@jant/core 0.6.11 → 0.6.12

package/src/preset.css

@@ -182,9 +182,9 @@ html {
   --tw-prose-quote-borders: var(--color-border);
   --tw-prose-captions: var(--color-muted-foreground);
   --tw-prose-kbd: var(--color-foreground);
-  --tw-prose-code: var(--color-foreground);
-  --tw-prose-pre-code: var(--color-muted-foreground);
-  --tw-prose-pre-bg: var(--color-muted);
+  --tw-prose-code: var(--site-code-text);
+  --tw-prose-pre-code: var(--site-code-text);
+  --tw-prose-pre-bg: var(--site-code-block-bg);
   --tw-prose-th-borders: var(--color-border);
   --tw-prose-td-borders: var(--color-border);
   font-family: var(--font-body);
@@ -213,14 +213,12 @@ html {
 
   :where(h2) {
     font-size: var(--type-content-title);
-    font-style: italic;
     margin-top: 2.1rem;
     margin-bottom: 1.4rem;
   }
 
   :where(h3) {
     font-size: var(--type-content-subtitle);
-    font-style: italic;
     margin-top: 2rem;
     margin-bottom: 1.4rem;
   }
@@ -236,12 +234,12 @@ html {
 
   :where(ul, ol) {
     margin: 1.25em 0;
-    padding-left: 1.625em;
+    padding-left: 1.4em;
   }
 
   :where(li, dt) {
-    margin-top: 1.2em;
-    margin-bottom: 1.2em;
+    margin-top: 0.65em;
+    margin-bottom: 0.65em;
   }
 
   /* Normalize li > p so list spacing is controlled by li alone,
@@ -257,18 +255,35 @@ html {
   :where(code, pre code) {
     font-size: var(--type-code);
     line-height: 1.42;
+    color: var(--site-code-text);
     overflow-wrap: break-word;
   }
 
   :where(:not(pre) > code) {
-    padding: 0.1em 0.35em;
-    background-color: var(--site-feed-card-bg);
-    border: 1px solid var(--site-feed-card-border);
-    border-radius: 0.25rem;
+    padding: 0.08em 0.28em;
+    background-color: var(--site-code-bg);
+    border-radius: 0.22em;
+    box-decoration-break: clone;
+    -webkit-box-decoration-break: clone;
+  }
+
+  :where(:not(pre) > code)::before,
+  :where(:not(pre) > code)::after {
+    content: none;
+  }
+
+  :where(pre) {
+    background-color: var(--site-code-block-bg);
+    border: 1px solid var(--site-code-block-border);
+    border-radius: 6px;
   }
 
   :where(pre code) {
     font-size: var(--type-code-block);
+    color: inherit;
+    background: transparent;
+    border: 0;
+    padding: 0;
   }
 
   :where(h1, h2, h3) :where(code) {
@@ -425,6 +440,37 @@ html {
   margin-bottom: 0;
 }
 
+/*
+ * Feed body headings
+ *
+ * In list contexts, the post title owns the card heading level. Authored
+ * headings inside the body should remain visible, but they should read as
+ * sections within the card rather than as peer post titles.
+ */
+[data-post]:not([data-page="post"]) [data-post-body].prose {
+  :where(h1, h2) {
+    font-size: calc(var(--type-content-body) * 1.12);
+    font-weight: var(--fw-medium);
+    margin-top: 1.45rem;
+    margin-bottom: 0.55rem;
+  }
+
+  :where(h3, h4) {
+    font-size: var(--type-content-body);
+    font-weight: var(--fw-medium);
+    margin-top: 1.2rem;
+    margin-bottom: 0.45rem;
+  }
+
+  :where(h5, h6) {
+    font-size: var(--type-secondary);
+    font-weight: var(--fw-medium);
+    color: var(--site-text-secondary);
+    margin-top: 1rem;
+    margin-bottom: 0.35rem;
+  }
+}
+
 /*
  * Detail-page reading prose
  *
@@ -455,12 +501,8 @@ html {
   );
   --tw-prose-captions: var(--site-reading-caption);
   --tw-prose-kbd: var(--site-reading-heading);
-  --tw-prose-code: var(--site-reading-heading);
-  --tw-prose-pre-code: color-mix(
-    in srgb,
-    var(--site-reading-caption) 86%,
-    var(--site-reading-body)
-  );
+  --tw-prose-code: var(--site-code-text);
+  --tw-prose-pre-code: var(--site-code-text);
   --tw-prose-th-borders: color-mix(
     in srgb,
     var(--site-divider) 88%,

package/src/routes/dash/settings.tsx

@@ -75,6 +75,7 @@ import {
   isSyncPending,
   markSyncPending,
   runBackgroundSync,
+  triggerGitHubSyncInline,
 } from "../../lib/github-sync-trigger.js";
 import { buildSyncSiteConfig } from "../../lib/github-sync-site-config.js";
 import {
@@ -117,6 +118,10 @@ function publicPath(c: Context<Env>, path: string): string {
   return toPublicPath(path, c.var.appConfig.sitePathPrefix);
 }
 
+function aboutEditPath(c: Context<Env>): string {
+  return `${publicPath(c, "/about")}?edit=1`;
+}
+
 /**
  * Breadcrumb labels for admin settings pages.
  *
@@ -302,7 +307,10 @@ settingsRoutes.get("/general", async (c) => {
   const dbSiteDescription = allSettings["SITE_DESCRIPTION"] ?? "";
 
   const saved = c.req.query("saved") !== undefined;
-  const navData = await getNavigationData(c);
+  const [navData, aboutPage] = await Promise.all([
+    getNavigationData(c),
+    c.var.services.aboutPage.getStatus(),
+  ]);
   const siteUrlForDisplay =
     appConfig.siteUrl || new URL(publicPath(c, "/"), c.req.url).toString();
 
@@ -356,6 +364,9 @@ settingsRoutes.get("/general", async (c) => {
           noindex={appConfig.noindex}
           demoMode={appConfig.demoMode}
           timezones={TIMEZONES}
+          aboutPage={aboutPage}
+          aboutEditUrl={aboutEditPath(c)}
+          aboutCreateUrl={publicPath(c, "/settings/general/about-page")}
         />
       </>
     ),
@@ -534,6 +545,32 @@ settingsRoutes.post("/general/search", async (c) => {
   );
 });
 
+settingsRoutes.post("/general/about-page", async (c) => {
+  try {
+    await c.var.services.aboutPage.ensurePage();
+    await triggerGitHubSyncInline(c);
+  } catch (error) {
+    if (error instanceof ValidationError) {
+      const wantsJson = c.req.header("accept")?.includes("application/json");
+      if (wantsJson) {
+        return c.json({ error: error.message, code: error.code }, 400);
+      }
+      return c.text(error.message, 400);
+    }
+    throw error;
+  }
+
+  const wantsJson = c.req.header("accept")?.includes("application/json");
+  if (wantsJson) {
+    return c.json({
+      status: "redirect" as const,
+      url: aboutEditPath(c),
+    });
+  }
+
+  return c.redirect(aboutEditPath(c));
+});
+
 // ===========================================================================
 // Avatar
 // ===========================================================================
@@ -743,9 +780,10 @@ settingsRoutes.post("/avatar/display", async (c) => {
 // ===========================================================================
 
 settingsRoutes.get("/navigation", async (c) => {
-  const [navItems, directoryData] = await Promise.all([
+  const [navItems, directoryData, suggestedLinks] = await Promise.all([
     c.var.services.navItems.list(),
     c.var.services.collections.listDirectoryData(),
+    c.var.services.navItems.listSuggestedLinks(),
   ]);
   const navData = await getNavigationData(c);
 
@@ -762,6 +800,7 @@ settingsRoutes.get("/navigation", async (c) => {
         <NavigationContent
           navItems={navItems}
           directoryData={directoryData}
+          suggestedLinks={suggestedLinks}
           mainRssFeed={c.var.appConfig.mainRssFeed}
           siteName={navData.siteName}
           sitePathPrefix={c.var.appConfig.sitePathPrefix}

package/src/routes/pages/__tests__/draft-about-edit.test.ts

@@ -0,0 +1,65 @@
+import { describe, expect, it } from "vitest";
+import { createTestApp } from "../../../__tests__/helpers/app.js";
+import { pageRoutes } from "../page.js";
+
+function createPageTestApp(options: { authenticated?: boolean } = {}) {
+  const testApp = createTestApp(options);
+  const { app } = testApp;
+
+  app.use("*", async (c, next) => {
+    c.set("publicPath", c.req.path);
+    c.set("publicRequestUrl", c.req.url);
+    await next();
+  });
+
+  app.route("/", pageRoutes);
+
+  return testApp;
+}
+
+async function createDraftAbout(
+  services: ReturnType<typeof createTestApp>["services"],
+) {
+  return services.posts.create({
+    format: "note",
+    title: "About",
+    slug: "about",
+    bodyMarkdown: "Draft About body",
+    status: "draft",
+    visibility: "latest_hidden",
+  });
+}
+
+describe("draft About edit route", () => {
+  it("keeps draft About hidden from anonymous edit requests", async () => {
+    const { app, services } = createPageTestApp();
+    await createDraftAbout(services);
+
+    const res = await app.request("/about?edit=1");
+
+    expect(res.status).toBe(404);
+  });
+
+  it("keeps draft About hidden from normal authenticated page requests", async () => {
+    const { app, services } = createPageTestApp({ authenticated: true });
+    await createDraftAbout(services);
+
+    const res = await app.request("/about");
+
+    expect(res.status).toBe(404);
+  });
+
+  it("renders draft About for authenticated edit requests", async () => {
+    const { app, services } = createPageTestApp({ authenticated: true });
+    const post = await createDraftAbout(services);
+
+    const res = await app.request("/about?edit=1");
+
+    expect(res.status).toBe(200);
+    const html = await res.text();
+    expect(html).toContain(`data-post-id="${post.id}"`);
+    expect(html).toContain("data-authenticated");
+    expect(html).not.toContain('rel="canonical"');
+    expect(html).not.toContain("application/ld+json");
+  });
+});

package/src/routes/pages/page.tsx

@@ -23,6 +23,7 @@ import {
   toPublicHref,
   toPublicPath,
 } from "../../lib/url.js";
+import { ABOUT_PAGE_SLUG } from "../../services/about-page.js";
 import { isTextAttachment } from "../../services/media.js";
 import type { Post } from "../../types.js";
 import { renderArchivePage } from "./archive.js";
@@ -186,12 +187,30 @@ async function renderPostWithTextPreview(
   });
 }
 
-async function renderPost(c: Context<Env>, post: Post) {
+function canRenderDraftAboutEditor(
+  c: Context<Env>,
+  fullPath: string,
+  post: Post,
+): boolean {
+  return (
+    post.status === "draft" &&
+    fullPath === ABOUT_PAGE_SLUG &&
+    c.req.query("edit") === "1" &&
+    c.var.isAuthenticated
+  );
+}
+
+async function renderPost(
+  c: Context<Env>,
+  post: Post,
+  options: { allowDraft?: boolean } = {},
+) {
   // Start navData fetch immediately — it's independent of thread/media queries
   const navDataPromise = getNavigationData(c);
   const display = await assemblePostPageDisplay(c, post, {
     // Private-post access is validated before renderPost() is called.
     isAuthenticated: true,
+    allowDraft: options.allowDraft,
   });
   if (!display) {
     return c.notFound();
@@ -208,15 +227,25 @@ async function renderPost(c: Context<Env>, post: Post) {
   return renderPublicPage(c, {
     title: buildPageTitle(meta.title, navData.siteName),
     description: meta.description,
-    canonicalHref,
-    socialImageUrl: display.socialImage?.url,
-    socialImageAlt: display.socialImage?.alt,
-    socialImageWidth: display.socialImage?.width,
-    socialImageHeight: display.socialImage?.height,
-    ogType: "article",
-    articlePublishedTime: display.articlePublishedTime,
-    articleModifiedTime: display.articleModifiedTime,
-    jsonLd: buildPostJsonLd(c, display, meta, canonicalHref, navData.siteName),
+    ...(post.status === "published"
+      ? {
+          canonicalHref,
+          socialImageUrl: display.socialImage?.url,
+          socialImageAlt: display.socialImage?.alt,
+          socialImageWidth: display.socialImage?.width,
+          socialImageHeight: display.socialImage?.height,
+          ogType: "article" as const,
+          articlePublishedTime: display.articlePublishedTime,
+          articleModifiedTime: display.articleModifiedTime,
+          jsonLd: buildPostJsonLd(
+            c,
+            display,
+            meta,
+            canonicalHref,
+            navData.siteName,
+          ),
+        }
+      : {}),
     navData,
     content: (
       <PostPage post={display.postView} threadPosts={display.threadPostViews} />
@@ -350,7 +379,10 @@ pageRoutes.get("/*", async (c) => {
 
   if (resolved.postId) {
     const post = await c.var.services.posts.getById(resolved.postId);
-    if (!post || post.status === "draft") return c.notFound();
+    if (!post) return c.notFound();
+
+    const allowDraft = canRenderDraftAboutEditor(c, fullPath, post);
+    if (post.status === "draft" && !allowDraft) return c.notFound();
 
     if (post.visibility === "private") {
       const navData = await getNavigationData(c);
@@ -368,7 +400,7 @@ pageRoutes.get("/*", async (c) => {
       }
     }
 
-    return renderPost(c, post);
+    return renderPost(c, post, { allowDraft });
   }
 
   if (resolved.collectionId) {

package/src/services/__tests__/about-page.test.ts

@@ -0,0 +1,116 @@
+import { describe, expect, it, beforeEach } from "vitest";
+import {
+  createTestDatabase,
+  DEFAULT_TEST_SITE_ID,
+} from "../../__tests__/helpers/db.js";
+import type { Database } from "../../db/index.js";
+import { createAboutPageService } from "../about-page.js";
+import { createCollectionService } from "../collection.js";
+import { createPathService } from "../path.js";
+import { createPostService } from "../post.js";
+
+const ABOUT_BODY = JSON.stringify({
+  type: "doc",
+  content: [
+    {
+      type: "paragraph",
+      content: [{ type: "text", text: "About this site." }],
+    },
+  ],
+});
+
+describe("AboutPageService", () => {
+  let aboutPage: ReturnType<typeof createAboutPageService>;
+  let posts: ReturnType<typeof createPostService>;
+  let collections: ReturnType<typeof createCollectionService>;
+
+  beforeEach(() => {
+    const testDb = createTestDatabase();
+    const db = testDb.db as unknown as Database;
+    const paths = createPathService(db, DEFAULT_TEST_SITE_ID);
+    posts = createPostService(
+      db,
+      { slugIdLength: 5 },
+      DEFAULT_TEST_SITE_ID,
+      paths,
+    );
+    collections = createCollectionService(db, DEFAULT_TEST_SITE_ID, paths);
+    aboutPage = createAboutPageService({
+      paths,
+      posts,
+      collections,
+    });
+  });
+
+  it("reports a missing About page when /about is unused", async () => {
+    await expect(aboutPage.getStatus()).resolves.toMatchObject({
+      state: "missing",
+      path: "/about",
+    });
+  });
+
+  it("recognizes a post at /about as the About page", async () => {
+    const post = await posts.create({
+      format: "note",
+      title: "About",
+      slug: "about",
+      visibility: "latest_hidden",
+      body: ABOUT_BODY,
+    });
+
+    await expect(aboutPage.getStatus()).resolves.toMatchObject({
+      state: "ready",
+      post: {
+        id: post.id,
+        title: "About",
+        visibility: "latest_hidden",
+      },
+    });
+  });
+
+  it("creates a hidden About page when /about is unused", async () => {
+    const post = await aboutPage.ensurePage();
+    expect(post).toMatchObject({
+      title: "About",
+      status: "published",
+      visibility: "latest_hidden",
+    });
+
+    await expect(aboutPage.getStatus()).resolves.toMatchObject({
+      state: "ready",
+      post: {
+        id: post.id,
+        title: "About",
+        status: "published",
+        visibility: "latest_hidden",
+      },
+    });
+  });
+
+  it("reports a conflict when a collection owns /about", async () => {
+    const collection = await collections.create({
+      title: "About",
+      slug: "about",
+    });
+
+    await expect(aboutPage.getStatus()).resolves.toMatchObject({
+      state: "conflict",
+      conflict: {
+        targetType: "collection",
+        id: collection.id,
+        title: "About",
+      },
+    });
+  });
+
+  it("rejects About creation when another item owns /about", async () => {
+    await collections.create({
+      title: "About",
+      slug: "about",
+    });
+
+    await expect(aboutPage.ensurePage()).rejects.toThrow(
+      "/about is already used.",
+    );
+  });
+});