@acms-subir/core 0.3.46 → 0.3.47

package/src/pages/embed/calendar/[slug].astro

@@ -1,36 +1,56 @@
 ---
 import Site from '../../../layouts/Site.astro';
 import { getRepo } from '../../../lib/repo';
-import { CALENDAR } from '../../../lib/calendar/config';
+import { siteLang } from '../../../lib/dates';
+import { I18N, localePath } from '../../../lib/i18n';
+import { isExtraLocale } from '../../../lib/translations';
+import { eventStrings } from '../../../lib/calendar/event-words';
+import { CALENDAR, eventUrl } from '../../../lib/calendar/config';
 import { calendarWindow, renderCalendarView } from '../../../lib/calendar/render';
 import { collectViewEvents } from '../../../lib/calendar/data';
 import { upcomingEvents, eventCardHtml } from '../../../lib/calendar/cards';
+import { readEventFilter, resolveEventFilter } from '../../../lib/calendar/filter';
 
 // Embeddable calendar for other websites:
 //   <iframe src="https://site/embed/calendar/all?view=month" …>
 // slug 'all' = every public calendar. view: month | week | list | cards.
-// Links open in the parent window; height is posted to the parent so a
-// small script can auto-size the iframe.
+// The /calendar page's filters work here too (?tag=Class, ?notag=,
+// ?cal=a,b to add calendars, ?room=), and ?lang=es picks one of the site's
+// languages (embeds are never under /es). Links open in the parent window;
+// height is posted to the parent so a small script can auto-size the iframe.
 if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
-const settings = await repo.getSettings();
+const base = await repo.getSettings();
 const slug = Astro.params.slug ?? 'all';
 const cal = slug === 'all' ? null : await repo.getCalendarBySlug(slug);
 if (slug !== 'all' && (!cal || cal.visibility === 'private')) return new Response(null, { status: 404 });
+const langParam = Astro.url.searchParams.get('lang') ?? '';
+const reqLocale = I18N.enabled ? (I18N.locales.includes(langParam) ? langParam : I18N.defaultLocale) : '';
+// the layout's <html lang> reads the request's language
+if (reqLocale) (Astro.locals as { acmsLocale?: string }).acmsLocale = reqLocale;
+const settings = isExtraLocale(reqLocale) ? { ...base, locale: reqLocale } : base;
+const lang = reqLocale || siteLang(settings);
+const w = eventStrings(lang).calendar;
+
+const query = readEventFilter(Astro.url.searchParams);
+const filter = cal ? { ...query, cal: [cal.slug, ...query.cal] } : query;
+const [calendars, resources] = await Promise.all([repo.listCalendars(), filter.room.length ? repo.listResources() : []]);
+const resolved = resolveEventFilter(filter, { calendars, resources });
 const view = (['month', 'week', 'list', 'cards'] as const).find((v) => v === Astro.url.searchParams.get('view')) ?? 'month';
 const now = Date.now();
 let html: string;
 if (view === 'cards') {
-  const items = await upcomingEvents(repo, settings, now, { calendarIds: cal ? [cal.id] : undefined, limit: Math.min(12, Number(Astro.url.searchParams.get('limit')) || 6) });
-  html = `<section class="pc-ev-cards" data-layout="grid">${items.map((o) => eventCardHtml(o, settings, { showImage: true })).join('') || '<p class="pc-ev-empty">No upcoming events.</p>'}</section>`;
+  const items = await upcomingEvents(repo, settings, now, { filter: resolved, locale: lang, limit: Math.min(12, Number(Astro.url.searchParams.get('limit')) || 6) });
+  const cards = items.map((o) => eventCardHtml(o, settings, { showImage: true, href: localePath(eventUrl(o.event.slug), reqLocale) })).join('');
+  html = '<section class="pc-ev-cards" data-layout="grid">' + (cards || '<p class="pc-ev-empty">' + w.noUpcoming + '</p>') + '</section>';
 } else {
-  const { events, calendars } = await collectViewEvents(repo, settings, calendarWindow(settings, now), { audience: 'public', ...(cal ? { calendarIds: [cal.id] } : {}) });
-  html = renderCalendarView(events, settings, now, { view: view === 'list' ? 'upcoming' : view, limit: 30, multi: !cal && calendars.length > 1 });
+  const { events, calendars: shown } = await collectViewEvents(repo, settings, calendarWindow(settings, now), { audience: 'public', filter: resolved, locale: lang });
+  html = renderCalendarView(events, settings, now, { view: view === 'list' ? 'upcoming' : view, limit: 30, multi: shown.length > 1 });
 }
 Astro.response.headers.set('Content-Security-Policy', "frame-ancestors *");
 ---
 
-<Site title={cal?.name ?? 'Calendar'} bare noindex>
+<Site title={cal?.name ?? w.title} bare noindex>
   <base target="_top" />
   <div class="pc-embed" set:html={html} />
   <script is:inline>

package/src/styles/site.css

@@ -930,6 +930,16 @@ li::marker { color: var(--muted); }
   .pc-calpage-chips a:hover { color: var(--ink); }
   .pc-calpage-chips a.is-on { color: var(--ink); font-weight: 600; box-shadow: inset 0 -2px 0 var(--ink); }
   .pc-calpage-chips i { width: 7px; height: 7px; border-radius: 2px; }
+  /* active filters from the address (tag, left-out tag, room): removable chips */
+  .pc-calpage-filters { display: flex; flex-wrap: wrap; align-items: center; gap: 6px; margin: -2px 0 16px; }
+  .pc-calpage-filter {
+    display: inline-flex; align-items: center; gap: 6px; height: 28px; padding: 0 8px 0 11px; border-radius: var(--r-sm);
+    background: var(--soft); color: var(--ink); font-size: 13px; font-weight: 550; text-decoration: none;
+  }
+  .pc-calpage-filter svg { width: 13px; height: 13px; color: var(--muted); }
+  .pc-calpage-filter:hover svg { color: var(--ink); }
+  .pc-calpage-clear { padding: 0 6px; font-size: 13px; color: var(--muted); text-decoration: none; }
+  .pc-calpage-clear:hover { color: var(--ink); }
   .pc-calpage-tools { display: flex; gap: 8px; align-items: center; margin-left: auto; }
   .pc-calpage-views { display: inline-flex; background: var(--soft); border-radius: 10px; padding: 3px; }
   .pc-calpage-views a { padding: 5px 12px; border-radius: 7px; font-size: 13px; font-weight: 550; color: var(--muted); text-decoration: none; }