diff --git a/packages-rs/drainpipe/docker-compose.yml b/packages-rs/drainpipe/docker-compose.yml index 0e1d2ca..d5e214a 100644 --- a/packages-rs/drainpipe/docker-compose.yml +++ b/packages-rs/drainpipe/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3" services: drainpipe: build: diff --git a/packages-rs/drainpipe/src/main.rs b/packages-rs/drainpipe/src/main.rs index 21278a5..0a05d06 100644 --- a/packages-rs/drainpipe/src/main.rs +++ b/packages-rs/drainpipe/src/main.rs @@ -76,7 +76,7 @@ async fn process(message: Vec, ctx: &mut Context) -> Result>(); if !frontpage_ops.is_empty() { process_frontpage_ops(&frontpage_ops, &commit, &ctx) diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx index c0720e5..e619a5f 100644 --- a/packages/frontpage/app/(app)/_components/post-card.tsx +++ b/packages/frontpage/app/(app)/_components/post-card.tsx @@ -83,7 +83,7 @@ export async function PostCard({ votes={votes} /> -
+

+
+ {/*
*/}
{/* eslint-disable-next-line @next/next/no-img-element */} @@ -52,6 +53,8 @@ export default async function Layout({
{children}
+ + {/*

Made by{" "} @@ -59,10 +62,11 @@ export default async function Layout({ href={`https://bsky.app/profile/${FRONTPAGE_ATPROTO_HANDLE}`} className="font-medium text-indigo-600 hover:text-indigo-500 dark:text-indigo-400 dark:hover:text-indigo-300" > - @frontpage.fyi + @o.syui.ai

+ */}
); } @@ -141,8 +145,8 @@ async function LoginOrLogout() { } return ( - ); } diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/[commentAuthor]/[commentRkey]/page.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/[commentAuthor]/[commentRkey]/page.tsx index c9a2883..c50b02f 100644 --- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/[commentAuthor]/[commentRkey]/page.tsx +++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/[commentAuthor]/[commentRkey]/page.tsx @@ -30,7 +30,7 @@ export async function generateMetadata(props: { description: comment.status === "live" ? truncateText(comment.body, 47) : null, alternates: { - canonical: `https://frontpage.fyi${path}`, + canonical: `https://o.syui.ai${path}`, }, openGraph: comment.status === "live" @@ -40,7 +40,7 @@ export async function generateMetadata(props: { type: "article", publishedTime: comment.createdAt.toISOString(), authors: [`@${handle}`], - url: `https://frontpage.fyi${path}`, + url: `https://o.syui.ai${path}`, images: [ { url: `${path}/og-image`, diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx index 71dd664..954f499 100644 --- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx +++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx @@ -283,16 +283,12 @@ export function NewComment({ ref={textAreaRef} placeholder="Write a comment..." disabled={isPending} - className="resize-y flex-1" + className="" />
- -
+
{extraButton} -
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx index 517c871..ef73ecb 100644 --- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx +++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx @@ -29,7 +29,7 @@ export default async function Post(props: { } return ( -
+
}) { return ( <> + + {/* }) { /> ))}
+ */} + + {params.postAuthor === "syui.ai" && (post.title.includes("live") || post.title.includes("video")) && ( +
+ +
+ + + {comments.map((comment) => ( + + ))} +
+
+ )} + + {post.status === "live" ? ( + + ) : ( + + This post has been deleted + + Deleted posts cannot receive new comments. + + + )} +
+ {comments.map((comment) => ( + + ))} + +
+ ); } diff --git a/packages/frontpage/app/(auth)/login/page.tsx b/packages/frontpage/app/(auth)/login/page.tsx index e3165f9..4d661ce 100644 --- a/packages/frontpage/app/(auth)/login/page.tsx +++ b/packages/frontpage/app/(auth)/login/page.tsx @@ -14,17 +14,15 @@ export default async function LoginPage() {

- Sign in to Frontpage + Login with atproto

- Don't have an account?{" "} - Sign up on Bluesky - - , then return here to login. + Bluesky + oauth login

diff --git a/packages/frontpage/app/api/receive_hook/route.ts b/packages/frontpage/app/api/receive_hook/route.ts index 04bda27..9feb136 100644 --- a/packages/frontpage/app/api/receive_hook/route.ts +++ b/packages/frontpage/app/api/receive_hook/route.ts @@ -96,7 +96,7 @@ export async function POST(request: Request) { }); } - if (collection === "fyi.unravel.frontpage.vote") { + if (collection === "ai.syui.o.vote") { if (op.action === "create") { const hydratedRecord = await atprotoGetRecord({ serviceEndpoint: service, diff --git a/packages/frontpage/app/globals.css b/packages/frontpage/app/globals.css index 9abc86b..e22dba5 100644 --- a/packages/frontpage/app/globals.css +++ b/packages/frontpage/app/globals.css @@ -13,8 +13,12 @@ --popover: 0 0% 100%; --popover-foreground: 222.2 84% 4.9%; + /* --primary: 222.2 47.4% 11.2%; - --primary-foreground: 210 40% 98%; + --primary-foreground: 210 40% 98%; */ + + --primary: 210 100% 50%; /* HSLカラーで青色を定義 */ + --primary-foreground: 0 0% 100%; /* 白色のテキスト */ --secondary: 210 40% 96.1%; --secondary-foreground: 222.2 47.4% 11.2%; @@ -67,8 +71,12 @@ --popover: 222.2 84% 4.9%; --popover-foreground: 210 40% 98%; - --primary: 210 40% 98%; - --primary-foreground: 222.2 47.4% 11.2%; + /*--primary: 210 40% 98%; + *--primary-foreground: 222.2 47.4% 11.2%;*/ + + /* ダークモード用に少し明るい青 */ + --primary: 210 100% 60%; + --primary-foreground: 0 0% 100%; --secondary: 217.2 32.6% 17.5%; --secondary-foreground: 210 40% 98%; diff --git a/packages/frontpage/app/layout.tsx b/packages/frontpage/app/layout.tsx index e8b5a39..a9fa945 100644 --- a/packages/frontpage/app/layout.tsx +++ b/packages/frontpage/app/layout.tsx @@ -22,13 +22,13 @@ const sourceSans = Source_Sans_3({ }); export const metadata: Metadata = { - title: "Frontpage", + title: "o.syui.ai", description: "A federated link aggregator. Your frontpage to the internet.", openGraph: { title: "Frontpage", description: "Your frontpage to the internet.", type: "website", - siteName: "frontpage.fyi", + siteName: "o.syui.ai", }, }; @@ -53,11 +53,7 @@ export default function Layout({ children }: { children: React.ReactNode }) { -