@acms-subir/core 0.3.40 → 0.3.42

package/src/pages/book/manage/[token].astro

@@ -2,16 +2,16 @@
 import Site from '../../../layouts/Site.astro';
 import { getRepo } from '../../../lib/repo';
 import { CALENDAR, bookingLinkUrl, bookingsEnabled, eventUrl, resourceUrl } from '../../../lib/calendar/config';
-import { guestCancel, guestChanges, BookingError } from '../../../lib/booking/service';
+import { confirmOffer, guestCancel, guestChanges, waitlistPosition, BookingError, WAITLIST_HOLD } from '../../../lib/booking/service';
 import { bookingIcs, whenText } from '../../../lib/booking/emails';
 import { resourceZone } from '../../../lib/booking/availability';
 import { eventTimeZone, locationLine } from '../../../lib/calendar/events';
 import { siteOrigin } from '../../../lib/seo';
 import { waitUntilFrom } from '../../../lib/webhooks';
 import { I18N, localePath, requestLocale } from '../../../lib/i18n';
-import { siteLang } from '../../../lib/dates';
+import { siteLang, siteLocale } from '../../../lib/dates';
 import { isExtraLocale, localizeDoc } from '../../../lib/translations';
-import { rsvpStrings } from '../../../lib/calendar/rsvp-words';
+import { deadlineParts, rsvpStrings } from '../../../lib/calendar/rsvp-words';
 import { bookingStrings } from '../../../lib/email/booking-words';
 import { fill } from '../../../lib/live/words';
 
@@ -21,7 +21,10 @@ import { fill } from '../../../lib/live/words';
 // speaks the request's language, for RSVPs and room bookings alike
 // (/es/book/manage/… in Spanish, as the emails of a booking made in Spanish
 // link it); opened without the prefix it shows the main language, with no
-// redirect. The room booking flow it links back to stays in English.
+// redirect. The room booking flow it links back to stays in English. An RSVP
+// on a full date's waitlist shows its place in line ("#3 in line · 2 seats")
+// or the spot held for it ("A spot is yours until …", Confirm my spot), and
+// can leave the line or release the spot.
 if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const booking = await repo.getBookingByToken(Astro.params.token ?? '');
@@ -52,31 +55,62 @@ if (Astro.url.searchParams.get('ics')) {
 }
 let error = '';
 let current = booking;
+// what this request just did: left the line (or released a held spot), or took the spot
+let left = false, took = false;
 if (Astro.request.method === 'POST') {
   const form = await Astro.request.formData();
-  if (form.get('op') === 'cancel' && (booking.status === 'pending' || booking.status === 'confirmed')) {
+  const flow = { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) };
+  if (form.get('op') === 'cancel' && ['pending', 'confirmed', 'waitlisted', 'offered'].includes(booking.status)) {
     try {
-      current = await guestCancel(repo, booking, { origin, locals: Astro.locals, waitUntil: waitUntilFrom(Astro.locals) });
+      current = await guestCancel(repo, booking, flow);
+      left = booking.status === 'waitlisted' || booking.status === 'offered';
     } catch (err) {
       error = err instanceof BookingError ? err.message : w.cancelError;
     }
   }
+  if (form.get('op') === 'confirm' && booking.status === 'offered') {
+    try {
+      current = await confirmOffer(repo, booking, flow);
+      took = true;
+    } catch (err) {
+      current = (await repo.getBooking(booking.id)) ?? booking;
+      // released: the page says so in its own words
+      error = current.status === 'expired' ? '' : err instanceof BookingError ? err.message : w.confirmError;
+    }
+  }
 }
 const tz = event ? eventTimeZone(event, settings) : resource ? resourceZone(resource, settings.timezone) : settings.timezone || 'UTC';
-const when = whenText(current, tz, isExtraLocale(locale) ? { ...settings, locale } : settings, link?.mode === 'day' || event?.allDay);
-const active = current.status === 'pending' || current.status === 'confirmed';
+const dateSettings = isExtraLocale(locale) ? { ...settings, locale } : settings;
+const when = whenText(current, tz, dateSettings, link?.mode === 'day' || event?.allDay);
+const waiting = current.status === 'waitlisted' || current.status === 'offered';
+const active = current.status === 'pending' || current.status === 'confirmed' || waiting;
 const upcoming = current.end > Date.now();
 const can = guestChanges(current, link);
-const isNew = Astro.url.searchParams.has('new');
+const isNew = Astro.url.searchParams.has('new') || took;
 const moved = Astro.url.searchParams.has('moved');
-const heading = current.status === 'cancelled' ? w.cancelledTitle
+const hours = String(WAITLIST_HOLD / 3_600_000);
+// "#3 in line · 2 seats"; "A spot is yours until Fri, Oct 24 at 9 PM"
+const position = await waitlistPosition(repo, current);
+const inLine = position === null ? '' : fill(w.inLine, { position: String(position), seats: fill(current.seats === 1 ? w.seat : w.seats, { count: String(current.seats) }) });
+const holdUntil = current.status === 'offered' && current.holdUntil !== null ? deadlineParts(current.holdUntil, tz, siteLocale(dateSettings)) : null;
+const heading = current.status === 'cancelled' ? (left ? w.offWaitlist : w.cancelledTitle)
   : current.status === 'declined' ? w.notAvailable
+  : current.status === 'waitlisted' ? w.onWaitlist
+  : current.status === 'offered' ? w.spotOpened
+  : current.status === 'expired' ? w.released
   : current.status === 'pending' ? (isNew ? w.requestSent : w.awaitingApproval)
   : moved ? bw.moved : isNew ? w.booked : w.yours;
 const lede = current.status === 'pending' ? fill(w.emailWhenApproved, { email: current.email })
   : current.status === 'confirmed' ? (current.formResponse?.definition.confirmation || link?.confirmMessage || fill(w.confirmationOnItsWay, { email: current.email }))
   : current.status === 'declined' ? w.declined
-  : w.cancelledText;
+  : current.status === 'waitlisted' ? fill(w.waitlistPromise, { hours })
+  : current.status === 'offered' ? (holdUntil ? fill(w.spotYours, holdUntil) : '')
+  : current.status === 'expired' ? fill(w.releasedText, { hours })
+  : left ? w.offWaitlistText : w.cancelledText;
+// a room booking's own words list only its four statuses
+const statusLabel = (w.statuses as Record<string, string>)[current.status] ?? rsvpStrings(lang).statuses[current.status];
+const cancelLabel = current.status === 'waitlisted' ? w.leaveWaitlist : current.status === 'offered' ? w.releaseSpot : w.cancel;
+const cancelAsk = `return confirm(${JSON.stringify(current.status === 'waitlisted' ? w.leaveConfirm : current.status === 'offered' ? w.releaseConfirm : w.cancelConfirm)})`;
 const cutoff = fill(bw.cutoff, { hours: String(can.cutoffHours) });
 const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchParams({ action: 'TEMPLATE', text: title, dates: `${new Date(current.start).toISOString().replace(/[-:]|\.\d{3}/g, '')}/${new Date(current.end).toISOString().replace(/[-:]|\.\d{3}/g, '')}`, details: url, location })}`;
 ---
@@ -85,10 +119,12 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
   <div class="pc-manage">
     <div class={`pc-manage-icon is-${current.status}`} aria-hidden="true">
       {current.status === 'confirmed' ? <svg viewBox="0 0 24 24"><path d="M5 12l5 5L19 7" /></svg>
-        : current.status === 'pending' ? <svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="8" /><path d="M12 8v4l3 2" /></svg>
+        : current.status === 'pending' || current.status === 'offered' ? <svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="8" /><path d="M12 8v4l3 2" /></svg>
+        : current.status === 'waitlisted' ? <svg viewBox="0 0 24 24"><path d="M5 7h14M5 12h14M5 17h8" /></svg>
         : <svg viewBox="0 0 24 24"><path d="M7 7l10 10M17 7 7 17" /></svg>}
     </div>
     <h1>{heading}</h1>
+    {inLine && <p class="pc-manage-wait">{inLine}</p>}
     <p class="pc-manage-lede">{lede}</p>
     {error && <p class="pc-bk-error">{error}</p>}
     <dl class="pc-manage-card">
@@ -96,7 +132,7 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
       <div><dt>{w.when}</dt><dd>{when}</dd></div>
       {location && <div><dt>{w.where}</dt><dd>{location}</dd></div>}
       {current.seats > 1 && <div><dt>{w.seatsField}</dt><dd>{current.seats}</dd></div>}
-      <div><dt>{w.status}</dt><dd class={`pc-manage-status is-${current.status}`}>{w.statuses[current.status]}</dd></div>
+      <div><dt>{w.status}</dt><dd class={`pc-manage-status is-${current.status}`}>{statusLabel}</dd></div>
       <div><dt>{w.reference}</dt><dd class="mono">{current.id.slice(0, 8).toUpperCase()}</dd></div>
     </dl>
     {active && upcoming && (
@@ -111,13 +147,19 @@ const googleUrl = `https://calendar.google.com/calendar/render?${new URLSearchPa
             </div>
           </details>
         )}
+        {can.confirm && (
+          <form method="post">
+            <input type="hidden" name="op" value="confirm" />
+            <button class="pc-manage-btn is-primary" type="submit">{w.confirmSpot}</button>
+          </form>
+        )}
         {resource && link && can.reschedule && (
           <a class="pc-manage-btn" href={`${bookingLinkUrl(resource.slug, link.slug)}?reschedule=${encodeURIComponent(current.manageToken)}`}>{bw.reschedule}</a>
         )}
         {can.cancel && (
-          <form method="post" onsubmit={`return confirm(${JSON.stringify(w.cancelConfirm)})`}>
+          <form method="post" onsubmit={cancelAsk}>
             <input type="hidden" name="op" value="cancel" />
-            <button class="pc-manage-btn is-danger" type="submit">{w.cancel}</button>
+            <button class="pc-manage-btn is-danger" type="submit">{cancelLabel}</button>
           </form>
         )}
       </div>

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

@@ -22,7 +22,7 @@ import { CALENDAR, eventUrl, withoutPrivateFields } from '../../lib/calendar/con
 import { eventIsPublic, featuredOccurrence, rsvpDeadline } from '../../lib/calendar/events';
 import { eventJsonLd } from '../../lib/calendar/seo';
 import { upcomingEvents } from '../../lib/calendar/cards';
-import { seatsTaken, BookingError } from '../../lib/booking/service';
+import { seatsTaken, waitlistOn, BookingError } from '../../lib/booking/service';
 import { manageUrl } from '../../lib/calendar/config';
 import { waitUntilFrom } from '../../lib/webhooks';
 
@@ -77,9 +77,10 @@ const formHtml = hiddenFields(await formVersion(definition), requestId) + `<inpu
 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,
-    open: occurrence.end > now && !occurrence.cancelled && !(closesAt !== null && closesAt <= now), closesAt }
+    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));

package/src/styles/admin.css

@@ -1476,7 +1476,9 @@ a.bk-row:hover, .bk-row.is-sel { background: var(--hover); }
 .bk-st { font-size: 12px; font-weight: 600; white-space: nowrap; }
 .bk-st.is-confirmed { color: var(--green); }
 .bk-st.is-pending { color: var(--amber); }
-.bk-st.is-cancelled, .bk-st.is-declined, .bk-st.is-block { color: var(--muted); }
+.bk-st.is-cancelled, .bk-st.is-declined, .bk-st.is-block, .bk-st.is-expired { color: var(--muted); }
+.bk-st.is-waitlisted { color: var(--text-2); }
+.bk-st.is-offered { color: var(--accent); }
 .bk-panel { padding: 16px 18px; position: sticky; top: 64px; }
 .bk-panel-head { display: flex; justify-content: space-between; align-items: center; }
 .bk-panel h2 { font-size: 18px; margin: 6px 0 2px; }

package/src/styles/site.css

@@ -1119,7 +1119,9 @@ li::marker { color: var(--muted); }
   .pc-manage-icon svg { width: 26px; height: 26px; fill: none; stroke: currentColor; stroke-width: 2.4; stroke-linecap: round; stroke-linejoin: round; }
   .pc-manage-icon.is-confirmed { background: color-mix(in srgb, var(--success) 14%, var(--panel)); color: var(--success); }
   .pc-manage-icon.is-pending { background: color-mix(in srgb, var(--warning) 14%, var(--panel)); color: var(--warning); }
-  .pc-manage-icon.is-cancelled, .pc-manage-icon.is-declined { background: var(--soft); color: var(--muted); }
+  .pc-manage-icon.is-cancelled, .pc-manage-icon.is-declined, .pc-manage-icon.is-expired { background: var(--soft); color: var(--muted); }
+  .pc-manage-icon.is-waitlisted { background: var(--soft); color: var(--ink); }
+  .pc-manage-icon.is-offered { background: color-mix(in srgb, var(--success) 14%, var(--panel)); color: var(--success); }
   .pc-manage h1 { font-size: 30px; margin: 0 0 8px; }
   .pc-manage-lede { color: var(--muted); margin: 0 0 18px; }
   .pc-manage-card { text-align: left; background: var(--panel); border: 1px solid var(--line); border-radius: var(--r); margin: 0; padding: 4px 18px; box-shadow: var(--sh-1); }
@@ -1130,12 +1132,17 @@ li::marker { color: var(--muted); }
   .pc-manage-card .mono { font-family: var(--font-mono); font-size: 13px; }
   .pc-manage-status.is-confirmed { color: var(--success); font-weight: 600; }
   .pc-manage-status.is-pending { color: var(--warning); font-weight: 600; }
+  .pc-manage-status.is-waitlisted { font-weight: 600; }
+  .pc-manage-status.is-offered { color: var(--success); font-weight: 600; }
+  .pc-manage-wait { font-weight: 600; margin: 0 0 6px; }
   .pc-manage-actions { display: flex; gap: 8px; justify-content: center; flex-wrap: wrap; margin-top: 16px; }
   .pc-manage-actions .pc-ev-add { margin: 0; }
   .pc-manage-actions .pc-ev-add > summary { width: auto; }
   .pc-manage-btn { display: inline-flex; align-items: center; height: 40px; padding: 0 14px; border: 1px solid var(--line-2); border-radius: 12px; background: var(--panel); font: 550 14px/1.2 var(--font-body); color: var(--ink); text-decoration: none; cursor: pointer; }
   .pc-manage-btn:hover { background: var(--soft); }
   .pc-manage-btn.is-danger { color: var(--danger); }
+  .pc-manage-btn.is-primary { background: var(--btn); color: var(--btn-ink); border-color: transparent; }
+  .pc-manage-btn.is-primary:hover { background: var(--btn); filter: brightness(1.08); }
   .pc-manage-note { font-size: 12.5px; color: var(--muted); margin-top: 22px; }
 
   /* RSVP on the event page */
@@ -1149,6 +1156,8 @@ li::marker { color: var(--muted); }
   .pc-ev-full { font-size: 14px; font-weight: 600; color: var(--muted); }
   .pc-ev-closes { font-size: 13.5px; color: var(--muted); margin: 0 0 10px; }
   .pc-ev-full + .pc-ev-closes { margin-top: 4px; }
+  .pc-ev-full.is-waitlist { color: var(--ink); margin: 0 0 2px; }
+  .pc-ev-waitlist { font-size: 13.5px; color: var(--muted); margin: 0 0 10px; }
   .pc-ev-notice { font-size: 14px; line-height: 1.5; background: var(--soft); border-radius: var(--r-sm); padding: 9px 12px; margin: 0 0 14px; }
 
   @media (max-width: 860px) {

package/src/styles/test-phones.css

@@ -0,0 +1,30 @@
+/* Test phones panel and "Send test to my phone" (Admin → Announcements and
+   Admin → Mobile app). Scoped under .tp; admin.css tokens only. */
+.tp { display: flex; flex-direction: column; align-items: flex-start; gap: 12px; scroll-margin-top: 72px; }
+.tp > * { align-self: stretch; }
+.tp > .btn { align-self: flex-start; }
+.tp-head h2 { font-size: 14.5px; margin: 0; letter-spacing: -0.01em; }
+.tp-head p { margin: 2px 0 0; color: var(--muted); font-size: 13px; max-width: 64ch; }
+.tp-note { margin: 0; max-width: 64ch; }
+.tp-intro { margin: 0 0 14px; max-width: 64ch; }
+.tp-empty { margin: 0; color: var(--text-2); font-size: 13px; }
+.tp-list { list-style: none; margin: 0; padding: 0; border-top: 1px solid var(--line); }
+.tp-list li { display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 9px 0; border-bottom: 1px solid var(--line); }
+.tp-phone { display: flex; flex-direction: column; min-width: 0; }
+.tp-phone b { font-size: 13.5px; }
+.tp-phone small { color: var(--muted); font-size: 12px; }
+.tp-code { display: grid; grid-template-columns: auto minmax(0, 1fr); align-items: center; gap: 4px 16px; background: var(--panel-2); border-radius: var(--r-md); padding: 12px 14px; }
+.tp-code p { margin: 0; color: var(--text-2); font-size: 13px; max-width: 52ch; }
+.tp-code .btn { grid-column: 2; justify-self: start; margin-top: 4px; }
+.tp-digits { grid-row: span 2; font: 700 30px/1.1 ui-monospace, 'SF Mono', Menlo, monospace; letter-spacing: 0.18em; font-variant-numeric: tabular-nums; }
+.tp-flash .flash { margin: 0; }
+/* an always-present live region; no gap while empty */
+.tp > .tp-flash:empty { margin-top: -12px; }
+.tp-send > .tp-flash:empty { margin-top: -8px; }
+.tp-send { display: flex; flex-direction: column; align-items: center; gap: 8px; align-self: stretch; }
+.tp-send .tp-flash { align-self: stretch; text-align: center; }
+@media (max-width: 560px) {
+  .tp-code { grid-template-columns: minmax(0, 1fr); }
+  .tp-digits { grid-row: auto; }
+  .tp-code .btn { grid-column: 1; }
+}

package/src/theme-sdk/index.ts

@@ -11,7 +11,7 @@ export interface HomeProps { settings: Settings; page: Page | null; posts: Post[
 export interface PageProps { settings: Settings; page: Page; html: string }
 export interface PostProps { settings: Settings; post: Post; html: string; authors: User[]; related: Post[] }
 import type { Occurrence } from '../lib/calendar/events';
-export interface EventProps { settings: Settings; event: CalEvent; html: string; calendars: Calendar[]; origin: string; occurrence: Occurrence; upcoming: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>[]; preview?: boolean; rsvp?: {going:number;left:number|null;maxSeats:number;error:string;open:boolean;closesAt?:number|null;duplicate?:boolean}|null }
+export interface EventProps { settings: Settings; event: CalEvent; html: string; calendars: Calendar[]; origin: string; occurrence: Occurrence; upcoming: Pick<Occurrence, 'event' | 'start' | 'end' | 'allDay' | 'days'>[]; preview?: boolean; rsvp?: {going:number;left:number|null;maxSeats:number;error:string;open:boolean;closesAt?:number|null;duplicate?:boolean;waitlist?:boolean}|null }
 /**
  * Props for a coded section. `data` holds resolved values: link fields arrive
  * as LinkValue, lists as row arrays, source fields as fresh item arrays