@acms-subir/core 0.3.46 → 0.3.48

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/pages/members/_Layout.astro

@@ -62,6 +62,7 @@ const { title, user } = Astro.props;
     .pc-mem-dates li { display: flex; align-items: center; justify-content: space-between; gap: 10px; min-height: 42px; padding: 5px 0; border-top: 1px solid var(--line); font-variant-numeric: tabular-nums; }
     .pc-mem-dates li.is-cancelled > span { color: var(--muted); }
     .pc-mem-dates em { font-style: normal; font-size: 12.5px; font-weight: 600; color: var(--danger); margin-left: 8px; }
+    .pc-mem-dates em.is-moved { color: var(--accent); font-weight: 500; }
     .pc-mem-past > summary { cursor: pointer; font-weight: 600; font-size: 15px; }
     .pc-mem-past .pc-mem-list { margin-top: 10px; }
     /* the request form */

package/src/pages/members/events/index.astro

@@ -175,7 +175,7 @@ const pastShown = past.slice(0, 10);
                 const off = e.cancelledDates.includes(o.key);
                 return (
                   <li class={o.cancelled ? 'is-cancelled' : undefined}>
-                    <span>{o.cancelled ? <s>{when(o)}</s> : when(o)}{o.cancelled && <em>Cancelled</em>}</span>
+                    <span>{o.cancelled ? <s>{when(o)}</s> : when(o)}{o.cancelled && <em>Cancelled</em>}{o.moved && !o.cancelled && <em class="is-moved" title={o.moved.note || undefined}>Moved from {when({ ...o, start: o.moved.from.start, end: o.moved.from.end })}</em>}</span>
                     {e.rrule && !e.cancelled && o.start > now && (
                       <form method="post" onsubmit={off ? undefined : "return confirm('Cancel this date? It shows as cancelled straight away.')"}>
                         <input type="hidden" name="op" value={off ? 'restore-date' : 'cancel-date'} />

package/src/server/index.ts

@@ -37,6 +37,7 @@ export interface ServerUser {
 export type { CalEvent, Occurrence };
 export type { EventRequestInput } from '../lib/calendar/requests';
 export type { EventClash, BusySlot, Hold } from '../lib/booking/holds';
+export type { MoveInput, MoveResult } from '../lib/calendar/moves';
 
 export interface ListEventsOptions {
   /** only published events (default: every event except archived ones) */
@@ -172,6 +173,38 @@ export async function restoreOccurrence(repo: Repo, eventId: string, occurrenceK
   return restore(internal(repo), eventId, occurrenceKey, { url: context.url, locals: context.locals });
 }
 
+// ---- moved dates -------------------------------------------------------------
+// One date of a repeating event at another time (and maybe other rooms or
+// another place), keeping its key, its RSVPs (moved with it; each person gets
+// the "new time" email with their cancel link) and its hosts. These check who
+// is acting: staff ("Create and edit content") and GOOGLE_SYNC may move any
+// date, and a room taken at the new time comes back in `clashes` as a
+// warning; a host of the event may move its dates only while the rooms are
+// free (409 otherwise), and staff are emailed about it.
+
+/** The actor for a calendar sync acting with staff rights (a change already made elsewhere): clashes only warn. */
+export const GOOGLE_SYNC = 'google-sync';
+
+/**
+ * Move one date (by its occurrence key) to `input.start` (and `end`, else it
+ * keeps its length; wall-clock in the event's timezone, like `start`).
+ * `roomIds`/`location`/`note` replace that date's own (omit to keep them).
+ * Applies at once, even on a published event. `quiet` skips the app notice
+ * and the staff email (a sync catching up); RSVP emails still go. Errors have
+ * a `status`: 400 (not a repeating event, not one of its dates, started or a
+ * past time), 401, 404, 409 (a cancelled date, or a taken room for a host).
+ */
+export async function moveOccurrence(repo: Repo, who: Who | typeof GOOGLE_SYNC, eventId: string, occurrenceKey: string, input: import('../lib/calendar/moves').MoveInput, context: WriteContext, opts: { quiet?: boolean } = {}): Promise<import('../lib/calendar/moves').MoveResult> {
+  const { moveOccurrence: move } = await import('../lib/calendar/moves');
+  return move(internal(repo), who, eventId, occurrenceKey, input, { url: context.url, locals: context.locals }, opts);
+}
+
+/** Put a moved date back where the series has it. Same rules; idempotent. */
+export async function moveOccurrenceBack(repo: Repo, who: Who | typeof GOOGLE_SYNC, eventId: string, occurrenceKey: string, context: WriteContext, opts: { quiet?: boolean } = {}): Promise<import('../lib/calendar/moves').MoveResult> {
+  const { moveOccurrenceBack: back } = await import('../lib/calendar/moves');
+  return back(internal(repo), who, eventId, occurrenceKey, { url: context.url, locals: context.locals }, opts);
+}
+
 // ---- rooms -----------------------------------------------------------------
 // Events hold rooms (CalEvent.roomHold) while they happen. These find where
 // two things want the same room. They don't check permissions, and their

package/src/styles/editor.css

@@ -1328,3 +1328,22 @@ html.pe-evr-lock { overflow: hidden; }
   .pe-evs-wrap { --evs-pad: 14px; padding-top: 18px; }
   .pe-evsec input:where(:not([type='checkbox'], [type='radio'])), .pe-evsec select, .pe-evsec textarea, .pe-loc-search input, .pe-evsec input.mono { font-size: 16px; }
 }
+
+/* Event settings → Single dates (SingleDates.tsx): move or cancel one date */
+.pe-evd { list-style: none; margin: 0; padding: 0; }
+.pe-evd-row { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: 6px 12px; padding: 8px 0; border-top: 1px solid var(--line); }
+.pe-evd-row:first-child { border-top: 0; }
+.pe-evd-main { display: flex; flex-direction: column; min-width: 0; font-size: 13.5px; font-variant-numeric: tabular-nums; }
+.pe-evd-state { font-size: 12px; color: var(--text-2); }
+.pe-evd-row.is-cancelled .pe-evd-when { color: var(--muted); }
+.pe-evd-row.is-cancelled .pe-evd-state { color: var(--red); }
+.pe-evd-row.is-moved .pe-evd-state { color: var(--accent); }
+.pe-evd-acts { display: flex; flex-wrap: wrap; gap: 6px; }
+.pe-evd-form { flex-basis: 100%; display: flex; flex-direction: column; gap: 10px; margin: 4px 0 6px; padding: 12px; border-radius: 10px; background: var(--panel-2, var(--soft)); }
+.pe-evd-fields { display: flex; flex-wrap: wrap; gap: 10px; }
+.pe-evd-fields .pe-field { flex: 1 1 130px; margin: 0; }
+.pe-evd-rooms { border: 0; margin: 0; padding: 0; display: flex; flex-wrap: wrap; gap: 4px 14px; font-size: 13px; }
+.pe-evd-rooms legend { font-size: 12px; color: var(--text-2); margin-bottom: 4px; padding: 0; }
+.pe-evd-room { display: inline-flex; align-items: center; gap: 6px; cursor: pointer; }
+.pe-evd-formacts { display: flex; gap: 8px; }
+.pe-ev-note.is-error { color: var(--red); }

package/src/styles/schedule.css

@@ -205,6 +205,8 @@ kbd { font: 10.5px ui-monospace, SFMono-Regular, Menlo, monospace; color: var(--
 .sch-toast button { border: 0; background: none; color: var(--accent); font: inherit; font-weight: 650; cursor: pointer; padding: 0; }
 :root[data-theme='dark'] .sch-toast { background: #2e2b27; color: var(--text); border: 1px solid var(--line-strong); }
 .sch-toast.err { background: var(--red); color: #fff; }
+/* a room clash after a move: both events keep the room */
+.sch-toast-warn { display: block; max-width: 340px; font-size: 12px; color: var(--amber, #c98a16); }
 
 /* ---- quick add ---- */
 .qa-layer { position: fixed; inset: 0; z-index: 75; }

package/src/styles/site.css

@@ -806,6 +806,10 @@ li::marker { color: var(--muted); }
 @layer base {
   .pc-cal-event.is-cancelled b, .pc-cal-row.is-cancelled .ti { text-decoration: line-through; color: var(--cal-muted); }
   .pc-cal-pop-flag { display: inline-block; font-size: 11px; font-weight: 700; letter-spacing: 0.04em; text-transform: uppercase; color: var(--danger); margin-bottom: 3px; }
+  /* a moved date: flagged, never struck through */
+  .pc-cal-pop-flag.is-moved, .pc-ev-flag.is-moved { color: var(--accent); }
+  .pc-cal-pop-moved { font-size: 12.5px; color: var(--cal-muted); margin-top: 2px; }
+  .pc-cal-event.is-moved b::before { content: '↷ '; }
   .pc-cal-pop-link { display: inline-block; margin-top: 9px; font-weight: 600; font-size: 12.5px; color: var(--cal-accent); text-decoration: none; }
   .pc-cal-pop-link:hover { text-decoration: underline; }
 
@@ -867,6 +871,8 @@ li::marker { color: var(--muted); }
   .pc-ev-page.is-cancelled .pc-ev-title { text-decoration: line-through; text-decoration-thickness: 2px; color: var(--muted); }
   .pc-ev-cancelled { background: color-mix(in srgb, var(--danger) 10%, var(--panel)); border-radius: var(--r-sm); padding: 10px 14px; font-size: 14.5px; margin: 0 0 16px; }
   .pc-ev-cancelled b { color: var(--danger); }
+  .pc-ev-moved { background: color-mix(in srgb, var(--accent) 10%, var(--panel)); border-radius: var(--r-sm); padding: 10px 14px; font-size: 14.5px; margin: 0 0 16px; }
+  .pc-ev-moved b { color: var(--accent); }
   .pc-ev-lede { font-size: 19px; line-height: 1.55; color: var(--muted); margin: 0 0 22px; }
   .pc-ev-side {
     position: sticky; top: 96px; background: var(--panel); border: 1px solid var(--line); border-radius: var(--r-lg);
@@ -930,6 +936,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; }

package/src/theme-sdk/calendar.ts

@@ -29,9 +29,10 @@ export interface UpcomingEventsOptions {
 /**
  * Occurrence start/end are Unix milliseconds; event retains its authored
  * fields except private custom fields. `cancelled` is true when the whole
- * event or just this date is cancelled.
+ * event or just this date is cancelled. `moved` is set when this date of a
+ * series was moved here: `from` (its old start and end) and staff's `note`.
  */
-export type UpcomingEvent = Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days' | 'cancelled'>;
+export type UpcomingEvent = Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days' | 'cancelled'> & Pick<Partial<Occurrence>, 'moved'>;
 
 /** Server-side helper for Astro templates and endpoints. No repository access needed. */
 export async function upcomingEvents(