@acms-subir/core 0.3.51 → 0.3.53

package/src/pages/api/calendar/screens.ts

@@ -0,0 +1,30 @@
+import type { APIRoute } from 'astro';
+import { getRepo } from '../../../lib/repo';
+import { ApiError, apiError, json, readJson } from '../../../lib/api';
+import { requirePermission } from '../../../lib/permissions/access';
+import { CALENDAR } from '../../../lib/calendar/config';
+import { siteOrigin } from '../../../lib/seo';
+import { ScreenAction, screenAction, screensState } from '../../../lib/display/screens';
+
+// Admin → Calendar → Screens: saved TV screens, for people who manage rooms
+// and calendars (a screen's link can show private calendars).
+export const GET: APIRoute = async ({ request, cookies, locals, url }) => {
+  try {
+    if (!CALENDAR.enabled) throw new ApiError(404, 'The calendar is off on this site.');
+    const repo = await getRepo(locals);
+    const access = await requirePermission(request, cookies, repo, 'schedule.manage');
+    return json(await screensState(repo, siteOrigin(await repo.getSettings(), url), { bookings: access.can('schedule.bookings') }));
+  } catch (e) { return apiError(e); }
+};
+export const POST: APIRoute = async ({ request, cookies, locals, url }) => {
+  try {
+    if (!CALENDAR.enabled) throw new ApiError(404, 'The calendar is off on this site.');
+    const repo = await getRepo(locals);
+    const access = await requirePermission(request, cookies, repo, 'schedule.manage');
+    // a screen's key unlocks private calendars: only from this site's admin
+    if (request.headers.get('origin') !== url.origin) throw new ApiError(403, 'Change this from this site’s admin.');
+    const bookings = access.can('schedule.bookings');
+    const result = await screenAction(repo, ScreenAction.parse(await readJson(request, 20_000)), { bookings });
+    return json({ ...result, state: await screensState(repo, siteOrigin(await repo.getSettings(), url), { bookings }) });
+  } catch (e) { return apiError(e); }
+};

package/src/pages/blog/[slug].astro

@@ -63,7 +63,7 @@ const po = design.post;
 const PostTemplate = (post.template ? design.theme.postTemplates[post.template] : null) as any;
 const tagSlug = (name: string) =>
   tags.find((t) => t.name.toLowerCase() === name.toLowerCase())?.slug ?? slugify(name);
-const html = highlightCodeHtml(await expandDynamicBlocks(post.bodyHtml || renderMarkdown(post.body), repo));
+const html = highlightCodeHtml(await expandDynamicBlocks(post.bodyHtml || renderMarkdown(post.body), repo, locale));
 const fmt = (ts: number | null) => formatDate(ts, settings);
 const words = (post.bodyHtml || post.body).replace(/<[^>]+>/g, ' ').split(/\s+/).filter(Boolean).length;
 const readMins = Math.max(1, Math.round(words / 220));

package/src/pages/display/s/[key].astro

@@ -0,0 +1,48 @@
+---
+import DisplayPage from '../../../components/display/DisplayPage.astro';
+import { getRepo } from '../../../lib/repo';
+import { CALENDAR } from '../../../lib/calendar/config';
+import { I18N, localePath, requestLocale } from '../../../lib/i18n';
+import { siteOrigin } from '../../../lib/seo';
+import { siteLang } from '../../../lib/dates';
+import { defaultDisplaySettings, readDisplaySettings } from '../../../lib/display/settings';
+import { loadDisplayBoard } from '../../../lib/display/board';
+import { displayHeaders } from '../../../lib/display/http';
+import { MISS_WINDOW, openScreen } from '../../../lib/display/screens';
+
+// A saved screen (Admin → Calendar → Screens): its long random key is the
+// whole address. With "Show private calendars and room bookings" on, it shows
+// the private calendars it names and its rooms' bookings, with titles, rooms,
+// hosts and the name on a booking; never emails, phone numbers or notes.
+// The board's 5-minute refresh fetches this same address, so a rotated key
+// stops the TV at once and every fetch counts as the screen's check-in.
+if (!CALENDAR.enabled) return new Response(null, { status: 404 });
+const repo = await getRepo(Astro.locals);
+let address = 'unknown';
+try { address = Astro.clientAddress || address; } catch { /* adapters without a client address share a bucket */ }
+const opened = await openScreen(repo, Astro.params.key ?? '', address);
+if (opened.status === 'limited') {
+  return new Response('Too many wrong screen links from this network. Try again in a few minutes.', {
+    status: 429,
+    headers: { 'Retry-After': String(MISS_WINDOW / 1000), 'Cache-Control': 'private, no-store', 'Referrer-Policy': 'no-referrer', 'Content-Type': 'text/plain; charset=utf-8' },
+  });
+}
+const site = await repo.getSettings();
+// the address's language prefix (/es/display/s/…) picks the worker's scope
+const pathLang = I18N.enabled ? requestLocale(Astro.url, Astro.locals) : '';
+const prefix = I18N.enabled && pathLang && pathLang !== I18N.defaultLocale ? `/${pathLang}` : '';
+const screen = opened.status === 'ok' ? opened.screen : null;
+const settings = screen ? readDisplaySettings(new URLSearchParams(screen.params)) : defaultDisplaySettings();
+const lang = screen?.locale || (prefix ? pathLang : '') || siteLang(site);
+const board = screen
+  ? await loadDisplayBoard(repo, site, {
+      settings, privateDetails: screen.privateDetails, lang,
+      phoneLink: siteOrigin(site, Astro.url) + localePath(CALENDAR.base, lang),
+    })
+  : null;
+if (screen) await repo.screens.checkIn(screen.id);
+else Astro.response.status = 404;
+displayHeaders(Astro.response.headers, { shared: false });
+---
+
+<DisplayPage site={site} board={board} settings={settings} title={screen?.name || site.siteTitle} lang={lang} live sw={`${prefix}/display/sw.js`} />

package/src/pages/events/[slug].astro

@@ -3,6 +3,8 @@ import { ApiError } from '../../lib/api';
 import { starter } from '../../lib/forms/schema';
 import { formVersion } from '../../lib/forms/service';
 import { renderFields, hiddenFields } from '../../lib/forms/render';
+import { localizeForm } from '../../lib/forms/localize';
+import { formStrings } from '../../lib/forms/words';
 import { readForm, readAnswers, submissionGuard } from '../../lib/forms/http';
 import { submitEventForm, prepareLegacyEventForm } from '../../lib/forms/events';
 import { I18N, localePath, requestLocale } from '../../lib/i18n';
@@ -74,22 +76,26 @@ if (Astro.request.method === 'POST' && event.rsvp.enabled) {
   }
 }
 const formHtml = hiddenFields(await formVersion(definition), requestId) + `<input type="hidden" name="occurrence" value="${occurrence.start}">`;
+// the questions in the page's language (main-language words where the form has none)
+const fieldsHtml = renderFields(localizeForm(definition, isExtraLocale(locale) ? locale : ''), formValues, 'event-registration', formStrings((I18N.enabled ? locale : '') || siteLang(settings)));
 const taken = event.rsvp.enabled ? await seatsTaken(repo, event.id, occurrence.start) : 0;
 // the event's RSVP deadline for this date (null: open until it ends)
 const closesAt = event.rsvp.enabled ? rsvpDeadline(occurrence, settings) : null;
 // waitlist: a full date offers "Join the waitlist" (the same form, posting waitlist=1)
 const rsvp = event.rsvp.enabled
-  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, duplicate: rsvpDuplicate, formHtml, fieldsHtml: renderFields(definition, formValues, 'event-registration'), values: coreValues,
+  ? { going: taken, left: event.rsvp.capacity ? Math.max(0, event.rsvp.capacity - taken) : null, maxSeats: event.rsvp.maxSeats, error: rsvpError, duplicate: rsvpDuplicate, formHtml, fieldsHtml, values: coreValues,
     open: occurrence.end > now && !occurrence.cancelled && !(closesAt !== null && closesAt <= now), closesAt, waitlist: waitlistOn(event) }
   : null;
 const calendars = event.calendarIds.map((id) => calMap.get(id)).filter((c): c is NonNullable<typeof c> => Boolean(c) && c!.visibility !== 'private');
-const html = highlightCodeHtml(await expandDynamicBlocks(event.bodyHtml, repo));
+const html = highlightCodeHtml(await expandDynamicBlocks(event.bodyHtml, repo, locale));
 const upcoming = (await upcomingEvents(repo, settings, now, { limit: 4 })).filter((u) => u.event.id !== event.id).slice(0, 3);
 const pageUrl = origin + eventUrl(event.slug);
 const jsonLd = eventJsonLd(event, occurrence, settings, origin, pageUrl);
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const Template = resolveDesign(settings).theme.EventTemplate as any;
-const props = { event, occurrence, settings, calendars, html, upcoming, origin, preview: event.status !== 'published', rsvp };
+// templates read the form's title, introduction and button from the event: in the page's language too
+const shownEvent = event.rsvp.form && isExtraLocale(locale) ? { ...event, rsvp: { ...event.rsvp, form: localizeForm(event.rsvp.form, locale) } } : event;
+const props = { event: shownEvent, occurrence, settings, calendars, html, upcoming, origin, preview: event.status !== 'published', rsvp };
 ---
 
 <Site

package/src/pages/forms/[id].astro

@@ -5,12 +5,24 @@ import { renderForm } from '../../lib/forms/render';
 import { collectResponse } from '../../lib/forms/service';
 import { readForm, readAnswers, submissionGuard } from '../../lib/forms/http';
 import { saveResponse } from '../../lib/forms/alerts';
+import { localizeForm } from '../../lib/forms/localize';
+import { formStrings, thanksText } from '../../lib/forms/words';
 import { ApiError } from '../../lib/api';
+import { I18N, localePath, requestLocale } from '../../lib/i18n';
+import { isExtraLocale } from '../../lib/translations';
+import { siteLang } from '../../lib/dates';
 const repo = await getRepo(Astro.locals);
 const form = await repo.forms.get(Astro.params.id || '');
 if (!form || form.status !== 'published' || form.kind !== 'form' || form.purpose !== 'general') return new Response(null, { status: 404 });
 Astro.response.headers.set('Cache-Control', 'private, no-store');
 const embed = Astro.url.searchParams.has('embed');
+// /es/forms/<id>: the form's Spanish words (main-language ones where it has
+// none) and the page's own words in Spanish; answers are stored the same
+const locale = requestLocale(Astro.url, Astro.locals);
+const formLocale = isExtraLocale(locale) ? locale : '';
+const lang = (I18N.enabled ? locale : '') || siteLang(await repo.getSettings());
+const shown = localizeForm(form.definition, formLocale);
+const path = localePath(`/forms/${encodeURIComponent(form.id)}`, locale);
 let error = '', success = false, values: Record<string,string> = {};
 let requestId: string = crypto.randomUUID();
 if (Astro.request.method === 'POST') {
@@ -18,11 +30,17 @@ if (Astro.request.method === 'POST') {
     const data = await readForm(Astro.request);
     requestId = await submissionGuard(repo, data, Astro.clientAddress, `form:${form.id}`);
     values = readAnswers(data, form.definition);
-    const response = await collectResponse(form.definition, values, String(data.get('formVersion') || ''));
-    await saveResponse(repo, form, response, requestId, { via: 'web', locals: Astro.locals });
+    // a resubmit of a saved response (refresh, double click) thanks them again,
+    // also after the form changed since; the same id with other answers is a 409
+    const prior = await repo.forms.receipt(form.id, requestId);
+    if (!prior || JSON.stringify((JSON.parse(prior) as { definition: unknown }).definition) === JSON.stringify(form.definition)) {
+      const response = await collectResponse(form.definition, values, prior ? undefined : String(data.get('formVersion') || ''));
+      await saveResponse(repo, form, response, requestId, { via: 'web', locals: Astro.locals });
+    }
     success = true;
   } catch (e) { error = e instanceof ApiError ? e.message : 'Could not save your response. Please try again.'; Astro.response.status = e instanceof ApiError ? e.status : 500; }
 }
-const html = success ? '' : await renderForm(form.id, form.definition, values, error, requestId, embed);
+const w = formStrings(lang);
+const html = success ? '' : await renderForm(form.id, form.definition, values, error, requestId, embed, { locale: formLocale, lang, action: path });
 ---
-<Site title={form.definition.title || form.name} noindex bare={embed}>{success ? <section class="pc-simple-form"><h1>{form.definition.title || form.name}</h1><p role="status">{form.definition.confirmation || 'Thank you. Your response has been received.'}</p><a href={Astro.url.pathname + (embed ? '?embed=1' : '')}>Send another response</a></section> : <div set:html={html}/>}</Site>
+<Site title={shown.title || form.name} noindex bare={embed}>{success ? <section class="pc-simple-form"><h1>{shown.title || form.name}</h1><p role="status">{thanksText(shown.confirmation, w)}</p><a href={path + (embed ? '?embed=1' : '')}>{w.sendAnother}</a></section> : <div set:html={html}/>}</Site>

package/src/pages/index.astro

@@ -46,7 +46,7 @@ const [posts, tags] = HomeTemplate
   : [[], []];
 // expand dynamic blocks (post lists) in the page body for BOTH paths — a theme
 // template injects the body as its hero, so it must receive expanded HTML too
-const homeHtml = home?.bodyHtml ? await expandDynamicBlocks(home.bodyHtml, repo) : '';
+const homeHtml = home?.bodyHtml ? await expandDynamicBlocks(home.bodyHtml, repo, locale) : '';
 const homeForTemplate = home ? { ...home, bodyHtml: homeHtml } : null;
 ---
 

package/src/styles/display.css

@@ -161,7 +161,8 @@ body { background: #000; }
 /* list: columns, then pages (the script turns them) */
 .display-list { height: 100%; overflow: hidden; }
 .display-list-cols { height: 100%; column-count: var(--dsp-list-cols, 3); column-gap: calc(3.5 * var(--dsp-u)); column-fill: auto; }
-.display-day { margin: 0 0 calc(2.2 * var(--dsp-u)); }
+/* a day stays in one column when it fits, so a column never starts without its day */
+.display-day { margin: 0 0 calc(2.2 * var(--dsp-u)); break-inside: avoid-column; }
 .display-day-title { margin: 0 0 calc(0.6 * var(--dsp-u)); font-size: calc(2.3 * var(--dsp-u)); font-weight: 700; color: var(--dsp-muted); break-after: avoid; }
 .display-day.is-today .display-day-title { color: var(--dsp-fg); }
 .display-row {

package/src/styles/forms.css

@@ -81,6 +81,7 @@
 .fb.is-preview .fb-canvas { border: 0; }
 .fb-wide .fb-canvas:has(> .fb-float) { padding-top: 48px; }
 .fb-float { position: absolute; top: 8px; right: 10px; z-index: 3; display: flex; gap: 2px; padding: 2px; border-radius: 10px; background: color-mix(in srgb, var(--panel-2) 85%, transparent); }
+.fb-float-l { right: auto; left: 10px; }
 .fb-paper {
   /* the public form's tokens, mapped onto the admin palette */
   --ink: var(--text); --line-2: var(--line-strong); --btn: var(--text); --btn-ink: var(--bg); --accent-text: var(--accent-deep);
@@ -195,6 +196,13 @@
 .fb-choice.dragging input { box-shadow: var(--shadow-pop); }
 .fb-choice input { min-height: 34px; }
 .fb-choice-add { margin: 2px 0 0; font-size: 12px; color: var(--muted); }
+/* another language: the main language's words above each box, choices side by side */
+.fb-src { display: block; padding: 6px 9px; border-radius: var(--r-sm); background: var(--panel-2); color: var(--text-2); font-size: 12.5px; line-height: 1.45; white-space: pre-line; overflow-wrap: anywhere; max-height: 7.5em; overflow: auto; }
+.fb-src > span { display: block; font-size: 10.5px; font-weight: 600; text-transform: uppercase; letter-spacing: 0.06em; color: var(--muted); margin-bottom: 1px; }
+.fb-tr-choices { display: grid; gap: 6px; }
+.fb-tr-choice { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1.4fr); gap: 8px; align-items: center; }
+.fb-tr-choice > span { font-size: 12.5px; color: var(--text-2); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.fb-tr-choice input { min-height: 34px; }
 
 /* menus */
 .fb-more, .fb-q-more { position: relative; flex: none; }

package/src/styles/screens-admin.css

@@ -0,0 +1,53 @@
+/* Admin → Calendar → Screens (components/display/ScreensManager.tsx) */
+.sc { display: grid; grid-template-columns: minmax(240px, 300px) minmax(0, 1fr); gap: 16px; align-items: start; }
+.sc .card + .card { margin-top: 0; }
+@media (max-width: 1100px) { .sc { grid-template-columns: minmax(0, 1fr); } }
+.sc-skel { color: var(--muted); }
+.sc-list { overflow: hidden; }
+.sc-list-head { display: flex; align-items: center; justify-content: space-between; gap: 8px; padding: 12px 14px; border-bottom: 1px solid var(--line); flex-wrap: wrap; }
+.sc-list-actions { display: flex; gap: 6px; }
+.sc-empty { padding: 26px 16px; }
+.sc-rows { list-style: none; margin: 0; padding: 0; }
+.sc-rows li + li { border-top: 1px solid var(--line); }
+.sc-row { display: flex; flex-direction: column; gap: 3px; width: 100%; text-align: left; padding: 11px 14px; background: none; border: 0; font: inherit; color: var(--text); cursor: pointer; }
+.sc-row:hover { background: var(--hover); }
+.sc-row.on { background: var(--sel); }
+.sc-row-name { font-weight: 600; display: flex; align-items: center; gap: 6px; flex-wrap: wrap; }
+.sc-row-sum { font-size: 12px; color: var(--muted); }
+.sc-seen { font-size: 12px; color: var(--faint); }
+.sc-seen.ok { color: var(--green); }
+.sc-seen.stale { color: var(--amber); }
+.pill.sc-private { background: var(--amber-soft); color: var(--amber); }
+.sc-intro h2, .sc-h { font-size: 16px; margin: 0 0 8px; }
+.sc-intro p { color: var(--text-2); font-size: 13.5px; line-height: 1.55; margin: 0 0 10px; }
+.sc-steps { margin: 0 0 12px; padding-left: 18px; color: var(--text-2); font-size: 13.5px; line-height: 1.55; }
+.sc-editor { padding: 16px 18px; }
+.sc-editor-grid { display: grid; grid-template-columns: minmax(280px, 1fr) minmax(320px, 1.25fr); gap: 20px; align-items: start; }
+@media (max-width: 1380px) { .sc-editor-grid { grid-template-columns: minmax(0, 1fr); } .sc-side { order: -1; position: static; } }
+.sc-side { position: sticky; top: 16px; display: flex; flex-direction: column; gap: 12px; }
+.sc-fs { border: 0; padding: 0; margin: 0 0 16px; min-width: 0; }
+.sc-fs legend { font-size: 12px; text-transform: uppercase; letter-spacing: 0.07em; color: var(--muted); font-weight: 600; padding: 0; margin-bottom: 8px; }
+.sc-fs > .hint { margin: 0 0 6px; }
+.seg.sc-seg { flex-wrap: wrap; }
+.seg.sc-seg > button { border: 0; background: none; font: inherit; font-size: 12.5px; font-weight: 600; padding: 5px 10px; border-radius: 7px; color: var(--muted); cursor: pointer; }
+.sc-look { display: flex; gap: 10px; flex-wrap: wrap; margin-bottom: 10px; }
+.sc-chips { display: flex; flex-wrap: wrap; gap: 6px; margin: 4px 0 10px; }
+.sc-chip { display: inline-flex; align-items: center; gap: 6px; padding: 4px 10px; border: 1px solid var(--line-strong); border-radius: var(--r-full); font-size: 12.5px; cursor: pointer; }
+.sc-chip input { accent-color: var(--accent); margin: 0; }
+.sc-checks { max-height: 200px; overflow: auto; }
+.sc-checks .check-row { margin: 4px 0; align-items: center; }
+.sc-off { opacity: 0.6; }
+.sc-swatch { display: inline-block; width: 11px; height: 11px; border-radius: 3px; flex: none; }
+.sc-order { display: inline-grid; place-items: center; min-width: 18px; height: 18px; border-radius: 9px; background: var(--accent-soft); color: var(--accent-deep); font-size: 11px; font-weight: 700; }
+.sc-tags-label { display: block; font-size: 12px; color: var(--muted); margin-bottom: 5px; font-weight: 500; }
+.sc-tag-list { border: 1px solid var(--line); border-radius: var(--r-md); padding: 4px 10px; max-height: 150px; }
+.sc-inline { display: flex; gap: 6px; }
+.sc-private { background: var(--panel-2); border: 1px solid var(--line); border-radius: var(--r-md); padding: 10px 12px 6px; }
+.sc-private legend { padding-top: 2px; }
+.sc-private .hint { margin: 0 0 6px 23px; }
+.sc-preview { position: relative; width: 100%; aspect-ratio: 16 / 9; overflow: hidden; border-radius: var(--r-md); background: #000; border: 1px solid var(--line); }
+.sc-preview iframe { position: absolute; top: 0; left: 0; border: 0; transform-origin: 0 0; pointer-events: none; }
+.sc-link .field { margin-bottom: 6px; }
+.sc-link input[readonly] { font-family: ui-monospace, 'SF Mono', monospace; font-size: 12px; }
+.sc-link .form-actions { margin-top: 6px; }
+.sc-save { margin-top: 0; padding-top: 12px; border-top: 1px solid var(--line); }