@acms-subir/core 0.3.6 → 0.3.8

package/src/pages/admin/calendar/resources/link.astro

@@ -1,10 +1,11 @@
 ---
 import Admin from '../../../../layouts/Admin.astro';
 import HoursEditor from '../../../../components/booking/HoursEditor.astro';
+import DurationEditor from '../../../../components/booking/DurationEditor.astro';
 import { getRepo } from '../../../../lib/repo';
-import { slugify, QUESTION_TYPES, type BookingMode } from '../../../../lib/schema';
+import { slugify, QUESTION_TYPES, type BookingLink, type BookingMode } from '../../../../lib/schema';
 import { bookingLinkUrl, bookingsEnabled } from '../../../../lib/calendar/config';
-import { hoursFromForm, int, list, questionsFromForm } from '../../../../lib/booking/forms';
+import { durationFromForm, durationRow, hoursFromForm, int, lengthsFromForm, questionsFromForm } from '../../../../lib/booking/forms';
 import { describeLink } from '../../../../lib/booking/availability';
 import { siteOrigin } from '../../../../lib/seo';
 import { APPROVAL_LABEL, linkApproval, siteApproval } from '../../../../lib/booking/approval';
@@ -21,6 +22,13 @@ if (!resource || !link || link.resourceId !== resource.id) return new Response(n
 const settings = await repo.getSettings();
 const origin = siteOrigin(settings, Astro.url);
 let notice = '';
+let failed = false;
+// what the form shows: the saved link, or the submitted values after a failed save
+let view: BookingLink = link;
+let single = durationRow(link.duration);
+let singleError = '';
+let several = (link.lengths.length ? link.lengths : [link.duration]).map(durationRow);
+let severalError = '';
 
 if (Astro.request.method === 'POST') {
   const form = await Astro.request.formData();
@@ -35,7 +43,22 @@ if (Astro.request.method === 'POST') {
   let slug = base;
   for (let n = 2; ; n++) { const hit = await repo.getBookingLinkBySlug(resource.id, slug); if (!hit || hit.id === link.id) break; slug = `${base}-${n}`; }
   const mode = (['slots', 'range', 'day'] as const).find((m) => m === form.get('mode')) ?? 'slots';
-  const lengths = list(String(form.get('lengths') || '')).map((x) => Math.round(Number(x) * 60)).filter((n) => n >= 15 && n <= 1440);
+  // only the active mode's length is read; the other keeps its saved value
+  // (hidden mode inputs are disabled, so they aren't submitted)
+  let duration = link.duration;
+  let lengths = link.lengths;
+  if (mode === 'slots') {
+    const d = durationFromForm(form);
+    single = d.row;
+    singleError = d.error ?? '';
+    if (d.minutes !== null) duration = d.minutes;
+  } else if (mode === 'range') {
+    const l = lengthsFromForm(form);
+    several = l.rows;
+    severalError = l.error ?? '';
+    if (!l.error) lengths = l.minutes;
+  }
+  const minDays = int(form.get('minDays'), 1, 60, link.minDays);
   const approval = (['default', 'auto', 'rules', 'manual'] as const).find((m) => m === form.get('approval')) ?? 'default';
   const approvalRules = ApprovalRules.parse({
     longerThan: form.has('ruleLonger') ? int(form.get('longerThanHours'), 1, 24 * 60, 4) * 60 : 0,
@@ -44,14 +67,14 @@ if (Astro.request.method === 'POST') {
     deadlineHours: form.has('deadline') ? int(form.get('deadlineHours'), 1, 24 * 60, 48) : 0,
     deadlineAction: form.get('deadlineAction') === 'decline' ? 'decline' : 'approve',
   });
-  await repo.updateBookingLink(link.id, {
+  const patch: Partial<BookingLink> = {
     name, slug, mode: mode as BookingMode,
     description: String(form.get('description') || '').slice(0, 1000),
-    duration: int(form.get('duration'), 5, 1440, 60),
+    duration,
     lengths,
-    minDays: int(form.get('minDays'), 1, 60, 1),
-    maxDays: Math.max(int(form.get('minDays'), 1, 60, 1), int(form.get('maxDays'), 1, 60, 1)),
-    step: int(form.get('step'), 5, 240, 30),
+    minDays,
+    maxDays: Math.max(minDays, int(form.get('maxDays'), 1, 60, link.maxDays)),
+    step: int(form.get('step'), 5, 240, link.step),
     bufferBefore: int(form.get('bufferBefore'), 0, 480, 0),
     bufferAfter: int(form.get('bufferAfter'), 0, 480, 0),
     minNotice: int(form.get('minNoticeH'), 0, 24 * 60, 2) * 60,
@@ -67,17 +90,28 @@ if (Astro.request.method === 'POST') {
     confirmMessage: String(form.get('confirmMessage') || '').slice(0, 1000),
     redirectUrl: /^https?:\/\//.test(String(form.get('redirectUrl') || '')) ? String(form.get('redirectUrl')) : '',
     active: Boolean(form.get('active')),
-  });
-  link = (await repo.getBookingLink(link.id))!;
-  notice = 'Saved.';
+  };
+  if (singleError || severalError) {
+    // nothing saved: show everything as submitted, with the length errors inline
+    view = { ...link, ...patch };
+    failed = true;
+    notice = 'Not saved — fix the booking length below.';
+    Astro.response.status = 422;
+  } else {
+    await repo.updateBookingLink(link.id, patch);
+    link = view = (await repo.getBookingLink(link.id))!;
+    single = durationRow(link.duration);
+    several = (link.lengths.length ? link.lengths : [link.duration]).map(durationRow);
+    notice = 'Saved.';
+  }
 }
 const publicUrl = origin + bookingLinkUrl(resource.slug, link.slug);
 const embed = `<iframe src="${origin}/embed/book/${resource.slug}/${link.slug}" style="width:100%;height:620px;border:0" title="${link.name}"></iframe>`;
-const qRows = [...link.questions, ...Array.from({ length: 2 }, () => ({ id: '', label: '', type: 'text' as const, required: false, options: [] as string[], help: '' }))];
-const hours = (link.hours ?? resource.hours);
+const qRows = [...view.questions, ...Array.from({ length: 2 }, () => ({ id: '', label: '', type: 'text' as const, required: false, options: [] as string[], help: '' }))];
+const hours = (view.hours ?? resource.hours);
 const site = siteApproval(settings);
-const own = link.approval === 'default' ? site.rules : link.approvalRules;
-const effective = linkApproval(link, settings).mode;
+const own = view.approval === 'default' ? site.rules : view.approvalRules;
+const effective = linkApproval(view, settings).mode;
 ---
 
 <Admin title={link.name} section="calendar:bookings">
@@ -92,7 +126,7 @@ const effective = linkApproval(link, settings).mode;
       <button class="btn primary" type="submit" form="link-form">Save</button>
     </div>
   </div>
-  {notice && <p class="notice" role="status">{notice}</p>}
+  {notice && (failed ? <p class="notice warn" role="alert">{notice}</p> : <p class="notice" role="status">{notice}</p>)}
 
   <form method="post" id="link-form" class="res-grid">
     <input type="hidden" name="op" value="save" />
@@ -100,22 +134,22 @@ const effective = linkApproval(link, settings).mode;
       <section class="card card-pad appr" data-approval>
         <div class="card-head"><b>Approval</b><span class="hint">What happens when someone books this link</span></div>
         <div class="appr-choices" role="radiogroup" aria-label="Approval">
-          <label class="appr-choice"><input type="radio" name="approval" value="default" checked={link.approval === 'default'} />
+          <label class="appr-choice"><input type="radio" name="approval" value="default" checked={view.approval ==='default'} />
             <span><b>Use the site setting</b><small>Currently: {APPROVAL_LABEL[site.mode]}. <a href="/admin/calendar/settings#bookings">Change it</a></small></span></label>
-          <label class="appr-choice"><input type="radio" name="approval" value="auto" checked={link.approval === 'auto'} />
+          <label class="appr-choice"><input type="radio" name="approval" value="auto" checked={view.approval ==='auto'} />
             <span><b>{APPROVAL_LABEL.auto}</b><small>Booked means confirmed. It shows on your Schedule right away.</small></span></label>
-          <label class="appr-choice"><input type="radio" name="approval" value="rules" checked={link.approval === 'rules'} />
+          <label class="appr-choice"><input type="radio" name="approval" value="rules" checked={view.approval ==='rules'} />
             <span><b>{APPROVAL_LABEL.rules}</b><small>Confirm most bookings at once; hold unusual ones for you.</small></span></label>
-          <label class="appr-choice"><input type="radio" name="approval" value="manual" checked={link.approval === 'manual'} />
+          <label class="appr-choice"><input type="radio" name="approval" value="manual" checked={view.approval ==='manual'} />
             <span><b>{APPROVAL_LABEL.manual}</b><small>Every booking waits under Needs approval.</small></span></label>
         </div>
-        <fieldset class="appr-rules" data-rules hidden={link.approval !== 'rules'}>
+        <fieldset class="appr-rules" data-rules hidden={view.approval !== 'rules'}>
           <legend>Ask me first when a booking is…</legend>
           <label class="appr-check"><input type="checkbox" name="ruleLonger" checked={own.longerThan > 0} /> longer than <input type="number" name="longerThanHours" min="1" max="1440" value={own.longerThan ? Math.round(own.longerThan / 60) : 4} /> hours</label>
           <label class="appr-check"><input type="checkbox" name="ruleFirst" checked={own.firstTime} /> the first booking from that email address</label>
           <label class="appr-check"><input type="checkbox" name="ruleSeats" checked={own.moreSeats > 0} /> for more than <input type="number" name="moreSeats" min="1" max="100000" value={own.moreSeats || 20} /> people</label>
         </fieldset>
-        <div class="appr-deadline" data-deadline hidden={link.approval === 'default' || link.approval === 'auto'}>
+        <div class="appr-deadline" data-deadline hidden={view.approval === 'default' || view.approval === 'auto'}>
           <label class="appr-check"><input type="checkbox" name="deadline" checked={own.deadlineHours > 0} /> If I haven’t answered in <input type="number" name="deadlineHours" min="1" max="1440" value={own.deadlineHours || 48} /> hours,</label>
           <select name="deadlineAction" aria-label="What happens then">
             <option value="approve" selected={own.deadlineAction === 'approve'}>approve it</option>
@@ -127,39 +161,43 @@ const effective = linkApproval(link, settings).mode;
 
       <section class="card card-pad">
         <div class="card-head"><b>How people book</b></div>
-        <div class="seg block mode-seg" role="radiogroup">
-          {[['slots', 'Fixed length'], ['range', 'Choose a length'], ['day', 'Whole days']].map(([v, l]) => (
-            <label class={link.mode === v ? 'on' : ''}><input type="radio" name="mode" value={v} checked={link.mode === v} /> {l}</label>
+        <div class="seg block mode-seg" role="radiogroup" aria-label="How people book">
+          {[['slots', 'One length'], ['range', 'Several lengths'], ['day', 'Whole days']].map(([v, l]) => (
+            <label class={view.mode === v ? 'on' : ''}><input type="radio" name="mode" value={v} checked={view.mode === v} /> {l}</label>
           ))}
         </div>
-        <div class="field-row three mode-fields">
-          <label class="field" data-mode="slots"><span>Length (minutes)</span><input type="number" name="duration" min="5" max="1440" value={link.duration} /></label>
-          <label class="field" data-mode="range"><span>Lengths offered (hours)</span><input type="text" name="lengths" value={link.lengths.map((n) => n / 60).join(', ')} placeholder="4, 5, 6, 8" /></label>
-          <label class="field" data-mode="day"><span>Min days</span><input type="number" name="minDays" min="1" max="60" value={link.minDays} /></label>
-          <label class="field" data-mode="day"><span>Max days</span><input type="number" name="maxDays" min="1" max="60" value={link.maxDays} /></label>
-          <label class="field" data-mode="slots range"><span>Start every (minutes)</span><input type="number" name="step" min="5" max="240" value={link.step} /></label>
+        <div class="mode-fields">
+          <p class="hint mode-help" data-mode="slots">Every booking is the same length.</p>
+          <p class="hint mode-help" data-mode="range">People choose one of the lengths you offer.</p>
+          <p class="hint mode-help" data-mode="day">People book one or more whole days.</p>
+          <DurationEditor single={single} singleError={singleError} several={several} severalError={severalError} />
+          <div class="field-row three">
+            <label class="field" data-mode="day"><span>Min days</span><input type="number" name="minDays" min="1" max="60" value={view.minDays} /></label>
+            <label class="field" data-mode="day"><span>Max days</span><input type="number" name="maxDays" min="1" max="60" value={view.maxDays} /></label>
+            <label class="field" data-mode="slots range"><span>Start every (minutes)</span><input type="number" name="step" min="5" max="240" value={view.step} /></label>
+          </div>
         </div>
         <div class="field-row three">
-          <label class="field"><span>Setup before (min)</span><input type="number" name="bufferBefore" min="0" max="480" value={link.bufferBefore} /></label>
-          <label class="field"><span>Cleanup after (min)</span><input type="number" name="bufferAfter" min="0" max="480" value={link.bufferAfter} /></label>
-          <label class="field"><span>Max per day <em class="hint">0 = no limit</em></span><input type="number" name="perDayCap" min="0" max="100" value={link.perDayCap} /></label>
-          <label class="field"><span>Book at least (hours ahead)</span><input type="number" name="minNoticeH" min="0" max="1440" value={Math.round(link.minNotice / 60)} /></label>
-          <label class="field"><span>Book up to (days ahead)</span><input type="number" name="maxAdvance" min="1" max="730" value={link.maxAdvance} /></label>
+          <label class="field"><span>Setup before (min)</span><input type="number" name="bufferBefore" min="0" max="480" value={view.bufferBefore} /></label>
+          <label class="field"><span>Cleanup after (min)</span><input type="number" name="bufferAfter" min="0" max="480" value={view.bufferAfter} /></label>
+          <label class="field"><span>Max per day <em class="hint">0 = no limit</em></span><input type="number" name="perDayCap" min="0" max="100" value={view.perDayCap} /></label>
+          <label class="field"><span>Book at least (hours ahead)</span><input type="number" name="minNoticeH" min="0" max="1440" value={Math.round(view.minNotice / 60)} /></label>
+          <label class="field"><span>Book up to (days ahead)</span><input type="number" name="maxAdvance" min="1" max="730" value={view.maxAdvance} /></label>
         </div>
       </section>
 
       <section class="card card-pad">
         <div class="card-head"><b>Hours for this link</b></div>
-        <label class="check-row"><input type="checkbox" name="customHours" checked={Boolean(link.hours)} data-toggle="lh-box" /> Narrow the {resource.name.toLowerCase()} hours for this link</label>
-        <div id="lh-box" hidden={!link.hours}>
+        <label class="check-row"><input type="checkbox" name="customHours" checked={Boolean(view.hours)} data-toggle="lh-box" /> Narrow the {resource.name.toLowerCase()} hours for this link</label>
+        <div id="lh-box" hidden={!view.hours}>
           <HoursEditor hours={hours} prefix="lh" bounds={resource.hours} note={`Green = this link, grey = when ${resource.name} is open. The link can only narrow those hours.`} />
         </div>
-        {!link.hours && <p class="hint">Uses {resource.name}’s open hours.</p>}
+        {!view.hours && <p class="hint">Uses {resource.name}’s open hours.</p>}
       </section>
 
       <section class="card card-pad">
         <div class="card-head"><b>Questions</b><span class="hint">Name and email are always asked</span></div>
-        <label class="check-row"><input type="checkbox" name="askPhone" checked={link.askPhone} /> Ask for a phone number</label>
+        <label class="check-row"><input type="checkbox" name="askPhone" checked={view.askPhone} /> Ask for a phone number</label>
         <div class="q-list">
           {qRows.map((q, i) => (
             <div class={`q-row${q.label ? '' : ' is-blank'}`}>
@@ -178,22 +216,22 @@ const effective = linkApproval(link, settings).mode;
     <div class="res-side">
       <section class="card card-pad">
         <div class="card-head"><b>Link</b></div>
-        <label class="field"><span>Name</span><input type="text" name="name" value={link.name} required /></label>
-        <label class="field"><span>URL name</span><input type="text" class="mono" name="slug" value={link.slug} /></label>
-        <label class="field"><span>Description</span><textarea name="description" rows="3" placeholder="What this booking is for">{link.description}</textarea></label>
+        <label class="field"><span>Name</span><input type="text" name="name" value={view.name} required /></label>
+        <label class="field"><span>URL name</span><input type="text" class="mono" name="slug" value={view.slug} /></label>
+        <label class="field"><span>Description</span><textarea name="description" rows="3" placeholder="What this booking is for">{view.description}</textarea></label>
         <label class="field">
           <span>Who can find it</span>
           <select name="visibility">
-            <option value="public" selected={link.visibility === 'public'}>Listed on the {resource.name} page</option>
-            <option value="unlisted" selected={link.visibility === 'unlisted'}>Unlisted — share the link directly</option>
+            <option value="public" selected={view.visibility === 'public'}>Listed on the {resource.name} page</option>
+            <option value="unlisted" selected={view.visibility === 'unlisted'}>Unlisted — share the link directly</option>
           </select>
         </label>
-        <label class="check-row"><input type="checkbox" name="active" checked={link.active} /> Taking bookings</label>
+        <label class="check-row"><input type="checkbox" name="active" checked={view.active} /> Taking bookings</label>
       </section>
       <section class="card card-pad">
         <div class="card-head"><b>After booking</b></div>
-        <label class="field"><span>Confirmation message</span><textarea name="confirmMessage" rows="3" placeholder="Shown on the confirmation page and in the email">{link.confirmMessage}</textarea></label>
-        <label class="field"><span>Redirect to <em class="hint">optional</em></span><input type="text" class="mono" name="redirectUrl" value={link.redirectUrl} placeholder="https://…" /></label>
+        <label class="field"><span>Confirmation message</span><textarea name="confirmMessage" rows="3" placeholder="Shown on the confirmation page and in the email">{view.confirmMessage}</textarea></label>
+        <label class="field"><span>Redirect to <em class="hint">optional</em></span><input type="text" class="mono" name="redirectUrl" value={view.redirectUrl} placeholder="https://…" /></label>
       </section>
       <section class="card card-pad">
         <div class="card-head"><b>Share</b></div>
@@ -206,12 +244,20 @@ const effective = linkApproval(link, settings).mode;
   </form>
 </Admin>
 
+<style>
+  .mode-help { margin: -6px 4px 12px; }
+</style>
+
 <script>
   const form = document.getElementById('link-form') as HTMLFormElement;
   const sync = () => {
     const mode = (form.querySelector<HTMLInputElement>('input[name=mode]:checked')?.value) ?? 'slots';
     form.querySelectorAll<HTMLElement>('.mode-seg label').forEach((l) => l.classList.toggle('on', l.querySelector('input')?.checked ?? false));
-    form.querySelectorAll<HTMLElement>('.mode-fields [data-mode]').forEach((el) => { el.hidden = !(el.dataset.mode ?? '').split(' ').includes(mode); });
+    form.querySelectorAll<HTMLElement>('.mode-fields [data-mode]').forEach((el) => {
+      el.hidden = !(el.dataset.mode ?? '').split(' ').includes(mode);
+      // hidden modes don't submit (or block submit with their own min/max)
+      el.querySelectorAll<HTMLInputElement>('input, select, textarea').forEach((i) => (i.disabled = el.hidden));
+    });
     const appr = (form.querySelector<HTMLInputElement>('input[name=approval]:checked')?.value) ?? 'default';
     const rules = form.querySelector<HTMLElement>('[data-rules]');
     const deadline = form.querySelector<HTMLElement>('[data-deadline]');

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>