@acms-subir/core 0.3.6 → 0.3.7

package/src/lib/schema.ts

@@ -3,6 +3,7 @@ import { PushSettings } from './push/types';
 import { SectionPages } from '../theme-sdk/contract.mjs';
 import { AiConfig, AgentConfig } from './ai-schema';
 import { z } from 'zod';
+import { FormDefinition, FormResponse } from './forms/schema';
 
 // ---- Widgets -------------------------------------------------------------
 // Each widget type has a zod config schema; pages store an ordered array of
@@ -304,6 +305,18 @@ export const EventLocation = z.object({
   address: z.string().default(''),
   // a map link or an online-meeting URL
   url: z.string().default(''),
+  // the pin, when known (picked from suggestions, parsed from a map link,
+  // or copied from a saved place); null = no pin, so no map image
+  lat: z.number().nullable().default(null),
+  lng: z.number().nullable().default(null),
+  // the saved place this was picked from ('' = typed by hand). The fields
+  // above are a copy; saving the place refreshes upcoming events' copies.
+  placeId: z.string().default(''),
+  // show the static map image on the public event page
+  showMap: z.boolean().default(true),
+  // cached static map images (media URLs) for the current pin; '' = none
+  mapImage: z.string().default(''),
+  mapImageDark: z.string().default(''),
 });
 export type EventLocation = z.infer<typeof EventLocation>;
 
@@ -365,6 +378,7 @@ export const CalEvent = z.object({
     capacity: z.number().int().default(0),
     autoConfirm: z.boolean().default(true),
     maxSeats: z.number().int().default(4),
+    form: FormDefinition.optional(),
   }).default({}),
   // rooms/people this event uses: they can't be booked while it happens (or
   // all day). Computed into availability, never stored as bookings. Drafts
@@ -439,12 +453,35 @@ export const Resource = z.object({
   showOnCalendar: z.boolean().default(false),
   // secret for the staff feed /book/<slug>.ics?t=… (bookings with names)
   feedToken: z.string().default(''),
+  // the saved place this room is in ('' = none)
+  placeId: z.string().default(''),
   order: z.number().default(0),
   createdAt: z.number(),
   updatedAt: z.number(),
 });
 export type Resource = z.infer<typeof Resource>;
 
+// A saved place (HQ, the park pavilion…): picked in an event's Where field,
+// it copies its details into the event. Rooms can belong to one (resource.placeId).
+export const Place = z.object({
+  id: z.string(),
+  name: z.string(),
+  address: z.string().default(''),
+  url: z.string().default(''),
+  lat: z.number().nullable().default(null),
+  lng: z.number().nullable().default(null),
+  // shown to editors only ("Use the side door")
+  notes: z.string().default(''),
+  // new events start here
+  isDefault: z.boolean().default(false),
+  mapImage: z.string().default(''),
+  mapImageDark: z.string().default(''),
+  order: z.number().default(0),
+  createdAt: z.number(),
+  updatedAt: z.number(),
+});
+export type Place = z.infer<typeof Place>;
+
 export const QUESTION_TYPES = ['text', 'textarea', 'email', 'phone', 'number', 'select', 'checkbox', 'date'] as const;
 export const BookingQuestion = z.object({
   id: z.string(),
@@ -549,6 +586,7 @@ export const Booking = z.object({
   phone: z.string().default(''),
   seats: z.number().int().default(1),
   answers: z.record(z.string()).default({}),
+  formResponse: FormResponse.optional(),
   notes: z.string().default(''), // staff-only
   manageToken: z.string().default(''),
   source: z.enum(['web', 'admin', 'api', 'agent']).default('web'),

package/src/lib/umami.ts

@@ -21,6 +21,7 @@ export interface TrafficSummary {
 }
 
 const TTL = 10 * 60_000;
+const CACHE_MAX = 32;
 const cache = new Map<string, { at: number; value: TrafficSummary | null }>();
 
 function config(settings: Settings) {
@@ -97,7 +98,13 @@ export async function getTraffic(settings: Settings, days = 30): Promise<Traffic
   } catch {
     value = null;
   }
-  cache.set(cacheKey, { at: Date.now(), value });
+  // Expiry controls freshness, not retention. Bound old site/range keys in
+  // long-lived Node processes as well as short-lived Worker isolates.
+  const now = Date.now();
+  for (const [key, entry] of cache) if (now - entry.at >= TTL) cache.delete(key);
+  cache.delete(cacheKey);
+  cache.set(cacheKey, { at: now, value });
+  if (cache.size > CACHE_MAX) cache.delete(cache.keys().next().value!);
   return value;
 }
 

package/src/pages/admin/calendar/bookings.astro

@@ -1,11 +1,13 @@
 ---
+import { csv } from '../../../lib/forms/service';
+import { readForm } from '../../../lib/forms/http';
 import Admin from '../../../layouts/Admin.astro';
 import BookingsHead from '../../../components/calendar/BookingsHead.astro';
 import { eventHolds } from '../../../lib/booking/holds';
 import Modal from '../../../components/Modal.astro';
 import { getRepo } from '../../../lib/repo';
 import type { Booking, BookingStatus } from '../../../lib/schema';
-import { bookingsEnabled, eventUrl } from '../../../lib/calendar/config';
+import { CALENDAR, bookingsEnabled, eventUrl } from '../../../lib/calendar/config';
 import { createBlock, createResourceBooking, rescheduleBooking, setBookingStatus, BookingError } from '../../../lib/booking/service';
 import { addDaysYmd, localMidnight, ymd } from '../../../lib/booking/availability';
 import { fmt } from '../../../lib/booking/view';
@@ -16,7 +18,7 @@ import { waitUntilFrom } from '../../../lib/webhooks';
 // Bookings (mockup I): Cal.com-style tabs, an agenda by day with pending
 // requests first, a Day view with one column per resource, a details panel
 // (?b=<id>) with private notes, plus Block time and Add booking.
-if (!bookingsEnabled()) return new Response(null, { status: 404 });
+if (!CALENDAR.enabled) return new Response(null, { status: 404 });
 const repo = await getRepo(Astro.locals);
 const settings = await repo.getSettings();
 const tz = settings.timezone || 'UTC';
@@ -43,10 +45,11 @@ let notice = Astro.url.searchParams.get('notice') ?? '';
 let error = '';
 
 if (Astro.request.method === 'POST') {
-  const form = await Astro.request.formData();
+  const form = await readForm(Astro.request);
   const op = String(form.get('op'));
   const id = String(form.get('id') || '');
   try {
+    if (!bookingsEnabled() && ['block', 'add', 'reschedule'].includes(op)) throw new BookingError(400, 'Resource bookings are disabled.');
     if (op === 'status') {
       const b = await repo.getBooking(id);
       if (!b) throw new BookingError(404, 'Booking not found.');
@@ -104,9 +107,10 @@ if (Astro.request.method === 'POST') {
 // ---- data ----
 const tab = (['upcoming', 'unconfirmed', 'past', 'cancelled'] as const).find((t) => t === Astro.url.searchParams.get('tab')) ?? 'upcoming';
 const view = Astro.url.searchParams.get('view') === 'day' ? 'day' : 'agenda';
+const eventFilter = Astro.url.searchParams.get('event') ?? '';
 const resFilter = Astro.url.searchParams.get('r') ?? '';
 const q = (Astro.url.searchParams.get('q') ?? '').trim().toLowerCase();
-const all = await repo.listBookings({ from: now - 400 * 86_400_000 });
+const all = await repo.listBookings({ from: now - 400 * 86_400_000, ...(eventFilter ? { eventId: eventFilter } : {}), ...(!bookingsEnabled() ? { kinds: ['rsvp'] } : {}) });
 const titleOf = (b: Booking) =>
   b.kind === 'block' ? `Blocked${b.notes ? ` · ${b.notes}` : ''}`
   : b.kind === 'rsvp' ? b.name
@@ -116,6 +120,7 @@ const contextOf = (b: Booking) =>
   : [linkById.get(b.linkId)?.name, ...Object.values(b.answers).slice(0, 2)].filter(Boolean).join(' · ');
 const where = (b: Booking) => (b.kind === 'rsvp' ? evById.get(b.eventId)?.location.name || 'Event' : resById.get(b.resourceId)?.name ?? '—');
 const matches = (b: Booking) =>
+  (!eventFilter || b.eventId === eventFilter) &&
   (!resFilter || b.resourceId === resFilter) &&
   (!q || `${b.name} ${b.email} ${b.phone} ${where(b)} ${contextOf(b)}`.toLowerCase().includes(q));
 const active = (b: Booking) => b.status === 'pending' || b.status === 'confirmed';
@@ -131,15 +136,14 @@ const list = all
   .sort((a, b) => (tab === 'past' || tab === 'cancelled' ? b.start - a.start : a.start - b.start))
   .slice(0, 300);
 if (Astro.url.searchParams.get('format') === 'csv') {
-  const cell = (v: string) => (/[",\n]/.test(v) ? `"${v.replace(/"/g, '""')}"` : v);
   const iso = (ms: number) => new Date(ms).toISOString();
   const keys = [...new Set(list.flatMap((b) => Object.keys(b.answers)))];
   const rows = [
     ['Start', 'End', 'Status', 'Kind', 'Resource / event', 'Link', 'Name', 'Email', 'Phone', 'Seats', ...keys, 'Notes', 'Booked'],
     ...list.map((b) => [iso(b.start), iso(b.end), b.status, b.kind, where(b), linkById.get(b.linkId)?.name ?? '', b.name, b.email, b.phone, String(b.seats), ...keys.map((k) => b.answers[k] ?? ''), b.notes, iso(b.createdAt)]),
   ];
-  return new Response(rows.map((r) => r.map(cell).join(',')).join('\n'), {
-    headers: { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="bookings-${tab}.csv"` },
+  return new Response(csv(rows), {
+    headers: { 'Content-Type': 'text/csv; charset=utf-8', 'Content-Disposition': `attachment; filename="bookings-${tab}.csv"`, 'Cache-Control': 'private, no-store' },
   });
 }
 const pending = tab === 'upcoming' ? list.filter((b) => b.status === 'pending') : [];
@@ -190,6 +194,7 @@ const activeLinks = links.filter((l) => l.active && resById.has(l.resourceId));
     <a class="btn" href={keep({ format: 'csv', b: null, notice: null })}>Export</a>
   </BookingsHead>
   {notice && <p class="notice" role="status">{notice}</p>}
+  {eventFilter && <p class="notice">Registrations for {evById.get(eventFilter)?.title ?? 'this event'} · <a href={keep({ event: null })}>Show all bookings</a></p>}
   {error && <p class="notice warn" role="alert">{error}</p>}
   {provider === 'none' && <p class="notice"><span>Emails are off — set <code>EMAIL_FROM</code> plus <code>RESEND_API_KEY</code> (or a Cloudflare <code>send_email</code> binding named EMAIL) so guests get confirmations and reminders.</span></p>}
 

package/src/pages/admin/calendar/events/[id].astro

@@ -8,14 +8,16 @@ import { BRAND } from '../../../../lib/brand';
 import { CALENDAR, eventUrl } from '../../../../lib/calendar/config';
 import { mergeEventDraft } from '../../../../lib/drafts';
 import { safeColor } from '../../../../lib/calendar/events';
+import { mapsStatus } from '../../../../lib/maps/config';
 import ThemeScript from '../../../../components/ThemeScript.astro';
 import PostEditor from '../../../../components/editor/PostEditor';
 import '../../../../styles/admin.css';
 import '../../../../styles/editor.css';
 
 // The shared writing surface in event mode: same cards, autosave, preview and
-// publish flow as posts, plus the When / Repeats / Where / Button / Calendars
-// sidebar. Live events stage edits until Update, like posts.
+// publish flow as posts, with the event's settings (When · Where ·
+// Registration · Organize) on the page above its content. Live events stage
+// edits until Update, like posts.
 if (!CALENDAR.enabled) return new Response(null, { status: 404, statusText: 'Not found' });
 
 const repo = await getRepo(Astro.locals);
@@ -59,6 +61,7 @@ const trDrafts = trLanguages.length > 0 && translationEngine((await repo.getSett
       calendars={calendars.filter((c) => c.kind === 'native').map((c) => ({ id: c.id, name: c.name, color: safeColor(c.color) }))}
       eventFields={CALENDAR.eventFields}
       siteTimezone={settings.timezone}
+      maps={mapsStatus(Astro.locals)}
       site={{ title: settings.siteTitle, url: settings.siteUrl }}
     />
   </body>

package/src/pages/admin/calendar/events/index.astro

@@ -9,6 +9,7 @@ import { getRepo } from '../../../../lib/repo';
 import { slugify, type Status } from '../../../../lib/schema';
 import { CALENDAR, eventUrl } from '../../../../lib/calendar/config';
 import { featuredOccurrence, formatOccurrence, locationLine, safeColor } from '../../../../lib/calendar/events';
+import { defaultPlaceLocation } from '../../../../lib/maps/places';
 import { describeRepeat } from '../../../../lib/calendar/rrule';
 import { expandVEvents, loadFeed, tzParts } from '../../../../lib/calendar/ics';
 import { normalizeCalendarSrc } from '../../../../lib/calendar/src';
@@ -71,9 +72,11 @@ if (Astro.request.method === 'POST') {
     const today = tzParts(now + 86_400_000, tz);
     const day = /^\d{4}-\d{2}-\d{2}$/.test(date) ? date : `${today.y}-${String(today.m).padStart(2, '0')}-${String(today.d).padStart(2, '0')}`;
     const start = /^\d{2}:\d{2}$/.test(time) ? `${day}T${time}` : day;
+    const place = await defaultPlaceLocation(repo);
     const event = await repo.createEvent({
       title, slug: await uniqueSlug(title), start, allDay: !/^\d{2}:\d{2}$/.test(time),
       calendarIds: calendarId && (await repo.getCalendar(calendarId))?.kind === 'native' ? [calendarId] : [],
+      ...(place ? { location: place } : {}),
     });
     return Astro.redirect(`/admin/calendar/events/${event.id}`);
   }

package/src/pages/admin/calendar/resources/[id].astro

@@ -26,6 +26,9 @@ let notice = Astro.url.searchParams.has('created') ? 'Created. Set its hours, th
 let error = '';
 const token = () => btoa(String.fromCharCode(...crypto.getRandomValues(new Uint8Array(18)))).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
 
+// saved places (Calendar settings → Places): which building this room is in
+const places = await repo.listPlaces();
+
 if (Astro.request.method === 'POST') {
   const form = await Astro.request.formData();
   const op = String(form.get('op'));
@@ -48,6 +51,7 @@ if (Astro.request.method === 'POST') {
       timezone: tz && isValidTimeZone(tz) ? tz : '',
       visibility: form.get('visibility') === 'unlisted' ? 'unlisted' : 'public',
       showOnCalendar: Boolean(form.get('showOnCalendar')),
+      placeId: places.some((p) => p.id === form.get('placeId')) ? String(form.get('placeId')) : '',
       hours: hoursFromForm(form), overrides: overridesFromForm(form), busyFeeds, notifyEmails: emails,
     });
     notice = error ? '' : 'Saved.';
@@ -160,6 +164,13 @@ const ovRows = [...resource.overrides, { date: '', endDate: '', ranges: [], labe
         <label class="field"><span>Description</span><textarea name="description" rows="3">{resource.description}</textarea></label>
         <label class="field"><span>Photo URL</span><input type="text" class="mono" name="photo" value={resource.photo} placeholder="/media/… or https://…" /></label>
         <label class="field"><span>Amenities <em class="hint">comma-separated</em></span><input type="text" name="amenities" value={resource.amenities.join(', ')} placeholder="Kitchen, Projector, Accessible" /></label>
+        <label class="field"><span>Place</span>
+          <select name="placeId">
+            <option value="">{places.length ? 'Not set' : 'No saved places yet'}</option>
+            {places.map((p) => <option value={p.id} selected={resource.placeId === p.id}>{p.name}{p.address ? ` — ${p.address}` : ''}</option>)}
+          </select>
+          <small class="hint">The building or venue it’s in. Add places in <a href="/admin/calendar/settings#places">Calendar settings</a>.</small>
+        </label>
         <label class="field"><span>Timezone</span><input type="text" name="timezone" value={resource.timezone} placeholder={`${settings.timezone || 'UTC'} (site default)`} /></label>
         <label class="field">
           <span>Listed</span>

package/src/pages/admin/calendar/settings.astro

@@ -9,9 +9,14 @@ import { normalizeCalendarSrc } from '../../../lib/calendar/src';
 import { loadFeed } from '../../../lib/calendar/ics';
 import { siteApproval, APPROVAL_LABEL } from '../../../lib/booking/approval';
 import { siteOrigin } from '../../../lib/seo';
+import { placeUsage, savePlace } from '../../../lib/maps/places';
+import { parseMapLink } from '../../../lib/maps/parse';
+import { ApiError } from '../../../lib/api';
+import type { Place } from '../../../lib/schema';
 
 // Calendar settings — one page behind the ⚙ on Schedule and Bookings:
-// calendars (groups + colors), subscribed calendars (read-only, synced in),
+// calendars (groups + colors), saved places (picked in an event's Where),
+// subscribed calendars (read-only, synced in),
 // share links (out to Google/Apple/Outlook), booking approval, defaults.
 // Replaces the old Calendars page and the duplicate subscribe dialogs.
 if (!CALENDAR.enabled) return new Response(null, { status: 404, statusText: 'Not found' });
@@ -77,6 +82,34 @@ if (Astro.request.method === 'POST') {
     }
     return back(reset ? `Approval saved — ${reset} booking link${reset === 1 ? '' : 's'} now follow it.` : 'Approval saved.', '#bookings');
   }
+  if (op === 'place-save') {
+    // the map link field is parsed in the browser (maps.resolve, short links
+    // included); without JS, a full map link is still read here
+    const num = (k: string) => { const v = String(form.get(k) ?? '').trim(); return v === '' ? null : Number(v); };
+    let lat = num('lat');
+    let lng = num('lng');
+    const url = String(form.get('url') || '').trim();
+    let address = String(form.get('address') || '');
+    if ((lat === null || lng === null) && url) {
+      const parsed = parseMapLink(url);
+      if (parsed?.lat !== null && parsed?.lat !== undefined) { lat = parsed.lat; lng = parsed.lng; }
+      if (!address.trim() && parsed?.address) address = parsed.address;
+    }
+    try {
+      const { place, updatedEvents } = await savePlace(repo, {
+        id: id || undefined, name, address, url, lat: Number.isFinite(lat) ? lat : null, lng: Number.isFinite(lng) ? lng : null,
+        notes: String(form.get('notes') || ''), isDefault: form.has('isDefault'),
+      }, { locals: Astro.locals, origin });
+      return back(`Saved “${place.name}”${updatedEvents ? ` — ${updatedEvents} upcoming event${updatedEvents === 1 ? '' : 's'} updated` : ''}.`, '#places');
+    } catch (err) {
+      return back(err instanceof ApiError ? err.message : 'Couldn’t save that place.', '#places');
+    }
+  }
+  if (op === 'place-delete') {
+    const place = id ? await repo.getPlace(id) : null;
+    if (place) await repo.deletePlace(place.id);
+    return back(place ? `Deleted “${place.name}”. Events that used it keep their address.` : undefined, '#places');
+  }
   if (op === 'create' || op === 'subscribe') {
     if (!name) return back('Give the calendar a name.');
     let feedUrl = '';
@@ -122,7 +155,9 @@ if (Astro.request.method === 'POST') {
   }
 }
 
-const [calendars, events, links] = await Promise.all([repo.listCalendars(), repo.listEvents(), bookingsEnabled() ? repo.listBookingLinks() : Promise.resolve([])]);
+const [calendars, events, links, places] = await Promise.all([repo.listCalendars(), repo.listEvents(), bookingsEnabled() ? repo.listBookingLinks() : Promise.resolve([]), repo.listPlaces()]);
+const placeCounts = placeUsage(events, settings);
+const placeLine = (p: Place) => [p.address, `${placeCounts.get(p.id) ?? 0} upcoming event${placeCounts.get(p.id) === 1 ? '' : 's'}`].filter(Boolean).join(' · ');
 const natives = calendars.filter((c) => c.kind === 'native');
 const feeds = calendars.filter((c) => c.kind === 'feed');
 const counts = new Map<string, number>();
@@ -148,9 +183,10 @@ const APPROVAL_NOTE: Record<ApprovalMode, string> = {
 const I = {
   up: 'M6 15l6-6 6 6', down: 'M6 9l6 6 6-6',
   ext: 'M14 4h6v6M20 4l-9 9M18 14v5a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h5',
+  pin: 'M12 22s7-7 7-12a7 7 0 0 0-14 0c0 5 7 12 7 12zM12 12.5a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5z',
 };
 const sections = [
-  ['calendars', 'Calendars'], ['subscribed', 'Subscribed calendars'], ['share', 'Share links'],
+  ['calendars', 'Calendars'], ['places', 'Places'], ['subscribed', 'Subscribed calendars'], ['share', 'Share links'],
   ...(bookingsEnabled() ? [['bookings', 'Bookings']] : []), ['defaults', 'Defaults'],
 ] as const;
 ---
@@ -204,6 +240,28 @@ const sections = [
         ))}
       </section>
 
+      <!-- Places -->
+      <section class="cs-sect" id="places">
+        <header>
+          <div><h2>Places</h2><p>Where your events usually happen. Pick one in an event’s Where field to fill in the address and map. Changing a place updates its upcoming events.</p></div>
+          <button class="btn" type="button" data-modal="place-new">+ New place</button>
+        </header>
+        {places.length === 0 ? (
+          <p class="cs-empty">No saved places yet. Add your building, a park or a partner venue once instead of typing it into every event.</p>
+        ) : places.map((p) => (
+          <div class="cs-row" id={`place-${p.id}`}>
+            <svg class="cs-pin" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d={I.pin} /></svg>
+            <div class="cs-main">
+              <b>{p.name}{p.isDefault && <span class="cs-default">Default</span>}</b>
+              <small>{placeLine(p)}{p.lat === null ? ' · no pin' : ''}</small>
+            </div>
+            <div class="cs-actions">
+              <button class="btn sm" type="button" data-modal={`place-edit-${p.id}`}>Edit</button>
+            </div>
+          </div>
+        ))}
+      </section>
+
       <!-- Subscribed -->
       <section class="cs-sect" id="subscribed">
         <header>
@@ -347,6 +405,37 @@ const sections = [
     </Modal>
   ))}
 
+  {[...places, null].map((p: Place | null) => (
+    <Modal id={p ? `place-edit-${p.id}` : 'place-new'} title={p ? `Edit ${p.name}` : 'New place'}>
+      <form method="post" data-place-form>
+        <input type="hidden" name="op" value="place-save" />
+        {p && <input type="hidden" name="id" value={p.id} />}
+        <input type="hidden" name="lat" value={p?.lat ?? ''} data-lat />
+        <input type="hidden" name="lng" value={p?.lng ?? ''} data-lng />
+        <label class="field"><span>Map link <em class="hint">paste from Google Maps, Apple Maps or OpenStreetMap — or a map embed code</em></span>
+          <input class="mono" type="text" name="url" value={p?.url ?? ''} placeholder="https://maps.app.goo.gl/…" data-maplink autocomplete="off" />
+        </label>
+        <p class="cs-pinline" data-pinline>
+          <span data-pintext>{p?.lat != null && p?.lng != null ? `Pin set at ${p.lat.toFixed(5)}, ${p.lng.toFixed(5)}` : 'No pin yet — paste a map link to set one.'}</span>
+          <button class="btn sm ghost" type="button" data-clearpin hidden={p?.lat == null}>Remove pin</button>
+        </p>
+        <label class="field"><span>Name</span><input type="text" name="name" value={p?.name ?? ''} placeholder="Main building" required data-name /></label>
+        <label class="field"><span>Address</span><input type="text" name="address" value={p?.address ?? ''} placeholder="Street, city" data-address /></label>
+        <label class="field"><span>Notes <em class="hint">for editors only</em></span><textarea name="notes" rows="2" placeholder="Use the side door after 6 PM">{p?.notes ?? ''}</textarea></label>
+        <label class="check-row"><input type="checkbox" name="isDefault" checked={p?.isDefault ?? false} /> New events start here</label>
+        {p?.mapImage && (
+          <figure class="cs-map"><img src={p.mapImage} alt={`Map of ${p.name}`} width="1200" height="500" loading="lazy" /></figure>
+        )}
+        <div class="modal-foot">
+          {p && <button class="btn danger ghost" type="submit" name="op" value="place-delete" formnovalidate data-confirm={`Delete “${p.name}”? Events that used it keep their address.`}>Delete</button>}
+          <span class="spacer" />
+          <button class="btn ghost" type="button" data-close>Cancel</button>
+          <button class="btn primary" type="submit">{p ? 'Save' : 'Add place'}</button>
+        </div>
+      </form>
+    </Modal>
+  ))}
+
   <Modal id="cal-new" title="New calendar" open={Astro.url.searchParams.has('new')}>
     <form method="post">
       <input type="hidden" name="op" value="create" />
@@ -424,6 +513,14 @@ const sections = [
   .cs-field { display: grid; grid-template-columns: 160px auto; align-items: center; gap: 10px; font-size: 13px; color: var(--text-2); justify-content: start; }
   .cs-foot { display: flex; align-items: center; gap: 12px; justify-content: space-between; flex-wrap: wrap; border-top: 1px solid var(--line); padding-top: 12px; }
   .cs-foot small { color: var(--muted); font-size: 12px; }
+  .cs-pin { width: 14px; height: 14px; color: var(--muted); }
+  .cs-default { display: inline-flex; align-items: center; gap: 5px; margin-left: 8px; font-size: 11.5px; font-weight: 600; color: var(--text-2); vertical-align: 1px; }
+  .cs-default::before { content: ''; width: 6px; height: 6px; border-radius: 2px; background: var(--accent); }
+  .cs-pinline { display: flex; align-items: center; justify-content: space-between; gap: 10px; flex-wrap: wrap; margin: -4px 0 12px; font-size: 12px; color: var(--muted); }
+  .cs-pinline.is-busy span { opacity: 0.6; }
+  .cs-pinline.is-error span { color: var(--red); }
+  .cs-map { margin: 0 0 4px; border: 1px solid var(--line); border-radius: 10px; overflow: hidden; }
+  .cs-map img { display: block; width: 100%; height: auto; }
   [hidden] { display: none !important; }
   @media (max-width: 860px) {
     .cs { grid-template-columns: 1fr; }
@@ -437,6 +534,8 @@ const sections = [
 </style>
 
 <script>
+  import { actions } from 'astro:actions';
+
   document.addEventListener('click', async (e) => {
     const b = e.target instanceof Element ? e.target.closest<HTMLButtonElement>('[data-copy]') : null;
     if (b) {
@@ -448,6 +547,44 @@ const sections = [
     const c = e.target instanceof Element ? e.target.closest<HTMLElement>('[data-confirm]') : null;
     if (c && !confirm(c.dataset.confirm)) e.preventDefault();
   });
+  // places: a pasted map link fills the pin (and name/address when empty).
+  // maps.resolve expands short links server-side; nothing needs a maps key.
+  for (const f of document.querySelectorAll<HTMLFormElement>('form[data-place-form]')) {
+    const link = f.querySelector<HTMLInputElement>('[data-maplink]')!;
+    const lat = f.querySelector<HTMLInputElement>('[data-lat]')!;
+    const lng = f.querySelector<HTMLInputElement>('[data-lng]')!;
+    const line = f.querySelector<HTMLElement>('[data-pinline]')!;
+    const text = f.querySelector<HTMLElement>('[data-pintext]')!;
+    const clear = f.querySelector<HTMLButtonElement>('[data-clearpin]')!;
+    const name = f.querySelector<HTMLInputElement>('[data-name]')!;
+    const address = f.querySelector<HTMLInputElement>('[data-address]')!;
+    const show = (msg: string, state = '') => { text.textContent = msg; line.className = `cs-pinline${state ? ` is-${state}` : ''}`; clear.hidden = !lat.value; };
+    let last = link.value.trim();
+    const resolve = async () => {
+      const raw = link.value.trim();
+      if (raw === last) return;
+      last = raw;
+      if (!raw) return;
+      show('Reading the link…', 'busy');
+      const { data, error } = await actions.maps.resolve({ url: raw });
+      if (link.value.trim() !== raw) return;
+      const loc = data?.location;
+      if (error || !loc) { show('That link didn’t include a place we could read. You can still type the address.', 'error'); return; }
+      if (loc.kind === 'meeting') { show('That’s an online meeting link — saved places are for physical places.', 'error'); return; }
+      // an embed's src isn't a link people can open: keep the field tidy
+      if (loc.url !== raw) { link.value = loc.url; last = loc.url; }
+      if (!name.value.trim() && loc.name) name.value = loc.name;
+      if (!address.value.trim() && loc.address) address.value = loc.address;
+      if (loc.lat !== null && loc.lng !== null) {
+        lat.value = String(loc.lat); lng.value = String(loc.lng);
+        show(`Pin set at ${loc.lat.toFixed(5)}, ${loc.lng.toFixed(5)}`);
+      } else show('No pin in that link — the address was filled in.');
+    };
+    link.addEventListener('paste', () => setTimeout(resolve, 0));
+    link.addEventListener('change', resolve);
+    clear.addEventListener('click', () => { lat.value = ''; lng.value = ''; show('Pin removed — it’s gone when you save.'); });
+  }
+
   // approval: rules only for "unless…", the deadline only when bookings can wait
   const form = document.querySelector<HTMLFormElement>('[data-approval]');
   form?.addEventListener('change', () => {

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

@@ -0,0 +1,121 @@
+---
+import Admin from '../../../../layouts/Admin.astro';
+import FormHeader from '../../../../components/forms/FormHeader.astro';
+import { getRepo } from '../../../../lib/repo';
+import { readForm } from '../../../../lib/forms/http';
+import { escapeForm } from '../../../../lib/forms/fields';
+import { siteOrigin } from '../../../../lib/seo';
+import { CONTENT } from '../../../../lib/content';
+import '../../../../styles/forms-admin.css';
+
+const repo = await getRepo(Astro.locals);
+let form = await repo.forms.get(Astro.params.id || '');
+if (!form || form.kind !== 'form') return new Response(null, { status: 404 });
+Astro.response.headers.set('Cache-Control', 'private, no-store');
+
+let error = '', notice = '';
+if (Astro.request.method === 'POST') {
+  try {
+    const data = await readForm(Astro.request);
+    const op = String(data.get('op') || '');
+    if (op !== 'publish' && op !== 'archive') throw new Error('Unknown action.');
+    // Same store operation as the Build tab: publish promotes pending edits.
+    await repo.forms.save(form.id, Number(data.get('revision')), form.name, form.draft ?? form.definition, op);
+    form = (await repo.forms.get(form.id))!;
+    notice = op === 'publish' ? 'Published. The form is accepting responses.' : 'Archived. The form no longer accepts responses; existing responses are kept.';
+  } catch (e) { error = e instanceof Error ? e.message : 'Could not update the form.'; }
+}
+
+const [settings, stats, used] = await Promise.all([repo.getSettings(), repo.forms.submissionStats(form.id, 0), repo.forms.usedOn(form.id)]);
+const origin = siteOrigin(settings, Astro.url);
+const link = `${origin}/forms/${form.id}`;
+const title = escapeForm(form.definition.title || form.name);
+const embed = `<iframe src="${link}?embed=1" title="${title}" loading="lazy" style="width:100%;min-height:560px;border:0"></iframe>`;
+const live = form.status === 'published';
+const state = live ? (form.draft ? ['Accepting responses', 'green', 'Visitors see the last published version. Publish to apply your changes.'] : ['Accepting responses', 'green', 'Anyone with the link, or on a page with this form, can respond.'])
+  : form.status === 'archived' ? ['Not accepting responses', 'muted', 'Archived. The link and embedded copies are hidden. Responses are kept.']
+  : ['Not accepting responses', 'amber', 'Publish the form to open the link and show it on pages.'];
+const editHref = (u: (typeof used)[number]) => u.kind === 'page' ? `/admin/pages/${u.id}` : u.kind === 'event' ? `/admin/calendar/events/${u.id}` : `/admin/c/${u.collection}/${u.id}`;
+const kindLabel = (u: (typeof used)[number]) => u.kind === 'page' ? 'Page' : u.kind === 'event' ? 'Event' : (CONTENT.collections[u.collection]?.singular ?? 'Post');
+const copyIcon = 'M9 9h10v10H9zM5 15V5h10';
+---
+<Admin title={`${form.name} · Share`} section="forms">
+  <FormHeader form={form} active="share" responses={stats.total}>
+    {live && <a slot="actions" class="btn" href={`/forms/${form.id}`} target="_blank" rel="noopener">Open form ↗</a>}
+  </FormHeader>
+  {error && <p class="notice warn" role="alert">{error}</p>}
+  {notice && <p class="notice" role="status">{notice}</p>}
+
+  <div class="fs">
+    <section class="fs-sec">
+      <div class="fs-label"><b>Responses</b><small>Publishing opens the form; archiving closes it.</small></div>
+      <div class="fs-body">
+        <div class="fs-state">
+          <div>
+            <p class={`fst fst-${state[1]} fs-state-title`}><i aria-hidden="true" />{state[0]}</p>
+            <p class="hint">{state[2]}</p>
+          </div>
+          <form method="post" class="fs-state-actions">
+            <input type="hidden" name="revision" value={form.revision} />
+            {(!live || form.draft) && <button class="btn primary" name="op" value="publish">{form.draft ? 'Publish changes' : form.status === 'archived' ? 'Reopen and publish' : 'Publish'}</button>}
+            {live && <button class="btn" name="op" value="archive">Stop accepting responses</button>}
+          </form>
+        </div>
+      </div>
+    </section>
+
+    <section class="fs-sec">
+      <div class="fs-label"><b>Public link</b><small>A page with just this form.</small></div>
+      <div class="fs-body">
+        <div class="fs-copy">
+          <input type="text" class="mono" readonly value={link} aria-label="Public link" id="fs-link" />
+          <button class="btn" type="button" data-copy="fs-link"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d={copyIcon} /></svg><span>Copy</span></button>
+        </div>
+        {!live && <p class="hint">The link opens once the form is published.</p>}
+      </div>
+    </section>
+
+    <section class="fs-sec">
+      <div class="fs-label"><b>Embed</b><small>Paste into another website. On this site, add a Form block to a page instead.</small></div>
+      <div class="fs-body">
+        <textarea class="code fs-embed" readonly rows="3" id="fs-embed" aria-label="Embed code">{embed}</textarea>
+        <div class="fs-row"><button class="btn" type="button" data-copy="fs-embed"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d={copyIcon} /></svg><span>Copy code</span></button></div>
+      </div>
+    </section>
+
+    <section class="fs-sec">
+      <div class="fs-label"><b>Used on</b><small>Pages, posts and events with a Form block for this form.</small></div>
+      <div class="fs-body">
+        {used.length ? (
+          <ul class="fs-used">
+            {used.map(u => (
+              <li>
+                <a href={editHref(u)}><b>{u.title || 'Untitled'}</b><small>{kindLabel(u)} · <span class={`status ${u.status}`}>{u.status[0].toUpperCase() + u.status.slice(1)}</span></small></a>
+                <a class="btn sm ghost" href={editHref(u)}>Edit</a>
+              </li>
+            ))}
+          </ul>
+        ) : <p class="hint fs-none">Not on any page yet. In the editor, type <kbd>/</kbd> and choose Form.</p>}
+      </div>
+    </section>
+
+    <section class="fs-sec">
+      <div class="fs-label"><b>Notifications</b></div>
+      <div class="fs-body"><p class="hint">Email alerts and webhooks for new responses are coming later. For now, check Responses or export a CSV.</p></div>
+    </section>
+  </div>
+</Admin>
+
+<script>
+  document.addEventListener('click', async (e) => {
+    const b = e.target instanceof Element ? e.target.closest<HTMLButtonElement>('[data-copy]') : null;
+    if (!b) return;
+    const el = document.getElementById(b.dataset.copy!) as HTMLInputElement | HTMLTextAreaElement | null;
+    if (!el) return;
+    const label = b.querySelector('span')!;
+    const was = label.textContent;
+    try { await navigator.clipboard.writeText(el.value); label.textContent = 'Copied'; }
+    catch { el.select(); label.textContent = 'Press ⌘C'; }
+    setTimeout(() => (label.textContent = was), 1600);
+  });
+</script>