@jant/core 0.3.7 → 0.3.9

package/dist/routes/dash/navigation.js

@@ -0,0 +1,274 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "hono/jsx/jsx-runtime";
+import { getSiteName } from "../../lib/config.js";
+/**
+ * Dashboard Navigation Links 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 { dsRedirect, dsToast } from "../../lib/sse.js";
+export const navigationRoutes = new Hono();
+function NavigationListContent({ links }) {
+    const { i18n: $__i18n, _: $__ } = $_useLingui();
+    return /*#__PURE__*/ _jsxs(_Fragment, {
+        children: [
+            /*#__PURE__*/ _jsx(CrudPageHeader, {
+                title: $__i18n._({
+                    id: "UxKoFf",
+                    message: "Navigation"
+                }),
+                ctaLabel: $__i18n._({
+                    id: "aaGV/9",
+                    message: "New Link"
+                }),
+                ctaHref: "/dash/navigation/new"
+            }),
+            links.length === 0 ? /*#__PURE__*/ _jsx(EmptyState, {
+                message: $__i18n._({
+                    id: "wdGjkd",
+                    message: "No navigation links configured."
+                }),
+                ctaText: $__i18n._({
+                    id: "aaGV/9",
+                    message: "New Link"
+                }),
+                ctaHref: "/dash/navigation/new"
+            }) : /*#__PURE__*/ _jsx(_Fragment, {
+                children: /*#__PURE__*/ _jsx("div", {
+                    id: "nav-links-list",
+                    class: "flex flex-col divide-y",
+                    children: links.map((link)=>/*#__PURE__*/ _jsx(ListItemRow, {
+                            actions: /*#__PURE__*/ _jsx(ActionButtons, {
+                                editHref: `/dash/navigation/${link.id}/edit`,
+                                editLabel: $__i18n._({
+                                    id: "ePK91l",
+                                    message: "Edit"
+                                }),
+                                deleteAction: `/dash/navigation/${link.id}/delete`,
+                                deleteLabel: $__i18n._({
+                                    id: "cnGeoo",
+                                    message: "Delete"
+                                })
+                            }),
+                            children: /*#__PURE__*/ _jsxs("div", {
+                                class: "flex items-center gap-3 cursor-grab",
+                                "data-id": link.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: link.label
+                                            }),
+                                            /*#__PURE__*/ _jsx("code", {
+                                                class: "text-sm text-muted-foreground bg-muted px-1 rounded",
+                                                children: link.url
+                                            })
+                                        ]
+                                    })
+                                ]
+                            })
+                        }, link.id))
+                })
+            })
+        ]
+    });
+}
+function NavigationFormContent({ link, 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: link?.label ?? "",
+        url: link?.url ?? ""
+    }).replace(/</g, "\\u003c");
+    const action = isEdit ? `/dash/navigation/${link?.id}` : "/dash/navigation";
+    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}')`,
+                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__*/ _jsx("button", {
+                                type: "submit",
+                                class: "btn",
+                                children: isEdit ? $__i18n._({
+                                    id: "IUwGEM",
+                                    message: "Save Changes"
+                                }) : $__i18n._({
+                                    id: "kd7eBB",
+                                    message: "Create Link"
+                                })
+                            }),
+                            /*#__PURE__*/ _jsx("a", {
+                                href: "/dash/navigation",
+                                class: "btn-outline",
+                                children: $__i18n._({
+                                    id: "dEgA5A",
+                                    message: "Cancel"
+                                })
+                            })
+                        ]
+                    })
+                ]
+            })
+        ]
+    });
+}
+// List navigation links
+navigationRoutes.get("/", async (c)=>{
+    const siteName = await getSiteName(c);
+    const links = await c.var.services.navigationLinks.list();
+    return c.html(/*#__PURE__*/ _jsx(DashLayout, {
+        c: c,
+        title: "Navigation",
+        siteName: siteName,
+        currentPath: "/dash/navigation",
+        children: /*#__PURE__*/ _jsx(NavigationListContent, {
+            links: links
+        })
+    }));
+});
+// New link form
+navigationRoutes.get("/new", async (c)=>{
+    const siteName = await getSiteName(c);
+    return c.html(/*#__PURE__*/ _jsx(DashLayout, {
+        c: c,
+        title: "New Link",
+        siteName: siteName,
+        currentPath: "/dash/navigation",
+        children: /*#__PURE__*/ _jsx(NavigationFormContent, {})
+    }));
+});
+// Create link
+navigationRoutes.post("/", 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.navigationLinks.create({
+        label: body.label,
+        url: body.url
+    });
+    return dsRedirect("/dash/navigation");
+});
+// Reorder links (must be before /:id to avoid "reorder" matching as :id)
+navigationRoutes.post("/reorder", async (c)=>{
+    const body = await c.req.json();
+    if (!Array.isArray(body.ids)) {
+        return dsToast("Invalid request", "error");
+    }
+    await c.var.services.navigationLinks.reorder(body.ids);
+    return dsToast("Order saved");
+});
+// Edit link form
+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 siteName = await getSiteName(c);
+    return c.html(/*#__PURE__*/ _jsx(DashLayout, {
+        c: c,
+        title: "Edit Link",
+        siteName: siteName,
+        currentPath: "/dash/navigation",
+        children: /*#__PURE__*/ _jsx(NavigationFormContent, {
+            link: link,
+            isEdit: true
+        })
+    }));
+});
+// Update link
+navigationRoutes.post("/: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.navigationLinks.update(id, {
+        label: body.label,
+        url: body.url
+    });
+    if (!updated) return c.notFound();
+    return dsRedirect("/dash/navigation");
+});
+// Delete link
+navigationRoutes.post("/:id/delete", async (c)=>{
+    const id = parseInt(c.req.param("id"), 10);
+    if (!isNaN(id)) {
+        await c.var.services.navigationLinks.delete(id);
+    }
+    return dsRedirect("/dash/navigation");
+});

package/dist/routes/dash/posts.js

@@ -148,7 +148,7 @@ function ViewPostContent({ post }) {
         ]
     });
 }
-function EditPostContent({ post, mediaAttachments, r2PublicUrl, imageTransformUrl, collections, postCollectionIds }) {
+function EditPostContent({ post, mediaAttachments, r2PublicUrl, imageTransformUrl, s3PublicUrl, collections, postCollectionIds }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
@@ -165,6 +165,7 @@ function EditPostContent({ post, mediaAttachments, r2PublicUrl, imageTransformUr
                 mediaAttachments: mediaAttachments,
                 r2PublicUrl: r2PublicUrl,
                 imageTransformUrl: imageTransformUrl,
+                s3PublicUrl: s3PublicUrl,
                 collections: collections,
                 postCollectionIds: postCollectionIds
             })
@@ -199,6 +200,7 @@ postsRoutes.get("/:id/edit", async (c)=>{
     const mediaAttachments = await c.var.services.media.getByPostId(post.id);
     const r2PublicUrl = c.env.R2_PUBLIC_URL;
     const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+    const s3PublicUrl = c.env.S3_PUBLIC_URL;
     const collections = await c.var.services.collections.list();
     const postCollections = await c.var.services.collections.getCollectionsForPost(post.id);
     const postCollectionIds = postCollections.map((col)=>col.id);
@@ -212,6 +214,7 @@ postsRoutes.get("/:id/edit", async (c)=>{
             mediaAttachments: mediaAttachments,
             r2PublicUrl: r2PublicUrl,
             imageTransformUrl: imageTransformUrl,
+            s3PublicUrl: s3PublicUrl,
             collections: collections,
             postCollectionIds: postCollectionIds
         })

package/dist/routes/feed/rss.js

@@ -3,7 +3,7 @@
  */ import { Hono } from "hono";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
-import { getMediaUrl } from "../../lib/image.js";
+import { getMediaUrl, getPublicUrlForProvider } from "../../lib/image.js";
 export const rssRoutes = new Hono();
 // RSS 2.0 Feed - main feed at /feed
 rssRoutes.get("/", async (c)=>{
@@ -12,6 +12,7 @@ rssRoutes.get("/", async (c)=>{
     const siteDescription = all["SITE_DESCRIPTION"] ?? "";
     const siteUrl = c.env.SITE_URL;
     const r2PublicUrl = c.env.R2_PUBLIC_URL;
+    const s3PublicUrl = c.env.S3_PUBLIC_URL;
     const posts = await c.var.services.posts.list({
         visibility: [
             "featured",
@@ -29,7 +30,7 @@ rssRoutes.get("/", async (c)=>{
         // Add enclosure for first media attachment
         const postMedia = mediaMap.get(post.id);
         const firstMedia = postMedia?.[0];
-        const enclosure = firstMedia ? `\n      <enclosure url="${getMediaUrl(firstMedia.id, firstMedia.r2Key, r2PublicUrl)}" length="${firstMedia.size}" type="${firstMedia.mimeType}"/>` : "";
+        const enclosure = firstMedia ? `\n      <enclosure url="${getMediaUrl(firstMedia.id, firstMedia.storageKey, getPublicUrlForProvider(firstMedia.provider, r2PublicUrl, s3PublicUrl))}" length="${firstMedia.size}" type="${firstMedia.mimeType}"/>` : "";
         return `
     <item>
       <title><![CDATA[${escapeXml(title)}]]></title>

package/dist/routes/pages/archive.js

@@ -1,16 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
-import { getSiteName } from "../../lib/config.js";
 /**
  * Archive Page Route
  *
  * Shows all posts, optionally filtered by type
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { BaseLayout } from "../../theme/layouts/index.js";
+import { BaseLayout, SiteLayout } from "../../theme/layouts/index.js";
 import { Pagination } from "../../theme/components/index.js";
 import { POST_TYPES } from "../../types.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getNavigationData } from "../../lib/navigation.js";
 const PAGE_SIZE = 50;
 export const archiveRoutes = new Hono();
 function getTypeLabel(type) {
@@ -89,7 +89,6 @@ function ArchiveContent({ displayPosts, hasMore, nextCursor, type, grouped, repl
         message: "Archive"
     });
     return /*#__PURE__*/ _jsxs("div", {
-        class: "container py-8",
         children: [
             /*#__PURE__*/ _jsxs("header", {
                 class: "mb-8",
@@ -183,21 +182,6 @@ function ArchiveContent({ displayPosts, hasMore, nextCursor, type, grouped, repl
                 baseUrl: type ? `/archive?type=${type}` : "/archive",
                 hasMore: hasMore,
                 nextCursor: nextCursor
-            }),
-            /*#__PURE__*/ _jsx("nav", {
-                class: "mt-4",
-                children: /*#__PURE__*/ _jsxs("a", {
-                    href: "/",
-                    class: "text-sm hover:underline",
-                    children: [
-                        "←",
-                        " ",
-                        $__i18n._({
-                            id: "x4RuFo",
-                            message: "Back to home"
-                        })
-                    ]
-                })
             })
         ]
     });
@@ -209,7 +193,7 @@ archiveRoutes.get("/", async (c)=>{
     // Parse cursor
     const cursorParam = c.req.query("cursor");
     const cursor = cursorParam ? parseInt(cursorParam, 10) : undefined;
-    const siteName = await getSiteName(c);
+    const navData = await getNavigationData(c);
     // Fetch one extra to check for more
     const posts = await c.var.services.posts.list({
         type,
@@ -240,15 +224,18 @@ archiveRoutes.get("/", async (c)=>{
         grouped.get(key).push(post);
     }
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
-        title: `Archive - ${siteName}`,
+        title: `Archive - ${navData.siteName}`,
         c: c,
-        children: /*#__PURE__*/ _jsx(ArchiveContent, {
-            displayPosts: displayPosts,
-            hasMore: hasMore,
-            nextCursor: nextCursor,
-            type: type,
-            grouped: grouped,
-            replyCounts: replyCounts
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
+            ...navData,
+            children: /*#__PURE__*/ _jsx(ArchiveContent, {
+                displayPosts: displayPosts,
+                hasMore: hasMore,
+                nextCursor: nextCursor,
+                type: type,
+                grouped: grouped,
+                replyCounts: replyCounts
+            })
         })
     }));
 });

package/dist/routes/pages/collection.js

@@ -1,17 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
-import { getSiteName } from "../../lib/config.js";
 /**
  * Collection Page Route
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
-import { BaseLayout } from "../../theme/layouts/index.js";
+import { BaseLayout, SiteLayout } from "../../theme/layouts/index.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getNavigationData } from "../../lib/navigation.js";
 export const collectionRoutes = new Hono();
 function CollectionContent({ collection, posts }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs("div", {
-        class: "container py-8",
         children: [
             /*#__PURE__*/ _jsxs("header", {
                 class: "mb-8",
@@ -61,17 +60,6 @@ function CollectionContent({ collection, posts }) {
                             })
                         ]
                     }, post.id))
-            }),
-            /*#__PURE__*/ _jsx("nav", {
-                class: "mt-8",
-                children: /*#__PURE__*/ _jsx("a", {
-                    href: "/",
-                    class: "text-sm hover:underline",
-                    children: $__i18n._({
-                        id: "biOepV",
-                        message: "← Back to home"
-                    })
-                })
             })
         ]
     });
@@ -81,14 +69,17 @@ collectionRoutes.get("/:path", async (c)=>{
     const collection = await c.var.services.collections.getByPath(path);
     if (!collection) return c.notFound();
     const posts = await c.var.services.collections.getPosts(collection.id);
-    const siteName = await getSiteName(c);
+    const navData = await getNavigationData(c);
     return c.html(/*#__PURE__*/ _jsx(BaseLayout, {
-        title: `${collection.title} - ${siteName}`,
+        title: `${collection.title} - ${navData.siteName}`,
         description: collection.description ?? undefined,
         c: c,
-        children: /*#__PURE__*/ _jsx(CollectionContent, {
-            collection: collection,
-            posts: posts
+        children: /*#__PURE__*/ _jsx(SiteLayout, {
+            ...navData,
+            children: /*#__PURE__*/ _jsx(CollectionContent, {
+                collection: collection,
+                posts: posts
+            })
         })
     }));
 });