@jant/core 0.3.22 → 0.3.24

package/src/routes/dash/collections.tsx

@@ -67,7 +67,7 @@ function CollectionsListContent({
                     message: "Edit",
                     comment: "@context: Button to edit collection",
                   })}
-                  viewHref={`/c/${col.path}`}
+                  viewHref={`/c/${col.slug}`}
                   viewLabel={t({
                     message: "View",
                     comment: "@context: Button to view collection",
@@ -81,7 +81,7 @@ function CollectionsListContent({
               >
                 {col.title}
               </a>
-              <p class="text-sm text-muted-foreground">/{col.path}</p>
+              <p class="text-sm text-muted-foreground">/{col.slug}</p>
               {col.description && (
                 <p class="text-sm text-muted-foreground mt-1">
                   {col.description}
@@ -104,7 +104,7 @@ function NewCollectionContent() {
       </h1>
 
       <form
-        data-signals="{title: '', path: '', description: ''}"
+        data-signals="{title: '', slug: '', description: ''}"
         data-on:submit__prevent="@post('/dash/collections')"
         data-indicator="_loading"
         class="flex flex-col gap-4 max-w-lg"
@@ -134,7 +134,7 @@ function NewCollectionContent() {
           </label>
           <input
             type="text"
-            data-bind="path"
+            data-bind="slug"
             class="input"
             required
             placeholder="my-collection"
@@ -213,7 +213,7 @@ function ViewCollectionContent({
       <div class="flex items-center justify-between mb-6">
         <div>
           <h1 class="text-2xl font-semibold">{collection.title}</h1>
-          <p class="text-sm text-muted-foreground">/{collection.path}</p>
+          <p class="text-sm text-muted-foreground">/{collection.slug}</p>
         </div>
         <ActionButtons
           editHref={`/dash/collections/${collection.id}/edit`}
@@ -221,7 +221,7 @@ function ViewCollectionContent({
             message: "Edit",
             comment: "@context: Button to edit collection",
           })}
-          viewHref={`/c/${collection.path}`}
+          viewHref={`/c/${collection.slug}`}
           viewLabel={t({
             message: "View",
             comment: "@context: Button to view collection",
@@ -255,21 +255,10 @@ function ViewCollectionContent({
                       class="font-medium hover:underline"
                     >
                       {post.title ||
-                        post.content?.slice(0, 50) ||
+                        post.body?.slice(0, 50) ||
                         `Post #${post.id}`}
                     </a>
                   </div>
-                  <button
-                    type="button"
-                    class="btn-sm-ghost text-destructive"
-                    data-on:click__prevent={`@post('/dash/collections/${collection.id}/remove-post', {payload: {postId: ${post.id}}})`}
-                  >
-                    {t({
-                      message: "Remove",
-                      comment:
-                        "@context: Button to remove post from collection",
-                    })}
-                  </button>
                 </div>
               ))}
             </div>
@@ -280,7 +269,7 @@ function ViewCollectionContent({
       <div class="mt-6">
         <a href="/dash/collections" class="text-sm hover:underline">
           {t({
-            message: "← Back to Collections",
+            message: "\u2190 Back to Collections",
             comment: "@context: Navigation link",
           })}
         </a>
@@ -294,7 +283,7 @@ function EditCollectionContent({ collection }: { collection: Collection }) {
 
   const signals = JSON.stringify({
     title: collection.title,
-    path: collection.path ?? "",
+    slug: collection.slug ?? "",
     description: collection.description ?? "",
   }).replace(/</g, "\\u003c");
 
@@ -326,7 +315,7 @@ function EditCollectionContent({ collection }: { collection: Collection }) {
           </label>
           <input
             type="text"
-            data-bind="path"
+            data-bind="slug"
             class="input"
             required
             pattern="[a-z0-9-]+"
@@ -419,13 +408,13 @@ collectionsRoutes.get("/new", async (c) => {
 collectionsRoutes.post("/", async (c) => {
   const body = await c.req.json<{
     title: string;
-    path: string;
+    slug: string;
     description?: string;
   }>();
 
   const collection = await c.var.services.collections.create({
     title: body.title,
-    path: body.path,
+    slug: body.slug,
     description: body.description || undefined,
   });
 
@@ -440,7 +429,10 @@ collectionsRoutes.get("/:id", async (c) => {
   const collection = await c.var.services.collections.getById(id);
   if (!collection) return c.notFound();
 
-  const posts = await c.var.services.collections.getPosts(id);
+  // Fetch posts in this collection via post service
+  const posts = await c.var.services.posts.list({
+    collectionId: id,
+  });
   const siteName = await getSiteName(c);
 
   return c.html(
@@ -484,13 +476,13 @@ collectionsRoutes.post("/:id", async (c) => {
 
   const body = await c.req.json<{
     title: string;
-    path: string;
+    slug: string;
     description?: string;
   }>();
 
   await c.var.services.collections.update(id, {
     title: body.title,
-    path: body.path,
+    slug: body.slug,
     description: body.description || undefined,
   });
 
@@ -506,17 +498,3 @@ collectionsRoutes.post("/:id/delete", async (c) => {
 
   return dsRedirect("/dash/collections");
 });
-
-// Remove post from collection
-collectionsRoutes.post("/:id/remove-post", async (c) => {
-  const id = parseInt(c.req.param("id"), 10);
-  if (isNaN(id)) return c.notFound();
-
-  const body = await c.req.json<{ postId: number }>();
-
-  if (body.postId) {
-    await c.var.services.collections.removePost(id, body.postId);
-  }
-
-  return dsRedirect(`/dash/collections/${id}`);
-});

package/src/routes/dash/index.tsx

@@ -91,8 +91,8 @@ dashIndexRoutes.get("/", async (c) => {
 
   // Get some stats
   const allPosts = await c.var.services.posts.list({ limit: 1000 });
-  const publishedPosts = allPosts.filter((p) => p.visibility !== "draft");
-  const draftPosts = allPosts.filter((p) => p.visibility === "draft");
+  const publishedPosts = allPosts.filter((p) => p.status !== "draft");
+  const draftPosts = allPosts.filter((p) => p.status === "draft");
 
   return c.html(
     <DashLayout c={c} title="Dashboard" siteName={siteName} currentPath="/dash">

package/src/routes/dash/navigation.tsx

@@ -1,11 +1,11 @@
 import { getSiteName } from "../../lib/config.js";
 /**
- * Dashboard Navigation Links Routes
+ * Dashboard Navigation Items Routes
  */
 
 import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
-import type { Bindings, NavigationLink } from "../../types.js";
+import type { Bindings, NavItem } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import { DashLayout } from "../../theme/layouts/index.js";
 import {
@@ -20,7 +20,7 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const navigationRoutes = new Hono<Env>();
 
-function NavigationListContent({ links }: { links: NavigationLink[] }) {
+function NavigationListContent({ items }: { items: NavItem[] }) {
   const { t } = useLingui();
 
   return (
@@ -37,7 +37,7 @@ function NavigationListContent({ links }: { links: NavigationLink[] }) {
         ctaHref="/dash/navigation/new"
       />
 
-      {links.length === 0 ? (
+      {items.length === 0 ? (
         <EmptyState
           message={t({
             message: "No navigation links configured.",
@@ -52,17 +52,17 @@ function NavigationListContent({ links }: { links: NavigationLink[] }) {
       ) : (
         <>
           <div id="nav-links-list" class="flex flex-col divide-y">
-            {links.map((link) => (
+            {items.map((item) => (
               <ListItemRow
-                key={link.id}
+                key={item.id}
                 actions={
                   <ActionButtons
-                    editHref={`/dash/navigation/${link.id}/edit`}
+                    editHref={`/dash/navigation/${item.id}/edit`}
                     editLabel={t({
                       message: "Edit",
                       comment: "@context: Button to edit navigation link",
                     })}
-                    deleteAction={`/dash/navigation/${link.id}/delete`}
+                    deleteAction={`/dash/navigation/${item.id}/delete`}
                     deleteLabel={t({
                       message: "Delete",
                       comment: "@context: Button to delete navigation link",
@@ -72,13 +72,13 @@ function NavigationListContent({ links }: { links: NavigationLink[] }) {
               >
                 <div
                   class="flex items-center gap-3 cursor-grab"
-                  data-id={link.id}
+                  data-id={item.id}
                 >
                   <span class="text-muted-foreground select-none">⠿</span>
                   <div class="flex items-center gap-2">
-                    <span class="font-medium">{link.label}</span>
+                    <span class="font-medium">{item.label}</span>
                     <code class="text-sm text-muted-foreground bg-muted px-1 rounded">
-                      {link.url}
+                      {item.url}
                     </code>
                   </div>
                 </div>
@@ -94,10 +94,10 @@ function NavigationListContent({ links }: { links: NavigationLink[] }) {
 }
 
 function NavigationFormContent({
-  link,
+  item,
   isEdit,
 }: {
-  link?: NavigationLink;
+  item?: NavItem;
   isEdit?: boolean;
 }) {
   const { t } = useLingui();
@@ -106,11 +106,11 @@ function NavigationFormContent({
     : t({ message: "New Link", comment: "@context: Page heading" });
 
   const signals = JSON.stringify({
-    label: link?.label ?? "",
-    url: link?.url ?? "",
+    label: item?.label ?? "",
+    url: item?.url ?? "",
   }).replace(/</g, "\\u003c");
 
-  const action = isEdit ? `/dash/navigation/${link?.id}` : "/dash/navigation";
+  const action = isEdit ? `/dash/navigation/${item?.id}` : "/dash/navigation";
 
   return (
     <>
@@ -200,10 +200,10 @@ function NavigationFormContent({
   );
 }
 
-// List navigation links
+// List navigation items
 navigationRoutes.get("/", async (c) => {
   const siteName = await getSiteName(c);
-  const links = await c.var.services.navigationLinks.list();
+  const items = await c.var.services.navItems.list();
 
   return c.html(
     <DashLayout
@@ -212,7 +212,7 @@ navigationRoutes.get("/", async (c) => {
       siteName={siteName}
       currentPath="/dash/navigation"
     >
-      <NavigationListContent links={links} />
+      <NavigationListContent items={items} />
     </DashLayout>,
   );
 });
@@ -241,7 +241,8 @@ navigationRoutes.post("/", async (c) => {
     return dsToast("Label and URL are required", "error");
   }
 
-  await c.var.services.navigationLinks.create({
+  await c.var.services.navItems.create({
+    type: "link",
     label: body.label,
     url: body.url,
   });
@@ -257,7 +258,7 @@ navigationRoutes.post("/reorder", async (c) => {
     return dsToast("Invalid request", "error");
   }
 
-  await c.var.services.navigationLinks.reorder(body.ids);
+  await c.var.services.navItems.reorder(body.ids);
 
   return dsToast("Order saved");
 });
@@ -267,8 +268,8 @@ navigationRoutes.get("/:id/edit", async (c) => {
   const id = parseInt(c.req.param("id"), 10);
   if (isNaN(id)) return c.notFound();
 
-  const link = await c.var.services.navigationLinks.getById(id);
-  if (!link) return c.notFound();
+  const item = await c.var.services.navItems.getById(id);
+  if (!item) return c.notFound();
 
   const siteName = await getSiteName(c);
 
@@ -279,7 +280,7 @@ navigationRoutes.get("/:id/edit", async (c) => {
       siteName={siteName}
       currentPath="/dash/navigation"
     >
-      <NavigationFormContent link={link} isEdit />
+      <NavigationFormContent item={item} isEdit />
     </DashLayout>,
   );
 });
@@ -295,7 +296,7 @@ navigationRoutes.post("/:id", async (c) => {
     return dsToast("Label and URL are required", "error");
   }
 
-  const updated = await c.var.services.navigationLinks.update(id, {
+  const updated = await c.var.services.navItems.update(id, {
     label: body.label,
     url: body.url,
   });
@@ -309,7 +310,7 @@ navigationRoutes.post("/:id", async (c) => {
 navigationRoutes.post("/:id/delete", async (c) => {
   const id = parseInt(c.req.param("id"), 10);
   if (!isNaN(id)) {
-    await c.var.services.navigationLinks.delete(id);
+    await c.var.services.navItems.delete(id);
   }
 
   return dsRedirect("/dash/navigation");

package/src/routes/dash/pages.tsx

@@ -2,24 +2,22 @@ import { getSiteName } from "../../lib/config.js";
 /**
  * Dashboard Pages Routes
  *
- * Management for custom pages (posts with type="page")
+ * Management for standalone pages (about, now, etc.)
  */
 
 import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
-import type { Bindings, Post } from "../../types.js";
+import type { Bindings, Page } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import { DashLayout } from "../../theme/layouts/index.js";
 import {
   PageForm,
-  VisibilityBadge,
   EmptyState,
   ListItemRow,
   ActionButtons,
   CrudPageHeader,
   DangerZone,
 } from "../../theme/components/index.js";
-import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
 import { dsRedirect } from "../../lib/sse.js";
 
@@ -27,7 +25,7 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const pagesRoutes = new Hono<Env>();
 
-function PagesListContent({ pages }: { pages: Post[] }) {
+function PagesListContent({ pages }: { pages: Page[] }) {
   const { t } = useLingui();
 
   return (
@@ -60,15 +58,13 @@ function PagesListContent({ pages }: { pages: Post[] }) {
               key={page.id}
               actions={
                 <ActionButtons
-                  editHref={`/dash/pages/${sqid.encode(page.id)}/edit`}
+                  editHref={`/dash/pages/${page.id}/edit`}
                   editLabel={t({
                     message: "Edit",
                     comment: "@context: Button to edit page",
                   })}
                   viewHref={
-                    page.visibility !== "draft" && page.path
-                      ? `/${page.path}`
-                      : undefined
+                    page.status !== "draft" ? `/${page.slug}` : undefined
                   }
                   viewLabel={t({
                     message: "View",
@@ -78,13 +74,12 @@ function PagesListContent({ pages }: { pages: Post[] }) {
               }
             >
               <div class="flex items-center gap-2 mb-1">
-                <VisibilityBadge visibility={page.visibility} />
                 <span class="text-xs text-muted-foreground">
                   {time.formatDate(page.updatedAt)}
                 </span>
               </div>
               <a
-                href={`/dash/pages/${sqid.encode(page.id)}`}
+                href={`/dash/pages/${page.id}`}
                 class="font-medium hover:underline"
               >
                 {page.title ||
@@ -93,7 +88,7 @@ function PagesListContent({ pages }: { pages: Post[] }) {
                     comment: "@context: Default title for untitled page",
                   })}
               </a>
-              <p class="text-sm text-muted-foreground mt-1">/{page.path}</p>
+              <p class="text-sm text-muted-foreground mt-1">/{page.slug}</p>
             </ListItemRow>
           ))}
         </div>
@@ -114,7 +109,7 @@ function NewPageContent() {
   );
 }
 
-function ViewPageContent({ page }: { page: Post }) {
+function ViewPageContent({ page }: { page: Page }) {
   const { t } = useLingui();
   return (
     <>
@@ -127,19 +122,15 @@ function ViewPageContent({ page }: { page: Post }) {
                 comment: "@context: Default page heading when untitled",
               })}
           </h1>
-          {page.path && <p class="text-muted-foreground mt-1">/{page.path}</p>}
+          <p class="text-muted-foreground mt-1">/{page.slug}</p>
         </div>
         <ActionButtons
-          editHref={`/dash/pages/${sqid.encode(page.id)}/edit`}
+          editHref={`/dash/pages/${page.id}/edit`}
           editLabel={t({
             message: "Edit",
             comment: "@context: Button to edit page",
           })}
-          viewHref={
-            page.visibility !== "draft" && page.path
-              ? `/${page.path}`
-              : undefined
-          }
+          viewHref={page.status !== "draft" ? `/${page.slug}` : undefined}
           viewLabel={t({
             message: "View",
             comment: "@context: Button to view page on public site",
@@ -151,7 +142,7 @@ function ViewPageContent({ page }: { page: Post }) {
         <section>
           <div
             class="prose"
-            dangerouslySetInnerHTML={{ __html: page.contentHtml || "" }}
+            dangerouslySetInnerHTML={{ __html: page.bodyHtml || "" }}
           />
         </section>
       </div>
@@ -161,14 +152,14 @@ function ViewPageContent({ page }: { page: Post }) {
           message: "Delete Page",
           comment: "@context: Button to delete page",
         })}
-        formAction={`/dash/pages/${sqid.encode(page.id)}/delete`}
+        formAction={`/dash/pages/${page.id}/delete`}
         confirmMessage="Are you sure you want to delete this page?"
       />
     </>
   );
 }
 
-function EditPageContent({ page }: { page: Post }) {
+function EditPageContent({ page }: { page: Page }) {
   const { t } = useLingui();
   return (
     <>
@@ -178,18 +169,14 @@ function EditPageContent({ page }: { page: Post }) {
           comment: "@context: Edit page main heading",
         })}
       </h1>
-      <PageForm page={page} action={`/dash/pages/${sqid.encode(page.id)}`} />
+      <PageForm page={page} action={`/dash/pages/${page.id}`} />
     </>
   );
 }
 
 // List pages
 pagesRoutes.get("/", async (c) => {
-  const pages = await c.var.services.posts.list({
-    type: "page",
-    visibility: ["unlisted", "draft"],
-    limit: 100,
-  });
+  const pages = await c.var.services.pages.list();
   const siteName = await getSiteName(c);
 
   return c.html(
@@ -224,29 +211,28 @@ pagesRoutes.get("/new", async (c) => {
 pagesRoutes.post("/", async (c) => {
   const body = await c.req.json<{
     title: string;
-    content: string;
-    visibility: string;
-    path: string;
+    body: string;
+    status: string;
+    slug: string;
   }>();
 
-  const page = await c.var.services.posts.create({
-    type: "page",
+  const page = await c.var.services.pages.create({
     title: body.title,
-    content: body.content,
-    visibility: body.visibility as Post["visibility"],
-    path: body.path.toLowerCase().replace(/[^a-z0-9-]/g, "-"),
+    body: body.body,
+    status: body.status as Page["status"],
+    slug: body.slug.toLowerCase().replace(/[^a-z0-9-]/g, "-"),
   });
 
-  return dsRedirect(`/dash/pages/${sqid.encode(page.id)}`);
+  return dsRedirect(`/dash/pages/${page.id}`);
 });
 
 // View single page
 pagesRoutes.get("/:id", async (c) => {
-  const id = sqid.decode(c.req.param("id"));
-  if (!id) return c.notFound();
+  const id = parseInt(c.req.param("id"), 10);
+  if (isNaN(id)) return c.notFound();
 
-  const page = await c.var.services.posts.getById(id);
-  if (!page || page.type !== "page") return c.notFound();
+  const page = await c.var.services.pages.getById(id);
+  if (!page) return c.notFound();
 
   const siteName = await getSiteName(c);
 
@@ -264,11 +250,11 @@ pagesRoutes.get("/:id", async (c) => {
 
 // Edit page form
 pagesRoutes.get("/:id/edit", async (c) => {
-  const id = sqid.decode(c.req.param("id"));
-  if (!id) return c.notFound();
+  const id = parseInt(c.req.param("id"), 10);
+  if (isNaN(id)) return c.notFound();
 
-  const page = await c.var.services.posts.getById(id);
-  if (!page || page.type !== "page") return c.notFound();
+  const page = await c.var.services.pages.getById(id);
+  if (!page) return c.notFound();
 
   const siteName = await getSiteName(c);
 
@@ -286,33 +272,32 @@ pagesRoutes.get("/:id/edit", async (c) => {
 
 // Update page
 pagesRoutes.post("/:id", async (c) => {
-  const id = sqid.decode(c.req.param("id"));
-  if (!id) return c.notFound();
+  const id = parseInt(c.req.param("id"), 10);
+  if (isNaN(id)) return c.notFound();
 
   const body = await c.req.json<{
     title: string;
-    content: string;
-    visibility: string;
-    path: string;
+    body: string;
+    status: string;
+    slug: string;
   }>();
 
-  await c.var.services.posts.update(id, {
-    type: "page",
+  await c.var.services.pages.update(id, {
     title: body.title,
-    content: body.content,
-    visibility: body.visibility as Post["visibility"],
-    path: body.path.toLowerCase().replace(/[^a-z0-9-]/g, "-"),
+    body: body.body,
+    status: body.status as Page["status"],
+    slug: body.slug.toLowerCase().replace(/[^a-z0-9-]/g, "-"),
   });
 
-  return dsRedirect(`/dash/pages/${sqid.encode(id)}`);
+  return dsRedirect(`/dash/pages/${id}`);
 });
 
 // Delete page
 pagesRoutes.post("/:id/delete", async (c) => {
-  const id = sqid.decode(c.req.param("id"));
-  if (!id) return c.notFound();
+  const id = parseInt(c.req.param("id"), 10);
+  if (isNaN(id)) return c.notFound();
 
-  await c.var.services.posts.delete(id);
+  await c.var.services.pages.delete(id);
 
   return dsRedirect("/dash/pages");
 });