@jant/core 0.3.7 → 0.3.9

package/dist/theme/layouts/SiteLayout.js

@@ -0,0 +1,160 @@
+/**
+ * Site Layout
+ *
+ * Two-column layout for public pages with sidebar navigation.
+ * On mobile, uses a slide-out drawer menu.
+ */ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "hono/jsx/jsx-runtime";
+/**
+ * Determine if a navigation link is active based on the current path.
+ *
+ * @param linkUrl - The link's URL
+ * @param currentPath - The current page path
+ * @returns Whether the link should be shown as active
+ */ function isLinkActive(linkUrl, currentPath) {
+    // External links are never active
+    if (linkUrl.startsWith("http://") || linkUrl.startsWith("https://")) {
+        return false;
+    }
+    // Exact match for home
+    if (linkUrl === "/") {
+        return currentPath === "/";
+    }
+    // Prefix match for other internal links
+    return currentPath === linkUrl || currentPath.startsWith(linkUrl + "/");
+}
+/**
+ * Check if a URL is external
+ */ function isExternalUrl(url) {
+    return url.startsWith("http://") || url.startsWith("https://");
+}
+/**
+ * Render navigation links with dot indicator for active state.
+ */ function NavLinks({ navigationLinks, currentPath }) {
+    return /*#__PURE__*/ _jsx(_Fragment, {
+        children: navigationLinks.map((link)=>{
+            const active = isLinkActive(link.url, currentPath);
+            const external = isExternalUrl(link.url);
+            return /*#__PURE__*/ _jsxs("a", {
+                href: link.url,
+                class: `text-sm flex items-center gap-2 py-0.5 ${active ? "text-primary font-medium" : "text-muted-foreground hover:text-foreground"}`,
+                ...external ? {
+                    target: "_blank",
+                    rel: "noopener noreferrer"
+                } : {},
+                children: [
+                    /*#__PURE__*/ _jsx("span", {
+                        class: `size-1.5 rounded-full shrink-0 ${active ? "bg-primary" : "bg-transparent"}`
+                    }),
+                    link.label,
+                    external && /*#__PURE__*/ _jsx("span", {
+                        class: "ml-1 text-xs opacity-50",
+                        children: "↗"
+                    })
+                ]
+            }, link.id);
+        })
+    });
+}
+export const SiteLayout = ({ siteName, navigationLinks, currentPath, children })=>{
+    return /*#__PURE__*/ _jsxs("div", {
+        class: "container py-8 md:flex md:gap-12",
+        "data-signals": JSON.stringify({
+            _drawerOpen: false
+        }),
+        children: [
+            /*#__PURE__*/ _jsxs("div", {
+                class: "flex items-center justify-between mb-6 md:hidden",
+                children: [
+                    /*#__PURE__*/ _jsx("a", {
+                        href: "/",
+                        class: "text-xl font-semibold",
+                        children: siteName
+                    }),
+                    /*#__PURE__*/ _jsx("button", {
+                        "data-on:click": "$_drawerOpen = true",
+                        class: "p-2 -mr-2 text-muted-foreground hover:text-foreground",
+                        "aria-label": "Open menu",
+                        children: /*#__PURE__*/ _jsx("svg", {
+                            class: "size-5",
+                            fill: "none",
+                            viewBox: "0 0 24 24",
+                            "stroke-width": "1.5",
+                            stroke: "currentColor",
+                            children: /*#__PURE__*/ _jsx("path", {
+                                "stroke-linecap": "round",
+                                "stroke-linejoin": "round",
+                                d: "M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"
+                            })
+                        })
+                    })
+                ]
+            }),
+            /*#__PURE__*/ _jsx("div", {
+                class: "fixed inset-0 bg-black/50 z-40 opacity-0 pointer-events-none transition-opacity duration-300 ease-in-out md:hidden",
+                "data-class": "{'opacity-100 pointer-events-auto': $_drawerOpen, 'opacity-0 pointer-events-none': !$_drawerOpen}",
+                "data-on:click": "$_drawerOpen = false"
+            }),
+            /*#__PURE__*/ _jsxs("aside", {
+                class: "fixed inset-y-0 left-0 w-64 bg-background z-50 p-6 overflow-y-auto shadow-lg -translate-x-full transition-transform duration-300 ease-in-out md:hidden",
+                "data-class": "{'translate-x-0': $_drawerOpen, '-translate-x-full': !$_drawerOpen}",
+                children: [
+                    /*#__PURE__*/ _jsxs("div", {
+                        class: "flex items-center justify-between mb-8",
+                        children: [
+                            /*#__PURE__*/ _jsx("a", {
+                                href: "/",
+                                class: "text-xl font-semibold",
+                                children: siteName
+                            }),
+                            /*#__PURE__*/ _jsx("button", {
+                                "data-on:click": "$_drawerOpen = false",
+                                class: "p-2 -mr-2 text-muted-foreground hover:text-foreground",
+                                "aria-label": "Close menu",
+                                children: /*#__PURE__*/ _jsx("svg", {
+                                    class: "size-5",
+                                    fill: "none",
+                                    viewBox: "0 0 24 24",
+                                    "stroke-width": "1.5",
+                                    stroke: "currentColor",
+                                    children: /*#__PURE__*/ _jsx("path", {
+                                        "stroke-linecap": "round",
+                                        "stroke-linejoin": "round",
+                                        d: "M6 18L18 6M6 6l12 12"
+                                    })
+                                })
+                            })
+                        ]
+                    }),
+                    /*#__PURE__*/ _jsx("nav", {
+                        class: "flex flex-col gap-0.5",
+                        children: /*#__PURE__*/ _jsx(NavLinks, {
+                            navigationLinks: navigationLinks,
+                            currentPath: currentPath
+                        })
+                    })
+                ]
+            }),
+            /*#__PURE__*/ _jsxs("aside", {
+                class: "hidden md:block md:w-48 md:shrink-0 md:sticky md:top-8 md:self-start",
+                children: [
+                    /*#__PURE__*/ _jsx("a", {
+                        href: "/",
+                        class: "text-xl font-semibold block mb-20",
+                        children: siteName
+                    }),
+                    /*#__PURE__*/ _jsx("nav", {
+                        class: "flex flex-col gap-0.5",
+                        children: /*#__PURE__*/ _jsx(NavLinks, {
+                            navigationLinks: navigationLinks,
+                            currentPath: currentPath
+                        })
+                    })
+                ]
+            }),
+            /*#__PURE__*/ _jsx("main", {
+                class: "flex-1 min-w-0",
+                children: children
+            })
+        ]
+    });
+};

package/dist/theme/layouts/index.js

@@ -1,2 +1,3 @@
 export { BaseLayout } from "./BaseLayout.js";
 export { DashLayout } from "./DashLayout.js";
+export { SiteLayout } from "./SiteLayout.js";

package/dist/types/sortablejs.d.js

@@ -0,0 +1,5 @@
+/**
+ * Minimal type declarations for sortablejs
+ *
+ * Only covers the API surface used by nav-reorder.ts.
+ */ 

package/dist/types.js

@@ -38,6 +38,10 @@ export const MAX_MEDIA_ATTACHMENTS = 20;
     ],
     page: null
 };
+export const STORAGE_DRIVERS = [
+    "r2",
+    "s3"
+];
 export const VISIBILITY_LEVELS = [
     "featured",
     "quiet",
@@ -94,5 +98,33 @@ export const VISIBILITY_LEVELS = [
     DEMO_PASSWORD: {
         defaultValue: "",
         envOnly: true
+    },
+    STORAGE_DRIVER: {
+        defaultValue: "r2",
+        envOnly: true
+    },
+    S3_ENDPOINT: {
+        defaultValue: "",
+        envOnly: true
+    },
+    S3_BUCKET: {
+        defaultValue: "",
+        envOnly: true
+    },
+    S3_ACCESS_KEY_ID: {
+        defaultValue: "",
+        envOnly: true
+    },
+    S3_SECRET_ACCESS_KEY: {
+        defaultValue: "",
+        envOnly: true
+    },
+    S3_REGION: {
+        defaultValue: "auto",
+        envOnly: true
+    },
+    S3_PUBLIC_URL: {
+        defaultValue: "",
+        envOnly: true
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jant/core",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "A modern, open-source microblogging platform built on Cloudflare Workers",
   "type": "module",
   "bin": {
@@ -31,12 +31,14 @@
     "access": "public"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.987.0",
     "@lingui/core": "^5.9.0",
     "basecoat-css": "^0.3.10",
     "better-auth": "^1.4.18",
     "drizzle-orm": "^0.45.1",
     "hono": "^4.11.7",
     "marked": "^17.0.1",
+    "sortablejs": "^1.15.6",
     "sqids": "^0.3.0",
     "uuidv7": "^1.1.0",
     "vite-ssr-components": "^0.5.2",
@@ -90,7 +92,7 @@
     "build": "pnpm build:lib",
     "build:lib": "swc src -d dist --strip-leading-paths --ignore '**/__tests__/**' && pnpm build:types",
     "build:types": "tsc -p tsconfig.build.json",
-    "typecheck": "tsc --noEmit && tsc -p tsconfig.client.json",
+    "typecheck": "tsc --noEmit",
     "db:generate": "drizzle-kit generate",
     "i18n:extract": "lingui extract",
     "i18n:compile": "lingui compile --typescript",

package/src/__tests__/helpers/app.ts

@@ -58,6 +58,7 @@ export function createTestApp(options: TestAppOptions = {}) {
 
     c.set("services", services as AppVariables["services"]);
     c.set("config", {});
+    c.set("storage", null);
 
     if (options.authenticated) {
       // Mock auth that always returns a session

package/src/__tests__/helpers/db.ts

@@ -89,6 +89,26 @@ export function createTestDatabase(options?: { fts?: boolean }) {
     if (trimmed) sqlite.exec(trimmed);
   }
 
+  // Apply navigation links migration
+  const migration3 = readFileSync(
+    resolve(MIGRATIONS_DIR, "0003_add_navigation_links.sql"),
+    "utf-8",
+  );
+  for (const sql of migration3.split("--> statement-breakpoint")) {
+    const trimmed = sql.trim();
+    if (trimmed) sqlite.exec(trimmed);
+  }
+
+  // Apply storage provider migration
+  const migration4 = readFileSync(
+    resolve(MIGRATIONS_DIR, "0004_add_storage_provider.sql"),
+    "utf-8",
+  );
+  for (const sql of migration4.split("--> statement-breakpoint")) {
+    const trimmed = sql.trim();
+    if (trimmed) sqlite.exec(trimmed);
+  }
+
   const db = drizzle(sqlite, { schema });
 
   return { db, sqlite };

package/src/app.tsx

@@ -29,11 +29,13 @@ import { mediaRoutes as dashMediaRoutes } from "./routes/dash/media.js";
 import { settingsRoutes as dashSettingsRoutes } from "./routes/dash/settings.js";
 import { redirectsRoutes as dashRedirectsRoutes } from "./routes/dash/redirects.js";
 import { collectionsRoutes as dashCollectionsRoutes } from "./routes/dash/collections.js";
+import { navigationRoutes as dashNavigationRoutes } from "./routes/dash/navigation.js";
 
 // Routes - API
 import { postsApiRoutes } from "./routes/api/posts.js";
 import { uploadApiRoutes } from "./routes/api/upload.js";
 import { searchApiRoutes } from "./routes/api/search.js";
+import { timelineApiRoutes } from "./routes/api/timeline.js";
 
 // Routes - Feed
 import { rssRoutes } from "./routes/feed/rss.js";
@@ -47,6 +49,7 @@ import { requireOnboarding } from "./middleware/onboarding.js";
 import { BaseLayout } from "./theme/layouts/index.js";
 import { dsRedirect, dsToast } from "./lib/sse.js";
 import { getAvailableThemes, buildThemeStyle } from "./lib/theme.js";
+import { createStorageDriver, type StorageDriver } from "./lib/storage.js";
 
 // Extend Hono's context variables
 export interface AppVariables {
@@ -54,6 +57,7 @@ export interface AppVariables {
   auth: Auth;
   config: JantConfig;
   themeStyle: string;
+  storage: StorageDriver | null;
 }
 
 export type App = Hono<{ Bindings: Bindings; Variables: AppVariables }>;
@@ -93,6 +97,7 @@ export function createApp(config: JantConfig = {}): App {
     const services = createServices(db, session as unknown as D1Database);
     c.set("services", services);
     c.set("config", config);
+    c.set("storage", createStorageDriver(c.env));
 
     if (c.env.AUTH_SECRET) {
       const auth = createAuth(session as unknown as D1Database, {
@@ -168,6 +173,7 @@ export function createApp(config: JantConfig = {}): App {
 
   // API Routes
   app.route("/api/posts", postsApiRoutes);
+  app.route("/api/timeline", timelineApiRoutes);
 
   // Setup page component
   const SetupContent: FC = () => {
@@ -660,13 +666,15 @@ export function createApp(config: JantConfig = {}): App {
   app.route("/dash/settings", dashSettingsRoutes);
   app.route("/dash/redirects", dashRedirectsRoutes);
   app.route("/dash/collections", dashCollectionsRoutes);
+  app.route("/dash/navigation", dashNavigationRoutes);
   // API routes
   app.route("/api/upload", uploadApiRoutes);
   app.route("/api/search", searchApiRoutes);
 
-  // Media files from R2 (UUIDv7-based URLs with extension)
+  // Media files from storage (UUIDv7-based URLs with extension)
   app.get("/media/:idWithExt", async (c) => {
-    if (!c.env.R2) {
+    const storage = c.var.storage;
+    if (!storage) {
       return c.notFound();
     }
 
@@ -679,16 +687,13 @@ export function createApp(config: JantConfig = {}): App {
       return c.notFound();
     }
 
-    const object = await c.env.R2.get(media.r2Key);
+    const object = await storage.get(media.storageKey);
     if (!object) {
       return c.notFound();
     }
 
     const headers = new Headers();
-    headers.set(
-      "Content-Type",
-      object.httpMetadata?.contentType || media.mimeType,
-    );
+    headers.set("Content-Type", object.contentType || media.mimeType);
     headers.set("Cache-Control", "public, max-age=31536000, immutable");
 
     return new Response(object.body, { headers });

package/src/client.ts

@@ -11,3 +11,4 @@ import "./vendor/datastar.js";
 import "basecoat-css/all";
 import "./lib/image-processor.js";
 import "./lib/media-upload.js";
+import "./lib/nav-reorder.js";

package/src/db/migrations/0003_add_navigation_links.sql

@@ -0,0 +1,8 @@
+CREATE TABLE `navigation_links` (
+	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
+	`label` text NOT NULL,
+	`url` text NOT NULL,
+	`position` integer DEFAULT 0 NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL
+);

package/src/db/migrations/0004_add_storage_provider.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `media` ADD COLUMN `provider` text NOT NULL DEFAULT 'r2';
+--> statement-breakpoint
+ALTER TABLE `media` RENAME COLUMN `r2_key` TO `storage_key`;