diff --git a/frontend/app/announcement/[id]/page.tsx b/frontend/app/announcement/[id]/page.tsx index f0380f6..5af0375 100644 --- a/frontend/app/announcement/[id]/page.tsx +++ b/frontend/app/announcement/[id]/page.tsx @@ -1,13 +1,21 @@ import type { Metadata } from "next"; -import Link from "next/link"; import { cookies } from "next/headers"; import { notFound } from "next/navigation"; -import { ChevronRight, Megaphone } from "lucide-react"; -import { fetchAnnouncementDetail } from "@/lib/api"; +import { Megaphone } from "lucide-react"; +import { fetchAnnouncementDetail, fetchOverview } from "@/lib/api"; import { authCookieHeader } from "@/lib/cookies"; -import { formatDate } from "@/lib/format"; -import { getMeCached } from "@/lib/serverData"; +import { getMeCached, getPublicSettingsCached } from "@/lib/serverData"; +import { extractToc, estimateReadingMinutes, markdownHeadingToc } from "@/lib/toc"; import MarkdownBody from "@/components/MarkdownBody"; +import PostToc from "@/components/PostToc"; +import { + SiteDocShell, + SiteDocIdentity, + SiteDocPageNav, + SiteDocAnnoNav, + SiteDocMasthead, + SiteDocBreadcrumb, +} from "@/components/site-doc"; interface PageProps { params: Promise<{ id: string }>; @@ -32,14 +40,35 @@ export async function generateMetadata({ params }: PageProps): Promise export default async function AnnouncementPage({ params }: PageProps) { const { id } = await params; const cookie = authCookieHeader(await cookies()); - const [data, me] = await Promise.all([ + const [data, me, overview, settings] = await Promise.all([ fetchAnnouncementDetail(id, cookie || undefined).catch(() => null), getMeCached(cookie || undefined), + fetchOverview(cookie || undefined).catch(() => null), + getPublicSettingsCached(), ]); if (!data) notFound(); const a = data.announcement; + const annId = Number(id); const loginHref = `/login?redirect=${encodeURIComponent(`/announcement/${id}`)}`; + const sidebarPages = overview?.sidebar_pages ?? []; + const announcements = overview?.announcements ?? []; + const siteLead = settings.site_description?.trim() || undefined; + const toc = extractToc(a.content); + const headingToc = markdownHeadingToc(toc); + const readingMinutes = estimateReadingMinutes(a.content, a.title.length); + + let headingIndex = 0; + const headingRenderer = (Tag: "h2" | "h3") => + function Heading({ children }: { children?: React.ReactNode }) { + const item = headingToc[headingIndex++]; + return ( + + {children} + + ); + }; + const jsonLd = { "@context": "https://schema.org", "@type": "Article", @@ -50,69 +79,79 @@ export default async function AnnouncementPage({ params }: PageProps) { keywords: a.tag, }; + const left = ( + <> + + + + ); + + const right = ( + <> + {toc.length > 0 ? : null} + + + ); + return ( -
+ <>