@acms-subir/core 0.1.0 → 0.3.0

package/src/pages/search.astro

@@ -6,6 +6,9 @@ import { collectionUrl, tagUrl } from '../lib/content';
 import { authorSlug } from '../lib/schema';
 import { I18N, localeFromPath, localeHomeUrl, normalizePageLocale } from '../lib/i18n';
 import { searchStrings } from '../lib/search-i18n';
+import { CALENDAR, eventUrl } from '../lib/calendar/config';
+import { eventIsPublic, featuredOccurrence, formatOccurrence } from '../lib/calendar/events';
+import { siteLocale } from '../lib/dates';
 
 // The no-JS search surface (the modal's form falls back here). Serves both
 // /search and the locale-prefixed /<locale>/search routes — the locale comes
@@ -20,8 +23,10 @@ const locale = normalizePageLocale(reqLocale);
 const t = searchStrings((reqLocale || siteLang(settings)).slice(0, 2));
 const results = q
   ? await repo.searchPublished(q, { locale })
-  : { posts: [], pages: [], tags: [], authors: [] };
-const total = results.posts.length + results.pages.length + results.tags.length + results.authors.length;
+  : { posts: [], pages: [], events: [], tags: [], authors: [] };
+const calMap = new Map((await repo.listCalendars()).map((c) => [c.id, c]));
+const events = CALENDAR.enabled ? results.events.filter(({ doc }) => eventIsPublic(doc, calMap)).slice(0, 10) : [];
+const total = results.posts.length + results.pages.length + events.length + results.tags.length + results.authors.length;
 ---
 
 <Site title={q ? `${t.label}: ${q}` : t.label} description={`${t.label} · ${settings.siteTitle}`} noindex={Boolean(q)}>
@@ -88,6 +93,26 @@ const total = results.posts.length + results.pages.length + results.tags.length
     </section>
   )}
 
+  {events.length > 0 && (
+    <section class="search-section">
+      <h2>{t.events}</h2>
+      <ul class="post-list">
+        {events.map(({ doc: e, snippet }) => {
+          const o = featuredOccurrence(e, settings, Date.now());
+          return (
+            <li class="post-item">
+              <div>
+                <a href={eventUrl(e.slug)}>{e.title}</a>
+                {o && <span class="search-loc">{formatOccurrence(o, settings.timezone || 'UTC', siteLocale(settings)).range}</span>}
+                {snippet && <p class="post-excerpt" set:html={snippet} />}
+              </div>
+            </li>
+          );
+        })}
+      </ul>
+    </section>
+  )}
+
   {results.tags.length > 0 && (
     <section class="search-section">
       <h2>{t.tags}</h2>
@@ -118,31 +143,26 @@ const total = results.posts.length + results.pages.length + results.tags.length
 </Site>
 
 <style>
-  .search-hero { margin: 24px 0 8px; }
-  .search-form { display: flex; gap: 10px; margin: 18px 0; }
-  .search-form input {
-    flex: 1; font: inherit; padding: 10px 14px; border: 1px solid var(--line);
-    border-radius: 9px; background: var(--panel); color: var(--ink);
-  }
-  .search-form input:focus { outline: 2px solid var(--accent); outline-offset: 1px; border-color: transparent; }
+  .search-hero { padding: calc(20px * var(--space)) 0 0; }
+  .search-hero h1 { font-size: clamp(34px, 5vw, 46px); margin: 0 0 18px; }
+  .search-form { display: flex; gap: 6px; padding: 5px; margin: 0 0 18px; background: var(--panel); border: 1px solid var(--line-2); border-radius: 14px; box-shadow: var(--sh-1); }
+  .search-form:focus-within { border-color: var(--accent); box-shadow: 0 0 0 3px var(--accent-soft); }
+  .search-form input { flex: 1; min-width: 0; font: inherit; padding: 0 12px; border: 0; background: none; color: var(--ink); outline: none; }
   .search-form button {
-    font: inherit; font-weight: 600; padding: 10px 20px; border: 0; border-radius: 9px;
-    background: var(--accent); color: #fff; cursor: pointer;
+    font: 550 15px/1 var(--font-body); height: 42px; padding: 0 18px; border: 0; border-radius: 10px;
+    background: var(--btn); color: var(--btn-ink); cursor: pointer;
   }
-  .search-count { color: var(--muted); }
-  .search-section h2 { font-size: 1.1rem; margin-top: 2rem; }
+  .search-count { color: var(--muted); font-size: 14.5px; margin: 0 0 8px; }
+  .search-section h2 { font-size: 13px; font-weight: 550; letter-spacing: 0; color: var(--muted); margin: 36px 0 4px; font-family: var(--font-body); }
+  .post-list :global(.post-excerpt) { color: var(--muted); font-size: 15px; margin: 4px 0 0; }
   /* snippets arrive pre-escaped with <mark> around matches (set:html), so
      the highlight style must reach into the injected fragment */
   .post-excerpt :global(mark) {
     background: color-mix(in srgb, var(--accent) 22%, transparent);
     color: inherit; border-radius: 3px; padding: 0 1px;
   }
-  .search-loc {
-    font-size: 11px; font-weight: 700; letter-spacing: 0.06em; color: var(--muted);
-    border: 1px solid var(--line); border-radius: 5px; padding: 1px 5px; margin-left: 8px;
-    vertical-align: 2px;
-  }
-  .search-tags { display: flex; flex-wrap: wrap; gap: 8px; margin-top: 10px; }
-  .search-tag-count { color: var(--muted); }
+  .search-loc { font-size: 12.5px; font-weight: 550; color: var(--muted); margin-left: 10px; }
+  .search-tags { display: flex; flex-wrap: wrap; gap: 8px 16px; margin-top: 12px; }
+  .search-tag-count { color: var(--muted); font-weight: 400; }
   .search-avatar { width: 44px; height: 44px; border-radius: 50%; object-fit: cover; flex: none; }
 </style>

package/src/pages/sitemap.xml.ts

@@ -3,18 +3,24 @@ import { getRepo } from '../lib/repo';
 import { isInternalTag } from '../lib/schema';
 import { siteOrigin, xmlEscape } from '../lib/seo';
 import { CONTENT, collectionUrl, tagUrl } from '../lib/content';
+import { CALENDAR, eventUrl, bookingsEnabled, resourceUrl } from '../lib/calendar/config';
+import { eventIsPublic } from '../lib/calendar/events';
 
 // DB-backed sitemap: content lives in D1/libSQL, so this is generated per
 // request instead of at build time. Draft/scheduled content never appears.
 
 export const GET: APIRoute = async ({ locals, url }) => {
   const repo = await getRepo(locals);
-  const [settings, pages, posts, tags] = await Promise.all([
+  const [settings, pages, posts, tags, events, calendars] = await Promise.all([
     repo.getSettings(),
     repo.listPages(),
     repo.listPublishedPosts(),
     repo.listTags(),
+    CALENDAR.enabled ? repo.listPublishedEvents() : Promise.resolve([]),
+    CALENDAR.enabled ? repo.listCalendars() : Promise.resolve([]),
   ]);
+  const calMap = new Map(calendars.map((c) => [c.id, c]));
+  const publicEvents = events.filter((e) => eventIsPublic(e, calMap));
   const origin = siteOrigin(settings, url);
 
   const usedTags = new Set(posts.flatMap((p) => p.tags.map((t) => t.toLowerCase())));
@@ -37,6 +43,15 @@ export const GET: APIRoute = async ({ locals, url }) => {
       .filter((t) => usedTags.has(t.name.toLowerCase()) && !isInternalTag(t.name))
       .map((t) => ({ loc: tagUrl(t.slug) })),
     { loc: '/links' },
+    ...(CALENDAR.enabled
+      ? [
+          { loc: CALENDAR.base, lastmod: Math.max(0, ...publicEvents.map((e) => e.updatedAt)) || undefined },
+          ...publicEvents.map((e) => ({ loc: eventUrl(e.slug), lastmod: e.updatedAt })),
+        ]
+      : []),
+    ...(bookingsEnabled()
+      ? [{ loc: CALENDAR.bookBase }, ...(await repo.listResources()).filter((r) => r.visibility === 'public').map((r) => ({ loc: resourceUrl(r.slug), lastmod: r.updatedAt }))]
+      : []),
   ];
 
   const xml = `<?xml version="1.0" encoding="UTF-8"?>