@acms-subir/core 0.3.50 → 0.3.52

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @acms-subir/core
 
+## 0.3.52
+
+### Patch Changes
+
+- b8ffed8: Saved TV screens: **Admin → Calendar → Screens** (for people who manage rooms and calendars).
+
+  Each screen has a name, the display settings (view, hours with "Show all hours" or "Fit the events", days, first day, calendars, rooms in column order, tags, theme, text size, what shows, title, language) beside a live 16:9 preview, and a long random key that is its whole address: `/display/s/<key>`. **Copy link** copies it, and **Rotate link** makes a new one; the old link stops working at once. **Last check-in** shows when the screen last fetched its events (a TV that's on checks in every 5 minutes), so staff can tell a TV is off. A change made in the admin reaches the TV within 5 minutes. The same editor builds quick links, can start from a pasted one, and saves any quick link as a screen.
+
+  **Show private calendars and room bookings** (off by default) lets a screen show the private calendars it names and the confirmed bookings of the rooms it names (or of rooms set to show on the calendar): titles, rooms, hosts and the name on each booking ("Birthday party · Rivera"), never emails, phone numbers, booking notes or RSVP lists. A Google booking keeps "Booked" with its own title under it. Turning it on, or previewing it, also needs **Manage bookings**. Saved screens are never cached (`private, no-store`) and send no referrer. Wrong keys are rate-limited: after 60 in 15 minutes from one address, further wrong keys from it get a 429, while a screen's own key always opens it (bad keys can't lock a church's TVs out).
+
+  Migration 67 adds the `display_screens` table. Screens go into backups without their keys; after a restore each screen has a new link to put on its TV. New: `/display/s/[key]`, `/admin/calendar/screens`, `/admin/calendar/screens/preview` and `/api/calendar/screens` (staff only). `npx acms docs calendar` covers screens, keys and private details.
+
+  The display list now keeps each day in one column when it fits, so a column never starts without its day.
+
+  Moved and cancelled dates on the display use the event pages' own words ("Cambio de horario" in Spanish), so a TV says what the site and its emails say.
+
+## 0.3.51
+
+### Patch Changes
+
+- 1efe99e: Section event items (an events source, as theme sections and the apps' native sections receive them) carry `rooms`: the public rooms each date holds, as `{ slug, name, color }`. A moved date lists its own rooms, and only rooms set to "Name it on public events" are included, with `color` `null` when a room has none. A Classes card can now name the room without staff typing it into the place. `upcomingEvents()` in the theme SDK returns `rooms` too, as `{ id, slug, name, color }`. The library's Upcoming events section shows "Moved · " before a moved date, with "Moved from …" and the note. `EventItem` and its sibling types now live in `lib/section-items.ts`, which has no imports, and `EventItemRoom` is exported from `@acms-subir/core/theme`.
+
+  The app API's `event.repeats` (`/api/v1/events`, `/api/v1/events/:slug` and search) now follows `?locale=`: "Todos los sábados, hasta el 1 jun 2030" instead of always English. Without a locale it uses the site's main language, and the until date is written in that language too. `eventToJson` takes a `locale` option for it. The REST API and webhooks keep English.
+
 ## 0.3.50
 
 ### Patch Changes

package/cli/migrations.generated.mjs

@@ -434,6 +434,19 @@ var ANNOUNCEMENT_VISIBLE_COLUMNS = [
   "published_at"
 ];
 
+// src/lib/display/store.ts
+var SCREENS_MIGRATION = {
+  version: 67,
+  statements: [
+    `CREATE TABLE display_screens (
+      id TEXT PRIMARY KEY, name TEXT NOT NULL DEFAULT '', params TEXT NOT NULL DEFAULT '', locale TEXT NOT NULL DEFAULT '',
+      private_details INTEGER NOT NULL DEFAULT 0, screen_key TEXT NOT NULL DEFAULT '', last_seen_at INTEGER,
+      ord INTEGER NOT NULL DEFAULT 0, created_at INTEGER NOT NULL, updated_at INTEGER NOT NULL
+    )`,
+    `CREATE UNIQUE INDEX display_screens_key ON display_screens (screen_key) WHERE screen_key <> ''`
+  ]
+};
+
 // src/lib/repo/migrations.ts
 var CONTENT_VERSION_COLUMNS = {
   settings: [
@@ -1266,7 +1279,9 @@ var MIGRATIONS = [
   EVENT_CHANGES_MIGRATION,
   // single dates of a series moved (CalEvent.movedDates): a column on the
   // row, so the triggers on events (content version, event_changes) see a move
-  MOVED_DATES_MIGRATION(contentVersionTriggers("events", [...CONTENT_VERSION_COLUMNS.events, "cancelled_dates", "moved_dates"])[2])
+  MOVED_DATES_MIGRATION(contentVersionTriggers("events", [...CONTENT_VERSION_COLUMNS.events, "cancelled_dates", "moved_dates"])[2]),
+  // saved TV screens (Admin → Calendar → Screens, lib/display/store.ts)
+  SCREENS_MIGRATION
 ];
 var CURRENT_CONTENT_VERSION_COLUMNS = {
   ...CONTENT_VERSION_COLUMNS,

package/docs/calendar.md

@@ -195,9 +195,12 @@ client has `roomFree({ room, start, end })`, and the native package has
 
 A full-screen calendar for a TV in a lobby or on a room's door. It shows a week, day, month, list, rooms or "now and next" view, with your own hours (8 AM to 10 PM by default). TVs have no mouse, so everything about a screen lives in its link. The page has nothing to focus or follow (no links, buttons or tab stops), because a remote's presses go to the page.
 
-A display link spells out its settings in the address: `/display/calendar?view=week&hours=8-22`. Nothing is saved. Whatever its parameters, it shows only what `calendar.ics` shows: published events in public calendars, or in an unlisted calendar named in `cal=`. It never shows subscribed calendars, booking blocks, hosts, or rooms that aren't shown on public events.
+There are two kinds of link:
 
-Spanish (or any other site language): `/es/display/calendar?…`.
+- **Quick links** spell out their settings in the address: `/display/calendar?view=week&hours=8-22`. Nothing is saved. Whatever their parameters, they show only what `calendar.ics` shows: published events in public calendars, or in an unlisted calendar named in `cal=`. There are no subscribed calendars, booking blocks, room names (until rooms are shown on public events) or hosts.
+- **Saved screens** live in **Admin → Calendar → Screens**. Each has a name, the same settings and a long random key, which is the whole address: `/display/s/<key>`. A screen can show private details (below).
+
+Spanish (or any other site language): `/es/display/calendar?…`, or the screen's Language setting.
 
 ### Parameters
 
@@ -209,12 +212,12 @@ Each has a default; leave out what you don't need. Lists are comma-separated or
 | `hours` | `8-22` · `8:30-21` · `8-24` · `0-24` (or `all`) · `auto` | The hour grids' visible hours. `8-24` ends at midnight. `auto` fits the events shown, never less than 6 hours. Events outside the hours are cut and marked (▲ ▼), never left out. Default `8-22`. |
 | `days` | `7` · `5` · `mon-fri` · `mon-sat` · `sun,wed,fri` | A number is that many days from the first day; names pick weekdays. For `list`, a number is how many days the list covers. Default 7. |
 | `start` | `sun` · `mon` · `today` | The week's first day. `today` gives a rolling week. Default: Calendar settings → Defaults. |
-| `cal` | calendar slugs | Only these calendars. Default: every public calendar. Private calendars never show. |
-| `tag` / `notag` | tag names | Only events with one of these tags, or none of them. `tag=Class` makes a class board. Internal `#` tags never match. |
-| `room` | room slugs | Only events held in these rooms. With `view=rooms` it also sets the columns and their order (otherwise every room of kind "Room"). Only rooms shown on public events count; any other room shows nothing. |
+| `cal` | calendar slugs | Only these calendars. Default: every public calendar. Private calendars need a saved screen with private details. |
+| `tag` / `notag` | tag names | Only events with one of these tags, or none of them. `tag=Class` makes a class board. Internal `#` tags only match on a screen with private details. |
+| `room` | room slugs | Only events held in these rooms. With `view=rooms` it also sets the columns and their order (otherwise every room of kind "Room"). On a quick link, only rooms named on public events count; any other room shows nothing. |
 | `theme` | `dark` · `light` | Default `dark`. |
 | `size` | `s` · `m` · `l` · `xl` | Text size for the viewing distance. Default `m`. |
-| `show` | `time,room,host,clock,legend,qr` (or `none`) | What each event and the page show. Default `time,room,clock`. `legend` is a colour key; `qr` is a code that opens the calendar on a phone (with the same filters). `host` is for saved screens with private details, which are coming next. |
+| `show` | `time,room,host,clock,legend,qr` (or `none`) | What each event and the page show. Default `time,room,clock`. `legend` is a colour key; `qr` is a code that opens the calendar on a phone (with the same public filters). Hosts only show on a screen with private details. |
 | `title` | text | Replaces the heading ("This week", "Today"…). |
 
 Examples:
@@ -223,19 +226,30 @@ Examples:
 - `/display/calendar?view=list&days=14&size=l`: the next two weeks, in large text.
 - `/display/calendar?view=rooms&room=chapel,hall,youth&hours=auto`: today, one column per room.
 
+The editor in Admin → Calendar → Screens builds these links (**Quick link**), shows a live preview and can save any quick link as a screen.
+
 ### What a board does
 
 - The first view is rendered on the server. A small script moves the now line, dims what has ended, and turns the list's pages (the list runs in columns, then pages, instead of scrolling).
 - Every 5 minutes it fetches the board again from the same address, so a change made in the admin reaches the TV within 5 minutes. It also fetches at midnight, so the board rolls to the next day, week or month. It reloads once a night (between 3:00 and 3:40, site time).
-- Offline, it keeps the last board and shows "Updated 7:41 PM". A small service worker (scope `/display/`) keeps a copy of the page, so a reload during an outage shows the last events instead of an error page.
+- Offline, it keeps the last board and shows "Updated 7:41 PM". A small service worker (scope `/display/`) keeps a copy of the page, so a reload during an outage or a server error shows the last events instead of an error page (a copy older than a week is never shown).
 - Events take their room's colour, else their calendar's. Appointments from Google booking pages (tagged `#google-booking`) show as "Booked". A cancelled date is struck through, and a moved date shows at its new time, marked "Moved" with its old time (and day, when that changed).
-- The page may be framed anywhere (`frame-ancestors *`), sends no referrer, is never indexed, and needs no cookie. It may sit in a shared cache for a minute.
+- The page may be framed anywhere (`frame-ancestors *`), sends no referrer, is never indexed, and needs no cookie. Quick links may sit in a shared cache for a minute; saved screens never do.
+
+### Saved screens, keys and private details
+
+**Show private calendars and room bookings** (each screen's switch, off by default) lets the screen show the private calendars it names in `cal=` and the confirmed bookings of the rooms it names in `room=` (or of rooms set to show on the calendar). It shows their titles, times, rooms, hosts and the name on each booking ("Birthday party · Rivera"). It never shows emails, phone numbers, booking notes or RSVP lists. Turning it on (or previewing it) needs both **Manage rooms and calendars** and **Manage bookings**. Anyone with the screen's link can see what it shows, so keep the link in the TV's playlist and nowhere public. A booking isn't in any calendar, so a `cal=` filter leaves bookings out.
+
+- **Copy link** copies the screen's address. **Rotate link** makes a new key; the old address stops working at once (the TV shows "This screen isn't available" until it gets the new link).
+- **Last check-in** is when the screen last fetched its events. A TV that is on checks in every 5 minutes, so an old check-in means it's off or offline.
+- Wrong keys are rate-limited per network address: after 60 wrong keys in 15 minutes, further wrong keys from that address get "Too many" until the window ends. A screen's own key always opens it.
+- Screens go into backups without their keys. After a restore, each screen has a new link: copy it into each TV again.
 
 ### Setting up a TV with AbleSign
 
 AbleSign (app.ablesign.tv/screens) plays a playlist on each screen; a website is one item.
 
-1. In AbleSign, open **Websites → Add website** and paste the display link.
+1. In AbleSign, open **Websites → Add website** and paste the screen's link (or a quick link).
 2. Add the website to the screen's playlist with a long duration (AbleSign reloads a website every time the playlist plays it; the page refreshes itself).
 3. Put a short image before it in the playlist, so the page loads in the background.
 4. The Fire TV Stick needs Fire OS 6 or later (not Vega OS) and AbleSign 2.2.2 or later.
@@ -253,4 +267,4 @@ A theme's `theme.css` loads after the board's own styles. The simplest way to re
 .acms-display[data-theme='light'] { --display-bg: #fffaf2; --display-fg: #1d1a16; }
 ```
 
-Keep blocks flat: the built-in look has no accent stripes or gradients. The display leaves out the site's header, footer, head code and analytics. A site file at `src/pages/display/calendar.astro` replaces that page.
+Keep blocks flat: the built-in look has no accent stripes or gradients. The display leaves out the site's header, footer, head code and analytics. A site file at `src/pages/display/calendar.astro` (or `display/s/[key].astro`) replaces that page.

package/docs/theme-authoring.md

@@ -55,7 +55,7 @@ const date = new Intl.DateTimeFormat('en', { dateStyle: 'medium', timeZone: Astr
 </section>}
 ```
 
-`calendarConfig()` returns a fresh `{ enabled, base, eventsBase }` object; `eventUrl(slug)` uses the configured event base. `upcomingEvents(Astro, options?)` resolves storage through `Astro.locals` and loads the site's timezone settings. It returns the next or ongoing occurrence of each distinct published, publicly listed native event, soonest first, including recurring and all-day events. Private/unlisted calendars and external feed entries are excluded; cancelled public events remain visible so templates can label them, and a date moved to another time carries `moved` (`{ from: { start, end }, note }`) so templates can say "Moved from …". `tag` keeps only events with that tag and `excludeTag` leaves them out (a tag's name in any case, or its slug), e.g. `upcomingEvents(Astro, { tag: 'Class' })` for a Classes page. Disabled calendars and a zero limit return `[]` without accessing storage. Storage errors propagate to the template.
+`calendarConfig()` returns a fresh `{ enabled, base, eventsBase }` object; `eventUrl(slug)` uses the configured event base. `upcomingEvents(Astro, options?)` resolves storage through `Astro.locals` and loads the site's timezone settings. It returns the next or ongoing occurrence of each distinct published, publicly listed native event, soonest first, including recurring and all-day events. Private/unlisted calendars and external feed entries are excluded; cancelled public events remain visible so templates can label them, and a date moved to another time carries `moved` (`{ from: { start, end }, note }`) so templates can say "Moved from …". `rooms` lists the public rooms each date holds (`{ id, slug, name, color }`, only rooms set to show on public events). Section `EventItem`s from an events source carry `moved` (`{ from: "Thu, Oct 1 · 6:00 PM", note }` or `null`) and `rooms` (`{ slug, name, color }[]`, `color` `null` when the room has none). `tag` keeps only events with that tag and `excludeTag` leaves them out (a tag's name in any case, or its slug), e.g. `upcomingEvents(Astro, { tag: 'Class' })` for a Classes page. Disabled calendars and a zero limit return `[]` without accessing storage. Storage errors propagate to the template.
 
 Options default to `{ limit: 6, horizonDays: 400 }`. The limit must be a non-negative safe integer and the horizon a positive finite number. Each `UpcomingEvent` contains `{ event, start, end, allDay, days }`, with start/end in Unix milliseconds. Format occurrence timestamps using the site's timezone rather than the authored `event.start` when displaying recurring events. `UpcomingEvent`, `UpcomingEventsOptions`, and `ThemeCalendarConfig` are exported types.
 

package/integration.mjs

@@ -863,6 +863,11 @@ export default function acms(options = {}) {
       // TV displays: quick links (everything in the address) and their offline worker
       ['/display/calendar', 'display/calendar.astro'],
       ['/display/sw.js', 'display/sw.js.ts'],
+      // saved screens: a long random key is the whole address (Admin → Calendar → Screens)
+      ['/display/s/[key]', 'display/s/[key].astro'],
+      ['/admin/calendar/screens', 'admin/calendar/screens/index.astro'],
+      ['/admin/calendar/screens/preview', 'admin/calendar/screens/preview.astro'],
+      ['/api/calendar/screens', 'api/calendar/screens.ts'],
       ['/api/v1/events', 'api/v1/events.ts'],
       ['/api/v1/calendars', 'api/v1/calendars.ts'],
       // RSVPs from apps: a date's status, then POST /bookings (room bookings there need bookings on)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.50",
+  "version": "0.3.52",
   "publishConfig": {
     "access": "public"
   },

package/section-library/upcoming-events/UpcomingEvents.astro

@@ -24,8 +24,9 @@ const fit = data.imageFit === 'contain' ? 'contain' : 'cover';
               ? <a class="upev-media" href={e.url} tabindex="-1" aria-hidden="true"><img src={image.src} alt="" loading="lazy" /></a>
               : <span class="upev-date" aria-hidden="true"><b>{e.day}</b>{e.month}</span>}
             <div class="upev-body">
-              <span class="upev-when">{e.cancelled ? 'Cancelled · ' : ''}{e.when}</span>
+              <span class="upev-when">{e.cancelled ? 'Cancelled · ' : e.moved ? 'Moved · ' : ''}{e.when}</span>
               <h3 class="upev-title"><a href={e.url}>{e.title}</a></h3>
+              {!e.cancelled && e.moved && <span class="upev-moved">Moved from {e.moved.from}{e.moved.note ? ` · ${e.moved.note}` : ''}</span>}
               {data.showSummary && e.summary && <p class="upev-summary">{e.summary}</p>}
               {data.showLocation !== false && e.location && <span class="upev-loc">{e.location}</span>}
             </div>
@@ -59,5 +60,6 @@ const fit = data.imageFit === 'contain' ? 'contain' : 'cover';
   .upev-title a { color: inherit; text-decoration: none; }
   .upev-title a:hover { text-decoration: underline; }
   .upev-loc { font-size: 0.9rem; color: var(--muted); }
+  .upev-moved { font-size: 0.9rem; color: var(--accent, inherit); }
   .is-cancelled .upev-title { text-decoration: line-through; opacity: 0.7; }
 </style>