@jant/core 0.3.20 → 0.3.22

package/src/routes/dash/collections.tsx

@@ -106,6 +106,7 @@ function NewCollectionContent() {
       <form
         data-signals="{title: '', path: '', description: ''}"
         data-on:submit__prevent="@post('/dash/collections')"
+        data-indicator="_loading"
         class="flex flex-col gap-4 max-w-lg"
       >
         <div class="field">
@@ -166,11 +167,20 @@ function NewCollectionContent() {
         </div>
 
         <div class="flex gap-2">
-          <button type="submit" class="btn">
-            {t({
-              message: "Create Collection",
-              comment: "@context: Button to save new collection",
-            })}
+          <button type="submit" class="btn" data-attr-disabled="$_loading">
+            <span data-show="!$_loading">
+              {t({
+                message: "Create Collection",
+                comment: "@context: Button to save new collection",
+              })}
+            </span>
+            <span data-show="$_loading">
+              {t({
+                message: "Processing...",
+                comment:
+                  "@context: Loading text shown on submit button while request is in progress",
+              })}
+            </span>
           </button>
           <a href="/dash/collections" class="btn-outline">
             {t({
@@ -297,6 +307,7 @@ function EditCollectionContent({ collection }: { collection: Collection }) {
       <form
         data-signals={signals}
         data-on:submit__prevent={`@post('/dash/collections/${collection.id}')`}
+        data-indicator="_loading"
         class="flex flex-col gap-4 max-w-lg"
       >
         <div class="field">
@@ -335,11 +346,20 @@ function EditCollectionContent({ collection }: { collection: Collection }) {
         </div>
 
         <div class="flex gap-2">
-          <button type="submit" class="btn">
-            {t({
-              message: "Update Collection",
-              comment: "@context: Button to save collection changes",
-            })}
+          <button type="submit" class="btn" data-attr-disabled="$_loading">
+            <span data-show="!$_loading">
+              {t({
+                message: "Update Collection",
+                comment: "@context: Button to save collection changes",
+              })}
+            </span>
+            <span data-show="$_loading">
+              {t({
+                message: "Processing...",
+                comment:
+                  "@context: Loading text shown on submit button while request is in progress",
+              })}
+            </span>
           </button>
           <a href={`/dash/collections/${collection.id}`} class="btn-outline">
             {t({

package/src/routes/dash/navigation.tsx

@@ -119,6 +119,7 @@ function NavigationFormContent({
       <form
         data-signals={signals}
         data-on:submit__prevent={`@post('${action}')`}
+        data-indicator="_loading"
         class="flex flex-col gap-4 max-w-lg"
       >
         <div class="field">
@@ -167,16 +168,25 @@ function NavigationFormContent({
         </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 type="submit" class="btn" data-attr-disabled="$_loading">
+            <span data-show="!$_loading">
+              {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",
+                  })}
+            </span>
+            <span data-show="$_loading">
+              {t({
+                message: "Processing...",
+                comment:
+                  "@context: Loading text shown on submit button while request is in progress",
+              })}
+            </span>
           </button>
           <a href="/dash/navigation" class="btn-outline">
             {t({

package/src/routes/dash/redirects.tsx

@@ -90,6 +90,7 @@ function NewRedirectContent() {
       <form
         data-signals="{fromPath: '', toPath: '', type: '301'}"
         data-on:submit__prevent="@post('/dash/redirects')"
+        data-indicator="_loading"
         class="flex flex-col gap-4 max-w-lg"
       >
         <div class="field">
@@ -157,11 +158,20 @@ function NewRedirectContent() {
         </div>
 
         <div class="flex gap-2">
-          <button type="submit" class="btn">
-            {t({
-              message: "Create Redirect",
-              comment: "@context: Button to save new redirect",
-            })}
+          <button type="submit" class="btn" data-attr-disabled="$_loading">
+            <span data-show="!$_loading">
+              {t({
+                message: "Create Redirect",
+                comment: "@context: Button to save new redirect",
+              })}
+            </span>
+            <span data-show="$_loading">
+              {t({
+                message: "Processing...",
+                comment:
+                  "@context: Loading text shown on submit button while request is in progress",
+              })}
+            </span>
           </button>
           <a href="/dash/redirects" class="btn-outline">
             {t({

package/src/routes/dash/settings.tsx

@@ -123,6 +123,7 @@ function GeneralContent({
         <form
           data-signals={generalSignals}
           data-on:submit__prevent="@post('/dash/settings')"
+          data-indicator="_loading"
         >
           <div class="card">
             <header>
@@ -188,11 +189,20 @@ function GeneralContent({
             </section>
           </div>
 
-          <button type="submit" class="btn mt-4">
-            {t({
-              message: "Save Settings",
-              comment: "@context: Button to save settings",
-            })}
+          <button type="submit" class="btn mt-4" data-attr-disabled="$_loading">
+            <span data-show="!$_loading">
+              {t({
+                message: "Save Settings",
+                comment: "@context: Button to save settings",
+              })}
+            </span>
+            <span data-show="$_loading">
+              {t({
+                message: "Processing...",
+                comment:
+                  "@context: Loading text shown on submit button while request is in progress",
+              })}
+            </span>
           </button>
         </form>
       </div>
@@ -346,6 +356,7 @@ function AccountContent({ userName }: { userName: string }) {
         <form
           data-signals={profileSignals}
           data-on:submit__prevent="@post('/dash/settings/account')"
+          data-indicator="_profileLoading"
         >
           <div class="card">
             <header>
@@ -374,17 +385,31 @@ function AccountContent({ userName }: { userName: string }) {
             </section>
           </div>
 
-          <button type="submit" class="btn mt-4">
-            {t({
-              message: "Save Profile",
-              comment: "@context: Button to save profile",
-            })}
+          <button
+            type="submit"
+            class="btn mt-4"
+            data-attr-disabled="$_profileLoading"
+          >
+            <span data-show="!$_profileLoading">
+              {t({
+                message: "Save Profile",
+                comment: "@context: Button to save profile",
+              })}
+            </span>
+            <span data-show="$_profileLoading">
+              {t({
+                message: "Processing...",
+                comment:
+                  "@context: Loading text shown on submit button while request is in progress",
+              })}
+            </span>
           </button>
         </form>
 
         <form
           data-signals="{currentPassword: '', newPassword: '', confirmPassword: ''}"
           data-on:submit__prevent="@post('/dash/settings/password')"
+          data-indicator="_passwordLoading"
         >
           <div class="card">
             <header>
@@ -448,11 +473,24 @@ function AccountContent({ userName }: { userName: string }) {
             </section>
           </div>
 
-          <button type="submit" class="btn mt-4">
-            {t({
-              message: "Change Password",
-              comment: "@context: Button to change password",
-            })}
+          <button
+            type="submit"
+            class="btn mt-4"
+            data-attr-disabled="$_passwordLoading"
+          >
+            <span data-show="!$_passwordLoading">
+              {t({
+                message: "Change Password",
+                comment: "@context: Button to change password",
+              })}
+            </span>
+            <span data-show="$_passwordLoading">
+              {t({
+                message: "Processing...",
+                comment:
+                  "@context: Loading text shown on submit button while request is in progress",
+              })}
+            </span>
           </button>
         </form>
       </div>

package/src/routes/feed/rss.ts

@@ -3,24 +3,27 @@
  */
 
 import { Hono } from "hono";
-import type { Bindings } from "../../types.js";
+import type { Context } from "hono";
+import type { Bindings, FeedData } 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, getPublicUrlForProvider } from "../../lib/image.js";
+import { defaultRssRenderer, defaultAtomRenderer } from "../../lib/feed.js";
+import { getSiteLanguage } from "../../lib/config.js";
+import { buildMediaMap } from "../../lib/media-helpers.js";
+import { createMediaContext, toPostViews } from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const rssRoutes = new Hono<Env>();
 
-// RSS 2.0 Feed - main feed at /feed
-rssRoutes.get("/", async (c) => {
+/**
+ * Build FeedData from the Hono context.
+ */
+async function buildFeedData(c: Context<Env>): Promise<FeedData> {
   const all = await c.var.services.settings.getAll();
   const siteName = all["SITE_NAME"] ?? "Jant";
   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 siteLanguage = await getSiteLanguage(c);
 
   const posts = await c.var.services.posts.list({
     visibility: ["featured", "quiet"],
@@ -29,45 +32,41 @@ rssRoutes.get("/", async (c) => {
 
   // Batch load media for enclosures
   const postIds = posts.map((p) => p.id);
-  const mediaMap = await c.var.services.media.getByPostIds(postIds);
-
-  const items = posts
-    .map((post) => {
-      const link = `${siteUrl}/p/${sqid.encode(post.id)}`;
-      const title = post.title || `Post #${post.id}`;
-      const pubDate = new Date(post.publishedAt * 1000).toUTCString();
-
-      // 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.storageKey, getPublicUrlForProvider(firstMedia.provider, r2PublicUrl, s3PublicUrl))}" length="${firstMedia.size}" type="${firstMedia.mimeType}"/>`
-        : "";
+  const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
+  const mediaCtx = createMediaContext(c);
+  const mediaMap = buildMediaMap(
+    rawMediaMap,
+    mediaCtx.r2PublicUrl,
+    mediaCtx.imageTransformUrl,
+    mediaCtx.s3PublicUrl,
+  );
+
+  // Transform to PostView[] with media
+  const postViews = toPostViews(
+    posts.map((p) => ({
+      ...p,
+      mediaAttachments: mediaMap.get(p.id) ?? [],
+    })),
+    mediaCtx,
+  );
+
+  return {
+    siteName,
+    siteDescription,
+    siteUrl,
+    siteLanguage,
+    posts: postViews,
+  };
+}
 
-      return `
-    <item>
-      <title><![CDATA[${escapeXml(title)}]]></title>
-      <link>${link}</link>
-      <guid isPermaLink="true">${link}</guid>
-      <pubDate>${pubDate}</pubDate>
-      <description><![CDATA[${post.contentHtml || ""}]]></description>${enclosure}
-    </item>`;
-    })
-    .join("");
+// RSS 2.0 Feed - main feed at /feed
+rssRoutes.get("/", async (c) => {
+  const feedData = await buildFeedData(c);
 
-  const rss = `<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>${escapeXml(siteName)}</title>
-    <link>${siteUrl}</link>
-    <description>${escapeXml(siteDescription)}</description>
-    <language>en</language>
-    <atom:link href="${siteUrl}/feed" rel="self" type="application/rss+xml"/>
-    ${items}
-  </channel>
-</rss>`;
+  const renderer = c.var.config.theme?.feed?.rss ?? defaultRssRenderer;
+  const xml = renderer(feedData);
 
-  return new Response(rss, {
+  return new Response(xml, {
     headers: {
       "Content-Type": "application/rss+xml; charset=utf-8",
     },
@@ -76,60 +75,14 @@ rssRoutes.get("/", async (c) => {
 
 // Atom Feed
 rssRoutes.get("/atom.xml", async (c) => {
-  const all = await c.var.services.settings.getAll();
-  const siteName = all["SITE_NAME"] ?? "Jant";
-  const siteDescription = all["SITE_DESCRIPTION"] ?? "";
-  const siteUrl = c.env.SITE_URL;
-
-  const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet"],
-    limit: 50,
-  });
+  const feedData = await buildFeedData(c);
 
-  const entries = posts
-    .map((post) => {
-      const link = `${siteUrl}/p/${sqid.encode(post.id)}`;
-      const title = post.title || `Post #${post.id}`;
-      const updated = time.toISOString(post.updatedAt);
-      const published = time.toISOString(post.publishedAt);
+  const renderer = c.var.config.theme?.feed?.atom ?? defaultAtomRenderer;
+  const xml = renderer(feedData);
 
-      return `
-  <entry>
-    <title>${escapeXml(title)}</title>
-    <link href="${link}" rel="alternate"/>
-    <id>${link}</id>
-    <published>${published}</published>
-    <updated>${updated}</updated>
-    <content type="html"><![CDATA[${post.contentHtml || ""}]]></content>
-  </entry>`;
-    })
-    .join("");
-
-  const now = time.toISOString(time.now());
-
-  const atom = `<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <title>${escapeXml(siteName)}</title>
-  <subtitle>${escapeXml(siteDescription)}</subtitle>
-  <link href="${siteUrl}" rel="alternate"/>
-  <link href="${siteUrl}/feed/atom.xml" rel="self"/>
-  <id>${siteUrl}/</id>
-  <updated>${now}</updated>
-  ${entries}
-</feed>`;
-
-  return new Response(atom, {
+  return new Response(xml, {
     headers: {
       "Content-Type": "application/atom+xml; charset=utf-8",
     },
   });
 });
-
-function escapeXml(str: string): string {
-  return str
-    .replace(/&/g, "&amp;")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&apos;");
-}

package/src/routes/feed/sitemap.ts

@@ -5,8 +5,8 @@
 import { Hono } from "hono";
 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 { defaultSitemapRenderer } from "../../lib/feed.js";
+import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -21,36 +21,14 @@ sitemapRoutes.get("/sitemap.xml", async (c) => {
     limit: 1000,
   });
 
-  const urls = posts
-    .map((post) => {
-      const loc = `${siteUrl}/p/${sqid.encode(post.id)}`;
-      const lastmod = time.toISOString(post.updatedAt).split("T")[0];
-      const priority = post.visibility === "featured" ? "0.8" : "0.6";
+  // Transform to PostView[]
+  const mediaCtx = createMediaContext(c);
+  const postViews = toPostViewsFromPosts(posts, mediaCtx);
 
-      return `
-  <url>
-    <loc>${loc}</loc>
-    <lastmod>${lastmod}</lastmod>
-    <priority>${priority}</priority>
-  </url>`;
-    })
-    .join("");
+  const renderer = c.var.config.theme?.feed?.sitemap ?? defaultSitemapRenderer;
+  const xml = renderer({ siteUrl, posts: postViews });
 
-  // Add homepage
-  const homepageUrl = `
-  <url>
-    <loc>${siteUrl}/</loc>
-    <priority>1.0</priority>
-    <changefreq>daily</changefreq>
-  </url>`;
-
-  const sitemap = `<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  ${homepageUrl}
-  ${urls}
-</urlset>`;
-
-  return new Response(sitemap, {
+  return new Response(xml, {
     headers: {
       "Content-Type": "application/xml; charset=utf-8",
     },