@jant/core 0.3.7 → 0.3.9

package/src/routes/dash/navigation.tsx

@@ -0,0 +1,306 @@
+import { getSiteName } from "../../lib/config.js";
+/**
+ * Dashboard Navigation Links Routes
+ */
+
+import { Hono } from "hono";
+import { useLingui } from "@lingui/react/macro";
+import type { Bindings, NavigationLink } from "../../types.js";
+import type { AppVariables } from "../../app.js";
+import { DashLayout } from "../../theme/layouts/index.js";
+import {
+  EmptyState,
+  ListItemRow,
+  ActionButtons,
+  CrudPageHeader,
+} from "../../theme/components/index.js";
+import { dsRedirect, dsToast } from "../../lib/sse.js";
+
+type Env = { Bindings: Bindings; Variables: AppVariables };
+
+export const navigationRoutes = new Hono<Env>();
+
+function NavigationListContent({ links }: { links: NavigationLink[] }) {
+  const { t } = useLingui();
+
+  return (
+    <>
+      <CrudPageHeader
+        title={t({
+          message: "Navigation",
+          comment: "@context: Dashboard heading",
+        })}
+        ctaLabel={t({
+          message: "New Link",
+          comment: "@context: Button to create new navigation link",
+        })}
+        ctaHref="/dash/navigation/new"
+      />
+
+      {links.length === 0 ? (
+        <EmptyState
+          message={t({
+            message: "No navigation links configured.",
+            comment: "@context: Empty state message",
+          })}
+          ctaText={t({
+            message: "New Link",
+            comment: "@context: Button to create new navigation link",
+          })}
+          ctaHref="/dash/navigation/new"
+        />
+      ) : (
+        <>
+          <div id="nav-links-list" class="flex flex-col divide-y">
+            {links.map((link) => (
+              <ListItemRow
+                key={link.id}
+                actions={
+                  <ActionButtons
+                    editHref={`/dash/navigation/${link.id}/edit`}
+                    editLabel={t({
+                      message: "Edit",
+                      comment: "@context: Button to edit navigation link",
+                    })}
+                    deleteAction={`/dash/navigation/${link.id}/delete`}
+                    deleteLabel={t({
+                      message: "Delete",
+                      comment: "@context: Button to delete navigation link",
+                    })}
+                  />
+                }
+              >
+                <div
+                  class="flex items-center gap-3 cursor-grab"
+                  data-id={link.id}
+                >
+                  <span class="text-muted-foreground select-none">⠿</span>
+                  <div class="flex items-center gap-2">
+                    <span class="font-medium">{link.label}</span>
+                    <code class="text-sm text-muted-foreground bg-muted px-1 rounded">
+                      {link.url}
+                    </code>
+                  </div>
+                </div>
+              </ListItemRow>
+            ))}
+          </div>
+
+          {/* SortableJS is initialized by client.ts via lib/nav-reorder.ts */}
+        </>
+      )}
+    </>
+  );
+}
+
+function NavigationFormContent({
+  link,
+  isEdit,
+}: {
+  link?: NavigationLink;
+  isEdit?: boolean;
+}) {
+  const { t } = useLingui();
+  const title = isEdit
+    ? t({ message: "Edit Link", comment: "@context: Page heading" })
+    : t({ message: "New Link", comment: "@context: Page heading" });
+
+  const signals = JSON.stringify({
+    label: link?.label ?? "",
+    url: link?.url ?? "",
+  }).replace(/</g, "\\u003c");
+
+  const action = isEdit ? `/dash/navigation/${link?.id}` : "/dash/navigation";
+
+  return (
+    <>
+      <h1 class="text-2xl font-semibold mb-6">{title}</h1>
+
+      <form
+        data-signals={signals}
+        data-on:submit__prevent={`@post('${action}')`}
+        class="flex flex-col gap-4 max-w-lg"
+      >
+        <div class="field">
+          <label class="label">
+            {t({
+              message: "Label",
+              comment: "@context: Navigation link form field",
+            })}
+          </label>
+          <input
+            type="text"
+            data-bind="label"
+            class="input"
+            placeholder="Home"
+            required
+          />
+          <p class="text-xs text-muted-foreground mt-1">
+            {t({
+              message: "Display text for the link",
+              comment: "@context: Navigation label help text",
+            })}
+          </p>
+        </div>
+
+        <div class="field">
+          <label class="label">
+            {t({
+              message: "URL",
+              comment: "@context: Navigation link form field",
+            })}
+          </label>
+          <input
+            type="text"
+            data-bind="url"
+            class="input"
+            placeholder="/archive or https://..."
+            required
+          />
+          <p class="text-xs text-muted-foreground mt-1">
+            {t({
+              message:
+                "Path (e.g. /archive) or full URL (e.g. https://example.com)",
+              comment: "@context: Navigation URL help text",
+            })}
+          </p>
+        </div>
+
+        <div class="flex gap-2">
+          <button type="submit" class="btn">
+            {isEdit
+              ? t({
+                  message: "Save Changes",
+                  comment: "@context: Button to save edited navigation link",
+                })
+              : t({
+                  message: "Create Link",
+                  comment: "@context: Button to save new navigation link",
+                })}
+          </button>
+          <a href="/dash/navigation" class="btn-outline">
+            {t({
+              message: "Cancel",
+              comment: "@context: Button to cancel form",
+            })}
+          </a>
+        </div>
+      </form>
+    </>
+  );
+}
+
+// List navigation links
+navigationRoutes.get("/", async (c) => {
+  const siteName = await getSiteName(c);
+  const links = await c.var.services.navigationLinks.list();
+
+  return c.html(
+    <DashLayout
+      c={c}
+      title="Navigation"
+      siteName={siteName}
+      currentPath="/dash/navigation"
+    >
+      <NavigationListContent links={links} />
+    </DashLayout>,
+  );
+});
+
+// New link form
+navigationRoutes.get("/new", async (c) => {
+  const siteName = await getSiteName(c);
+
+  return c.html(
+    <DashLayout
+      c={c}
+      title="New Link"
+      siteName={siteName}
+      currentPath="/dash/navigation"
+    >
+      <NavigationFormContent />
+    </DashLayout>,
+  );
+});
+
+// Create link
+navigationRoutes.post("/", async (c) => {
+  const body = await c.req.json<{ label: string; url: string }>();
+
+  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<{ ids: number[] }>();
+
+  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(
+    <DashLayout
+      c={c}
+      title="Edit Link"
+      siteName={siteName}
+      currentPath="/dash/navigation"
+    >
+      <NavigationFormContent link={link} isEdit />
+    </DashLayout>,
+  );
+});
+
+// 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<{ label: string; url: string }>();
+
+  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/src/routes/dash/posts.tsx

@@ -168,6 +168,7 @@ function EditPostContent({
   mediaAttachments,
   r2PublicUrl,
   imageTransformUrl,
+  s3PublicUrl,
   collections,
   postCollectionIds,
 }: {
@@ -175,6 +176,7 @@ function EditPostContent({
   mediaAttachments: Media[];
   r2PublicUrl?: string;
   imageTransformUrl?: string;
+  s3PublicUrl?: string;
   collections: Collection[];
   postCollectionIds: number[];
 }) {
@@ -190,6 +192,7 @@ function EditPostContent({
         mediaAttachments={mediaAttachments}
         r2PublicUrl={r2PublicUrl}
         imageTransformUrl={imageTransformUrl}
+        s3PublicUrl={s3PublicUrl}
         collections={collections}
         postCollectionIds={postCollectionIds}
       />
@@ -232,6 +235,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);
@@ -249,6 +253,7 @@ postsRoutes.get("/:id/edit", async (c) => {
         mediaAttachments={mediaAttachments}
         r2PublicUrl={r2PublicUrl}
         imageTransformUrl={imageTransformUrl}
+        s3PublicUrl={s3PublicUrl}
         collections={collections}
         postCollectionIds={postCollectionIds}
       />

package/src/routes/feed/rss.ts

@@ -7,7 +7,7 @@ import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 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";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -20,6 +20,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", "quiet"],
@@ -40,7 +41,7 @@ rssRoutes.get("/", async (c) => {
       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}"/>`
+        ? `\n      <enclosure url="${getMediaUrl(firstMedia.id, firstMedia.storageKey, getPublicUrlForProvider(firstMedia.provider, r2PublicUrl, s3PublicUrl))}" length="${firstMedia.size}" type="${firstMedia.mimeType}"/>`
         : "";
 
       return `

package/src/routes/pages/archive.tsx

@@ -1,4 +1,3 @@
-import { getSiteName } from "../../lib/config.js";
 /**
  * Archive Page Route
  *
@@ -9,11 +8,12 @@ import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
 import type { Bindings, Post, PostType } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-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";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -102,7 +102,7 @@ function ArchiveContent({
     : t({ message: "Archive", comment: "@context: Archive page title" });
 
   return (
-    <div class="container py-8">
+    <div>
       <header class="mb-8">
         <h1 class="text-2xl font-semibold">{title}</h1>
 
@@ -202,16 +202,6 @@ function ArchiveContent({
         hasMore={hasMore}
         nextCursor={nextCursor}
       />
-
-      <nav class="mt-4">
-        <a href="/" class="text-sm hover:underline">
-          ←{" "}
-          {t({
-            message: "Back to home",
-            comment: "@context: Navigation link back to home page",
-          })}
-        </a>
-      </nav>
     </div>
   );
 }
@@ -226,7 +216,7 @@ archiveRoutes.get("/", async (c) => {
   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({
@@ -264,15 +254,17 @@ archiveRoutes.get("/", async (c) => {
   }
 
   return c.html(
-    <BaseLayout title={`Archive - ${siteName}`} c={c}>
-      <ArchiveContent
-        displayPosts={displayPosts}
-        hasMore={hasMore}
-        nextCursor={nextCursor}
-        type={type}
-        grouped={grouped}
-        replyCounts={replyCounts}
-      />
+    <BaseLayout title={`Archive - ${navData.siteName}`} c={c}>
+      <SiteLayout {...navData}>
+        <ArchiveContent
+          displayPosts={displayPosts}
+          hasMore={hasMore}
+          nextCursor={nextCursor}
+          type={type}
+          grouped={grouped}
+          replyCounts={replyCounts}
+        />
+      </SiteLayout>
     </BaseLayout>,
   );
 });

package/src/routes/pages/collection.tsx

@@ -1,4 +1,3 @@
-import { getSiteName } from "../../lib/config.js";
 /**
  * Collection Page Route
  */
@@ -7,9 +6,10 @@ import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
 import type { Bindings, Collection, Post } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-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";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -25,7 +25,7 @@ function CollectionContent({
   const { t } = useLingui();
 
   return (
-    <div class="container py-8">
+    <div>
       <header class="mb-8">
         <h1 class="text-2xl font-semibold">{collection.title}</h1>
         {collection.description && (
@@ -70,15 +70,6 @@ function CollectionContent({
           ))
         )}
       </main>
-
-      <nav class="mt-8">
-        <a href="/" class="text-sm hover:underline">
-          {t({
-            message: "← Back to home",
-            comment: "@context: Navigation link",
-          })}
-        </a>
-      </nav>
     </div>
   );
 }
@@ -90,15 +81,17 @@ collectionRoutes.get("/:path", async (c) => {
   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(
     <BaseLayout
-      title={`${collection.title} - ${siteName}`}
+      title={`${collection.title} - ${navData.siteName}`}
       description={collection.description ?? undefined}
       c={c}
     >
-      <CollectionContent collection={collection} posts={posts} />
+      <SiteLayout {...navData}>
+        <CollectionContent collection={collection} posts={posts} />
+      </SiteLayout>
     </BaseLayout>,
   );
 });