ferst-core 0.7.5 → 0.7.7

package/bin/ferst-modules.mjs

@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+// ferst-modules — what this site has from its organisation's modules in the Ferst portal:
+// the forms it can place and the calendar it shows. Run it in a client repo root:
+//
+//   npx --no-install ferst-modules                 # the site named in ferst-site.json
+//   npx --no-install ferst-modules --site <address> # or ask by the site's address
+//   npx --no-install ferst-modules --json          # the raw answer
+//
+// Forms and calendars live in the portal, never in the repo: place a form with a
+// `{ "type": "form", "form": "<id>" }` block, and show the calendar by setting
+// calendarSettings.embedUrl to the address printed here.
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { isDirectInvocation, resolveGitBase } from './cms-config.mjs';
+
+/** The site to ask about: `--site <ref>`, else ferst-site.json's siteId, else null. */
+export function moduleRef(argv, siteMeta) {
+  const i = argv.indexOf('--site');
+  if (i !== -1 && argv[i + 1]) return argv[i + 1];
+  return siteMeta && typeof siteMeta.siteId === 'string' && siteMeta.siteId ? siteMeta.siteId : null;
+}
+
+/** A readable summary of GET /sites/:ref/modules. Pure — unit-tested. */
+export function formatModules(data) {
+  const out = [];
+  out.push(`Site: ${data.site.address ?? data.site.id} (${data.site.id})`, '');
+
+  out.push('Forms');
+  if (!data.modules.forms) out.push('  The Forms module is off for this site.');
+  else if (data.forms.length === 0) out.push('  No forms yet. They are created in the portal (Forms).');
+  for (const f of data.forms) {
+    out.push(`  ${f.name}`);
+    out.push(`    place it with: { "type": "form", "form": "${f.id}" }`);
+    out.push(`    fields: ${f.fields.map((x) => `${x.label}${x.required ? ' *' : ''}`).join(', ') || '(none)'}`);
+    out.push(`    button: ${f.submitLabel}`);
+  }
+  out.push('');
+
+  out.push('Events');
+  if (!data.events) out.push('  The Events module is off for this site.');
+  else {
+    out.push(`  calendarSettings.embedUrl = ${data.events.embedUrl}`);
+    out.push(
+      data.events.calendars.length
+        ? `  shows: ${data.events.calendars.map((c) => c.name).join(', ')}`
+        : '  No calendars chosen yet. They are connected in the portal (Events).',
+    );
+  }
+  return out.join('\n');
+}
+
+function readSiteMeta(cwd) {
+  try {
+    return JSON.parse(readFileSync(resolve(cwd, 'ferst-site.json'), 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+async function main() {
+  const argv = process.argv.slice(2);
+  const ref = moduleRef(argv, readSiteMeta(process.cwd()));
+  if (!ref) {
+    console.error('ferst-modules: no site to ask about. Pass --site <your site address> (e.g. --site example.pages.dev), or add "siteId" to ferst-site.json.');
+    process.exit(2);
+  }
+  const base = resolveGitBase();
+  const url = `${base}/sites/${encodeURIComponent(ref)}/modules`;
+  let res;
+  try {
+    res = await fetch(url, { headers: { Accept: 'application/json' } });
+  } catch (e) {
+    console.error(`ferst-modules: couldn't reach the Ferst platform at ${url}: ${e instanceof Error ? e.message : e}`);
+    process.exit(1);
+  }
+  if (res.status === 404) {
+    console.error(`ferst-modules: the platform doesn't know a site "${ref}". Check the address, or ask the core team (a core-request issue).`);
+    process.exit(1);
+  }
+  if (!res.ok) {
+    console.error(`ferst-modules: the platform answered ${res.status} for ${url}.`);
+    process.exit(1);
+  }
+  const data = await res.json();
+  console.log(argv.includes('--json') ? JSON.stringify(data, null, 2) : formatModules(data));
+}
+
+// Run when invoked directly as a bin — including via npm's node_modules/.bin symlink.
+if (isDirectInvocation(process.argv[1])) {
+  main();
+}

package/cms/config.template.yml

@@ -126,6 +126,19 @@ collections:
             fields:
               - { name: label, label: Label, widget: string }
               - { name: href, label: Link, widget: string }
+          - name: groups
+            label: Footer columns
+            widget: list
+            required: false
+            hint: Headed columns for policies, safeguarding, documents and forms — keep the main menu short.
+            fields:
+              - { name: heading, label: Heading, widget: string }
+              - name: links
+                label: Links
+                widget: list
+                fields:
+                  - { name: label, label: Label, widget: string }
+                  - { name: href, label: Link, widget: string }
 
       - name: calendar-settings
         label: Calendar

package/components/BlockRenderer.astro

@@ -26,6 +26,7 @@ import Faq from './recipes/Faq.astro';
 import Gallery from './recipes/Gallery.astro';
 import Testimonial from './recipes/Testimonial.astro';
 import ContactForm from './recipes/ContactForm.astro';
+import Form from './recipes/Form.astro';
 import Accordion from './recipes/Accordion.astro';
 import Tiles from './recipes/Tiles.astro';
 import Banner from './recipes/Banner.astro';
@@ -79,6 +80,7 @@ const registry: Record<BlockType, any> = {
   gallery: Gallery,
   testimonial: Testimonial,
   contactForm: ContactForm,
+  form: Form,
   accordion: Accordion,
   tiles: Tiles,
   banner: Banner,

package/components/ProseParts.astro

@@ -0,0 +1,26 @@
+---
+/**
+ * ProseParts — renders prose text as paragraphs and lists (lib/prose: blank lines →
+ * paragraphs, `- ` / `1. ` lines → lists, inline links / bold / italic, all escaped).
+ * The one place this markup lives, shared by prose, document, accordion, mediaText and
+ * table intros, so a fix lands everywhere at once.
+ *
+ * Note for callers: these elements carry THIS component's style scope, so a parent styles
+ * them through its own wrapper with `:global(p)`, `:global(ul)` etc.
+ */
+import { proseParts } from '../lib/prose';
+
+interface Props {
+  text: string | undefined | null;
+  /** Optional class on each paragraph / list (e.g. a table intro's). */
+  class?: string;
+}
+const { text, class: cls } = Astro.props;
+const parts = proseParts(text);
+---
+
+{parts.map((part) =>
+  part.kind === 'p' ? <p class={cls} set:html={part.html} />
+  : part.kind === 'ul' ? <ul class={cls}>{part.items.map((x) => <li set:html={x} />)}</ul>
+  : <ol class={cls}>{part.items.map((x) => <li set:html={x} />)}</ol>
+)}

package/components/SiteFooter.astro

@@ -28,9 +28,11 @@ interface Props {
   tagline?: string;
   /** The site's call-to-action (navbarSettings.cta), shown beside Facebook; null hides it. */
   cta?: { label: string; href: string } | null;
+  /** Headed columns of reference links (policies, documents, forms). */
+  groups?: Array<{ heading: string; links: NavLink[] }>;
 }
 
-const { facebookUrl, footerLinks, footerClass, shortName, tagline, cta = { label: 'Contact', href: '/contact/' } } = Astro.props;
+const { facebookUrl, footerLinks, footerClass, shortName, tagline, cta = { label: 'Contact', href: '/contact/' }, groups = [] } = Astro.props;
 const year = new Date().getFullYear();
 ---
 
@@ -65,6 +67,19 @@ const year = new Date().getFullYear();
     </div>
   </div>
 
+  {groups.length > 0 && (
+    <nav class="footer-groups" aria-label="Site information">
+      {groups.map((g) => (
+        <div class="footer-group">
+          <h2 class="footer-group__title">{g.heading}</h2>
+          <ul>
+            {g.links.map((l) => <li><a href={l.href}>{l.label}</a></li>)}
+          </ul>
+        </div>
+      ))}
+    </nav>
+  )}
+
   <div class="footer-bottom">
     <nav class="footer-nav" aria-label="Footer navigation">
       {footerLinks.map((link) => (
@@ -271,4 +286,40 @@ const year = new Date().getFullYear();
       gap: 1rem;
     }
   }
+
+  /* Headed columns of reference links: policies, documents, forms. */
+  .site-footer .footer-groups {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(min(100%, 11rem), 1fr));
+    gap: 1.5rem 2rem;
+    max-width: 72rem;
+    margin: 0 auto;
+    padding: 1.75rem clamp(1.25rem, 4vw, 2.5rem) 0.5rem;
+  }
+  .site-footer .footer-group__title {
+    margin: 0 0 0.6rem;
+    font-family: var(--font-heading);
+    font-size: 0.75rem;
+    font-weight: 600;
+    letter-spacing: 0.1em;
+    text-transform: uppercase;
+    color: var(--text-footer);
+    opacity: 0.8;
+  }
+  .site-footer .footer-group ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    display: grid;
+    gap: 0.45rem;
+  }
+  .site-footer .footer-group a {
+    color: var(--text-footer-link);
+    text-decoration: none;
+    font-size: 0.9375rem;
+  }
+  .site-footer .footer-group a:hover,
+  .site-footer .footer-group a:focus-visible {
+    text-decoration: underline;
+  }
 </style>