create-astroid 0.9.2 → 0.11.0

package/template/src/pages/[...slug].astro

@@ -0,0 +1,76 @@
+---
+// Every page an owner makes in the Pages panel, served at its slug: `about` at
+// /about. The same render as the home page (src/lib/pages.ts): a visitor sees
+// the live row, and an editor in edit mode sees the latest pending draft, with
+// the same inline editing and Publish.
+//
+// A file route always wins over this one, so /contact and /login stay theirs.
+// `pagesRoute` refuses those slugs (ASTROID_RESERVED_SLUGS), so a page can't be
+// saved where it would never be reached.
+//
+// Anything else that matches nothing answers 404 here. That includes a hidden or
+// never-published page, and a renamed page's old path, which the middleware's
+// `redirectFor` then answers with a 301 to the new one.
+import Editable from "astroidjs/components/Editable.astro";
+import Sections from "astroidjs/components/Sections.astro";
+import { env } from "cloudflare:workers";
+import Site from "../layouts/Site.astro";
+import { readPage } from "../lib/pages";
+
+export const prerender = false;
+
+const { editMode } = Astro.locals;
+const slug = Astro.params.slug ?? "";
+
+// `home` is served at "/", never at "/home".
+if (slug === "home") return Astro.redirect("/", 301);
+
+const page = slug ? await readPage(env.DB, slug, { editMode }) : null;
+
+// Edge caching (ADR 0004), gated exactly as on the home page: never in edit
+// mode, only when ASTROID_EDGE_CACHE is "true", and never for a 404, so a page
+// published a minute later isn't hidden behind a cached miss.
+if (!page || editMode || env.ASTROID_EDGE_CACHE !== "true") {
+  Astro.cache.set(false);
+} else {
+  Astro.cache.set({ maxAge: 60 });
+}
+
+if (!page) Astro.response.status = 404;
+---
+
+{
+  page ? (
+    <Site
+      title={page.row.seo_title ?? page.title}
+      description={page.row.seo_description ?? undefined}
+      ogImage={page.row.og_image ?? undefined}
+      noindex={Boolean(page.row.noindex)}
+      versionedPageId={page.row.id}
+      sections={page.sections}
+    >
+      <main>
+        <Sections items={page.sections} db={env.DB} mediaBase={env.MEDIA_URL} />
+
+        <div class="mx-auto max-w-3xl px-6 py-16">
+          <Editable as="h1" collection="pages" key={page.row.id} field="title" class="text-5xl font-bold">
+            {page.title}
+          </Editable>
+          <Editable as="div" collection="pages" key={page.row.id} field="body" type="richtext" class="prose mt-6 max-w-none">
+            <Fragment set:html={page.body} />
+          </Editable>
+        </div>
+      </main>
+    </Site>
+  ) : (
+    <Site title="Page not found" noindex>
+      <main class="mx-auto max-w-3xl px-6 py-24 text-center">
+        <h1 class="text-4xl font-bold">Page not found</h1>
+        <p class="mt-4">This page doesn't exist, or it has moved.</p>
+        <p class="mt-8">
+          <a class="link" href="/">Go to the home page</a>
+        </p>
+      </main>
+    </Site>
+  )
+}

package/template/src/pages/index.astro

@@ -9,6 +9,7 @@ import Sections from "astroidjs/components/Sections.astro";
 import { env } from "cloudflare:workers";
 import Hero from "../components/Hero.astro";
 import Site from "../layouts/Site.astro";
+import { readPage } from "../lib/pages";
 
 export const prerender = false;
 
@@ -37,75 +38,21 @@ if (editMode || env.ASTROID_EDGE_CACHE !== "true") {
 // is the on-page H1. The home page passes NO title to <Site>, so <title>
 // is the site-wide default ("Acme Coffee", not "Acme Coffee | Acme Coffee");
 // set `seo_title` on the row to override just the head.
-interface HomeRow {
-  id: number;
-  title: string;
-  body: string | null;
-  /** The page-builder array, stored as a JSON string in D1. */
-  sections: string | null;
-  seo_title: string | null;
-  seo_description: string | null;
-  og_image: string | null;
-  noindex: number | null;
-}
-let page: HomeRow | null = null;
-try {
-  page = await env.DB.prepare(
-    "SELECT id, title, body, sections, seo_title, seo_description, og_image, noindex FROM pages WHERE slug = 'home'",
-  ).first<HomeRow>();
-} catch {
-  // No DB binding yet (pre-provision)—fall through to the seed-me prompt.
-}
-
-let title = page?.title ?? "__BRAND_NAME__";
-let body = page?.body ?? "";
-// `sections` is a JSON string in D1. Bad JSON is a render-time non-event—the
-// page falls back to its prose body rather than 500ing on one malformed row.
-function parseSections(raw: string | null | undefined): unknown[] {
-  if (!raw) return [];
-  try {
-    const parsed = JSON.parse(raw);
-    return Array.isArray(parsed) ? parsed : [];
-  } catch {
-    return [];
-  }
-}
-let sections = parseSections(page?.sections);
-
-// In edit mode, prefer the latest unpublished draft so edits resume across reloads.
-if (editMode && page) {
-  try {
-    const draft = await env.DB.prepare(
-      "SELECT version_data FROM pages_versions WHERE parent_id = ? AND status = 'draft' ORDER BY created_at DESC LIMIT 1",
-    )
-      .bind(page.id)
-      .first<{ version_data: string }>();
-    if (draft?.version_data) {
-      const d = JSON.parse(draft.version_data) as {
-        title?: string;
-        body?: string;
-        sections?: unknown;
-      };
-      if (typeof d.title === "string") title = d.title;
-      if (typeof d.body === "string") body = d.body;
-      // Sections stage as drafts like any other field, so edit mode must render
-      // the draft's array—otherwise an editor's in-progress section edits
-      // vanish on reload while their title edits survive.
-      if (Array.isArray(d.sections)) sections = d.sections;
-      else if (typeof d.sections === "string") sections = parseSections(d.sections);
-    }
-  } catch {
-    // Non-fatal—fall back to the live row.
-  }
-}
+//
+// `requireLive: false`: an unpublished home keeps rendering rather than turning
+// the site's front door into a 404. Every other page is visitor-visible only
+// while it's live (src/pages/[...slug].astro).
+const page = await readPage(env.DB, "home", { editMode, requireLive: false });
+const title = page?.title ?? "__BRAND_NAME__";
+const sections = page?.sections ?? [];
 ---
 
 <Site
-  title={page?.seo_title ?? undefined}
-  description={page?.seo_description ?? undefined}
-  ogImage={page?.og_image ?? undefined}
-  noindex={Boolean(page?.noindex)}
-  versionedPageId={page?.id}
+  title={page?.row.seo_title ?? undefined}
+  description={page?.row.seo_description ?? undefined}
+  ogImage={page?.row.og_image ?? undefined}
+  noindex={Boolean(page?.row.noindex)}
+  versionedPageId={page?.row.id}
   sections={sections}
 >
   {
@@ -118,11 +65,11 @@ if (editMode && page) {
         <Sections items={sections} db={env.DB} mediaBase={env.MEDIA_URL} />
 
         <div class="mx-auto max-w-3xl px-6 py-16">
-        <Editable as="h1" collection="pages" key={page.id} field="title" class="text-5xl font-bold">
+        <Editable as="h1" collection="pages" key={page.row.id} field="title" class="text-5xl font-bold">
           {title}
         </Editable>
-        <Editable as="div" collection="pages" key={page.id} field="body" type="richtext" class="prose mt-6 max-w-none">
-          <Fragment set:html={body} />
+        <Editable as="div" collection="pages" key={page.row.id} field="body" type="richtext" class="prose mt-6 max-w-none">
+          <Fragment set:html={page.body} />
         </Editable>
         </div>
       </main>