@jant/core 0.3.24 → 0.3.25

package/dist/routes/dash/pages.js

@@ -1,17 +1,20 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "hono/jsx/jsx-runtime";
 import { getSiteName } from "../../lib/config.js";
 /**
- * Dashboard Pages Routes
+ * Dashboard Pages & Navigation Routes
  *
- * Management for standalone pages (about, now, etc.)
+ * Unified management for pages and navigation items (pika.page style).
+ * Two sections: "Your site navigation" (draggable) and "Other pages".
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { DashLayout } from "../../theme/layouts/index.js";
-import { PageForm, EmptyState, ListItemRow, ActionButtons, CrudPageHeader, DangerZone } from "../../theme/components/index.js";
-import * as time from "../../lib/time.js";
-import { dsRedirect } from "../../lib/sse.js";
+import { DashLayout } from "../../ui/layouts/DashLayout.js";
+import { PageForm, ListItemRow, ActionButtons, CrudPageHeader, DangerZone } from "../../ui/dash/index.js";
+import { dsRedirect, dsToast } from "../../lib/sse.js";
 export const pagesRoutes = new Hono();
-function PagesListContent({ pages }) {
+// =============================================================================
+// Components
+// =============================================================================
+function UnifiedPagesContent({ navItems, otherPages }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
@@ -20,62 +23,181 @@ function PagesListContent({ pages }) {
                     id: "wRR604",
                     message: "Pages"
                 }),
-                ctaLabel: $__i18n._({
-                    id: "GrZ6fH",
-                    message: "New Page"
-                }),
-                ctaHref: "/dash/pages/new"
-            }),
-            pages.length === 0 ? /*#__PURE__*/ _jsx(EmptyState, {
-                message: $__i18n._({
-                    id: "LkvLQe",
-                    message: "No pages yet."
-                }),
-                ctaText: $__i18n._({
-                    id: "0JkyS7",
-                    message: "Create your first page"
-                }),
-                ctaHref: "/dash/pages/new"
-            }) : /*#__PURE__*/ _jsx("div", {
-                class: "flex flex-col divide-y",
-                children: pages.map((page)=>/*#__PURE__*/ _jsxs(ListItemRow, {
-                        actions: /*#__PURE__*/ _jsx(ActionButtons, {
-                            editHref: `/dash/pages/${page.id}/edit`,
-                            editLabel: $__i18n._({
-                                id: "ePK91l",
-                                message: "Edit"
-                            }),
-                            viewHref: page.status !== "draft" ? `/${page.slug}` : undefined,
-                            viewLabel: $__i18n._({
-                                id: "jpctdh",
-                                message: "View"
+                children: /*#__PURE__*/ _jsxs("div", {
+                    class: "flex gap-2",
+                    children: [
+                        /*#__PURE__*/ _jsx("a", {
+                            href: "/dash/pages/links/new",
+                            class: "btn-outline",
+                            children: $__i18n._({
+                                id: "V4WsyL",
+                                message: "Add Link"
                             })
                         }),
-                        children: [
-                            /*#__PURE__*/ _jsx("div", {
-                                class: "flex items-center gap-2 mb-1",
-                                children: /*#__PURE__*/ _jsx("span", {
-                                    class: "text-xs text-muted-foreground",
-                                    children: time.formatDate(page.updatedAt)
-                                })
-                            }),
-                            /*#__PURE__*/ _jsx("a", {
-                                href: `/dash/pages/${page.id}`,
-                                class: "font-medium hover:underline",
-                                children: page.title || $__i18n._({
-                                    id: "wja8aL",
-                                    message: "Untitled"
+                        /*#__PURE__*/ _jsx("a", {
+                            href: "/dash/pages/new",
+                            class: "btn",
+                            children: $__i18n._({
+                                id: "GrZ6fH",
+                                message: "New Page"
+                            })
+                        })
+                    ]
+                })
+            }),
+            /*#__PURE__*/ _jsxs("section", {
+                class: "mb-8",
+                children: [
+                    /*#__PURE__*/ _jsx("h2", {
+                        class: "text-lg font-medium mb-3",
+                        children: $__i18n._({
+                            id: "GTPbOX",
+                            message: "Your site navigation"
+                        })
+                    }),
+                    navItems.length === 0 ? /*#__PURE__*/ _jsx("p", {
+                        class: "text-sm text-muted-foreground py-4",
+                        children: $__i18n._({
+                            id: "vh0C9b",
+                            message: "No navigation links yet. Add pages to navigation or create links."
+                        })
+                    }) : /*#__PURE__*/ _jsx("div", {
+                        id: "nav-links-list",
+                        class: "flex flex-col divide-y",
+                        children: navItems.map((item)=>/*#__PURE__*/ _jsx(ListItemRow, {
+                                actions: item.type === "page" ? /*#__PURE__*/ _jsxs(_Fragment, {
+                                    children: [
+                                        /*#__PURE__*/ _jsx(ActionButtons, {
+                                            editHref: item.pageId ? `/dash/pages/${item.pageId}/edit` : undefined,
+                                            editLabel: $__i18n._({
+                                                id: "ePK91l",
+                                                message: "Edit"
+                                            })
+                                        }),
+                                        /*#__PURE__*/ _jsx("button", {
+                                            type: "button",
+                                            class: "btn-sm-ghost",
+                                            "data-on:click__prevent": `@post('/dash/pages/${item.pageId}/remove-from-nav')`,
+                                            children: $__i18n._({
+                                                id: "g3mKmM",
+                                                message: "Un-nav"
+                                            })
+                                        })
+                                    ]
+                                }) : /*#__PURE__*/ _jsx(_Fragment, {
+                                    children: /*#__PURE__*/ _jsx(ActionButtons, {
+                                        editHref: `/dash/pages/links/${item.id}/edit`,
+                                        editLabel: $__i18n._({
+                                            id: "ePK91l",
+                                            message: "Edit"
+                                        }),
+                                        deleteAction: `/dash/pages/links/${item.id}/delete`,
+                                        deleteLabel: $__i18n._({
+                                            id: "cnGeoo",
+                                            message: "Delete"
+                                        })
+                                    })
+                                }),
+                                children: /*#__PURE__*/ _jsxs("div", {
+                                    class: "flex items-center gap-3 cursor-grab",
+                                    "data-id": item.id,
+                                    children: [
+                                        /*#__PURE__*/ _jsx("span", {
+                                            class: "text-muted-foreground select-none",
+                                            children: "⠿"
+                                        }),
+                                        /*#__PURE__*/ _jsxs("div", {
+                                            class: "flex items-center gap-2",
+                                            children: [
+                                                /*#__PURE__*/ _jsx("span", {
+                                                    class: "font-medium",
+                                                    children: item.label
+                                                }),
+                                                /*#__PURE__*/ _jsx("code", {
+                                                    class: "text-sm text-muted-foreground bg-muted px-1 rounded",
+                                                    children: item.url
+                                                }),
+                                                /*#__PURE__*/ _jsx("span", {
+                                                    class: "badge badge-sm",
+                                                    children: item.type === "page" ? $__i18n._({
+                                                        id: "MnbH31",
+                                                        message: "page"
+                                                    }) : $__i18n._({
+                                                        id: "LdyooL",
+                                                        message: "link"
+                                                    })
+                                                })
+                                            ]
+                                        })
+                                    ]
                                 })
-                            }),
-                            /*#__PURE__*/ _jsxs("p", {
-                                class: "text-sm text-muted-foreground mt-1",
+                            }, item.id))
+                    })
+                ]
+            }),
+            /*#__PURE__*/ _jsxs("section", {
+                children: [
+                    /*#__PURE__*/ _jsx("h2", {
+                        class: "text-lg font-medium mb-3",
+                        children: $__i18n._({
+                            id: "Y75ho6",
+                            message: "Other pages"
+                        })
+                    }),
+                    otherPages.length === 0 ? /*#__PURE__*/ _jsx("p", {
+                        class: "text-sm text-muted-foreground py-4",
+                        children: $__i18n._({
+                            id: "/rkqRV",
+                            message: "All pages are in your navigation."
+                        })
+                    }) : /*#__PURE__*/ _jsx("div", {
+                        class: "flex flex-col divide-y",
+                        children: otherPages.map((page)=>/*#__PURE__*/ _jsxs(ListItemRow, {
+                                actions: /*#__PURE__*/ _jsxs(_Fragment, {
+                                    children: [
+                                        /*#__PURE__*/ _jsx("button", {
+                                            type: "button",
+                                            class: "btn-sm-outline",
+                                            "data-on:click__prevent": `@post('/dash/pages/${page.id}/add-to-nav')`,
+                                            children: $__i18n._({
+                                                id: "+MH6k9",
+                                                message: "Add to nav"
+                                            })
+                                        }),
+                                        /*#__PURE__*/ _jsx(ActionButtons, {
+                                            editHref: `/dash/pages/${page.id}/edit`,
+                                            editLabel: $__i18n._({
+                                                id: "ePK91l",
+                                                message: "Edit"
+                                            }),
+                                            viewHref: page.status !== "draft" ? `/${page.slug}` : undefined,
+                                            viewLabel: $__i18n._({
+                                                id: "jpctdh",
+                                                message: "View"
+                                            })
+                                        })
+                                    ]
+                                }),
                                 children: [
-                                    "/",
-                                    page.slug
+                                    /*#__PURE__*/ _jsx("a", {
+                                        href: `/dash/pages/${page.id}`,
+                                        class: "font-medium hover:underline",
+                                        children: page.title || $__i18n._({
+                                            id: "wja8aL",
+                                            message: "Untitled"
+                                        })
+                                    }),
+                                    /*#__PURE__*/ _jsxs("p", {
+                                        class: "text-sm text-muted-foreground mt-1",
+                                        children: [
+                                            "/",
+                                            page.slug
+                                        ]
+                                    })
                                 ]
-                            })
-                        ]
-                    }, page.id))
+                            }, page.id))
+                    })
+                ]
             })
         ]
     });
@@ -176,17 +298,144 @@ function EditPageContent({ page }) {
         ]
     });
 }
-// List pages
+function LinkFormContent({ item, isEdit }) {
+    const { i18n: $__i18n, _: $__ } = $_useLingui();
+    const title = isEdit ? $__i18n._({
+        id: "gDx5MG",
+        message: "Edit Link"
+    }) : $__i18n._({
+        id: "aaGV/9",
+        message: "New Link"
+    });
+    const signals = JSON.stringify({
+        label: item?.label ?? "",
+        url: item?.url ?? ""
+    }).replace(/</g, "\\u003c");
+    const action = isEdit ? `/dash/pages/links/${item?.id}` : "/dash/pages/links";
+    return /*#__PURE__*/ _jsxs(_Fragment, {
+        children: [
+            /*#__PURE__*/ _jsx("h1", {
+                class: "text-2xl font-semibold mb-6",
+                children: title
+            }),
+            /*#__PURE__*/ _jsxs("form", {
+                "data-signals": signals,
+                "data-on:submit__prevent": `@post('${action}')`,
+                "data-indicator": "_loading",
+                class: "flex flex-col gap-4 max-w-lg",
+                children: [
+                    /*#__PURE__*/ _jsxs("div", {
+                        class: "field",
+                        children: [
+                            /*#__PURE__*/ _jsx("label", {
+                                class: "label",
+                                children: $__i18n._({
+                                    id: "87a/t/",
+                                    message: "Label"
+                                })
+                            }),
+                            /*#__PURE__*/ _jsx("input", {
+                                type: "text",
+                                "data-bind": "label",
+                                class: "input",
+                                placeholder: "Home",
+                                required: true
+                            }),
+                            /*#__PURE__*/ _jsx("p", {
+                                class: "text-xs text-muted-foreground mt-1",
+                                children: $__i18n._({
+                                    id: "+bHzpy",
+                                    message: "Display text for the link"
+                                })
+                            })
+                        ]
+                    }),
+                    /*#__PURE__*/ _jsxs("div", {
+                        class: "field",
+                        children: [
+                            /*#__PURE__*/ _jsx("label", {
+                                class: "label",
+                                children: $__i18n._({
+                                    id: "IagCbF",
+                                    message: "URL"
+                                })
+                            }),
+                            /*#__PURE__*/ _jsx("input", {
+                                type: "text",
+                                "data-bind": "url",
+                                class: "input",
+                                placeholder: "/archive or https://...",
+                                required: true
+                            }),
+                            /*#__PURE__*/ _jsx("p", {
+                                class: "text-xs text-muted-foreground mt-1",
+                                children: $__i18n._({
+                                    id: "QEbNBb",
+                                    message: "Path (e.g. /archive) or full URL (e.g. https://example.com)"
+                                })
+                            })
+                        ]
+                    }),
+                    /*#__PURE__*/ _jsxs("div", {
+                        class: "flex gap-2",
+                        children: [
+                            /*#__PURE__*/ _jsxs("button", {
+                                type: "submit",
+                                class: "btn",
+                                "data-attr-disabled": "$_loading",
+                                children: [
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "!$_loading",
+                                        children: isEdit ? $__i18n._({
+                                            id: "IUwGEM",
+                                            message: "Save Changes"
+                                        }) : $__i18n._({
+                                            id: "kd7eBB",
+                                            message: "Create Link"
+                                        })
+                                    }),
+                                    /*#__PURE__*/ _jsx("span", {
+                                        "data-show": "$_loading",
+                                        children: $__i18n._({
+                                            id: "k1ifdL",
+                                            message: "Processing..."
+                                        })
+                                    })
+                                ]
+                            }),
+                            /*#__PURE__*/ _jsx("a", {
+                                href: "/dash/pages",
+                                class: "btn-outline",
+                                children: $__i18n._({
+                                    id: "dEgA5A",
+                                    message: "Cancel"
+                                })
+                            })
+                        ]
+                    })
+                ]
+            })
+        ]
+    });
+}
+// =============================================================================
+// Page Routes
+// =============================================================================
+// List pages (unified view)
 pagesRoutes.get("/", async (c)=>{
-    const pages = await c.var.services.pages.list();
+    const [navItems, otherPages] = await Promise.all([
+        c.var.services.navItems.list(),
+        c.var.services.pages.listNotInNav()
+    ]);
     const siteName = await getSiteName(c);
     return c.html(/*#__PURE__*/ _jsx(DashLayout, {
         c: c,
         title: "Pages",
         siteName: siteName,
         currentPath: "/dash/pages",
-        children: /*#__PURE__*/ _jsx(PagesListContent, {
-            pages: pages
+        children: /*#__PURE__*/ _jsx(UnifiedPagesContent, {
+            navItems: navItems,
+            otherPages: otherPages
         })
     }));
 });
@@ -201,6 +450,80 @@ pagesRoutes.get("/new", async (c)=>{
         children: /*#__PURE__*/ _jsx(NewPageContent, {})
     }));
 });
+// New link form
+pagesRoutes.get("/links/new", async (c)=>{
+    const siteName = await getSiteName(c);
+    return c.html(/*#__PURE__*/ _jsx(DashLayout, {
+        c: c,
+        title: "New Link",
+        siteName: siteName,
+        currentPath: "/dash/pages",
+        children: /*#__PURE__*/ _jsx(LinkFormContent, {})
+    }));
+});
+// Create link
+pagesRoutes.post("/links", async (c)=>{
+    const body = await c.req.json();
+    if (!body.label || !body.url) {
+        return dsToast("Label and URL are required", "error");
+    }
+    await c.var.services.navItems.create({
+        type: "link",
+        label: body.label,
+        url: body.url
+    });
+    return dsRedirect("/dash/pages");
+});
+// Reorder nav items (must be before /:id to avoid matching)
+pagesRoutes.post("/reorder", async (c)=>{
+    const body = await c.req.json();
+    if (!Array.isArray(body.ids)) {
+        return dsToast("Invalid request", "error");
+    }
+    await c.var.services.navItems.reorder(body.ids);
+    return dsToast("Order saved");
+});
+// Edit link form
+pagesRoutes.get("/links/:id/edit", async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.notFound();
+    const item = await c.var.services.navItems.getById(id);
+    if (!item) return c.notFound();
+    const siteName = await getSiteName(c);
+    return c.html(/*#__PURE__*/ _jsx(DashLayout, {
+        c: c,
+        title: "Edit Link",
+        siteName: siteName,
+        currentPath: "/dash/pages",
+        children: /*#__PURE__*/ _jsx(LinkFormContent, {
+            item: item,
+            isEdit: true
+        })
+    }));
+});
+// Update link
+pagesRoutes.post("/links/:id", async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.notFound();
+    const body = await c.req.json();
+    if (!body.label || !body.url) {
+        return dsToast("Label and URL are required", "error");
+    }
+    const updated = await c.var.services.navItems.update(id, {
+        label: body.label,
+        url: body.url
+    });
+    if (!updated) return c.notFound();
+    return dsRedirect("/dash/pages");
+});
+// Delete link
+pagesRoutes.post("/links/:id/delete", async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (!isNaN(id)) {
+        await c.var.services.navItems.delete(id);
+    }
+    return dsRedirect("/dash/pages");
+});
 // Create page
 pagesRoutes.post("/", async (c)=>{
     const body = await c.req.json();
@@ -212,6 +535,32 @@ pagesRoutes.post("/", async (c)=>{
     });
     return dsRedirect(`/dash/pages/${page.id}`);
 });
+// Add page to navigation
+pagesRoutes.post("/:id/add-to-nav", async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (isNaN(id)) return c.notFound();
+    const page = await c.var.services.pages.getById(id);
+    if (!page) return c.notFound();
+    await c.var.services.navItems.create({
+        type: "page",
+        label: page.title || page.slug,
+        url: `/${page.slug}`,
+        pageId: page.id
+    });
+    return dsRedirect("/dash/pages");
+});
+// Remove page from navigation (keeps the page, deletes the nav item)
+pagesRoutes.post("/:id/remove-from-nav", async (c)=>{
+    const pageId = parseInt(c.req.param("id"), 10);
+    if (isNaN(pageId)) return c.notFound();
+    // Find nav item by pageId
+    const navItems = await c.var.services.navItems.list();
+    const navItem = navItems.find((item)=>item.pageId === pageId);
+    if (navItem) {
+        await c.var.services.navItems.delete(navItem.id);
+    }
+    return dsRedirect("/dash/pages");
+});
 // View single page
 pagesRoutes.get("/:id", async (c)=>{
     const id = parseInt(c.req.param("id"), 10);

package/dist/routes/dash/posts.js

@@ -4,8 +4,8 @@ import { getSiteName } from "../../lib/config.js";
  * Dashboard Posts Routes
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { DashLayout } from "../../theme/layouts/index.js";
-import { PostForm, PostList, CrudPageHeader, ActionButtons } from "../../theme/components/index.js";
+import { DashLayout } from "../../ui/layouts/DashLayout.js";
+import { PostForm, PostList, CrudPageHeader, ActionButtons } from "../../ui/dash/index.js";
 import * as sqid from "../../lib/sqid.js";
 import { dsRedirect } from "../../lib/sse.js";
 export const postsRoutes = new Hono();
@@ -88,7 +88,6 @@ postsRoutes.post("/", async (c)=>{
         status: body.status,
         featured: body.featured,
         pinned: body.pinned,
-        slug: body.slug || undefined,
         url: body.url || undefined,
         quoteText: body.quoteText || undefined,
         rating: body.rating || undefined,
@@ -106,7 +105,7 @@ function ViewPostContent({ post }) {
         id: "y28hnO",
         message: "Post"
     });
-    const permalink = post.slug ? `/${post.slug}` : `/p/${sqid.encode(post.id)}`;
+    const permalink = post.path ? `/${post.path}` : `/p/${sqid.encode(post.id)}`;
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
             /*#__PURE__*/ _jsxs("div", {
@@ -224,7 +223,6 @@ postsRoutes.post("/:id", async (c)=>{
         status: body.status,
         featured: body.featured,
         pinned: body.pinned,
-        slug: body.slug || null,
         url: body.url || null,
         quoteText: body.quoteText || null,
         rating: body.rating || null,

package/dist/routes/dash/redirects.js

@@ -4,8 +4,8 @@ import { getSiteName } from "../../lib/config.js";
  * Dashboard Redirects Routes
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { DashLayout } from "../../theme/layouts/index.js";
-import { EmptyState, ListItemRow, ActionButtons, CrudPageHeader } from "../../theme/components/index.js";
+import { DashLayout } from "../../ui/layouts/DashLayout.js";
+import { EmptyState, ListItemRow, ActionButtons, CrudPageHeader } from "../../ui/dash/index.js";
 import { dsRedirect } from "../../lib/sse.js";
 export const redirectsRoutes = new Hono();
 function RedirectsListContent({ redirects }) {