@jant/core 0.3.34 → 0.3.36

package/src/routes/api/upload.ts

@@ -138,7 +138,7 @@ uploadApiRoutes.post("/", async (c) => {
   if (!storage) {
     const errorText = i18n._(
       msg({
-        message: "Storage not configured",
+        message: "File storage isn't set up. Check your server config.",
         comment: "@context: Error when file storage is not set up",
       }),
     );
@@ -154,7 +154,7 @@ uploadApiRoutes.post("/", async (c) => {
   if (!file) {
     const errorText = i18n._(
       msg({
-        message: "No file provided",
+        message: "No file selected. Choose a file to upload.",
         comment: "@context: Error when no file was selected for upload",
       }),
     );
@@ -165,7 +165,9 @@ uploadApiRoutes.post("/", async (c) => {
   }
 
   // Validate file type and size
-  const uploadError = validateUploadFile(file);
+  const uploadError = validateUploadFile(file, {
+    maxFileSizeMB: c.var.appConfig.uploadMaxFileSize,
+  });
   if (uploadError) {
     if (wantsSSE(c)) {
       return sseUploadError(c, uploadError);
@@ -215,7 +217,7 @@ uploadApiRoutes.post("/", async (c) => {
         await stream.toast(
           i18n._(
             msg({
-              message: "Upload successful!",
+              message: "File uploaded.",
               comment: "@context: Toast after successful file upload",
             }),
           ),
@@ -243,7 +245,7 @@ uploadApiRoutes.post("/", async (c) => {
 
     const errorText = i18n._(
       msg({
-        message: "Upload failed. Please try again.",
+        message: "Upload didn't go through. Try again in a moment.",
         comment: "@context: Error when file upload fails",
       }),
     );

package/src/routes/auth/reset.tsx

@@ -37,7 +37,7 @@ const ResetContent: FC<{ token: string }> = ({ token }) => {
           </h2>
           <p>
             {t({
-              message: "Enter your new password.",
+              message: "Choose a new password.",
               comment: "@context: Password reset page description",
             })}
           </p>
@@ -118,7 +118,7 @@ const ResetErrorContent: FC = () => {
         <header>
           <h2>
             {t({
-              message: "Invalid or Expired Link",
+              message: "This Link Has Expired",
               comment: "@context: Password reset error heading",
             })}
           </h2>
@@ -127,7 +127,7 @@ const ResetErrorContent: FC = () => {
           <p class="text-muted-foreground">
             {t({
               message:
-                "This password reset link is invalid or has expired. Please generate a new one.",
+                "This reset link is no longer valid. Request a new one to continue.",
               comment: "@context: Password reset error description",
             })}
           </p>
@@ -175,7 +175,8 @@ resetRoutes.post("/reset", async (c) => {
       parsed.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment:
             "@context: Fallback validation error for password reset form",
         }),

package/src/routes/auth/setup.tsx

@@ -146,7 +146,8 @@ setupRoutes.post("/setup", async (c) => {
       parsed.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment: "@context: Fallback validation error for setup form",
         }),
       );
@@ -159,7 +160,7 @@ setupRoutes.post("/setup", async (c) => {
     return dsToast(
       i18n._(
         msg({
-          message: "AUTH_SECRET not configured",
+          message: "Auth secret is missing. Check your environment variables.",
           comment:
             "@context: Error toast when authentication secret is missing from server config",
         }),
@@ -177,7 +178,8 @@ setupRoutes.post("/setup", async (c) => {
       return dsToast(
         i18n._(
           msg({
-            message: "Failed to create account",
+            message:
+              "Couldn't create your account. Check the details and try again.",
             comment: "@context: Error toast when account creation fails",
           }),
         ),
@@ -195,19 +197,13 @@ setupRoutes.post("/setup", async (c) => {
       }
     }
 
+    // Seed default navigation items (order: Collections, About, Archive, RSS, Dashboard)
     await c.var.services.navItems.create({
       type: "link",
       label: "Collections",
       url: "/c",
     });
-    // Seed default navigation items
-    await c.var.services.navItems.create({
-      type: "link",
-      label: "Archive",
-      url: "/archive",
-    });
 
-    // Seed default About page
     const aboutPage = await c.var.services.pages.create({
       slug: "about",
       title: "About",
@@ -228,6 +224,24 @@ setupRoutes.post("/setup", async (c) => {
       pageId: aboutPage.id,
     });
 
+    await c.var.services.navItems.create({
+      type: "link",
+      label: "Archive",
+      url: "/archive",
+    });
+
+    await c.var.services.navItems.create({
+      type: "system",
+      label: "RSS",
+      url: "/feed",
+    });
+
+    await c.var.services.navItems.create({
+      type: "system",
+      label: "Dashboard",
+      url: "/dash",
+    });
+
     return dsRedirect("/signin?setup");
   } catch (err) {
     // eslint-disable-next-line no-console -- Error logging is intentional
@@ -235,7 +249,8 @@ setupRoutes.post("/setup", async (c) => {
     return dsToast(
       i18n._(
         msg({
-          message: "Failed to create account",
+          message:
+            "Couldn't create your account. Check the details and try again.",
           comment: "@context: Error toast when account creation fails",
         }),
       ),

package/src/routes/auth/signin.tsx

@@ -40,7 +40,8 @@ const SigninContent: FC<{
           {demoEmail && demoPassword && (
             <p class="text-muted-foreground text-sm mb-4">
               {t({
-                message: "Demo account pre-filled. Just click Sign In.",
+                message:
+                  "Demo credentials are pre-filled — hit Sign In to continue.",
                 comment:
                   "@context: Hint shown on signin page when demo credentials are pre-filled",
               })}
@@ -110,9 +111,9 @@ signinRoutes.get("/signin", async (c) => {
   const isReset = c.req.query("reset") !== undefined;
   let toast: { message: string } | undefined;
   if (isSetup) {
-    toast = { message: "Account created successfully. Please sign in." };
+    toast = { message: "Account created. Sign in to get started." };
   } else if (isReset) {
-    toast = { message: "Password reset successfully. Please sign in." };
+    toast = { message: "Password reset. Sign in with your new password." };
   }
 
   return c.html(
@@ -132,7 +133,7 @@ signinRoutes.post("/signin", async (c) => {
     return dsToast(
       i18n._(
         msg({
-          message: "Auth not configured",
+          message: "Authentication isn't set up. Check your server config.",
           comment:
             "@context: Error toast when authentication system is unavailable",
         }),
@@ -149,7 +150,8 @@ signinRoutes.post("/signin", async (c) => {
       parsed.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment: "@context: Fallback validation error for sign-in form",
         }),
       );
@@ -165,12 +167,13 @@ signinRoutes.post("/signin", async (c) => {
       headers: c.req.raw.headers,
     });
 
-    return dsRedirect("/dash", { headers });
+    return dsRedirect("/", { headers });
   } catch {
     return dsToast(
       i18n._(
         msg({
-          message: "Invalid email or password",
+          message:
+            "Wrong email or password. Check your credentials and try again.",
           comment: "@context: Error toast when sign-in credentials are wrong",
         }),
       ),

package/src/routes/compose.tsx

@@ -94,7 +94,8 @@ composeRoutes.post("/", async (c) => {
       result.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment: "@context: Fallback validation error for compose form",
         }),
       );
@@ -121,16 +122,24 @@ composeRoutes.post("/", async (c) => {
     }
   }
 
-  const post = await c.var.services.posts.create({
-    format: data.format,
-    title: data.title || undefined,
-    body: data.body || undefined,
-    status: data.status ?? "published",
-    url: data.url || undefined,
-    quoteText: data.quoteText || undefined,
-    rating: data.rating || undefined,
-    collectionIds: data.collectionIds?.length ? data.collectionIds : undefined,
-  });
+  const post = await c.var.services.posts.create(
+    {
+      format: data.format,
+      title: data.title || undefined,
+      body: data.body || undefined,
+      status: data.status ?? "published",
+      url: data.url || undefined,
+      quoteText: data.quoteText || undefined,
+      rating: data.rating || undefined,
+      collectionIds: data.collectionIds?.length
+        ? data.collectionIds
+        : undefined,
+    },
+    {
+      maxParagraphs: c.var.appConfig.summaryMaxParagraphs,
+      maxChars: c.var.appConfig.summaryMaxChars,
+    },
+  );
 
   // Attach media if provided
   if (data.mediaIds && data.mediaIds.length > 0) {

package/src/routes/dash/__tests__/settings-avatar.test.ts

@@ -57,7 +57,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const avatarKey = await settingsService.get("SITE_AVATAR");
@@ -72,7 +77,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const mediaList = await mediaService.list();
@@ -89,7 +99,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file, faviconIco: fakeIcoData.buffer },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const stored = await settingsService.get("SITE_FAVICON_ICO");
@@ -105,7 +120,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file, appleTouchIcon: appleTouchData },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const stored = await settingsService.get("SITE_FAVICON_APPLE_TOUCH");
@@ -120,7 +140,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const stored = await settingsService.get("SITE_FAVICON_VERSION");
@@ -135,19 +160,29 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
       await expect(
         settingsService.uploadAvatar(
           { file },
-          { media: mediaService, storage, storageProvider: "r2" },
+          {
+            media: mediaService,
+            storage,
+            storageProvider: "r2",
+            maxFileSizeMB: 500,
+          },
         ),
       ).rejects.toThrow("File type not allowed");
     });
 
     it("throws ValidationError for oversized file", async () => {
       const storage = createMockStorage();
-      const file = createMockFile("big.png", "image/png", 20 * 1024 * 1024);
+      const file = createMockFile("big.png", "image/png", 501 * 1024 * 1024);
 
       await expect(
         settingsService.uploadAvatar(
           { file },
-          { media: mediaService, storage, storageProvider: "r2" },
+          {
+            media: mediaService,
+            storage,
+            storageProvider: "r2",
+            maxFileSizeMB: 500,
+          },
         ),
       ).rejects.toThrow("File too large");
     });

package/src/routes/dash/index.tsx

@@ -93,7 +93,13 @@ dashIndexRoutes.get("/", async (c) => {
   ]);
 
   return c.html(
-    <DashLayout c={c} title="Dashboard" siteName={siteName} currentPath="/dash">
+    <DashLayout
+      c={c}
+      title="Dashboard"
+      siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
+      currentPath="/dash"
+    >
       <DashboardContent
         publishedCount={publishedCount}
         draftCount={draftCount}

package/src/routes/dash/media.tsx

@@ -29,6 +29,7 @@ mediaRoutes.get("/", async (c) => {
       c={c}
       title="Media"
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/media"
     >
       <MediaListContent
@@ -36,6 +37,7 @@ mediaRoutes.get("/", async (c) => {
         r2PublicUrl={c.var.appConfig.r2PublicUrl}
         imageTransformUrl={c.var.appConfig.imageTransformUrl}
         s3PublicUrl={c.var.appConfig.s3PublicUrl}
+        uploadMaxFileSize={c.var.appConfig.uploadMaxFileSize}
       />
     </DashLayout>,
   );
@@ -108,6 +110,7 @@ mediaRoutes.get("/:id", async (c) => {
       c={c}
       title={media.originalName}
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/media"
     >
       <ViewMediaContent

package/src/routes/dash/pages.tsx

@@ -114,6 +114,7 @@ pagesRoutes.get("/", async (c) => {
       c={c}
       title="Pages"
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/pages"
     >
       <PagesContent pages={pages} />
@@ -128,6 +129,7 @@ pagesRoutes.get("/new", async (c) => {
       c={c}
       title="New Page"
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/pages"
     >
       <NewPageContent />
@@ -144,7 +146,8 @@ pagesRoutes.post("/", async (c) => {
       parsed.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment: "@context: Fallback validation error for page form",
         }),
       );
@@ -174,6 +177,7 @@ pagesRoutes.get("/:id", async (c) => {
       c={c}
       title={page.title || "Page"}
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/pages"
     >
       <ViewPageContent page={page} />
@@ -194,6 +198,7 @@ pagesRoutes.get("/:id/edit", async (c) => {
       c={c}
       title={`Edit: ${page.title || "Page"}`}
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/pages"
     >
       <EditPageContent page={page} />
@@ -213,7 +218,8 @@ pagesRoutes.post("/:id", async (c) => {
       parsed.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment: "@context: Fallback validation error for page form",
         }),
       );

package/src/routes/dash/posts.tsx

@@ -81,6 +81,7 @@ postsRoutes.get("/", async (c) => {
       c={c}
       title="Posts"
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/posts"
     >
       <PostsListContent posts={postViews} />
@@ -98,6 +99,7 @@ postsRoutes.get("/new", async (c) => {
       c={c}
       title="New Post"
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/posts"
     >
       <NewPostContent collections={collections} />
@@ -120,7 +122,7 @@ postsRoutes.post("/", async (c) => {
     title: body.title || undefined,
     body: body.body,
     status: body.status,
-    featured: body.featured,
+    visibility: body.visibility,
     pinned: body.pinned,
     url: body.url || undefined,
     quoteText: body.quoteText || undefined,
@@ -236,6 +238,7 @@ postsRoutes.get("/:id", async (c) => {
       c={c}
       title={pageTitle}
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/posts"
     >
       <ViewPostContent post={postView} />
@@ -265,6 +268,7 @@ postsRoutes.get("/:id/edit", async (c) => {
       c={c}
       title={`Edit: ${post.title || "Post"}`}
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/posts"
     >
       <EditPostContent
@@ -299,7 +303,7 @@ postsRoutes.post("/:id", async (c) => {
     title: body.title || null,
     body: body.body || null,
     status: body.status,
-    featured: body.featured,
+    visibility: body.visibility,
     pinned: body.pinned,
     url: body.url || null,
     quoteText: body.quoteText || null,

package/src/routes/dash/redirects.tsx

@@ -11,7 +11,6 @@ import type { Bindings, Redirect } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
 import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import { EmptyState, ListItemRow, ActionButtons } from "../../ui/dash/index.js";
-import { SettingsNav } from "../../ui/dash/settings/SettingsNav.js";
 import { dsRedirect } from "../../lib/sse.js";
 import { RedirectTypeSchema, parseValidated } from "../../lib/schemas.js";
 
@@ -30,8 +29,6 @@ function RedirectsListContent({ redirects }: { redirects: Redirect[] }) {
 
   return (
     <>
-      <SettingsNav currentTab="redirects" />
-
       <div class="flex items-center justify-between mb-6">
         <h2 class="text-lg font-medium">
           {t({
@@ -50,7 +47,8 @@ function RedirectsListContent({ redirects }: { redirects: Redirect[] }) {
       {redirects.length === 0 ? (
         <EmptyState
           message={t({
-            message: "No redirects configured.",
+            message:
+              "No redirects yet. Create one to forward traffic from old URLs.",
             comment: "@context: Empty state message",
           })}
           ctaText={t({
@@ -76,7 +74,7 @@ function RedirectsListContent({ redirects }: { redirects: Redirect[] }) {
             >
               <div class="flex items-center gap-2">
                 <code class="text-sm bg-muted px-1 rounded">{r.fromPath}</code>
-                <span class="text-muted-foreground">→</span>
+                <span class="text-muted-foreground">&rarr;</span>
                 <code class="text-sm bg-muted px-1 rounded">{r.toPath}</code>
                 <span class="badge-outline">{r.type}</span>
               </div>
@@ -93,8 +91,6 @@ function NewRedirectContent() {
 
   return (
     <>
-      <SettingsNav currentTab="redirects" />
-
       <h2 class="text-lg font-medium mb-6">
         {t({ message: "New Redirect", comment: "@context: Page heading" })}
       </h2>
@@ -203,6 +199,12 @@ function NewRedirectContent() {
   );
 }
 
+const BREADCRUMB = {
+  parent: "Settings",
+  parentHref: "/dash/settings",
+  current: "Redirects",
+};
+
 // List redirects
 redirectsRoutes.get("/", async (c) => {
   const siteName = c.var.appConfig.siteName;
@@ -211,9 +213,11 @@ redirectsRoutes.get("/", async (c) => {
   return c.html(
     <DashLayout
       c={c}
-      title="Settings"
+      title="Redirects"
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/settings"
+      breadcrumb={BREADCRUMB}
     >
       <RedirectsListContent redirects={redirects} />
     </DashLayout>,
@@ -227,9 +231,11 @@ redirectsRoutes.get("/new", async (c) => {
   return c.html(
     <DashLayout
       c={c}
-      title="Settings"
+      title="Redirects"
       siteName={siteName}
+      siteAvatarUrl={c.var.appConfig.siteAvatarUrl}
       currentPath="/dash/settings"
+      breadcrumb={BREADCRUMB}
     >
       <NewRedirectContent />
     </DashLayout>,