Compare commits
No commits in common. "main" and "v1.4" have entirely different histories.
113 changed files with 959 additions and 13693 deletions
78
CLAUDE.md
78
CLAUDE.md
|
|
@ -1,78 +0,0 @@
|
|||
# CLAUDE.md
|
||||
|
||||
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
||||
|
||||
# NGU-Web
|
||||
|
||||
Website for NGU (Next Generation of Unity), a Unity movement organization with regional chapters in the US and internationally. Full-stack app with a public site and a role-based admin panel.
|
||||
|
||||
## Stack
|
||||
- Frontend: React, TypeScript, Tailwind CSS, React Router, Vite (in `src/`)
|
||||
- Backend: Hono on Node.js, SQLite (WAL mode, STRICT tables) via better-sqlite3 / node:sqlite (in `server/`)
|
||||
- Package manager: pnpm only (never npm or yarn)
|
||||
|
||||
## Commands
|
||||
Frontend (repo root):
|
||||
- `pnpm dev` / `pnpm build` / `pnpm preview`: Vite
|
||||
- `pnpm format`: oxfmt
|
||||
- `pnpm exec tsc`: type-check (`noEmit`; there is no separate lint or typecheck script)
|
||||
- There is no test suite.
|
||||
|
||||
Backend (`server/`, Node >= 22). The server reads `HOST` (default `127.0.0.1`), `PORT` (default `3001`) and `DB_PATH` (default `./ngu.db`); locally, use `DB_PATH=./dev.db`:
|
||||
- `DB_PATH=./dev.db pnpm dev`: run with `node --watch`
|
||||
- `DB_PATH=./dev.db pnpm migrate`: apply migrations without starting the server
|
||||
- `DB_PATH=./dev.db node src/seed.js`: rebuild content tables from `src/data/`. It wipes every content table first (feedback is kept). Run it from the repo, not the deployed copy.
|
||||
- `DB_PATH=./dev.db node src/admin-cli.js add|list|passwd|role|disable|enable ...`: the only way accounts are created
|
||||
|
||||
In dev, Vite proxies `/api` to the target set in `vite.config.ts`, so the API must listen on that port.
|
||||
|
||||
## Deployment (production)
|
||||
- Ubuntu VPS, nginx reverse proxy, systemd service `ngu-api`
|
||||
- App deployed to `/srv/ngu-api`; database at `/var/lib/ngu/ngu.db`
|
||||
- Debugging: check `journalctl -u ngu-api -n 40 --no-pager` first. Make sure rsync ran from the repo (not the deployed copy) before restarting the service.
|
||||
- Never run commands against the production server or database unless explicitly asked.
|
||||
|
||||
## Git workflow
|
||||
- Remote is a self-hosted Forgejo server, not GitHub. Do not use `gh`.
|
||||
- Open pull requests with `tea`: `tea pr create --base main --head <branch> --title "..." --description "..."`
|
||||
- Never commit directly to main. Create a branch per change, push it, open a PR.
|
||||
- Versions are marked with annotated tags (v1.0, v1.3...). Don't create or move tags unless asked.
|
||||
- `server/dev.db` and other `*.db` files are local only and never committed.
|
||||
|
||||
## How to work in this repo
|
||||
- Read the relevant existing files before writing anything. Follow existing patterns exactly: descriptors, field syntax, extension shape, import conventions.
|
||||
- Ask questions up front before implementing non-trivial features.
|
||||
- Prefer targeted edits when surrounding code is stable; full rewrites only when a component is being substantially reworked.
|
||||
- Fix root causes. No redirect shims or workarounds.
|
||||
- Keep data logic in the database and presentation logic in code. Make things configurable via constants, not hardcoded in components.
|
||||
- Name components for what they do, not what they currently filter.
|
||||
|
||||
## Project layout
|
||||
- All pages use `PageShell.tsx` as the wrapper unless explicitly noted otherwise.
|
||||
- Pages live in `src/pages/`; section-level components go in `src/pages/sections/`.
|
||||
- `src/data/` holds only hardcoded data shared across multiple section files (e.g. `historyDecades.ts`, map grid). Everything else comes from SQLite.
|
||||
- `navConfig.js` is the single source of truth for navigation, routes, and actions (header, footer, pages).
|
||||
- `api.js` is the shared caching client used by frontend data hooks.
|
||||
- Logos: org logos in `public/org-logos/` (served at `/org-logos/`), event logos in `public/event-logos/`. The `<Logo>` component hides itself on load error.
|
||||
|
||||
## Rules and gotchas
|
||||
- **Role checks must use ladder comparisons, never equality.** Roles rank viewer → editor → admin → superadmin. Use the minimum-rank helpers from `src/lib/roles.ts` (`canWrite`, `canDelete`, `isSuper`, `atLeast`). Where a local variable shadows the name, import with an alias, e.g. `canWrite as roleCanWrite`. `role === "admin"` silently excludes higher roles and has caused repeated bugs.
|
||||
- **Imports need explicit extensions** (`.ts`, `.tsx`, `.js`) everywhere.
|
||||
- **Vite resolves `.js` before `.ts`**, so a `.js` and `.ts` file with the same base name will import the wrong one. Give new hooks distinct names.
|
||||
- **Don't use `fallback: EMPTY` in api.js hooks.** It silently returns empty arrays and hides server errors; let the error state surface.
|
||||
|
||||
## Admin CRUD engine
|
||||
Descriptor-driven: `server/admin-crud.js` and `admin-schema.js` (server) and `adminSchema.js` (client) generate SQL and form fields from declarative entity configs. Adding an entity should mean adding a descriptor, not new CRUD code.
|
||||
- Child collections are deleted and reinserted wholesale. Unsafe for entities referenced by foreign keys elsewhere.
|
||||
- `reindex: false` prevents cross-entity sort order collisions.
|
||||
- The `OMIT` sentinel distinguishes unsent fields from deliberate clears.
|
||||
- `admin-schema-sync.js` runs at boot and throws if descriptors don't match live `PRAGMA table_info`. If boot fails after a schema change, update the descriptor or migration so they agree.
|
||||
- `admin-cli.js` imports `ROLES` and `destroyAllSessionsFor` from `auth.js`. Keep it that way to prevent drift.
|
||||
|
||||
## Migrations
|
||||
- Sequential files: `001_`, `002_`, ...
|
||||
- The runner may drop statements after a `BEGIN...END` trigger body. Put each `CREATE VIEW` in its own migration file with no `BEGIN...END` block.
|
||||
- `PRAGMA foreign_keys = OFF` must be set outside transactions when cascading constraints are involved.
|
||||
|
||||
## Integrations
|
||||
- Church Center (ngu.churchcenteronline.com): Planning Center embeds for giving and the calendar.
|
||||
|
|
@ -1 +0,0 @@
|
|||
Test line added by Claude Code.
|
||||
|
|
@ -9,45 +9,22 @@
|
|||
DB_PATH=/var/lib/ngu/ngu.db node src/admin-cli.js add you@ngu.org
|
||||
DB_PATH=/var/lib/ngu/ngu.db node src/admin-cli.js list
|
||||
DB_PATH=/var/lib/ngu/ngu.db node src/admin-cli.js passwd you@ngu.org
|
||||
DB_PATH=/var/lib/ngu/ngu.db node src/admin-cli.js role them@ngu.org editor
|
||||
DB_PATH=/var/lib/ngu/ngu.db node src/admin-cli.js disable them@ngu.org
|
||||
DB_PATH=/var/lib/ngu/ngu.db node src/admin-cli.js enable them@ngu.org
|
||||
|
||||
Roles, low to high. Each one can do everything the one above it
|
||||
in this list can:
|
||||
add takes --role=viewer for read-only, --name="Full Name".
|
||||
Press enter at the password prompt and it generates one and
|
||||
prints it once.
|
||||
|
||||
viewer read the CMS, change nothing
|
||||
editor + create and update records
|
||||
admin + delete records
|
||||
superadmin + accounts, roles and sessions, via /admin/panel
|
||||
|
||||
add takes --role=editor, --name="Full Name". It defaults to
|
||||
admin. Press enter at the password prompt and it generates one
|
||||
and prints it once.
|
||||
|
||||
The list comes from auth.js rather than being repeated here, so
|
||||
the CLI can't drift from what requireRole will actually accept.
|
||||
|
||||
This is also how the first superadmin is made — there's no
|
||||
bootstrap path in the web interface, on purpose:
|
||||
|
||||
node src/admin-cli.js role you@ngu.org superadmin
|
||||
|
||||
Changing a password, a role, or disabling an account drops that
|
||||
person's live sessions, so it takes effect now rather than in
|
||||
30 days.
|
||||
|
||||
Nothing here refuses to demote or disable the last superadmin.
|
||||
The panel does, because a misclick there locks everyone out;
|
||||
here you're already root on the box holding the database, and a
|
||||
recovery tool that argues with you isn't one.
|
||||
Changing or disabling a password also drops that person's live
|
||||
sessions, so "disable" takes effect now rather than in 30 days.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { createInterface } from "node:readline";
|
||||
import { randomBytes } from "node:crypto";
|
||||
|
||||
import { openDatabase, migrate } from "./db.js";
|
||||
import { hashPassword, destroyAllSessionsFor, ROLES } from "./auth.js";
|
||||
import { hashPassword, destroyAllSessionsFor } from "./auth.js";
|
||||
|
||||
const MIN_PASSWORD = 12;
|
||||
|
||||
|
|
@ -109,37 +86,11 @@ function findUser(db, email) {
|
|||
.get(email);
|
||||
}
|
||||
|
||||
function checkRole(role) {
|
||||
if (!ROLES.includes(role)) {
|
||||
fail(`Role must be one of: ${ROLES.join(", ")}.`);
|
||||
}
|
||||
return role;
|
||||
}
|
||||
|
||||
/* Printed, never enforced — see the note at the top of the file.
|
||||
Worth saying out loud, because the person doing it is usually
|
||||
tidying up accounts rather than thinking about lockouts. */
|
||||
function warnIfLastSuper(db, user) {
|
||||
if (user.role !== "superadmin" || user.is_active !== 1) return;
|
||||
|
||||
const { n } = db
|
||||
.prepare(
|
||||
"SELECT COUNT(*) AS n FROM admin_users WHERE role = 'superadmin' AND is_active = 1",
|
||||
)
|
||||
.get();
|
||||
|
||||
if (n <= 1) {
|
||||
console.warn(
|
||||
"⚠ That's the last active superadmin. Nobody will be able to manage\n" +
|
||||
" accounts from /admin/panel until you promote someone here.",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
async function add(db, email, flags) {
|
||||
if (findUser(db, email)) fail(`${email} already exists. Use passwd to change it.`);
|
||||
|
||||
const role = checkRole(flags.role ?? "admin");
|
||||
const role = flags.role ?? "admin";
|
||||
if (!["admin", "viewer"].includes(role)) fail("Role must be admin or viewer.");
|
||||
|
||||
const password = await readPassword();
|
||||
|
||||
|
|
@ -166,36 +117,10 @@ async function passwd(db, email) {
|
|||
console.log(`✓ password changed for ${email}, existing sessions ended`);
|
||||
}
|
||||
|
||||
function setRole(db, email, role) {
|
||||
const user = findUser(db, email);
|
||||
if (!user) fail(`No account for ${email}.`);
|
||||
|
||||
checkRole(role);
|
||||
|
||||
if (user.role === role) {
|
||||
console.log(`· ${email} is already ${role}, nothing to do`);
|
||||
return;
|
||||
}
|
||||
|
||||
// Only a demotion can strand the account list.
|
||||
if (role !== "superadmin") warnIfLastSuper(db, user);
|
||||
|
||||
db.prepare("UPDATE admin_users SET role = ? WHERE id = ?").run(role, user.id);
|
||||
|
||||
// The session they're holding was issued against the old role.
|
||||
// Every check reads the row fresh, so it isn't a security hole —
|
||||
// but their open tab would keep drawing buttons that now 403.
|
||||
destroyAllSessionsFor(db, user.id);
|
||||
|
||||
console.log(`✓ ${email} is now ${role} (was ${user.role}), sessions ended`);
|
||||
}
|
||||
|
||||
function setActive(db, email, active) {
|
||||
const user = findUser(db, email);
|
||||
if (!user) fail(`No account for ${email}.`);
|
||||
|
||||
if (!active) warnIfLastSuper(db, user);
|
||||
|
||||
db.prepare("UPDATE admin_users SET is_active = ? WHERE id = ?").run(
|
||||
active ? 1 : 0,
|
||||
user.id,
|
||||
|
|
@ -222,13 +147,10 @@ function list(db) {
|
|||
}
|
||||
|
||||
for (const r of rows) {
|
||||
// Role and state are separate facts now. The old single column
|
||||
// printed "disabled" over the top of the role, which hid what
|
||||
// the account would go back to on enable.
|
||||
const state = r.is_active ? r.role : `${r.role} (disabled)`;
|
||||
const state = r.is_active ? r.role : "disabled";
|
||||
const seen = r.last_login_at ?? "never";
|
||||
console.log(
|
||||
`${r.email.padEnd(32)} ${state.padEnd(22)} last login ${seen.padEnd(20)} ${r.sessions} session(s)`,
|
||||
`${r.email.padEnd(32)} ${state.padEnd(9)} last login ${seen.padEnd(20)} ${r.sessions} session(s)`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -253,38 +175,24 @@ migrate(db); // so a fresh database gets the tables before we use them
|
|||
try {
|
||||
switch (command) {
|
||||
case "add":
|
||||
if (!email) fail("Usage: admin-cli.js add email@example.com [--role=editor]");
|
||||
if (!email) fail("Usage: admin-cli.js add email@example.com");
|
||||
await add(db, email, flags);
|
||||
break;
|
||||
case "passwd":
|
||||
if (!email) fail("Usage: admin-cli.js passwd email@example.com");
|
||||
await passwd(db, email);
|
||||
break;
|
||||
case "role": {
|
||||
// Positional reads better for a two-argument command, but
|
||||
// --role= is what `add` takes, so accept both rather than
|
||||
// making people remember which is which.
|
||||
const role = positional[1]?.trim().toLowerCase() ?? flags.role;
|
||||
if (!email || !role) {
|
||||
fail(`Usage: admin-cli.js role email@example.com <${ROLES.join("|")}>`);
|
||||
}
|
||||
setRole(db, email, role);
|
||||
break;
|
||||
}
|
||||
case "disable":
|
||||
if (!email) fail("Usage: admin-cli.js disable email@example.com");
|
||||
setActive(db, email, false);
|
||||
break;
|
||||
case "enable":
|
||||
if (!email) fail("Usage: admin-cli.js enable email@example.com");
|
||||
setActive(db, email, true);
|
||||
break;
|
||||
case "list":
|
||||
list(db);
|
||||
break;
|
||||
default:
|
||||
console.log("Commands: add, passwd, role, disable, enable, list");
|
||||
console.log(`Roles: ${ROLES.join(", ")}`);
|
||||
console.log("Commands: add, passwd, disable, enable, list");
|
||||
process.exit(command ? 1 : 0);
|
||||
}
|
||||
} finally {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ export class HttpError extends Error {
|
|||
|
||||
const SLUG = /^[a-z0-9][a-z0-9-]{0,63}$/;
|
||||
const ISO_DATE = /^\d{4}-\d{2}-\d{2}$/;
|
||||
const CLOCK_TIME = /^([01]\d|2[0-3]):[0-5]\d$/;
|
||||
|
||||
/* Not a value the caller can ever send, so it can mean "leave this
|
||||
column out of the statement" without colliding with real data. */
|
||||
|
|
@ -99,13 +98,6 @@ function coerceValue(column, raw, errors, prefix = "") {
|
|||
if (!ISO_DATE.test(value)) errors[key] = "Use YYYY-MM-DD.";
|
||||
return ISO_DATE.test(value) ? value : null;
|
||||
}
|
||||
case "time": {
|
||||
// <input type="time"> sends HH:MM, or HH:MM:SS when a step
|
||||
// asks for seconds. Nothing here does, so seconds are dropped.
|
||||
const value = String(raw).trim().slice(0, 5);
|
||||
if (!CLOCK_TIME.test(value)) errors[key] = "Use HH:MM, 24-hour.";
|
||||
return CLOCK_TIME.test(value) ? value : null;
|
||||
}
|
||||
default: {
|
||||
const value = String(raw).trim();
|
||||
return value === "" ? null : value;
|
||||
|
|
@ -161,8 +153,7 @@ export function listRows(db, entity, query = {}) {
|
|||
return { rows, total: rows.length };
|
||||
}
|
||||
|
||||
export function readRow(db, entity, rawId) {
|
||||
const id = normalizeId(entity, rawId);
|
||||
export function readRow(db, entity, id) {
|
||||
const row = db
|
||||
.prepare(`SELECT * FROM ${entity.table} WHERE ${entity.idColumn} = ?`)
|
||||
.get(id);
|
||||
|
|
@ -170,7 +161,10 @@ export function readRow(db, entity, rawId) {
|
|||
if (!row) throw new HttpError(404, "Not found.");
|
||||
|
||||
for (const ext of entity.extensions ?? []) {
|
||||
row[ext.key] = readExtension(db, ext, id);
|
||||
row[ext.key] =
|
||||
db
|
||||
.prepare(`SELECT * FROM ${ext.table} WHERE ${ext.idColumn} = ?`)
|
||||
.get(id) ?? null;
|
||||
}
|
||||
|
||||
for (const child of entity.children ?? []) {
|
||||
|
|
@ -180,29 +174,6 @@ export function readRow(db, entity, rawId) {
|
|||
return row;
|
||||
}
|
||||
|
||||
/* A 1:1 side table is found one of two ways. `idColumn` is the
|
||||
original: the side table's key IS the parent's id, which is how
|
||||
regions and person_private work. `owner` is the same block children
|
||||
already use — a foreign key column plus an optional kind discriminator
|
||||
— and it exists because a timeline entry is keyed by (ref_kind,
|
||||
ref_id) rather than by the event's own slug. Same upsert either way;
|
||||
only the WHERE differs. */
|
||||
function extensionWhere(ext, id) {
|
||||
if (!ext.owner) return { sql: `${ext.idColumn} = ?`, params: [id] };
|
||||
const where = [`${ext.owner.column} = ?`];
|
||||
const params = [id];
|
||||
if (ext.owner.kindColumn) {
|
||||
where.push(`${ext.owner.kindColumn} = ?`);
|
||||
params.push(ext.owner.kindValue);
|
||||
}
|
||||
return { sql: where.join(" AND "), params };
|
||||
}
|
||||
|
||||
function readExtension(db, ext, id) {
|
||||
const { sql, params } = extensionWhere(ext, id);
|
||||
return db.prepare(`SELECT * FROM ${ext.table} WHERE ${sql}`).get(...params) ?? null;
|
||||
}
|
||||
|
||||
function readChildren(db, child, ownerId) {
|
||||
const where = [`${child.owner.column} = ?`];
|
||||
const params = [ownerId];
|
||||
|
|
@ -237,49 +208,22 @@ function readChildren(db, child, ownerId) {
|
|||
|
||||
/* ── Write ───────────────────────────────────────────────────── */
|
||||
|
||||
/* An entity whose id is an autoincrement integer is addressed by a
|
||||
number, and a number arriving from a URL segment is a string. Every
|
||||
comparison against the id column goes through here so the two can't
|
||||
drift apart. */
|
||||
export function normalizeId(entity, id) {
|
||||
if (entity.idKind !== "auto") return id;
|
||||
const n = Number(id);
|
||||
if (!Number.isInteger(n)) throw new HttpError(404, "Not found.");
|
||||
return n;
|
||||
}
|
||||
|
||||
export function createRow(db, entity, payload) {
|
||||
// A singleton's one row comes from its migration. There is no
|
||||
// second one to create, and the CHECK on its id would refuse it.
|
||||
if (entity.singleton) {
|
||||
throw new HttpError(405, "There is only one of these; edit it instead.");
|
||||
const id = String(payload?.[entity.idColumn] ?? "").trim().toLowerCase();
|
||||
|
||||
if (entity.idKind === "slug" && !SLUG.test(id)) {
|
||||
throw new HttpError(422, "Validation failed", {
|
||||
[entity.idColumn]: "Lowercase letters, numbers and hyphens only.",
|
||||
});
|
||||
}
|
||||
|
||||
// idKind "auto": the table assigns the id, so there is nothing to
|
||||
// validate, nothing to check for collisions, and nothing for the
|
||||
// client to have sent. Timeline entries use this — they have no
|
||||
// natural name to slug, and one gets created every time somebody
|
||||
// ticks a checkbox on an event.
|
||||
const auto = entity.idKind === "auto";
|
||||
const id = auto
|
||||
? null
|
||||
: String(payload?.[entity.idColumn] ?? "").trim().toLowerCase();
|
||||
|
||||
if (!auto) {
|
||||
if (entity.idKind === "slug" && !SLUG.test(id)) {
|
||||
throw new HttpError(422, "Validation failed", {
|
||||
[entity.idColumn]: "Lowercase letters, numbers and hyphens only.",
|
||||
});
|
||||
}
|
||||
|
||||
const exists = db
|
||||
.prepare(`SELECT 1 FROM ${entity.table} WHERE ${entity.idColumn} = ?`)
|
||||
.get(id);
|
||||
if (exists) {
|
||||
throw new HttpError(422, "Validation failed", {
|
||||
[entity.idColumn]: "Already taken.",
|
||||
});
|
||||
}
|
||||
const exists = db
|
||||
.prepare(`SELECT 1 FROM ${entity.table} WHERE ${entity.idColumn} = ?`)
|
||||
.get(id);
|
||||
if (exists) {
|
||||
throw new HttpError(422, "Validation failed", {
|
||||
[entity.idColumn]: "Already taken.",
|
||||
});
|
||||
}
|
||||
|
||||
const { values, errors } = coerceRow(entity.columns, payload);
|
||||
|
|
@ -287,43 +231,24 @@ export function createRow(db, entity, payload) {
|
|||
throw new HttpError(422, "Validation failed", errors);
|
||||
}
|
||||
|
||||
let newId = id;
|
||||
const names = [entity.idColumn, ...Object.keys(values)];
|
||||
|
||||
wrapDbErrors(() =>
|
||||
tx(db, () => {
|
||||
if (auto) {
|
||||
const names = Object.keys(values);
|
||||
// Every column omitted is legitimate here: a blank entry that
|
||||
// takes all its defaults. INSERT INTO t () VALUES () is not
|
||||
// valid SQL, so that case needs DEFAULT VALUES.
|
||||
const result = names.length
|
||||
? db
|
||||
.prepare(
|
||||
`INSERT INTO ${entity.table} (${names.join(", ")})
|
||||
VALUES (${names.map(() => "?").join(", ")})`,
|
||||
)
|
||||
.run(...Object.values(values))
|
||||
: db.prepare(`INSERT INTO ${entity.table} DEFAULT VALUES`).run();
|
||||
// better-sqlite3 and node:sqlite disagree about BigInt here.
|
||||
newId = Number(result.lastInsertRowid);
|
||||
} else {
|
||||
const names = [entity.idColumn, ...Object.keys(values)];
|
||||
db.prepare(
|
||||
`INSERT INTO ${entity.table} (${names.join(", ")})
|
||||
VALUES (${names.map(() => "?").join(", ")})`,
|
||||
).run(id, ...Object.values(values));
|
||||
}
|
||||
db.prepare(
|
||||
`INSERT INTO ${entity.table} (${names.join(", ")})
|
||||
VALUES (${names.map(() => "?").join(", ")})`,
|
||||
).run(id, ...Object.values(values));
|
||||
|
||||
writeExtensions(db, entity, newId, payload, values);
|
||||
writeChildren(db, entity, newId, payload, values);
|
||||
writeExtensions(db, entity, id, payload, values);
|
||||
writeChildren(db, entity, id, payload, values);
|
||||
}),
|
||||
);
|
||||
|
||||
return readRow(db, entity, newId);
|
||||
return readRow(db, entity, id);
|
||||
}
|
||||
|
||||
export function updateRow(db, entity, rawId, payload) {
|
||||
const id = normalizeId(entity, rawId);
|
||||
export function updateRow(db, entity, id, payload) {
|
||||
const current = db
|
||||
.prepare(`SELECT * FROM ${entity.table} WHERE ${entity.idColumn} = ?`)
|
||||
.get(id);
|
||||
|
|
@ -371,14 +296,7 @@ export function updateRow(db, entity, rawId, payload) {
|
|||
return readRow(db, entity, id);
|
||||
}
|
||||
|
||||
export function deleteRow(db, entity, rawId) {
|
||||
// Deleting a singleton would leave the page it drives with nothing
|
||||
// to read, and the admin with no way to make another.
|
||||
if (entity.singleton) {
|
||||
throw new HttpError(405, "This can't be deleted, only edited.");
|
||||
}
|
||||
|
||||
const id = normalizeId(entity, rawId);
|
||||
export function deleteRow(db, entity, id) {
|
||||
const result = wrapDbErrors(() =>
|
||||
db.prepare(`DELETE FROM ${entity.table} WHERE ${entity.idColumn} = ?`).run(id),
|
||||
);
|
||||
|
|
@ -391,10 +309,8 @@ function writeExtensions(db, entity, id, payload, parentValues) {
|
|||
for (const ext of entity.extensions ?? []) {
|
||||
if (!applies(ext.when, parentValues)) {
|
||||
// The gate closed — the kind changed away from this side
|
||||
// table, or a checkbox was unticked — so its row (and anything
|
||||
// cascading off it) goes.
|
||||
const gone = extensionWhere(ext, id);
|
||||
db.prepare(`DELETE FROM ${ext.table} WHERE ${gone.sql}`).run(...gone.params);
|
||||
// table, so its row (and anything cascading off it) goes.
|
||||
db.prepare(`DELETE FROM ${ext.table} WHERE ${ext.idColumn} = ?`).run(id);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -407,42 +323,21 @@ function writeExtensions(db, entity, id, payload, parentValues) {
|
|||
|
||||
if (ext.touch) values.updated_at = new Date().toISOString().replace("T", " ").slice(0, 19);
|
||||
|
||||
// The owning columns come first, then whatever the form sent.
|
||||
const ownNames = [];
|
||||
const ownParams = [];
|
||||
if (ext.owner) {
|
||||
ownNames.push(ext.owner.column);
|
||||
ownParams.push(id);
|
||||
if (ext.owner.kindColumn) {
|
||||
ownNames.push(ext.owner.kindColumn);
|
||||
ownParams.push(ext.owner.kindValue);
|
||||
}
|
||||
} else {
|
||||
ownNames.push(ext.idColumn);
|
||||
ownParams.push(id);
|
||||
}
|
||||
|
||||
const names = [...ownNames, ...Object.keys(values)];
|
||||
const names = [ext.idColumn, ...Object.keys(values)];
|
||||
const sets = Object.keys(values).map((n) => `${n} = excluded.${n}`);
|
||||
|
||||
// What makes this row the same row on a second save. Defaults to
|
||||
// the id column; an owned extension declares the unique index its
|
||||
// owning columns form.
|
||||
const conflict = ext.conflict ?? ownNames;
|
||||
|
||||
// Upsert rather than delete-and-insert: deleting a regions row
|
||||
// would cascade its region_areas away underneath us, and deleting
|
||||
// a timeline row would take its people with it. With every
|
||||
// would cascade its region_areas away underneath us. With every
|
||||
// optional column omitted there is nothing to set, so the
|
||||
// conflict clause has to degrade to DO NOTHING or the SQL is
|
||||
// syntactically invalid.
|
||||
db.prepare(
|
||||
`INSERT INTO ${ext.table} (${names.join(", ")})
|
||||
VALUES (${names.map(() => "?").join(", ")})
|
||||
ON CONFLICT(${conflict.join(", ")}) ${
|
||||
ON CONFLICT(${ext.idColumn}) ${
|
||||
sets.length ? `DO UPDATE SET ${sets.join(", ")}` : "DO NOTHING"
|
||||
}`,
|
||||
).run(...ownParams, ...Object.values(values));
|
||||
).run(id, ...Object.values(values));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -633,19 +528,6 @@ function wrapDbErrors(fn) {
|
|||
throw new HttpError(422, `A value was rejected by the "${check[1]}" rule.`);
|
||||
}
|
||||
|
||||
// The polymorphic tables stand in for a foreign key with a
|
||||
// BEFORE INSERT trigger, and a trigger's RAISE(ABORT) matches none
|
||||
// of the patterns above — so without this, pointing a content
|
||||
// block, link or timeline entry at a row that isn't there is a 500
|
||||
// rather than something the form can show.
|
||||
const ghost = /^(\w+): no such (\w+)$/.exec(message);
|
||||
if (ghost) {
|
||||
throw new HttpError(
|
||||
422,
|
||||
`That points at ${/^[aeiou]/i.test(ghost[2]) ? "an" : "a"} ${ghost[2]} that doesn't exist.`,
|
||||
);
|
||||
}
|
||||
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,15 +53,7 @@ function collectGroups(entity) {
|
|||
groups.push({
|
||||
table: ext.table,
|
||||
columns: ext.columns ?? [],
|
||||
// An extension is keyed either by the parent's own id or by an
|
||||
// owner block, the same one children use. Both sets of columns
|
||||
// are filled in by the engine, never by the form.
|
||||
engineSupplied: [
|
||||
ext.idColumn,
|
||||
ext.owner?.column,
|
||||
ext.owner?.kindColumn,
|
||||
...(ext.touch ? ["updated_at"] : []),
|
||||
].filter(Boolean),
|
||||
engineSupplied: [ext.idColumn, ...(ext.touch ? ["updated_at"] : [])],
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -73,7 +65,7 @@ function collectGroups(entity) {
|
|||
child.owner.column,
|
||||
child.owner.kindColumn,
|
||||
"sort_order",
|
||||
...Object.keys(child.owner.inherit ?? {}),
|
||||
...Object.keys(child.owner.inherit ?? {}),
|
||||
].filter(Boolean),
|
||||
});
|
||||
for (const nested of child.children ?? []) walk(nested);
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@
|
|||
value (organizations.kind decides whether a
|
||||
regions or chapters row should exist)
|
||||
children ordered collections, replaced wholesale on save
|
||||
singleton the one id this entity ever has; the engine
|
||||
refuses create and delete (see front_page)
|
||||
|
||||
Replacing children wholesale is only safe because nothing has a
|
||||
foreign key INTO these tables. That is the dividing line, and
|
||||
|
|
@ -42,7 +40,6 @@ const int = (name, opts = {}) => ({ name, type: "int", ...opts });
|
|||
const real = (name, opts = {}) => ({ name, type: "real", ...opts });
|
||||
const bool = (name, opts = {}) => ({ name, type: "bool", ...opts });
|
||||
const date = (name, opts = {}) => ({ name, type: "date", ...opts });
|
||||
const time = (name, opts = {}) => ({ name, type: "time", ...opts });
|
||||
const enumeration = (name, values, opts = {}) => ({
|
||||
name,
|
||||
type: "enum",
|
||||
|
|
@ -77,51 +74,6 @@ const affiliationRole = [
|
|||
bool("is_public"),
|
||||
];
|
||||
|
||||
/* The editable half of a timeline entry, shared by the standalone
|
||||
editor and by the in_timeline extension on events and organizations.
|
||||
|
||||
occurred_on is text, not date. "2012" and "2025-07" are legitimate
|
||||
values — a backfilled entry often knows the year and nothing more —
|
||||
and the date coercion would reject both. `precision` is what says how
|
||||
much of it to believe. */
|
||||
const timelineFields = [
|
||||
text("occurred_on"),
|
||||
enumeration("precision", ["year", "month", "day"]),
|
||||
text("title"),
|
||||
text("blurb"),
|
||||
text("meta"),
|
||||
text("link_url"),
|
||||
bool("is_featured"),
|
||||
bool("is_published"),
|
||||
int("sort_order"),
|
||||
];
|
||||
|
||||
/* The extension that the in_timeline checkbox drives. Ticked, the row
|
||||
is upserted; unticked, writeExtensions deletes it. Both happen in the
|
||||
parent's transaction, so the flag and the row cannot disagree.
|
||||
|
||||
The conflict target is the UNIQUE (ref_kind, ref_id) index from
|
||||
migration 007, which is also what stops a second save creating a
|
||||
duplicate instead of updating the first. */
|
||||
const timelineExtension = (refKind) => ({
|
||||
key: "timeline",
|
||||
table: "timeline_entries",
|
||||
owner: { column: "ref_id", kindColumn: "ref_kind", kindValue: refKind },
|
||||
conflict: ["ref_kind", "ref_id"],
|
||||
when: { column: "in_timeline", value: 1 },
|
||||
columns: [
|
||||
// Fixed for this end: an event's entry is always an event entry.
|
||||
// Declared as a default rather than a form field so the column is
|
||||
// written without asking.
|
||||
enumeration(
|
||||
"kind",
|
||||
["milestone", "event", "organization", "award", "people"],
|
||||
{ default: refKind === "organization" ? "organization" : refKind },
|
||||
),
|
||||
...timelineFields,
|
||||
],
|
||||
});
|
||||
|
||||
/* The two polymorphic collections, parameterised by owner_kind. */
|
||||
const linksChild = (ownerKind) => ({
|
||||
key: "links",
|
||||
|
|
@ -179,26 +131,6 @@ const blocksChild = (ownerKind) => ({
|
|||
],
|
||||
});
|
||||
|
||||
/* Hosts. One row is one host, ordered, each either an organization
|
||||
or a person — the CHECK on event_hosts rejects both and the blank
|
||||
filter drops neither, so the only bad row that reaches SQLite is
|
||||
one with both selects filled, and that comes back keyed to the
|
||||
row like any other field error.
|
||||
|
||||
Not parameterised the way links and blocks are: this table is
|
||||
events-only, and the owner column says so.
|
||||
|
||||
sort_order isn't declared. The engine writes it from the row's
|
||||
position because `order` is "sort_order", which is what makes
|
||||
the first row the one v_events takes the logo and colour from. */
|
||||
const hostsChild = {
|
||||
key: "event_hosts",
|
||||
table: "event_hosts",
|
||||
owner: { column: "event_id" },
|
||||
order: "sort_order",
|
||||
columns: [text("org_id"), text("person_id")],
|
||||
};
|
||||
|
||||
/* ── Organizations ───────────────────────────────────────────── */
|
||||
|
||||
const organizations = {
|
||||
|
|
@ -237,11 +169,9 @@ const organizations = {
|
|||
...placeColumns,
|
||||
bool("is_published"),
|
||||
int("sort_order"),
|
||||
bool("in_timeline"),
|
||||
],
|
||||
|
||||
extensions: [
|
||||
timelineExtension("organization"),
|
||||
{
|
||||
key: "region",
|
||||
table: "regions",
|
||||
|
|
@ -284,10 +214,6 @@ const organizations = {
|
|||
|
||||
/* ── Events ──────────────────────────────────────────────────── */
|
||||
|
||||
/* Column suffixes for the series weekday flags, Sunday first to
|
||||
match Date#getDay. */
|
||||
const SERIES_WEEKDAYS = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"];
|
||||
|
||||
const events = {
|
||||
key: "events",
|
||||
table: "events",
|
||||
|
|
@ -300,7 +226,7 @@ const events = {
|
|||
"id",
|
||||
"title",
|
||||
"section_id",
|
||||
"event_type",
|
||||
"host_org_id",
|
||||
"date_label",
|
||||
"starts_on",
|
||||
"status",
|
||||
|
|
@ -308,29 +234,14 @@ const events = {
|
|||
"sort_order",
|
||||
"updated_at",
|
||||
],
|
||||
// No host filter: hosts are rows in another table now, and the
|
||||
// engine's filters are columns on this one. The events a host
|
||||
// owns are on that host's own page.
|
||||
filters: ["section_id", "event_type", "status", "is_published"],
|
||||
filters: ["section_id", "status", "is_published", "host_org_id"],
|
||||
search: ["title", "id", "theme"],
|
||||
order: "sort_order, starts_on DESC, title",
|
||||
},
|
||||
|
||||
columns: [
|
||||
text("section_id", { required: true }),
|
||||
|
||||
// What kind of gathering, as against section_id's which band of
|
||||
// the page. Declared required even though the column has a
|
||||
// DEFAULT: every select renders a blank first option, so without
|
||||
// it a new event files itself as a retreat while nobody is
|
||||
// looking. An existing row always loads with its value set, so
|
||||
// this only ever asks on create.
|
||||
enumeration(
|
||||
"event_type",
|
||||
["retreat", "class", "workshop", "meeting", "other"],
|
||||
{ required: true },
|
||||
),
|
||||
|
||||
text("host_org_id"),
|
||||
text("title", { required: true }),
|
||||
text("theme"),
|
||||
text("tagline"),
|
||||
|
|
@ -345,25 +256,9 @@ const events = {
|
|||
text("gradient"),
|
||||
bool("is_published"),
|
||||
int("sort_order"),
|
||||
bool("in_timeline"),
|
||||
|
||||
// A repeating schedule. Columns rather than a side table: the
|
||||
// schedule is always exactly one per event, and the public view
|
||||
// is SELECT e.*, so it reaches the site with no join. Ignored
|
||||
// while is_series is 0. See migration 016 for what each means.
|
||||
bool("is_series"),
|
||||
enumeration("series_frequency", ["weekly", "monthly_date", "monthly_weekday"]),
|
||||
int("series_interval"),
|
||||
...SERIES_WEEKDAYS.map((day) => bool(`series_${day}`)),
|
||||
time("series_start_time"),
|
||||
time("series_end_time"),
|
||||
int("series_count"),
|
||||
],
|
||||
|
||||
extensions: [timelineExtension("event")],
|
||||
|
||||
children: [
|
||||
hostsChild,
|
||||
linksChild("event"),
|
||||
blocksChild("event"),
|
||||
{
|
||||
|
|
@ -590,195 +485,7 @@ const awards = {
|
|||
],
|
||||
};
|
||||
|
||||
/* ── Timeline ────────────────────────────────────────────────── */
|
||||
|
||||
// The history page's spine, and the only entity whose id the table
|
||||
// assigns. There is nothing to slug: an entry referencing an event has
|
||||
// no name of its own, and one gets created every time somebody ticks a
|
||||
// checkbox. idKind "auto" is what lets createRow skip the id entirely.
|
||||
//
|
||||
// ref_kind and ref_id are writable here and only here. The extension on
|
||||
// events and organizations owns those two columns for rows it created,
|
||||
// which is why they aren't in timelineFields.
|
||||
//
|
||||
// Deleting an entry takes its people with it (ON DELETE CASCADE) and
|
||||
// nothing points at an entry, so the delete-and-reinsert child engine
|
||||
// is safe on this one.
|
||||
const timeline = {
|
||||
key: "timeline",
|
||||
table: "timeline_entries",
|
||||
idColumn: "id",
|
||||
idKind: "auto",
|
||||
concurrency: "updated_at",
|
||||
|
||||
list: {
|
||||
columns: [
|
||||
"id",
|
||||
"kind",
|
||||
"ref_kind",
|
||||
"ref_id",
|
||||
"occurred_on",
|
||||
"title",
|
||||
"is_featured",
|
||||
"is_published",
|
||||
"updated_at",
|
||||
],
|
||||
filters: ["kind", "ref_kind", "is_featured", "is_published"],
|
||||
search: ["title", "blurb", "meta", "ref_id"],
|
||||
// Undated entries sort last rather than first, so a missing date
|
||||
// reads as something to fix instead of something to scroll past.
|
||||
order: "occurred_on IS NULL, occurred_on DESC, sort_order",
|
||||
},
|
||||
|
||||
columns: [
|
||||
enumeration(
|
||||
"kind",
|
||||
["milestone", "event", "organization", "award", "people"],
|
||||
{ required: true },
|
||||
),
|
||||
enumeration("ref_kind", ["event", "organization", "award", "person", "team"]),
|
||||
text("ref_id"),
|
||||
...timelineFields,
|
||||
],
|
||||
|
||||
children: [
|
||||
{
|
||||
key: "people",
|
||||
table: "timeline_entry_people",
|
||||
owner: { column: "entry_id" },
|
||||
order: "sort_order",
|
||||
columns: [text("person_id", { required: true }), text("note")],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
/* ── Front page ──────────────────────────────────────────────────
|
||||
|
||||
A singleton: one row, id 'home', created by migration 017 and
|
||||
never by the admin. `singleton` tells the engine to refuse create
|
||||
and delete, and the CHECK on front_page.id is what makes a second
|
||||
row impossible even without it.
|
||||
|
||||
Every collection here is owned by page_id and replaced wholesale.
|
||||
That is safe for the same reason it is for links and blocks —
|
||||
nothing has a foreign key into these tables — and paths carry
|
||||
their actions as a nested collection, the shape content blocks
|
||||
and their items already use. */
|
||||
|
||||
const frontPage = {
|
||||
key: "front_page",
|
||||
table: "front_page",
|
||||
idColumn: "id",
|
||||
idKind: "slug",
|
||||
singleton: "home",
|
||||
concurrency: "updated_at",
|
||||
|
||||
list: {
|
||||
columns: ["id", "headline", "hero_mode", "updated_at"],
|
||||
filters: [],
|
||||
search: [],
|
||||
order: "id",
|
||||
},
|
||||
|
||||
columns: [
|
||||
enumeration("hero_mode", ["brand", "photos", "livestream"]),
|
||||
text("eyebrow"),
|
||||
text("headline"),
|
||||
text("subhead"),
|
||||
text("primary_label"),
|
||||
text("primary_url"),
|
||||
text("secondary_label"),
|
||||
text("secondary_url"),
|
||||
int("slide_seconds"),
|
||||
text("livestream_url"),
|
||||
text("livestream_title"),
|
||||
text("countdown_event_id"),
|
||||
],
|
||||
|
||||
children: [
|
||||
{
|
||||
key: "slides",
|
||||
table: "front_page_slides",
|
||||
owner: { column: "page_id" },
|
||||
order: "sort_order",
|
||||
columns: [
|
||||
text("media", { required: true }),
|
||||
text("alt"),
|
||||
text("caption"),
|
||||
text("link_url"),
|
||||
],
|
||||
},
|
||||
{
|
||||
key: "sections",
|
||||
table: "front_page_sections",
|
||||
owner: { column: "page_id" },
|
||||
order: "sort_order",
|
||||
columns: [
|
||||
enumeration(
|
||||
"section",
|
||||
["countdown", "retreats", "calendar", "stats", "timeline", "connect"],
|
||||
{ required: true },
|
||||
),
|
||||
text("title"),
|
||||
text("blurb"),
|
||||
bool("is_hidden"),
|
||||
],
|
||||
},
|
||||
{
|
||||
key: "stats",
|
||||
table: "front_page_stats",
|
||||
owner: { column: "page_id" },
|
||||
order: "sort_order",
|
||||
columns: [
|
||||
text("label", { required: true }),
|
||||
enumeration("source", [
|
||||
"manual",
|
||||
"years_since",
|
||||
"regions",
|
||||
"chapters",
|
||||
"partners",
|
||||
"events_held",
|
||||
"retreats_held",
|
||||
"people",
|
||||
"awards_given",
|
||||
]),
|
||||
text("value"),
|
||||
text("suffix"),
|
||||
text("note"),
|
||||
],
|
||||
},
|
||||
{
|
||||
key: "paths",
|
||||
table: "front_page_paths",
|
||||
owner: { column: "page_id" },
|
||||
order: "sort_order",
|
||||
columns: [text("label", { required: true }), text("icon"), text("blurb")],
|
||||
children: [
|
||||
{
|
||||
key: "actions",
|
||||
table: "front_page_path_actions",
|
||||
owner: { column: "path_id" },
|
||||
order: "sort_order",
|
||||
columns: [
|
||||
text("label", { required: true }),
|
||||
text("description"),
|
||||
text("url", { required: true }),
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const ENTITIES = {
|
||||
organizations,
|
||||
events,
|
||||
people,
|
||||
teams,
|
||||
awards,
|
||||
timeline,
|
||||
front_page: frontPage,
|
||||
};
|
||||
export const ENTITIES = { organizations, events, people, teams, awards };
|
||||
|
||||
/* ── Options for the form's select inputs ────────────────────── */
|
||||
|
||||
|
|
@ -796,22 +503,6 @@ export const OPTION_QUERIES = {
|
|||
teams:
|
||||
"SELECT id, name AS label, org_id FROM teams ORDER BY org_id, sort_order, name",
|
||||
|
||||
// One flat list the ref picker filters by ref_kind, rather than five
|
||||
// dropdowns of which four are always wrong. `kind` is the discriminator
|
||||
// the client's filterBy matches on; org_kind disambiguates the label,
|
||||
// since a region and a chapter can share a name.
|
||||
timeline_refs: `
|
||||
SELECT 'event' AS kind, id, title AS label FROM events
|
||||
UNION ALL
|
||||
SELECT 'organization', id, name || ' (' || kind || ')' FROM organizations
|
||||
UNION ALL
|
||||
SELECT 'award', id, name FROM awards
|
||||
UNION ALL
|
||||
SELECT 'person', id, display_name FROM people
|
||||
UNION ALL
|
||||
SELECT 'team', id, name FROM teams
|
||||
ORDER BY kind, label`,
|
||||
|
||||
// The awarding organization is folded into the label instead,
|
||||
// because a person can receive an award from any organization —
|
||||
// there is nothing to filter on, only something to disambiguate
|
||||
|
|
|
|||
|
|
@ -198,14 +198,10 @@ export async function requireAuth(c, next) {
|
|||
await next();
|
||||
}
|
||||
|
||||
export const ROLES = ["viewer", "editor", "admin", "superadmin"];
|
||||
const RANK = { viewer: 1, editor: 2, admin: 3, superadmin: 4 };
|
||||
|
||||
export function requireRole(...roles) {
|
||||
const need = Math.min(...roles.map((r) => RANK[r] ?? Infinity));
|
||||
return async (c, next) => {
|
||||
const user = c.get("user");
|
||||
if (!user || (RANK[user.role] ?? 0) < need) {
|
||||
if (!user || !roles.includes(user.role)) {
|
||||
return c.json({ error: "Not allowed." }, 403);
|
||||
}
|
||||
await next();
|
||||
|
|
|
|||
|
|
@ -16,12 +16,9 @@ import { openDatabase, migrate } from "./db.js";
|
|||
import { rateLimit } from "./rateLimit.js";
|
||||
import content from "./routes/content.js";
|
||||
import people from "./routes/people.js";
|
||||
import history from "./routes/history.js";
|
||||
import home from "./routes/home.js";
|
||||
import feedback from "./routes/feedback.js";
|
||||
import auth from "./routes/auth.js";
|
||||
import admin from "./routes/admin.js";
|
||||
import panel from "./routes/panel.js";
|
||||
import adminEntities from "./routes/admin-entities.js";
|
||||
import { startSessionSweeper } from "./auth.js";
|
||||
import { syncDescriptorsWithSchema } from "./admin-schema-sync.js";
|
||||
|
|
@ -56,15 +53,12 @@ app.get("/api/health", (c) =>
|
|||
|
||||
app.route("/api", content);
|
||||
app.route("/api", people);
|
||||
app.route("/api", history);
|
||||
app.route("/api", home);
|
||||
|
||||
// Tighter limit on the write path than anything else gets.
|
||||
app.use("/api/feedback", rateLimit({ windowMs: 60_000, max: 5 }));
|
||||
app.route("/api/feedback", feedback);
|
||||
|
||||
app.use("/api/auth/login", rateLimit({ windowMs: 15 * 60_000, max: 10 }));
|
||||
app.route("/api/admin/panel", panel);
|
||||
app.route("/api/auth", auth);
|
||||
app.route("/api/admin", admin);
|
||||
app.route("/api/admin", adminEntities);
|
||||
|
|
|
|||
|
|
@ -1,279 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- 007 TIMELINE
|
||||
--
|
||||
-- The history page's spine. One row per thing worth putting on the
|
||||
-- rail, and — this is the whole point — a row that points at an
|
||||
-- event holds almost nothing of its own. Title, date and logo are
|
||||
-- read back from `events` at query time, so editing the event edits
|
||||
-- the timeline and there is no second copy to drift.
|
||||
--
|
||||
-- Decade headers are NOT here. There are four of them, they change
|
||||
-- about never, and they are editorial voice rather than record; they
|
||||
-- live in src/data/historyDecades.ts.
|
||||
--
|
||||
-- ref_kind + ref_id is polymorphic, matching content_blocks and
|
||||
-- links rather than inventing a second pattern. SQLite can't express
|
||||
-- that as a foreign key, so the triggers below do the work one
|
||||
-- would, exactly as those two tables already do.
|
||||
--
|
||||
-- PRAGMA user_version; -- was 6 before this file
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
CREATE TABLE timeline_entries (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
|
||||
-- What the entry is about, which drives the marker and the body
|
||||
-- layout on the page. Usually mirrors ref_kind; 'people' is the
|
||||
-- exception, being a team ref rendered as a roster, and
|
||||
-- 'milestone' is the free-standing case with no ref at all.
|
||||
kind TEXT NOT NULL DEFAULT 'milestone'
|
||||
CHECK (kind IN ('milestone', 'event', 'organization',
|
||||
'award', 'people')),
|
||||
|
||||
ref_kind TEXT CHECK (ref_kind IN ('event', 'organization', 'award',
|
||||
'person', 'team')),
|
||||
ref_id TEXT,
|
||||
|
||||
-- Null inherits from the referenced row: an event's starts_on. A
|
||||
-- hand-authored entry has to supply its own, which the descriptor
|
||||
-- can't require conditionally — the read layer reports an entry
|
||||
-- with neither rather than the table refusing it.
|
||||
occurred_on TEXT,
|
||||
|
||||
-- How much of occurred_on is trustworthy. Backfilled rows often
|
||||
-- have a full date where only the year is actually known, and
|
||||
-- 'year' is what routes them to "Elsewhere in 2009" instead of
|
||||
-- asserting a month nobody can source.
|
||||
precision TEXT NOT NULL DEFAULT 'day'
|
||||
CHECK (precision IN ('year', 'month', 'day')),
|
||||
|
||||
-- All null-inherits-from-the-ref. Filling one in is an override,
|
||||
-- for when the timeline wants to say something the event card
|
||||
-- doesn't.
|
||||
title TEXT,
|
||||
blurb TEXT,
|
||||
meta TEXT,
|
||||
link_url TEXT,
|
||||
|
||||
is_featured INTEGER NOT NULL DEFAULT 0 CHECK (is_featured IN (0, 1)),
|
||||
is_published INTEGER NOT NULL DEFAULT 1 CHECK (is_published IN (0, 1)),
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
|
||||
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
||||
updated_at TEXT NOT NULL DEFAULT (datetime('now')),
|
||||
|
||||
-- Half a reference is worse than none: it would resolve to a link
|
||||
-- with no destination and no way to notice.
|
||||
CHECK ((ref_kind IS NULL) = (ref_id IS NULL)),
|
||||
|
||||
-- One timeline entry per referenced record, which is what makes
|
||||
-- the in_timeline checkbox an upsert rather than a duplicate
|
||||
-- factory. SQLite permits any number of NULL pairs here, so
|
||||
-- hand-authored entries are unaffected.
|
||||
UNIQUE (ref_kind, ref_id)
|
||||
) STRICT;
|
||||
|
||||
CREATE INDEX timeline_entries_date_idx
|
||||
ON timeline_entries (is_published, occurred_on DESC);
|
||||
|
||||
|
||||
-- Who an entry is about, when it isn't a whole team. A 'people'
|
||||
-- entry naming a team resolves its roster through v_org_leadership
|
||||
-- instead and leaves this table empty; this is for the cases where
|
||||
-- the list is editorial rather than structural.
|
||||
--
|
||||
-- Safe for the CRUD engine's delete-and-reinsert because nothing
|
||||
-- references these rows.
|
||||
CREATE TABLE timeline_entry_people (
|
||||
entry_id INTEGER NOT NULL REFERENCES timeline_entries (id) ON DELETE CASCADE,
|
||||
person_id TEXT NOT NULL REFERENCES people (id) ON DELETE CASCADE,
|
||||
note TEXT, -- 'Founding lead'
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (entry_id, person_id)
|
||||
) STRICT;
|
||||
|
||||
CREATE INDEX timeline_entry_people_person_idx
|
||||
ON timeline_entry_people (person_id);
|
||||
|
||||
|
||||
-- ── The checkbox on the event and organization editors ─────────
|
||||
--
|
||||
-- Not a denormalised copy of "does a timeline row exist" — it is the
|
||||
-- gate the admin descriptor reads. Ticked, the extension upserts a
|
||||
-- timeline_entries row; unticked, the engine deletes it. The flag
|
||||
-- and the row are written in the same transaction, so they cannot
|
||||
-- disagree.
|
||||
ALTER TABLE events
|
||||
ADD COLUMN in_timeline INTEGER NOT NULL DEFAULT 0
|
||||
CHECK (in_timeline IN (0, 1));
|
||||
|
||||
ALTER TABLE organizations
|
||||
ADD COLUMN in_timeline INTEGER NOT NULL DEFAULT 0
|
||||
CHECK (in_timeline IN (0, 1));
|
||||
|
||||
|
||||
-- ── Integrity for the polymorphic reference ────────────────────
|
||||
|
||||
CREATE TRIGGER timeline_entries_ref_exists
|
||||
BEFORE INSERT ON timeline_entries
|
||||
BEGIN
|
||||
SELECT CASE
|
||||
WHEN new.ref_kind = 'event'
|
||||
AND NOT EXISTS (SELECT 1 FROM events WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such event')
|
||||
WHEN new.ref_kind = 'organization'
|
||||
AND NOT EXISTS (SELECT 1 FROM organizations WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such organization')
|
||||
WHEN new.ref_kind = 'award'
|
||||
AND NOT EXISTS (SELECT 1 FROM awards WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such award')
|
||||
WHEN new.ref_kind = 'person'
|
||||
AND NOT EXISTS (SELECT 1 FROM people WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such person')
|
||||
WHEN new.ref_kind = 'team'
|
||||
AND NOT EXISTS (SELECT 1 FROM teams WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such team')
|
||||
END;
|
||||
END;
|
||||
|
||||
-- The same check on update, because the standalone editor can
|
||||
-- repoint an entry at a different record.
|
||||
CREATE TRIGGER timeline_entries_ref_exists_update
|
||||
BEFORE UPDATE OF ref_kind, ref_id ON timeline_entries
|
||||
BEGIN
|
||||
SELECT CASE
|
||||
WHEN new.ref_kind = 'event'
|
||||
AND NOT EXISTS (SELECT 1 FROM events WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such event')
|
||||
WHEN new.ref_kind = 'organization'
|
||||
AND NOT EXISTS (SELECT 1 FROM organizations WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such organization')
|
||||
WHEN new.ref_kind = 'award'
|
||||
AND NOT EXISTS (SELECT 1 FROM awards WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such award')
|
||||
WHEN new.ref_kind = 'person'
|
||||
AND NOT EXISTS (SELECT 1 FROM people WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such person')
|
||||
WHEN new.ref_kind = 'team'
|
||||
AND NOT EXISTS (SELECT 1 FROM teams WHERE id = new.ref_id)
|
||||
THEN RAISE(ABORT, 'timeline_entries: no such team')
|
||||
END;
|
||||
END;
|
||||
|
||||
|
||||
-- Deleting the record deletes its entry. Separate triggers rather
|
||||
-- than editing the existing *_cleanup ones, so this migration adds
|
||||
-- and never rewrites.
|
||||
CREATE TRIGGER timeline_events_cleanup
|
||||
AFTER DELETE ON events
|
||||
BEGIN
|
||||
DELETE FROM timeline_entries WHERE ref_kind = 'event' AND ref_id = old.id;
|
||||
END;
|
||||
|
||||
CREATE TRIGGER timeline_organizations_cleanup
|
||||
AFTER DELETE ON organizations
|
||||
BEGIN
|
||||
DELETE FROM timeline_entries WHERE ref_kind = 'organization' AND ref_id = old.id;
|
||||
END;
|
||||
|
||||
CREATE TRIGGER timeline_awards_cleanup
|
||||
AFTER DELETE ON awards
|
||||
BEGIN
|
||||
DELETE FROM timeline_entries WHERE ref_kind = 'award' AND ref_id = old.id;
|
||||
END;
|
||||
|
||||
CREATE TRIGGER timeline_people_cleanup
|
||||
AFTER DELETE ON people
|
||||
BEGIN
|
||||
DELETE FROM timeline_entries WHERE ref_kind = 'person' AND ref_id = old.id;
|
||||
END;
|
||||
|
||||
CREATE TRIGGER timeline_teams_cleanup
|
||||
AFTER DELETE ON teams
|
||||
BEGIN
|
||||
DELETE FROM timeline_entries WHERE ref_kind = 'team' AND ref_id = old.id;
|
||||
END;
|
||||
|
||||
|
||||
-- updated_at, with the same WHEN guard as the other touch triggers
|
||||
-- so an explicit value passes through untouched on import.
|
||||
CREATE TRIGGER timeline_entries_touch
|
||||
AFTER UPDATE ON timeline_entries
|
||||
FOR EACH ROW WHEN new.updated_at = old.updated_at
|
||||
BEGIN
|
||||
UPDATE timeline_entries SET updated_at = datetime('now') WHERE id = new.id;
|
||||
END;
|
||||
|
||||
|
||||
-- ── Read view ──────────────────────────────────────────────────
|
||||
--
|
||||
-- Every fallback the page depends on, resolved once here rather than
|
||||
-- restated by each route. An entry with no title of its own takes
|
||||
-- the referenced record's name; with no date, the event's starts_on.
|
||||
--
|
||||
-- org_kind rides along because /regions, /chapters and /partners are
|
||||
-- three different routes and only this table knows which a slug is.
|
||||
--
|
||||
-- effective_date is the sort key. An entry that ended up with no
|
||||
-- date at all sorts last rather than vanishing, so a missing one is
|
||||
-- visible in the admin instead of silently absent from the page.
|
||||
CREATE VIEW v_timeline AS
|
||||
SELECT
|
||||
t.id,
|
||||
t.kind,
|
||||
t.ref_kind,
|
||||
t.ref_id,
|
||||
t.precision,
|
||||
t.is_featured,
|
||||
t.is_published,
|
||||
t.sort_order,
|
||||
|
||||
COALESCE(t.occurred_on, e.starts_on, pa.awarded_on) AS effective_date,
|
||||
|
||||
COALESCE(
|
||||
t.title,
|
||||
e.title,
|
||||
o.name,
|
||||
aw.name,
|
||||
p.display_name,
|
||||
tm.name
|
||||
) AS effective_title,
|
||||
|
||||
COALESCE(t.blurb, e.tagline, o.tagline, aw.description, p.tagline, tm.tagline)
|
||||
AS effective_blurb,
|
||||
t.meta,
|
||||
t.link_url,
|
||||
|
||||
-- Filename only. The directory is the frontend's business.
|
||||
COALESCE(e.event_logo, e.org_logo, o.logo, aw.logo, p.photo, tm.logo)
|
||||
AS effective_logo,
|
||||
|
||||
o.kind AS org_kind,
|
||||
tm.org_id AS team_org_id,
|
||||
tm.name AS team_name,
|
||||
|
||||
-- Whether the referenced record is itself visible. An entry must not
|
||||
-- outlive the thing it points at being unpublished — a draft event
|
||||
-- would otherwise leak its title and date onto a public page. Null
|
||||
-- for a standalone milestone, which answers to nothing but its own
|
||||
-- is_published.
|
||||
CASE t.ref_kind
|
||||
WHEN 'event' THEN e.is_published
|
||||
WHEN 'organization' THEN o.is_published
|
||||
WHEN 'person' THEN p.is_published
|
||||
WHEN 'team' THEN tm.is_published
|
||||
ELSE NULL
|
||||
END AS ref_is_published,
|
||||
t.occurred_on,
|
||||
t.title AS title_override
|
||||
FROM timeline_entries t
|
||||
LEFT JOIN events e ON t.ref_kind = 'event' AND e.id = t.ref_id
|
||||
LEFT JOIN organizations o ON t.ref_kind = 'organization' AND o.id = t.ref_id
|
||||
LEFT JOIN awards aw ON t.ref_kind = 'award' AND aw.id = t.ref_id
|
||||
LEFT JOIN people p ON t.ref_kind = 'person' AND p.id = t.ref_id
|
||||
LEFT JOIN teams tm ON t.ref_kind = 'team' AND tm.id = t.ref_id
|
||||
LEFT JOIN person_awards pa ON t.ref_kind = 'award' AND pa.award_id = t.ref_id
|
||||
AND pa.id = (SELECT MIN(id) FROM person_awards
|
||||
WHERE award_id = t.ref_id);
|
||||
|
||||
PRAGMA user_version = 7;
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- 008 v_timeline
|
||||
--
|
||||
-- 007's tables, indexes and all eight triggers landed; its view did
|
||||
-- not. This file creates it, and nothing else.
|
||||
--
|
||||
-- The definition below is byte-identical to the one at the foot of
|
||||
-- 007. That is deliberate: a fresh database built from 007 and an
|
||||
-- existing one upgraded through 008 must end up with the same view,
|
||||
-- or a restore from backup six months from now produces a subtly
|
||||
-- different site. Leave 007 exactly as it is.
|
||||
--
|
||||
-- No BEGIN...END anywhere in this file — two plain statements and a
|
||||
-- pragma — so a runner that splits on semicolons treats it the same
|
||||
-- way one that doesn't would. 007's triggers are the only place in
|
||||
-- the schema where that distinction bites, and they are already in.
|
||||
--
|
||||
-- Safe to run twice: DROP VIEW IF EXISTS makes it idempotent, and
|
||||
-- dropping a view touches no data.
|
||||
--
|
||||
-- PRAGMA user_version; -- reads 7 before this file
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
DROP VIEW IF EXISTS v_timeline;
|
||||
|
||||
CREATE VIEW v_timeline AS
|
||||
SELECT
|
||||
t.id,
|
||||
t.kind,
|
||||
t.ref_kind,
|
||||
t.ref_id,
|
||||
t.precision,
|
||||
t.is_featured,
|
||||
t.is_published,
|
||||
t.sort_order,
|
||||
|
||||
COALESCE(t.occurred_on, e.starts_on, pa.awarded_on) AS effective_date,
|
||||
|
||||
COALESCE(
|
||||
t.title,
|
||||
e.title,
|
||||
o.name,
|
||||
aw.name,
|
||||
p.display_name,
|
||||
tm.name
|
||||
) AS effective_title,
|
||||
|
||||
COALESCE(t.blurb, e.tagline, o.tagline, aw.description, p.tagline, tm.tagline)
|
||||
AS effective_blurb,
|
||||
t.meta,
|
||||
t.link_url,
|
||||
|
||||
-- Filename only. The directory is the frontend's business.
|
||||
COALESCE(e.event_logo, e.org_logo, o.logo, aw.logo, p.photo, tm.logo)
|
||||
AS effective_logo,
|
||||
|
||||
o.kind AS org_kind,
|
||||
tm.org_id AS team_org_id,
|
||||
tm.name AS team_name,
|
||||
|
||||
-- Whether the referenced record is itself visible. An entry must not
|
||||
-- outlive the thing it points at being unpublished — a draft event
|
||||
-- would otherwise leak its title and date onto a public page. Null
|
||||
-- for a standalone milestone, which answers to nothing but its own
|
||||
-- is_published.
|
||||
CASE t.ref_kind
|
||||
WHEN 'event' THEN e.is_published
|
||||
WHEN 'organization' THEN o.is_published
|
||||
WHEN 'person' THEN p.is_published
|
||||
WHEN 'team' THEN tm.is_published
|
||||
ELSE NULL
|
||||
END AS ref_is_published,
|
||||
t.occurred_on,
|
||||
t.title AS title_override
|
||||
FROM timeline_entries t
|
||||
LEFT JOIN events e ON t.ref_kind = 'event' AND e.id = t.ref_id
|
||||
LEFT JOIN organizations o ON t.ref_kind = 'organization' AND o.id = t.ref_id
|
||||
LEFT JOIN awards aw ON t.ref_kind = 'award' AND aw.id = t.ref_id
|
||||
LEFT JOIN people p ON t.ref_kind = 'person' AND p.id = t.ref_id
|
||||
LEFT JOIN teams tm ON t.ref_kind = 'team' AND tm.id = t.ref_id
|
||||
LEFT JOIN person_awards pa ON t.ref_kind = 'award' AND pa.award_id = t.ref_id
|
||||
AND pa.id = (SELECT MIN(id) FROM person_awards
|
||||
WHERE award_id = t.ref_id);
|
||||
|
||||
PRAGMA user_version = 8;
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- 009_superadmin.sql
|
||||
--
|
||||
-- Adds a third role above 'admin'. A CHECK constraint can't be
|
||||
-- altered in place, so the table is rebuilt — the recipe from the
|
||||
-- SQLite docs, in the order it has to happen.
|
||||
--
|
||||
-- Foreign keys are OFF for the duration on purpose. `sessions`
|
||||
-- references admin_users(id), and:
|
||||
--
|
||||
-- * with FKs ON, DROP TABLE admin_users fires the ON DELETE
|
||||
-- CASCADE and empties `sessions` — everyone signed out;
|
||||
-- * with FKs ON, the RENAME afterwards tries to rewrite the
|
||||
-- REFERENCES clause in `sessions` and fails, because the table
|
||||
-- it points at no longer exists.
|
||||
--
|
||||
-- With them OFF neither happens: `sessions` keeps pointing at the
|
||||
-- name "admin_users", which the rename puts back underneath it.
|
||||
--
|
||||
-- ⚠ PRAGMA foreign_keys is a no-op inside a transaction. If the
|
||||
-- migration runner wraps each file in BEGIN/COMMIT, this file will
|
||||
-- appear to work and then fail at the rename. Check the runner
|
||||
-- before applying, or run this one by hand:
|
||||
--
|
||||
-- sudo systemctl stop ngu-api
|
||||
-- sudo sqlite3 /var/lib/ngu/ngu.db < 009_superadmin.sql
|
||||
-- sudo systemctl start ngu-api
|
||||
--
|
||||
-- Verify after:
|
||||
--
|
||||
-- PRAGMA user_version; -- 9
|
||||
-- PRAGMA foreign_key_check; -- no rows
|
||||
-- SELECT email, role FROM admin_users;
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
PRAGMA foreign_keys = OFF;
|
||||
|
||||
CREATE TABLE admin_users_new (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
||||
|
||||
-- Stored lowercased. The application lowercases on every read
|
||||
-- and write, so the UNIQUE index is genuinely case-insensitive
|
||||
-- without depending on a collation.
|
||||
email TEXT NOT NULL UNIQUE,
|
||||
name TEXT,
|
||||
|
||||
-- Nullable so a Google-only account can exist later with no
|
||||
-- password at all. A row with both can use either route in.
|
||||
password_hash TEXT,
|
||||
|
||||
-- Google's stable subject id. Nullable, unique when present —
|
||||
-- SQLite allows any number of NULLs in a unique index.
|
||||
google_sub TEXT UNIQUE,
|
||||
|
||||
-- Listed low to high. The application treats these as a ladder,
|
||||
-- not a set: 'superadmin' passes every check 'admin' passes.
|
||||
-- The default stays 'admin' — a new account should never arrive
|
||||
-- at the top of the ladder by accident.
|
||||
role TEXT NOT NULL DEFAULT 'admin'
|
||||
CHECK (role IN ('viewer', 'editor', 'admin', 'superadmin')),
|
||||
is_active INTEGER NOT NULL DEFAULT 1 CHECK (is_active IN (0, 1)),
|
||||
last_login_at TEXT
|
||||
) STRICT;
|
||||
|
||||
-- Columns listed explicitly rather than SELECT *, so this breaks
|
||||
-- loudly if the old shape isn't what this file assumes.
|
||||
INSERT INTO admin_users_new
|
||||
(id, created_at, email, name, password_hash, google_sub,
|
||||
role, is_active, last_login_at)
|
||||
SELECT
|
||||
id, created_at, email, name, password_hash, google_sub,
|
||||
role, is_active, last_login_at
|
||||
FROM admin_users;
|
||||
|
||||
DROP TABLE admin_users;
|
||||
|
||||
ALTER TABLE admin_users_new RENAME TO admin_users;
|
||||
|
||||
-- Informational: prints offending rows and returns nothing if the
|
||||
-- rebuild left the graph intact.
|
||||
PRAGMA foreign_key_check;
|
||||
|
||||
PRAGMA foreign_keys = ON;
|
||||
|
||||
PRAGMA user_version = 9; -- ← set to this migration's number
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- 010_editor_role.sql
|
||||
--
|
||||
-- Adds 'editor' between viewer and admin: can create and update,
|
||||
-- can't delete.
|
||||
--
|
||||
-- ⚠ If 008 hasn't been applied yet, don't apply this. Edit 008's
|
||||
-- CHECK to the four-role list below, leave its user_version at 8,
|
||||
-- and throw this file away. Two rebuilds of the same table to
|
||||
-- reach the same shape is pure risk for no gain.
|
||||
--
|
||||
-- Same rebuild as 008, for the same reason: a CHECK constraint
|
||||
-- can't be altered in place. Foreign keys stay OFF throughout
|
||||
-- because `sessions` cascades from this table — with them on, the
|
||||
-- DROP empties your session table and the RENAME then fails.
|
||||
--
|
||||
-- ⚠ PRAGMA foreign_keys is a no-op inside a transaction. If the
|
||||
-- migration runner wraps each file in BEGIN/COMMIT, this fails at
|
||||
-- the rename. Same drill as last time:
|
||||
--
|
||||
-- sudo systemctl stop ngu-api
|
||||
-- sudo sqlite3 /var/lib/ngu/ngu.db < 009_editor_role.sql
|
||||
-- sudo systemctl start ngu-api
|
||||
--
|
||||
-- Verify after:
|
||||
--
|
||||
-- PRAGMA user_version; -- 9
|
||||
-- PRAGMA foreign_key_check; -- no rows
|
||||
-- SELECT email, role FROM admin_users;
|
||||
--
|
||||
-- No existing row changes meaning: an 'admin' stays an 'admin'.
|
||||
-- Nobody is demoted into the new role automatically, because the
|
||||
-- accounts that most want it are the ones you'd notice least.
|
||||
--
|
||||
-- If a fifth role ever comes up, this is the moment to stop using
|
||||
-- a CHECK and make `role` an FK to a small admin_roles table —
|
||||
-- then adding one is an INSERT. Not worth a third rebuild today,
|
||||
-- since the rank ladder lives in auth.js either way.
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
PRAGMA foreign_keys = OFF;
|
||||
|
||||
CREATE TABLE admin_users_new (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
||||
|
||||
-- Stored lowercased. The application lowercases on every read
|
||||
-- and write, so the UNIQUE index is genuinely case-insensitive
|
||||
-- without depending on a collation.
|
||||
email TEXT NOT NULL UNIQUE,
|
||||
name TEXT,
|
||||
|
||||
-- Nullable so a Google-only account can exist later with no
|
||||
-- password at all. A row with both can use either route in.
|
||||
password_hash TEXT,
|
||||
|
||||
-- Google's stable subject id. Nullable, unique when present —
|
||||
-- SQLite allows any number of NULLs in a unique index.
|
||||
google_sub TEXT UNIQUE,
|
||||
|
||||
-- Listed low to high. The application treats these as a ladder,
|
||||
-- not a set: each one passes every check the one below it
|
||||
-- passes. The default stays 'admin' so no existing tooling
|
||||
-- starts creating accounts with different powers than it did
|
||||
-- yesterday.
|
||||
--
|
||||
-- viewer read
|
||||
-- editor + create and update
|
||||
-- admin + delete
|
||||
-- superadmin + accounts, roles and sessions
|
||||
role TEXT NOT NULL DEFAULT 'admin'
|
||||
CHECK (role IN ('viewer', 'editor', 'admin', 'superadmin')),
|
||||
is_active INTEGER NOT NULL DEFAULT 1 CHECK (is_active IN (0, 1)),
|
||||
last_login_at TEXT
|
||||
) STRICT;
|
||||
|
||||
-- Columns listed explicitly rather than SELECT *, so this breaks
|
||||
-- loudly if the old shape isn't what this file assumes.
|
||||
INSERT INTO admin_users_new
|
||||
(id, created_at, email, name, password_hash, google_sub,
|
||||
role, is_active, last_login_at)
|
||||
SELECT
|
||||
id, created_at, email, name, password_hash, google_sub,
|
||||
role, is_active, last_login_at
|
||||
FROM admin_users;
|
||||
|
||||
DROP TABLE admin_users;
|
||||
|
||||
ALTER TABLE admin_users_new RENAME TO admin_users;
|
||||
|
||||
-- Informational: prints offending rows, returns nothing if the
|
||||
-- rebuild left the graph intact.
|
||||
PRAGMA foreign_key_check;
|
||||
|
||||
PRAGMA foreign_keys = ON;
|
||||
|
||||
PRAGMA user_version = 10; -- ← set to this migration's number
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- 011 AWARDS CAN BE DRAFTED
|
||||
--
|
||||
-- awards was written when an award was a line on a person's
|
||||
-- record: created, named, done. Now each one has a URL, and
|
||||
-- there is no way to add a row without it being live the moment
|
||||
-- it saves.
|
||||
--
|
||||
-- Plain ADD COLUMN, no rebuild. DEFAULT 1 because every award
|
||||
-- that exists today is already public and backfilling the other
|
||||
-- way round would take the lot offline.
|
||||
--
|
||||
-- After this:
|
||||
-- · add bool("is_published") to the awards descriptor in
|
||||
-- admin-schema.js, and the matching checkbox in adminSchema.js
|
||||
-- (PUBLISH_FIELDS covers both it and sort_order)
|
||||
-- · add AND a.is_published = 1 to the three award queries in
|
||||
-- content.js — the /awards list, /awards/:id, and the
|
||||
-- recipient_count subquery in attachAwards
|
||||
--
|
||||
-- PRAGMA user_version; -- was 7 before this file
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
ALTER TABLE awards
|
||||
ADD COLUMN is_published INTEGER NOT NULL DEFAULT 1
|
||||
CHECK (is_published IN (0, 1));
|
||||
|
||||
CREATE INDEX awards_published_idx ON awards (is_published, sort_order);
|
||||
|
||||
PRAGMA user_version = 11; -- ← set to this migration's number
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- 012 HOSTS ARE A LIST, AND CAN BE PEOPLE
|
||||
--
|
||||
-- host_org_id said two things that turned out to be wrong: that an
|
||||
-- event has exactly one host, and that the host is an
|
||||
-- organization. A retreat can be run jointly by two regions, and
|
||||
-- some events are one person's.
|
||||
--
|
||||
-- Two nullable foreign keys rather than a polymorphic
|
||||
-- host_kind/host_id pair. There are only ever two kinds, and this
|
||||
-- way the references stay real and cascade on their own instead of
|
||||
-- needing the trigger treatment timeline_entries has. CASCADE here
|
||||
-- does what SET NULL used to do on the column: deleting an
|
||||
-- organization drops it from the host list and leaves the event
|
||||
-- standing.
|
||||
--
|
||||
-- The first host by sort_order is the one that supplies the logo
|
||||
-- and colour fallbacks. A person supplies neither — `photo` is a
|
||||
-- headshot, not a logo, and people have no colour — so an event
|
||||
-- hosted only by a person and carrying no colour of its own falls
|
||||
-- through to the section default. That's the view doing nothing
|
||||
-- rather than a rule anybody has to remember.
|
||||
--
|
||||
-- host_org_id stays in place here, unread. 013 drops it: that
|
||||
-- needs v_events and events_host_idx gone first, and it shouldn't
|
||||
-- share a deploy with the table replacing it.
|
||||
--
|
||||
-- No trigger bodies in this file, so the views can ride along.
|
||||
--
|
||||
-- After this:
|
||||
-- · event_hosts child collection in admin-schema.js and
|
||||
-- adminSchema.js; the host_org_id field comes out of the
|
||||
-- events Identity group in both
|
||||
-- · shapeEvent in content.js emits `hosts`, not `host`
|
||||
-- · the organization page's hosted-events query joins
|
||||
-- event_hosts instead of reading host_org_id
|
||||
-- · eventData.js filters on hosts[], EventDetail renders a list
|
||||
--
|
||||
-- PRAGMA user_version; -- reads 11 before this file
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
CREATE TABLE event_hosts (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
event_id TEXT NOT NULL REFERENCES events (id) ON DELETE CASCADE,
|
||||
org_id TEXT REFERENCES organizations (id) ON DELETE CASCADE,
|
||||
person_id TEXT REFERENCES people (id) ON DELETE CASCADE,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
|
||||
-- Exactly one of the two. (x IS NULL) evaluates to 0 or 1, so
|
||||
-- <> between them is xor.
|
||||
CHECK ((org_id IS NULL) <> (person_id IS NULL))
|
||||
) STRICT;
|
||||
|
||||
CREATE INDEX event_hosts_event_idx ON event_hosts (event_id, sort_order);
|
||||
CREATE INDEX event_hosts_org_idx ON event_hosts (org_id);
|
||||
CREATE INDEX event_hosts_person_idx ON event_hosts (person_id);
|
||||
|
||||
-- UNIQUE (event_id, org_id, person_id) would not do it: SQLite
|
||||
-- treats NULLs as distinct, so the same organization could be
|
||||
-- added twice with the person column null both times. Two partial
|
||||
-- indexes, one per kind.
|
||||
CREATE UNIQUE INDEX event_hosts_org_uniq
|
||||
ON event_hosts (event_id, org_id) WHERE org_id IS NOT NULL;
|
||||
|
||||
CREATE UNIQUE INDEX event_hosts_person_uniq
|
||||
ON event_hosts (event_id, person_id) WHERE person_id IS NOT NULL;
|
||||
|
||||
INSERT INTO event_hosts (event_id, org_id, sort_order)
|
||||
SELECT id, host_org_id, 0
|
||||
FROM events
|
||||
WHERE host_org_id IS NOT NULL;
|
||||
|
||||
|
||||
-- ── Views ──────────────────────────────────────────────────────
|
||||
|
||||
-- Every host of every event, resolved to a name and the bits the
|
||||
-- fallbacks need. is_published travels with the row rather than
|
||||
-- being filtered here, so the public routes can hide an
|
||||
-- unpublished host and the admin can still see one.
|
||||
CREATE VIEW v_event_hosts AS
|
||||
SELECT
|
||||
eh.id,
|
||||
eh.event_id,
|
||||
eh.sort_order,
|
||||
CASE WHEN eh.person_id IS NULL THEN 'organization' ELSE 'person' END
|
||||
AS host_kind,
|
||||
COALESCE(eh.org_id, eh.person_id) AS host_id,
|
||||
COALESCE(o.name, p.display_name) AS host_name,
|
||||
o.kind AS host_org_kind,
|
||||
o.logo AS host_logo,
|
||||
o.color AS host_color,
|
||||
p.photo AS host_photo,
|
||||
COALESCE(o.is_published, p.is_published) AS host_is_published
|
||||
FROM event_hosts eh
|
||||
LEFT JOIN organizations o ON o.id = eh.org_id
|
||||
LEFT JOIN people p ON p.id = eh.person_id;
|
||||
|
||||
|
||||
DROP VIEW IF EXISTS v_events;
|
||||
|
||||
-- Same contract as before — effective_org_logo, effective_color,
|
||||
-- effective_status — with the first host standing in for what
|
||||
-- host_org_id used to be. host_org_id itself is still selected by
|
||||
-- e.*, and is dead weight until 013 removes it.
|
||||
--
|
||||
-- A correlated subquery rather than GROUP BY with bare columns
|
||||
-- alongside MIN(sort_order): the bare-column form works in SQLite
|
||||
-- and nowhere else, and it leaves a tie on sort_order resolving
|
||||
-- differently run to run. At a few dozen events the extra lookup
|
||||
-- costs nothing worth measuring.
|
||||
CREATE VIEW v_events AS
|
||||
SELECT
|
||||
e.*,
|
||||
h.host_kind,
|
||||
h.host_id,
|
||||
h.host_name,
|
||||
h.host_org_kind,
|
||||
COALESCE(e.org_logo, h.host_logo) AS effective_org_logo,
|
||||
COALESCE(e.color, h.host_color) AS effective_color,
|
||||
COALESCE(
|
||||
e.status,
|
||||
CASE WHEN e.ends_on IS NOT NULL AND e.ends_on < date('now')
|
||||
THEN 'past' ELSE 'upcoming' END
|
||||
) AS effective_status
|
||||
FROM events e
|
||||
LEFT JOIN v_event_hosts h
|
||||
ON h.id = (
|
||||
SELECT x.id
|
||||
FROM v_event_hosts x
|
||||
WHERE x.event_id = e.id
|
||||
ORDER BY x.sort_order, x.id
|
||||
LIMIT 1
|
||||
);
|
||||
|
||||
PRAGMA user_version = 12; -- ← set to this migration's number
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- 013 DROP events.host_org_id
|
||||
--
|
||||
-- Run this only once 012 is deployed and the site is reading
|
||||
-- hosts off event_hosts. Until then the column is the rollback:
|
||||
-- restoring the old v_events is one CREATE VIEW away.
|
||||
--
|
||||
-- SQLite refuses DROP COLUMN while the column is named by an index
|
||||
-- or a view, so both go first and the view comes back unchanged
|
||||
-- apart from no longer selecting e.host_org_id through e.*. No
|
||||
-- table rebuild, so no PRAGMA foreign_keys dance.
|
||||
--
|
||||
-- Check nothing still reads it before running:
|
||||
-- grep -rn host_org_id server/src client/src
|
||||
--
|
||||
-- PRAGMA user_version; -- reads 12 before this file
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
DROP INDEX IF EXISTS events_host_idx;
|
||||
DROP VIEW IF EXISTS v_events;
|
||||
|
||||
ALTER TABLE events DROP COLUMN host_org_id;
|
||||
|
||||
CREATE VIEW v_events AS
|
||||
SELECT
|
||||
e.*,
|
||||
h.host_kind,
|
||||
h.host_id,
|
||||
h.host_name,
|
||||
h.host_org_kind,
|
||||
COALESCE(e.org_logo, h.host_logo) AS effective_org_logo,
|
||||
COALESCE(e.color, h.host_color) AS effective_color,
|
||||
COALESCE(
|
||||
e.status,
|
||||
CASE WHEN e.ends_on IS NOT NULL AND e.ends_on < date('now')
|
||||
THEN 'past' ELSE 'upcoming' END
|
||||
) AS effective_status
|
||||
FROM events e
|
||||
LEFT JOIN v_event_hosts h
|
||||
ON h.id = (
|
||||
SELECT x.id
|
||||
FROM v_event_hosts x
|
||||
WHERE x.event_id = e.id
|
||||
ORDER BY x.sort_order, x.id
|
||||
LIMIT 1
|
||||
);
|
||||
|
||||
PRAGMA user_version = 13; -- ← set to this migration's number
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- EVENT TYPE
|
||||
--
|
||||
-- What kind of gathering a row is, independent of which band of
|
||||
-- the Retreats page it appears in. section_id answers "whose is
|
||||
-- it" — national, regional, partner. event_type answers "what is
|
||||
-- it", and the two cross freely: a region can run a class, a
|
||||
-- partner can run a retreat.
|
||||
--
|
||||
-- An enum column rather than a lookup table, unlike event_sections.
|
||||
-- Sections need a table because Retreats.tsx owns presentation
|
||||
-- keyed on the id, so an unrecognised value makes an event vanish
|
||||
-- with no error anywhere. A type carries no presentation of its
|
||||
-- own — an unknown value renders as its own name rather than
|
||||
-- disappearing — so the CHECK is enough, and the column matches
|
||||
-- `status` and event_people.role in shape.
|
||||
--
|
||||
-- DEFAULT 'retreat' backfills every existing row, which is what
|
||||
-- they all are. That default is also what lets the admin clear the
|
||||
-- field: coerceValue omits an empty NOT NULL column rather than
|
||||
-- writing NULL into it.
|
||||
--
|
||||
-- No change to v_events: it is SELECT e.*, so the column arrives on
|
||||
-- both /events and /events/:id for free.
|
||||
--
|
||||
-- No BEGIN...END in this file, so nothing after it is dropped by
|
||||
-- the migration runner.
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
ALTER TABLE events
|
||||
ADD COLUMN event_type TEXT NOT NULL DEFAULT 'retreat'
|
||||
CHECK (event_type IN ('retreat', 'class', 'workshop', 'meeting', 'other'));
|
||||
|
||||
-- Mirrors events_section_idx: the public list filters on published
|
||||
-- rows and orders by sort_order, whatever it is narrowing by.
|
||||
CREATE INDEX events_type_idx ON events (event_type, is_published, sort_order);
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- EVENT SCOPES
|
||||
--
|
||||
-- event_sections is a scope list and always was: whose gathering
|
||||
-- this is, not which band of a page it lands in. The name stuck
|
||||
-- because for three values those two things coincided. They stop
|
||||
-- coinciding here — local, international and other are real scopes
|
||||
-- that Retreats.tsx does not draw a band for.
|
||||
--
|
||||
-- Nothing is renamed. events.section_id keeps its name and its
|
||||
-- foreign key, and this file only touches rows. A column rename
|
||||
-- would have to walk the descriptors, the shaper, the hook, the
|
||||
-- section prop and the view, for a word.
|
||||
--
|
||||
-- Order is scope order, widest first, with Other last where an
|
||||
-- unclassified row belongs. Gaps of ten leave room to slot a scope
|
||||
-- in later without renumbering the ones around it.
|
||||
--
|
||||
-- The three UPDATEs correct the existing rows' labels: "National
|
||||
-- Retreats" was a page heading living in a scope table, and now
|
||||
-- that a scope can hold a class it reads wrong in the admin's
|
||||
-- dropdown. Retreats.tsx owns its own band titles and never read
|
||||
-- these, so nothing on the public site moves.
|
||||
--
|
||||
-- INSERT OR IGNORE rather than INSERT: if a scope was added by hand
|
||||
-- on the box before this shipped, re-running is a no-op instead of
|
||||
-- a constraint error.
|
||||
--
|
||||
-- No BEGIN...END, so nothing after this file is dropped by the
|
||||
-- migration runner.
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
UPDATE event_sections SET name = 'National', sort_order = 10 WHERE id = 'national';
|
||||
UPDATE event_sections SET name = 'Regional', sort_order = 20 WHERE id = 'regional';
|
||||
UPDATE event_sections SET name = 'Partner', sort_order = 50 WHERE id = 'partner';
|
||||
|
||||
INSERT OR IGNORE INTO event_sections (id, name, sort_order) VALUES
|
||||
('local', 'Local', 30),
|
||||
('international', 'International', 40),
|
||||
('other', 'Other', 60);
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- EVENT SERIES
|
||||
--
|
||||
-- An event that meets on a schedule — a weekly class, a monthly
|
||||
-- meeting — is still one row. is_series says the dates repeat; the
|
||||
-- series_ columns say how. Occurrences are never stored: they are
|
||||
-- a pure function of these columns plus starts_on and ends_on, and
|
||||
-- the site works them out when it draws them.
|
||||
--
|
||||
-- The event's own dates bound the series. starts_on is the first
|
||||
-- meeting and anchors everything else: which week an every-other-
|
||||
-- week series is "on", which day of the month a monthly one keeps,
|
||||
-- and which weekday it falls on when no day is ticked. ends_on,
|
||||
-- when set, is the last day it can meet — which is also what keeps
|
||||
-- effective_status in v_events right with no change to the view.
|
||||
-- series_count, when set, stops it after that many meetings,
|
||||
-- whichever comes first.
|
||||
--
|
||||
-- series_frequency:
|
||||
-- weekly on the ticked weekdays, every N weeks
|
||||
-- monthly_date on starts_on's day of the month (the 13th),
|
||||
-- every N months; a short month uses its last day
|
||||
-- monthly_weekday on starts_on's weekday position (2nd Tuesday),
|
||||
-- every N months; a 5th becomes "last"
|
||||
--
|
||||
-- One boolean per weekday rather than a packed text column: each
|
||||
-- is a checkbox the CRUD engine already knows how to validate and
|
||||
-- write, and a CHECK can hold it to 0 or 1.
|
||||
--
|
||||
-- frequency and interval are NOT NULL with defaults so that a box
|
||||
-- ticked with nothing else filled in is still a complete schedule —
|
||||
-- weekly, on starts_on's weekday — and so every existing row gets
|
||||
-- a valid value without a backfill. They are ignored while
|
||||
-- is_series is 0.
|
||||
--
|
||||
-- Times are 'HH:MM', 24-hour, local to the event. The GLOB is a
|
||||
-- backstop; the admin engine checks the range before it gets here.
|
||||
--
|
||||
-- No change to v_events: it is SELECT e.*, so the columns arrive
|
||||
-- on /events and /events/:id for free.
|
||||
--
|
||||
-- No BEGIN...END in this file, so nothing after it is dropped by
|
||||
-- the migration runner.
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
ALTER TABLE events
|
||||
ADD COLUMN is_series INTEGER NOT NULL DEFAULT 0 CHECK (is_series IN (0, 1));
|
||||
|
||||
ALTER TABLE events
|
||||
ADD COLUMN series_frequency TEXT NOT NULL DEFAULT 'weekly'
|
||||
CHECK (series_frequency IN ('weekly', 'monthly_date', 'monthly_weekday'));
|
||||
|
||||
ALTER TABLE events
|
||||
ADD COLUMN series_interval INTEGER NOT NULL DEFAULT 1 CHECK (series_interval >= 1);
|
||||
|
||||
ALTER TABLE events ADD COLUMN series_sun INTEGER NOT NULL DEFAULT 0 CHECK (series_sun IN (0, 1));
|
||||
ALTER TABLE events ADD COLUMN series_mon INTEGER NOT NULL DEFAULT 0 CHECK (series_mon IN (0, 1));
|
||||
ALTER TABLE events ADD COLUMN series_tue INTEGER NOT NULL DEFAULT 0 CHECK (series_tue IN (0, 1));
|
||||
ALTER TABLE events ADD COLUMN series_wed INTEGER NOT NULL DEFAULT 0 CHECK (series_wed IN (0, 1));
|
||||
ALTER TABLE events ADD COLUMN series_thu INTEGER NOT NULL DEFAULT 0 CHECK (series_thu IN (0, 1));
|
||||
ALTER TABLE events ADD COLUMN series_fri INTEGER NOT NULL DEFAULT 0 CHECK (series_fri IN (0, 1));
|
||||
ALTER TABLE events ADD COLUMN series_sat INTEGER NOT NULL DEFAULT 0 CHECK (series_sat IN (0, 1));
|
||||
|
||||
ALTER TABLE events
|
||||
ADD COLUMN series_start_time TEXT
|
||||
CHECK (series_start_time GLOB '[0-2][0-9]:[0-5][0-9]');
|
||||
|
||||
ALTER TABLE events
|
||||
ADD COLUMN series_end_time TEXT
|
||||
CHECK (series_end_time GLOB '[0-2][0-9]:[0-5][0-9]');
|
||||
|
||||
ALTER TABLE events
|
||||
ADD COLUMN series_count INTEGER CHECK (series_count >= 1);
|
||||
|
|
@ -1,189 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- FRONT PAGE
|
||||
--
|
||||
-- The home page's editable half. One row in front_page — the CHECK
|
||||
-- on id makes a second one impossible — and ordered collections
|
||||
-- hanging off it, each replaced wholesale on save the way every
|
||||
-- other child collection is. Nothing outside this file has a
|
||||
-- foreign key into any of them, which is what makes that safe.
|
||||
--
|
||||
-- front_page the hero: its words, its buttons, and
|
||||
-- which mode it's in
|
||||
-- front_page_slides photos the hero cycles through in
|
||||
-- 'photos' mode
|
||||
-- front_page_sections which bands the page draws, in what
|
||||
-- order, under what heading
|
||||
-- front_page_stats the numbers band; each one typed in or
|
||||
-- counted from the database
|
||||
-- front_page_paths the connect section's "I want to…"
|
||||
-- choices, each with its actions
|
||||
-- front_page_path_actions
|
||||
--
|
||||
-- What stays in code: how each section looks, and the list of
|
||||
-- section keys. A section is a component, so the CHECK on
|
||||
-- front_page_sections.section is the list of components that
|
||||
-- exist; a row can reorder, retitle or hide one, never invent one.
|
||||
--
|
||||
-- hero_mode is switched by hand. 'livestream' shows the embed with
|
||||
-- a LIVE badge until someone switches it back — no schedule, so no
|
||||
-- guessing whose timezone a start time was typed in.
|
||||
--
|
||||
-- countdown_event_id pins the countdown to one event. Null counts
|
||||
-- down to the next upcoming published event, which is what it
|
||||
-- should do almost always.
|
||||
--
|
||||
-- Stats: source says where the number comes from. 'manual' prints
|
||||
-- value as typed. 'years_since' reads value as a year and counts up
|
||||
-- from it. Everything else is a COUNT the API runs, so the band
|
||||
-- never goes stale. Adding a source is this CHECK, the enum in both
|
||||
-- descriptor halves, and the query in routes/home.js.
|
||||
--
|
||||
-- The seed is the page as it ships: every section, the stats that
|
||||
-- need no typing, and the Church Center forms that were hardcoded
|
||||
-- on the old home page, sorted into paths.
|
||||
--
|
||||
-- The updated_at trigger is in 018, on its own, so no statement
|
||||
-- here sits after a BEGIN...END body.
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
CREATE TABLE front_page (
|
||||
id TEXT PRIMARY KEY CHECK (id = 'home'),
|
||||
|
||||
hero_mode TEXT NOT NULL DEFAULT 'brand'
|
||||
CHECK (hero_mode IN ('brand', 'photos', 'livestream')),
|
||||
eyebrow TEXT,
|
||||
headline TEXT NOT NULL DEFAULT 'Next Generation of Unity',
|
||||
subhead TEXT,
|
||||
primary_label TEXT,
|
||||
primary_url TEXT,
|
||||
secondary_label TEXT,
|
||||
secondary_url TEXT,
|
||||
|
||||
slide_seconds INTEGER NOT NULL DEFAULT 7
|
||||
CHECK (slide_seconds BETWEEN 3 AND 60),
|
||||
|
||||
livestream_url TEXT,
|
||||
livestream_title TEXT,
|
||||
|
||||
countdown_event_id TEXT REFERENCES events (id) ON DELETE SET NULL,
|
||||
|
||||
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
||||
) STRICT;
|
||||
|
||||
CREATE TABLE front_page_slides (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
page_id TEXT NOT NULL REFERENCES front_page (id) ON DELETE CASCADE,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
media TEXT NOT NULL, -- filename in public/front-page/, or a URL
|
||||
alt TEXT,
|
||||
caption TEXT,
|
||||
link_url TEXT
|
||||
) STRICT;
|
||||
|
||||
CREATE TABLE front_page_sections (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
page_id TEXT NOT NULL REFERENCES front_page (id) ON DELETE CASCADE,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
section TEXT NOT NULL
|
||||
CHECK (section IN ('countdown', 'retreats', 'stats', 'timeline', 'connect')),
|
||||
title TEXT, -- null → the section's own heading
|
||||
blurb TEXT,
|
||||
-- Hidden rather than visible, so a freshly added row with nothing
|
||||
-- ticked is still a blank row the engine can drop.
|
||||
is_hidden INTEGER NOT NULL DEFAULT 0 CHECK (is_hidden IN (0, 1)),
|
||||
UNIQUE (page_id, section)
|
||||
) STRICT;
|
||||
|
||||
CREATE TABLE front_page_stats (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
page_id TEXT NOT NULL REFERENCES front_page (id) ON DELETE CASCADE,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
label TEXT NOT NULL,
|
||||
source TEXT NOT NULL DEFAULT 'manual'
|
||||
CHECK (source IN ('manual', 'years_since', 'regions', 'chapters',
|
||||
'partners', 'events_held', 'retreats_held',
|
||||
'people', 'awards_given')),
|
||||
value TEXT,
|
||||
suffix TEXT, -- '+', 'k', ' states'
|
||||
note TEXT
|
||||
) STRICT;
|
||||
|
||||
CREATE TABLE front_page_paths (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
page_id TEXT NOT NULL REFERENCES front_page (id) ON DELETE CASCADE,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
label TEXT NOT NULL, -- 'Attend'
|
||||
icon TEXT, -- one emoji
|
||||
blurb TEXT
|
||||
) STRICT;
|
||||
|
||||
CREATE TABLE front_page_path_actions (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
path_id INTEGER NOT NULL REFERENCES front_page_paths (id) ON DELETE CASCADE,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
label TEXT NOT NULL,
|
||||
description TEXT,
|
||||
url TEXT NOT NULL
|
||||
) STRICT;
|
||||
|
||||
CREATE INDEX front_page_path_actions_path_idx ON front_page_path_actions (path_id, sort_order);
|
||||
|
||||
-- ── Seed ─────────────────────────────────────────────────────────
|
||||
|
||||
INSERT INTO front_page
|
||||
(id, eyebrow, headline, subhead,
|
||||
primary_label, primary_url, secondary_label, secondary_url)
|
||||
VALUES
|
||||
('home',
|
||||
'Young adults of the Unity movement',
|
||||
'Next Generation of Unity',
|
||||
'A community for 18–40 year olds, rooted in spiritual growth, leadership and sacred service.',
|
||||
'Find a retreat', '/retreats',
|
||||
'Find your way in', '#connect');
|
||||
|
||||
INSERT INTO front_page_sections (page_id, sort_order, section, title, blurb) VALUES
|
||||
('home', 0, 'countdown', NULL, NULL),
|
||||
('home', 1, 'retreats', 'National Retreats', 'Our flagship gatherings, open to young adults across the country.'),
|
||||
('home', 2, 'stats', 'NGU by the numbers', NULL),
|
||||
('home', 3, 'timeline', 'Moments that shaped us', 'Highlights from our history.'),
|
||||
('home', 4, 'connect', 'Find your way in', 'Tell us what you''re looking for.');
|
||||
|
||||
INSERT INTO front_page_stats (page_id, sort_order, label, source) VALUES
|
||||
('home', 0, 'Regions', 'regions'),
|
||||
('home', 1, 'Chapters', 'chapters'),
|
||||
('home', 2, 'Retreats held', 'retreats_held'),
|
||||
('home', 3, 'Awards given', 'awards_given');
|
||||
|
||||
INSERT INTO front_page_paths (page_id, sort_order, label, icon, blurb) VALUES
|
||||
('home', 0, 'Attend', '🧭', 'Come to a gathering near you or across the country.'),
|
||||
('home', 1, 'Serve', '🤲', 'Help create transformative experiences for young adults.'),
|
||||
('home', 2, 'Belong', '🌱', 'Make NGU your community.'),
|
||||
('home', 3, 'Partner', '🤝', 'Bring your ministry or organization alongside us.');
|
||||
|
||||
INSERT INTO front_page_path_actions (path_id, sort_order, label, description, url)
|
||||
SELECT p.id, a.sort_order, a.label, a.description, a.url
|
||||
FROM front_page_paths p
|
||||
JOIN (
|
||||
SELECT 'Attend' AS path, 0 AS sort_order, 'See upcoming retreats' AS label,
|
||||
'National, regional and partner gatherings.' AS description,
|
||||
'/retreats' AS url
|
||||
UNION ALL SELECT 'Attend', 1, 'NGU calendar',
|
||||
'Everything on the schedule, in one place.',
|
||||
'https://ngu.churchcenter.com/calendar?view=gallery'
|
||||
UNION ALL SELECT 'Serve', 0, 'Volunteer',
|
||||
'Lend a hand at a retreat or event.',
|
||||
'https://ngu.churchcenter.com/people/forms/1176908'
|
||||
UNION ALL SELECT 'Serve', 1, 'Speaker & Musician Directory',
|
||||
'Join our network of speakers, musicians and facilitators.',
|
||||
'https://ngu.churchcenter.com/people/forms/1173181'
|
||||
UNION ALL SELECT 'Belong', 0, 'Become a member',
|
||||
'Join the NGU community officially.',
|
||||
'https://ngu.churchcenter.com/people/forms/1135816'
|
||||
UNION ALL SELECT 'Belong', 1, 'Find your region',
|
||||
'Chapters and regions across the country.',
|
||||
'/community'
|
||||
UNION ALL SELECT 'Partner', 0, 'Affiliation form',
|
||||
'Affiliate your ministry or spiritual organization with NGU.',
|
||||
'https://ngu.churchcenter.com/people/forms/1135750'
|
||||
) a ON a.path = p.label
|
||||
WHERE p.page_id = 'home';
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- FRONT PAGE updated_at
|
||||
--
|
||||
-- Same rule as the other touch triggers in 002: an UPDATE that
|
||||
-- doesn't set updated_at itself gets it set, which is what the
|
||||
-- admin engine's optimistic concurrency compares against. On its
|
||||
-- own because the migration runner may drop anything that follows
|
||||
-- a BEGIN...END body.
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
CREATE TRIGGER front_page_touch
|
||||
AFTER UPDATE ON front_page
|
||||
FOR EACH ROW WHEN new.updated_at = old.updated_at
|
||||
BEGIN
|
||||
UPDATE front_page SET updated_at = datetime('now') WHERE id = new.id;
|
||||
END;
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
-- ═══════════════════════════════════════════════════════════════
|
||||
-- FRONT PAGE: calendar band
|
||||
--
|
||||
-- Adds 'calendar' to the sections the front page can draw. The key
|
||||
-- is a CHECK, and SQLite can't alter a CHECK in place, so the table
|
||||
-- is rebuilt: new table, copy, drop, rename.
|
||||
--
|
||||
-- No PRAGMA foreign_keys dance. front_page_sections only points out
|
||||
-- (at front_page); nothing points in, so dropping the old table
|
||||
-- cascades into nothing, and the copy keeps every page_id valid.
|
||||
--
|
||||
-- The new band is inserted straight after the retreats carousel,
|
||||
-- where "what's on" reads naturally, by shifting everything below it
|
||||
-- down one. If retreats was removed on this box, it goes last.
|
||||
--
|
||||
-- Adding another section later is the same three steps: this CHECK,
|
||||
-- the enum in both descriptor halves, and SECTIONS in Home.tsx.
|
||||
--
|
||||
-- No BEGIN...END in this file.
|
||||
-- ═══════════════════════════════════════════════════════════════
|
||||
|
||||
CREATE TABLE front_page_sections_new (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
page_id TEXT NOT NULL REFERENCES front_page (id) ON DELETE CASCADE,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
section TEXT NOT NULL
|
||||
CHECK (section IN ('countdown', 'retreats', 'calendar', 'stats',
|
||||
'timeline', 'connect')),
|
||||
title TEXT,
|
||||
blurb TEXT,
|
||||
is_hidden INTEGER NOT NULL DEFAULT 0 CHECK (is_hidden IN (0, 1)),
|
||||
UNIQUE (page_id, section)
|
||||
) STRICT;
|
||||
|
||||
INSERT INTO front_page_sections_new (id, page_id, sort_order, section, title, blurb, is_hidden)
|
||||
SELECT id, page_id, sort_order, section, title, blurb, is_hidden
|
||||
FROM front_page_sections;
|
||||
|
||||
DROP TABLE front_page_sections;
|
||||
|
||||
ALTER TABLE front_page_sections_new RENAME TO front_page_sections;
|
||||
|
||||
UPDATE front_page_sections
|
||||
SET sort_order = sort_order + 1
|
||||
WHERE page_id = 'home'
|
||||
AND sort_order > COALESCE(
|
||||
(SELECT sort_order FROM front_page_sections
|
||||
WHERE page_id = 'home' AND section = 'retreats'),
|
||||
(SELECT MAX(sort_order) FROM front_page_sections WHERE page_id = 'home'));
|
||||
|
||||
INSERT INTO front_page_sections (page_id, sort_order, section, title, blurb)
|
||||
SELECT 'home',
|
||||
COALESCE(
|
||||
(SELECT sort_order + 1 FROM front_page_sections
|
||||
WHERE page_id = 'home' AND section = 'retreats'),
|
||||
(SELECT COALESCE(MAX(sort_order), -1) + 1 FROM front_page_sections
|
||||
WHERE page_id = 'home')),
|
||||
'calendar',
|
||||
'What''s on',
|
||||
'Every gathering, class and meeting in one place.'
|
||||
WHERE EXISTS (SELECT 1 FROM front_page WHERE id = 'home');
|
||||
|
|
@ -63,14 +63,14 @@ entities.get("/:entity/:id", (c) => {
|
|||
return c.json({ row: readRow(c.get("db"), entity, c.req.param("id")) }, 200, NO_STORE);
|
||||
});
|
||||
|
||||
entities.post("/:entity", requireRole("editor"), async (c) => {
|
||||
entities.post("/:entity", requireRole("admin"), async (c) => {
|
||||
const entity = entityOr404(c);
|
||||
const row = createRow(c.get("db"), entity, await json(c));
|
||||
console.log(`${entity.key} ${row[entity.idColumn]} created by ${c.get("user").email}`);
|
||||
return c.json({ row }, 201, NO_STORE);
|
||||
});
|
||||
|
||||
entities.patch("/:entity/:id", requireRole("editor"), async (c) => {
|
||||
entities.patch("/:entity/:id", requireRole("admin"), async (c) => {
|
||||
const entity = entityOr404(c);
|
||||
const id = c.req.param("id");
|
||||
const row = updateRow(c.get("db"), entity, id, await json(c));
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ admin.get("/feedback", (c) => {
|
|||
{ status?, admin_note? } — either, both, partial.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
|
||||
admin.patch("/feedback/:id", requireRole("editor"), async (c) => {
|
||||
admin.patch("/feedback/:id", requireRole("admin"), async (c) => {
|
||||
const id = Number(c.req.param("id"));
|
||||
if (!Number.isInteger(id)) return c.json({ error: "Bad id." }, 400);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,10 +5,6 @@
|
|||
GET /events/:id one event, full body, people
|
||||
GET /organizations list, ?kind=region|chapter|…
|
||||
GET /organizations/:id one organization's page
|
||||
GET /teams list, ?org=slug
|
||||
GET /teams/:id one team's page
|
||||
GET /awards list, ?org=slug
|
||||
GET /awards/:id one award and its recipients
|
||||
|
||||
Organizations are one table, so they're one endpoint. A region
|
||||
and a chapter differ by a handful of fields, which arrive under
|
||||
|
|
@ -16,45 +12,14 @@
|
|||
list component be written once and pointed at any kind.
|
||||
|
||||
Responses carry their fallbacks already resolved: an event's
|
||||
`color` is its own or its first host's, and `status` is derived
|
||||
from the dates when it isn't set. Components read one field and
|
||||
don't reimplement the rules.
|
||||
|
||||
`event_type` is orthogonal to `section_id`: the section is which
|
||||
band of the Retreats page an event belongs to, the type is what
|
||||
kind of gathering it is. A region can run a class and a partner
|
||||
can run a retreat, so neither implies the other and both ship on
|
||||
every event.
|
||||
|
||||
An event's hosts are a list, in billing order, and each one is
|
||||
either an organization or a person — `kind` says which, and
|
||||
`org_kind` is there for the three organization routes. The
|
||||
first is the one the colour and logo fell back to, which is why
|
||||
order is data and not a display choice.
|
||||
|
||||
Two things the team and award routes deliberately don't do:
|
||||
|
||||
· /teams/:id carries no roster. /teams/:id/people in people.js
|
||||
already serves it off v_org_leadership in the shape
|
||||
PeopleTiles wants, and a second shaper here would be the same
|
||||
visibility rules written twice, free to drift.
|
||||
|
||||
· /awards/:id carries no links and no content blocks. 'award'
|
||||
is not in the owner_kind CHECK on either polymorphic table,
|
||||
and widening it is a STRICT table rebuild. `description` is
|
||||
the prose; the recipients are the page.
|
||||
`color` is its own or its host's, and `status` is derived from
|
||||
the dates when it isn't set. Components read one field and don't
|
||||
reimplement the rules.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Hono } from "hono";
|
||||
|
||||
import {
|
||||
asBool,
|
||||
loadBlocks,
|
||||
loadLinks,
|
||||
paragraphs,
|
||||
shapeSeries,
|
||||
splitLinks,
|
||||
} from "../shape.js";
|
||||
import { asBool, loadBlocks, loadLinks, paragraphs, splitLinks } from "../shape.js";
|
||||
|
||||
const content = new Hono();
|
||||
|
||||
|
|
@ -69,59 +34,14 @@ const ORG_KINDS = ["national", "region", "chapter", "partner"];
|
|||
|
||||
const marks = (n) => Array(n).fill("?").join(",");
|
||||
|
||||
/* ── Loaders ───────────────────────────────────────────────── */
|
||||
|
||||
/* Hosts for a batch of events, keyed by event id, in the order
|
||||
they're billed. Shaped like loadLinks and loadBlocks so the list
|
||||
route stays one query per collection rather than one per row.
|
||||
|
||||
Unpublished hosts are dropped here rather than in the view: the
|
||||
admin reads the same view and needs to see them. An event whose
|
||||
only host is unpublished comes back with an empty list, which is
|
||||
the right answer — there is nobody to name and nowhere to link. */
|
||||
function loadHosts(db, ids) {
|
||||
const byEvent = new Map();
|
||||
if (ids.length === 0) return byEvent;
|
||||
|
||||
const rows = db
|
||||
.prepare(
|
||||
`SELECT event_id, host_kind, host_id, host_name, host_org_kind
|
||||
FROM v_event_hosts
|
||||
WHERE event_id IN (${marks(ids.length)})
|
||||
AND host_is_published = 1
|
||||
ORDER BY event_id, sort_order, id`,
|
||||
)
|
||||
.all(...ids);
|
||||
|
||||
for (const row of rows) {
|
||||
const list = byEvent.get(row.event_id) ?? [];
|
||||
list.push(row);
|
||||
byEvent.set(row.event_id, list);
|
||||
}
|
||||
|
||||
return byEvent;
|
||||
}
|
||||
|
||||
/* ── Shapers ───────────────────────────────────────────────── */
|
||||
|
||||
function shapeHost(row) {
|
||||
return {
|
||||
kind: row.host_kind, // 'organization' | 'person'
|
||||
id: row.host_id,
|
||||
name: row.host_name,
|
||||
// Which of /regions, /chapters, /partners the slug belongs to.
|
||||
// Null for a person, whose route needs no disambiguating.
|
||||
org_kind: row.host_org_kind,
|
||||
};
|
||||
}
|
||||
|
||||
function shapeEvent(row, links, cardBlocks, hosts = []) {
|
||||
function shapeEvent(row, links, cardBlocks) {
|
||||
const { actions, instagram } = splitLinks(links);
|
||||
|
||||
return {
|
||||
id: row.id,
|
||||
section_id: row.section_id,
|
||||
event_type: row.event_type,
|
||||
|
||||
title: row.title,
|
||||
theme: row.theme,
|
||||
|
|
@ -131,7 +51,6 @@ function shapeEvent(row, links, cardBlocks, hosts = []) {
|
|||
ends_on: row.ends_on,
|
||||
date_label: row.date_label,
|
||||
status: row.effective_status,
|
||||
series: shapeSeries(row),
|
||||
|
||||
location_label: row.location_label,
|
||||
locality: row.locality,
|
||||
|
|
@ -144,7 +63,9 @@ function shapeEvent(row, links, cardBlocks, hosts = []) {
|
|||
color: row.effective_color,
|
||||
gradient: row.gradient,
|
||||
|
||||
hosts: hosts.map(shapeHost),
|
||||
host: row.host_org_id
|
||||
? { id: row.host_org_id, name: row.host_name, kind: row.host_kind }
|
||||
: null,
|
||||
|
||||
description: paragraphs(cardBlocks),
|
||||
links: actions,
|
||||
|
|
@ -203,42 +124,6 @@ function shapeLeader(row) {
|
|||
};
|
||||
}
|
||||
|
||||
/* teams.org_id is NOT NULL and every query below joins a published
|
||||
organization, so `org` is never absent. */
|
||||
function shapeTeam(row, links, cardBlocks) {
|
||||
const { actions, socials, instagram } = splitLinks(links);
|
||||
|
||||
return {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
tagline: row.tagline,
|
||||
color: row.color,
|
||||
logo: row.logo,
|
||||
|
||||
org: { id: row.org_id, name: row.org_name, kind: row.org_kind },
|
||||
|
||||
description: paragraphs(cardBlocks),
|
||||
links: actions,
|
||||
socials,
|
||||
instagram,
|
||||
};
|
||||
}
|
||||
|
||||
/* awards.org_id is nullable — an award can predate any decision
|
||||
about which organization owns it — so `org` genuinely can be
|
||||
null, and is also null when the awarding org is unpublished. */
|
||||
function shapeAward(row) {
|
||||
return {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
description: row.description,
|
||||
logo: row.logo,
|
||||
org: row.org_id && row.org_name
|
||||
? { id: row.org_id, name: row.org_name, kind: row.org_kind }
|
||||
: null,
|
||||
};
|
||||
}
|
||||
|
||||
/* ── Kind-specific details, batched ────────────────────────────
|
||||
Each of these runs a fixed number of queries for the whole list
|
||||
rather than one per organization.
|
||||
|
|
@ -358,84 +243,6 @@ function attachLeadership(db, orgs) {
|
|||
for (const org of orgs) org.leadership = byOrg.get(org.id) ?? [];
|
||||
}
|
||||
|
||||
/* ── Sections that only an organization's own page wants ───────
|
||||
Called from /organizations/:id and not from the list. A page
|
||||
needs them; a card doesn't, and the listing shouldn't pay two
|
||||
queries for something nothing renders.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
|
||||
/* Every team this organization has, including ones with nobody
|
||||
currently filed under them. `leadership` already carries team_id
|
||||
and team_name, so the page can group people without this — but
|
||||
grouping alone would make an empty team invisible rather than
|
||||
listed, which is the wrong answer for a team that exists. */
|
||||
function attachTeams(db, orgs) {
|
||||
const ids = orgs.map((o) => o.id);
|
||||
if (ids.length === 0) return;
|
||||
|
||||
const rows = db
|
||||
.prepare(
|
||||
`SELECT id, org_id, name, tagline, color, logo
|
||||
FROM teams
|
||||
WHERE org_id IN (${marks(ids.length)}) AND is_published = 1
|
||||
ORDER BY sort_order, name`,
|
||||
)
|
||||
.all(...ids);
|
||||
|
||||
const byOrg = new Map();
|
||||
for (const row of rows) {
|
||||
const list = byOrg.get(row.org_id);
|
||||
const entry = {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
tagline: row.tagline,
|
||||
color: row.color,
|
||||
logo: row.logo,
|
||||
};
|
||||
if (list) list.push(entry);
|
||||
else byOrg.set(row.org_id, [entry]);
|
||||
}
|
||||
|
||||
for (const org of orgs) org.teams = byOrg.get(org.id) ?? [];
|
||||
}
|
||||
|
||||
/* The awards this organization gives. awards has no is_published
|
||||
column, so every row is public the moment it exists — see the
|
||||
note in the route below. */
|
||||
function attachAwards(db, orgs) {
|
||||
const ids = orgs.map((o) => o.id);
|
||||
if (ids.length === 0) return;
|
||||
|
||||
const rows = db
|
||||
.prepare(
|
||||
`SELECT a.id, a.org_id, a.name, a.description, a.logo,
|
||||
(SELECT COUNT(*)
|
||||
FROM person_awards pa
|
||||
JOIN people p ON p.id = pa.person_id AND p.is_published = 1
|
||||
WHERE pa.award_id = a.id AND pa.is_public = 1) AS recipient_count
|
||||
FROM awards a
|
||||
WHERE a.org_id IN (${marks(ids.length)})
|
||||
ORDER BY a.sort_order, a.name`,
|
||||
)
|
||||
.all(...ids);
|
||||
|
||||
const byOrg = new Map();
|
||||
for (const row of rows) {
|
||||
const list = byOrg.get(row.org_id);
|
||||
const entry = {
|
||||
id: row.id,
|
||||
name: row.name,
|
||||
description: row.description,
|
||||
logo: row.logo,
|
||||
recipient_count: row.recipient_count,
|
||||
};
|
||||
if (list) list.push(entry);
|
||||
else byOrg.set(row.org_id, [entry]);
|
||||
}
|
||||
|
||||
for (const org of orgs) org.awards = byOrg.get(org.id) ?? [];
|
||||
}
|
||||
|
||||
/* ── Events ────────────────────────────────────────────────────
|
||||
Flat, with the section ids alongside. Retreats.tsx owns the
|
||||
section titles and colours and filters this list by section_id.
|
||||
|
|
@ -459,15 +266,9 @@ content.get("/events", (c) => {
|
|||
const ids = rows.map((row) => row.id);
|
||||
const links = loadLinks(db, "event", ids);
|
||||
const cards = loadBlocks(db, "event", ids, "card");
|
||||
const hosts = loadHosts(db, ids);
|
||||
|
||||
const events = rows.map((row) =>
|
||||
shapeEvent(
|
||||
row,
|
||||
links.get(row.id) ?? [],
|
||||
cards.get(row.id) ?? [],
|
||||
hosts.get(row.id) ?? [],
|
||||
),
|
||||
shapeEvent(row, links.get(row.id) ?? [], cards.get(row.id) ?? []),
|
||||
);
|
||||
|
||||
return json(c, { sections, events });
|
||||
|
|
@ -488,7 +289,6 @@ content.get("/events/:id", (c) => {
|
|||
const links = loadLinks(db, "event", [id]).get(id) ?? [];
|
||||
const cards = loadBlocks(db, "event", [id], "card").get(id) ?? [];
|
||||
const body = loadBlocks(db, "event", [id], "body").get(id) ?? [];
|
||||
const hosts = loadHosts(db, [id]).get(id) ?? [];
|
||||
|
||||
const people = db
|
||||
.prepare(
|
||||
|
|
@ -497,36 +297,8 @@ content.get("/events/:id", (c) => {
|
|||
)
|
||||
.all(id);
|
||||
|
||||
// Awards presented at this event. person_awards.event_id is the
|
||||
// only thing that records where a citation was read out, and an
|
||||
// event page is the one place it reads as news rather than
|
||||
// trivia.
|
||||
const awards = db
|
||||
.prepare(
|
||||
`SELECT pa.award_id, pa.awarded_on, pa.citation,
|
||||
a.name AS award_name, a.logo AS award_logo,
|
||||
pa.person_id, p.display_name, p.photo
|
||||
FROM person_awards pa
|
||||
JOIN awards a ON a.id = pa.award_id
|
||||
JOIN people p ON p.id = pa.person_id AND p.is_published = 1
|
||||
WHERE pa.event_id = ? AND pa.is_public = 1
|
||||
ORDER BY a.sort_order, a.name, COALESCE(p.sort_name, p.display_name)`,
|
||||
)
|
||||
.all(id)
|
||||
.map((r) => ({
|
||||
award: { id: r.award_id, name: r.award_name, logo: r.award_logo },
|
||||
person: { id: r.person_id, name: r.display_name, photo: r.photo },
|
||||
awarded_on: r.awarded_on,
|
||||
citation: r.citation,
|
||||
}));
|
||||
|
||||
return json(c, {
|
||||
event: {
|
||||
...shapeEvent(row, links, cards, hosts),
|
||||
blocks: body,
|
||||
people,
|
||||
awards,
|
||||
},
|
||||
event: { ...shapeEvent(row, links, cards), blocks: body, people },
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -607,179 +379,19 @@ content.get("/organizations/:id", (c) => {
|
|||
attachRegionDetails(db, one);
|
||||
attachChapterDetails(db, one);
|
||||
attachLeadership(db, one);
|
||||
attachTeams(db, one);
|
||||
attachAwards(db, one);
|
||||
|
||||
// Everything this organization is hosting or has hosted, whether
|
||||
// on its own or alongside somebody else. Co-hosting counts: an
|
||||
// event run jointly by two regions belongs on both pages.
|
||||
// Everything this organization is hosting or has hosted.
|
||||
organization.events = db
|
||||
.prepare(
|
||||
`SELECT e.id, e.title, e.date_label, e.event_type,
|
||||
e.effective_status AS status,
|
||||
e.location_label, e.event_logo,
|
||||
e.effective_color AS color
|
||||
FROM v_events e
|
||||
JOIN event_hosts eh ON eh.event_id = e.id AND eh.org_id = ?
|
||||
WHERE e.is_published = 1
|
||||
ORDER BY e.sort_order`,
|
||||
`SELECT id, title, date_label, effective_status AS status,
|
||||
location_label, event_logo, effective_color AS color
|
||||
FROM v_events
|
||||
WHERE host_org_id = ? AND is_published = 1
|
||||
ORDER BY sort_order`,
|
||||
)
|
||||
.all(id);
|
||||
|
||||
return json(c, { organization });
|
||||
});
|
||||
|
||||
|
||||
/* ── Teams ─────────────────────────────────────────────────────
|
||||
GET /teams every published team
|
||||
GET /teams?org=mid-atlantic one organization's teams
|
||||
GET /teams/:id one team's page
|
||||
|
||||
An unpublished organization hides its teams too, in both
|
||||
routes. Without that join a retired chapter's board stays
|
||||
reachable by URL after the chapter itself has gone.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
|
||||
content.get("/teams", (c) => {
|
||||
const db = c.get("db");
|
||||
const org = c.req.query("org");
|
||||
|
||||
const rows = db
|
||||
.prepare(
|
||||
`SELECT t.*, o.name AS org_name, o.kind AS org_kind
|
||||
FROM teams t
|
||||
JOIN organizations o ON o.id = t.org_id AND o.is_published = 1
|
||||
WHERE t.is_published = 1 ${org ? "AND t.org_id = ?" : ""}
|
||||
ORDER BY o.sort_order, t.sort_order, t.name`,
|
||||
)
|
||||
.all(...(org ? [org] : []));
|
||||
|
||||
const ids = rows.map((row) => row.id);
|
||||
const links = loadLinks(db, "team", ids);
|
||||
const cards = loadBlocks(db, "team", ids, "card");
|
||||
|
||||
return json(c, {
|
||||
teams: rows.map((row) =>
|
||||
shapeTeam(row, links.get(row.id) ?? [], cards.get(row.id) ?? []),
|
||||
),
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
content.get("/teams/:id", (c) => {
|
||||
const db = c.get("db");
|
||||
const id = c.req.param("id");
|
||||
|
||||
const row = db
|
||||
.prepare(
|
||||
`SELECT t.*, o.name AS org_name, o.kind AS org_kind
|
||||
FROM teams t
|
||||
JOIN organizations o ON o.id = t.org_id AND o.is_published = 1
|
||||
WHERE t.id = ? AND t.is_published = 1`,
|
||||
)
|
||||
.get(id);
|
||||
|
||||
if (!row) return c.json({ error: "No such team" }, 404);
|
||||
|
||||
const links = loadLinks(db, "team", [id]).get(id) ?? [];
|
||||
const cards = loadBlocks(db, "team", [id], "card").get(id) ?? [];
|
||||
const body = loadBlocks(db, "team", [id], "body").get(id) ?? [];
|
||||
|
||||
return json(c, { team: { ...shapeTeam(row, links, cards), blocks: body } });
|
||||
});
|
||||
|
||||
|
||||
/* ── Awards ────────────────────────────────────────────────────
|
||||
GET /awards every award
|
||||
GET /awards?org=ngu awards a given organization gives
|
||||
GET /awards/:id one award and who has received it
|
||||
|
||||
`awards` has no is_published column: an award is public the
|
||||
moment somebody creates it, and there is no way to draft one.
|
||||
That was fine while awards only appeared as a line on a
|
||||
person's record; it is thinner ground now that each has a URL.
|
||||
A plain ADD COLUMN with DEFAULT 1 fixes it without a rebuild —
|
||||
worth doing before this ships.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
|
||||
content.get("/awards", (c) => {
|
||||
const db = c.get("db");
|
||||
const org = c.req.query("org");
|
||||
|
||||
// The count has to apply exactly the visibility rules the detail
|
||||
// route does, or a card will promise recipients the page then
|
||||
// doesn't list.
|
||||
const rows = db
|
||||
.prepare(
|
||||
`SELECT a.*, o.name AS org_name, o.kind AS org_kind,
|
||||
(SELECT COUNT(*)
|
||||
FROM person_awards pa
|
||||
JOIN people p ON p.id = pa.person_id AND p.is_published = 1
|
||||
WHERE pa.award_id = a.id AND pa.is_public = 1) AS recipient_count
|
||||
FROM awards a
|
||||
LEFT JOIN organizations o ON o.id = a.org_id AND o.is_published = 1
|
||||
${org ? "WHERE a.org_id = ?" : ""}
|
||||
ORDER BY a.sort_order, a.name`,
|
||||
)
|
||||
.all(...(org ? [org] : []));
|
||||
|
||||
return json(c, {
|
||||
awards: rows.map((row) => ({
|
||||
...shapeAward(row),
|
||||
recipient_count: row.recipient_count,
|
||||
})),
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
content.get("/awards/:id", (c) => {
|
||||
const db = c.get("db");
|
||||
const id = c.req.param("id");
|
||||
|
||||
const row = db
|
||||
.prepare(
|
||||
`SELECT a.*, o.name AS org_name, o.kind AS org_kind
|
||||
FROM awards a
|
||||
LEFT JOIN organizations o ON o.id = a.org_id AND o.is_published = 1
|
||||
WHERE a.id = ?`,
|
||||
)
|
||||
.get(id);
|
||||
|
||||
if (!row) return c.json({ error: "No such award" }, 404);
|
||||
|
||||
// The event join is LEFT twice over: person_awards.event_id is
|
||||
// ON DELETE SET NULL, and the event may since have been
|
||||
// unpublished. A citation outlives the occasion it was read at.
|
||||
//
|
||||
// awarded_on DESC puts undated rows last in SQLite, which is the
|
||||
// right end for a recipient nobody has dated yet.
|
||||
const recipients = db
|
||||
.prepare(
|
||||
`SELECT pa.person_id, pa.awarded_on, pa.citation,
|
||||
p.display_name, p.photo, p.tagline,
|
||||
e.id AS event_id, e.title AS event_title
|
||||
FROM person_awards pa
|
||||
JOIN people p ON p.id = pa.person_id AND p.is_published = 1
|
||||
LEFT JOIN events e ON e.id = pa.event_id AND e.is_published = 1
|
||||
WHERE pa.award_id = ? AND pa.is_public = 1
|
||||
ORDER BY pa.awarded_on DESC, COALESCE(p.sort_name, p.display_name)`,
|
||||
)
|
||||
.all(id);
|
||||
|
||||
return json(c, {
|
||||
award: {
|
||||
...shapeAward(row),
|
||||
recipients: recipients.map((r) => ({
|
||||
id: r.person_id,
|
||||
name: r.display_name,
|
||||
photo: r.photo,
|
||||
tagline: r.tagline,
|
||||
awarded_on: r.awarded_on,
|
||||
citation: r.citation,
|
||||
event: r.event_id ? { id: r.event_id, title: r.event_title } : null,
|
||||
})),
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
export default content;
|
||||
|
|
|
|||
|
|
@ -1,217 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
HISTORY ROUTE — read-only, mounted under /api
|
||||
|
||||
GET /history every published timeline entry
|
||||
|
||||
v_timeline has already done the resolution: an entry with no title
|
||||
of its own carries the referenced record's name, an entry with no
|
||||
date carries the event's starts_on, and org_kind rides along
|
||||
because /regions, /chapters and /partners are three routes and only
|
||||
the database knows which a slug is.
|
||||
|
||||
What's left here is shaping, and three things the view can't do:
|
||||
|
||||
· rosters. A 'people' entry naming a team resolves through
|
||||
v_org_leadership; one with an editorial list reads
|
||||
timeline_entry_people. Both are batched, so the number of
|
||||
queries doesn't grow with the number of entries.
|
||||
|
||||
· precision that outruns the date. An entry can hold '2012' with
|
||||
precision 'day' — the admin doesn't stop you. Trusting that
|
||||
pair would put the entry in a month node built from a month
|
||||
that isn't there, so precision is capped at what the string
|
||||
actually carries.
|
||||
|
||||
· entries with no date at all. They can't be placed on a rail, so
|
||||
they're dropped rather than crashing the page, and counted so
|
||||
the omission is visible rather than silent.
|
||||
|
||||
Filenames only, as everywhere else in this API. Where the images
|
||||
live is the component's business.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Hono } from "hono";
|
||||
|
||||
const history = new Hono();
|
||||
|
||||
const CACHE = "public, max-age=60, stale-while-revalidate=300";
|
||||
|
||||
const json = (c, body) => c.json(body, 200, { "Cache-Control": CACHE });
|
||||
|
||||
const marks = (n) => Array(n).fill("?").join(",");
|
||||
|
||||
/* 'YYYY' → year, 'YYYY-MM' → month, 'YYYY-MM-DD' → day. */
|
||||
function precisionOfString(date) {
|
||||
const parts = String(date).split("-");
|
||||
if (parts.length >= 3) return "day";
|
||||
if (parts.length === 2) return "month";
|
||||
return "year";
|
||||
}
|
||||
|
||||
const RANK = { year: 0, month: 1, day: 2 };
|
||||
|
||||
/* The stored precision is a claim about how much to trust the date. It
|
||||
can't be more precise than the date itself, and a row that claims
|
||||
otherwise is a data error the page shouldn't have to survive. */
|
||||
function effectivePrecision(stored, date) {
|
||||
const actual = precisionOfString(date);
|
||||
return RANK[stored] < RANK[actual] ? stored : actual;
|
||||
}
|
||||
|
||||
function shapeEntry(row, rosters) {
|
||||
const precision = effectivePrecision(row.precision, row.effective_date);
|
||||
|
||||
const item = {
|
||||
id: String(row.id),
|
||||
date: row.effective_date,
|
||||
precision,
|
||||
kind: row.kind,
|
||||
title: row.effective_title,
|
||||
featured: row.is_featured === 1,
|
||||
};
|
||||
|
||||
if (row.effective_blurb) item.blurb = row.effective_blurb;
|
||||
if (row.meta) item.meta = row.meta;
|
||||
|
||||
// An explicit link wins on the client too, but sending it only when
|
||||
// set keeps "no override" distinguishable from "override to empty".
|
||||
if (row.link_url) item.href = row.link_url;
|
||||
|
||||
if (row.ref_kind && row.ref_id) {
|
||||
item.ref = { kind: row.ref_kind, id: row.ref_id };
|
||||
// Only organizations need it, and only they have it.
|
||||
if (row.org_kind) item.ref.orgKind = row.org_kind;
|
||||
}
|
||||
|
||||
if (row.effective_logo && row.ref_kind) {
|
||||
item.logo = { file: row.effective_logo, kind: row.ref_kind };
|
||||
}
|
||||
|
||||
if (row.ref_kind === "team") {
|
||||
item.team = {
|
||||
id: row.ref_id,
|
||||
name: row.team_name,
|
||||
orgId: row.team_org_id ?? undefined,
|
||||
};
|
||||
}
|
||||
|
||||
const people = rosters.get(row.id);
|
||||
if (people?.length) item.people = people;
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
history.get("/history", (c) => {
|
||||
const db = c.get("db");
|
||||
|
||||
const rows = db
|
||||
.prepare(
|
||||
`SELECT * FROM v_timeline
|
||||
WHERE is_published = 1
|
||||
-- A standalone milestone reports null here and is unaffected.
|
||||
AND (ref_is_published IS NULL OR ref_is_published = 1)
|
||||
AND effective_date IS NOT NULL
|
||||
ORDER BY effective_date DESC, sort_order, id`,
|
||||
)
|
||||
.all();
|
||||
|
||||
// How many entries exist but can't be placed. Worth knowing about —
|
||||
// an entry nobody gave a date to is invisible, and silence is how it
|
||||
// stays that way.
|
||||
const undated = db
|
||||
.prepare(
|
||||
`SELECT COUNT(*) AS n FROM v_timeline
|
||||
WHERE is_published = 1 AND effective_date IS NULL`,
|
||||
)
|
||||
.get().n;
|
||||
|
||||
const rosters = loadRosters(db, rows);
|
||||
|
||||
return json(c, {
|
||||
items: rows.map((row) => shapeEntry(row, rosters)),
|
||||
undated,
|
||||
});
|
||||
});
|
||||
|
||||
/* ── Rosters ───────────────────────────────────────────────────
|
||||
Two queries total, whatever the number of entries. A team entry
|
||||
reads the team's current public membership; anything else reads
|
||||
the entry's own curated list.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
|
||||
function loadRosters(db, rows) {
|
||||
const rosters = new Map();
|
||||
|
||||
const teamEntries = rows.filter(
|
||||
(row) => row.kind === "people" && row.ref_kind === "team" && row.ref_id,
|
||||
);
|
||||
const listEntries = rows.filter(
|
||||
(row) => row.kind === "people" && row.ref_kind !== "team",
|
||||
);
|
||||
|
||||
if (teamEntries.length) {
|
||||
const teamIds = [...new Set(teamEntries.map((row) => row.ref_id))];
|
||||
|
||||
// v_org_leadership already decides who counts as current and
|
||||
// public — affiliation still open, marked public, person
|
||||
// published. Restating those conditions here is how they drift.
|
||||
const members = db
|
||||
.prepare(
|
||||
`SELECT team_id, person_id, display_name, photo, title
|
||||
FROM v_org_leadership
|
||||
WHERE team_id IN (${marks(teamIds.length)})
|
||||
ORDER BY is_owner DESC, sort_order,
|
||||
COALESCE(sort_name, display_name)`,
|
||||
)
|
||||
.all(...teamIds);
|
||||
|
||||
const byTeam = new Map();
|
||||
for (const member of members) {
|
||||
const list = byTeam.get(member.team_id) ?? [];
|
||||
list.push({
|
||||
id: member.person_id,
|
||||
name: member.display_name,
|
||||
...(member.photo ? { photo: member.photo } : {}),
|
||||
...(member.title ? { title: member.title } : {}),
|
||||
});
|
||||
byTeam.set(member.team_id, list);
|
||||
}
|
||||
|
||||
for (const row of teamEntries) {
|
||||
const list = byTeam.get(row.ref_id);
|
||||
if (list) rosters.set(row.id, list);
|
||||
}
|
||||
}
|
||||
|
||||
if (listEntries.length) {
|
||||
const ids = listEntries.map((row) => row.id);
|
||||
|
||||
const listed = db
|
||||
.prepare(
|
||||
`SELECT tep.entry_id, tep.person_id, tep.note,
|
||||
p.display_name, p.photo
|
||||
FROM timeline_entry_people tep
|
||||
JOIN people p ON p.id = tep.person_id AND p.is_published = 1
|
||||
WHERE tep.entry_id IN (${marks(ids.length)})
|
||||
ORDER BY tep.entry_id, tep.sort_order`,
|
||||
)
|
||||
.all(...ids);
|
||||
|
||||
for (const person of listed) {
|
||||
const list = rosters.get(person.entry_id) ?? [];
|
||||
list.push({
|
||||
id: person.person_id,
|
||||
name: person.display_name,
|
||||
...(person.photo ? { photo: person.photo } : {}),
|
||||
// The note is the person's standing in this entry, which is
|
||||
// what `title` means on the client.
|
||||
...(person.note ? { title: person.note } : {}),
|
||||
});
|
||||
rosters.set(person.entry_id, list);
|
||||
}
|
||||
}
|
||||
|
||||
return rosters;
|
||||
}
|
||||
|
||||
export default history;
|
||||
|
|
@ -1,186 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
FRONT PAGE ROUTE — read-only, mounted under /api
|
||||
|
||||
GET /front-page the home page's configuration, resolved
|
||||
|
||||
Everything the admin's Front page editor holds, shaped for the
|
||||
page: hidden sections dropped, stats counted, paths carrying
|
||||
their actions, and the countdown's event looked up.
|
||||
|
||||
The retreats carousel and the timeline rail are not in here.
|
||||
They fetch /events and /history themselves, as they do on their
|
||||
own pages, so the rules for which events and entries are public
|
||||
live in one place each. This route only says whether those bands
|
||||
appear and under what heading.
|
||||
|
||||
── Stats ──
|
||||
A stat's source picks a query from STAT_QUERIES. Each counts
|
||||
exactly what the matching public page shows: published rows, and
|
||||
for awards only public citations to published people. A count
|
||||
that disagreed with the page it summarises would be worse than
|
||||
none. 'manual' and 'years_since' read the row's own value.
|
||||
|
||||
── Countdown ──
|
||||
The pinned event if it is still published and not over;
|
||||
otherwise the next published, non-cancelled event that hasn't
|
||||
ended. "Hasn't ended" is COALESCE(ends_on, starts_on) >= today,
|
||||
so a running series with a start date in the past still counts.
|
||||
The client works out the next meeting of a series from `series`.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Hono } from "hono";
|
||||
|
||||
import { asBool, shapeSeries } from "../shape.js";
|
||||
|
||||
const home = new Hono();
|
||||
|
||||
const CACHE = "public, max-age=60, stale-while-revalidate=300";
|
||||
|
||||
const json = (c, body) => c.json(body, 200, { "Cache-Control": CACHE });
|
||||
|
||||
const PAGE_ID = "home";
|
||||
|
||||
const STAT_QUERIES = {
|
||||
regions: `SELECT COUNT(*) AS n FROM organizations WHERE kind = 'region' AND is_published = 1`,
|
||||
chapters: `SELECT COUNT(*) AS n FROM organizations WHERE kind = 'chapter' AND is_published = 1`,
|
||||
partners: `SELECT COUNT(*) AS n FROM organizations WHERE kind = 'partner' AND is_published = 1`,
|
||||
events_held: `SELECT COUNT(*) AS n FROM v_events
|
||||
WHERE is_published = 1 AND effective_status = 'past'`,
|
||||
retreats_held: `SELECT COUNT(*) AS n FROM v_events
|
||||
WHERE is_published = 1 AND effective_status = 'past'
|
||||
AND event_type = 'retreat'`,
|
||||
people: `SELECT COUNT(*) AS n FROM people WHERE is_published = 1`,
|
||||
awards_given: `SELECT COUNT(*) AS n
|
||||
FROM person_awards pa
|
||||
JOIN people p ON p.id = pa.person_id AND p.is_published = 1
|
||||
JOIN awards a ON a.id = pa.award_id AND a.is_published = 1
|
||||
WHERE pa.is_public = 1`,
|
||||
};
|
||||
|
||||
/* The number as a string, or null when there's nothing to print —
|
||||
a manual stat nobody filled in, or a year that isn't one. */
|
||||
function statValue(db, row) {
|
||||
if (row.source === "manual") return row.value || null;
|
||||
|
||||
if (row.source === "years_since") {
|
||||
const year = Number.parseInt(row.value ?? "", 10);
|
||||
if (!Number.isInteger(year)) return null;
|
||||
return String(Math.max(0, new Date().getFullYear() - year));
|
||||
}
|
||||
|
||||
const sql = STAT_QUERIES[row.source];
|
||||
return sql ? String(db.prepare(sql).get().n) : null;
|
||||
}
|
||||
|
||||
function shapeCountdown(row) {
|
||||
if (!row) return null;
|
||||
return {
|
||||
id: row.id,
|
||||
title: row.title,
|
||||
theme: row.theme,
|
||||
starts_on: row.starts_on,
|
||||
ends_on: row.ends_on,
|
||||
date_label: row.date_label,
|
||||
location_label: row.location_label,
|
||||
is_online: asBool(row.is_online),
|
||||
color: row.effective_color,
|
||||
event_logo: row.event_logo,
|
||||
series: shapeSeries(row),
|
||||
};
|
||||
}
|
||||
|
||||
home.get("/front-page", (c) => {
|
||||
const db = c.get("db");
|
||||
|
||||
const page = db.prepare(`SELECT * FROM front_page WHERE id = ?`).get(PAGE_ID);
|
||||
|
||||
// Migration 017 creates the row and the engine refuses to delete
|
||||
// it, so this is a database that hasn't been migrated. Say so.
|
||||
if (!page) return c.json({ error: "The front page hasn't been set up." }, 500);
|
||||
|
||||
const byOrder = (table) =>
|
||||
db.prepare(`SELECT * FROM ${table} WHERE page_id = ? ORDER BY sort_order`).all(PAGE_ID);
|
||||
|
||||
const sections = byOrder("front_page_sections")
|
||||
.filter((row) => !asBool(row.is_hidden))
|
||||
.map((row) => ({ section: row.section, title: row.title, blurb: row.blurb }));
|
||||
|
||||
const slides = byOrder("front_page_slides").map((row) => ({
|
||||
media: row.media,
|
||||
alt: row.alt,
|
||||
caption: row.caption,
|
||||
link_url: row.link_url,
|
||||
}));
|
||||
|
||||
const stats = byOrder("front_page_stats")
|
||||
.map((row) => ({
|
||||
label: row.label,
|
||||
value: statValue(db, row),
|
||||
suffix: row.suffix,
|
||||
note: row.note,
|
||||
}))
|
||||
.filter((stat) => stat.value !== null);
|
||||
|
||||
const actions = db.prepare(
|
||||
`SELECT label, description, url FROM front_page_path_actions
|
||||
WHERE path_id = ? ORDER BY sort_order`,
|
||||
);
|
||||
const paths = byOrder("front_page_paths")
|
||||
.map((row) => ({
|
||||
label: row.label,
|
||||
icon: row.icon,
|
||||
blurb: row.blurb,
|
||||
actions: actions.all(row.id),
|
||||
}))
|
||||
// A path with nothing to do is a dead tab.
|
||||
.filter((path) => path.actions.length > 0);
|
||||
|
||||
const notOver = `is_published = 1
|
||||
AND effective_status != 'cancelled'
|
||||
AND COALESCE(ends_on, starts_on) >= date('now')`;
|
||||
|
||||
const pinned = page.countdown_event_id
|
||||
? db
|
||||
.prepare(`SELECT * FROM v_events WHERE id = ? AND ${notOver}`)
|
||||
.get(page.countdown_event_id)
|
||||
: null;
|
||||
|
||||
const next =
|
||||
pinned ??
|
||||
db
|
||||
.prepare(
|
||||
`SELECT * FROM v_events
|
||||
WHERE ${notOver}
|
||||
ORDER BY starts_on, sort_order
|
||||
LIMIT 1`,
|
||||
)
|
||||
.get();
|
||||
|
||||
return json(c, {
|
||||
front_page: {
|
||||
hero: {
|
||||
mode: page.hero_mode,
|
||||
eyebrow: page.eyebrow,
|
||||
headline: page.headline,
|
||||
subhead: page.subhead,
|
||||
primary: page.primary_label && page.primary_url
|
||||
? { label: page.primary_label, url: page.primary_url }
|
||||
: null,
|
||||
secondary: page.secondary_label && page.secondary_url
|
||||
? { label: page.secondary_label, url: page.secondary_url }
|
||||
: null,
|
||||
slide_seconds: page.slide_seconds,
|
||||
slides,
|
||||
livestream: page.livestream_url
|
||||
? { url: page.livestream_url, title: page.livestream_title }
|
||||
: null,
|
||||
},
|
||||
sections,
|
||||
stats,
|
||||
paths,
|
||||
countdown: shapeCountdown(next),
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
export default home;
|
||||
|
|
@ -1,215 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
PANEL ROUTES — server/src/routes/panel.js
|
||||
|
||||
GET /api/admin/panel/overview
|
||||
PATCH /api/admin/panel/users/:id role, is_active
|
||||
DELETE /api/admin/panel/users/:id/sessions sign out everywhere
|
||||
|
||||
Everything here is superadmin-only, enforced once at the top
|
||||
rather than per route — there's no read here that an ordinary
|
||||
admin should have either. Account records and live session
|
||||
counts are a different class of thing from content.
|
||||
|
||||
Two rules run through the writes, both about not locking
|
||||
everyone out of the building:
|
||||
|
||||
* nobody edits their own role or active flag, so a misclick
|
||||
can't demote the person making it;
|
||||
* the last active superadmin can't be demoted or disabled.
|
||||
|
||||
Changing a role or disabling an account drops that person's
|
||||
live sessions immediately, the same way admin-cli.js does.
|
||||
Leaving a 30-day cookie valid after revoking the access it
|
||||
represents is the whole point of having the button.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Hono } from "hono";
|
||||
import { requireAuth, requireRole, ROLES } from "../auth.js";
|
||||
|
||||
const panel = new Hono();
|
||||
|
||||
panel.use("*", requireAuth);
|
||||
panel.use("*", requireRole("superadmin"));
|
||||
|
||||
const NO_STORE = { "Cache-Control": "no-store" };
|
||||
|
||||
/* The counts on the overview. Table name is a literal from this
|
||||
list, never anything off the wire. */
|
||||
const CONTENT_TABLES = [
|
||||
["Events", "events"],
|
||||
["Organizations", "organizations"],
|
||||
["People", "people"],
|
||||
["Teams", "teams"],
|
||||
["Awards", "awards"],
|
||||
["Timeline entries", "timeline_entries"],
|
||||
["Feedback", "feedback"],
|
||||
];
|
||||
|
||||
/* ── GET /api/admin/panel/overview ─────────────────────────────── */
|
||||
|
||||
panel.get("/overview", (c) => {
|
||||
const db = c.get("db");
|
||||
|
||||
const users = db
|
||||
.prepare(
|
||||
`SELECT u.id, u.email, u.name, u.role, u.is_active,
|
||||
u.created_at, u.last_login_at,
|
||||
(SELECT COUNT(*) FROM sessions s
|
||||
WHERE s.user_id = u.id
|
||||
AND s.expires_at > datetime('now')) AS sessions
|
||||
FROM admin_users u
|
||||
ORDER BY u.role DESC, u.email`,
|
||||
)
|
||||
.all();
|
||||
|
||||
const content = CONTENT_TABLES.map(([label, table]) => ({
|
||||
label,
|
||||
count: count(db, table),
|
||||
}));
|
||||
|
||||
return c.json(
|
||||
{
|
||||
system: {
|
||||
schemaVersion: db.prepare("PRAGMA user_version").get().user_version,
|
||||
dbPath: process.env.DB_PATH ?? null,
|
||||
nodeVersion: process.version,
|
||||
platform: `${process.platform} ${process.arch}`,
|
||||
uptimeSeconds: Math.round(process.uptime()),
|
||||
startedAt: new Date(Date.now() - process.uptime() * 1000).toISOString(),
|
||||
sessions: count(db, "sessions", "expires_at > datetime('now')"),
|
||||
roles: ROLES,
|
||||
},
|
||||
content,
|
||||
users,
|
||||
},
|
||||
200,
|
||||
NO_STORE,
|
||||
);
|
||||
});
|
||||
|
||||
/* A table that hasn't been created yet shouldn't take the whole
|
||||
page down — the panel is where you go when something is wrong. */
|
||||
function count(db, table, where) {
|
||||
try {
|
||||
const sql = `SELECT COUNT(*) AS n FROM ${table}${where ? ` WHERE ${where}` : ""}`;
|
||||
return db.prepare(sql).get().n;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/* ── PATCH /api/admin/panel/users/:id ───────────────────────────── */
|
||||
|
||||
panel.patch("/users/:id", async (c) => {
|
||||
const db = c.get("db");
|
||||
const me = c.get("user");
|
||||
|
||||
const id = Number(c.req.param("id"));
|
||||
if (!Number.isInteger(id)) return c.json({ error: "Bad id." }, 400);
|
||||
|
||||
if (id === me.id) {
|
||||
return c.json(
|
||||
{ error: "You can't change your own role or access. Ask another superadmin." },
|
||||
403,
|
||||
);
|
||||
}
|
||||
|
||||
let body;
|
||||
try {
|
||||
body = await c.req.json();
|
||||
} catch {
|
||||
return c.json({ error: "Expected a JSON body." }, 400);
|
||||
}
|
||||
|
||||
const target = db
|
||||
.prepare("SELECT id, email, role, is_active FROM admin_users WHERE id = ?")
|
||||
.get(id);
|
||||
if (!target) return c.json({ error: "No such account." }, 404);
|
||||
|
||||
const sets = [];
|
||||
const params = [];
|
||||
|
||||
const losingSuper =
|
||||
target.role === "superadmin" &&
|
||||
((body.role !== undefined && body.role !== "superadmin") ||
|
||||
(body.is_active !== undefined && Number(body.is_active) === 0));
|
||||
|
||||
if (losingSuper && activeSupers(db) <= 1) {
|
||||
return c.json(
|
||||
{ error: "That's the last active superadmin. Promote someone else first." },
|
||||
409,
|
||||
);
|
||||
}
|
||||
|
||||
if (body.role !== undefined) {
|
||||
if (!ROLES.includes(body.role)) return c.json({ error: "Unknown role." }, 422);
|
||||
sets.push("role = ?");
|
||||
params.push(body.role);
|
||||
}
|
||||
|
||||
if (body.is_active !== undefined) {
|
||||
sets.push("is_active = ?");
|
||||
params.push(Number(body.is_active) ? 1 : 0);
|
||||
}
|
||||
|
||||
if (sets.length === 0) return c.json({ error: "Nothing to change." }, 400);
|
||||
|
||||
const tx = db.transaction(() => {
|
||||
db.prepare(`UPDATE admin_users SET ${sets.join(", ")} WHERE id = ?`).run(
|
||||
...params,
|
||||
id,
|
||||
);
|
||||
// Whatever changed, the access they're holding no longer
|
||||
// matches the row. Make them sign in again.
|
||||
db.prepare("DELETE FROM sessions WHERE user_id = ?").run(id);
|
||||
});
|
||||
tx();
|
||||
|
||||
console.log(
|
||||
`account ${target.email} updated by ${me.email}: ${JSON.stringify(body)}`,
|
||||
);
|
||||
|
||||
return c.json({ user: userRow(db, id) }, 200, NO_STORE);
|
||||
});
|
||||
|
||||
/* ── DELETE /api/admin/panel/users/:id/sessions ─────────────────── */
|
||||
|
||||
panel.delete("/users/:id/sessions", (c) => {
|
||||
const db = c.get("db");
|
||||
const id = Number(c.req.param("id"));
|
||||
if (!Number.isInteger(id)) return c.json({ error: "Bad id." }, 400);
|
||||
|
||||
const target = db.prepare("SELECT email FROM admin_users WHERE id = ?").get(id);
|
||||
if (!target) return c.json({ error: "No such account." }, 404);
|
||||
|
||||
const { changes } = db.prepare("DELETE FROM sessions WHERE user_id = ?").run(id);
|
||||
|
||||
console.log(
|
||||
`${changes} session(s) for ${target.email} revoked by ${c.get("user").email}`,
|
||||
);
|
||||
|
||||
return c.json({ user: userRow(db, id), revoked: changes }, 200, NO_STORE);
|
||||
});
|
||||
|
||||
function activeSupers(db) {
|
||||
return db
|
||||
.prepare(
|
||||
"SELECT COUNT(*) AS n FROM admin_users WHERE role = 'superadmin' AND is_active = 1",
|
||||
)
|
||||
.get().n;
|
||||
}
|
||||
|
||||
function userRow(db, id) {
|
||||
return db
|
||||
.prepare(
|
||||
`SELECT u.id, u.email, u.name, u.role, u.is_active,
|
||||
u.created_at, u.last_login_at,
|
||||
(SELECT COUNT(*) FROM sessions s
|
||||
WHERE s.user_id = u.id
|
||||
AND s.expires_at > datetime('now')) AS sessions
|
||||
FROM admin_users u WHERE u.id = ?`,
|
||||
)
|
||||
.get(id);
|
||||
}
|
||||
|
||||
export default panel;
|
||||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
GET /teams/:id/people current public members of a team
|
||||
GET /people?ids=a,b,c named people, any order
|
||||
GET /people/:id one person's page
|
||||
|
||||
The team route reads v_org_leadership, which already decides who
|
||||
counts as current and public — affiliation still open, marked
|
||||
|
|
@ -21,7 +20,7 @@
|
|||
|
||||
import { Hono } from "hono";
|
||||
|
||||
import { asBool, loadBlocks, loadLinks, paragraphs, splitLinks } from "../shape.js";
|
||||
import { asBool } from "../shape.js";
|
||||
|
||||
const people = new Hono();
|
||||
|
||||
|
|
@ -139,161 +138,4 @@ people.get("/people", (c) => {
|
|||
return json(c, { people: rows.map(shapePerson) });
|
||||
});
|
||||
|
||||
/* ── One person's page ─────────────────────────────────────────
|
||||
Everything public that points at this person, each list with
|
||||
the same visibility rules its own page applies: a role needs a
|
||||
public affiliation and a published organization, an event must
|
||||
be published, an award must be published and the citation
|
||||
public. A hidden team drops its name rather than the role —
|
||||
the seat is still real, it just has no page to link to.
|
||||
|
||||
Roles are current and past. v_org_leadership only knows
|
||||
current, which is what a roster wants and not what a person's
|
||||
record does, so this reads affiliations directly.
|
||||
|
||||
Events merge two tables: event_people (who was billed, and as
|
||||
what) and event_hosts (who ran it). One person can be both at
|
||||
one event, so they collapse to one row carrying every role.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
|
||||
people.get("/people/:id", (c) => {
|
||||
const db = c.get("db");
|
||||
const id = c.req.param("id");
|
||||
|
||||
const row = db
|
||||
.prepare(
|
||||
`SELECT p.id,
|
||||
p.display_name,
|
||||
p.pronouns,
|
||||
p.photo,
|
||||
p.tagline,
|
||||
p.location_label,
|
||||
p.public_email,
|
||||
p.bio,
|
||||
o.id AS primary_org_id,
|
||||
o.name AS primary_org_name,
|
||||
o.kind AS primary_org_kind
|
||||
FROM people p
|
||||
LEFT JOIN organizations o ON o.id = p.primary_org_id AND o.is_published = 1
|
||||
WHERE p.id = ? AND p.is_published = 1`,
|
||||
)
|
||||
.get(id);
|
||||
|
||||
if (!row) return c.json({ error: "No such person" }, 404);
|
||||
|
||||
const links = loadLinks(db, "person", [id]).get(id) ?? [];
|
||||
const cards = loadBlocks(db, "person", [id], "card").get(id) ?? [];
|
||||
const body = loadBlocks(db, "person", [id], "body").get(id) ?? [];
|
||||
const { actions, socials, website, instagram } = splitLinks(links);
|
||||
|
||||
// Current first, then most recently ended. Within each, the same
|
||||
// order a roster uses: owner, then the affiliation's sort_order.
|
||||
const roles = db
|
||||
.prepare(
|
||||
`SELECT a.title, a.role, a.is_owner, a.started_on, a.ended_on,
|
||||
o.id AS org_id, o.name AS org_name, o.kind AS org_kind,
|
||||
t.id AS team_id, t.name AS team_name
|
||||
FROM affiliations a
|
||||
JOIN organizations o ON o.id = a.org_id AND o.is_published = 1
|
||||
LEFT JOIN teams t ON t.id = a.team_id AND t.is_published = 1
|
||||
WHERE a.person_id = ? AND a.is_public = 1
|
||||
ORDER BY a.ended_on IS NOT NULL, a.ended_on DESC,
|
||||
a.is_owner DESC, a.sort_order, o.sort_order`,
|
||||
)
|
||||
.all(id)
|
||||
.map((r) => ({
|
||||
title: r.title,
|
||||
role: r.role,
|
||||
is_owner: asBool(r.is_owner),
|
||||
started_on: r.started_on,
|
||||
ended_on: r.ended_on,
|
||||
org: { id: r.org_id, name: r.org_name, kind: r.org_kind },
|
||||
team: r.team_id ? { id: r.team_id, name: r.team_name } : null,
|
||||
}));
|
||||
|
||||
const eventRows = db
|
||||
.prepare(
|
||||
`SELECT e.id, e.title, e.event_type, e.date_label, e.starts_on,
|
||||
e.effective_status AS status, x.role, x.title AS billing
|
||||
FROM (
|
||||
SELECT event_id, role, title, sort_order
|
||||
FROM event_people
|
||||
WHERE person_id = ? AND is_public = 1
|
||||
UNION ALL
|
||||
SELECT event_id, 'host', NULL, -1
|
||||
FROM event_hosts
|
||||
WHERE person_id = ?
|
||||
) x
|
||||
JOIN v_events e ON e.id = x.event_id AND e.is_published = 1
|
||||
ORDER BY e.starts_on IS NULL, e.starts_on DESC, e.sort_order, x.sort_order`,
|
||||
)
|
||||
.all(id, id);
|
||||
|
||||
const byEvent = new Map();
|
||||
for (const r of eventRows) {
|
||||
let event = byEvent.get(r.id);
|
||||
if (!event) {
|
||||
event = {
|
||||
id: r.id,
|
||||
title: r.title,
|
||||
event_type: r.event_type,
|
||||
date_label: r.date_label,
|
||||
starts_on: r.starts_on,
|
||||
status: r.status,
|
||||
roles: [],
|
||||
};
|
||||
byEvent.set(r.id, event);
|
||||
}
|
||||
// Hosting shows up from both tables when a host is also billed
|
||||
// as one. Once is enough.
|
||||
if (!event.roles.some((role) => role.role === r.role && role.title === r.billing)) {
|
||||
event.roles.push({ role: r.role, title: r.billing });
|
||||
}
|
||||
}
|
||||
|
||||
const awards = db
|
||||
.prepare(
|
||||
`SELECT pa.awarded_on, pa.citation,
|
||||
a.id AS award_id, a.name AS award_name, a.logo AS award_logo,
|
||||
e.id AS event_id, e.title AS event_title
|
||||
FROM person_awards pa
|
||||
JOIN awards a ON a.id = pa.award_id AND a.is_published = 1
|
||||
LEFT JOIN events e ON e.id = pa.event_id AND e.is_published = 1
|
||||
WHERE pa.person_id = ? AND pa.is_public = 1
|
||||
ORDER BY pa.awarded_on DESC, a.sort_order, a.name`,
|
||||
)
|
||||
.all(id)
|
||||
.map((r) => ({
|
||||
award: { id: r.award_id, name: r.award_name, logo: r.award_logo },
|
||||
awarded_on: r.awarded_on,
|
||||
citation: r.citation,
|
||||
event: r.event_id ? { id: r.event_id, title: r.event_title } : null,
|
||||
}));
|
||||
|
||||
const person = shapePerson(row);
|
||||
|
||||
return json(c, {
|
||||
person: {
|
||||
id: person.id,
|
||||
name: person.name,
|
||||
pronouns: person.pronouns,
|
||||
tagline: person.tagline,
|
||||
photo: person.photo,
|
||||
location_label: person.location_label,
|
||||
public_email: person.public_email,
|
||||
org: person.org && { ...person.org, kind: row.primary_org_kind },
|
||||
bio: person.bio ?? [],
|
||||
description: paragraphs(cards),
|
||||
blocks: body,
|
||||
links: actions,
|
||||
socials,
|
||||
website,
|
||||
instagram,
|
||||
roles,
|
||||
events: [...byEvent.values()],
|
||||
awards,
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
export default people;
|
||||
|
|
|
|||
|
|
@ -144,26 +144,4 @@ export function splitLinks(links = []) {
|
|||
};
|
||||
}
|
||||
|
||||
/* ── Event series ──────────────────────────────────────────────
|
||||
The repeating schedule, or null for a one-off. Weekdays
|
||||
collapse from seven flags to a list of the ticked ones, Sunday
|
||||
first; an empty list means "starts_on's weekday", which the
|
||||
client resolves since it already holds starts_on. Occurrences
|
||||
are not sent — they are derived, and the client derives them
|
||||
against its own today. Shared by /events and /front-page.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
const SERIES_WEEKDAYS = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"];
|
||||
|
||||
export function shapeSeries(row) {
|
||||
if (!asBool(row.is_series)) return null;
|
||||
return {
|
||||
frequency: row.series_frequency,
|
||||
interval: row.series_interval,
|
||||
weekdays: SERIES_WEEKDAYS.filter((day) => asBool(row[`series_${day}`])),
|
||||
start_time: row.series_start_time,
|
||||
end_time: row.series_end_time,
|
||||
count: row.series_count,
|
||||
};
|
||||
}
|
||||
|
||||
export { asBool };
|
||||
|
|
|
|||
28
src/App.tsx
28
src/App.tsx
|
|
@ -4,7 +4,6 @@ import Layout from "./components/Layout.tsx";
|
|||
|
||||
/*Libraries*/
|
||||
import { AuthProvider, RequireAuth } from "./lib/auth.tsx";
|
||||
import RequireRole from "./pages/admin/RequireRole.tsx";
|
||||
|
||||
/*Primary Pages*/
|
||||
import Home from "./pages/Home.tsx";
|
||||
|
|
@ -12,24 +11,14 @@ import Retreats from "./pages/Retreats.tsx";
|
|||
import Community from "./pages/Community.tsx";
|
||||
import Leadership from "./pages/Leadership.tsx";
|
||||
import Resources from "./pages/Resources.tsx";
|
||||
import History from "./pages/History.tsx";
|
||||
|
||||
/*Secondary Pages*/
|
||||
import Feedback from "./pages/Feedback.tsx";
|
||||
import Giving from "./pages/Giving.tsx";
|
||||
|
||||
/*Entity Pages*/
|
||||
import EventDetail from './pages/EventDetail.tsx'
|
||||
import OrganizationDetail from './pages/OrganizationDetail.tsx'
|
||||
import TeamDetail from './pages/TeamDetail.tsx'
|
||||
import AwardDetail from './pages/AwardDetail.tsx'
|
||||
import PersonDetail from './pages/PersonDetail.tsx'
|
||||
|
||||
/*Admin Pages*/
|
||||
import AdminLayout from "./pages/admin/AdminLayout.tsx";
|
||||
import AdminLogin from "./pages/admin/AdminLogin.tsx";
|
||||
import AdminPanel from "./pages/admin/AdminPanel.tsx";
|
||||
import AdminHome from "./pages/admin/AdminHome.tsx";
|
||||
import AdminFeedback from "./pages/admin/AdminFeedback.tsx";
|
||||
import EntityList from "./pages/admin/EntityList.tsx";
|
||||
import EntityEdit from "./pages/admin/EntityEdit.tsx";
|
||||
|
|
@ -47,19 +36,10 @@ export default function App() {
|
|||
<Route element={<Layout />}>
|
||||
<Route index element={<Home />} />
|
||||
<Route path="retreats" element={<Retreats />} />
|
||||
<Route path="/events/:id" element={<EventDetail />} />
|
||||
<Route path="community" element={<Community />} />
|
||||
<Route path="/regions/:id" element={<OrganizationDetail />} />
|
||||
<Route path="/chapters/:id" element={<OrganizationDetail />} />
|
||||
<Route path="/partners/:id" element={<OrganizationDetail />} />
|
||||
<Route path="/organizations/:id" element={<OrganizationDetail />} />
|
||||
<Route path="/teams/:id" element={<TeamDetail />} />
|
||||
<Route path="/awards/:id" element={<AwardDetail />} />
|
||||
<Route path="/people/:id" element={<PersonDetail />} />
|
||||
<Route path="leadership" element={<Leadership />} />
|
||||
<Route path="resources" element={<Resources />} />
|
||||
<Route path="history" element={<History />} />
|
||||
<Route path="feedback" element={<Feedback />} />
|
||||
<Route path="feedback" element={<Feedback />} />
|
||||
<Route path="give" element={<Giving />} />
|
||||
<Route path="privacy" element={<Privacy />} />
|
||||
<Route path="terms" element={<Terms />} />
|
||||
|
|
@ -69,11 +49,7 @@ export default function App() {
|
|||
<Route path="/admin/login" element={<AdminLogin />} />
|
||||
<Route element={<RequireAuth />}>
|
||||
<Route path="/admin" element={<AdminLayout />}>
|
||||
<Route index element={<Navigate to="/admin/home" replace />} />
|
||||
<Route path="home" element={<AdminHome />} />
|
||||
<Route element={<RequireRole role="superadmin" />}>
|
||||
<Route path="panel" element={<AdminPanel />} />
|
||||
</Route>
|
||||
<Route index element={<Navigate to="/admin/feedback" replace />} />
|
||||
<Route path="feedback" element={<AdminFeedback />} />
|
||||
<Route path=":entity" element={<EntityList />} />
|
||||
<Route path=":entity/:id" element={<EntityEdit />} />
|
||||
|
|
|
|||
|
|
@ -4,15 +4,7 @@ import { Link } from "react-router-dom";
|
|||
ARROW LINK
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
type ArrowLinkProps = {
|
||||
to: string;
|
||||
label: string;
|
||||
color: string;
|
||||
/** Tailwind size classes for the circle. */
|
||||
size?: string;
|
||||
};
|
||||
|
||||
export default function ArrowLink({ to, label, color, size = "h-9 w-9" }: ArrowLinkProps) {
|
||||
export default function ArrowLink({ to, label, color, size = "h-9 w-9" }) {
|
||||
return (
|
||||
<Link
|
||||
to={to}
|
||||
|
|
|
|||
|
|
@ -1,189 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
CONTENT BLOCKS
|
||||
|
||||
Renders the `body` slot of content_blocks. Events, organizations
|
||||
and teams all own blocks and all render them the same way, so
|
||||
this is written once and tinted by the caller's accent.
|
||||
|
||||
⚠ Assumes shape.js's loadBlocks returns rows carrying `type`,
|
||||
`text`, `media`, `href` and an `items` array. If the field names
|
||||
differ, this is the only file to fix — nothing else reads a
|
||||
block.
|
||||
|
||||
An unknown `type` renders its text as a paragraph rather than
|
||||
disappearing. A block somebody typed into the admin should be
|
||||
visible even if the renderer hasn't caught up with it.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Link } from 'react-router-dom'
|
||||
import { blockMedia } from '../lib/media.ts'
|
||||
import type { ContentBlock } from '../lib/useContent.ts'
|
||||
|
||||
const BODY = '#4a6b72'
|
||||
|
||||
/** External if it has a scheme or starts with //; otherwise it's
|
||||
* one of our own routes and should go through the router. */
|
||||
const isExternal = (url: string) => /^([a-z][a-z0-9+.-]*:|\/\/)/i.test(url)
|
||||
|
||||
function Anchor({
|
||||
href,
|
||||
children,
|
||||
className,
|
||||
style,
|
||||
}: {
|
||||
href: string
|
||||
children: React.ReactNode
|
||||
className?: string
|
||||
style?: React.CSSProperties
|
||||
}) {
|
||||
if (isExternal(href)) {
|
||||
return (
|
||||
<a href={href} target="_blank" rel="noreferrer" className={className} style={style}>
|
||||
{children}
|
||||
</a>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<Link to={href} className={className} style={style}>
|
||||
{children}
|
||||
</Link>
|
||||
)
|
||||
}
|
||||
|
||||
export default function ContentBlocks({
|
||||
blocks,
|
||||
accent = '#138ba0',
|
||||
className = '',
|
||||
}: {
|
||||
blocks?: ContentBlock[] | null
|
||||
accent?: string
|
||||
className?: string
|
||||
}) {
|
||||
if (!blocks?.length) return null
|
||||
|
||||
return (
|
||||
<div className={`space-y-6 ${className}`}>
|
||||
{blocks.map((block, index) => (
|
||||
<Block key={block.id ?? index} block={block} accent={accent} />
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function Block({ block, accent }: { block: ContentBlock; accent: string }) {
|
||||
const text = block.text ?? ''
|
||||
|
||||
switch (block.type) {
|
||||
case 'heading':
|
||||
return (
|
||||
<h3 className="text-2xl font-bold" style={{ color: accent }}>
|
||||
{text}
|
||||
</h3>
|
||||
)
|
||||
|
||||
case 'subheading':
|
||||
return (
|
||||
<h4 className="text-lg font-semibold" style={{ color: accent }}>
|
||||
{text}
|
||||
</h4>
|
||||
)
|
||||
|
||||
case 'list':
|
||||
return (
|
||||
<ul className="space-y-2">
|
||||
{(block.items ?? []).map((item, index) => (
|
||||
<li key={index} className="flex gap-3">
|
||||
<span aria-hidden="true" style={{ color: accent }}>
|
||||
•
|
||||
</span>
|
||||
<span style={{ color: BODY }}>
|
||||
{item.url ? (
|
||||
<Anchor href={item.url} className="underline" style={{ color: accent }}>
|
||||
{item.text}
|
||||
</Anchor>
|
||||
) : (
|
||||
item.text
|
||||
)}
|
||||
{item.detail && (
|
||||
<span className="opacity-70"> — {item.detail}</span>
|
||||
)}
|
||||
</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)
|
||||
|
||||
case 'links':
|
||||
return (
|
||||
<div className="flex flex-wrap gap-3">
|
||||
{(block.items ?? [])
|
||||
.filter((item) => item.url)
|
||||
.map((item, index) => (
|
||||
<Anchor
|
||||
key={index}
|
||||
href={item.url as string}
|
||||
className="rounded-full border px-4 py-1.5 text-sm font-medium transition-colors hover:bg-[#eef9fb]"
|
||||
style={{ borderColor: accent, color: accent }}
|
||||
>
|
||||
{item.text}
|
||||
</Anchor>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
|
||||
case 'quote':
|
||||
return (
|
||||
<blockquote
|
||||
className="border-l-2 pl-5 text-lg italic"
|
||||
style={{ borderColor: accent, color: BODY }}
|
||||
>
|
||||
{text}
|
||||
</blockquote>
|
||||
)
|
||||
|
||||
case 'image': {
|
||||
const src = blockMedia(block.media)
|
||||
if (!src) return null
|
||||
const img = (
|
||||
<img
|
||||
src={src}
|
||||
// A caption is a caption, not alt text — but an image with
|
||||
// neither is decorative, and alt="" is the correct answer
|
||||
// for that rather than a filename read aloud.
|
||||
alt={text}
|
||||
loading="lazy"
|
||||
decoding="async"
|
||||
className="w-full rounded-lg"
|
||||
/>
|
||||
)
|
||||
return (
|
||||
<figure>
|
||||
{block.href ? <Anchor href={block.href}>{img}</Anchor> : img}
|
||||
{text && (
|
||||
<figcaption className="mt-2 text-sm opacity-70" style={{ color: BODY }}>
|
||||
{text}
|
||||
</figcaption>
|
||||
)}
|
||||
</figure>
|
||||
)
|
||||
}
|
||||
|
||||
case 'divider':
|
||||
return <hr className="border-0 h-px" style={{ background: accent, opacity: 0.3 }} />
|
||||
|
||||
case 'paragraph':
|
||||
default:
|
||||
if (!text) return null
|
||||
return (
|
||||
<p className="leading-relaxed" style={{ color: BODY }}>
|
||||
{block.href ? (
|
||||
<Anchor href={block.href} className="underline" style={{ color: accent }}>
|
||||
{text}
|
||||
</Anchor>
|
||||
) : (
|
||||
text
|
||||
)}
|
||||
</p>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
DOVE MARK
|
||||
|
||||
NGU's dove, lifted from the original home page. The path and its
|
||||
two transforms are the drawing as exported, untouched; only the
|
||||
wrapper changed — sized by the caller, coloured by currentColor,
|
||||
and hidden from screen readers since it's decoration wherever
|
||||
it appears.
|
||||
|
||||
Renders as an <svg> element, so it nests inside another SVG as
|
||||
well as in HTML: pass x, y, width and height to place it in a
|
||||
parent viewBox.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import type { SVGProps } from 'react'
|
||||
|
||||
const PATH =
|
||||
'm 355.91146,-123.11955 c 3.13369,-1.59928 7.04147,-4.49077 10.29591,-6.33595 3.25443,-1.84519 6.30899,-3.58417 9.61426,-4.20523 2.65302,-0.4889 6.37319,-0.18817 9.07211,0.58357 2.69896,0.77175 5.57299,2.70484 7.16593,3.40762 1.59295,0.70275 2.24655,0.19006 2.82855,-0.77494 0.582,-0.96504 2.81839,-6.05064 3.84362,-8.9293 1.02519,-2.87864 2.26409,-5.72337 4.14553,-7.76121 1.88144,-2.03782 2.31893,-2.07776 4.06202,-3.15865 1.74307,-1.08086 10.24244,-3.71628 14.53403,-5.61581 4.29158,-1.89953 8.11957,-3.58996 12.24067,-5.48028 4.12109,-1.89033 6.08861,-2.79441 7.30709,-3.29554 0.273,0.73801 -0.2034,3.06663 -1.16031,5.22317 -0.95691,2.15654 -2.9569,5.04357 -4.86279,7.26365 -1.90589,2.22009 -4.28775,4.10342 -6.82223,5.66812 -2.53448,1.56467 -4.53981,2.45823 -7.60439,3.71266 -3.06457,1.25446 -11.88915,4.7102 -14.64698,7.12005 -2.75786,2.40984 -4.18313,6.63212 -3.64772,7.60115 0.5354,0.96902 2.51391,-1.48598 3.81084,-2.34867 1.29694,-0.8627 1.95172,-1.05814 3.14897,-1.09198 1.17765,-0.0172 2.77532,0.40067 3.29849,0.63293 1.48441,0.659 3.97438,2.00122 3.54176,3.36038 -0.16368,0.51434 -0.19462,0.56904 -3.05611,1.25841 -2.86151,0.68935 -3.48508,1.29579 -3.81533,3.74861 -0.22097,1.47094 -1.44719,3.88743 -3.13317,5.28015 -1.68596,1.39274 -4.55099,2.93627 -8.41717,3.35482 -3.86617,0.41855 -6.17544,3.97192 -6.93256,5.37259 -0.75713,1.40064 -2.66104,5.90506 -2.99685,6.15238 -0.3358,0.24732 -2.76998,-0.36582 -3.79458,-0.82517 -1.02463,-0.45935 -2.612,-1.39111 -3.63624,-2.16132 -1.02425,-0.7702 -3.457,-2.975 -3.0018,-3.64018 0.45519,-0.66516 1.56543,-1.35445 2.73515,-2.12254 1.16972,-0.76811 3.86984,-2.33631 5.3456,-3.59002 1.47576,-1.25372 2.7334,-2.47754 3.4042,-3.48323 0.67079,-1.00567 0.9358,-2.14286 -0.28206,-2.7388 -1.21786,-0.59597 -1.84092,-0.39835 -4.4486,0.0225 -2.60769,0.42097 -4.8218,1.10142 -8.46858,1.9005 -3.64678,0.79905 -7.82786,2.49393 -10.97221,3.07304 -3.14439,0.5791 -4.3363,0.83756 -8.5197,0.95691 -4.1834,0.11935 -7.15938,-0.35864 -8.95468,-0.91763 -1.7953,-0.55899 -2.64147,-1.55556 -2.60415,-2.17667 3.90737,-1.58574 7.9469,-3.2841 11.38348,-5.04009 z'
|
||||
|
||||
export default function DoveMark(props: SVGProps<SVGSVGElement>) {
|
||||
return (
|
||||
<svg viewBox="0 0 72.867699 48.568241" aria-hidden="true" focusable="false" {...props}>
|
||||
<g transform="translate(-70.490069,-117.83965)">
|
||||
<g transform="matrix(0.71532587,0,0,0.71532587,-173.91758,237.73112)">
|
||||
<path d={PATH} fill="currentColor" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
)
|
||||
}
|
||||
|
|
@ -39,13 +39,7 @@ const Social_Links = [
|
|||
// Only the label differs down here.
|
||||
const giveAction = NAV_ACTIONS.find((a) => a.variant === "fancy");
|
||||
|
||||
/* An internal route, or an off-site address opened in a new tab. */
|
||||
type TouchLink = { label: string } & (
|
||||
| { external?: false; to: string }
|
||||
| { external: true; href: string }
|
||||
);
|
||||
|
||||
const Get_In_Touch: TouchLink[] = [
|
||||
const Get_In_Touch = [
|
||||
{ label: "Feedback", to: "/feedback"},
|
||||
{ label: "Contact Us", to: "/leadership#contact" },
|
||||
];
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ export default function Layout() {
|
|||
|
||||
const targets = sections
|
||||
.map((s) => document.querySelector(s.hash))
|
||||
.filter((el): el is Element => el !== null);
|
||||
.filter(Boolean);
|
||||
if (targets.length === 0) return;
|
||||
|
||||
const observer = new IntersectionObserver(
|
||||
|
|
|
|||
|
|
@ -29,27 +29,9 @@
|
|||
/>
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import type { ReactNode } from "react";
|
||||
|
||||
const TEAL = "#138ba0";
|
||||
|
||||
export type ShellSection = {
|
||||
id: string;
|
||||
title: string;
|
||||
blurb?: string;
|
||||
accent: string;
|
||||
background: string;
|
||||
actions?: ReactNode;
|
||||
content: ReactNode;
|
||||
};
|
||||
|
||||
type PageShellProps = {
|
||||
title: ReactNode;
|
||||
intro?: ReactNode;
|
||||
sections: ShellSection[];
|
||||
};
|
||||
|
||||
export function Section({ section }: { section: ShellSection }) {
|
||||
export function Section({ section }) {
|
||||
const {
|
||||
id,
|
||||
title,
|
||||
|
|
@ -88,7 +70,7 @@ export function Section({ section }: { section: ShellSection }) {
|
|||
);
|
||||
}
|
||||
|
||||
export default function PageShell({ title, intro, sections }: PageShellProps) {
|
||||
export default function PageShell({ title, intro, sections }) {
|
||||
return (
|
||||
<>
|
||||
{/* Page header */}
|
||||
|
|
|
|||
|
|
@ -1,91 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
PAGE STATE
|
||||
|
||||
The three ways a detail page can fail to be a detail page. All
|
||||
four of them need the same thing, and it should be the same thing
|
||||
— a visitor who hits a dead retreat link and a dead chapter link
|
||||
shouldn't get two different pages.
|
||||
|
||||
Rendered inside PageShell so the chrome doesn't flicker in and
|
||||
out between loading and loaded.
|
||||
|
||||
A 404 gets no retry button: the slug doesn't exist and trying
|
||||
again won't change that. Anything else does, because a dropped
|
||||
connection is the usual cause and one tap fixes it.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Link } from 'react-router-dom'
|
||||
import PageShell from './PageShell.tsx'
|
||||
|
||||
const TEAL = '#138ba0'
|
||||
const BODY = '#4a6b72'
|
||||
|
||||
export default function PageState({
|
||||
loading,
|
||||
error,
|
||||
notFound,
|
||||
onRetry,
|
||||
noun,
|
||||
backTo,
|
||||
backLabel,
|
||||
}: {
|
||||
loading: boolean
|
||||
error: string | null
|
||||
notFound: boolean
|
||||
onRetry: () => void
|
||||
/** Lowercase, as it appears mid-sentence: "retreat", "chapter". */
|
||||
noun: string
|
||||
backTo: string
|
||||
backLabel: string
|
||||
}) {
|
||||
let title: string
|
||||
let content: React.ReactNode
|
||||
|
||||
if (notFound) {
|
||||
title = 'Not found'
|
||||
content = (
|
||||
<div className="max-w-6xl mx-auto px-6">
|
||||
<p style={{ color: BODY }}>
|
||||
There’s no {noun} at this address. It may have been renamed, or taken
|
||||
down.
|
||||
</p>
|
||||
<Link
|
||||
to={backTo}
|
||||
className="mt-4 inline-block rounded-full border px-4 py-1.5 text-sm font-medium transition-colors hover:bg-[#eef9fb]"
|
||||
style={{ borderColor: TEAL, color: TEAL }}
|
||||
>
|
||||
{backLabel}
|
||||
</Link>
|
||||
</div>
|
||||
)
|
||||
} else if (error) {
|
||||
title = 'Something went wrong'
|
||||
content = (
|
||||
<div className="max-w-6xl mx-auto px-6">
|
||||
<p style={{ color: '#b3261e' }}>Couldn’t load this {noun}. {error}</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onRetry}
|
||||
className="mt-3 rounded-full border px-4 py-1.5 text-sm font-medium transition-colors hover:bg-[#eef9fb]"
|
||||
style={{ borderColor: TEAL, color: TEAL }}
|
||||
>
|
||||
Try again
|
||||
</button>
|
||||
</div>
|
||||
)
|
||||
} else {
|
||||
title = 'Loading…'
|
||||
content = (
|
||||
<p className="max-w-6xl mx-auto px-6" style={{ color: BODY }} role="status">
|
||||
Loading this {noun}…
|
||||
</p>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<PageShell
|
||||
title={title}
|
||||
sections={[{ id: 'status', title: '', accent: TEAL, background: '#ffffff', content }]}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
|
@ -123,16 +123,10 @@
|
|||
text-align: inherit;
|
||||
}
|
||||
|
||||
.pl__tile--button,
|
||||
.pl__tile--link {
|
||||
.pl__tile--button {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.pl__tile--link {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.pl__frame {
|
||||
position: relative;
|
||||
display: flex;
|
||||
|
|
@ -156,20 +150,16 @@
|
|||
}
|
||||
|
||||
.pl__tile--button:hover .pl__frame,
|
||||
.pl__tile--button:focus-visible .pl__frame,
|
||||
.pl__tile--link:hover .pl__frame,
|
||||
.pl__tile--link:focus-visible .pl__frame {
|
||||
.pl__tile--button:focus-visible .pl__frame {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 1px 1px rgba(15, 23, 42, 0.06), 0 16px 24px -16px rgba(15, 23, 42, 0.6);
|
||||
}
|
||||
|
||||
.pl__tile--button:focus-visible,
|
||||
.pl__tile--link:focus-visible {
|
||||
.pl__tile--button:focus-visible {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.pl__tile--button:focus-visible .pl__frame,
|
||||
.pl__tile--link:focus-visible .pl__frame {
|
||||
.pl__tile--button:focus-visible .pl__frame {
|
||||
outline: 2px solid var(--pl-accent);
|
||||
outline-offset: 3px;
|
||||
}
|
||||
|
|
@ -321,20 +311,6 @@
|
|||
max-width: 62ch;
|
||||
}
|
||||
|
||||
.pl__profile {
|
||||
display: inline-block;
|
||||
margin-top: 0.75rem;
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 600;
|
||||
color: var(--pl-accent);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.pl__profile:hover,
|
||||
.pl__profile:focus-visible {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.pl__empty {
|
||||
margin: 0;
|
||||
font-size: 0.9375rem;
|
||||
|
|
|
|||
|
|
@ -8,10 +8,7 @@ import {
|
|||
type HTMLAttributes,
|
||||
} from "react";
|
||||
|
||||
import { Link } from "react-router-dom";
|
||||
|
||||
import { get } from "../lib/api.js";
|
||||
import { isBadId, personHref } from "../lib/hrefs.ts";
|
||||
import "./PeopleTiles.css";
|
||||
|
||||
/**
|
||||
|
|
@ -46,13 +43,6 @@ import "./PeopleTiles.css";
|
|||
*
|
||||
* Field names follow the API (is_owner, location_label), so a row
|
||||
* from /api/teams/:id/people drops in unchanged.
|
||||
*
|
||||
* Profiles
|
||||
* A person with a string id is taken to be a people row and links
|
||||
* to /people/:id. A tile with nothing to expand is that link; an
|
||||
* expandable one stays the button that opens its panel — a link
|
||||
* can't sit inside a button — and the panel carries the link
|
||||
* instead. A hand-written entry with no id links nowhere.
|
||||
*/
|
||||
|
||||
export interface Person {
|
||||
|
|
@ -174,7 +164,7 @@ export default function PeopleTiles({
|
|||
|
||||
Promise.all(
|
||||
specs.map((spec) =>
|
||||
get<TeamResponse>(`/teams/${spec.id}/people`, { ttl }).then((data) => ({
|
||||
get(`/teams/${spec.id}/people`, { ttl }).then((data: TeamResponse) => ({
|
||||
spec,
|
||||
data,
|
||||
})),
|
||||
|
|
@ -208,8 +198,8 @@ export default function PeopleTiles({
|
|||
let live = true;
|
||||
setFailed(false);
|
||||
|
||||
get<{ people: Person[] }>(`/people?ids=${encodeURIComponent(slugKey)}`, { ttl })
|
||||
.then((data) => {
|
||||
get(`/people?ids=${encodeURIComponent(slugKey)}`, { ttl })
|
||||
.then((data: { people: Person[] }) => {
|
||||
if (!live) return;
|
||||
const byId: Record<string, Person> = {};
|
||||
for (const person of data.people) byId[String(person.id)] = person;
|
||||
|
|
@ -314,10 +304,11 @@ function resolveAll(
|
|||
}
|
||||
|
||||
const { peopleslug, ...overrides } = entry;
|
||||
const defined: Partial<Person> = Object.fromEntries(
|
||||
Object.entries(overrides).filter(([, value]) => value !== undefined),
|
||||
);
|
||||
resolved.push({ ...base, ...defined });
|
||||
const merged: Person = { ...base };
|
||||
for (const [key, value] of Object.entries(overrides)) {
|
||||
if (value !== undefined) (merged as Record<string, unknown>)[key] = value;
|
||||
}
|
||||
resolved.push(merged);
|
||||
}
|
||||
|
||||
return resolved;
|
||||
|
|
@ -561,14 +552,7 @@ function Tile({
|
|||
);
|
||||
|
||||
if (!expandable) {
|
||||
const href = profileHref(person);
|
||||
return href ? (
|
||||
<Link to={href} className="pl__tile pl__tile--link">
|
||||
{content}
|
||||
</Link>
|
||||
) : (
|
||||
<div className="pl__tile">{content}</div>
|
||||
);
|
||||
return <div className="pl__tile">{content}</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
|
|
@ -627,7 +611,6 @@ function DetailPanel({
|
|||
const title = titleOf(person);
|
||||
const paragraphs = Array.isArray(person.bio) ? person.bio : [person.bio];
|
||||
const tint = person.accent || group?.accent;
|
||||
const profile = profileHref(person);
|
||||
|
||||
return (
|
||||
<div
|
||||
|
|
@ -690,12 +673,6 @@ function DetailPanel({
|
|||
{paragraph}
|
||||
</p>
|
||||
))}
|
||||
|
||||
{profile && (
|
||||
<Link to={profile} className="pl__profile">
|
||||
View full profile →
|
||||
</Link>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -717,12 +694,6 @@ function Chevron() {
|
|||
|
||||
/* ── Helpers ─────────────────────────────────────────────────── */
|
||||
|
||||
/* A string id is a people slug; a numeric or missing one is a
|
||||
hand-written entry with no page behind it. */
|
||||
function profileHref(person: Person): string | null {
|
||||
return typeof person.id === "string" && !isBadId(person.id) ? personHref(person.id) : null;
|
||||
}
|
||||
|
||||
function keyFor(group: PeopleGroup, person: Person, index: number): string {
|
||||
return `${group.id}:${person.id ?? person.name ?? index}`;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,16 +32,7 @@
|
|||
able to read and copy.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { useRef, useState, type ChangeEvent, type ReactNode } from "react";
|
||||
|
||||
import type { FieldErrors } from "../../lib/api.js";
|
||||
import type {
|
||||
AdminFieldSpec,
|
||||
AdminOption,
|
||||
AdminOptions,
|
||||
AdminRow,
|
||||
CollectionSpec,
|
||||
} from "../../lib/adminSchema.js";
|
||||
import { useRef, useState } from "react";
|
||||
|
||||
const input =
|
||||
"w-full rounded-lg border border-[#4a6b72]/25 bg-white px-3 py-2 text-sm text-[#26454c] " +
|
||||
|
|
@ -65,56 +56,34 @@ const inputLocked =
|
|||
|
||||
/* ── Dotted paths ────────────────────────────────────────────── */
|
||||
|
||||
export function getPath(object: unknown, path: string | null | undefined): unknown {
|
||||
// An entity with no slug has no heading path either, and a missing
|
||||
// path should read as "no value" rather than throwing on .split.
|
||||
if (!path) return undefined;
|
||||
return path
|
||||
.split(".")
|
||||
.reduce<unknown>((value, key) => (value == null ? undefined : (value as AdminRow)[key]), object);
|
||||
export function getPath(object, path) {
|
||||
return path.split(".").reduce((value, key) => value?.[key], object);
|
||||
}
|
||||
|
||||
export function setPath(object: AdminRow | null | undefined, path: string, value: unknown): AdminRow {
|
||||
export function setPath(object, path, value) {
|
||||
const [head, ...rest] = path.split(".");
|
||||
if (rest.length === 0) return { ...object, [head]: value };
|
||||
const inner = (object?.[head] ?? {}) as AdminRow;
|
||||
return { ...object, [head]: setPath(inner, rest.join("."), value) };
|
||||
return { ...object, [head]: setPath(object?.[head] ?? {}, rest.join("."), value) };
|
||||
}
|
||||
|
||||
/* ── Field ───────────────────────────────────────────────────── */
|
||||
|
||||
/* [value, label, the option row it came from]. Manifest options
|
||||
have no row, which is what filterBy's `!raw` lets through. */
|
||||
type Choice = [id: string, label: string, raw?: AdminOption];
|
||||
|
||||
type FieldProps = {
|
||||
field: AdminFieldSpec;
|
||||
/* Whatever the row holds at field.path; shown as text. */
|
||||
value: unknown;
|
||||
row?: AdminRow;
|
||||
options?: AdminOptions | null;
|
||||
error?: string;
|
||||
onChange: (value: string | number) => void;
|
||||
};
|
||||
|
||||
export function Field({ field, value, row, options, error, onChange }: FieldProps) {
|
||||
export function Field({ field, value, row, options, error, onChange }) {
|
||||
const id = `f-${field.path.replace(/\./g, "-")}`;
|
||||
const widget = field.widget ?? "text";
|
||||
const locked = Boolean(field.readOnly);
|
||||
const text = value == null ? "" : String(value);
|
||||
|
||||
let list: Choice[] = [];
|
||||
let list = null;
|
||||
let orphaned = false;
|
||||
|
||||
if (widget === "select") {
|
||||
list = field.optionsFrom
|
||||
? (options?.[field.optionsFrom] ?? []).map((o): Choice => [o.id, o.label, o])
|
||||
: (field.options ?? []).map((o): Choice =>
|
||||
typeof o === "string" ? [o, o] : [o[0], o[1]],
|
||||
? (options?.[field.optionsFrom] ?? []).map((o) => [o.id, o.label, o])
|
||||
: (field.options ?? []).map((o) =>
|
||||
Array.isArray(o) ? [o[0], o[1]] : [o, o],
|
||||
);
|
||||
const { filterBy } = field;
|
||||
if (filterBy && row) {
|
||||
list = list.filter(([, , raw]) => !raw || filterBy(raw, row));
|
||||
if (field.filterBy && row) {
|
||||
list = list.filter(([, , raw]) => !raw || field.filterBy(raw, row));
|
||||
}
|
||||
|
||||
// A stored value with no matching option renders as the blank
|
||||
|
|
@ -130,9 +99,8 @@ export function Field({ field, value, row, options, error, onChange }: FieldProp
|
|||
const common = {
|
||||
id,
|
||||
className: `${input} ${error ? inputError : ""}`,
|
||||
value: text,
|
||||
onChange: (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>) =>
|
||||
onChange(e.target.value),
|
||||
value: value ?? "",
|
||||
onChange: (e) => onChange(e.target.value),
|
||||
};
|
||||
|
||||
return (
|
||||
|
|
@ -174,7 +142,7 @@ export function Field({ field, value, row, options, error, onChange }: FieldProp
|
|||
}`}
|
||||
>
|
||||
<option value="">{field.blankLabel ?? "— choose —"}</option>
|
||||
{orphaned && <option value={text}>{text} — no longer exists</option>}
|
||||
{orphaned && <option value={value}>{value} — no longer exists</option>}
|
||||
{list.map(([id2, label]) => (
|
||||
<option key={id2} value={id2}>
|
||||
{label}
|
||||
|
|
@ -185,7 +153,7 @@ export function Field({ field, value, row, options, error, onChange }: FieldProp
|
|||
<div className="flex gap-2">
|
||||
<input
|
||||
type="color"
|
||||
value={/^#[0-9a-f]{6}$/i.test(text) ? text : "#138ba0"}
|
||||
value={/^#[0-9a-f]{6}$/i.test(value ?? "") ? value : "#138ba0"}
|
||||
disabled={locked}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
className="h-9 w-12 shrink-0 rounded border border-[#4a6b72]/25 bg-white disabled:opacity-50"
|
||||
|
|
@ -217,7 +185,7 @@ export function Field({ field, value, row, options, error, onChange }: FieldProp
|
|||
<input
|
||||
id={id}
|
||||
type="text"
|
||||
value={text}
|
||||
value={value ?? ""}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
placeholder={field.placeholder}
|
||||
className="w-full border-0 bg-transparent p-0 text-[#26454c] outline-none placeholder:text-[#4a6b72]/45"
|
||||
|
|
@ -225,9 +193,7 @@ export function Field({ field, value, row, options, error, onChange }: FieldProp
|
|||
</div>
|
||||
) : (
|
||||
<input
|
||||
type={
|
||||
widget === "number" || widget === "date" || widget === "time" ? widget : "text"
|
||||
}
|
||||
type={widget === "number" ? "number" : widget === "date" ? "date" : "text"}
|
||||
step={widget === "number" ? "any" : undefined}
|
||||
{...common}
|
||||
readOnly={locked}
|
||||
|
|
@ -253,36 +219,26 @@ export function Field({ field, value, row, options, error, onChange }: FieldProp
|
|||
);
|
||||
}
|
||||
|
||||
export function FieldGrid({ children }: { children: ReactNode }) {
|
||||
export function FieldGrid({ children }) {
|
||||
return <div className="grid gap-4 sm:grid-cols-2">{children}</div>;
|
||||
}
|
||||
|
||||
/* ── Repeater ────────────────────────────────────────────────── */
|
||||
|
||||
type RepeaterProps = {
|
||||
spec: CollectionSpec;
|
||||
rows: AdminRow[] | null | undefined;
|
||||
options?: AdminOptions | null;
|
||||
errors?: Partial<FieldErrors> | null;
|
||||
/** Where this collection's rows sit in the server's error keys. */
|
||||
errorPrefix: string;
|
||||
onChange: (rows: AdminRow[]) => void;
|
||||
};
|
||||
|
||||
export function Repeater({ spec, rows, options, errors, errorPrefix, onChange }: RepeaterProps) {
|
||||
export function Repeater({ spec, rows, options, errors, errorPrefix, onChange }) {
|
||||
const list = rows ?? [];
|
||||
|
||||
// Which row is in flight, and which one it's currently over.
|
||||
// Both are per-Repeater, which is what keeps a drag inside a
|
||||
// nested collection from being accepted by the outer one.
|
||||
const [dragIndex, setDragIndex] = useState<number | null>(null);
|
||||
const [overIndex, setOverIndex] = useState<number | null>(null);
|
||||
const rowRefs = useRef<Array<HTMLDivElement | null>>([]);
|
||||
const [dragIndex, setDragIndex] = useState(null);
|
||||
const [overIndex, setOverIndex] = useState(null);
|
||||
const rowRefs = useRef([]);
|
||||
|
||||
const update = (index: number, next: AdminRow) =>
|
||||
const update = (index, next) =>
|
||||
onChange(list.map((row, i) => (i === index ? next : row)));
|
||||
|
||||
const move = (index: number, delta: number) => {
|
||||
const move = (index, delta) => {
|
||||
const target = index + delta;
|
||||
if (target < 0 || target >= list.length) return;
|
||||
const next = [...list];
|
||||
|
|
@ -290,7 +246,7 @@ export function Repeater({ spec, rows, options, errors, errorPrefix, onChange }:
|
|||
onChange(next);
|
||||
};
|
||||
|
||||
const relocate = (from: number | null, to: number | null) => {
|
||||
const relocate = (from, to) => {
|
||||
if (from === to || from == null || to == null) return;
|
||||
const next = [...list];
|
||||
const [moved] = next.splice(from, 1);
|
||||
|
|
@ -423,7 +379,7 @@ export function Repeater({ spec, rows, options, errors, errorPrefix, onChange }:
|
|||
<div key={nested.key} className="mt-4 border-t border-[#4a6b72]/15 pt-2">
|
||||
<Repeater
|
||||
spec={nested}
|
||||
rows={row[nested.key] as AdminRow[] | undefined}
|
||||
rows={row[nested.key]}
|
||||
options={options}
|
||||
errors={errors}
|
||||
errorPrefix={`${errorPrefix}${index}.${nested.key}.`}
|
||||
|
|
@ -439,15 +395,7 @@ export function Repeater({ spec, rows, options, errors, errorPrefix, onChange }:
|
|||
);
|
||||
}
|
||||
|
||||
type IconButtonProps = {
|
||||
label: string;
|
||||
onClick: () => void;
|
||||
danger?: boolean;
|
||||
disabled?: boolean;
|
||||
children: ReactNode;
|
||||
};
|
||||
|
||||
function IconButton({ label, onClick, danger, disabled, children }: IconButtonProps) {
|
||||
function IconButton({ label, onClick, danger, disabled, children }) {
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
|
|
|
|||
10
src/data/bannerConfig.d.ts
vendored
10
src/data/bannerConfig.d.ts
vendored
|
|
@ -1,10 +0,0 @@
|
|||
/* Types for bannerConfig.js. */
|
||||
|
||||
export type BannerPart = { text: string; href?: string; external?: boolean };
|
||||
|
||||
export declare const SITE_BANNER: {
|
||||
enabled: boolean;
|
||||
id: string;
|
||||
content: BannerPart[];
|
||||
dismissible: boolean;
|
||||
};
|
||||
47
src/data/chapters.d.ts
vendored
47
src/data/chapters.d.ts
vendored
|
|
@ -1,47 +0,0 @@
|
|||
/* Types for chapters.js: GET /organizations rows with their
|
||||
kind-specific details lifted to the top level. */
|
||||
|
||||
import type { OrganizationListItem, RegionArea, RegionScope } from "../lib/useContent.ts";
|
||||
import type { AreaSlice, RegionAreaRow } from "./mapGrid.js";
|
||||
|
||||
export { initialsFor } from "./organizations.js";
|
||||
|
||||
export type Region = OrganizationListItem & {
|
||||
scope: RegionScope | null;
|
||||
map_note: string | null;
|
||||
areas: RegionArea[];
|
||||
};
|
||||
|
||||
export type Chapter = OrganizationListItem & {
|
||||
region_id: string | null;
|
||||
region_name: string | null;
|
||||
region_color: string | null;
|
||||
meets: string | null;
|
||||
started: string | null;
|
||||
/** The map tile this chapter lights up, or null if it has none. */
|
||||
area_code: string | null;
|
||||
};
|
||||
|
||||
export type Community = {
|
||||
loading: boolean;
|
||||
error: Error | null;
|
||||
|
||||
regions: Region[];
|
||||
regionAreas: RegionAreaRow[];
|
||||
regionById: Record<string, Region>;
|
||||
domestic: Region[];
|
||||
international: Region[];
|
||||
virtual: Region[];
|
||||
|
||||
chapters: Chapter[];
|
||||
chaptersIn: (regionId: string) => Chapter[];
|
||||
|
||||
slices: Record<string, AreaSlice[]>;
|
||||
chapterCounts: Record<string, number>;
|
||||
regionsForArea: (areaCode: string) => Region[];
|
||||
|
||||
areasLabelFor: (regionId: string) => string;
|
||||
subtextFor: (region: Pick<Region, "id" | "map_note">) => string;
|
||||
};
|
||||
|
||||
export declare function useCommunity(): Community;
|
||||
29
src/data/eventData.d.ts
vendored
29
src/data/eventData.d.ts
vendored
|
|
@ -1,29 +0,0 @@
|
|||
/* Types for eventData.js. Rows are GET /events as shapeEvent in
|
||||
server/src/routes/content.js sends them. */
|
||||
|
||||
import type { EventType } from "../lib/eventTypes.ts";
|
||||
import type { EventListItem, EventSection } from "../lib/useContent.ts";
|
||||
|
||||
export type EventFilter = {
|
||||
section?: string;
|
||||
host?: string;
|
||||
status?: EventListItem["status"];
|
||||
type?: EventType | EventType[];
|
||||
};
|
||||
|
||||
export declare function useEvents(filter?: EventFilter): {
|
||||
events: EventListItem[];
|
||||
/** event_sections, in scope order. Empty until loaded. */
|
||||
sections: EventSection[];
|
||||
loading: boolean;
|
||||
error: Error | null;
|
||||
};
|
||||
|
||||
export declare function splitByStatus<T extends { status: string }>(
|
||||
events?: T[],
|
||||
): { upcoming: T[]; past: T[] };
|
||||
|
||||
export declare function typesPresent<D extends { id: string }>(
|
||||
events?: Array<{ event_type: string }>,
|
||||
declared?: readonly D[],
|
||||
): D[];
|
||||
|
|
@ -7,24 +7,10 @@
|
|||
narrows the result to what it shows.
|
||||
|
||||
useEvents({ section: "national" }) one band
|
||||
useEvents({ host: "northwest" }) one host's events
|
||||
useEvents({ host: "northwest" }) a region's own events
|
||||
useEvents({ status: "upcoming" }) a home page strip
|
||||
useEvents({ type: "workshop" }) one kind, wherever it is
|
||||
useEvents({ type: ["class", "workshop"] })
|
||||
useEvents() everything
|
||||
|
||||
`section` and `type` are different questions and stack rather
|
||||
than overlap: the section is which band of the page an event
|
||||
belongs to, the type is what kind of gathering it is. A regional
|
||||
class matches both { section: "regional" } and { type: "class" }.
|
||||
|
||||
The event_sections rows (the scope list) come back alongside, for
|
||||
anything that offers a scope filter.
|
||||
|
||||
No fallback. An empty list on a failed request would read as
|
||||
"nothing scheduled" when the truth is "the server is down", so
|
||||
the error comes back and each caller says so.
|
||||
|
||||
Filtering here rather than in the query keeps the endpoint to
|
||||
one cached response. At a few dozen events that's the right
|
||||
trade; if the list ever runs to hundreds, move the filters into
|
||||
|
|
@ -35,37 +21,22 @@ import { useMemo } from "react";
|
|||
|
||||
import { useResource } from "../lib/useResource.js";
|
||||
|
||||
/* One shared empty list, so a memo keyed on `sections` doesn't
|
||||
restart on every render before the data arrives. */
|
||||
const NO_SECTIONS = [];
|
||||
const EMPTY = { events: [] };
|
||||
|
||||
export function useEvents({ section, host, status, type } = {}) {
|
||||
const { data, error, loading } = useResource("/events");
|
||||
export function useEvents({ section, host, status } = {}) {
|
||||
const { data, error, loading } = useResource("/events", { fallback: EMPTY });
|
||||
|
||||
const all = data?.events;
|
||||
const sections = data?.sections ?? NO_SECTIONS;
|
||||
|
||||
/* An array prop is a new identity on every render, which would
|
||||
restart the memo each time. Joining it gives the dependency
|
||||
list something stable to compare. */
|
||||
const typeKey = Array.isArray(type) ? type.join(",") : (type ?? "");
|
||||
|
||||
const events = useMemo(() => {
|
||||
let list = all ?? [];
|
||||
if (section) list = list.filter(e => e.section_id === section);
|
||||
// `host` is an organization or a person slug, and an event can
|
||||
// have several of either — co-hosting puts one event on both
|
||||
// hosts' lists, which is the point.
|
||||
if (host) list = list.filter(e => e.hosts?.some(h => h.id === host));
|
||||
if (host) list = list.filter(e => e.host?.id === host);
|
||||
if (status) list = list.filter(e => e.status === status);
|
||||
if (typeKey) {
|
||||
const wanted = new Set(typeKey.split(","));
|
||||
list = list.filter(e => wanted.has(e.event_type));
|
||||
}
|
||||
return list;
|
||||
}, [all, section, host, status, typeKey]);
|
||||
}, [all, section, host, status]);
|
||||
|
||||
return { events, sections, loading, error };
|
||||
return { events, loading, error };
|
||||
}
|
||||
|
||||
/* Past and upcoming, split. `status` arrives already resolved — the
|
||||
|
|
@ -81,12 +52,3 @@ export function splitByStatus(events = []) {
|
|||
|
||||
return { upcoming, past };
|
||||
}
|
||||
|
||||
/* Which of the declared types a list actually contains, in
|
||||
EVENT_TYPES order rather than whatever order the rows arrived
|
||||
in. A section with one type has nothing to filter, which is what
|
||||
lets the chip bar hide itself. */
|
||||
export function typesPresent(events = [], declared = []) {
|
||||
const seen = new Set(events.map(e => e.event_type));
|
||||
return declared.filter(entry => seen.has(entry.id));
|
||||
}
|
||||
|
|
|
|||
7
src/data/feedbackTypes.d.ts
vendored
7
src/data/feedbackTypes.d.ts
vendored
|
|
@ -1,7 +0,0 @@
|
|||
/* Types for feedbackTypes.js. */
|
||||
|
||||
export type FeedbackType = { id: string; label: string; hint: string };
|
||||
|
||||
export declare const FEEDBACK_TYPES: FeedbackType[];
|
||||
|
||||
export declare function feedbackTypeLabel(id: string): string;
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
/**
|
||||
* Decade headers for the history page.
|
||||
*
|
||||
* Not in the database on purpose. There are four of them, they change
|
||||
* about never, and they're editorial voice rather than record — the same
|
||||
* reasoning that keeps the map grid config in code. A table for four
|
||||
* rows that nobody edits is a migration and an admin page for nothing.
|
||||
*
|
||||
* `preProgram` is what draws the gap: a dashed rail, hollow year dots,
|
||||
* and the "before the program" marker. It lives on the decade rather
|
||||
* than being a hardcoded year check, so the gap moves if the founding
|
||||
* date is ever revised.
|
||||
*/
|
||||
|
||||
import type { DecadeMeta } from '../lib/timeline'
|
||||
|
||||
export const HISTORY_DECADES: DecadeMeta[] = [
|
||||
{
|
||||
decade: 2020,
|
||||
title: 'The Age of Autonomy',
|
||||
tagline: 'Growth, unprecedented support, returning to our roots',
|
||||
blurb:
|
||||
'Covid-19 sends everyone home for 2 years and from the resurgence comes a new iteration of the program',
|
||||
},
|
||||
{
|
||||
decade: 2010,
|
||||
title: 'Millennials run the show',
|
||||
tagline: 'A time of something',
|
||||
blurb:
|
||||
'Need to update what happened here, mostly documented on facebook we asumme',
|
||||
},
|
||||
{
|
||||
decade: 2000,
|
||||
title: 'NGU - The new acronym',
|
||||
tagline: 'Turn of the century forms a national explosion',
|
||||
blurb:
|
||||
'Unity\'s young adult program becomes Next Generation of Unity',
|
||||
},
|
||||
{
|
||||
decade: 1990,
|
||||
title: 'Before NGU there was YAU',
|
||||
tagline: 'Young adult ministry existed',
|
||||
preProgram: true,
|
||||
blurb:
|
||||
'Anything listed here predates our named program. We are looking to document this history more',
|
||||
},
|
||||
{
|
||||
decade: 1980,
|
||||
title: 'YAU?',
|
||||
tagline: 'Young adult ministry existed',
|
||||
preProgram: true,
|
||||
blurb:
|
||||
'Anything listed here predates our named program. We are looking to document this history more',
|
||||
},
|
||||
{
|
||||
decade: 1970,
|
||||
title: 'YAU?',
|
||||
tagline: 'Young adult ministry existed',
|
||||
preProgram: true,
|
||||
blurb:
|
||||
'Anything listed here predates our named program. We are looking to document this history more',
|
||||
},
|
||||
]
|
||||
51
src/data/mapGrid.d.ts
vendored
51
src/data/mapGrid.d.ts
vendored
|
|
@ -1,51 +0,0 @@
|
|||
/* Types for mapGrid.js. */
|
||||
|
||||
import type { RegionArea } from "../lib/useContent.ts";
|
||||
|
||||
export declare const GRID_COLS: number;
|
||||
export declare const GRID_ROWS: number;
|
||||
|
||||
export declare const AREA_NAMES: Record<string, string>;
|
||||
|
||||
/** One tile: a state, or a band such as CANADA with a span. */
|
||||
export type MapArea = {
|
||||
code: string;
|
||||
name: string;
|
||||
col: number;
|
||||
row: number;
|
||||
span: number;
|
||||
isState: boolean;
|
||||
};
|
||||
|
||||
export declare const AREAS: readonly MapArea[];
|
||||
export declare const AREA_BY_CODE: Record<string, MapArea>;
|
||||
|
||||
/** A region_areas row flattened with its region, as buildAreaSlices takes it. */
|
||||
export type RegionAreaRow = RegionArea & { region_id: string };
|
||||
|
||||
/** One region's share of a tile. */
|
||||
export type AreaSlice = {
|
||||
regionId: string;
|
||||
name: string;
|
||||
color: string | null | undefined;
|
||||
share: number;
|
||||
edge: RegionArea["edge"];
|
||||
note: string | null;
|
||||
};
|
||||
|
||||
type Locatable = {
|
||||
is_online?: boolean;
|
||||
country?: string | null;
|
||||
state_code?: string | null;
|
||||
};
|
||||
|
||||
export declare function areaForChapter(chapter: Locatable | null | undefined): string | null;
|
||||
|
||||
export declare function buildAreaSlices(
|
||||
regionAreas?: RegionAreaRow[],
|
||||
regions?: Array<{ id: string; name: string; color?: string | null }>,
|
||||
): Record<string, AreaSlice[]>;
|
||||
|
||||
export declare function countChaptersByArea(chapters?: Locatable[]): Record<string, number>;
|
||||
|
||||
export declare function areasLabel(regionId: string, regionAreas?: RegionAreaRow[]): string;
|
||||
|
|
@ -1,299 +0,0 @@
|
|||
/**
|
||||
* PLACEHOLDER DATA — delete this file once `GET /api/history` lands.
|
||||
*
|
||||
* Shaped exactly like the aggregation route's payload, so swapping it out
|
||||
* is a two-line change in History.tsx.
|
||||
*
|
||||
* Note what is and isn't here. Entries that point at a record carry a
|
||||
* `ref` and little else: no venue, no host name, no copy that also lives
|
||||
* in `events`. The few that do carry a title are overriding it on
|
||||
* purpose. Titles and blurbs below are invented scaffolding, not real NGU
|
||||
* history — replace them before anyone sees this.
|
||||
*
|
||||
* Decade headers are not here — they live in historyDecades.ts and stay
|
||||
* in code even after the API lands.
|
||||
*
|
||||
* Upcoming items are not flagged. `partitionByDate` decides what's
|
||||
* upcoming by comparing dates to the wall clock, so nothing here needs
|
||||
* editing as dates pass.
|
||||
*/
|
||||
|
||||
import type { TimelineItem } from '../lib/timeline'
|
||||
|
||||
export const MOCK_ITEMS: TimelineItem[] = [
|
||||
// ——— Upcoming (relative to the wall clock, not a flag) ———
|
||||
{
|
||||
id: 'tl-0001',
|
||||
date: '2027-06',
|
||||
precision: 'month',
|
||||
kind: 'event',
|
||||
title: 'Summer Conference 2027',
|
||||
meta: 'Unity Village, MO',
|
||||
ref: { kind: 'event', id: 'summer-2027' },
|
||||
logo: { file: 'summer-conference.svg', kind: 'event' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0002',
|
||||
date: '2026-11-14',
|
||||
precision: 'day',
|
||||
kind: 'event',
|
||||
title: 'Fall Regional Rally',
|
||||
meta: 'Southeast',
|
||||
ref: { kind: 'event', id: 'fall-rally-2026' },
|
||||
logo: { file: 'regional-rally.svg', kind: 'event' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0003',
|
||||
date: '2026-10-03',
|
||||
precision: 'day',
|
||||
kind: 'event',
|
||||
title: 'Chapter Leads Intensive',
|
||||
meta: 'Online',
|
||||
ref: { kind: 'event', id: 'leads-intensive-2026' },
|
||||
},
|
||||
|
||||
// ——— 2020s ———
|
||||
{
|
||||
id: 'tl-0010',
|
||||
date: '2026-03',
|
||||
precision: 'month',
|
||||
kind: 'organization',
|
||||
title: 'Twentieth chapter chartered',
|
||||
blurb:
|
||||
'The first new charter in the region since 2017, started by three people who met at a rally two summers earlier.',
|
||||
featured: true,
|
||||
ref: { kind: 'organization', id: 'boise', orgKind: 'chapter' },
|
||||
logo: { file: 'boise.svg', kind: 'organization' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0011',
|
||||
date: '2026-04-17',
|
||||
precision: 'day',
|
||||
kind: 'event',
|
||||
title: 'Spring Regional Rally',
|
||||
ref: { kind: 'event', id: 'spring-rally-2026' },
|
||||
logo: { file: 'regional-rally.svg', kind: 'event' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0012',
|
||||
date: '2026-01',
|
||||
precision: 'month',
|
||||
kind: 'people',
|
||||
title: 'New leadership team seated',
|
||||
blurb: 'A four-person exec on a two-year term, the first under the 2024 bylaws.',
|
||||
ref: { kind: 'team', id: 'ngu-leadership' },
|
||||
team: { id: 'ngu-leadership', name: 'Leadership Team', orgId: 'ngu', orgName: 'NGU National' },
|
||||
people: [
|
||||
{ id: 'jane-doe', name: 'Jane Doe', title: 'Chair', photo: 'jane-doe.jpg' },
|
||||
{ id: 'sam-ruiz', name: 'Sam Ruiz', title: 'Vice Chair', photo: 'sam-ruiz.jpg' },
|
||||
{ id: 'ada-mensah', name: 'Ada Mensah', title: 'Secretary' },
|
||||
{ id: 'tom-baird', name: 'Tom Baird', title: 'Treasurer', photo: 'tom-baird.jpg' },
|
||||
],
|
||||
},
|
||||
{
|
||||
id: 'tl-0013',
|
||||
date: '2025-12-28',
|
||||
precision: 'day',
|
||||
kind: 'event',
|
||||
title: 'Winter Gathering',
|
||||
ref: { kind: 'event', id: 'winter-gathering-2025' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0014',
|
||||
date: '2025-07-19',
|
||||
precision: 'day',
|
||||
kind: 'award',
|
||||
title: 'Service Award',
|
||||
meta: 'Presented to the Southeast chapter leads',
|
||||
ref: { kind: 'award', id: 'service' },
|
||||
logo: { file: 'service-award.svg', kind: 'award' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0015',
|
||||
date: '2025-07-17',
|
||||
precision: 'day',
|
||||
kind: 'event',
|
||||
title: 'Summer Conference',
|
||||
meta: 'Three days, 140 attendees',
|
||||
ref: { kind: 'event', id: 'summer-2025' },
|
||||
logo: { file: 'summer-conference.svg', kind: 'event' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0016',
|
||||
date: '2025',
|
||||
precision: 'year',
|
||||
kind: 'milestone',
|
||||
title: 'Photo archive digitized',
|
||||
blurb: 'Roughly 4,000 images from 2003 onward, scanned by volunteers.',
|
||||
href: 'https://archive.nextgenerationofunity.org',
|
||||
},
|
||||
{
|
||||
id: 'tl-0017',
|
||||
date: '2024-09',
|
||||
precision: 'month',
|
||||
kind: 'milestone',
|
||||
title: 'Bylaws rewritten',
|
||||
blurb:
|
||||
'Term limits, a defined handoff window, and the first written process for chartering a chapter.',
|
||||
featured: true,
|
||||
},
|
||||
{
|
||||
id: 'tl-0018',
|
||||
date: '2024-07-11',
|
||||
precision: 'day',
|
||||
kind: 'event',
|
||||
title: 'Summer Conference',
|
||||
ref: { kind: 'event', id: 'summer-2024' },
|
||||
logo: { file: 'summer-conference.svg', kind: 'event' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0019',
|
||||
date: '2024-07-13',
|
||||
precision: 'day',
|
||||
kind: 'award',
|
||||
title: 'Emerging Leader Award',
|
||||
meta: 'First year the award was given',
|
||||
ref: { kind: 'award', id: 'emerging-leader' },
|
||||
logo: { file: 'emerging-leader.svg', kind: 'award' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0020',
|
||||
date: '2022-06',
|
||||
precision: 'month',
|
||||
kind: 'event',
|
||||
title: 'First in-person rally since 2019',
|
||||
blurb: 'Sixty-one people, most of whom had only ever met on a video call.',
|
||||
featured: true,
|
||||
ref: { kind: 'event', id: 'return-rally-2022' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0021',
|
||||
date: '2021-08',
|
||||
precision: 'month',
|
||||
kind: 'event',
|
||||
title: 'Online Summer Intensive',
|
||||
meta: 'Six sessions across two weeks',
|
||||
ref: { kind: 'event', id: 'online-intensive-2021' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0022',
|
||||
date: '2020-03',
|
||||
precision: 'month',
|
||||
kind: 'milestone',
|
||||
title: 'All gatherings suspended',
|
||||
blurb: 'Weekly online rooms started the following week and ran for 118 weeks.',
|
||||
},
|
||||
|
||||
// ——— 2010s ———
|
||||
{
|
||||
id: 'tl-0030',
|
||||
date: '2018-05',
|
||||
precision: 'month',
|
||||
kind: 'organization',
|
||||
title: 'Eighth region recognized',
|
||||
featured: true,
|
||||
ref: { kind: 'organization', id: 'northwest', orgKind: 'region' },
|
||||
logo: { file: 'northwest.svg', kind: 'organization' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0031',
|
||||
date: '2018-07-20',
|
||||
precision: 'day',
|
||||
kind: 'event',
|
||||
title: 'Summer Conference',
|
||||
ref: { kind: 'event', id: 'summer-2018' },
|
||||
logo: { file: 'summer-conference.svg', kind: 'event' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0032',
|
||||
date: '2016-02',
|
||||
precision: 'month',
|
||||
kind: 'people',
|
||||
title: 'Retreat Team formed',
|
||||
blurb:
|
||||
'Programming had been whoever volunteered. This made it a standing team with a handoff.',
|
||||
ref: { kind: 'team', id: 'ngu-retreat-team' },
|
||||
team: { id: 'ngu-retreat-team', name: 'Retreat Team', orgId: 'ngu', orgName: 'NGU National' },
|
||||
people: [
|
||||
{ id: 'marcus-hale', name: 'Marcus Hale', title: 'Founding lead', photo: 'marcus-hale.jpg' },
|
||||
{ id: 'priya-nair', name: 'Priya Nair', photo: 'priya-nair.jpg' },
|
||||
],
|
||||
},
|
||||
{
|
||||
id: 'tl-0033',
|
||||
date: '2015-07',
|
||||
precision: 'month',
|
||||
kind: 'award',
|
||||
title: 'First Service Award presented',
|
||||
blurb: 'Created to name the work that had been going unnamed for a decade.',
|
||||
featured: true,
|
||||
ref: { kind: 'award', id: 'service' },
|
||||
logo: { file: 'service-award.svg', kind: 'award' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0034',
|
||||
date: '2015-02',
|
||||
precision: 'month',
|
||||
kind: 'milestone',
|
||||
title: 'Shared calendar goes live',
|
||||
blurb: 'Regions stop scheduling on top of each other.',
|
||||
},
|
||||
{
|
||||
id: 'tl-0035',
|
||||
date: '2012-06',
|
||||
precision: 'month',
|
||||
kind: 'event',
|
||||
title: 'Summer Conference',
|
||||
meta: 'The year attendance first passed 100',
|
||||
ref: { kind: 'event', id: 'summer-2012' },
|
||||
logo: { file: 'summer-conference.svg', kind: 'event' },
|
||||
},
|
||||
{
|
||||
id: 'tl-0036',
|
||||
date: '2012',
|
||||
precision: 'year',
|
||||
kind: 'milestone',
|
||||
title: 'Adopted the name Next Generation of Unity',
|
||||
},
|
||||
|
||||
// ——— 2000s ———
|
||||
{
|
||||
id: 'tl-0040',
|
||||
date: '2009',
|
||||
precision: 'year',
|
||||
kind: 'milestone',
|
||||
title: 'Four regions drawn on a map for the first time',
|
||||
},
|
||||
{
|
||||
id: 'tl-0041',
|
||||
date: '2005-08',
|
||||
precision: 'month',
|
||||
kind: 'milestone',
|
||||
title: 'The gathering becomes annual',
|
||||
blurb: 'Before this it happened when someone had the energy to organize it.',
|
||||
featured: true,
|
||||
},
|
||||
{
|
||||
id: 'tl-0042',
|
||||
date: '2002-08',
|
||||
precision: 'month',
|
||||
kind: 'event',
|
||||
title: 'First young adult retreat',
|
||||
meta: 'Nineteen attendees',
|
||||
blurb:
|
||||
'Organized over six weeks at a borrowed retreat center. Everything else on this page follows from it.',
|
||||
featured: true,
|
||||
ref: { kind: 'event', id: 'first-retreat-2002' },
|
||||
},
|
||||
|
||||
// ——— Pre-program ———
|
||||
{
|
||||
id: 'tl-0050',
|
||||
date: '1997',
|
||||
precision: 'year',
|
||||
kind: 'milestone',
|
||||
title: 'Regional youth programs running independently',
|
||||
blurb:
|
||||
'Not NGU, and not connected to each other — but the people who started NGU came out of these.',
|
||||
},
|
||||
]
|
||||
21
src/data/organizations.d.ts
vendored
21
src/data/organizations.d.ts
vendored
|
|
@ -1,21 +0,0 @@
|
|||
/* Types for organizations.js. Rows are GET /organizations as
|
||||
shapeOrganization in server/src/routes/content.js sends them. */
|
||||
|
||||
import type { OrgKind } from "../lib/hrefs.ts";
|
||||
import type { OrganizationListItem, RegionArea } from "../lib/useContent.ts";
|
||||
|
||||
export declare function useOrganizations(kind?: OrgKind): {
|
||||
organizations: OrganizationListItem[];
|
||||
loading: boolean;
|
||||
error: Error | null;
|
||||
};
|
||||
|
||||
export declare function orgPath(
|
||||
org: { id: string; kind?: string | null } | null | undefined,
|
||||
): string | null;
|
||||
|
||||
export declare function areasSentence(
|
||||
areas?: Array<Pick<RegionArea, "area_code" | "note">>,
|
||||
): string;
|
||||
|
||||
export declare function initialsFor(name?: string): string;
|
||||
|
|
@ -32,7 +32,7 @@ export function useOrganizations(kind) {
|
|||
? `/organizations?kind=${encodeURIComponent(kind)}`
|
||||
: "/organizations";
|
||||
|
||||
const { data, error, loading } = useResource(path);
|
||||
const { data, error, loading } = useResource(path, { fallback: EMPTY });
|
||||
|
||||
return {
|
||||
organizations: data?.organizations ?? [],
|
||||
|
|
|
|||
123
src/lib/adminSchema.d.ts
vendored
123
src/lib/adminSchema.d.ts
vendored
|
|
@ -1,123 +0,0 @@
|
|||
/* Types for adminSchema.js: the client half of the descriptor-driven
|
||||
admin CRUD engine. Rows are whatever columns the server-side
|
||||
descriptor in server/src/admin-schema.js declares, so they stay a
|
||||
string-keyed record; the descriptors are what's fixed. */
|
||||
|
||||
/** A row from /api/admin/:entity or /:entity/:id. Nested paths
|
||||
* ('region.scope') are side-table objects under their key, and
|
||||
* child collections are arrays of rows under theirs. */
|
||||
export type AdminRow = Record<string, unknown>;
|
||||
|
||||
/** One row of an OPTION_QUERIES result. `kind` and `org_id` ride
|
||||
* along on the lists that filterBy narrows. */
|
||||
export type AdminOption = {
|
||||
id: string;
|
||||
label: string;
|
||||
kind?: string;
|
||||
org_id?: string | null;
|
||||
};
|
||||
|
||||
/** GET /api/admin/options, keyed by OPTION_QUERIES name. */
|
||||
export type AdminOptions = Record<string, AdminOption[]>;
|
||||
|
||||
export type FieldWidget =
|
||||
| "text"
|
||||
| "textarea"
|
||||
| "select"
|
||||
| "checkbox"
|
||||
| "color"
|
||||
| "number"
|
||||
| "date"
|
||||
| "time";
|
||||
|
||||
/** A bare value, or [value, label]. */
|
||||
export type SelectOption = string | readonly [string, string];
|
||||
|
||||
/** Show a group or collection only when another field has this value. */
|
||||
export type FieldCondition = { path: string; value: unknown };
|
||||
|
||||
export type AdminFieldSpec = {
|
||||
path: string;
|
||||
label: string;
|
||||
widget?: FieldWidget;
|
||||
required?: boolean;
|
||||
full?: boolean;
|
||||
help?: string;
|
||||
options?: readonly SelectOption[];
|
||||
optionsFrom?: string;
|
||||
blankLabel?: string;
|
||||
filterBy?: (option: AdminOption, row: AdminRow) => boolean;
|
||||
/* Set by EntityEdit on the id field rather than in a manifest. */
|
||||
readOnly?: boolean;
|
||||
prefix?: string;
|
||||
prefixPending?: boolean;
|
||||
placeholder?: string;
|
||||
};
|
||||
|
||||
export type FieldGroupSpec = {
|
||||
legend: string;
|
||||
note?: string;
|
||||
when?: FieldCondition;
|
||||
fields: AdminFieldSpec[];
|
||||
};
|
||||
|
||||
export type CollectionSpec = {
|
||||
key: string;
|
||||
label: string;
|
||||
addLabel?: string;
|
||||
note?: string;
|
||||
when?: FieldCondition;
|
||||
title?: (row: AdminRow, options: AdminOptions | null | undefined) => string;
|
||||
blank: AdminRow;
|
||||
fields: AdminFieldSpec[];
|
||||
children?: CollectionSpec[];
|
||||
};
|
||||
|
||||
export type ListColumn = {
|
||||
key: string;
|
||||
label: string;
|
||||
primary?: boolean;
|
||||
widget?: "bool";
|
||||
};
|
||||
|
||||
export type ListFilter = {
|
||||
key: string;
|
||||
label: string;
|
||||
options?: readonly SelectOption[];
|
||||
optionsFrom?: string;
|
||||
};
|
||||
|
||||
export type EntitySpec = {
|
||||
key: string;
|
||||
label: string;
|
||||
singular: string;
|
||||
idLabel: string;
|
||||
/** "auto": the table assigns the id, so the form shows it rather than asking. */
|
||||
idKind?: "auto";
|
||||
/** The one id a singleton entity has. The list opens it directly,
|
||||
* and the editor offers no slug, back link or delete. */
|
||||
singleton?: string;
|
||||
/** Field(s) the slug is composed from. Absent when idKind is "auto". */
|
||||
slugFrom?: string | string[];
|
||||
titleFrom?: string;
|
||||
list: { columns: ListColumn[]; filters: ListFilter[] };
|
||||
groups: FieldGroupSpec[];
|
||||
children?: CollectionSpec[];
|
||||
};
|
||||
|
||||
export type AdminEntityKey =
|
||||
| "organizations"
|
||||
| "events"
|
||||
| "people"
|
||||
| "teams"
|
||||
| "awards"
|
||||
| "timeline"
|
||||
| "front_page";
|
||||
|
||||
/* Indexed by route param as often as by name, so any other string
|
||||
reads as possibly missing. */
|
||||
export declare const ADMIN_ENTITIES: { readonly [K in AdminEntityKey]: EntitySpec } & {
|
||||
readonly [key: string]: EntitySpec | undefined;
|
||||
};
|
||||
|
||||
export declare function slugify(value: unknown): string;
|
||||
|
|
@ -48,78 +48,6 @@ const AFFILIATION_ROLE_FIELDS = [
|
|||
{ path: "is_public", label: "Public", widget: "checkbox" },
|
||||
];
|
||||
|
||||
/* The timeline panel that appears on an event or organization once the
|
||||
box is ticked. Paths are prefixed with the extension key, exactly as
|
||||
'region.scope' and 'private.notes' are.
|
||||
|
||||
Everything here is an override. Left blank, the history page falls
|
||||
back to the record's own title, date and logo through v_timeline —
|
||||
which is the point of referencing rather than copying. */
|
||||
const timelineExtensionFields = (noun) => [
|
||||
{
|
||||
path: "timeline.occurred_on",
|
||||
label: "Date on the timeline",
|
||||
help: `Blank uses the ${noun}'s own date. Partial dates are fine: 2012, 2012-06`,
|
||||
},
|
||||
{
|
||||
path: "timeline.precision",
|
||||
label: "Date precision",
|
||||
widget: "select",
|
||||
options: ["year", "month", "day"],
|
||||
help: "How much of the date to trust. 'year' files it under 'Elsewhere in 2012'",
|
||||
},
|
||||
{
|
||||
path: "timeline.title",
|
||||
label: "Title override",
|
||||
full: true,
|
||||
help: `Blank uses the ${noun}'s name`,
|
||||
},
|
||||
{
|
||||
path: "timeline.blurb",
|
||||
label: "Blurb override",
|
||||
widget: "textarea",
|
||||
full: true,
|
||||
help: `Blank uses the ${noun}'s tagline`,
|
||||
},
|
||||
{ path: "timeline.meta", label: "Secondary line", help: "Region, venue, recipient" },
|
||||
{
|
||||
path: "timeline.link_url",
|
||||
label: "Link override",
|
||||
help: `Blank links to the ${noun}'s own page`,
|
||||
},
|
||||
{
|
||||
path: "timeline.is_featured",
|
||||
label: "Featured",
|
||||
widget: "checkbox",
|
||||
help: "Shown large, above the month list for its year",
|
||||
},
|
||||
{ path: "timeline.is_published", label: "Visible on the history page", widget: "checkbox" },
|
||||
{ path: "timeline.sort_order", label: "Sort order", widget: "number" },
|
||||
];
|
||||
|
||||
/* The checkbox itself, plus the panel it gates. One entry in `groups`. */
|
||||
const timelineGroup = (noun) => ({
|
||||
legend: "Timeline",
|
||||
note:
|
||||
`Adds this ${noun} to the history page. Nothing is copied — the entry ` +
|
||||
`reads this record, so editing it here updates the timeline too.`,
|
||||
fields: [
|
||||
{
|
||||
path: "in_timeline",
|
||||
label: "On the timeline",
|
||||
widget: "checkbox",
|
||||
help: "Show this on the history page",
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
const timelineDetailGroup = (noun) => ({
|
||||
legend: "Timeline entry",
|
||||
when: { path: "in_timeline", value: 1 },
|
||||
note: "Every field here is optional. Blank means \u201cuse the record's own value\u201d.",
|
||||
fields: timelineExtensionFields(noun),
|
||||
});
|
||||
|
||||
/* The two collections every entity carries. */
|
||||
const linksChild = {
|
||||
key: "links",
|
||||
|
|
@ -141,43 +69,6 @@ const linksChild = {
|
|||
],
|
||||
};
|
||||
|
||||
/* Hosts. One row is one host, ordered, and each is either an
|
||||
organization or a person — never both, which the CHECK on
|
||||
event_hosts enforces and this form can only ask nicely about.
|
||||
|
||||
The first row supplies the logo and colour when the event sets
|
||||
neither, so the order here is data rather than a display choice.
|
||||
A person supplies neither: there is no colour on a person and a
|
||||
headshot is not a logo, so a person-hosted event with no colour
|
||||
of its own falls through to the section default. */
|
||||
const hostsChild = {
|
||||
key: "event_hosts",
|
||||
label: "Hosts",
|
||||
addLabel: "Add host",
|
||||
title: (row, options) =>
|
||||
options?.organizations?.find((o) => o.id === row.org_id)?.label ??
|
||||
options?.people?.find((p) => p.id === row.person_id)?.label ??
|
||||
"New host",
|
||||
blank: { org_id: "", person_id: "" },
|
||||
fields: [
|
||||
{
|
||||
path: "org_id",
|
||||
label: "Organization",
|
||||
widget: "select",
|
||||
optionsFrom: "organizations",
|
||||
blankLabel: "— none —",
|
||||
},
|
||||
{
|
||||
path: "person_id",
|
||||
label: "Person",
|
||||
widget: "select",
|
||||
optionsFrom: "people",
|
||||
blankLabel: "— none —",
|
||||
help: "One or the other, not both. First host supplies the logo and colour.",
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const blocksChild = {
|
||||
key: "content_blocks",
|
||||
label: "Content blocks",
|
||||
|
|
@ -293,8 +184,6 @@ const organizations = {
|
|||
],
|
||||
},
|
||||
{ legend: "Place", fields: PLACE_FIELDS },
|
||||
timelineGroup("organization"),
|
||||
timelineDetailGroup("organization"),
|
||||
{ legend: "Publishing", fields: PUBLISH_FIELDS },
|
||||
],
|
||||
|
||||
|
|
@ -326,62 +215,6 @@ const organizations = {
|
|||
|
||||
/* ── Events ──────────────────────────────────────────────────── */
|
||||
|
||||
/* The panel the Series checkbox opens. Starts and Ends above stay
|
||||
the series' bounds — the first meeting and the last day it can
|
||||
meet — so nothing here repeats them. */
|
||||
const SERIES_WEEKDAYS = [
|
||||
["sun", "Sunday"],
|
||||
["mon", "Monday"],
|
||||
["tue", "Tuesday"],
|
||||
["wed", "Wednesday"],
|
||||
["thu", "Thursday"],
|
||||
["fri", "Friday"],
|
||||
["sat", "Saturday"],
|
||||
];
|
||||
|
||||
const seriesGroup = {
|
||||
legend: "Series",
|
||||
when: { path: "is_series", value: 1 },
|
||||
note:
|
||||
"Starts is the first meeting and anchors the schedule; Ends, if set, is the last " +
|
||||
"day it can meet. The weekdays only apply to a weekly series; with none ticked it " +
|
||||
"meets on the start date's day. Leave Date label blank and the site describes " +
|
||||
"the schedule itself.",
|
||||
fields: [
|
||||
{
|
||||
path: "series_frequency",
|
||||
label: "Repeats",
|
||||
widget: "select",
|
||||
options: [
|
||||
["weekly", "Weekly, on the days ticked below"],
|
||||
["monthly_date", "Monthly, on the start date's day (the 13th)"],
|
||||
["monthly_weekday", "Monthly, on the start date's weekday (2nd Tuesday)"],
|
||||
],
|
||||
blankLabel: "— weekly —",
|
||||
},
|
||||
{
|
||||
path: "series_interval",
|
||||
label: "Every",
|
||||
widget: "number",
|
||||
help: "1 for every week or month, 2 for every other, and so on",
|
||||
},
|
||||
{ path: "series_start_time", label: "Start time", widget: "time" },
|
||||
{ path: "series_end_time", label: "End time", widget: "time" },
|
||||
{
|
||||
path: "series_count",
|
||||
label: "Number of meetings",
|
||||
widget: "number",
|
||||
help: "Stops after this many. Blank to run until Ends, or indefinitely",
|
||||
},
|
||||
...SERIES_WEEKDAYS.map(([day, name]) => ({
|
||||
path: `series_${day}`,
|
||||
label: name,
|
||||
widget: "checkbox",
|
||||
help: `Meets on ${name}s`,
|
||||
})),
|
||||
],
|
||||
};
|
||||
|
||||
const events = {
|
||||
key: "events",
|
||||
label: "Events",
|
||||
|
|
@ -392,19 +225,13 @@ const events = {
|
|||
list: {
|
||||
columns: [
|
||||
{ key: "title", label: "Title", primary: true },
|
||||
{ key: "section_id", label: "Scope" },
|
||||
{ key: "event_type", label: "Type" },
|
||||
{ key: "section_id", label: "Section" },
|
||||
{ key: "date_label", label: "Dates" },
|
||||
{ key: "status", label: "Status" },
|
||||
{ key: "is_published", label: "Live", widget: "bool" },
|
||||
],
|
||||
filters: [
|
||||
{ key: "section_id", label: "Scope", optionsFrom: "event_sections" },
|
||||
{
|
||||
key: "event_type",
|
||||
label: "Type",
|
||||
options: ["retreat", "class", "workshop", "meeting", "other"],
|
||||
},
|
||||
{ key: "section_id", label: "Section", optionsFrom: "event_sections" },
|
||||
{ key: "status", label: "Status", options: ["upcoming", "past", "cancelled"] },
|
||||
{ key: "is_published", label: "Published", options: [["1", "Live"], ["0", "Hidden"]] },
|
||||
],
|
||||
|
|
@ -414,25 +241,20 @@ const events = {
|
|||
{
|
||||
legend: "Identity",
|
||||
fields: [
|
||||
// The column is still section_id — the rows in event_sections
|
||||
// are what changed, not the schema. Only the label moved,
|
||||
// because "scope" is what the field has always meant and
|
||||
// "section" described where it happened to be rendered.
|
||||
{
|
||||
path: "section_id",
|
||||
label: "Scope",
|
||||
label: "Section",
|
||||
widget: "select",
|
||||
optionsFrom: "event_sections",
|
||||
required: true,
|
||||
help: "Whose gathering this is. Only national, regional and partner appear on the Retreats page",
|
||||
},
|
||||
{
|
||||
path: "event_type",
|
||||
label: "Type",
|
||||
path: "host_org_id",
|
||||
label: "Host",
|
||||
widget: "select",
|
||||
options: ["retreat", "class", "workshop", "meeting", "other"],
|
||||
required: true,
|
||||
help: "What kind of gathering. Independent of the scope",
|
||||
optionsFrom: "organizations",
|
||||
blankLabel: "— none —",
|
||||
help: "Supplies the logo and colour when this event sets neither",
|
||||
},
|
||||
{ path: "title", label: "Title", required: true },
|
||||
{ path: "theme", label: "Theme" },
|
||||
|
|
@ -456,15 +278,8 @@ const events = {
|
|||
options: ["upcoming", "past", "cancelled"],
|
||||
blankLabel: "— derive from end date —",
|
||||
},
|
||||
{
|
||||
path: "is_series",
|
||||
label: "Series",
|
||||
widget: "checkbox",
|
||||
help: "Repeats on a schedule — a weekly class, a monthly meeting",
|
||||
},
|
||||
],
|
||||
},
|
||||
seriesGroup,
|
||||
{ legend: "Where", fields: PLACE_FIELDS },
|
||||
{
|
||||
legend: "Appearance",
|
||||
|
|
@ -475,13 +290,10 @@ const events = {
|
|||
{ path: "gradient", label: "Gradient", full: true },
|
||||
],
|
||||
},
|
||||
timelineGroup("event"),
|
||||
timelineDetailGroup("event"),
|
||||
{ legend: "Publishing", fields: PUBLISH_FIELDS },
|
||||
],
|
||||
|
||||
children: [
|
||||
hostsChild,
|
||||
{
|
||||
key: "event_people",
|
||||
label: "People at this event",
|
||||
|
|
@ -788,355 +600,7 @@ const awards = {
|
|||
],
|
||||
};
|
||||
|
||||
/* ── Timeline ─────────────────────────────────────────── */
|
||||
|
||||
// The only entity with no slug: the table assigns the id, because an
|
||||
// entry referencing an event has no name of its own and one gets
|
||||
// created every time somebody ticks a checkbox. `idKind: "auto"` tells
|
||||
// EntityEdit to show the id rather than ask for it.
|
||||
//
|
||||
// Most rows here are created from an event or organization page, not
|
||||
// this one. What this page is for: hand-authored milestones with no
|
||||
// record behind them, 'people' entries about a team forming, and fixing
|
||||
// up the entries the checkboxes made.
|
||||
const timeline = {
|
||||
key: "timeline",
|
||||
label: "Timeline",
|
||||
singular: "entry",
|
||||
idLabel: "Entry",
|
||||
idKind: "auto",
|
||||
titleFrom: "title",
|
||||
|
||||
list: {
|
||||
columns: [
|
||||
{ key: "title", label: "Title", primary: true },
|
||||
{ key: "occurred_on", label: "Date" },
|
||||
{ key: "kind", label: "Kind" },
|
||||
{ key: "ref_id", label: "References" },
|
||||
{ key: "is_featured", label: "Featured", widget: "bool" },
|
||||
{ key: "is_published", label: "Live", widget: "bool" },
|
||||
],
|
||||
filters: [
|
||||
{
|
||||
key: "kind",
|
||||
label: "Kind",
|
||||
options: ["milestone", "event", "organization", "award", "people"],
|
||||
},
|
||||
{
|
||||
key: "ref_kind",
|
||||
label: "References",
|
||||
options: ["event", "organization", "award", "person", "team"],
|
||||
},
|
||||
{ key: "is_featured", label: "Featured", options: [["1", "Featured"], ["0", "Normal"]] },
|
||||
{ key: "is_published", label: "Published", options: [["1", "Live"], ["0", "Hidden"]] },
|
||||
],
|
||||
},
|
||||
|
||||
groups: [
|
||||
{
|
||||
legend: "What this is",
|
||||
note:
|
||||
"An entry either points at a record or stands on its own. " +
|
||||
"Pointing at one means its title, date and logo come from that " +
|
||||
"record \u2014 nothing is copied, so editing the record updates this.",
|
||||
fields: [
|
||||
{
|
||||
path: "kind",
|
||||
label: "Kind",
|
||||
widget: "select",
|
||||
options: ["milestone", "event", "organization", "award", "people"],
|
||||
required: true,
|
||||
help: "Drives the marker and the layout. 'people' renders a roster",
|
||||
},
|
||||
{
|
||||
path: "ref_kind",
|
||||
label: "Points at",
|
||||
widget: "select",
|
||||
options: ["event", "organization", "award", "person", "team"],
|
||||
blankLabel: "\u2014 nothing, this stands alone \u2014",
|
||||
help: "Changing this leaves the record below orphaned \u2014 pick a new one",
|
||||
},
|
||||
{
|
||||
path: "ref_id",
|
||||
label: "Record",
|
||||
widget: "select",
|
||||
optionsFrom: "timeline_refs",
|
||||
blankLabel: "\u2014 none \u2014",
|
||||
// One flat list of every referenceable row, narrowed to the
|
||||
// kind chosen above. Five dropdowns of which four are always
|
||||
// wrong would be worse.
|
||||
filterBy: (option, row) => option.kind === row.ref_kind,
|
||||
help: "Only records of the kind chosen above",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
legend: "When",
|
||||
note:
|
||||
"Blank takes the referenced record's own date. Precision is what " +
|
||||
"says how much of the date to believe \u2014 a backfilled entry that " +
|
||||
"only knows the year should say so.",
|
||||
fields: [
|
||||
{
|
||||
path: "occurred_on",
|
||||
label: "Date",
|
||||
help: "2012, 2012-06 or 2012-06-14",
|
||||
},
|
||||
{
|
||||
path: "precision",
|
||||
label: "Precision",
|
||||
widget: "select",
|
||||
options: ["year", "month", "day"],
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
legend: "Text",
|
||||
note: "All optional. Blank uses the referenced record's own wording.",
|
||||
fields: [
|
||||
{ path: "title", label: "Title", full: true },
|
||||
{ path: "blurb", label: "Blurb", widget: "textarea", full: true },
|
||||
{ path: "meta", label: "Secondary line", help: "Region, venue, recipient" },
|
||||
{ path: "link_url", label: "Link", help: "Blank links to the record's own page" },
|
||||
],
|
||||
},
|
||||
{
|
||||
legend: "Publishing",
|
||||
fields: [
|
||||
{
|
||||
path: "is_featured",
|
||||
label: "Featured",
|
||||
widget: "checkbox",
|
||||
help: "Shown large, above the month list for its year",
|
||||
},
|
||||
{ path: "is_published", label: "Published", widget: "checkbox" },
|
||||
{ path: "sort_order", label: "Sort order", widget: "number" },
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
children: [
|
||||
{
|
||||
key: "people",
|
||||
label: "People",
|
||||
addLabel: "Add person",
|
||||
note:
|
||||
"For an entry about people. A 'people' entry pointing at a team " +
|
||||
"already shows that team's members \u2014 this is for the cases where " +
|
||||
"the list is editorial rather than structural.",
|
||||
title: (row, options) =>
|
||||
options?.people?.find((p) => p.id === row.person_id)?.label ?? "New person",
|
||||
blank: { person_id: "" },
|
||||
fields: [
|
||||
{
|
||||
path: "person_id",
|
||||
label: "Person",
|
||||
widget: "select",
|
||||
optionsFrom: "people",
|
||||
required: true,
|
||||
},
|
||||
{ path: "note", label: "Note", help: "Founding lead, first chair" },
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
/* ── Front page ──────────────────────────────────────────────────
|
||||
|
||||
One record (see the singleton note in server/src/admin-schema.js).
|
||||
The groups are the hero; the collections below are the rest of
|
||||
the page. Photos and the livestream are editable whatever the
|
||||
mode, so either can be ready before the switch is flipped.
|
||||
|
||||
Section keys and stat sources are the CHECK lists in migrations
|
||||
017 and 019. The labels here are what the admin reads; the values are
|
||||
what the page and the API key on. */
|
||||
|
||||
const FRONT_PAGE_SECTIONS = [
|
||||
["countdown", "Countdown to the next event"],
|
||||
["retreats", "National Retreats carousel"],
|
||||
["calendar", "Event calendar"],
|
||||
["stats", "Numbers"],
|
||||
["timeline", "Featured timeline"],
|
||||
["connect", "Find your way in"],
|
||||
];
|
||||
|
||||
const STAT_SOURCES = [
|
||||
["manual", "Typed in — shows Value"],
|
||||
["years_since", "Years since — Value is the year"],
|
||||
["regions", "Count: published regions"],
|
||||
["chapters", "Count: published chapters"],
|
||||
["partners", "Count: published partners"],
|
||||
["events_held", "Count: past events"],
|
||||
["retreats_held", "Count: past retreats"],
|
||||
["people", "Count: published people"],
|
||||
["awards_given", "Count: public awards given"],
|
||||
];
|
||||
|
||||
const frontPage = {
|
||||
key: "front_page",
|
||||
label: "Front page",
|
||||
singular: "front page",
|
||||
idLabel: "Page",
|
||||
singleton: "home",
|
||||
|
||||
list: { columns: [], filters: [] },
|
||||
|
||||
groups: [
|
||||
{
|
||||
legend: "Hero",
|
||||
note: "The first thing a visitor sees. Blank buttons don't render.",
|
||||
fields: [
|
||||
{
|
||||
path: "hero_mode",
|
||||
label: "Mode",
|
||||
widget: "select",
|
||||
options: [
|
||||
["brand", "Brand — animated colour, no media"],
|
||||
["photos", "Photos — cycles through the photos below"],
|
||||
["livestream", "Livestream — embeds the stream with a LIVE badge"],
|
||||
],
|
||||
blankLabel: "— brand —",
|
||||
help: "Switch to Livestream when you go live, and back when you're done",
|
||||
},
|
||||
{ path: "eyebrow", label: "Eyebrow", help: "Small line above the headline" },
|
||||
{ path: "headline", label: "Headline", full: true },
|
||||
{ path: "subhead", label: "Subhead", widget: "textarea", full: true },
|
||||
{ path: "primary_label", label: "Main button label" },
|
||||
{ path: "primary_url", label: "Main button link", help: "/retreats, #connect or a full URL" },
|
||||
{ path: "secondary_label", label: "Second button label" },
|
||||
{ path: "secondary_url", label: "Second button link" },
|
||||
],
|
||||
},
|
||||
{
|
||||
legend: "Photos and livestream",
|
||||
fields: [
|
||||
{
|
||||
path: "slide_seconds",
|
||||
label: "Seconds per photo",
|
||||
widget: "number",
|
||||
help: "Photos mode. 3 to 60",
|
||||
},
|
||||
{
|
||||
path: "livestream_url",
|
||||
label: "Livestream link",
|
||||
full: true,
|
||||
help: "A YouTube, Facebook or Vimeo link, or any embed URL",
|
||||
},
|
||||
{ path: "livestream_title", label: "Livestream title", full: true },
|
||||
],
|
||||
},
|
||||
{
|
||||
legend: "Countdown",
|
||||
fields: [
|
||||
{
|
||||
path: "countdown_event_id",
|
||||
label: "Count down to",
|
||||
widget: "select",
|
||||
optionsFrom: "events",
|
||||
blankLabel: "— the next upcoming event —",
|
||||
help: "Leave blank almost always. A pinned event that's over falls back to the next one",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
children: [
|
||||
{
|
||||
key: "sections",
|
||||
label: "Page sections",
|
||||
note: "Drag to reorder. Each section can appear once; leave one out to drop it.",
|
||||
addLabel: "Add section",
|
||||
title: (row) =>
|
||||
FRONT_PAGE_SECTIONS.find(([key]) => key === row.section)?.[1] ?? "New section",
|
||||
blank: { section: "", title: "", blurb: "" },
|
||||
fields: [
|
||||
{
|
||||
path: "section",
|
||||
label: "Section",
|
||||
widget: "select",
|
||||
options: FRONT_PAGE_SECTIONS,
|
||||
required: true,
|
||||
},
|
||||
{ path: "title", label: "Heading", help: "Blank for the section's own" },
|
||||
{ path: "blurb", label: "Blurb", full: true },
|
||||
{ path: "is_hidden", label: "Hidden", widget: "checkbox", help: "Hide for now" },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: "slides",
|
||||
label: "Hero photos",
|
||||
note: "Shown in Photos mode, in this order.",
|
||||
addLabel: "Add photo",
|
||||
title: (row) => row.caption || row.media || "New photo",
|
||||
blank: { media: "", alt: "", caption: "" },
|
||||
fields: [
|
||||
{ path: "media", label: "Photo", required: true, help: "Filename in public/front-page/, or a URL" },
|
||||
{ path: "alt", label: "Description", help: "For screen readers" },
|
||||
{ path: "caption", label: "Caption", full: true },
|
||||
{ path: "link_url", label: "Link", help: "Optional; makes the caption a link" },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: "stats",
|
||||
label: "Numbers",
|
||||
note: "Counts update themselves. A typed-in number with no value is left out.",
|
||||
addLabel: "Add number",
|
||||
title: (row) => row.label || "New number",
|
||||
blank: { label: "", source: "", value: "" },
|
||||
fields: [
|
||||
{ path: "label", label: "Label", required: true },
|
||||
{
|
||||
path: "source",
|
||||
label: "Where it comes from",
|
||||
widget: "select",
|
||||
options: STAT_SOURCES,
|
||||
blankLabel: "— typed in —",
|
||||
},
|
||||
{ path: "value", label: "Value", help: "Typed in: the number. Years since: the year" },
|
||||
{ path: "suffix", label: "Suffix", help: "+, k, % …" },
|
||||
{ path: "note", label: "Note", full: true },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: "paths",
|
||||
label: "Find your way in",
|
||||
note: "Each path is a choice a visitor can pick; its actions appear when they do.",
|
||||
addLabel: "Add path",
|
||||
title: (row) => [row.icon, row.label].filter(Boolean).join(" ") || "New path",
|
||||
blank: { label: "", icon: "", blurb: "" },
|
||||
fields: [
|
||||
{ path: "label", label: "Label", required: true, help: "Attend, Serve…" },
|
||||
{ path: "icon", label: "Icon", help: "One emoji" },
|
||||
{ path: "blurb", label: "Blurb", full: true },
|
||||
],
|
||||
children: [
|
||||
{
|
||||
key: "actions",
|
||||
label: "Actions",
|
||||
addLabel: "Add action",
|
||||
title: (row) => row.label || "New action",
|
||||
blank: { label: "", url: "" },
|
||||
fields: [
|
||||
{ path: "label", label: "Label", required: true },
|
||||
{ path: "url", label: "Link", required: true },
|
||||
{ path: "description", label: "Description", full: true },
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
export const ADMIN_ENTITIES = {
|
||||
organizations,
|
||||
events,
|
||||
people,
|
||||
teams,
|
||||
awards,
|
||||
timeline,
|
||||
front_page: frontPage,
|
||||
};
|
||||
export const ADMIN_ENTITIES = { organizations, events, people, teams, awards };
|
||||
|
||||
export function slugify(value) {
|
||||
return String(value ?? "")
|
||||
|
|
|
|||
|
|
@ -14,14 +14,12 @@
|
|||
|
||||
import { createContext, useContext, useEffect } from "react";
|
||||
|
||||
export type AdminTitleValue = { setDetail: (value: string | null) => void };
|
||||
|
||||
export const AdminTitleContext = createContext<AdminTitleValue | null>(null);
|
||||
export const AdminTitleContext = createContext(null);
|
||||
|
||||
/* Publish the name of whatever this page is showing. Clears on
|
||||
unmount, so navigating away can't leave a stale record name in
|
||||
the tab. */
|
||||
export function useAdminDetail(name: string | null | undefined) {
|
||||
export function useAdminDetail(name) {
|
||||
const setDetail = useContext(AdminTitleContext)?.setDetail;
|
||||
|
||||
useEffect(() => {
|
||||
|
|
|
|||
26
src/lib/api.d.ts
vendored
26
src/lib/api.d.ts
vendored
|
|
@ -1,26 +0,0 @@
|
|||
/* Types for api.js. The response type is the caller's to name:
|
||||
every endpoint sends a different body, so get<T> defaults to
|
||||
unknown rather than pretending to know. */
|
||||
|
||||
/** Per-field messages, as admin-crud.js and feedback.js send them. */
|
||||
export type FieldErrors = Record<string, string>;
|
||||
|
||||
export declare class ApiError extends Error {
|
||||
status?: number;
|
||||
fields?: FieldErrors;
|
||||
constructor(message: string, options?: { status?: number; fields?: FieldErrors });
|
||||
}
|
||||
|
||||
export declare function get<T = unknown>(
|
||||
path: string,
|
||||
options?: { ttl?: number; fallback?: T },
|
||||
): Promise<T>;
|
||||
|
||||
export declare function invalidate(path?: string): void;
|
||||
|
||||
export declare function post<T = unknown>(path: string, data: unknown): Promise<T>;
|
||||
|
||||
export declare function patch<T = unknown>(path: string, data: unknown): Promise<T>;
|
||||
|
||||
/* A 204 comes back as null. */
|
||||
export declare function del<T = null>(path: string): Promise<T>;
|
||||
|
|
@ -13,40 +13,21 @@
|
|||
staring at an empty table.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { createContext, useCallback, useContext, useEffect, useState, type ReactNode } from "react";
|
||||
import { createContext, useCallback, useContext, useEffect, useState } from "react";
|
||||
import { Navigate, Outlet, useLocation } from "react-router-dom";
|
||||
|
||||
import { get, post, ApiError } from "./api.js";
|
||||
import type { Role } from "./roles.ts";
|
||||
|
||||
/* What currentUser() in server/src/auth.js returns, and what
|
||||
/auth/me and /auth/login send under `user`. */
|
||||
export type AdminUser = {
|
||||
id: number;
|
||||
email: string;
|
||||
name: string | null;
|
||||
role: Role;
|
||||
};
|
||||
const AuthContext = createContext(null);
|
||||
|
||||
type AuthResponse = { user: AdminUser };
|
||||
|
||||
type AuthValue = {
|
||||
user: AdminUser | null;
|
||||
loading: boolean;
|
||||
login: (email: string, password: string) => Promise<AdminUser>;
|
||||
logout: () => Promise<void>;
|
||||
};
|
||||
|
||||
const AuthContext = createContext<AuthValue | null>(null);
|
||||
|
||||
export function AuthProvider({ children }: { children: ReactNode }) {
|
||||
const [user, setUser] = useState<AdminUser | null>(null);
|
||||
export function AuthProvider({ children }) {
|
||||
const [user, setUser] = useState(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
let ignore = false;
|
||||
|
||||
get<AuthResponse>("/auth/me", { ttl: 0 })
|
||||
get("/auth/me", { ttl: 0 })
|
||||
.then((data) => {
|
||||
if (!ignore) setUser(data.user);
|
||||
})
|
||||
|
|
@ -62,8 +43,8 @@ export function AuthProvider({ children }: { children: ReactNode }) {
|
|||
};
|
||||
}, []);
|
||||
|
||||
const login = useCallback(async (email: string, password: string) => {
|
||||
const data = await post<AuthResponse>("/auth/login", { email, password });
|
||||
const login = useCallback(async (email, password) => {
|
||||
const data = await post("/auth/login", { email, password });
|
||||
setUser(data.user);
|
||||
return data.user;
|
||||
}, []);
|
||||
|
|
@ -92,7 +73,7 @@ export function useAuth() {
|
|||
|
||||
/* Signals a session that ended while the page was open — the
|
||||
admin pages call this when a request comes back 401. */
|
||||
export function isUnauthorized(error: unknown): boolean {
|
||||
export function isUnauthorized(error) {
|
||||
return error instanceof ApiError && error.status === 401;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
EMBEDS
|
||||
|
||||
Turns the link an admin pastes into the URL an <iframe> can
|
||||
load. People paste the page they're looking at — a YouTube watch
|
||||
or live link, a Facebook video, a Vimeo page — not the embed
|
||||
form, so those are recognised and rewritten. Anything else that
|
||||
is https is assumed to already be an embed URL and passed
|
||||
through; anything that isn't https is refused, so the hero never
|
||||
frames a plain-http or javascript: URL.
|
||||
|
||||
Streams start muted: browsers only autoplay muted video, and a
|
||||
hero that starts shouting is worse than one that asks.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
function youtubeId(url: URL): string | null {
|
||||
const host = url.hostname.replace(/^www\.|^m\./, '')
|
||||
if (host === 'youtu.be') return url.pathname.slice(1) || null
|
||||
if (host !== 'youtube.com' && host !== 'youtube-nocookie.com') return null
|
||||
|
||||
const v = url.searchParams.get('v')
|
||||
if (v) return v
|
||||
|
||||
// /live/ID, /embed/ID, /shorts/ID
|
||||
const match = url.pathname.match(/^\/(?:live|embed|shorts)\/([\w-]+)/)
|
||||
return match?.[1] ?? null
|
||||
}
|
||||
|
||||
/** An iframe src for a pasted stream link, or null if it can't be framed. */
|
||||
export function livestreamEmbedUrl(raw?: string | null): string | null {
|
||||
if (!raw) return null
|
||||
|
||||
let url: URL
|
||||
try {
|
||||
url = new URL(raw.trim())
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
if (url.protocol !== 'https:') return null
|
||||
|
||||
const yt = youtubeId(url)
|
||||
if (yt) {
|
||||
return `https://www.youtube-nocookie.com/embed/${encodeURIComponent(yt)}?autoplay=1&mute=1&playsinline=1`
|
||||
}
|
||||
|
||||
const host = url.hostname.replace(/^www\./, '')
|
||||
|
||||
if (host === 'vimeo.com') {
|
||||
const id = url.pathname.match(/^\/(?:event\/)?(\d+)/)?.[1]
|
||||
if (id) {
|
||||
return url.pathname.startsWith('/event/')
|
||||
? `https://vimeo.com/event/${id}/embed?autoplay=1&muted=1`
|
||||
: `https://player.vimeo.com/video/${id}?autoplay=1&muted=1`
|
||||
}
|
||||
}
|
||||
|
||||
if ((host === 'facebook.com' || host === 'fb.watch') && !url.pathname.startsWith('/plugins/')) {
|
||||
return `https://www.facebook.com/plugins/video.php?href=${encodeURIComponent(url.href)}&autoplay=1&mute=1`
|
||||
}
|
||||
|
||||
return url.href
|
||||
}
|
||||
|
|
@ -1,292 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
EVENT SERIES
|
||||
|
||||
An event with is_series set meets on a schedule rather than once.
|
||||
The API sends the schedule as-is (shapeSeries in content.js); this
|
||||
file is the one place that turns it into words and dates, so the
|
||||
cards and the detail page can't describe the same series two ways.
|
||||
|
||||
Occurrences are derived, never stored. starts_on is the first
|
||||
meeting and the anchor: it fixes which weeks an every-other-week
|
||||
series is "on", which day a monthly one keeps, and the weekday
|
||||
when none is ticked. ends_on, when set, is the last day it can
|
||||
meet; count, when set, stops it after that many meetings.
|
||||
|
||||
Dates are 'YYYY-MM-DD' and are handled as UTC midnights so that
|
||||
stepping a day never lands on a DST gap. They are calendar dates,
|
||||
not instants — nothing here converts timezones.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
export type SeriesFrequency = 'weekly' | 'monthly_date' | 'monthly_weekday'
|
||||
|
||||
export type SeriesWeekday = 'sun' | 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat'
|
||||
|
||||
export type EventSeries = {
|
||||
frequency: SeriesFrequency
|
||||
interval: number
|
||||
/** Ticked days, Sunday first. Empty means starts_on's weekday. */
|
||||
weekdays: SeriesWeekday[]
|
||||
/** 'HH:MM', 24-hour. */
|
||||
start_time?: string | null
|
||||
end_time?: string | null
|
||||
count?: number | null
|
||||
}
|
||||
|
||||
/** How many upcoming meetings the event page lists. */
|
||||
export const SERIES_UPCOMING_SHOWN = 6
|
||||
|
||||
/* Past this many meetings the walk stops, whatever the schedule
|
||||
says. Twenty years of a daily-ish weekly series is well inside
|
||||
it; an open-ended series with a start date decades back is what
|
||||
it's for. */
|
||||
const MAX_OCCURRENCES = 5000
|
||||
|
||||
/* Index is Date#getUTCDay. */
|
||||
const WEEKDAYS: SeriesWeekday[] = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
|
||||
const WEEKDAY_NAMES = [
|
||||
'Sunday',
|
||||
'Monday',
|
||||
'Tuesday',
|
||||
'Wednesday',
|
||||
'Thursday',
|
||||
'Friday',
|
||||
'Saturday',
|
||||
]
|
||||
|
||||
const DAY_MS = 86_400_000
|
||||
|
||||
/* ── Dates ───────────────────────────────────────────────────── */
|
||||
|
||||
function parseDate(value?: string | null): Date | null {
|
||||
if (!value || !/^\d{4}-\d{2}-\d{2}$/.test(value)) return null
|
||||
const date = new Date(`${value}T00:00:00Z`)
|
||||
return Number.isNaN(date.getTime()) ? null : date
|
||||
}
|
||||
|
||||
const isoDate = (date: Date) => date.toISOString().slice(0, 10)
|
||||
|
||||
/* The viewer's today, as a calendar date. */
|
||||
function today(): string {
|
||||
const now = new Date()
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
return `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())}`
|
||||
}
|
||||
|
||||
const daysInMonth = (year: number, month: number) =>
|
||||
new Date(Date.UTC(year, month + 1, 0)).getUTCDate()
|
||||
|
||||
/* 1st–4th, or 5 for a date in the month's fifth week, which the
|
||||
schedule treats as "last" — every month has a last Tuesday, not
|
||||
every month has a fifth. */
|
||||
const weekOfMonth = (date: Date) => Math.ceil(date.getUTCDate() / 7)
|
||||
|
||||
function nthWeekday(year: number, month: number, weekday: number, nth: number): Date {
|
||||
if (nth >= 5) {
|
||||
const last = new Date(Date.UTC(year, month, daysInMonth(year, month)))
|
||||
const back = (last.getUTCDay() - weekday + 7) % 7
|
||||
return new Date(last.getTime() - back * DAY_MS)
|
||||
}
|
||||
const first = new Date(Date.UTC(year, month, 1))
|
||||
const ahead = (weekday - first.getUTCDay() + 7) % 7
|
||||
return new Date(Date.UTC(year, month, 1 + ahead + (nth - 1) * 7))
|
||||
}
|
||||
|
||||
/* ── Occurrences ─────────────────────────────────────────────── */
|
||||
|
||||
/* Every meeting date in schedule order, lazily, bounded by ends_on,
|
||||
count and MAX_OCCURRENCES. */
|
||||
function* occurrences(
|
||||
series: EventSeries,
|
||||
startsOn?: string | null,
|
||||
endsOn?: string | null,
|
||||
): Generator<string> {
|
||||
const start = parseDate(startsOn)
|
||||
if (!start) return
|
||||
|
||||
const end = parseDate(endsOn)
|
||||
const limit = Math.min(series.count ?? MAX_OCCURRENCES, MAX_OCCURRENCES)
|
||||
const interval = Math.max(1, series.interval || 1)
|
||||
let emitted = 0
|
||||
|
||||
const within = (date: Date) => !end || date.getTime() <= end.getTime()
|
||||
|
||||
if (series.frequency === 'weekly') {
|
||||
const days = new Set(
|
||||
series.weekdays.length
|
||||
? series.weekdays.map((day) => WEEKDAYS.indexOf(day))
|
||||
: [start.getUTCDay()],
|
||||
)
|
||||
// Weeks run Sunday to Saturday and are numbered from the one
|
||||
// starts_on falls in, so "every 2 weeks" means that week, the
|
||||
// week after next, and so on.
|
||||
const weekZero = start.getTime() - start.getUTCDay() * DAY_MS
|
||||
|
||||
for (let t = start.getTime(); emitted < limit; t += DAY_MS) {
|
||||
const date = new Date(t)
|
||||
if (!within(date)) return
|
||||
const week = Math.floor((t - weekZero) / (7 * DAY_MS))
|
||||
if (week % interval === 0 && days.has(date.getUTCDay())) {
|
||||
yield isoDate(date)
|
||||
emitted += 1
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const year = start.getUTCFullYear()
|
||||
const month = start.getUTCMonth()
|
||||
const day = start.getUTCDate()
|
||||
const weekday = start.getUTCDay()
|
||||
const nth = weekOfMonth(start)
|
||||
|
||||
for (let step = 0; emitted < limit; step += 1) {
|
||||
const offset = month + step * interval
|
||||
const y = year + Math.floor(offset / 12)
|
||||
const m = offset % 12
|
||||
const date =
|
||||
series.frequency === 'monthly_weekday'
|
||||
? nthWeekday(y, m, weekday, nth)
|
||||
: new Date(Date.UTC(y, m, Math.min(day, daysInMonth(y, m))))
|
||||
if (!within(date)) return
|
||||
yield isoDate(date)
|
||||
emitted += 1
|
||||
}
|
||||
}
|
||||
|
||||
/** The next meetings from today on, soonest first. */
|
||||
export function upcomingOccurrences(
|
||||
series: EventSeries | null | undefined,
|
||||
startsOn?: string | null,
|
||||
endsOn?: string | null,
|
||||
limit = SERIES_UPCOMING_SHOWN,
|
||||
): string[] {
|
||||
if (!series) return []
|
||||
const from = today()
|
||||
const out: string[] = []
|
||||
for (const date of occurrences(series, startsOn, endsOn)) {
|
||||
if (date < from) continue
|
||||
out.push(date)
|
||||
if (out.length >= limit) break
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/** Every meeting between two dates, inclusive, in order. For a
|
||||
* calendar page: `from` and `to` are the visible range. */
|
||||
export function occurrencesBetween(
|
||||
series: EventSeries | null | undefined,
|
||||
startsOn: string | null | undefined,
|
||||
endsOn: string | null | undefined,
|
||||
from: string,
|
||||
to: string,
|
||||
): string[] {
|
||||
if (!series) return []
|
||||
const out: string[] = []
|
||||
for (const date of occurrences(series, startsOn, endsOn)) {
|
||||
if (date > to) break
|
||||
if (date >= from) out.push(date)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/** The first meeting on or after `from`, or null if the series has
|
||||
* ended by then. */
|
||||
export function firstOccurrenceFrom(
|
||||
series: EventSeries | null | undefined,
|
||||
startsOn: string | null | undefined,
|
||||
endsOn: string | null | undefined,
|
||||
from: string,
|
||||
): string | null {
|
||||
if (!series) return null
|
||||
for (const date of occurrences(series, startsOn, endsOn)) {
|
||||
if (date >= from) return date
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
/* ── Words ───────────────────────────────────────────────────── */
|
||||
|
||||
const ORDINALS = ['', '1st', '2nd', '3rd', '4th', 'last']
|
||||
|
||||
function ordinalDay(n: number): string {
|
||||
const tens = n % 100
|
||||
if (tens >= 11 && tens <= 13) return `${n}th`
|
||||
return `${n}${['th', 'st', 'nd', 'rd'][n % 10] ?? 'th'}`
|
||||
}
|
||||
|
||||
function joinWords(words: string[]): string {
|
||||
if (words.length <= 1) return words[0] ?? ''
|
||||
return `${words.slice(0, -1).join(', ')} and ${words[words.length - 1]}`
|
||||
}
|
||||
|
||||
function clock(value?: string | null): string | null {
|
||||
const match = value?.match(/^(\d{2}):(\d{2})$/)
|
||||
if (!match) return null
|
||||
const date = new Date(Date.UTC(2000, 0, 1, Number(match[1]), Number(match[2])))
|
||||
return date.toLocaleTimeString(undefined, {
|
||||
hour: 'numeric',
|
||||
minute: '2-digit',
|
||||
timeZone: 'UTC',
|
||||
})
|
||||
}
|
||||
|
||||
/** "7:00 PM – 8:30 PM", "7:00 PM", or null. */
|
||||
export function seriesTimes(series: EventSeries | null | undefined): string | null {
|
||||
if (!series) return null
|
||||
const from = clock(series.start_time)
|
||||
const to = clock(series.end_time)
|
||||
if (from && to) return `${from} – ${to}`
|
||||
return from ?? to
|
||||
}
|
||||
|
||||
/**
|
||||
* "Every Tuesday and Thursday, 7:00 PM – 8:30 PM",
|
||||
* "Every 2 weeks on Monday", "Monthly on the 2nd Tuesday",
|
||||
* "Every 3 months on the 13th". Null for a one-off event, or a
|
||||
* series with no start date to anchor it.
|
||||
*/
|
||||
export function seriesLabel(
|
||||
series: EventSeries | null | undefined,
|
||||
startsOn?: string | null,
|
||||
): string | null {
|
||||
const start = parseDate(startsOn)
|
||||
if (!series || !start) return null
|
||||
|
||||
const interval = Math.max(1, series.interval || 1)
|
||||
let pattern: string
|
||||
|
||||
if (series.frequency === 'weekly') {
|
||||
const days = series.weekdays.length
|
||||
? series.weekdays.map((day) => WEEKDAY_NAMES[WEEKDAYS.indexOf(day)])
|
||||
: [WEEKDAY_NAMES[start.getUTCDay()]]
|
||||
pattern =
|
||||
interval === 1
|
||||
? `Every ${joinWords(days)}`
|
||||
: `Every ${interval === 2 ? 'other week' : `${interval} weeks`} on ${joinWords(days)}`
|
||||
} else {
|
||||
const on =
|
||||
series.frequency === 'monthly_weekday'
|
||||
? `the ${ORDINALS[weekOfMonth(start)]} ${WEEKDAY_NAMES[start.getUTCDay()]}`
|
||||
: `the ${ordinalDay(start.getUTCDate())}`
|
||||
pattern =
|
||||
interval === 1
|
||||
? `Monthly on ${on}`
|
||||
: `Every ${interval === 2 ? 'other month' : `${interval} months`} on ${on}`
|
||||
}
|
||||
|
||||
const times = seriesTimes(series)
|
||||
return times ? `${pattern}, ${times}` : pattern
|
||||
}
|
||||
|
||||
/** '2026-10-13' → 'Tue, Oct 13, 2026'. */
|
||||
export function occurrenceLabel(date: string): string {
|
||||
const parsed = parseDate(date)
|
||||
if (!parsed) return date
|
||||
return parsed.toLocaleDateString(undefined, {
|
||||
weekday: 'short',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
year: 'numeric',
|
||||
timeZone: 'UTC',
|
||||
})
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
EVENT TYPES
|
||||
|
||||
The client half of the CHECK on events.event_type. Order here is
|
||||
display order — the filter chips read it straight off this array,
|
||||
so moving a line moves a chip.
|
||||
|
||||
What this is not: event_sections. A section owns presentation —
|
||||
Retreats.tsx keys its title, accent and background on the id, so
|
||||
an unrecognised section_id makes an event vanish with no error,
|
||||
which is why that one is a real table with a real foreign key. A
|
||||
type carries no presentation of its own and an unknown value
|
||||
renders as its own name, so a CHECK is enough.
|
||||
|
||||
Adding a type is three edits: the CHECK in a migration, the enum
|
||||
in both descriptor halves, and this list. Adding it here alone
|
||||
means the site offers a filter the database will refuse to store.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
export type EventType = 'retreat' | 'class' | 'workshop' | 'meeting' | 'other'
|
||||
|
||||
export const EVENT_TYPES: { id: EventType; label: string; plural: string }[] = [
|
||||
{ id: 'retreat', label: 'Retreat', plural: 'Retreats' },
|
||||
{ id: 'class', label: 'Class', plural: 'Classes' },
|
||||
{ id: 'workshop', label: 'Workshop', plural: 'Workshops' },
|
||||
{ id: 'meeting', label: 'Meeting', plural: 'Meetings' },
|
||||
{ id: 'other', label: 'Other', plural: 'Other' },
|
||||
]
|
||||
|
||||
export const EVENT_TYPE_IDS: EventType[] = EVENT_TYPES.map((entry) => entry.id)
|
||||
|
||||
const BY_ID = new Map<string, { label: string; plural: string }>(
|
||||
EVENT_TYPES.map((entry) => [entry.id as string, entry]),
|
||||
)
|
||||
|
||||
const capitalize = (word: string) =>
|
||||
word ? word.charAt(0).toUpperCase() + word.slice(1) : ''
|
||||
|
||||
/* A value the CHECK has gained since this file was written renders
|
||||
as itself rather than vanishing — the same rule EventDetail's
|
||||
ROLE_ORDER follows for billing roles. */
|
||||
export const eventTypeLabel = (id?: string | null): string =>
|
||||
(id ? BY_ID.get(id)?.label : null) ?? capitalize(id ?? '')
|
||||
|
||||
export const eventTypePlural = (id?: string | null): string =>
|
||||
(id ? BY_ID.get(id)?.plural : null) ?? capitalize(id ?? '')
|
||||
174
src/lib/hrefs.ts
174
src/lib/hrefs.ts
|
|
@ -1,174 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
PUBLIC HREFS
|
||||
|
||||
One place that turns a record into a URL. The API deliberately
|
||||
never sends paths — it sends `{ kind, id }` and, for an
|
||||
organization, the `org_kind` that decides which of the three
|
||||
routes a slug belongs to. Deciding that in each component is how
|
||||
/regions/x and /chapters/x end up both existing for the same
|
||||
record, and how the history timeline ended up emitting /event/:id
|
||||
while the router only knew /retreats/:id.
|
||||
|
||||
timelineRefs.ts now delegates here rather than keeping its own
|
||||
table, so there is one answer to "where does an event live" and
|
||||
changing it is changing EVENT_BASE below.
|
||||
|
||||
navConfig.js stays the source of truth for the *nav*: these are
|
||||
record routes, which never appear in it.
|
||||
|
||||
── On missing ids ──
|
||||
Every builder takes an id the caller believed it had. When it
|
||||
doesn't, the old behaviour was to interpolate the string
|
||||
"undefined" into a path, render a link to it, mount a page and
|
||||
fetch /api/organizations/undefined — four steps between the
|
||||
mistake and any sign of it, none of which name the component
|
||||
that made it.
|
||||
|
||||
Now the id is checked here. In dev that's a console.error with a
|
||||
stack trace pointing at the caller; in production the path still
|
||||
comes out, because a broken link beats a crashed page, and
|
||||
useResource refuses to fetch it.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
export type OrgKind = 'national' | 'region' | 'chapter' | 'partner'
|
||||
export type RefKind = 'event' | 'organization' | 'team' | 'award' | 'person'
|
||||
|
||||
/* A region, a chapter and a partner read as different things to a
|
||||
visitor even though they are one table, so they get one route
|
||||
each. 'national' is NGU itself — one record, no listing to sit
|
||||
under, so it falls through to the generic path. */
|
||||
const ORG_BASE: Record<string, string> = {
|
||||
region: '/regions',
|
||||
chapter: '/chapters',
|
||||
partner: '/partners',
|
||||
national: '/organizations',
|
||||
}
|
||||
|
||||
/** Canonical base for an event page.
|
||||
*
|
||||
* /events/:id, not /retreats/:id. The listing page is called
|
||||
* Retreats because that's what NGU calls the gatherings it hosts,
|
||||
* but the records are `events`, the API route is /api/events, and
|
||||
* plenty of them — partner events, conferences — aren't retreats
|
||||
* at all. Naming the record route after one page's editorial
|
||||
* framing would have been wrong the first time a non-retreat got
|
||||
* its own page.
|
||||
*
|
||||
* Nothing redirects from /retreats/:id, because nothing ever
|
||||
* linked there. */
|
||||
export const EVENT_BASE = '/events'
|
||||
|
||||
const DEV = Boolean((import.meta as any)?.env?.DEV)
|
||||
|
||||
/* Router params arrive as strings, so an id that has already been
|
||||
through a template literal shows up as the literal word. Those
|
||||
are as broken as a genuine null. */
|
||||
const BAD = new Set(['', 'undefined', 'null', 'NaN'])
|
||||
|
||||
export const isBadId = (id: unknown): boolean =>
|
||||
id == null || BAD.has(String(id))
|
||||
|
||||
function checkId(id: unknown, what: string): string {
|
||||
if (!isBadId(id)) return String(id)
|
||||
|
||||
if (DEV) {
|
||||
// console.error rather than warn: this is always a bug, and the
|
||||
// stack is the whole point — it names the component that passed
|
||||
// nothing.
|
||||
console.error(
|
||||
`hrefs: ${what}() was given ${JSON.stringify(id)}. ` +
|
||||
`The link it returns will 404. Caller:`,
|
||||
new Error('hrefs: missing id').stack,
|
||||
)
|
||||
}
|
||||
|
||||
return 'undefined'
|
||||
}
|
||||
|
||||
/**
|
||||
* The API path for one record, or null when the id isn't usable.
|
||||
*
|
||||
* The mirror image of the builders below: they make the URL a
|
||||
* visitor sees, this makes the URL the client fetches, and both
|
||||
* have to agree about what counts as an id.
|
||||
*
|
||||
* It lives here rather than next to the hook that calls it because
|
||||
* it is a path, and paths are this file's job — and because a
|
||||
* component that interpolates a missing route param produces the
|
||||
* literal string "undefined", which the server cannot tell apart
|
||||
* from a slug somebody genuinely typed. It answers 404 either way,
|
||||
* and the log fills with GET /api/organizations/undefined with
|
||||
* nothing to say where it came from.
|
||||
*
|
||||
* Returning null costs a round trip and turns a mystery 404 into
|
||||
* the not-found page, which is what a visitor should see anyway.
|
||||
*/
|
||||
export function detailPath(base: string, id?: string | null): string | null {
|
||||
return isBadId(id) ? null : `${base}/${encodeURIComponent(String(id))}`
|
||||
}
|
||||
|
||||
export const eventHref = (id?: string | null) =>
|
||||
`${EVENT_BASE}/${checkId(id, 'eventHref')}`
|
||||
|
||||
export const teamHref = (id?: string | null) => `/teams/${checkId(id, 'teamHref')}`
|
||||
|
||||
export const awardHref = (id?: string | null) => `/awards/${checkId(id, 'awardHref')}`
|
||||
|
||||
export const personHref = (id?: string | null) => `/people/${checkId(id, 'personHref')}`
|
||||
|
||||
export function orgHref(id?: string | null, kind?: string | null): string {
|
||||
return `${ORG_BASE[kind ?? ''] ?? '/organizations'}/${checkId(id, 'orgHref')}`
|
||||
}
|
||||
|
||||
/* For anything holding a polymorphic reference — timeline entries,
|
||||
content blocks — where the kind arrives as data rather than being
|
||||
known at the call site.
|
||||
|
||||
Returns null for a kind with no page AND for a reference with no
|
||||
id, so the caller renders plain text instead of a dead link.
|
||||
This is the one the timeline wants: an entry whose ref didn't
|
||||
resolve should read as text, not as a link to nowhere. */
|
||||
export function refHref(
|
||||
kind: string | null | undefined,
|
||||
id: string | null | undefined,
|
||||
orgKind?: string | null,
|
||||
): string | null {
|
||||
if (!kind || isBadId(id)) return null
|
||||
switch (kind) {
|
||||
case 'event':
|
||||
return eventHref(id)
|
||||
case 'organization':
|
||||
return orgHref(id, orgKind)
|
||||
case 'team':
|
||||
return teamHref(id)
|
||||
case 'award':
|
||||
return awardHref(id)
|
||||
case 'person':
|
||||
return personHref(id)
|
||||
default:
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
/* What to call the kind in a breadcrumb or a back link. */
|
||||
export const ORG_KIND_LABEL: Record<string, string> = {
|
||||
national: 'Next Generation of Unity',
|
||||
region: 'Region',
|
||||
chapter: 'Chapter',
|
||||
partner: 'Partner organization',
|
||||
}
|
||||
|
||||
/* Where "back" goes from a record page. A chapter belongs to
|
||||
/community, a retreat to /retreats. */
|
||||
export function orgListHref(kind?: string | null): { to: string; label: string } {
|
||||
switch (kind) {
|
||||
case 'region':
|
||||
return { to: '/community#local', label: 'All regions' }
|
||||
case 'chapter':
|
||||
return { to: '/community#local', label: 'All chapters' }
|
||||
case 'partner':
|
||||
return { to: '/community#partners', label: 'All partner organizations' }
|
||||
default:
|
||||
return { to: '/community', label: 'Community' }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
MEDIA PATHS
|
||||
|
||||
Every image field in the API is a bare filename — "where the
|
||||
images live is the component's business", as history.js puts it.
|
||||
This is that business, in one file, so moving a directory is one
|
||||
edit rather than a grep.
|
||||
|
||||
⚠ Only two of these directories are confirmed by the admin help
|
||||
text: people/ and event-logos/. The other three are a guess at
|
||||
your convention. Check public/ and fix them here — nothing else
|
||||
references the paths.
|
||||
|
||||
A value that already looks like a path or a URL is returned
|
||||
untouched, so a hand-written entry can point anywhere.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
const ABSOLUTE = /^(https?:|\/|data:)/
|
||||
|
||||
function inDir(dir: string) {
|
||||
return (file?: string | null): string | null => {
|
||||
if (!file) return null
|
||||
if (ABSOLUTE.test(file)) return file
|
||||
return `${dir}/${file}`
|
||||
}
|
||||
}
|
||||
|
||||
export const personPhoto = inDir('/people') // confirmed
|
||||
export const eventLogo = inDir('/event-logos') // confirmed
|
||||
export const orgLogo = inDir('/org-logos') // ⚠ guess
|
||||
export const teamLogo = inDir('/team-logos') // ⚠ guess
|
||||
export const awardLogo = inDir('/award-logos') // ⚠ guess
|
||||
|
||||
/* front_page_slides.media — the home page hero's photos. New with
|
||||
the Front page editor, which names the directory in its help. */
|
||||
export const heroPhoto = inDir('/front-page')
|
||||
|
||||
/* content_blocks.media, which can be an image on any owner's page,
|
||||
so it can't share a per-entity directory. */
|
||||
export const blockMedia = inDir('/media') // ⚠ guess
|
||||
|
||||
/* ── By record kind ────────────────────────────────────────────
|
||||
The timeline sends `logo: { file, kind }` rather than a path,
|
||||
because v_timeline COALESCEs across five tables and only the
|
||||
ref_kind says which one the filename came from.
|
||||
|
||||
⚠ Three of these directories are the guesses above. Your current
|
||||
timelineRefs.ts already has the real ones — timeline logos render
|
||||
today — so copy them into the map above and delete this note.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
|
||||
const BY_KIND: Record<string, (file?: string | null) => string | null> = {
|
||||
event: eventLogo,
|
||||
organization: orgLogo,
|
||||
team: teamLogo,
|
||||
award: awardLogo,
|
||||
person: personPhoto,
|
||||
}
|
||||
|
||||
export function logoForKind(
|
||||
kind?: string | null,
|
||||
file?: string | null,
|
||||
): string | null {
|
||||
if (!file) return null
|
||||
// An unrecognised kind still renders: a filename with no home
|
||||
// directory is a bug, but a broken <img> says so louder than a
|
||||
// silently absent one.
|
||||
return (BY_KIND[kind ?? ''] ?? blockMedia)(file)
|
||||
}
|
||||
|
||||
/* Initials for a photo that is missing or fails to load. Same
|
||||
two-word rule PeopleTiles uses. */
|
||||
export function initials(name = ''): string {
|
||||
return name
|
||||
.trim()
|
||||
.split(/\s+/)
|
||||
.slice(0, 2)
|
||||
.map((word) => word[0] || '')
|
||||
.join('')
|
||||
.toUpperCase()
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
ROLES — src/lib/roles.ts
|
||||
|
||||
The same ladder as server/src/auth.js, and it has to stay the
|
||||
same ladder. This copy exists to decide what to draw; the
|
||||
server's copy decides what's allowed. If they ever disagree the
|
||||
worst case is a button that 403s, which is the right way round
|
||||
for them to fail.
|
||||
|
||||
Components should ask canDelete(user), not
|
||||
user.role === "admin". The second form is what silently locked
|
||||
superadmins out of saving when the third role went in: an
|
||||
equality check against a ladder is a bug waiting for the next
|
||||
role to be added, and there's now a fourth.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
export const ROLES = ["viewer", "editor", "admin", "superadmin"] as const;
|
||||
|
||||
export type Role = (typeof ROLES)[number];
|
||||
|
||||
export const ROLE_RANK: Record<Role, number> = {
|
||||
viewer: 1,
|
||||
editor: 2,
|
||||
admin: 3,
|
||||
superadmin: 4,
|
||||
};
|
||||
|
||||
export const ROLE_LABELS: Record<Role, string> = {
|
||||
viewer: "Viewer",
|
||||
editor: "Editor",
|
||||
admin: "Admin",
|
||||
superadmin: "Superadmin",
|
||||
};
|
||||
|
||||
/* Each line is what that role adds to the one above it in the
|
||||
list. Read top to bottom, they describe the whole ladder. */
|
||||
export const ROLE_NOTES: Record<Role, string> = {
|
||||
viewer: "Can read everything in the CMS and change nothing.",
|
||||
editor: "Can create and update records. Can't delete anything.",
|
||||
admin: "Can delete records, including feedback.",
|
||||
superadmin: "Can manage accounts, roles and sessions.",
|
||||
};
|
||||
|
||||
type MaybeUser = { role?: string | null } | null | undefined;
|
||||
|
||||
/* Minimum, not equality: a superadmin passes atLeast(user, "editor"). */
|
||||
export function atLeast(user: MaybeUser, role: Role): boolean {
|
||||
const have = ROLE_RANK[(user?.role ?? "") as Role] ?? 0;
|
||||
return have >= ROLE_RANK[role];
|
||||
}
|
||||
|
||||
/* Named for the capability rather than the rank, so call sites
|
||||
read as intent and a future reshuffle of the ladder is one edit
|
||||
here rather than a search for every comparison. */
|
||||
export const canWrite = (user: MaybeUser) => atLeast(user, "editor");
|
||||
export const canDelete = (user: MaybeUser) => atLeast(user, "admin");
|
||||
export const isSuper = (user: MaybeUser) => atLeast(user, "superadmin");
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
import { useState, type ComponentType, type ReactNode } from "react";
|
||||
import { useState } from "react";
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════════
|
||||
SECTION MANIFEST
|
||||
|
|
@ -33,69 +33,25 @@ import { useState, type ComponentType, type ReactNode } from "react";
|
|||
want them.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
/* What every section Component is handed on top of its own props. */
|
||||
export type SectionInjected = { accent: string; view?: string };
|
||||
|
||||
export type SectionToggleProps = {
|
||||
view: string;
|
||||
setView: (value: string) => void;
|
||||
accent: string;
|
||||
options: string[];
|
||||
};
|
||||
|
||||
export type SectionViews = {
|
||||
options: string[];
|
||||
default?: string;
|
||||
Toggle: ComponentType<SectionToggleProps>;
|
||||
};
|
||||
|
||||
export type SectionHeading = {
|
||||
id: string;
|
||||
title: string;
|
||||
blurb?: string;
|
||||
accent: string;
|
||||
background: string;
|
||||
};
|
||||
|
||||
export type SectionEntry<P extends object = Record<string, unknown>> = SectionHeading & {
|
||||
Component: ComponentType<P & SectionInjected>;
|
||||
/* The Component decides P; props are checked against it. */
|
||||
props?: NoInfer<P>;
|
||||
views?: SectionViews;
|
||||
};
|
||||
|
||||
/* A manifest mixes components with different props, which no single
|
||||
array element type can check. This checks each entry against its
|
||||
own Component where it's written, then forgets P so the entries
|
||||
fit one array. */
|
||||
export function defineSection<P extends object>(entry: SectionEntry<P>): SectionEntry {
|
||||
return entry as unknown as SectionEntry;
|
||||
}
|
||||
|
||||
export type ManifestSection = SectionHeading & {
|
||||
actions?: ReactNode;
|
||||
content: ReactNode;
|
||||
};
|
||||
|
||||
export function useSectionManifest(manifest: SectionEntry[]): ManifestSection[] {
|
||||
export function useSectionManifest(manifest) {
|
||||
// One entry per section that has a toggle, seeded from its
|
||||
// declared default so the control is right before anything loads.
|
||||
const [views, setViews] = useState<Record<string, string | null>>(() =>
|
||||
const [views, setViews] = useState(() =>
|
||||
Object.fromEntries(
|
||||
manifest
|
||||
.filter(entry => entry.views)
|
||||
.map(entry => [
|
||||
entry.id,
|
||||
entry.views?.default ?? entry.views?.options[0] ?? null,
|
||||
entry.views.default ?? entry.views.options?.[0] ?? null,
|
||||
]),
|
||||
),
|
||||
);
|
||||
|
||||
const setView = (id: string, value: string) => setViews(prev => ({ ...prev, [id]: value }));
|
||||
const setView = (id, value) => setViews(prev => ({ ...prev, [id]: value }));
|
||||
|
||||
return manifest.map(entry => {
|
||||
const { Component, props, views: spec, ...heading } = entry;
|
||||
const view = views[entry.id] ?? undefined;
|
||||
const view = views[entry.id];
|
||||
const Toggle = spec?.Toggle;
|
||||
|
||||
return {
|
||||
|
|
@ -103,7 +59,7 @@ export function useSectionManifest(manifest: SectionEntry[]): ManifestSection[]
|
|||
|
||||
actions: Toggle ? (
|
||||
<Toggle
|
||||
view={view ?? ""}
|
||||
view={view}
|
||||
setView={value => setView(entry.id, value)}
|
||||
accent={entry.accent}
|
||||
options={spec.options}
|
||||
|
|
|
|||
|
|
@ -1,394 +0,0 @@
|
|||
/**
|
||||
* Timeline types + grouping.
|
||||
*
|
||||
* This is the contract between the future `GET /api/history` route and the
|
||||
* history page.
|
||||
*
|
||||
* ── Reference, don't duplicate ─────────────────────────────────────────
|
||||
* An entry is a *pointer* to a record plus an optional narrative override.
|
||||
* When the admin panel's "add to timeline" button fires on an event, it
|
||||
* writes a row holding the event's id and nothing else; title, logo and
|
||||
* date are read back from `events` at query time. Editing the event
|
||||
* therefore edits the timeline, and there is no second copy to drift.
|
||||
*
|
||||
* Hand-authored entries — "bylaws rewritten", "the gathering becomes
|
||||
* annual" — carry no ref and supply their own title and blurb. An entry
|
||||
* may also do both: reference an event but override its title, for when
|
||||
* the timeline wants to say something the event card doesn't.
|
||||
*
|
||||
* ── What the server resolves, and what it doesn't ──────────────────────
|
||||
* The server resolves *data*: title, date, logo filename, the members of
|
||||
* a referenced team. It does not resolve *routes* or *asset paths* —
|
||||
* those are presentation, and live in `timelineRefs.ts` so React Router
|
||||
* and the public/ layout stay the frontend's business.
|
||||
*/
|
||||
|
||||
import type { OrgKind } from './hrefs.ts'
|
||||
|
||||
export type DatePrecision = 'year' | 'month' | 'day'
|
||||
|
||||
/** What an entry is about. Drives the marker and the body layout. */
|
||||
export type TimelineKind =
|
||||
| 'milestone' // free-standing narrative, no record behind it
|
||||
| 'event'
|
||||
| 'organization'
|
||||
| 'award'
|
||||
| 'people' // a team forming, someone joining one
|
||||
|
||||
/** Tables an entry can point at. Mirrors the polymorphic owner_kind
|
||||
* pattern already used by content_blocks and links. */
|
||||
export type RefKind = 'event' | 'organization' | 'award' | 'person' | 'team'
|
||||
|
||||
export type TimelineRef = {
|
||||
kind: RefKind
|
||||
/** The row's TEXT primary key — an event id, org slug, team slug. */
|
||||
id: string
|
||||
/** Only on organizations: history.js copies v_timeline.org_kind. */
|
||||
orgKind?: OrgKind
|
||||
}
|
||||
|
||||
/** Filename plus the table it came from; the directory is derived
|
||||
* frontend-side, because asset layout is not database business. */
|
||||
export type TimelineLogo = {
|
||||
file: string
|
||||
kind: RefKind
|
||||
}
|
||||
|
||||
/** A person as they appear in a 'people' entry. Resolved server-side,
|
||||
* whether the entry named a team or listed people directly. */
|
||||
export type PersonRef = {
|
||||
id: string
|
||||
name: string
|
||||
/** people.photo — filename only. */
|
||||
photo?: string
|
||||
/** Their affiliation title at the time, if it's worth printing. */
|
||||
title?: string
|
||||
}
|
||||
|
||||
export type TeamRef = {
|
||||
id: string
|
||||
name: string
|
||||
orgId?: string
|
||||
orgName?: string
|
||||
logo?: string
|
||||
}
|
||||
|
||||
export type TimelineItem = {
|
||||
/** The timeline row's own id, not the referenced record's. */
|
||||
id: string
|
||||
/** "2014" | "2014-06" | "2014-06-12" */
|
||||
date: string
|
||||
/** How much of `date` is trustworthy. Authoritative — a backfilled row
|
||||
* may hold a full date while only the year is actually known. */
|
||||
precision: DatePrecision
|
||||
kind: TimelineKind
|
||||
|
||||
/** Falls back to the referenced record's own name when the row has no
|
||||
* title of its own. Resolved server-side. */
|
||||
title: string
|
||||
blurb?: string
|
||||
/** Secondary line: host org, region, venue, recipient. */
|
||||
meta?: string
|
||||
featured?: boolean
|
||||
|
||||
/** The record this points at. Absent for free-standing milestones. */
|
||||
ref?: TimelineRef
|
||||
/** Explicit link override. Absent → derived from `ref`. Every kind can
|
||||
* carry one; event/organization/award fall back to their own page. */
|
||||
href?: string
|
||||
|
||||
logo?: TimelineLogo
|
||||
|
||||
/** kind === 'people': who the entry is about. Populated from the named
|
||||
* team's current members, or from an explicit person list. */
|
||||
people?: PersonRef[]
|
||||
/** Set when the entry named a team rather than loose people. */
|
||||
team?: TeamRef
|
||||
}
|
||||
|
||||
export type DecadeMeta = {
|
||||
/** 2010, 2020, … */
|
||||
decade: number
|
||||
title: string
|
||||
tagline: string
|
||||
blurb?: string
|
||||
/** Renders the ghosted treatment and the "before NGU" marker. */
|
||||
preProgram?: boolean
|
||||
}
|
||||
|
||||
export type GroupedMonth = {
|
||||
month: number
|
||||
label: string
|
||||
items: TimelineItem[]
|
||||
}
|
||||
|
||||
export type GroupedYear = {
|
||||
year: number
|
||||
featured: boolean
|
||||
count: number
|
||||
featuredItems: TimelineItem[]
|
||||
/** Year-precision items — known to be this year, month unknown. */
|
||||
undated: TimelineItem[]
|
||||
months: GroupedMonth[]
|
||||
}
|
||||
|
||||
export type GroupedDecade = DecadeMeta & {
|
||||
years: GroupedYear[]
|
||||
count: number
|
||||
}
|
||||
|
||||
export type SortDirection = 'desc' | 'asc'
|
||||
|
||||
export const MONTH_LABELS = [
|
||||
'January', 'February', 'March', 'April', 'May', 'June',
|
||||
'July', 'August', 'September', 'October', 'November', 'December',
|
||||
]
|
||||
|
||||
export function decadeOf(year: number): number {
|
||||
return Math.floor(year / 10) * 10
|
||||
}
|
||||
|
||||
export function decadeLabel(decade: number): string {
|
||||
return `${decade}s`
|
||||
}
|
||||
|
||||
// ── dates ────────────────────────────────────────────────────────────
|
||||
|
||||
type DateParts = { year: number; month: number | null; day: number | null }
|
||||
|
||||
function parseDate(item: TimelineItem): DateParts {
|
||||
const [y, m, d] = item.date.split('-')
|
||||
const year = Number(y)
|
||||
if (!Number.isFinite(year)) {
|
||||
throw new Error(`Timeline item ${item.id} has an unparseable date: "${item.date}"`)
|
||||
}
|
||||
if (item.precision === 'year') return { year, month: null, day: null }
|
||||
const month = m ? Number(m) : null
|
||||
if (item.precision === 'month') return { year, month, day: null }
|
||||
return { year, month, day: d ? Number(d) : null }
|
||||
}
|
||||
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
|
||||
/**
|
||||
* Start of the item's date window, as a sortable YYYY-MM-DD.
|
||||
*
|
||||
* A year-precision item resolves to 1 January, a month-precision one to
|
||||
* the 1st. That makes "is this still upcoming?" answerable for imprecise
|
||||
* dates in the one way that can't surprise anyone: an entry stops being
|
||||
* upcoming as soon as any part of its window has passed. A row dated
|
||||
* only "2027" is upcoming through the end of 2026 and no longer is on
|
||||
* 1 January 2027, even though its real date may be months away.
|
||||
*/
|
||||
export function windowStart(item: TimelineItem): string {
|
||||
const { year, month, day } = parseDate(item)
|
||||
return `${year}-${pad(month ?? 1)}-${pad(day ?? 1)}`
|
||||
}
|
||||
|
||||
export function todayISO(now: Date = new Date()): string {
|
||||
return `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())}`
|
||||
}
|
||||
|
||||
/**
|
||||
* Split upcoming from recorded, off the wall clock rather than a flag.
|
||||
* Nothing needs flipping when a date passes.
|
||||
*/
|
||||
export function partitionByDate(
|
||||
items: TimelineItem[],
|
||||
now: Date = new Date(),
|
||||
): { upcoming: TimelineItem[]; past: TimelineItem[] } {
|
||||
const today = todayISO(now)
|
||||
const upcoming: TimelineItem[] = []
|
||||
const past: TimelineItem[] = []
|
||||
for (const item of items) {
|
||||
if (windowStart(item) > today) upcoming.push(item)
|
||||
else past.push(item)
|
||||
}
|
||||
return { upcoming, past }
|
||||
}
|
||||
|
||||
// ── grouping ─────────────────────────────────────────────────────────
|
||||
|
||||
function byDay(dir: SortDirection) {
|
||||
return (a: TimelineItem, b: TimelineItem) => {
|
||||
const da = parseDate(a).day
|
||||
const db = parseDate(b).day
|
||||
if (da == null && db == null) return a.title.localeCompare(b.title)
|
||||
if (da == null) return 1
|
||||
if (db == null) return -1
|
||||
return dir === 'desc' ? db - da : da - db
|
||||
}
|
||||
}
|
||||
|
||||
function byFeaturedThenDay(dir: SortDirection) {
|
||||
const day = byDay(dir)
|
||||
return (a: TimelineItem, b: TimelineItem) => {
|
||||
if (!!a.featured !== !!b.featured) return a.featured ? -1 : 1
|
||||
return day(a, b)
|
||||
}
|
||||
}
|
||||
|
||||
export type GroupOptions = {
|
||||
direction?: SortDirection
|
||||
/**
|
||||
* Decades ending before this year get the pre-program treatment even
|
||||
* if the decade row doesn't say so. Lets the gap survive missing
|
||||
* metadata.
|
||||
*/
|
||||
programStartYear?: number
|
||||
/**
|
||||
* Repeat featured items inside their month node as well as in the
|
||||
* featured block. Off by default — in a sparse year it just prints the
|
||||
* same line twice. A month left with nothing but featured items drops
|
||||
* out entirely.
|
||||
*/
|
||||
featuredInMonths?: boolean
|
||||
}
|
||||
|
||||
/** Bucket a flat item list into years. Shared by the main rail and the
|
||||
* upcoming block above it. */
|
||||
export function groupYears(
|
||||
items: TimelineItem[],
|
||||
options: GroupOptions = {},
|
||||
): GroupedYear[] {
|
||||
const direction = options.direction ?? 'desc'
|
||||
const featuredInMonths = options.featuredInMonths ?? false
|
||||
const sign = direction === 'desc' ? -1 : 1
|
||||
|
||||
const yearBuckets = new Map<number, TimelineItem[]>()
|
||||
for (const item of items) {
|
||||
const { year } = parseDate(item)
|
||||
const bucket = yearBuckets.get(year)
|
||||
if (bucket) bucket.push(item)
|
||||
else yearBuckets.set(year, [item])
|
||||
}
|
||||
|
||||
const years: GroupedYear[] = []
|
||||
|
||||
for (const [year, yearItems] of yearBuckets) {
|
||||
const featuredItems: TimelineItem[] = []
|
||||
const undated: TimelineItem[] = []
|
||||
const monthMap = new Map<number, TimelineItem[]>()
|
||||
|
||||
for (const item of yearItems) {
|
||||
if (item.featured) {
|
||||
featuredItems.push(item)
|
||||
if (!featuredInMonths) continue
|
||||
}
|
||||
const { month } = parseDate(item)
|
||||
if (month == null) {
|
||||
undated.push(item)
|
||||
continue
|
||||
}
|
||||
const bucket = monthMap.get(month)
|
||||
if (bucket) bucket.push(item)
|
||||
else monthMap.set(month, [item])
|
||||
}
|
||||
|
||||
const months: GroupedMonth[] = [...monthMap.entries()]
|
||||
.sort((a, b) => sign * (a[0] - b[0]))
|
||||
.map(([month, monthItems]) => ({
|
||||
month,
|
||||
label: MONTH_LABELS[month - 1] ?? `Month ${month}`,
|
||||
items: monthItems.sort(byFeaturedThenDay(direction)),
|
||||
}))
|
||||
|
||||
featuredItems.sort(byDay(direction))
|
||||
undated.sort((a, b) => a.title.localeCompare(b.title))
|
||||
|
||||
years.push({
|
||||
year,
|
||||
featured: featuredItems.length > 0,
|
||||
count: yearItems.length,
|
||||
featuredItems,
|
||||
undated,
|
||||
months,
|
||||
})
|
||||
}
|
||||
|
||||
return years.sort((a, b) => sign * (a.year - b.year))
|
||||
}
|
||||
|
||||
export function groupTimeline(
|
||||
items: TimelineItem[],
|
||||
decades: DecadeMeta[],
|
||||
options: GroupOptions = {},
|
||||
): GroupedDecade[] {
|
||||
const direction = options.direction ?? 'desc'
|
||||
const sign = direction === 'desc' ? -1 : 1
|
||||
const metaByDecade = new Map(decades.map((d) => [d.decade, d]))
|
||||
|
||||
const decadeBuckets = new Map<number, GroupedYear[]>()
|
||||
for (const year of groupYears(items, options)) {
|
||||
const dec = decadeOf(year.year)
|
||||
const bucket = decadeBuckets.get(dec)
|
||||
if (bucket) bucket.push(year)
|
||||
else decadeBuckets.set(dec, [year])
|
||||
}
|
||||
|
||||
// Include decades that have metadata but no items yet, so an authored
|
||||
// "before NGU" decade still renders its marker.
|
||||
for (const meta of decades) {
|
||||
if (!decadeBuckets.has(meta.decade)) decadeBuckets.set(meta.decade, [])
|
||||
}
|
||||
|
||||
return [...decadeBuckets.entries()]
|
||||
.sort((a, b) => sign * (a[0] - b[0]))
|
||||
.map(([decade, years]) => {
|
||||
const meta = metaByDecade.get(decade)
|
||||
const inferredPreProgram =
|
||||
options.programStartYear != null && decade + 9 < options.programStartYear
|
||||
return {
|
||||
decade,
|
||||
title: meta?.title ?? decadeLabel(decade),
|
||||
tagline: meta?.tagline ?? '',
|
||||
blurb: meta?.blurb,
|
||||
preProgram: meta?.preProgram ?? inferredPreProgram,
|
||||
years: years.sort((a, b) => sign * (a.year - b.year)),
|
||||
count: years.reduce((sum, y) => sum + y.count, 0),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert empty year nodes between the first and last year that actually
|
||||
* has data, so sparse decades read as gaps in the record rather than as
|
||||
* a shorter decade. Does not pad beyond the data.
|
||||
*/
|
||||
export function withGapYears(
|
||||
years: GroupedYear[],
|
||||
direction: SortDirection = 'desc',
|
||||
): GroupedYear[] {
|
||||
if (years.length < 2) return years
|
||||
|
||||
const present = new Map(years.map((y) => [y.year, y]))
|
||||
const all = years.map((y) => y.year)
|
||||
const min = Math.min(...all)
|
||||
const max = Math.max(...all)
|
||||
const filled: GroupedYear[] = []
|
||||
|
||||
for (let year = min; year <= max; year += 1) {
|
||||
filled.push(
|
||||
present.get(year) ?? {
|
||||
year,
|
||||
featured: false,
|
||||
count: 0,
|
||||
featuredItems: [],
|
||||
undated: [],
|
||||
months: [],
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
return direction === 'desc' ? filled.reverse() : filled
|
||||
}
|
||||
|
||||
/** Years that should start expanded: the most recent year with featured items. */
|
||||
export function defaultOpenYears(decades: GroupedDecade[]): number[] {
|
||||
for (const decade of decades) {
|
||||
if (decade.preProgram) continue
|
||||
const hit = decade.years.find((y) => y.featured)
|
||||
if (hit) return [hit.year]
|
||||
}
|
||||
return []
|
||||
}
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
TIMELINE REFS
|
||||
|
||||
Turns a timeline item into a destination and an image. Both were
|
||||
answered locally here before, which is how the timeline came to
|
||||
link events at /event/:id while the router only knew about
|
||||
/retreats/:id — two files holding the same opinion, one of them
|
||||
wrong, neither aware of the other.
|
||||
|
||||
Now this file knows about timeline items and nothing else. Where
|
||||
a record lives is hrefs.ts; where an image lives is media.ts.
|
||||
|
||||
── The shape this reads, from history.js ──
|
||||
|
||||
item.href explicit link_url override, may be off-site
|
||||
item.ref { kind, id, orgKind? } — orgKind only on
|
||||
organizations, because only they have it
|
||||
item.logo { file, kind } — v_timeline COALESCEs the
|
||||
filename across five tables, so the kind is
|
||||
what says which directory it came from
|
||||
item.team { id, name, orgId? } on a team ref
|
||||
item.people[] { id, name, photo?, title? }
|
||||
|
||||
Every one of those is optional. An entry is a standalone
|
||||
milestone until proven otherwise, and the two accessors below
|
||||
return null rather than assuming a shape that isn't there —
|
||||
which is the other half of the /organizations/undefined bug:
|
||||
reaching into a ref that wasn't sent yields undefined, and
|
||||
undefined interpolates into a path perfectly happily.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { refHref } from './hrefs.ts'
|
||||
import { logoForKind, personPhoto } from './media.ts'
|
||||
import type { TimelineItem } from './timeline.ts'
|
||||
|
||||
/**
|
||||
* Where this entry points, or null if nowhere.
|
||||
*
|
||||
* An explicit link_url wins: it's the editor deliberately
|
||||
* overriding the record's own page, usually to send someone to an
|
||||
* external write-up. TimelineEntry checks for a scheme and renders
|
||||
* an <a> instead of a <Link>, so this returns it unchanged.
|
||||
*
|
||||
* Otherwise the reference decides, and refHref returns null for a
|
||||
* kind with no page yet ('person', until /people/:id exists) as
|
||||
* well as for a ref that didn't resolve. Null means the entry
|
||||
* renders as a plain <div> — right for a milestone, and right for
|
||||
* a reference that's missing an id, which used to render as a link
|
||||
* to a 404.
|
||||
*/
|
||||
export function hrefFor(item: TimelineItem): string | null {
|
||||
if (item.href) return item.href
|
||||
|
||||
const ref = item.ref
|
||||
if (!ref) return null
|
||||
|
||||
return refHref(ref.kind, ref.id, ref.orgKind)
|
||||
}
|
||||
|
||||
/**
|
||||
* The entry's image, resolved against the directory for whatever
|
||||
* kind of record the filename came from.
|
||||
*/
|
||||
export function logoSrc(item: TimelineItem): string | null {
|
||||
if (!item.logo) return null
|
||||
return logoForKind(item.logo.kind, item.logo.file)
|
||||
}
|
||||
|
||||
/**
|
||||
* A roster member's photo. Same rule as everywhere else — the API
|
||||
* sends a bare filename.
|
||||
*/
|
||||
export function photoSrc(photo?: string | null): string | null {
|
||||
return personPhoto(photo)
|
||||
}
|
||||
|
|
@ -1,338 +0,0 @@
|
|||
/**
|
||||
* The four detail endpoints, typed.
|
||||
*
|
||||
* Adding a fifth is a type and a one-line hook — useRecord owns
|
||||
* the fetching, the caching and the 404.
|
||||
*
|
||||
* An id that is missing — or the literal string "undefined", which
|
||||
* is what a template literal makes of a missing route param — never
|
||||
* reaches the network. detailPath returns null and the hook reports
|
||||
* notFound, which is what the visitor should see anyway, and
|
||||
* hrefs.ts has already logged the component that produced it.
|
||||
*/
|
||||
|
||||
import { detailPath } from './hrefs.ts'
|
||||
import { useRecord, type Resource } from './useRecord.ts'
|
||||
import type { EventType } from './eventTypes.ts'
|
||||
import type { EventSeries } from './eventSeries.ts'
|
||||
|
||||
/* ── Shared shapes ───────────────────────────────────────────── */
|
||||
|
||||
/** A content_blocks row with its `items` child, as shape.js sends it. */
|
||||
export type ContentBlock = {
|
||||
id?: number | string
|
||||
slot?: 'card' | 'body'
|
||||
type:
|
||||
| 'heading'
|
||||
| 'subheading'
|
||||
| 'paragraph'
|
||||
| 'list'
|
||||
| 'links'
|
||||
| 'quote'
|
||||
| 'image'
|
||||
| 'divider'
|
||||
text?: string | null
|
||||
media?: string | null
|
||||
href?: string | null
|
||||
items?: Array<{ text: string; detail?: string | null; url?: string | null }>
|
||||
}
|
||||
|
||||
export type Link = {
|
||||
kind?: string
|
||||
platform?: string | null
|
||||
label: string
|
||||
url: string
|
||||
is_primary?: boolean
|
||||
}
|
||||
|
||||
export type OrgRef = { id: string; name: string; kind?: string | null }
|
||||
|
||||
/* One host of an event. `kind` says which table the id is in;
|
||||
`org_kind` is the region/chapter/partner split that decides an
|
||||
organization's route, and is null for a person. The triple is
|
||||
exactly what refHref() in hrefs.ts takes. */
|
||||
export type EventHost = {
|
||||
kind: 'organization' | 'person'
|
||||
id: string
|
||||
name: string
|
||||
org_kind?: string | null
|
||||
}
|
||||
|
||||
/* ── Events ──────────────────────────────────────────────────── */
|
||||
|
||||
export type EventPerson = {
|
||||
person_id: string
|
||||
display_name: string
|
||||
pronouns?: string | null
|
||||
tagline?: string | null
|
||||
photo?: string | null
|
||||
role?: string | null
|
||||
title?: string | null
|
||||
}
|
||||
|
||||
export type EventAward = {
|
||||
award: { id: string; name: string; logo?: string | null }
|
||||
person: { id: string; name: string; photo?: string | null }
|
||||
awarded_on?: string | null
|
||||
citation?: string | null
|
||||
}
|
||||
|
||||
export type EventRecord = {
|
||||
id: string
|
||||
/** Which band of the Retreats page this belongs to. */
|
||||
section_id: string
|
||||
/** What kind of gathering it is. Orthogonal to section_id. */
|
||||
event_type: EventType
|
||||
title: string
|
||||
theme?: string | null
|
||||
tagline?: string | null
|
||||
starts_on?: string | null
|
||||
ends_on?: string | null
|
||||
date_label?: string | null
|
||||
status: 'upcoming' | 'past' | 'cancelled'
|
||||
/** The repeating schedule, or null for a one-off. */
|
||||
series: EventSeries | null
|
||||
location_label?: string | null
|
||||
locality?: string | null
|
||||
state_code?: string | null
|
||||
country?: string | null
|
||||
is_online: boolean
|
||||
org_logo?: string | null
|
||||
event_logo?: string | null
|
||||
color?: string | null
|
||||
gradient?: string | null
|
||||
/* In billing order. The first is the one `color` and `org_logo`
|
||||
fell back to when the event set neither. */
|
||||
hosts: EventHost[]
|
||||
description: string[]
|
||||
links: Link[]
|
||||
/** The instagram link's label, the handle. See splitLinks in shape.js. */
|
||||
instagram?: string | null
|
||||
blocks: ContentBlock[]
|
||||
people: EventPerson[]
|
||||
awards: EventAward[]
|
||||
}
|
||||
|
||||
/** One row of GET /events: shapeEvent without the detail-only
|
||||
* blocks, people and awards. */
|
||||
export type EventListItem = Omit<EventRecord, 'blocks' | 'people' | 'awards'>
|
||||
|
||||
/** An event_sections row, as GET /events sends it beside the list. */
|
||||
export type EventSection = { id: string; name: string; sort_order: number }
|
||||
|
||||
export type EventsResponse = { sections: EventSection[]; events: EventListItem[] }
|
||||
|
||||
export const useEvent = (id?: string): Resource<EventRecord> =>
|
||||
useRecord<EventRecord>(detailPath('/events', id), 'event')
|
||||
|
||||
/* ── Organizations ───────────────────────────────────────────── */
|
||||
|
||||
export type Leader = {
|
||||
person_id: string
|
||||
display_name: string
|
||||
pronouns?: string | null
|
||||
title?: string | null
|
||||
role?: string | null
|
||||
is_owner: boolean
|
||||
photo?: string | null
|
||||
public_email?: string | null
|
||||
team_id?: string | null
|
||||
team_name?: string | null
|
||||
}
|
||||
|
||||
export type OrgTeam = {
|
||||
id: string
|
||||
name: string
|
||||
tagline?: string | null
|
||||
color?: string | null
|
||||
logo?: string | null
|
||||
}
|
||||
|
||||
export type OrgAward = {
|
||||
id: string
|
||||
name: string
|
||||
description?: string | null
|
||||
logo?: string | null
|
||||
recipient_count: number
|
||||
}
|
||||
|
||||
export type OrgEvent = {
|
||||
id: string
|
||||
title: string
|
||||
event_type: EventType
|
||||
date_label?: string | null
|
||||
status: string
|
||||
location_label?: string | null
|
||||
event_logo?: string | null
|
||||
color?: string | null
|
||||
}
|
||||
|
||||
/** regions.scope's CHECK values. */
|
||||
export type RegionScope = 'domestic' | 'international' | 'virtual'
|
||||
|
||||
/** A region_areas row as attachRegionDetails sends it. */
|
||||
export type RegionArea = {
|
||||
area_code: string
|
||||
share: number
|
||||
edge: 'top' | 'bottom' | null
|
||||
note: string | null
|
||||
}
|
||||
|
||||
export type OrganizationRecord = {
|
||||
id: string
|
||||
kind: 'national' | 'region' | 'chapter' | 'partner'
|
||||
name: string
|
||||
short_name?: string | null
|
||||
tagline?: string | null
|
||||
color?: string | null
|
||||
logo?: string | null
|
||||
venue?: string | null
|
||||
address?: string | null
|
||||
locality?: string | null
|
||||
state_code?: string | null
|
||||
country?: string | null
|
||||
location_label?: string | null
|
||||
is_online: boolean
|
||||
description: string[]
|
||||
blocks: ContentBlock[]
|
||||
links: Link[]
|
||||
socials: Link[]
|
||||
/* splitLinks in shape.js lifts these out as bare strings: the
|
||||
website's url, the email's label, the instagram handle. */
|
||||
website?: string | null
|
||||
email?: string | null
|
||||
instagram?: string | null
|
||||
/** Shape depends on `kind`; empty object for national and partner. */
|
||||
details: {
|
||||
scope?: RegionScope | null
|
||||
map_note?: string | null
|
||||
areas?: RegionArea[]
|
||||
chapters?: Array<{ id: string; name: string; location_label?: string | null; logo?: string | null }>
|
||||
region_id?: string | null
|
||||
region_name?: string | null
|
||||
region_color?: string | null
|
||||
meets?: string | null
|
||||
started?: string | null
|
||||
}
|
||||
leadership: Leader[]
|
||||
teams: OrgTeam[]
|
||||
awards: OrgAward[]
|
||||
events: OrgEvent[]
|
||||
}
|
||||
|
||||
/** One row of GET /organizations: the card surface and details,
|
||||
* without the sections only the org's own page loads. */
|
||||
export type OrganizationListItem = Omit<OrganizationRecord, 'teams' | 'awards' | 'events'> & {
|
||||
sort_order: number
|
||||
}
|
||||
|
||||
export type OrganizationsResponse = { organizations: OrganizationListItem[] }
|
||||
|
||||
export const useOrganization = (id?: string): Resource<OrganizationRecord> =>
|
||||
useRecord<OrganizationRecord>(detailPath('/organizations', id), 'organization')
|
||||
|
||||
/* ── Teams ───────────────────────────────────────────────────── */
|
||||
|
||||
/** No members here on purpose — PeopleTiles fetches
|
||||
* /teams/:id/people itself. See the note in content.js. */
|
||||
export type TeamRecord = {
|
||||
id: string
|
||||
name: string
|
||||
tagline?: string | null
|
||||
color?: string | null
|
||||
logo?: string | null
|
||||
org: OrgRef
|
||||
description: string[]
|
||||
links: Link[]
|
||||
socials: Link[]
|
||||
/** The instagram handle. See splitLinks in shape.js. */
|
||||
instagram?: string | null
|
||||
blocks: ContentBlock[]
|
||||
}
|
||||
|
||||
export const useTeam = (id?: string): Resource<TeamRecord> =>
|
||||
useRecord<TeamRecord>(detailPath('/teams', id), 'team')
|
||||
|
||||
/* ── Awards ──────────────────────────────────────────────────── */
|
||||
|
||||
export type Recipient = {
|
||||
id: string
|
||||
name: string
|
||||
photo?: string | null
|
||||
tagline?: string | null
|
||||
awarded_on?: string | null
|
||||
citation?: string | null
|
||||
event: { id: string; title: string } | null
|
||||
}
|
||||
|
||||
export type AwardRecord = {
|
||||
id: string
|
||||
name: string
|
||||
description?: string | null
|
||||
logo?: string | null
|
||||
org: OrgRef | null
|
||||
recipients: Recipient[]
|
||||
}
|
||||
|
||||
export const useAward = (id?: string): Resource<AwardRecord> =>
|
||||
useRecord<AwardRecord>(detailPath('/awards', id), 'award')
|
||||
|
||||
/* ── People ──────────────────────────────────────────────────── */
|
||||
|
||||
/** One public affiliation. ended_on null means current. */
|
||||
export type PersonRole = {
|
||||
title?: string | null
|
||||
role: 'lead' | 'board' | 'staff' | 'volunteer' | 'member'
|
||||
is_owner: boolean
|
||||
started_on?: string | null
|
||||
ended_on?: string | null
|
||||
org: OrgRef
|
||||
/** Null when there's no team, or the team is unpublished. */
|
||||
team: { id: string; name: string } | null
|
||||
}
|
||||
|
||||
/** A published event this person was billed at or hosted, with
|
||||
* every capacity they appeared in. 'host' comes from event_hosts. */
|
||||
export type PersonEvent = {
|
||||
id: string
|
||||
title: string
|
||||
event_type: EventType
|
||||
date_label?: string | null
|
||||
starts_on?: string | null
|
||||
status: 'upcoming' | 'past' | 'cancelled'
|
||||
roles: { role: string; title?: string | null }[]
|
||||
}
|
||||
|
||||
export type PersonAward = {
|
||||
award: { id: string; name: string; logo?: string | null }
|
||||
awarded_on?: string | null
|
||||
citation?: string | null
|
||||
event: { id: string; title: string } | null
|
||||
}
|
||||
|
||||
export type PersonRecord = {
|
||||
id: string
|
||||
name: string
|
||||
pronouns?: string | null
|
||||
tagline?: string | null
|
||||
photo?: string | null
|
||||
location_label?: string | null
|
||||
public_email?: string | null
|
||||
/** The primary organization, when it's published. */
|
||||
org: OrgRef | null
|
||||
/** people.bio split on blank lines. */
|
||||
bio: string[]
|
||||
description: string[]
|
||||
blocks: ContentBlock[]
|
||||
links: Link[]
|
||||
socials: Link[]
|
||||
website?: string | null
|
||||
instagram?: string | null
|
||||
/** Current first, then most recently ended. */
|
||||
roles: PersonRole[]
|
||||
events: PersonEvent[]
|
||||
awards: PersonAward[]
|
||||
}
|
||||
|
||||
export const usePerson = (id?: string): Resource<PersonRecord> =>
|
||||
useRecord<PersonRecord>(detailPath('/people', id), 'person')
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
FRONT PAGE DATA
|
||||
|
||||
GET /front-page, as routes/home.js shapes it: the hero, the
|
||||
visible sections in order, counted stats, paths with actions,
|
||||
and the countdown's event. Edited in the admin under Front page.
|
||||
|
||||
No fallback content. If the request fails the page says so — a
|
||||
plausible default home page would hide a broken server behind
|
||||
something that looks fine.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { useRecord, type Resource } from './useRecord.ts'
|
||||
import type { EventSeries } from './eventSeries.ts'
|
||||
|
||||
export type HeroMode = 'brand' | 'photos' | 'livestream'
|
||||
|
||||
/** The CHECK list on front_page_sections.section. */
|
||||
export type FrontPageSectionKey =
|
||||
| 'countdown'
|
||||
| 'retreats'
|
||||
| 'calendar'
|
||||
| 'stats'
|
||||
| 'timeline'
|
||||
| 'connect'
|
||||
|
||||
export type HeroButton = { label: string; url: string }
|
||||
|
||||
export type HeroSlide = {
|
||||
media: string
|
||||
alt?: string | null
|
||||
caption?: string | null
|
||||
link_url?: string | null
|
||||
}
|
||||
|
||||
export type Hero = {
|
||||
mode: HeroMode
|
||||
eyebrow?: string | null
|
||||
headline: string
|
||||
subhead?: string | null
|
||||
primary: HeroButton | null
|
||||
secondary: HeroButton | null
|
||||
slide_seconds: number
|
||||
slides: HeroSlide[]
|
||||
livestream: { url: string; title?: string | null } | null
|
||||
}
|
||||
|
||||
export type FrontPageSection = {
|
||||
section: FrontPageSectionKey
|
||||
/** Null → the section's own heading. */
|
||||
title?: string | null
|
||||
blurb?: string | null
|
||||
}
|
||||
|
||||
export type FrontPageStat = {
|
||||
label: string
|
||||
/** Already counted or typed; never null — the API drops those. */
|
||||
value: string
|
||||
suffix?: string | null
|
||||
note?: string | null
|
||||
}
|
||||
|
||||
export type PathAction = { label: string; description?: string | null; url: string }
|
||||
|
||||
export type FrontPagePath = {
|
||||
label: string
|
||||
icon?: string | null
|
||||
blurb?: string | null
|
||||
actions: PathAction[]
|
||||
}
|
||||
|
||||
export type CountdownEvent = {
|
||||
id: string
|
||||
title: string
|
||||
theme?: string | null
|
||||
starts_on?: string | null
|
||||
ends_on?: string | null
|
||||
date_label?: string | null
|
||||
location_label?: string | null
|
||||
is_online: boolean
|
||||
color?: string | null
|
||||
event_logo?: string | null
|
||||
series: EventSeries | null
|
||||
}
|
||||
|
||||
export type FrontPage = {
|
||||
hero: Hero
|
||||
sections: FrontPageSection[]
|
||||
stats: FrontPageStat[]
|
||||
paths: FrontPagePath[]
|
||||
countdown: CountdownEvent | null
|
||||
}
|
||||
|
||||
export const useFrontPage = (): Resource<FrontPage> =>
|
||||
useRecord<FrontPage>('/front-page', 'front_page')
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
/**
|
||||
* Loads the history timeline from `GET /api/history`.
|
||||
*
|
||||
* Goes through the shared client, so the request is deduped and cached
|
||||
* for 60s like every other read. Two consequences worth knowing:
|
||||
*
|
||||
* · `reload` has to invalidate before it refetches. Without that, the
|
||||
* retry button inside the TTL would hand back the same settled
|
||||
* promise and look like it did nothing. A *failed* request is
|
||||
* already evicted by the client, so this matters for the refresh
|
||||
* case rather than the error case.
|
||||
*
|
||||
* · there's no AbortController. `get` shares one promise between
|
||||
* callers, so aborting on unmount would cancel someone else's
|
||||
* request. The `live` flag drops the result instead.
|
||||
*
|
||||
* No `fallback` on purpose. Handing this the mock data would render a
|
||||
* plausible-looking history with no indication the server is down, and
|
||||
* the wrong history is worse than a visible error — the same reason
|
||||
* `fallback: EMPTY` came out elsewhere.
|
||||
*
|
||||
* `undated` is the number of published entries the API left out because
|
||||
* nothing gave them a date. Not rendered publicly — a visitor can't act
|
||||
* on it — but returned so it's reachable if you want a warning in the
|
||||
* admin later.
|
||||
*/
|
||||
|
||||
import { useCallback, useEffect, useState } from 'react'
|
||||
import { get, invalidate, ApiError } from './api.js'
|
||||
import type { TimelineItem } from './timeline'
|
||||
|
||||
const PATH = '/history'
|
||||
|
||||
type HistoryResponse = {
|
||||
items?: TimelineItem[]
|
||||
undated?: number
|
||||
}
|
||||
|
||||
type State = {
|
||||
items: TimelineItem[]
|
||||
undated: number
|
||||
loading: boolean
|
||||
error: string | null
|
||||
reload: () => void
|
||||
}
|
||||
|
||||
export function useHistory(): State {
|
||||
const [items, setItems] = useState<TimelineItem[]>([])
|
||||
const [undated, setUndated] = useState(0)
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [attempt, setAttempt] = useState(0)
|
||||
|
||||
const reload = useCallback(() => {
|
||||
invalidate(PATH)
|
||||
setAttempt((n) => n + 1)
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
let live = true
|
||||
|
||||
async function load() {
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
try {
|
||||
const data: HistoryResponse = await get(PATH)
|
||||
if (!live) return
|
||||
setItems(Array.isArray(data?.items) ? data.items : [])
|
||||
setUndated(Number(data?.undated) || 0)
|
||||
} catch (err) {
|
||||
if (!live) return
|
||||
setError(
|
||||
err instanceof ApiError ? err.message : "Couldn't reach the server.",
|
||||
)
|
||||
} finally {
|
||||
if (live) setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
load()
|
||||
return () => {
|
||||
live = false
|
||||
}
|
||||
}, [attempt])
|
||||
|
||||
return { items, undated, loading, error, reload }
|
||||
}
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
/**
|
||||
* useRecord — one record from one endpoint, on the useHistory
|
||||
* pattern.
|
||||
*
|
||||
* Named for what it returns, and deliberately not useResource:
|
||||
* src/lib/useResource.js is a different hook — it hands back the
|
||||
* whole response body and takes an options object — and a .ts file
|
||||
* of the same name would sit one extension away from it. An import
|
||||
* whose target goes missing then resolves to the other file without
|
||||
* a word, and every detail page renders the wrapper object instead
|
||||
* of the record. That is exactly how this file came to exist.
|
||||
*
|
||||
* Every detail route in content.js answers the same shape: 200 with
|
||||
* a single top-level key, or 404 with `{ error }`. So the hook takes
|
||||
* the path and the key, and the four callers in useContent.ts are
|
||||
* one line each rather than four copies of this file.
|
||||
*
|
||||
* `key` is a string rather than a selector function on purpose. A
|
||||
* selector passed inline would be a new identity every render, and
|
||||
* putting it in the effect's deps would refetch forever; leaving it
|
||||
* out would silently use a stale closure. A string has neither
|
||||
* problem.
|
||||
*
|
||||
* Carried over from useHistory, and worth restating:
|
||||
*
|
||||
* · `reload` invalidates before it refetches. Without that, the
|
||||
* retry button inside the 60s TTL hands back the same settled
|
||||
* promise and looks like it did nothing. A *failed* request is
|
||||
* already evicted by api.js, so this matters for the refresh
|
||||
* case rather than the error case.
|
||||
*
|
||||
* · no AbortController. `get` shares one promise between callers,
|
||||
* so aborting on unmount would cancel someone else's request.
|
||||
* The `live` flag drops the result instead.
|
||||
*
|
||||
* · no `fallback`. Rendering plausible-looking content with no
|
||||
* sign the server is down is worse than a visible error.
|
||||
*
|
||||
* `notFound` is separated from `error` because they are different
|
||||
* pages: a 404 is a slug that doesn't exist and retrying won't help,
|
||||
* anything else is worth a Try again button.
|
||||
*
|
||||
* A null `path` means there is nothing to ask for, and the hook
|
||||
* reports notFound rather than loading forever. Callers build the
|
||||
* path with detailPath() from hrefs.ts, which returns null for an
|
||||
* id that could never be real — "undefined" chief among them.
|
||||
*/
|
||||
|
||||
import { useCallback, useEffect, useState } from 'react'
|
||||
import { get, invalidate, ApiError } from './api.js'
|
||||
|
||||
export type Resource<T> = {
|
||||
data: T | null
|
||||
loading: boolean
|
||||
error: string | null
|
||||
notFound: boolean
|
||||
reload: () => void
|
||||
}
|
||||
|
||||
export function useRecord<T>(path: string | null, key: string): Resource<T> {
|
||||
const [data, setData] = useState<T | null>(null)
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [notFound, setNotFound] = useState(false)
|
||||
const [attempt, setAttempt] = useState(0)
|
||||
|
||||
const reload = useCallback(() => {
|
||||
if (path) invalidate(path)
|
||||
setAttempt((n) => n + 1)
|
||||
}, [path])
|
||||
|
||||
useEffect(() => {
|
||||
// Nothing to ask for. Distinguished from "not asked yet" by the
|
||||
// caller: useContent passes null only when the id is unusable,
|
||||
// and an unusable id is a 404 as far as the visitor is
|
||||
// concerned.
|
||||
if (!path) {
|
||||
setData(null)
|
||||
setError(null)
|
||||
setNotFound(true)
|
||||
setLoading(false)
|
||||
return undefined
|
||||
}
|
||||
|
||||
let live = true
|
||||
|
||||
async function load() {
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
setNotFound(false)
|
||||
try {
|
||||
const body = await get<Record<string, unknown> | null>(path as string)
|
||||
if (!live) return
|
||||
// A 200 with the key absent is a server-side shaping bug,
|
||||
// not an empty record. Say so rather than rendering a page
|
||||
// full of blanks.
|
||||
const record = body?.[key]
|
||||
if (record === undefined) {
|
||||
setError(`The server sent no "${key}".`)
|
||||
setData(null)
|
||||
return
|
||||
}
|
||||
setData(record as T)
|
||||
} catch (err) {
|
||||
if (!live) return
|
||||
if (err instanceof ApiError && err.status === 404) {
|
||||
setNotFound(true)
|
||||
setData(null)
|
||||
return
|
||||
}
|
||||
setError(
|
||||
err instanceof ApiError ? err.message : "Couldn't reach the server.",
|
||||
)
|
||||
setData(null)
|
||||
} finally {
|
||||
if (live) setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
load()
|
||||
return () => {
|
||||
live = false
|
||||
}
|
||||
}, [path, key, attempt])
|
||||
|
||||
return { data, loading, error, notFound, reload }
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
SITE VERSION — src/lib/version.ts
|
||||
|
||||
One string, bumped by hand when the working directory name
|
||||
changes. The admin footer is the only thing reading it today;
|
||||
keep it here rather than in a component so the panel, an about
|
||||
box or a build banner can read the same value later.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
export const SITE_VERSION = "NGU-Web.v1.5-history";
|
||||
20
src/navConfig.d.ts
vendored
20
src/navConfig.d.ts
vendored
|
|
@ -1,20 +0,0 @@
|
|||
/* Types for navConfig.js. */
|
||||
|
||||
export type PageLink = { label: string; path: string };
|
||||
|
||||
export type PageSectionLink = { label: string; hash: string };
|
||||
|
||||
export type NavAction = {
|
||||
label: string;
|
||||
to: string;
|
||||
/** Picks the styling, not the destination. */
|
||||
variant: "ghost" | "fancy";
|
||||
external?: boolean;
|
||||
};
|
||||
|
||||
export declare const PAGE_LINKS: PageLink[];
|
||||
|
||||
/** Keyed by the owning page's path. */
|
||||
export declare const PAGE_SECTIONS: Record<string, PageSectionLink[]>;
|
||||
|
||||
export declare const NAV_ACTIONS: NavAction[];
|
||||
|
|
@ -7,7 +7,6 @@ export const PAGE_LINKS = [
|
|||
{ label: "Community", path: "/community" },
|
||||
{ label: "Leadership", path: "/leadership" },
|
||||
{ label: "Resources", path: "/resources" },
|
||||
{ label: "History", path: "/history" },
|
||||
];
|
||||
|
||||
// Sections belong to a page, keyed by that page's path.
|
||||
|
|
@ -39,9 +38,6 @@ export const PAGE_SECTIONS = {
|
|||
{ label: "Branding & Marketing", hash: "#branding" },
|
||||
{ label: "Partner Resources", hash: "#partner" },
|
||||
],
|
||||
"/history": [
|
||||
{ label: "Timeline", hash: "#timeline" },
|
||||
],
|
||||
};
|
||||
|
||||
// Right-side actions. `variant` picks the styling, not the destination.
|
||||
|
|
|
|||
|
|
@ -1,178 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
AWARD DETAIL — /awards/:id
|
||||
|
||||
The thinnest of the four, by design. `awards` has no links and no
|
||||
content blocks — 'award' isn't in the owner_kind CHECK on either
|
||||
polymorphic table, and widening it means rebuilding two STRICT
|
||||
tables. `description` is the prose.
|
||||
|
||||
So the recipients are the page. They're rendered as a list rather
|
||||
than as PeopleTiles because each one carries a citation, and a
|
||||
citation is the point of an award — it doesn't belong folded
|
||||
behind a chevron.
|
||||
|
||||
Note also that `awards` has no is_published column: every row
|
||||
here is live the moment it's created. Worth an ADD COLUMN before
|
||||
this ships.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Link, useParams } from 'react-router-dom'
|
||||
|
||||
import PageShell from '../components/PageShell.tsx'
|
||||
import PageState from '../components/PageState.tsx'
|
||||
import { useAward, type Recipient } from '../lib/useContent.ts'
|
||||
import { eventHref, orgHref, personHref } from '../lib/hrefs.ts'
|
||||
import { awardLogo, initials, personPhoto } from '../lib/media.ts'
|
||||
|
||||
const TEAL = '#138ba0'
|
||||
const BODY = '#4a6b72'
|
||||
|
||||
export default function AwardDetail() {
|
||||
const { id } = useParams()
|
||||
const { data: award, loading, error, notFound, reload } = useAward(id)
|
||||
|
||||
if (!award) {
|
||||
return (
|
||||
<PageState
|
||||
loading={loading}
|
||||
error={error}
|
||||
notFound={notFound}
|
||||
onRetry={reload}
|
||||
noun="award"
|
||||
backTo="/community"
|
||||
backLabel="Community"
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
const accent = TEAL
|
||||
const logo = awardLogo(award.logo)
|
||||
|
||||
return (
|
||||
<PageShell
|
||||
title={award.name}
|
||||
intro={award.description ?? undefined}
|
||||
sections={[
|
||||
{
|
||||
id: 'recipients',
|
||||
title: 'Recipients',
|
||||
blurb:
|
||||
award.recipients.length === 0
|
||||
? 'Nobody has received this yet.'
|
||||
: undefined,
|
||||
accent,
|
||||
background: '#ffffff',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-8">
|
||||
<div className="flex flex-wrap items-center gap-x-6 gap-y-3 text-sm">
|
||||
{logo && (
|
||||
<img src={logo} alt="" loading="lazy" className="h-12 w-12 object-contain" />
|
||||
)}
|
||||
|
||||
{award.org && (
|
||||
<span style={{ color: BODY }}>
|
||||
Given by{' '}
|
||||
<Link
|
||||
to={orgHref(award.org.id, award.org.kind)}
|
||||
className="font-medium hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
{award.org.name}
|
||||
</Link>
|
||||
</span>
|
||||
)}
|
||||
|
||||
<span style={{ color: BODY }}>
|
||||
{award.recipients.length}{' '}
|
||||
{award.recipients.length === 1 ? 'recipient' : 'recipients'}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<ol className="space-y-8">
|
||||
{award.recipients.map((recipient, index) => (
|
||||
<li key={`${recipient.id}:${recipient.awarded_on ?? index}`}>
|
||||
<RecipientRow recipient={recipient} accent={accent} />
|
||||
</li>
|
||||
))}
|
||||
</ol>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
]}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
function RecipientRow({ recipient, accent }: { recipient: Recipient; accent: string }) {
|
||||
const photo = personPhoto(recipient.photo)
|
||||
|
||||
return (
|
||||
<div className="flex gap-5">
|
||||
{photo ? (
|
||||
<img
|
||||
src={photo}
|
||||
alt=""
|
||||
loading="lazy"
|
||||
decoding="async"
|
||||
className="h-16 w-16 shrink-0 rounded-full object-cover"
|
||||
/>
|
||||
) : (
|
||||
<span
|
||||
aria-hidden="true"
|
||||
className="flex h-16 w-16 shrink-0 items-center justify-center rounded-full text-sm font-bold text-white"
|
||||
style={{ background: accent }}
|
||||
>
|
||||
{initials(recipient.name)}
|
||||
</span>
|
||||
)}
|
||||
|
||||
<div className="min-w-0">
|
||||
<p className="text-lg font-semibold">
|
||||
<Link
|
||||
to={personHref(recipient.id)}
|
||||
className="hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
{recipient.name}
|
||||
</Link>
|
||||
</p>
|
||||
|
||||
<p className="text-sm" style={{ color: BODY }}>
|
||||
{[
|
||||
year(recipient.awarded_on),
|
||||
recipient.tagline,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' · ')}
|
||||
{recipient.event && (
|
||||
<>
|
||||
{(recipient.awarded_on || recipient.tagline) && ' · '}
|
||||
<Link
|
||||
to={eventHref(recipient.event.id)}
|
||||
className="hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
{recipient.event.title}
|
||||
</Link>
|
||||
</>
|
||||
)}
|
||||
</p>
|
||||
|
||||
{recipient.citation && (
|
||||
<p className="mt-2 max-w-2xl leading-relaxed" style={{ color: BODY }}>
|
||||
{recipient.citation}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/* awarded_on may be a partial date, so this takes the leading year
|
||||
rather than parsing. A full date would be false precision on a
|
||||
row backfilled from a programme booklet. */
|
||||
function year(date?: string | null): string | null {
|
||||
if (!date) return null
|
||||
const match = /^(\d{4})/.exec(date)
|
||||
return match ? match[1] : date
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import PageShell from "../components/PageShell.tsx";
|
||||
import { defineSection, useSectionManifest } from "../lib/sections.tsx";
|
||||
import { useSectionManifest } from "../lib/sections.tsx";
|
||||
import OrgListMap, { OrgMapToggle } from "./sections/OrgList-Map.tsx";
|
||||
import OrgListVertical from "./sections/OrgList-Vertical.tsx";
|
||||
import OrgListCards from "./sections/OrgList-Card.tsx";
|
||||
|
|
@ -13,7 +13,7 @@ import OrgListCards from "./sections/OrgList-Card.tsx";
|
|||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
const SECTIONS = [
|
||||
defineSection({
|
||||
{
|
||||
id: "chapters",
|
||||
title: "Local Chapters",
|
||||
blurb:
|
||||
|
|
@ -22,8 +22,8 @@ const SECTIONS = [
|
|||
background: "#eef9fb",
|
||||
Component: OrgListMap,
|
||||
views: { options: ["map", "grid"], default: "map", Toggle: OrgMapToggle },
|
||||
}),
|
||||
defineSection({
|
||||
},
|
||||
{
|
||||
id: "regions",
|
||||
title: "Unity Regions",
|
||||
blurb:
|
||||
|
|
@ -40,8 +40,8 @@ const SECTIONS = [
|
|||
{ key: "international", title: "International Unity Regions" },
|
||||
],
|
||||
},
|
||||
}),
|
||||
defineSection({
|
||||
},
|
||||
{
|
||||
id: "partners",
|
||||
title: "Partner Organizations",
|
||||
blurb:
|
||||
|
|
@ -54,7 +54,7 @@ const SECTIONS = [
|
|||
pageLabel: "Partner page",
|
||||
empty: "· Partner organizations coming soon ·",
|
||||
},
|
||||
}),
|
||||
},
|
||||
];
|
||||
|
||||
export default function CommunityPage() {
|
||||
|
|
|
|||
|
|
@ -1,399 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
EVENT DETAIL — /retreats/:id
|
||||
|
||||
Reached from the cards on Retreats.tsx. The API has already
|
||||
resolved the fallbacks — `color` is the event's own or its first
|
||||
host's, `status` is derived from the dates when nobody set it —
|
||||
so nothing here reimplements those rules.
|
||||
|
||||
Hosts arrive as a list in billing order, each one either an
|
||||
organization or a person. refHref takes the kind and works out
|
||||
the route, which is why this file doesn't branch on it.
|
||||
|
||||
People are grouped by their billing role rather than listed flat.
|
||||
A retreat with four speakers and eleven volunteers reads as two
|
||||
different things, and v_event_people already sorts within a role
|
||||
by sort_order.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Link, useParams } from 'react-router-dom'
|
||||
|
||||
import PageShell, { type ShellSection } from '../components/PageShell.tsx'
|
||||
import PageState from '../components/PageState.tsx'
|
||||
import ContentBlocks from '../components/ContentBlocks.tsx'
|
||||
import PeopleTiles, { type PeopleGroupInput } from '../components/PeopleTiles.tsx'
|
||||
import {
|
||||
useEvent,
|
||||
type EventHost,
|
||||
type EventPerson,
|
||||
type EventRecord,
|
||||
} from '../lib/useContent.ts'
|
||||
import { awardHref, personHref, refHref } from '../lib/hrefs.ts'
|
||||
import { personPhoto } from '../lib/media.ts'
|
||||
import { eventTypeLabel } from '../lib/eventTypes.ts'
|
||||
import { occurrenceLabel, seriesLabel, seriesTimes, upcomingOccurrences } from '../lib/eventSeries.ts'
|
||||
|
||||
const TEAL = '#138ba0'
|
||||
const BODY = '#4a6b72'
|
||||
|
||||
/* Billing order. A role missing from here still renders, at the
|
||||
end, under its own name — better than a speaker vanishing
|
||||
because somebody added a role to the CHECK and not to this list. */
|
||||
const ROLE_ORDER = [
|
||||
'speaker',
|
||||
'leader',
|
||||
'facilitator',
|
||||
'host',
|
||||
'musician',
|
||||
'volunteer',
|
||||
'attendee',
|
||||
] as const
|
||||
|
||||
const ROLE_LABEL: Record<string, string> = {
|
||||
speaker: 'Speakers',
|
||||
leader: 'Leaders',
|
||||
facilitator: 'Facilitators',
|
||||
host: 'Hosts',
|
||||
musician: 'Music',
|
||||
volunteer: 'Volunteers',
|
||||
attendee: 'Also there',
|
||||
}
|
||||
|
||||
const STATUS_LABEL: Record<string, string> = {
|
||||
upcoming: 'Upcoming',
|
||||
past: 'Past',
|
||||
cancelled: 'Cancelled',
|
||||
}
|
||||
|
||||
export default function EventDetail() {
|
||||
const { id } = useParams()
|
||||
const { data: event, loading, error, notFound, reload } = useEvent(id)
|
||||
|
||||
if (!event) {
|
||||
return (
|
||||
<PageState
|
||||
loading={loading}
|
||||
error={error}
|
||||
notFound={notFound}
|
||||
onRetry={reload}
|
||||
noun="retreat"
|
||||
backTo="/retreats"
|
||||
backLabel="All retreats"
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
const accent = event.color || TEAL
|
||||
const groups = peopleGroups(event.people, accent)
|
||||
|
||||
const sections: ShellSection[] = [
|
||||
{
|
||||
id: 'about',
|
||||
title: event.theme || 'About',
|
||||
blurb: event.theme ? event.tagline ?? undefined : undefined,
|
||||
accent,
|
||||
background: '#ffffff',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-8">
|
||||
<Facts event={event} accent={accent} />
|
||||
|
||||
{event.description.map((paragraph, index) => (
|
||||
<p key={index} className="leading-relaxed max-w-3xl" style={{ color: BODY }}>
|
||||
{paragraph}
|
||||
</p>
|
||||
))}
|
||||
|
||||
<div className="max-w-3xl">
|
||||
<ContentBlocks blocks={event.blocks} accent={accent} />
|
||||
</div>
|
||||
|
||||
{event.links.length > 0 && (
|
||||
<div className="flex flex-wrap gap-3">
|
||||
{event.links.map((link) => (
|
||||
<a
|
||||
key={link.url}
|
||||
href={link.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="rounded-full px-5 py-2 text-sm font-semibold text-white transition-transform hover:scale-105"
|
||||
style={{ background: accent }}
|
||||
>
|
||||
{link.label}
|
||||
</a>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
),
|
||||
},
|
||||
]
|
||||
|
||||
// A cancelled series has no next meeting, whatever its dates say.
|
||||
const upcoming =
|
||||
event.status === 'cancelled'
|
||||
? []
|
||||
: upcomingOccurrences(event.series, event.starts_on, event.ends_on)
|
||||
|
||||
if (upcoming.length > 0) {
|
||||
const times = seriesTimes(event.series)
|
||||
|
||||
sections.push({
|
||||
id: 'dates',
|
||||
title: 'Upcoming dates',
|
||||
blurb: seriesLabel(event.series, event.starts_on) ?? undefined,
|
||||
accent,
|
||||
background: '#eef9fb',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6">
|
||||
<ul className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
||||
{upcoming.map((date) => (
|
||||
<li
|
||||
key={date}
|
||||
className="rounded-xl border-l-4 bg-white px-5 py-3"
|
||||
style={{ borderColor: accent }}
|
||||
>
|
||||
<p className="font-semibold" style={{ color: accent }}>
|
||||
{occurrenceLabel(date)}
|
||||
</p>
|
||||
{times && (
|
||||
<p className="text-sm" style={{ color: BODY }}>
|
||||
{times}
|
||||
</p>
|
||||
)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
if (groups.length > 0) {
|
||||
sections.push({
|
||||
id: 'people',
|
||||
title: 'Who’s there',
|
||||
accent,
|
||||
background: '#eef9fb',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6">
|
||||
<PeopleTiles size="lg" groups={groups} accent={accent} />
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
if (event.awards.length > 0) {
|
||||
sections.push({
|
||||
id: 'awards',
|
||||
title: 'Presented here',
|
||||
blurb: 'Awards given at this gathering.',
|
||||
accent,
|
||||
background: '#ffffff',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-6">
|
||||
{event.awards.map((entry, index) => (
|
||||
<div
|
||||
key={`${entry.award.id}:${entry.person.id}:${index}`}
|
||||
className="flex gap-4 border-l-2 pl-5"
|
||||
style={{ borderColor: accent }}
|
||||
>
|
||||
<div>
|
||||
<p className="font-semibold" style={{ color: accent }}>
|
||||
<Link to={awardHref(entry.award.id)} className="hover:underline">
|
||||
{entry.award.name}
|
||||
</Link>
|
||||
</p>
|
||||
<p style={{ color: BODY }}>
|
||||
<Link to={personHref(entry.person.id)} className="hover:underline">
|
||||
{entry.person.name}
|
||||
</Link>
|
||||
</p>
|
||||
{entry.citation && (
|
||||
<p className="mt-1 text-sm italic opacity-80" style={{ color: BODY }}>
|
||||
{entry.citation}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<PageShell
|
||||
title={event.title}
|
||||
intro={event.theme ? event.tagline ?? undefined : event.tagline ?? undefined}
|
||||
sections={sections}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
/* ── The strip of facts under the heading ────────────────────── */
|
||||
|
||||
function Facts({ event, accent }: { event: EventRecord; accent: string }) {
|
||||
const where =
|
||||
event.location_label ||
|
||||
[event.locality, event.state_code].filter(Boolean).join(', ') ||
|
||||
(event.is_online ? 'Online' : null)
|
||||
|
||||
const schedule = seriesLabel(event.series, event.starts_on)
|
||||
// A series with no label of its own is described by its schedule
|
||||
// rather than by a start-to-end range that reads like one long
|
||||
// gathering.
|
||||
const when =
|
||||
event.date_label || (schedule ? null : dateRange(event.starts_on, event.ends_on))
|
||||
|
||||
return (
|
||||
<div className="flex flex-wrap items-center gap-x-6 gap-y-3 text-sm">
|
||||
<span
|
||||
className="rounded-full px-3 py-1 font-semibold uppercase tracking-wide"
|
||||
style={{
|
||||
background: event.status === 'cancelled' ? '#b3261e' : accent,
|
||||
color: '#ffffff',
|
||||
}}
|
||||
>
|
||||
{STATUS_LABEL[event.status] ?? event.status}
|
||||
</span>
|
||||
|
||||
{/* Outlined rather than filled: the status pill is the one
|
||||
thing in this strip that should read as loud, and two
|
||||
solid blocks side by side would compete. Shown
|
||||
unconditionally — a card suppresses its own type badge in
|
||||
a band of one kind, but here there is no band to make it
|
||||
redundant. */}
|
||||
{event.event_type && (
|
||||
<span
|
||||
className="rounded-full px-3 py-1 font-semibold uppercase tracking-wide"
|
||||
style={{ border: `1px solid ${accent}`, color: accent }}
|
||||
>
|
||||
{eventTypeLabel(event.event_type)}
|
||||
</span>
|
||||
)}
|
||||
|
||||
{when && <span style={{ color: BODY }}>{when}</span>}
|
||||
{schedule && <span style={{ color: BODY }}>{schedule}</span>}
|
||||
{where && <span style={{ color: BODY }}>{where}</span>}
|
||||
{event.is_online && where !== 'Online' && (
|
||||
<span style={{ color: BODY }}>Online too</span>
|
||||
)}
|
||||
|
||||
{(event.hosts?.length ?? 0) > 0 && (
|
||||
<span style={{ color: BODY }}>
|
||||
Hosted by <HostList hosts={event.hosts} accent={accent} />
|
||||
</span>
|
||||
)}
|
||||
|
||||
<Link to="/retreats" className="ml-auto hover:underline" style={{ color: accent }}>
|
||||
All retreats
|
||||
</Link>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/* One host reads as "Hosted by Northwest"; several read as a
|
||||
sentence, so they're joined with commas and an "and" rather than
|
||||
stacked. A host whose id didn't resolve to a route renders as
|
||||
plain text — refHref returns null for that — because a dead link
|
||||
is worse than a name. */
|
||||
function HostList({ hosts, accent }: { hosts: EventHost[]; accent: string }) {
|
||||
return (
|
||||
<>
|
||||
{hosts.map((host, index) => {
|
||||
const to = refHref(host.kind, host.id, host.org_kind)
|
||||
|
||||
return (
|
||||
<span key={`${host.kind}:${host.id}`}>
|
||||
{index > 0 && (hosts.length > 2 ? ', ' : ' ')}
|
||||
{index > 0 && index === hosts.length - 1 && 'and '}
|
||||
{to ? (
|
||||
<Link
|
||||
to={to}
|
||||
className="font-medium hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
{host.name}
|
||||
</Link>
|
||||
) : (
|
||||
<span className="font-medium">{host.name}</span>
|
||||
)}
|
||||
</span>
|
||||
)
|
||||
})}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
/* date_label is what a card shows and is free text — "March/April
|
||||
2026" is legitimate. This is only the fallback for an event that
|
||||
has dates and no label. */
|
||||
function dateRange(start?: string | null, end?: string | null): string | null {
|
||||
if (!start) return null
|
||||
const from = new Date(`${start}T00:00:00`)
|
||||
if (Number.isNaN(from.getTime())) return start
|
||||
|
||||
const full: Intl.DateTimeFormatOptions = {
|
||||
month: 'long',
|
||||
day: 'numeric',
|
||||
year: 'numeric',
|
||||
}
|
||||
|
||||
if (!end || end === start) return from.toLocaleDateString(undefined, full)
|
||||
|
||||
const to = new Date(`${end}T00:00:00`)
|
||||
if (Number.isNaN(to.getTime())) return from.toLocaleDateString(undefined, full)
|
||||
|
||||
const sameYear = from.getFullYear() === to.getFullYear()
|
||||
const sameMonth = sameYear && from.getMonth() === to.getMonth()
|
||||
|
||||
const left = from.toLocaleDateString(
|
||||
undefined,
|
||||
sameMonth
|
||||
? { month: 'long', day: 'numeric' }
|
||||
: sameYear
|
||||
? { month: 'long', day: 'numeric' }
|
||||
: full,
|
||||
)
|
||||
|
||||
return `${left} – ${to.toLocaleDateString(undefined, full)}`
|
||||
}
|
||||
|
||||
/* ── v_event_people → PeopleTiles groups ─────────────────────── */
|
||||
|
||||
function peopleGroups(people: EventPerson[], accent: string): PeopleGroupInput[] {
|
||||
if (!people.length) return []
|
||||
|
||||
const byRole = new Map<string, EventPerson[]>()
|
||||
for (const person of people) {
|
||||
const role = person.role || 'attendee'
|
||||
const list = byRole.get(role)
|
||||
if (list) list.push(person)
|
||||
else byRole.set(role, [person])
|
||||
}
|
||||
|
||||
// Known roles in billing order, then anything the CHECK has
|
||||
// gained since this file was written.
|
||||
const roles = [
|
||||
...ROLE_ORDER.filter((role) => byRole.has(role)),
|
||||
...[...byRole.keys()].filter((role) => !ROLE_ORDER.includes(role as never)),
|
||||
]
|
||||
|
||||
return roles.map((role) => ({
|
||||
id: `role-${role}`,
|
||||
label: ROLE_LABEL[role] ?? capitalize(role),
|
||||
accent,
|
||||
people: (byRole.get(role) ?? []).map((person) => ({
|
||||
id: person.person_id,
|
||||
name: person.display_name,
|
||||
title: person.title,
|
||||
tagline: person.tagline,
|
||||
pronouns: person.pronouns,
|
||||
// PeopleTiles resolves a bare filename itself; this is here
|
||||
// so a hand-written entry elsewhere can't diverge.
|
||||
photo: personPhoto(person.photo),
|
||||
})),
|
||||
}))
|
||||
}
|
||||
|
||||
const capitalize = (word: string) => word.charAt(0).toUpperCase() + word.slice(1)
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
import PageShell from "../components/PageShell";
|
||||
import HistoryTimeline from "./sections/history/HistoryTimeline";
|
||||
import { HISTORY_DECADES } from "../data/historyDecades";
|
||||
import { useHistory } from "../lib/useHistory";
|
||||
|
||||
/**
|
||||
* Year the program starts. Decades ending before this render with the
|
||||
* pre-program treatment, so the gap moves if the founding date is ever
|
||||
* corrected — no hardcoded 2000 anywhere in the components.
|
||||
*/
|
||||
const PROGRAM_START_YEAR = 2000;
|
||||
|
||||
const ACCENT = "#138ba0";
|
||||
const BACKGROUND = "#ffffff";
|
||||
|
||||
export default function History() {
|
||||
const { items, loading, error, reload } = useHistory();
|
||||
|
||||
// Section renders `content` outside its own max-width wrapper, so the
|
||||
// container lives here. The custom properties bind the timeline to
|
||||
// this section's accent and background — --tl-surface must match
|
||||
// `background` or the rail will show through the year dots.
|
||||
const wrap = (children: React.ReactNode) => (
|
||||
<div
|
||||
className="max-w-6xl mx-auto px-6"
|
||||
style={{ "--tl-accent": ACCENT, "--tl-surface": BACKGROUND } as React.CSSProperties}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
|
||||
let content: React.ReactNode;
|
||||
|
||||
if (loading) {
|
||||
content = wrap(
|
||||
<p className="py-12 text-[#4a6b72]" role="status">
|
||||
Loading the timeline…
|
||||
</p>,
|
||||
);
|
||||
} else if (error) {
|
||||
// Say what failed and offer the one action that might fix it.
|
||||
// A history page that silently renders nothing looks like an
|
||||
// organization with no history.
|
||||
content = wrap(
|
||||
<div className="py-12">
|
||||
<p className="text-[#b3261e]">Couldn’t load the timeline. {error}</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={reload}
|
||||
className="mt-3 rounded-full border border-[#138ba0] px-4 py-1.5 text-sm font-medium text-[#138ba0] transition-colors hover:bg-[#eef9fb]"
|
||||
>
|
||||
Try again
|
||||
</button>
|
||||
</div>,
|
||||
);
|
||||
} else {
|
||||
content = wrap(
|
||||
<HistoryTimeline
|
||||
items={items}
|
||||
decades={HISTORY_DECADES}
|
||||
direction="desc"
|
||||
programStartYear={PROGRAM_START_YEAR}
|
||||
/>,
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<PageShell
|
||||
title="History"
|
||||
intro="A near-complete timeline of Next Generation of Unity (NGU), and other Unity Young Adult programs."
|
||||
sections={[
|
||||
{
|
||||
id: "timeline",
|
||||
title: "NGU Timeline",
|
||||
blurb:
|
||||
"Open a year to see what happened.",
|
||||
accent: ACCENT,
|
||||
background: BACKGROUND,
|
||||
content,
|
||||
},
|
||||
]}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
|
@ -1,132 +1,477 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
HOME — /
|
||||
import { useState, useEffect } from "react";
|
||||
import nguLogo from "../assets/NGU_Logo.svg";
|
||||
import fallLogo from "../assets/Fall Logo.svg";
|
||||
import nguLogo_WhiteBG from "../assets/NGU_Logo_WhiteBG.svg";
|
||||
|
||||
Not a PageShell page: the front page has no title bar, and each
|
||||
band draws its own heading in its own style.
|
||||
{/* SVGs */}
|
||||
const DoveSVG = ({ className = "" }: { className?: string }) => (
|
||||
<svg className={className} width="72.867699mm" height="48.568241mm" viewBox="0 0 72.867699 48.568241" id="svg1" xmlns="http://www.w3.org/2000/svg">
|
||||
<defs id="defs1" />
|
||||
<g id="layer1" transform="translate(-70.490069,-117.83965)">
|
||||
<g id="g2-5" transform="matrix(0.71532587,0,0,0.71532587,-173.91758,237.73112)" style={{ display: "inline" }}>
|
||||
<path style={{ color: "#000000", display: "inline", fill: "#ffffff", stroke: "none", strokeWidth: 2.284, strokeMiterlimit: 4, strokeDasharray: "none", strokeOpacity: 1}} d="m 355.91146,-123.11955 c 3.13369,-1.59928 7.04147,-4.49077 10.29591,-6.33595 3.25443,-1.84519 6.30899,-3.58417 9.61426,-4.20523 2.65302,-0.4889 6.37319,-0.18817 9.07211,0.58357 2.69896,0.77175 5.57299,2.70484 7.16593,3.40762 1.59295,0.70275 2.24655,0.19006 2.82855,-0.77494 0.582,-0.96504 2.81839,-6.05064 3.84362,-8.9293 1.02519,-2.87864 2.26409,-5.72337 4.14553,-7.76121 1.88144,-2.03782 2.31893,-2.07776 4.06202,-3.15865 1.74307,-1.08086 10.24244,-3.71628 14.53403,-5.61581 4.29158,-1.89953 8.11957,-3.58996 12.24067,-5.48028 4.12109,-1.89033 6.08861,-2.79441 7.30709,-3.29554 0.273,0.73801 -0.2034,3.06663 -1.16031,5.22317 -0.95691,2.15654 -2.9569,5.04357 -4.86279,7.26365 -1.90589,2.22009 -4.28775,4.10342 -6.82223,5.66812 -2.53448,1.56467 -4.53981,2.45823 -7.60439,3.71266 -3.06457,1.25446 -11.88915,4.7102 -14.64698,7.12005 -2.75786,2.40984 -4.18313,6.63212 -3.64772,7.60115 0.5354,0.96902 2.51391,-1.48598 3.81084,-2.34867 1.29694,-0.8627 1.95172,-1.05814 3.14897,-1.09198 1.17765,-0.0172 2.77532,0.40067 3.29849,0.63293 1.48441,0.659 3.97438,2.00122 3.54176,3.36038 -0.16368,0.51434 -0.19462,0.56904 -3.05611,1.25841 -2.86151,0.68935 -3.48508,1.29579 -3.81533,3.74861 -0.22097,1.47094 -1.44719,3.88743 -3.13317,5.28015 -1.68596,1.39274 -4.55099,2.93627 -8.41717,3.35482 -3.86617,0.41855 -6.17544,3.97192 -6.93256,5.37259 -0.75713,1.40064 -2.66104,5.90506 -2.99685,6.15238 -0.3358,0.24732 -2.76998,-0.36582 -3.79458,-0.82517 -1.02463,-0.45935 -2.612,-1.39111 -3.63624,-2.16132 -1.02425,-0.7702 -3.457,-2.975 -3.0018,-3.64018 0.45519,-0.66516 1.56543,-1.35445 2.73515,-2.12254 1.16972,-0.76811 3.86984,-2.33631 5.3456,-3.59002 1.47576,-1.25372 2.7334,-2.47754 3.4042,-3.48323 0.67079,-1.00567 0.9358,-2.14286 -0.28206,-2.7388 -1.21786,-0.59597 -1.84092,-0.39835 -4.4486,0.0225 -2.60769,0.42097 -4.8218,1.10142 -8.46858,1.9005 -3.64678,0.79905 -7.82786,2.49393 -10.97221,3.07304 -3.14439,0.5791 -4.3363,0.83756 -8.5197,0.95691 -4.1834,0.11935 -7.15938,-0.35864 -8.95468,-0.91763 -1.7953,-0.55899 -2.64147,-1.55556 -2.60415,-2.17667 3.90737,-1.58574 7.9469,-3.2841 11.38348,-5.04009 z" id="path1887-1-3-7-7-6-0-1" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
);
|
||||
|
||||
Driven by the admin's Front page editor through GET /front-page.
|
||||
The hero comes first, always. After it, the bands in the order
|
||||
the admin dragged them into, minus any they hid. Which component
|
||||
draws a band is decided here, in SECTIONS, keyed on the same list
|
||||
the CHECK in migration 017 holds — the database says "retreats,
|
||||
third, called National Retreats"; this file says what a retreats
|
||||
band looks like.
|
||||
const InstagramIcon = ({ id = "ig-gradient" }) => (
|
||||
<svg viewBox="0 0 24 24" className="w-6 h-6 ig-icon" style={{ "--ig-fill": `url(#${id})` }}>
|
||||
<defs>
|
||||
<linearGradient id={id} x1="0%" y1="100%" x2="100%" y2="0%">
|
||||
<stop offset="0%" stopColor="#FEDA75" />
|
||||
<stop offset="25%" stopColor="#FA7E1E" />
|
||||
<stop offset="50%" stopColor="#D62976" />
|
||||
<stop offset="75%" stopColor="#962FBF" />
|
||||
<stop offset="100%" stopColor="#4F5BD5" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<path d="M12 2.163c3.204 0 3.584.012 4.85.07 3.252.148 4.771 1.691 4.919 4.919.058 1.265.069 1.645.069 4.849 0 3.205-.012 3.584-.069 4.849-.149 3.225-1.664 4.771-4.919 4.919-1.266.058-1.644.07-4.85.07-3.204 0-3.584-.012-4.849-.07-3.26-.149-4.771-1.699-4.919-4.92-.058-1.265-.07-1.644-.07-4.849 0-3.204.013-3.583.07-4.849.149-3.227 1.664-4.771 4.919-4.919 1.266-.057 1.645-.069 4.849-.069zM12 0C8.741 0 8.333.014 7.053.072 2.695.272.273 2.69.073 7.052.014 8.333 0 8.741 0 12c0 3.259.014 3.668.072 4.948.2 4.358 2.618 6.78 6.98 6.98C8.333 23.986 8.741 24 12 24c3.259 0 3.668-.014 4.948-.072 4.354-.2 6.782-2.618 6.979-6.98.059-1.28.073-1.689.073-4.948 0-3.259-.014-3.667-.072-4.947-.196-4.354-2.617-6.78-6.979-6.98C15.668.014 15.259 0 12 0zm0 5.838a6.162 6.162 0 100 12.324 6.162 6.162 0 000-12.324zM12 16a4 4 0 110-8 4 4 0 010 8zm6.406-11.845a1.44 1.44 0 100 2.881 1.44 1.44 0 000-2.881z"/>
|
||||
</svg>
|
||||
);
|
||||
|
||||
A band with nothing to show draws nothing: the countdown with no
|
||||
upcoming event, the numbers with no numbers, the timeline with
|
||||
nothing featured, the pathfinder with no paths.
|
||||
const FacebookIcon = () => (
|
||||
<svg viewBox="0 0 24 24" className="w-6 h-6 fb-icon" fill="currentColor">
|
||||
<path d="M24 12.073c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.99 4.388 10.954 10.125 11.854v-8.385H7.078v-3.47h3.047V9.43c0-3.007 1.792-4.669 4.533-4.669 1.312 0 2.686.235 2.686.235v2.953H15.83c-1.491 0-1.956.925-1.956 1.874v2.25h3.328l-.532 3.47h-2.796v8.385C19.612 23.027 24 18.062 24 12.073z"/>
|
||||
</svg>
|
||||
);
|
||||
|
||||
If /front-page fails, the hero still draws (empty) and the error
|
||||
takes the place of the bands, with a retry. There's deliberately
|
||||
no default page to fall back to: it would look fine and hide a
|
||||
broken server.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
const DiscordIcon = () => (
|
||||
<svg viewBox="0 0 24 24" className="w-6 h-6 ds-icon" fill="currentColor">
|
||||
<path d="M20.317 4.37a19.791 19.791 0 00-4.885-1.515.074.074 0 00-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 00-5.487 0 12.64 12.64 0 00-.617-1.25.077.077 0 00-.079-.037A19.736 19.736 0 003.677 4.37a.07.07 0 00-.032.027C.533 9.046-.32 13.58.099 18.057c.001.022.015.04.033.05a19.81 19.81 0 005.993 3.03.078.078 0 00.084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 00-.041-.106 13.107 13.107 0 01-1.872-.892.077.077 0 01-.008-.128 10.2 10.2 0 00.372-.292.074.074 0 01.077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 01.078.01c.12.098.246.198.373.292a.077.077 0 01-.006.127 12.299 12.299 0 01-1.873.892.077.077 0 00-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 00.084.028 19.839 19.839 0 006.002-3.03.077.077 0 00.032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 00-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.946 2.418-2.157 2.418z"/>
|
||||
</svg>
|
||||
);
|
||||
|
||||
import type { ReactNode } from 'react'
|
||||
{/* Link Tables */}
|
||||
const Social_Links = [
|
||||
{ label: "Instagram", href: "https://www.instagram.com/nextgenerationunity/", Icon: InstagramIcon },
|
||||
{ label: "Facebook", href: "https://www.facebook.com/NextGenerationofUnity", Icon: FacebookIcon },
|
||||
{ label: "Discord", href: "https://discord.com/invite/AtngzpqaX5", Icon: DiscordIcon },
|
||||
]
|
||||
|
||||
import HeroStage from './sections/home/HeroStage.tsx'
|
||||
import NextEventCountdown from './sections/home/NextEventCountdown.tsx'
|
||||
import RetreatsBand from './sections/home/RetreatsBand.tsx'
|
||||
import CalendarBand from './sections/home/CalendarBand.tsx'
|
||||
import StatsBand from './sections/home/StatsBand.tsx'
|
||||
import FeaturedTimelineRail from './sections/home/FeaturedTimelineRail.tsx'
|
||||
import Pathfinder from './sections/home/Pathfinder.tsx'
|
||||
import {
|
||||
useFrontPage,
|
||||
type FrontPage,
|
||||
type FrontPageSection,
|
||||
type FrontPageSectionKey,
|
||||
} from '../lib/useFrontPage.ts'
|
||||
import './sections/home/home.css'
|
||||
const Footer_Links = [
|
||||
{ label: "Privacy Policy", href: "#"},
|
||||
{ label: "Terms of Service", href: "#"},
|
||||
{ label: "Contact Us", href: "mailto:info@nextgenerationofunity.org"},
|
||||
]
|
||||
|
||||
type BandProps = {
|
||||
page: FrontPage
|
||||
section: FrontPageSection
|
||||
title: string
|
||||
/** Position among the visible bands, 0 = straight after the hero. */
|
||||
position: number
|
||||
}
|
||||
|
||||
/* Default headings for a band the admin didn't title, and how each
|
||||
one renders. The ids are the page anchors — #connect is what the
|
||||
hero's second button points at out of the box. */
|
||||
const SECTIONS: Record<
|
||||
FrontPageSectionKey,
|
||||
{ title: string; render: (props: BandProps) => ReactNode }
|
||||
> = {
|
||||
countdown: {
|
||||
title: 'Next up',
|
||||
render: ({ page, position }) =>
|
||||
page.countdown && <NextEventCountdown event={page.countdown} overlap={position === 0} />,
|
||||
const EVENTS = [
|
||||
{
|
||||
id: "spring-2025",
|
||||
title: "Spring Retreat 2026",
|
||||
theme: "Altering Intertia",
|
||||
date: "March/April 2026",
|
||||
location: "Unity Village, MO",
|
||||
image: fallLogo, // e.g. springLogo
|
||||
color: "#f1c2fe",
|
||||
gradient:
|
||||
"linear-gradient(150deg, rgba(240, 224, 254, 1), rgba(255, 255, 255, 0.28))",
|
||||
desc_a:
|
||||
"A weekend of connection, workshops, and community for young adults across the Unity movement.",
|
||||
desc_b: null,
|
||||
status: "past",
|
||||
links: [
|
||||
],
|
||||
},
|
||||
retreats: {
|
||||
title: 'National Retreats',
|
||||
render: ({ section, title }) => (
|
||||
<RetreatsBand id="retreats" title={title} blurb={section.blurb} />
|
||||
),
|
||||
{
|
||||
id: "fall-retreat-2026",
|
||||
title: "Fall Retreat 2026",
|
||||
theme: "Consciousness Creates",
|
||||
date: "November 12-15th, 2026",
|
||||
location: "Unity Village, MO",
|
||||
image: fallLogo,
|
||||
color: "#b89421",
|
||||
gradient:
|
||||
"linear-gradient(150deg, rgba(178, 150, 42, 0.45), rgba(230, 200, 120, 0.15) 65%, rgba(255, 255, 255, 0.28))",
|
||||
desc_a:
|
||||
"Join us for an exciting opportunity to connect with young adults from across the country through meaningful conversations, creative workshops, and shared artistic expression. All designed to shift your focus to your highest self.",
|
||||
desc_b: "Registration starting at $150, and $75 lodging cost.",
|
||||
status: "upcoming",
|
||||
links: [
|
||||
{ label: "Register Now!", link: "https://ngu.churchcenter.com/registrations/events/3761999" },
|
||||
{ label: "Scholarship Application", link: "https://ngu.churchcenter.com/people/forms/1261992" },
|
||||
{ label: "Volunteer", link: "https://ngu.churchcenter.com/people/forms/1176908" },
|
||||
],
|
||||
},
|
||||
calendar: {
|
||||
title: 'What’s on',
|
||||
render: ({ section, title }) => (
|
||||
<CalendarBand id="calendar" title={title} blurb={section.blurb} />
|
||||
),
|
||||
{
|
||||
id: "spring-recharge-2027",
|
||||
title: "Spring Recharge 2027",
|
||||
theme: "TBD",
|
||||
date: "March 6th, 2027",
|
||||
location: "Online",
|
||||
image: null, // e.g. eventLogo
|
||||
color: "#138ba0",
|
||||
gradient:
|
||||
null,
|
||||
desc_a:
|
||||
"One-day online event to reconnect in the spring.",
|
||||
desc_b: null,
|
||||
status: "upcoming",
|
||||
links: [
|
||||
],
|
||||
},
|
||||
stats: {
|
||||
title: 'By the numbers',
|
||||
render: ({ page, section, title }) =>
|
||||
page.stats.length > 0 && (
|
||||
<StatsBand id="numbers" title={title} blurb={section.blurb} stats={page.stats} />
|
||||
),
|
||||
},
|
||||
timeline: {
|
||||
title: 'Our story so far',
|
||||
render: ({ section, title }) => (
|
||||
<FeaturedTimelineRail id="story" title={title} blurb={section.blurb} />
|
||||
),
|
||||
},
|
||||
connect: {
|
||||
title: 'Find your way in',
|
||||
render: ({ page, section, title }) => (
|
||||
<Pathfinder id="connect" title={title} blurb={section.blurb} paths={page.paths} />
|
||||
),
|
||||
},
|
||||
}
|
||||
{
|
||||
id: "spring-service-2027",
|
||||
title: "Service Week 2027",
|
||||
theme: "Leadership & Service",
|
||||
date: "April 4-9th, 2027",
|
||||
location: "Unity Village, MO",
|
||||
image: null, // e.g. eventLogo
|
||||
color: "#138ba0",
|
||||
gradient:
|
||||
null,
|
||||
desc_a:
|
||||
"Join us at beautiful Unity Village for a week of leadership development and service projects.",
|
||||
desc_b: null,
|
||||
status: "upcoming",
|
||||
links: [
|
||||
],
|
||||
}
|
||||
];
|
||||
|
||||
export default function Home() {
|
||||
const { data: page, error, reload } = useFrontPage()
|
||||
const START_INDEX = (() => {
|
||||
const i = EVENTS.findIndex(e => e.status === "upcoming");
|
||||
return i === -1 ? EVENTS.length - 1 : i;
|
||||
})();
|
||||
|
||||
const TEAL = "#138ba0";
|
||||
|
||||
const CARD = "min(48rem, 90vw)"; // the card itself — your original max-w-3xl
|
||||
const GAP = "5rem"; // space between cards ← this is your knob
|
||||
const SLIDE = `calc(${CARD} + ${GAP})`;
|
||||
const HALF_SLIDE = `calc(${CARD} / 2)`;
|
||||
const FADE_DIST = "18rem";
|
||||
|
||||
const EDGE_FADE = `linear-gradient(to right,
|
||||
transparent calc(50% - (${HALF_SLIDE} + ${FADE_DIST})),
|
||||
black calc(50% - ${HALF_SLIDE}),
|
||||
black calc(50% + ${HALF_SLIDE}),
|
||||
transparent calc(50% + (${HALF_SLIDE} + ${FADE_DIST})))`;
|
||||
|
||||
{/* Functions */}
|
||||
function WaveText({ text, baseDelay = 0, step = 0.1 }) {
|
||||
return (
|
||||
<>
|
||||
<HeroStage hero={page?.hero ?? null} />
|
||||
{text.split("").map((char, i) => (
|
||||
<span
|
||||
key={i}
|
||||
className="float-anim"
|
||||
style={{ animationDelay: `${-i * step}s` }}
|
||||
>
|
||||
{char === " " ? "\u00A0" : char}
|
||||
</span>
|
||||
))}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
{error && (
|
||||
<section className="px-6 py-24 text-center">
|
||||
<p className="text-[#b3261e]">Couldn’t load the front page. {error}</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={reload}
|
||||
className="mt-4 rounded-full border border-[#138ba0] px-5 py-2 font-semibold text-[#138ba0] hover:bg-[#eef9fb]"
|
||||
>
|
||||
Try again
|
||||
</button>
|
||||
|
||||
|
||||
export default function Home() {
|
||||
{/* Other useState consts and Functions*/}
|
||||
const [showCalendar, setShowCalendar] = useState(false);
|
||||
const [index, setIndex] = useState(START_INDEX);
|
||||
|
||||
const event = EVENTS[index];
|
||||
const isPast = event.status === "past";
|
||||
const currentColor = event.color || TEAL;
|
||||
|
||||
const prev = () => setIndex(i => Math.max(0, i - 1));
|
||||
const next = () => setIndex(i => Math.min(EVENTS.length - 1, i + 1));
|
||||
|
||||
const arrowStyle = enabled => ({
|
||||
border: `1px solid ${TEAL}`,
|
||||
background: "rgba(255,255,255,0.6)",
|
||||
color: enabled ? TEAL : "#b8c6c9",
|
||||
cursor: enabled ? "pointer" : "default",
|
||||
opacity: enabled ? 1 : 0.4,
|
||||
});
|
||||
|
||||
{/* Start of Main Content*/}
|
||||
return (
|
||||
<>
|
||||
{/* ── HERO/ABOUT ─────────────────────────────────────────────── */}
|
||||
<section id="hero" className="relative min-h-screen flex flex-col items-center justify-center text-center overflow-hidden pt-20" style={{ background: "linear-gradient(135deg, #042f3a 0%, #004552 40%, #004c52 70%, #0e7a5a 100%)", opacity: 1 }}>
|
||||
{/* Floating doves */}
|
||||
<div className="absolute top-20 right-16 opacity-30 float-anim"><DoveSVG className="w-20 h-16"/></div>
|
||||
<div className="absolute top-32 right-36 opacity-20 float-anim" style={{ animationDelay: "1s" }}><DoveSVG className="w-10 h-8"/></div>
|
||||
<div className="absolute bottom-32 left-16 opacity-25 float-anim" style={{ animationDelay: "2s" }}><DoveSVG className="w-16 h-12"/></div>
|
||||
|
||||
<div className="relative z-10 max-w-4xl mx-auto px-6">
|
||||
<h1 className="text-5xl md:text-7xl font-900 text-white leading-tight mb-4" style={{ fontFamily: "Poppins,sans-serif" }}>
|
||||
Next Generation<br />
|
||||
<span className="grad-hero-text">
|
||||
<WaveText text="of Unity" step={0.1} />
|
||||
</span>
|
||||
</h1>
|
||||
|
||||
<p className="text-white/70 text-lg md:text-xl max-w-2xl mx-auto leading-relaxed" style={{ fontFamily: "League Spartan,sans-serif" }}>
|
||||
A young-adult focused community ministy focused on supporting individuals in Unity Ministries from 18-40 years old. Rooted in spiritual growth, leadership development, and sacred service.
|
||||
</p>
|
||||
<p className="text-white/90 text-lg md:text-xl max-w-2xl mx-auto leading-relaxed mb-10" style={{ fontFamily: "League Spartan,sans-serif", fontWeight: "bold"}}>
|
||||
We are the future of the Unity Movement.
|
||||
</p>
|
||||
|
||||
<div className="flex flex-wrap gap-4 justify-center">
|
||||
<a href="https://www.instagram.com/nextgenerationunity" className="px-8 py-4 rounded-full text-white font-700 text-lg transition-all duration-300 hover:scale-105 hover:shadow-xl shadow-lg" style={{ background: "linear-gradient(135deg, #008fa8, #88b668)", fontFamily: "Poppins,sans-serif" }}>
|
||||
Follow Us on Instagram
|
||||
</a>
|
||||
<a href="#events" className="px-8 py-4 rounded-full font-700 text-lg transition-all duration-300 hover:scale-105" style={{ border: "2px solid rgba(92, 231, 255,0.6)", color: "#5ce7ff", fontFamily: "Poppins,sans-serif" }}>
|
||||
Attend a Retreat
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
)}
|
||||
|
||||
{page?.sections.map((section, position) => {
|
||||
const band = SECTIONS[section.section]
|
||||
// A key the CHECK has gained since this file was written.
|
||||
if (!band) return null
|
||||
return (
|
||||
<div key={section.section}>
|
||||
{band.render({
|
||||
page,
|
||||
section,
|
||||
title: section.title || band.title,
|
||||
position,
|
||||
{/* #About ─────────────────────────────────────── */}
|
||||
<section id="about" className="py-24 px-6" style={{ background: "#f0fcfd" }}>
|
||||
<div className="max-w-6xl mx-auto">
|
||||
<div className="text-center mb-16">
|
||||
<h2 className="mt-4 text-4xl md:text-5xl font-800 text-[#138ba0]">A Ministry Designed For<br />Young Adults</h2>
|
||||
<p className="mt-4 text-[#0a5260]/70 max-w-2xl mx-auto text-lg leading-relaxed">
|
||||
NGU exists to connect young adults across Unity ministries and create spaces for authentic spiritual exploration, community, and conscious living.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="grid md:grid-cols-3 gap-8">
|
||||
{[
|
||||
{ title: "Spiritual Community", icon: "🕊️", desc: "We welcome all adults under 40 no matter where you are on your journey. Our community thrives on diversity of thought, background, and belief." },
|
||||
{ title: "Conscious Development", icon: "🌱", desc: "Through workshops, retreats, and gatherings, we cultivate minds and spirits ready to engage with life's deepest questions." },
|
||||
{ title: "Connected Network", icon: "🌐", desc: "NGU spans regions nationwide. From local chapter small group ministry to regional and national gatherings and retreats, you're never that far away from your people." },
|
||||
].map((card) => (
|
||||
<div key={card.title} className="p-8 rounded-2xl transition-all duration-300 hover:-translate-y-1 hover:shadow-xl" style={{ background: "white", border: "1px solid rgba(19,139,160,0.15)" }}>
|
||||
<div className="text-4xl mb-4">{card.icon}</div>
|
||||
<h3 className="font-700 text-xl text-[#073d4a] mb-3">{card.title}</h3>
|
||||
<p className="text-[#0a5260]/70 leading-relaxed text-sm">{card.desc}</p>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{/* #Events ─────────────────────────────────────────────── */}
|
||||
<section id="events" className="py-24 overflow-hidden" style={{ background: "#eef9fb" }}>
|
||||
<div className="max-w-6xl mx-auto px-6">
|
||||
<div className="text-center mb-16">
|
||||
<h2 className="mt-4 text-4xl md:text-5xl font-800 text-[#138ba0]">
|
||||
{isPast ? "Past Events" : "Upcoming Events"}
|
||||
</h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Carousel — full-bleed so neighbors can peek in from the screen edges */}
|
||||
<div className="relative mb-6">
|
||||
{/* Masked viewport: everything outside the fade gradient is invisible */}
|
||||
<div
|
||||
className="overflow-hidden"
|
||||
style={{ maskImage: EDGE_FADE, WebkitMaskImage: EDGE_FADE }}
|
||||
>
|
||||
{/* Sliding track */}
|
||||
<div
|
||||
className="flex items-stretch transition-transform duration-500 ease-out"
|
||||
style={{
|
||||
transform: `translateX(calc(50% - ${index + 0.5} * ${SLIDE}))`,
|
||||
}}
|
||||
>
|
||||
{EVENTS.map((ev, i) => {
|
||||
const active = i === index;
|
||||
const past = ev.status === "past";
|
||||
const color = ev.color || TEAL;
|
||||
return (
|
||||
<div
|
||||
key={ev.id}
|
||||
className="shrink-0"
|
||||
style={{
|
||||
width: SLIDE,
|
||||
padding: `0 calc(${GAP} / 2)`,
|
||||
cursor: active ? "default" : "pointer",
|
||||
}}
|
||||
onClick={() => !active && setIndex(i)}
|
||||
aria-hidden={!active}
|
||||
>
|
||||
<div
|
||||
className="rounded-3xl text-black overflow-hidden shadow-2xl h-full"
|
||||
style={{
|
||||
border: `1px solid ${color}`,
|
||||
background: ev.gradient,
|
||||
filter: past ? "saturate(0.75)" : "none",
|
||||
pointerEvents: active ? "auto" : "none",
|
||||
}}
|
||||
>
|
||||
<div className="p-10">
|
||||
<div className="grid grid-cols-1 md:grid-cols-3 mb-4">
|
||||
<div className="md:col-span-2">
|
||||
<img
|
||||
src={nguLogo_WhiteBG}
|
||||
alt="Next Generation of Unity"
|
||||
className="h-15 w-auto mb-6"
|
||||
/>
|
||||
<h3 className="text-4xl font-900">{ev.title}</h3>
|
||||
{ev.theme && (
|
||||
<p className="text-2xl font-300 font-bold">"{ev.theme}"</p>
|
||||
)}
|
||||
<p className="text-2xl">{ev.date}</p>
|
||||
<p className="text-2xl">{ev.location}</p>
|
||||
</div>
|
||||
<div className="md:col-span-1 flex justify-end items-start">
|
||||
{ev.image && (
|
||||
<img src={ev.image} alt={ev.title} className="h-60" />
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{ev.desc_a && <p className="mb-2 leading-relaxed">{ev.desc_a}</p>}
|
||||
{ev.desc_b && <p className="leading-relaxed">{ev.desc_b}</p>}
|
||||
|
||||
{ev.links.length > 0 ? (
|
||||
<div className="grid grid-cols-2 md:grid-cols-3 gap-3 mt-8">
|
||||
{ev.links.map(item => (
|
||||
<a
|
||||
key={item.label}
|
||||
href={item.link}
|
||||
className="py-2.5 px-3 rounded-xl font-700 transition-all duration-200 hover:scale-105 text-center"
|
||||
style={{ border: `1px solid ${color}` }}
|
||||
>
|
||||
{item.label}
|
||||
</a>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
past ? (
|
||||
<p className="mt-8 text-center font-600" style={{ color:TEAL }}>
|
||||
This event has concluded, thank you to everyone who joined us!
|
||||
</p>
|
||||
) : (
|
||||
<>
|
||||
<p className="mt-8 text-center font-600" style={{ color:TEAL }}>
|
||||
Registration has not opened yet, follow our instagram for more details.
|
||||
</p>
|
||||
<a href="https://instagram.com/nextgenerationunity" target="_blank" rel="noopener noreferrer" className="ig-link mt-4 w-fit mx-auto flex items-center justify-center gap-3 py-3 px-4 rounded-xl font-700 transition-all duration-200 hover:scale-[1.02]" style={{ border: `1px solid ${color}`, color }}>
|
||||
<InstagramIcon id={`ig-${ev.id}`} />
|
||||
@nextgenerationunity
|
||||
</a>
|
||||
</>
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* Arrows — outside the masked element so they never fade */}
|
||||
<button
|
||||
onClick={prev}
|
||||
disabled={index === 0}
|
||||
aria-label="Previous event"
|
||||
className="absolute left-2 md:left-6 top-1/2 -translate-y-1/2 z-10 h-12 w-12 rounded-full flex items-center justify-center text-2xl font-700 shadow-lg transition-all duration-200 hover:scale-110 disabled:hover:scale-100"
|
||||
style={arrowStyle(index > 0)}
|
||||
>
|
||||
‹
|
||||
</button>
|
||||
<button
|
||||
onClick={next}
|
||||
disabled={index === EVENTS.length - 1}
|
||||
aria-label="Next event"
|
||||
className="absolute right-2 md:right-6 top-1/2 -translate-y-1/2 z-10 h-12 w-12 rounded-full flex items-center justify-center text-2xl font-700 shadow-lg transition-all duration-200 hover:scale-110 disabled:hover:scale-100"
|
||||
style={arrowStyle(index < EVENTS.length - 1)}
|
||||
>
|
||||
›
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="max-w-6xl mx-auto px-6">
|
||||
{/* Dot indicators */}
|
||||
<div className="flex justify-center gap-2 mb-10">
|
||||
{EVENTS.map((e, i) => (
|
||||
<button
|
||||
key={e.id}
|
||||
onClick={() => setIndex(i)}
|
||||
aria-label={`Go to ${e.title}`}
|
||||
className="h-2.5 rounded-full transition-all duration-200"
|
||||
style={{
|
||||
width: i === index ? "1.5rem" : "0.625rem",
|
||||
background: i === index ? currentColor : "#b8c6c9",
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<p className="text-center text-[#138ba0] font-600 text-sm">
|
||||
· More events coming soon, stay connected for announcements ·
|
||||
</p>
|
||||
</div>
|
||||
</section>
|
||||
{/* #Connect -------------------------------------------- */}
|
||||
<section id="connect" className="py-24 px-6" style={{ background: "white" }}>
|
||||
<div className="max-w-6xl mx-auto">
|
||||
<div className="text-center mb-16">
|
||||
<h2 className="mt-4 text-4xl md:text-5xl font-800 text-[#138ba0]" style={{ fontFamily: "Poppins,sans-serif" }}>
|
||||
Ready to Connect?
|
||||
</h2>
|
||||
<p className="mt-4 text-[#0a5260]/70 max-w-xl mx-auto text-xl" style={{ fontFamily: "League Spartan,sans-serif" }}>Find your place in the NGU community</p>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 max-w-3xl mx-auto">
|
||||
{[
|
||||
{ label: "Volunteer", desc: "Help create transformative experiences for young adults", link:"https://ngu.churchcenter.com/people/forms/1176908"},
|
||||
{ label: "Membership", desc: "Become an official member of the NGU community", link:"https://ngu.churchcenter.com/people/forms/1135816"},
|
||||
{ label: "Affiliation Form", desc: "Affiliate your ministry or spiritual organization with NGU", link:"https://ngu.churchcenter.com/people/forms/1135750"},
|
||||
{ label: "Speaker & Musician Directory", desc: "Join our network of speakers, musicians, and facilitators", link:"https://ngu.churchcenter.com/people/forms/1173181"},
|
||||
].map(item => (
|
||||
<a key={item.label} href={item.link} className="flex items-center gap-5 p-6 rounded-2xl text-left transition-all duration-300 hover:-translate-y-1 hover:shadow-xl group" style={{ background: "#073d4a", border: "1px solid rgba(45,200,224,0.2)" }}>
|
||||
<div>
|
||||
<p className="text-white font-700 mb-1" style={{ fontFamily: "Poppins,sans-serif" }}>{item.label}</p>
|
||||
<p className="text-white/80 leading-snug" style={{ fontFamily: "League Spartan,sans-serif" }}>{item.desc}</p>
|
||||
</div>
|
||||
{/* Arrow */}
|
||||
<svg className="w-5 h-5 text-[#10d48a] ml-auto flex-shrink-0 opacity-0 group-hover:opacity-100 transition-opacity" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fillRule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clipRule="evenodd"/>
|
||||
</svg>
|
||||
</a>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<div className="mt-10 text-center">
|
||||
<div className="inline-flex flex-wrap justify-center gap-4">
|
||||
<a
|
||||
href="https://ngu.churchcenter.com/calendar?view=gallery"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="inline-flex items-center gap-2 px-8 py-4 rounded-full text-white font-700 text-lg transition-all duration-300 hover:scale-105"
|
||||
style={{ background: "linear-gradient(135deg, #138ba0, #10d48a)", fontFamily: "Outfit,sans-serif" }}
|
||||
>
|
||||
📅 View NGU Calendar
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
|
||||
<path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6" />
|
||||
<polyline points="15 3 21 3 21 9" />
|
||||
<line x1="10" y1="14" x2="21" y2="3" />
|
||||
</svg>
|
||||
</a>
|
||||
|
||||
<button
|
||||
onClick={() => setShowCalendar(!showCalendar)}
|
||||
className="inline-flex items-center gap-2 px-8 py-4 rounded-full font-700 text-lg transition-all duration-300 hover:scale-105"
|
||||
style={{ border: "2px solid #138ba0", color: "#138ba0", background: "transparent", fontFamily: "Outfit,sans-serif" }}
|
||||
>
|
||||
{showCalendar ? "▲ Hide Calendar" : "▼ Show Calendar Here"}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{showCalendar && (
|
||||
<div className="mt-8 mx-auto max-w-4xl rounded-2xl shadow-lg p-6" style={{ border: "2px solid #138ba0" }}>
|
||||
<iframe
|
||||
src="https://ngu.churchcenter.com/calendar?embed=true&view=month"
|
||||
title="NGU Calendar"
|
||||
className="w-full planning-center-calender-embed"
|
||||
style={{ height: "700px", border: "none" }}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,444 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
ORGANIZATION DETAIL
|
||||
/regions/:id /chapters/:id /partners/:id /organizations/:id
|
||||
|
||||
One component behind four routes, because organizations are one
|
||||
table. The kind decides which extras render, not which file runs.
|
||||
|
||||
The URL kind is decoration — the slug is what identifies the
|
||||
record — so a request for /chapters/great-lakes when that slug is
|
||||
a region redirects to the canonical path rather than rendering a
|
||||
correct page at a wrong address.
|
||||
|
||||
Leadership arrives flat with team_id and team_name on each row,
|
||||
so grouping costs nothing. `teams` is fetched alongside anyway:
|
||||
a team with no current public members would otherwise be
|
||||
invisible here instead of listed, and its page unreachable.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Link, Navigate, useLocation, useParams } from 'react-router-dom'
|
||||
|
||||
import PageShell from '../components/PageShell.tsx'
|
||||
import PageState from '../components/PageState.tsx'
|
||||
import ContentBlocks from '../components/ContentBlocks.tsx'
|
||||
import PeopleTiles from '../components/PeopleTiles.tsx'
|
||||
import EventListCards from './sections/EventList-Cards.tsx'
|
||||
import {
|
||||
useOrganization,
|
||||
type Leader,
|
||||
type OrganizationRecord,
|
||||
} from '../lib/useContent.ts'
|
||||
import { orgHref, orgListHref, teamHref } from '../lib/hrefs.ts'
|
||||
import { orgLogo, personPhoto } from '../lib/media.ts'
|
||||
|
||||
const TEAL = '#138ba0'
|
||||
const BODY = '#4a6b72'
|
||||
|
||||
export default function OrganizationDetail() {
|
||||
const { id } = useParams()
|
||||
const { pathname } = useLocation()
|
||||
const { data: org, loading, error, notFound, reload } = useOrganization(id)
|
||||
|
||||
if (!org) {
|
||||
return (
|
||||
<PageState
|
||||
loading={loading}
|
||||
error={error}
|
||||
notFound={notFound}
|
||||
onRetry={reload}
|
||||
noun="organization"
|
||||
backTo="/community"
|
||||
backLabel="Community"
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
// /chapters/x when x is a region: same record, wrong address.
|
||||
//
|
||||
// useLocation, not window.location: the latter is outside the
|
||||
// router's awareness — always "/" under HashRouter, and free to
|
||||
// be stale mid-navigation, either of which turns this into a
|
||||
// redirect loop rather than a one-shot correction.
|
||||
//
|
||||
// Guarded on org.id because a record with no id would redirect to
|
||||
// /chapters/undefined, which is a worse page than the one we're
|
||||
// already on. All four organization routes must be registered or
|
||||
// this redirects somewhere nothing matches.
|
||||
const canonical = org.id ? orgHref(org.id, org.kind) : null
|
||||
if (canonical && decodeURIComponent(pathname) !== canonical) {
|
||||
return <Navigate to={canonical} replace />
|
||||
}
|
||||
|
||||
const accent = org.color || TEAL
|
||||
const back = orgListHref(org.kind)
|
||||
|
||||
const sections: any[] = [
|
||||
{
|
||||
id: 'about',
|
||||
title: 'About',
|
||||
accent,
|
||||
background: '#ffffff',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-8">
|
||||
<Facts org={org} accent={accent} back={back} />
|
||||
|
||||
{org.description.map((paragraph, index) => (
|
||||
<p key={index} className="leading-relaxed max-w-3xl" style={{ color: BODY }}>
|
||||
{paragraph}
|
||||
</p>
|
||||
))}
|
||||
|
||||
<div className="max-w-3xl">
|
||||
<ContentBlocks blocks={org.blocks} accent={accent} />
|
||||
</div>
|
||||
|
||||
<Contact org={org} accent={accent} />
|
||||
</div>
|
||||
),
|
||||
},
|
||||
]
|
||||
|
||||
const teamBlocks = groupLeadership(org)
|
||||
|
||||
if (teamBlocks.length > 0) {
|
||||
sections.push({
|
||||
id: 'leadership',
|
||||
title: 'Who runs it',
|
||||
accent,
|
||||
background: '#eef9fb',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-12">
|
||||
{teamBlocks.map((block) => (
|
||||
<div key={block.key}>
|
||||
<div className="mb-4">
|
||||
{block.teamId ? (
|
||||
<h3 className="text-xl font-bold">
|
||||
<Link
|
||||
to={teamHref(block.teamId)}
|
||||
className="hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
{block.label}
|
||||
</Link>
|
||||
</h3>
|
||||
) : (
|
||||
block.label && (
|
||||
<h3 className="text-xl font-bold" style={{ color: accent }}>
|
||||
{block.label}
|
||||
</h3>
|
||||
)
|
||||
)}
|
||||
{block.tagline && (
|
||||
<p className="mt-1 text-sm" style={{ color: BODY }}>
|
||||
{block.tagline}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{block.people.length > 0 ? (
|
||||
<PeopleTiles
|
||||
size="lg"
|
||||
accent={block.accent || accent}
|
||||
people={block.people.map((leader) => ({
|
||||
id: leader.person_id,
|
||||
name: leader.display_name,
|
||||
title: leader.title,
|
||||
pronouns: leader.pronouns,
|
||||
public_email: leader.public_email,
|
||||
photo: personPhoto(leader.photo),
|
||||
is_owner: leader.is_owner,
|
||||
}))}
|
||||
/>
|
||||
) : (
|
||||
<p className="text-sm italic" style={{ color: BODY }}>
|
||||
No members listed yet.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
if (org.kind === 'region' && (org.details.chapters?.length ?? 0) > 0) {
|
||||
sections.push({
|
||||
id: 'chapters',
|
||||
title: 'Chapters',
|
||||
blurb: org.details.map_note ?? undefined,
|
||||
accent,
|
||||
background: '#ffffff',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
|
||||
{(org.details.chapters ?? []).map((chapter) => (
|
||||
<Link
|
||||
key={chapter.id}
|
||||
to={orgHref(chapter.id, 'chapter')}
|
||||
className="flex items-center gap-4 rounded-lg border p-4 transition-colors hover:bg-[#eef9fb]"
|
||||
style={{ borderColor: `${accent}40` }}
|
||||
>
|
||||
<Logo file={chapter.logo} name={chapter.name} accent={accent} />
|
||||
<span>
|
||||
<span className="block font-semibold" style={{ color: accent }}>
|
||||
{chapter.name}
|
||||
</span>
|
||||
{chapter.location_label && (
|
||||
<span className="block text-sm" style={{ color: BODY }}>
|
||||
{chapter.location_label}
|
||||
</span>
|
||||
)}
|
||||
</span>
|
||||
</Link>
|
||||
))}
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
if (org.awards.length > 0) {
|
||||
sections.push({
|
||||
id: 'awards',
|
||||
title: 'Awards',
|
||||
blurb: `Given by ${org.short_name || org.name}.`,
|
||||
accent,
|
||||
background: '#eef9fb',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 grid gap-4 sm:grid-cols-2">
|
||||
{org.awards.map((award) => (
|
||||
<Link
|
||||
key={award.id}
|
||||
to={`/awards/${award.id}`}
|
||||
className="rounded-lg border bg-white p-5 transition-colors hover:bg-[#f6fbfc]"
|
||||
style={{ borderColor: `${accent}40` }}
|
||||
>
|
||||
<span className="block font-semibold" style={{ color: accent }}>
|
||||
{award.name}
|
||||
</span>
|
||||
{award.description && (
|
||||
<span className="mt-1 block text-sm" style={{ color: BODY }}>
|
||||
{award.description}
|
||||
</span>
|
||||
)}
|
||||
<span className="mt-3 block text-xs uppercase tracking-wide opacity-70" style={{ color: BODY }}>
|
||||
{award.recipient_count === 0
|
||||
? 'No recipients yet'
|
||||
: `${award.recipient_count} recipient${award.recipient_count === 1 ? '' : 's'}`}
|
||||
</span>
|
||||
</Link>
|
||||
))}
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
// EventList-Cards fetches and renders this itself — its own
|
||||
// docstring offers `host` for exactly this case, and a card there
|
||||
// already knows about gradients, logos, past-event collapsing and
|
||||
// the carousel. A second grid here was the same component written
|
||||
// worse.
|
||||
//
|
||||
// `org.events` is still what decides whether the section exists at
|
||||
// all: an organization that has never hosted anything shouldn't
|
||||
// get a heading followed by "events coming soon".
|
||||
if (org.events.length > 0) {
|
||||
sections.push({
|
||||
id: 'events',
|
||||
title: 'Gatherings',
|
||||
accent,
|
||||
background: '#ffffff',
|
||||
content: (
|
||||
<EventListCards
|
||||
host={org.id}
|
||||
view="grid"
|
||||
accent={accent}
|
||||
empty="· Nothing on the calendar right now ·"
|
||||
/>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
return <PageShell title={org.name} intro={org.tagline ?? undefined} sections={sections} />
|
||||
}
|
||||
|
||||
/* ── Pieces ──────────────────────────────────────────────────── */
|
||||
|
||||
function Facts({
|
||||
org,
|
||||
accent,
|
||||
back,
|
||||
}: {
|
||||
org: OrganizationRecord
|
||||
accent: string
|
||||
back: { to: string; label: string }
|
||||
}) {
|
||||
const where =
|
||||
org.location_label || [org.locality, org.state_code].filter(Boolean).join(', ')
|
||||
|
||||
return (
|
||||
<div className="flex flex-wrap items-center gap-x-6 gap-y-3 text-sm">
|
||||
{where && <span style={{ color: BODY }}>{where}</span>}
|
||||
|
||||
{org.kind === 'region' && org.details.scope && (
|
||||
<span style={{ color: BODY }}>{org.details.scope}</span>
|
||||
)}
|
||||
|
||||
{org.kind === 'chapter' && org.details.region_id && (
|
||||
<span style={{ color: BODY }}>
|
||||
Part of{' '}
|
||||
<Link
|
||||
to={orgHref(org.details.region_id, 'region')}
|
||||
className="font-medium hover:underline"
|
||||
style={{ color: org.details.region_color || accent }}
|
||||
>
|
||||
{org.details.region_name}
|
||||
</Link>
|
||||
</span>
|
||||
)}
|
||||
|
||||
{org.kind === 'chapter' && org.details.meets && (
|
||||
<span style={{ color: BODY }}>Meets {org.details.meets}</span>
|
||||
)}
|
||||
{org.kind === 'chapter' && org.details.started && (
|
||||
<span style={{ color: BODY }}>Since {org.details.started}</span>
|
||||
)}
|
||||
{org.is_online && <span style={{ color: BODY }}>Online</span>}
|
||||
|
||||
<Link to={back.to} className="ml-auto hover:underline" style={{ color: accent }}>
|
||||
{back.label}
|
||||
</Link>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function Contact({ org, accent }: { org: OrganizationRecord; accent: string }) {
|
||||
const hasAny =
|
||||
org.links.length > 0 || org.socials.length > 0 || org.website || org.email
|
||||
|
||||
if (!hasAny) return null
|
||||
|
||||
return (
|
||||
<div className="flex flex-wrap gap-3">
|
||||
{org.links.map((link) => (
|
||||
<a
|
||||
key={link.url}
|
||||
href={link.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="rounded-full px-5 py-2 text-sm font-semibold text-white transition-transform hover:scale-105"
|
||||
style={{ background: accent }}
|
||||
>
|
||||
{link.label}
|
||||
</a>
|
||||
))}
|
||||
|
||||
{/* website and email arrive as bare strings (splitLinks in
|
||||
shape.js); socials are whole link rows. */}
|
||||
{[
|
||||
org.website ? { url: org.website, label: 'Website' } : null,
|
||||
org.email ? { url: `mailto:${org.email}`, label: org.email } : null,
|
||||
...org.socials,
|
||||
]
|
||||
.filter((link): link is NonNullable<typeof link> => Boolean(link))
|
||||
.map((link) => (
|
||||
<a
|
||||
key={link.url}
|
||||
href={link.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="rounded-full border px-4 py-1.5 text-sm font-medium transition-colors hover:bg-[#eef9fb]"
|
||||
style={{ borderColor: accent, color: accent }}
|
||||
>
|
||||
{link.label}
|
||||
</a>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function Logo({
|
||||
file,
|
||||
name,
|
||||
accent,
|
||||
}: {
|
||||
file?: string | null
|
||||
name: string
|
||||
accent: string
|
||||
}) {
|
||||
const src = orgLogo(file)
|
||||
if (!src) {
|
||||
return (
|
||||
<span
|
||||
aria-hidden="true"
|
||||
className="flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-xs font-bold text-white"
|
||||
style={{ background: accent }}
|
||||
>
|
||||
{name.slice(0, 2).toUpperCase()}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
return <img src={src} alt="" loading="lazy" className="h-10 w-10 shrink-0 object-contain" />
|
||||
}
|
||||
|
||||
/* ── Leadership → team blocks ────────────────────────────────── */
|
||||
|
||||
type TeamBlock = {
|
||||
key: string
|
||||
teamId: string | null
|
||||
label: string | null
|
||||
tagline?: string | null
|
||||
accent?: string | null
|
||||
people: Leader[]
|
||||
}
|
||||
|
||||
/* Order comes from `teams` (the admin's sort_order), not from the
|
||||
order people happen to appear in. Three cases to cover:
|
||||
affiliations with no team at all, teams with nobody in them, and
|
||||
people filed under a team that is no longer published. */
|
||||
function groupLeadership(org: OrganizationRecord): TeamBlock[] {
|
||||
const byTeam = new Map<string, Leader[]>()
|
||||
const loose: Leader[] = []
|
||||
|
||||
for (const leader of org.leadership) {
|
||||
if (!leader.team_id) {
|
||||
loose.push(leader)
|
||||
continue
|
||||
}
|
||||
const list = byTeam.get(leader.team_id)
|
||||
if (list) list.push(leader)
|
||||
else byTeam.set(leader.team_id, [leader])
|
||||
}
|
||||
|
||||
const blocks: TeamBlock[] = []
|
||||
|
||||
// People who hold a role in the organization without sitting on a
|
||||
// team. Usually the leads. No heading — they are the page.
|
||||
if (loose.length > 0) {
|
||||
blocks.push({ key: 'loose', teamId: null, label: null, people: loose })
|
||||
}
|
||||
|
||||
for (const team of org.teams) {
|
||||
blocks.push({
|
||||
key: team.id,
|
||||
teamId: team.id,
|
||||
label: team.name,
|
||||
tagline: team.tagline,
|
||||
accent: team.color,
|
||||
people: byTeam.get(team.id) ?? [],
|
||||
})
|
||||
byTeam.delete(team.id)
|
||||
}
|
||||
|
||||
// Whatever is left is filed under an unpublished team. Its page
|
||||
// isn't reachable, so the heading is plain text — but the people
|
||||
// are real and shouldn't silently vanish from the org.
|
||||
for (const [teamId, people] of byTeam) {
|
||||
blocks.push({
|
||||
key: teamId,
|
||||
teamId: null,
|
||||
label: people[0]?.team_name ?? null,
|
||||
people,
|
||||
})
|
||||
}
|
||||
|
||||
return blocks
|
||||
}
|
||||
|
|
@ -1,363 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
PERSON DETAIL — /people/:id
|
||||
|
||||
Everything public that points at one person, gathered by
|
||||
GET /people/:id in people.js. Visibility is decided there, the
|
||||
same way each list's own page decides it, so nothing here
|
||||
filters.
|
||||
|
||||
Roles are current and past. A roster only ever wants who holds
|
||||
a seat now; a person's record is also where "served on the board
|
||||
2018–2022" belongs, so ended affiliations list under Previously.
|
||||
|
||||
public_phone is never sent. The email is the one contact detail
|
||||
the page offers.
|
||||
|
||||
Sections after About alternate background in the order they
|
||||
appear, so a person with no roles doesn't get two tinted bands
|
||||
in a row.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Link, useParams } from 'react-router-dom'
|
||||
|
||||
import PageShell, { type ShellSection } from '../components/PageShell.tsx'
|
||||
import PageState from '../components/PageState.tsx'
|
||||
import ContentBlocks from '../components/ContentBlocks.tsx'
|
||||
import {
|
||||
usePerson,
|
||||
type PersonEvent,
|
||||
type PersonRecord,
|
||||
type PersonRole,
|
||||
} from '../lib/useContent.ts'
|
||||
import { awardHref, eventHref, orgHref, teamHref } from '../lib/hrefs.ts'
|
||||
import { initials, personPhoto } from '../lib/media.ts'
|
||||
import { eventTypeLabel } from '../lib/eventTypes.ts'
|
||||
|
||||
const TEAL = '#138ba0'
|
||||
const BODY = '#4a6b72'
|
||||
const BACKGROUNDS = ['#ffffff', '#eef9fb']
|
||||
|
||||
/* affiliations.role, for a row with no title of its own. */
|
||||
const ROLE_LABEL: Record<string, string> = {
|
||||
lead: 'Lead',
|
||||
board: 'Board member',
|
||||
staff: 'Staff',
|
||||
volunteer: 'Volunteer',
|
||||
member: 'Member',
|
||||
}
|
||||
|
||||
const capitalize = (word: string) =>
|
||||
word ? word.charAt(0).toUpperCase() + word.slice(1) : ''
|
||||
|
||||
export default function PersonDetail() {
|
||||
const { id } = useParams()
|
||||
const { data: person, loading, error, notFound, reload } = usePerson(id)
|
||||
|
||||
if (!person) {
|
||||
return (
|
||||
<PageState
|
||||
loading={loading}
|
||||
error={error}
|
||||
notFound={notFound}
|
||||
onRetry={reload}
|
||||
noun="person"
|
||||
backTo="/leadership"
|
||||
backLabel="Leadership"
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
const accent = TEAL
|
||||
const current = person.roles.filter((role) => !role.ended_on)
|
||||
const previous = person.roles.filter((role) => role.ended_on)
|
||||
|
||||
const sections: ShellSection[] = [
|
||||
{
|
||||
id: 'about',
|
||||
title: 'About',
|
||||
accent,
|
||||
background: BACKGROUNDS[0],
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-8">
|
||||
<Facts person={person} accent={accent} />
|
||||
|
||||
{[...person.bio, ...person.description].map((paragraph, index) => (
|
||||
<p key={index} className="leading-relaxed max-w-3xl" style={{ color: BODY }}>
|
||||
{paragraph}
|
||||
</p>
|
||||
))}
|
||||
|
||||
<div className="max-w-3xl">
|
||||
<ContentBlocks blocks={person.blocks} accent={accent} />
|
||||
</div>
|
||||
|
||||
<Contact person={person} accent={accent} />
|
||||
</div>
|
||||
),
|
||||
},
|
||||
]
|
||||
|
||||
if (person.roles.length > 0) {
|
||||
sections.push({
|
||||
id: 'roles',
|
||||
title: 'Roles',
|
||||
accent,
|
||||
background: BACKGROUNDS[sections.length % 2],
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-8">
|
||||
{current.length > 0 && <RoleList roles={current} accent={accent} />}
|
||||
|
||||
{previous.length > 0 && (
|
||||
<div>
|
||||
{current.length > 0 && (
|
||||
<h3 className="mb-4 text-lg font-semibold" style={{ color: accent }}>
|
||||
Previously
|
||||
</h3>
|
||||
)}
|
||||
<RoleList roles={previous} accent={accent} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
if (person.events.length > 0) {
|
||||
sections.push({
|
||||
id: 'events',
|
||||
title: 'Events',
|
||||
accent,
|
||||
background: BACKGROUNDS[sections.length % 2],
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6">
|
||||
<ul className="space-y-5">
|
||||
{person.events.map((event) => (
|
||||
<li key={event.id}>
|
||||
<EventRow event={event} accent={accent} />
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
if (person.awards.length > 0) {
|
||||
sections.push({
|
||||
id: 'awards',
|
||||
title: 'Awards',
|
||||
accent,
|
||||
background: BACKGROUNDS[sections.length % 2],
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-6">
|
||||
{person.awards.map((entry, index) => (
|
||||
<div
|
||||
key={`${entry.award.id}:${entry.awarded_on ?? index}`}
|
||||
className="border-l-2 pl-5"
|
||||
style={{ borderColor: accent }}
|
||||
>
|
||||
<p className="font-semibold" style={{ color: accent }}>
|
||||
<Link to={awardHref(entry.award.id)} className="hover:underline">
|
||||
{entry.award.name}
|
||||
</Link>
|
||||
</p>
|
||||
{(entry.awarded_on || entry.event) && (
|
||||
<p className="text-sm" style={{ color: BODY }}>
|
||||
{year(entry.awarded_on)}
|
||||
{entry.event && (
|
||||
<>
|
||||
{entry.awarded_on && ' · '}
|
||||
<Link
|
||||
to={eventHref(entry.event.id)}
|
||||
className="hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
{entry.event.title}
|
||||
</Link>
|
||||
</>
|
||||
)}
|
||||
</p>
|
||||
)}
|
||||
{entry.citation && (
|
||||
<p className="mt-1 max-w-2xl italic leading-relaxed" style={{ color: BODY }}>
|
||||
{entry.citation}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<PageShell title={person.name} intro={person.tagline ?? undefined} sections={sections} />
|
||||
)
|
||||
}
|
||||
|
||||
/* ── The strip of facts under the heading ────────────────────── */
|
||||
|
||||
function Facts({ person, accent }: { person: PersonRecord; accent: string }) {
|
||||
const photo = personPhoto(person.photo)
|
||||
|
||||
return (
|
||||
<div className="flex flex-wrap items-center gap-x-6 gap-y-3 text-sm">
|
||||
{photo ? (
|
||||
<img
|
||||
src={photo}
|
||||
alt=""
|
||||
loading="lazy"
|
||||
decoding="async"
|
||||
className="h-24 w-24 shrink-0 rounded-full object-cover"
|
||||
/>
|
||||
) : (
|
||||
<span
|
||||
aria-hidden="true"
|
||||
className="flex h-24 w-24 shrink-0 items-center justify-center rounded-full text-2xl font-bold text-white"
|
||||
style={{ background: accent }}
|
||||
>
|
||||
{initials(person.name)}
|
||||
</span>
|
||||
)}
|
||||
|
||||
{person.pronouns && <span style={{ color: BODY }}>{person.pronouns}</span>}
|
||||
|
||||
{person.org && (
|
||||
<Link
|
||||
to={orgHref(person.org.id, person.org.kind)}
|
||||
className="font-medium hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
{person.org.name}
|
||||
</Link>
|
||||
)}
|
||||
|
||||
{person.location_label && <span style={{ color: BODY }}>{person.location_label}</span>}
|
||||
|
||||
<Link to="/leadership" className="ml-auto hover:underline" style={{ color: accent }}>
|
||||
Leadership
|
||||
</Link>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function Contact({ person, accent }: { person: PersonRecord; accent: string }) {
|
||||
const outlined = [
|
||||
person.website ? { url: person.website, label: 'Website' } : null,
|
||||
person.public_email
|
||||
? { url: `mailto:${person.public_email}`, label: person.public_email }
|
||||
: null,
|
||||
...person.socials,
|
||||
].filter((link): link is NonNullable<typeof link> => Boolean(link))
|
||||
|
||||
if (person.links.length === 0 && outlined.length === 0) return null
|
||||
|
||||
return (
|
||||
<div className="flex flex-wrap gap-3">
|
||||
{person.links.map((link) => (
|
||||
<a
|
||||
key={link.url}
|
||||
href={link.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="rounded-full px-5 py-2 text-sm font-semibold text-white transition-transform hover:scale-105"
|
||||
style={{ background: accent }}
|
||||
>
|
||||
{link.label}
|
||||
</a>
|
||||
))}
|
||||
|
||||
{outlined.map((link) => (
|
||||
<a
|
||||
key={link.url}
|
||||
href={link.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="rounded-full border px-4 py-1.5 text-sm font-medium transition-colors hover:bg-[#eef9fb]"
|
||||
style={{ borderColor: accent, color: accent }}
|
||||
>
|
||||
{link.label}
|
||||
</a>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/* ── Roles ───────────────────────────────────────────────────── */
|
||||
|
||||
function RoleList({ roles, accent }: { roles: PersonRole[]; accent: string }) {
|
||||
return (
|
||||
<ul className="grid gap-4 sm:grid-cols-2">
|
||||
{roles.map((role, index) => (
|
||||
<li
|
||||
key={`${role.org.id}:${role.team?.id ?? ''}:${role.title ?? role.role}:${index}`}
|
||||
className="rounded-xl border-l-4 bg-white px-5 py-3"
|
||||
style={{ borderColor: accent }}
|
||||
>
|
||||
<p className="font-semibold" style={{ color: accent }}>
|
||||
{role.title || ROLE_LABEL[role.role] || capitalize(role.role)}
|
||||
</p>
|
||||
<p className="text-sm" style={{ color: BODY }}>
|
||||
{role.team && (
|
||||
<>
|
||||
<Link to={teamHref(role.team.id)} className="hover:underline">
|
||||
{role.team.name}
|
||||
</Link>
|
||||
{' · '}
|
||||
</>
|
||||
)}
|
||||
<Link to={orgHref(role.org.id, role.org.kind)} className="hover:underline">
|
||||
{role.org.name}
|
||||
</Link>
|
||||
</p>
|
||||
{tenure(role) && (
|
||||
<p className="text-xs" style={{ color: BODY }}>
|
||||
{tenure(role)}
|
||||
</p>
|
||||
)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)
|
||||
}
|
||||
|
||||
/* "2018 – 2022", "Since 2021", "Until 2019", or null. Years only:
|
||||
affiliation dates are often backfilled from memory. */
|
||||
function tenure(role: PersonRole): string | null {
|
||||
const from = year(role.started_on)
|
||||
const to = year(role.ended_on)
|
||||
if (from && to) return from === to ? from : `${from} – ${to}`
|
||||
if (from) return `Since ${from}`
|
||||
if (to) return `Until ${to}`
|
||||
return null
|
||||
}
|
||||
|
||||
/* ── Events ──────────────────────────────────────────────────── */
|
||||
|
||||
function EventRow({ event, accent }: { event: PersonEvent; accent: string }) {
|
||||
const when = event.date_label || year(event.starts_on)
|
||||
const capacities = event.roles
|
||||
.map((role) => role.title || capitalize(role.role))
|
||||
.join(', ')
|
||||
|
||||
return (
|
||||
<div className="border-l-2 pl-5" style={{ borderColor: accent }}>
|
||||
<p className="font-semibold" style={{ color: accent }}>
|
||||
<Link to={eventHref(event.id)} className="hover:underline">
|
||||
{event.title}
|
||||
</Link>
|
||||
</p>
|
||||
<p className="text-sm" style={{ color: BODY }}>
|
||||
{[capacities, eventTypeLabel(event.event_type), when].filter(Boolean).join(' · ')}
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/* Dates here may be partial ('2019', '2019-06'), so take the
|
||||
leading year rather than parsing. */
|
||||
function year(date?: string | null): string | null {
|
||||
if (!date) return null
|
||||
const match = /^(\d{4})/.exec(date)
|
||||
return match ? match[1] : date
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import PageShell from "../components/PageShell.tsx";
|
||||
import { defineSection, useSectionManifest } from "../lib/sections.tsx";
|
||||
import { useSectionManifest } from "../lib/sections.tsx";
|
||||
import EventListCards, { EventCardsToggle } from "./sections/EventList-Cards.tsx";
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════════
|
||||
|
|
@ -9,102 +9,43 @@ import EventListCards, { EventCardsToggle } from "./sections/EventList-Cards.tsx
|
|||
different filter. The page declares them and does nothing else —
|
||||
each section fetches its own slice.
|
||||
|
||||
Two filters per band now, and they answer different questions:
|
||||
|
||||
section whose gathering it is — the scope. event_sections
|
||||
holds six of these; this page draws three.
|
||||
type what kind of gathering it is. Pinned to "retreat"
|
||||
everywhere on this page, which is what the page is
|
||||
for and what lets "Partner" read as a heading rather
|
||||
than a catch-all.
|
||||
|
||||
Because every band is pinned to one type, EventListCards finds a
|
||||
single kind in each and draws no type chips. Drop the `type` from
|
||||
a band and the chips appear on their own.
|
||||
|
||||
What this page deliberately does not show: local, international
|
||||
and other scopes, and every non-retreat type. Those are reachable
|
||||
from their host's page and by URL, and get a band here when
|
||||
there's enough of them to fill one — see the block at the bottom.
|
||||
|
||||
To reorder the page, move a line. To add a different kind of
|
||||
section, add an entry with another Component.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
const CARD_VIEWS = { options: ["carousel", "grid"], Toggle: EventCardsToggle };
|
||||
|
||||
/* Pinned on every band. Named rather than repeated so turning this
|
||||
page into "everything, filtered" later is one deletion. */
|
||||
const RETREATS = { type: "retreat" } as const;
|
||||
|
||||
const SECTIONS = [
|
||||
defineSection({
|
||||
{
|
||||
id: "national",
|
||||
title: "National Retreats",
|
||||
blurb: "Our flagship gatherings, open to young adults across the country.",
|
||||
accent: "#138ba0",
|
||||
background: "#eef9fb",
|
||||
Component: EventListCards,
|
||||
props: { section: "national", ...RETREATS },
|
||||
props: { section: "national" },
|
||||
views: { ...CARD_VIEWS, default: "carousel" },
|
||||
}),
|
||||
defineSection({
|
||||
},
|
||||
{
|
||||
id: "regional",
|
||||
title: "Regional Retreats",
|
||||
blurb: "Smaller gatherings hosted by regions throughout the year.",
|
||||
accent: "#aac992",
|
||||
background: "#ffffff",
|
||||
Component: EventListCards,
|
||||
props: { section: "regional", ...RETREATS },
|
||||
props: { section: "regional" },
|
||||
views: { ...CARD_VIEWS, default: "grid" },
|
||||
}),
|
||||
defineSection({
|
||||
},
|
||||
{
|
||||
id: "partner",
|
||||
title: "Partner Events",
|
||||
blurb: "Retreats hosted by organizations we collaborate with.",
|
||||
blurb: "Events hosted by organizations we collaborate with.",
|
||||
accent: "#7a5ea8",
|
||||
background: "#eef9fb",
|
||||
Component: EventListCards,
|
||||
props: { section: "partner", ...RETREATS },
|
||||
props: { section: "partner" },
|
||||
views: { ...CARD_VIEWS, default: "grid" },
|
||||
}),
|
||||
|
||||
/* The other three scopes, ready to uncomment. Each needs an accent
|
||||
and a background of its own — those are presentation and live
|
||||
here, not in event_sections.
|
||||
|
||||
defineSection({
|
||||
id: "local",
|
||||
title: "Local Events",
|
||||
blurb: "Hosted by individual chapters.",
|
||||
accent: "#d08a3c",
|
||||
background: "#ffffff",
|
||||
Component: EventListCards,
|
||||
props: { section: "local", ...RETREATS_ONLY },
|
||||
views: { ...CARD_VIEWS, default: "grid" },
|
||||
}),
|
||||
defineSection({
|
||||
id: "international",
|
||||
title: "International Events",
|
||||
blurb: "Gatherings beyond the US.",
|
||||
accent: "#3c7fd0",
|
||||
background: "#eef9fb",
|
||||
Component: EventListCards,
|
||||
props: { section: "international", ...RETREATS_ONLY },
|
||||
views: { ...CARD_VIEWS, default: "grid" },
|
||||
}),
|
||||
defineSection({
|
||||
id: "other",
|
||||
title: "Other Events",
|
||||
blurb: "Everything that doesn't fit the categories above.",
|
||||
accent: "#7a8a8e",
|
||||
background: "#ffffff",
|
||||
Component: EventListCards,
|
||||
props: { section: "other", ...RETREATS_ONLY },
|
||||
views: { ...CARD_VIEWS, default: "grid" },
|
||||
}),
|
||||
|
||||
*/
|
||||
},
|
||||
];
|
||||
|
||||
export default function RetreatsPage() {
|
||||
|
|
@ -113,7 +54,7 @@ export default function RetreatsPage() {
|
|||
return (
|
||||
<PageShell
|
||||
title="Retreats"
|
||||
intro="Retreats hosted by Next Generation of Unity, our regions, and our partners throughout the year."
|
||||
intro="Retreats and gatherings hosted by Next Generation of Unity and our partners throughout the year."
|
||||
sections={sections}
|
||||
/>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,155 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
TEAM DETAIL — /teams/:id
|
||||
|
||||
teams.id is a global primary key rather than scoped to the
|
||||
organization, which is what lets this route be flat: 'ngu-board'
|
||||
can only mean one thing site-wide.
|
||||
|
||||
The roster is not in this page's data. PeopleTiles fetches
|
||||
/teams/:id/people itself, off v_org_leadership, which already
|
||||
decides who counts as current and public. Two requests, both
|
||||
cached for 60s by api.js, and one set of visibility rules.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Link, useParams } from 'react-router-dom'
|
||||
|
||||
import PageShell from '../components/PageShell.tsx'
|
||||
import PageState from '../components/PageState.tsx'
|
||||
import ContentBlocks from '../components/ContentBlocks.tsx'
|
||||
import PeopleTiles from '../components/PeopleTiles.tsx'
|
||||
import { useTeam } from '../lib/useContent.ts'
|
||||
import { orgHref } from '../lib/hrefs.ts'
|
||||
|
||||
const TEAL = '#138ba0'
|
||||
const BODY = '#4a6b72'
|
||||
|
||||
export default function TeamDetail() {
|
||||
const { id } = useParams()
|
||||
const { data: team, loading, error, notFound, reload } = useTeam(id)
|
||||
|
||||
if (!team) {
|
||||
return (
|
||||
<PageState
|
||||
loading={loading}
|
||||
error={error}
|
||||
notFound={notFound}
|
||||
onRetry={reload}
|
||||
noun="team"
|
||||
backTo="/leadership"
|
||||
backLabel="Leadership"
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
const accent = team.color || TEAL
|
||||
const hasAbout =
|
||||
team.description.length > 0 || team.blocks.length > 0 || team.links.length > 0
|
||||
|
||||
const sections: any[] = []
|
||||
|
||||
if (hasAbout) {
|
||||
sections.push({
|
||||
id: 'about',
|
||||
title: 'About',
|
||||
accent,
|
||||
background: '#ffffff',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-8">
|
||||
<Facts orgId={team.org.id} orgKind={team.org.kind} orgName={team.org.name} accent={accent} />
|
||||
|
||||
{team.description.map((paragraph, index) => (
|
||||
<p key={index} className="leading-relaxed max-w-3xl" style={{ color: BODY }}>
|
||||
{paragraph}
|
||||
</p>
|
||||
))}
|
||||
|
||||
<div className="max-w-3xl">
|
||||
<ContentBlocks blocks={team.blocks} accent={accent} />
|
||||
</div>
|
||||
|
||||
{team.links.length > 0 && (
|
||||
<div className="flex flex-wrap gap-3">
|
||||
{team.links.map((link) => (
|
||||
<a
|
||||
key={link.url}
|
||||
href={link.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="rounded-full px-5 py-2 text-sm font-semibold text-white transition-transform hover:scale-105"
|
||||
style={{ background: accent }}
|
||||
>
|
||||
{link.label}
|
||||
</a>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
sections.push({
|
||||
id: 'members',
|
||||
title: hasAbout ? 'Members' : team.name,
|
||||
accent,
|
||||
background: hasAbout ? '#eef9fb' : '#ffffff',
|
||||
content: (
|
||||
<div className="max-w-6xl mx-auto px-6 space-y-6">
|
||||
{!hasAbout && (
|
||||
<Facts
|
||||
orgId={team.org.id}
|
||||
orgKind={team.org.kind}
|
||||
orgName={team.org.name}
|
||||
accent={accent}
|
||||
/>
|
||||
)}
|
||||
|
||||
<PeopleTiles
|
||||
size="lg"
|
||||
accent={accent}
|
||||
teams={[{ id: team.id, label: 'Members', accent }]}
|
||||
emptyMessage="Nobody is currently listed on this team."
|
||||
/>
|
||||
</div>
|
||||
),
|
||||
})
|
||||
|
||||
return (
|
||||
<PageShell title={team.name} intro={team.tagline ?? undefined} sections={sections} />
|
||||
)
|
||||
}
|
||||
|
||||
function Facts({
|
||||
orgId,
|
||||
orgKind,
|
||||
orgName,
|
||||
accent,
|
||||
}: {
|
||||
orgId: string
|
||||
orgKind?: string | null
|
||||
orgName: string
|
||||
accent: string
|
||||
}) {
|
||||
return (
|
||||
<div className="flex flex-wrap items-center gap-x-6 gap-y-3 text-sm">
|
||||
<span style={{ color: BODY }}>
|
||||
A team of{' '}
|
||||
<Link
|
||||
to={orgHref(orgId, orgKind)}
|
||||
className="font-medium hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
{orgName}
|
||||
</Link>
|
||||
</span>
|
||||
|
||||
<Link
|
||||
to={orgHref(orgId, orgKind)}
|
||||
className="ml-auto hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
Back to {orgName}
|
||||
</Link>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -2,15 +2,8 @@
|
|||
ADMIN — FEEDBACK TRIAGE
|
||||
|
||||
Reads /api/admin/feedback, writes status and notes back through
|
||||
PATCH, and deletes through DELETE. Deliberately a flat list
|
||||
rather than a table: the message is the content, and messages
|
||||
don't fit in a cell.
|
||||
|
||||
Two capabilities, two ranks. Editors and above can change a
|
||||
status or leave a note; deleting is admin and above, matching
|
||||
requireRole on the server. Both come from the roles ladder
|
||||
rather than an equality check — a superadmin is not role ===
|
||||
"admin", and reading it that way is what hid these controls.
|
||||
PATCH. Deliberately a flat list rather than a table: the message
|
||||
is the content, and messages don't fit in a cell.
|
||||
|
||||
Every read passes ttl: 0. The api cache exists for public
|
||||
content that changes weekly; a triage queue two people are
|
||||
|
|
@ -20,42 +13,13 @@
|
|||
import { useCallback, useEffect, useState } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
|
||||
import { del, get, patch, ApiError } from "../../lib/api.js";
|
||||
import { get, patch, ApiError } from "../../lib/api.js";
|
||||
import { isUnauthorized, useAuth } from "../../lib/auth.tsx";
|
||||
import { canWrite as roleCanWrite, canDelete } from "../../lib/roles.ts";
|
||||
import { feedbackTypeLabel } from "../../data/feedbackTypes.js";
|
||||
|
||||
/* feedback.status's CHECK values, in triage order. */
|
||||
const STATUSES = ["new", "read", "actioned", "archived", "spam"] as const;
|
||||
const STATUSES = ["new", "read", "actioned", "archived", "spam"];
|
||||
|
||||
type FeedbackStatus = (typeof STATUSES)[number];
|
||||
|
||||
/* The columns GET /api/admin/feedback selects. */
|
||||
type FeedbackRow = {
|
||||
id: number;
|
||||
created_at: string;
|
||||
feedback_type: string;
|
||||
message: string;
|
||||
name: string | null;
|
||||
email: string | null;
|
||||
page_path: string | null;
|
||||
section_id: string | null;
|
||||
status: FeedbackStatus;
|
||||
admin_note: string | null;
|
||||
};
|
||||
|
||||
type FeedbackPage = {
|
||||
feedback: FeedbackRow[];
|
||||
/** Unfiltered, one per status. */
|
||||
counts: Record<FeedbackStatus, number>;
|
||||
nextCursor: number | null;
|
||||
};
|
||||
|
||||
type FeedbackChanges = { status?: FeedbackStatus; admin_note?: string };
|
||||
|
||||
type StatusFilter = FeedbackStatus | "all";
|
||||
|
||||
const STATUS_STYLE: Record<FeedbackStatus, string> = {
|
||||
const STATUS_STYLE = {
|
||||
new: "bg-[#138ba0] text-white",
|
||||
read: "bg-[#eef9fb] text-[#138ba0]",
|
||||
actioned: "bg-[#eaf3e2] text-[#4a6b2f]",
|
||||
|
|
@ -65,7 +29,7 @@ const STATUS_STYLE: Record<FeedbackStatus, string> = {
|
|||
|
||||
// created_at is UTC in 'YYYY-MM-DD HH:MM:SS' form, which Safari
|
||||
// won't parse without the T and the Z.
|
||||
function formatDate(value: string) {
|
||||
function formatDate(value) {
|
||||
const date = new Date(`${value.replace(" ", "T")}Z`);
|
||||
return date.toLocaleString(undefined, {
|
||||
dateStyle: "medium",
|
||||
|
|
@ -73,34 +37,25 @@ function formatDate(value: string) {
|
|||
});
|
||||
}
|
||||
|
||||
function locationOf(row: FeedbackRow) {
|
||||
function locationOf(row) {
|
||||
if (!row.page_path) return "Not page-specific";
|
||||
return row.section_id ? `${row.page_path} #${row.section_id}` : row.page_path;
|
||||
}
|
||||
|
||||
/* ── One submission ──────────────────────────────────────────── */
|
||||
|
||||
type FeedbackCardProps = {
|
||||
row: FeedbackRow;
|
||||
onChange: (row: FeedbackRow) => void;
|
||||
onRemove: (row: FeedbackRow) => void;
|
||||
canWrite: boolean;
|
||||
canRemove: boolean;
|
||||
};
|
||||
|
||||
function FeedbackCard({ row, onChange, onRemove, canWrite, canRemove }: FeedbackCardProps) {
|
||||
function FeedbackCard({ row, onChange, canWrite }) {
|
||||
const [note, setNote] = useState(row.admin_note ?? "");
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [confirming, setConfirming] = useState(false);
|
||||
const [error, setError] = useState(null);
|
||||
|
||||
const noteDirty = note !== (row.admin_note ?? "");
|
||||
|
||||
async function save(changes: FeedbackChanges) {
|
||||
async function save(changes) {
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
try {
|
||||
const data = await patch<{ feedback: FeedbackRow }>(`/admin/feedback/${row.id}`, changes);
|
||||
const data = await patch(`/admin/feedback/${row.id}`, changes);
|
||||
onChange(data.feedback);
|
||||
} catch (err) {
|
||||
setError(err instanceof ApiError ? err.message : "Couldn't save that.");
|
||||
|
|
@ -109,21 +64,6 @@ function FeedbackCard({ row, onChange, onRemove, canWrite, canRemove }: Feedback
|
|||
}
|
||||
}
|
||||
|
||||
// On success this card unmounts, so there's no finally here:
|
||||
// busy only needs clearing on the path where the row survives.
|
||||
async function remove() {
|
||||
setBusy(true);
|
||||
setError(null);
|
||||
try {
|
||||
await del(`/admin/feedback/${row.id}`);
|
||||
onRemove(row);
|
||||
} catch (err) {
|
||||
setError(err instanceof ApiError ? err.message : "Couldn't delete that.");
|
||||
setConfirming(false);
|
||||
setBusy(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<article className="rounded-2xl border border-[#138ba0]/20 bg-white p-5">
|
||||
<div className="flex flex-wrap items-center gap-x-4 gap-y-2 text-sm">
|
||||
|
|
@ -177,8 +117,7 @@ function FeedbackCard({ row, onChange, onRemove, canWrite, canRemove }: Feedback
|
|||
id={`status-${row.id}`}
|
||||
value={row.status}
|
||||
disabled={busy}
|
||||
// The options are STATUSES, so the value is always one of them.
|
||||
onChange={(e) => save({ status: e.target.value as FeedbackStatus })}
|
||||
onChange={(e) => save({ status: e.target.value })}
|
||||
className="rounded-lg border border-[#4a6b72]/25 bg-white px-3 py-1.5 text-sm text-[#26454c] outline-none focus:border-[#138ba0] focus:ring-2 focus:ring-[#138ba0]/25"
|
||||
>
|
||||
{STATUSES.map((s) => (
|
||||
|
|
@ -187,6 +126,8 @@ function FeedbackCard({ row, onChange, onRemove, canWrite, canRemove }: Feedback
|
|||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
{error && <span className="text-sm text-[#b3261e]">{error}</span>}
|
||||
</div>
|
||||
|
||||
<textarea
|
||||
|
|
@ -209,52 +150,6 @@ function FeedbackCard({ row, onChange, onRemove, canWrite, canRemove }: Feedback
|
|||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Deleting is the irreversible option; marking something
|
||||
spam or archived is the habit this defers to. Hence the
|
||||
second click rather than a window.confirm. */}
|
||||
{canRemove && (
|
||||
<div className="mt-4 flex flex-wrap items-center gap-3 border-t border-[#4a6b72]/15 pt-4">
|
||||
{confirming ? (
|
||||
<>
|
||||
<span className="text-sm text-[#26454c]">
|
||||
Delete #{row.id} for good? Marking it spam keeps it recoverable.
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
disabled={busy}
|
||||
onClick={remove}
|
||||
className="rounded-full bg-[#b3261e] px-4 py-1.5 text-sm font-semibold text-white transition-colors hover:bg-[#8f1e18] disabled:bg-[#4a6b72]/25"
|
||||
>
|
||||
{busy ? "Deleting…" : "Delete"}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
disabled={busy}
|
||||
onClick={() => setConfirming(false)}
|
||||
className="rounded-full border border-[#4a6b72]/25 px-4 py-1.5 text-sm text-[#4a6b72] transition-colors hover:border-[#4a6b72]/50"
|
||||
>
|
||||
Keep it
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<button
|
||||
type="button"
|
||||
disabled={busy}
|
||||
onClick={() => setConfirming(true)}
|
||||
className="rounded-full border border-[#b3261e]/30 px-4 py-1.5 text-sm font-medium text-[#b3261e] transition-colors hover:bg-[#fdf3f2]"
|
||||
>
|
||||
Delete
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{error && (
|
||||
<p role="alert" className="mt-3 text-sm text-[#b3261e]">
|
||||
{error}
|
||||
</p>
|
||||
)}
|
||||
</article>
|
||||
);
|
||||
}
|
||||
|
|
@ -265,22 +160,20 @@ export default function AdminFeedback() {
|
|||
const { user } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const [status, setStatus] = useState<StatusFilter>("new");
|
||||
const [status, setStatus] = useState("new");
|
||||
const [query, setQuery] = useState("");
|
||||
const [search, setSearch] = useState(""); // applied, not typed
|
||||
|
||||
const [rows, setRows] = useState<FeedbackRow[]>([]);
|
||||
const [counts, setCounts] = useState<Partial<Record<FeedbackStatus, number>>>({});
|
||||
const [cursor, setCursor] = useState<number | null>(null);
|
||||
const [rows, setRows] = useState([]);
|
||||
const [counts, setCounts] = useState({});
|
||||
const [cursor, setCursor] = useState(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [error, setError] = useState(null);
|
||||
|
||||
// Minimums, not equality — see lib/roles.ts.
|
||||
const canWrite = roleCanWrite(user);
|
||||
const canRemove = canDelete(user);
|
||||
const canWrite = user?.role === "admin";
|
||||
|
||||
const load = useCallback(
|
||||
async (before: number | null = null) => {
|
||||
async (before = null) => {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
|
||||
|
|
@ -290,7 +183,7 @@ export default function AdminFeedback() {
|
|||
if (before) params.set("before", String(before));
|
||||
|
||||
try {
|
||||
const data = await get<FeedbackPage>(`/admin/feedback?${params}`, { ttl: 0 });
|
||||
const data = await get(`/admin/feedback?${params}`, { ttl: 0 });
|
||||
setRows((prev) => (before ? [...prev, ...data.feedback] : data.feedback));
|
||||
setCounts(data.counts);
|
||||
setCursor(data.nextCursor);
|
||||
|
|
@ -314,7 +207,7 @@ export default function AdminFeedback() {
|
|||
load();
|
||||
}, [load]);
|
||||
|
||||
function replaceRow(updated: FeedbackRow) {
|
||||
function replaceRow(updated) {
|
||||
setRows((prev) =>
|
||||
prev
|
||||
.map((row) => (row.id === updated.id ? updated : row))
|
||||
|
|
@ -325,17 +218,7 @@ export default function AdminFeedback() {
|
|||
setCounts((prev) => ({ ...prev })); // counts refresh on next load
|
||||
}
|
||||
|
||||
// The deleted row is passed whole rather than by id: its status
|
||||
// is what says which tab count to drop.
|
||||
function removeRow(removed: FeedbackRow) {
|
||||
setRows((prev) => prev.filter((row) => row.id !== removed.id));
|
||||
setCounts((prev) => ({
|
||||
...prev,
|
||||
[removed.status]: Math.max((prev[removed.status] ?? 1) - 1, 0),
|
||||
}));
|
||||
}
|
||||
|
||||
const tabs: Array<{ id: StatusFilter; label: string; count?: number }> = [
|
||||
const tabs = [
|
||||
{ id: "all", label: "All" },
|
||||
...STATUSES.map((s) => ({ id: s, label: s, count: counts[s] })),
|
||||
];
|
||||
|
|
@ -411,9 +294,7 @@ export default function AdminFeedback() {
|
|||
key={row.id}
|
||||
row={row}
|
||||
canWrite={canWrite}
|
||||
canRemove={canRemove}
|
||||
onChange={replaceRow}
|
||||
onRemove={removeRow}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,191 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
ADMIN HOME
|
||||
|
||||
Where login lands. Two columns: the cards are the navigation —
|
||||
the header deliberately drops its tab row here so the same links
|
||||
aren't drawn twice — and a standing info panel on the right.
|
||||
|
||||
The cards come from adminNav.js, the same list the CMS header
|
||||
reads, so a new entity shows up here the moment it's registered.
|
||||
Forms sit in their own block below: they're submissions coming
|
||||
in rather than content going out, and there'll be more of them
|
||||
than the feedback queue eventually. The Panel block below that
|
||||
only exists for superadmins.
|
||||
|
||||
The right-hand panel is deliberately inert. Nothing here
|
||||
fetches, so the landing page can't be slow or half-broken on
|
||||
arrival; anything live (open feedback count, last-edited
|
||||
record) wants to be a separate component that fails on its own.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import type { ReactNode } from "react";
|
||||
import { Link } from "react-router-dom";
|
||||
import { useAuth } from "../../lib/auth.tsx";
|
||||
import { SITE_VERSION } from "../../lib/version.ts";
|
||||
import { ROLE_LABELS, isSuper } from "../../lib/roles.ts";
|
||||
import { CMS_NAV, FORMS_NAV, PANEL_NAV, target, type AdminNavItem } from "./adminNav.js";
|
||||
|
||||
/* One card. The title link is stretched over the whole card with
|
||||
`after:absolute`, which makes the card clickable without nesting
|
||||
an anchor inside an anchor; the sub-links sit above it on z-10 so
|
||||
they stay separately clickable. */
|
||||
function NavCard({ item }: { item: AdminNavItem }) {
|
||||
const to = target(item);
|
||||
|
||||
// Drop the child that just repeats the card's own destination —
|
||||
// "All organizations" under Organizations.
|
||||
const extras = (item.children ?? []).filter((child) => child.to !== to);
|
||||
|
||||
return (
|
||||
<div className="group relative flex flex-col rounded-2xl border border-[#138ba0]/20 bg-white p-5 transition-all hover:border-[#138ba0]/60 hover:shadow-sm">
|
||||
<div className="flex items-baseline gap-3">
|
||||
<h3 className="text-base font-semibold text-[#138ba0]">
|
||||
<Link
|
||||
to={to}
|
||||
className="after:absolute after:inset-0 after:rounded-2xl after:content-['']"
|
||||
>
|
||||
{item.label}
|
||||
</Link>
|
||||
</h3>
|
||||
<span
|
||||
aria-hidden="true"
|
||||
className="ml-auto text-[#138ba0] opacity-0 transition-opacity group-hover:opacity-100"
|
||||
>
|
||||
→
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{item.blurb && (
|
||||
<p className="mt-1.5 text-sm leading-relaxed text-[#4a6b72]">{item.blurb}</p>
|
||||
)}
|
||||
|
||||
{extras.length > 0 && (
|
||||
<div className="relative z-10 mt-4 flex flex-wrap gap-x-4 gap-y-1 border-t border-[#138ba0]/10 pt-3 text-sm">
|
||||
{extras.map((child) => (
|
||||
<Link
|
||||
key={child.to}
|
||||
to={child.to}
|
||||
className="text-[#4a6b72] underline-offset-4 transition-colors hover:text-[#138ba0] hover:underline"
|
||||
>
|
||||
{child.label}
|
||||
</Link>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function CardBlock({
|
||||
title,
|
||||
blurb,
|
||||
children,
|
||||
}: {
|
||||
title: string;
|
||||
blurb?: string;
|
||||
children: ReactNode;
|
||||
}) {
|
||||
return (
|
||||
<div className="mt-10">
|
||||
<div className="flex items-baseline gap-3">
|
||||
<h2 className="text-lg font-semibold text-[#138ba0]">{title}</h2>
|
||||
{blurb && <p className="text-sm text-[#4a6b72]">{blurb}</p>}
|
||||
</div>
|
||||
<div className="mt-4 grid gap-4 sm:grid-cols-2">{children}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function PanelSection({ title, children }: { title: string; children: ReactNode }) {
|
||||
return (
|
||||
<section className="border-b border-[#138ba0]/10 px-5 py-4 last:border-b-0">
|
||||
<h2 className="text-xs font-semibold uppercase tracking-wider text-[#4a6b72]/70">
|
||||
{title}
|
||||
</h2>
|
||||
<div className="mt-2.5 text-sm text-[#4a6b72]">{children}</div>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
const QUICK_ADD = [
|
||||
{ to: "/admin/events/new", label: "New event" },
|
||||
{ to: "/admin/people/new", label: "New person" },
|
||||
{ to: "/admin/organizations/new", label: "New organization" },
|
||||
{ to: "/admin/timeline/new", label: "New timeline entry" },
|
||||
];
|
||||
|
||||
export default function AdminHome() {
|
||||
const { user } = useAuth();
|
||||
const role = user ? (ROLE_LABELS[user.role] ?? user.role) : undefined;
|
||||
|
||||
return (
|
||||
<div className="grid gap-8 lg:grid-cols-[1fr_17rem] lg:items-start">
|
||||
<div>
|
||||
<h1 className="text-2xl font-bold text-[#138ba0]">
|
||||
{user?.name ? `Welcome back, ${user.name.split(" ")[0]}.` : "Welcome back."}
|
||||
</h1>
|
||||
<p className="mt-1 text-[#4a6b72]">Pick a section to work in.</p>
|
||||
|
||||
<div className="mt-6 grid gap-4 sm:grid-cols-2">
|
||||
{CMS_NAV.map((item) => (
|
||||
<NavCard key={item.label} item={item} />
|
||||
))}
|
||||
</div>
|
||||
|
||||
<CardBlock title={FORMS_NAV.label} blurb={FORMS_NAV.blurb}>
|
||||
{FORMS_NAV.children.map((form) => (
|
||||
<NavCard key={form.to} item={form} />
|
||||
))}
|
||||
</CardBlock>
|
||||
|
||||
{isSuper(user) && (
|
||||
<CardBlock title="Superadmin" blurb="Only superadmins see this block.">
|
||||
<NavCard item={PANEL_NAV} />
|
||||
</CardBlock>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Sticky so it stays put once the card column outgrows it. */}
|
||||
<aside className="divide-y divide-[#138ba0]/10 rounded-2xl border border-[#138ba0]/20 bg-white lg:sticky lg:top-6">
|
||||
<PanelSection title="Signed in">
|
||||
<p className="font-medium text-[#0f2f36]">{user?.name || user?.email}</p>
|
||||
{user?.name && user?.email && (
|
||||
<p className="mt-0.5 break-all text-xs text-[#4a6b72]/80">{user.email}</p>
|
||||
)}
|
||||
{role && (
|
||||
<span className="mt-2 inline-block rounded-full bg-[#eef9fb] px-2.5 py-0.5 text-xs font-medium text-[#138ba0]">
|
||||
{role}
|
||||
</span>
|
||||
)}
|
||||
</PanelSection>
|
||||
|
||||
<PanelSection title="Start something">
|
||||
<ul className="space-y-1.5">
|
||||
{QUICK_ADD.map((link) => (
|
||||
<li key={link.to}>
|
||||
<Link
|
||||
to={link.to}
|
||||
className="underline-offset-4 transition-colors hover:text-[#138ba0] hover:underline"
|
||||
>
|
||||
{link.label}
|
||||
</Link>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</PanelSection>
|
||||
|
||||
<PanelSection title="Site">
|
||||
<p className="font-mono text-xs text-[#4a6b72]/80">{SITE_VERSION}</p>
|
||||
<a
|
||||
href="/"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="mt-2 inline-block underline-offset-4 transition-colors hover:text-[#138ba0] hover:underline"
|
||||
>
|
||||
View the public site ↗
|
||||
</a>
|
||||
</PanelSection>
|
||||
</aside>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -5,45 +5,59 @@
|
|||
footer site map — none of that belongs around a staff tool, and
|
||||
/admin should never appear in navConfig.
|
||||
|
||||
Three areas share this chrome: Home, the CMS and the Panel. The
|
||||
wordmark names whichever one you're in, and from anywhere but
|
||||
Home it's the way back to Home.
|
||||
The nav is two tiers, the same shape as the public header: a
|
||||
primary row of the things you'd go looking for, and a subnav of
|
||||
whatever sits under the one you're in. Teams and Awards live
|
||||
under Organizations because that's where they belong
|
||||
conceptually — a team is part of an org, an award is given by
|
||||
one — even though each is its own table and its own page.
|
||||
|
||||
The tab row is drawn everywhere except Home, where the card grid
|
||||
is the navigation and drawing both would say the same thing
|
||||
twice. Which tabs appear depends on the signed-in user —
|
||||
navFor() drops the superadmin-only ones — but that's cosmetics.
|
||||
The route guard and the API are what actually say no.
|
||||
NAV is the single source for the rows, the document title and
|
||||
which tab lights up. Adding an entity is an entry here plus a
|
||||
descriptor; there's no second list to keep in step.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { Link, NavLink, Outlet, useLocation, useNavigate } from "react-router-dom";
|
||||
import { NavLink, Outlet, useLocation, useNavigate } from "react-router-dom";
|
||||
import { useAuth } from "../../lib/auth.tsx";
|
||||
import { AdminTitleContext } from "../../lib/adminTitle.tsx";
|
||||
import { SITE_VERSION } from "../../lib/version.ts";
|
||||
import { ROLE_LABELS, isSuper } from "../../lib/roles.ts";
|
||||
import nguLogo from "../../assets/NGU_Logo.svg";
|
||||
import {
|
||||
ADMIN_HOME,
|
||||
AREA_TITLES,
|
||||
areaFor,
|
||||
matches,
|
||||
navFor,
|
||||
target,
|
||||
} from "./adminNav.js";
|
||||
|
||||
const SITE_TITLE = "NGU Admin CMS";
|
||||
|
||||
// A group with no `to` of its own opens its first child, so
|
||||
// clicking the word Forms goes somewhere rather than nowhere.
|
||||
const NAV = [
|
||||
{ to: "/admin/events", label: "Events" },
|
||||
{
|
||||
to: "/admin/organizations",
|
||||
label: "Organizations",
|
||||
children: [
|
||||
{ to: "/admin/organizations", label: "All organizations" },
|
||||
{ to: "/admin/teams", label: "Teams" },
|
||||
{ to: "/admin/awards", label: "Awards" },
|
||||
],
|
||||
},
|
||||
{ to: "/admin/people", label: "People" },
|
||||
{
|
||||
label: "Forms",
|
||||
separated: true,
|
||||
children: [{ to: "/admin/feedback", label: "Website feedback" }],
|
||||
},
|
||||
];
|
||||
|
||||
// A tab owns its own page and everything below it, so editing
|
||||
// /admin/teams/ngu-board keeps Teams lit.
|
||||
const matches = (pathname, to) =>
|
||||
Boolean(to) && (pathname === to || pathname.startsWith(`${to}/`));
|
||||
|
||||
const target = (item) => item.to ?? item.children?.[0]?.to;
|
||||
|
||||
export default function AdminLayout() {
|
||||
const { user, logout } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
const { pathname } = useLocation();
|
||||
|
||||
const area = areaFor(pathname);
|
||||
const areaTitle = AREA_TITLES[area];
|
||||
const isHome = area === "home";
|
||||
|
||||
const nav = useMemo(() => navFor(user), [user]);
|
||||
|
||||
const active = nav.find(
|
||||
const active = NAV.find(
|
||||
(item) =>
|
||||
matches(pathname, item.to) ||
|
||||
(item.children ?? []).some((child) => matches(pathname, child.to)),
|
||||
|
|
@ -56,17 +70,14 @@ export default function AdminLayout() {
|
|||
// What the page below has published about itself — a record
|
||||
// name, or null on a list. setDetail is stable so publishing
|
||||
// can't loop.
|
||||
const [detail, setDetail] = useState<string | null>(null);
|
||||
const stableSet = useCallback((value: string | null) => setDetail(value), []);
|
||||
const [detail, setDetail] = useState(null);
|
||||
const stableSet = useCallback((value) => setDetail(value), []);
|
||||
const titleContext = useMemo(() => ({ setDetail: stableSet }), [stableSet]);
|
||||
|
||||
useEffect(() => {
|
||||
// Sections only exist in the CMS. Home and Panel already say
|
||||
// what they are in the area title; "Panel | NGU Admin Panel"
|
||||
// would just stutter.
|
||||
const section = area === "cms" ? activeChild?.label ?? active?.label : null;
|
||||
document.title = [detail, section, areaTitle].filter(Boolean).join(" | ");
|
||||
}, [area, areaTitle, active, activeChild, detail]);
|
||||
const section = activeChild?.label ?? active?.label;
|
||||
document.title = [detail, section, SITE_TITLE].filter(Boolean).join(" | ");
|
||||
}, [active, activeChild, detail]);
|
||||
|
||||
async function handleLogout() {
|
||||
await logout();
|
||||
|
|
@ -75,54 +86,37 @@ export default function AdminLayout() {
|
|||
|
||||
const subnav = active?.children ?? [];
|
||||
|
||||
const wordmark = <span className="text-lg font-bold text-[#138ba0]">{areaTitle}</span>;
|
||||
|
||||
return (
|
||||
<div className="flex min-h-screen flex-col bg-[#f6fbfc]">
|
||||
<div className="min-h-screen bg-[#f6fbfc]">
|
||||
<header className="border-b border-[#138ba0]/20 bg-white">
|
||||
<div className="mx-auto flex max-w-5xl flex-wrap items-center gap-x-8 gap-y-3 px-6 py-4">
|
||||
{/* Already home, so nothing to link to. */}
|
||||
{isHome ? (
|
||||
wordmark
|
||||
) : (
|
||||
<Link
|
||||
to={ADMIN_HOME}
|
||||
className="rounded transition-opacity hover:opacity-70"
|
||||
title="Back to the admin home"
|
||||
>
|
||||
{wordmark}
|
||||
</Link>
|
||||
)}
|
||||
<span className="text-lg font-bold text-[#138ba0]">{SITE_TITLE}</span>
|
||||
|
||||
{!isHome && (
|
||||
<nav className="flex items-center gap-6 text-sm">
|
||||
{nav.map((item) => (
|
||||
<div key={item.label} className="flex items-center gap-6">
|
||||
{item.separated && (
|
||||
<span
|
||||
aria-hidden="true"
|
||||
className="h-4 w-px bg-[#4a6b72]/25"
|
||||
/>
|
||||
)}
|
||||
<NavLink
|
||||
to={target(item)}
|
||||
className={
|
||||
item === active
|
||||
? "font-semibold text-[#138ba0]"
|
||||
: "text-[#4a6b72] transition-colors hover:text-[#138ba0]"
|
||||
}
|
||||
>
|
||||
{item.label}
|
||||
</NavLink>
|
||||
</div>
|
||||
))}
|
||||
</nav>
|
||||
)}
|
||||
<nav className="flex items-center gap-6 text-sm">
|
||||
{NAV.map((item) => (
|
||||
<div key={item.label} className="flex items-center gap-6">
|
||||
{item.separated && (
|
||||
<span
|
||||
aria-hidden="true"
|
||||
className="h-4 w-px bg-[#4a6b72]/25"
|
||||
/>
|
||||
)}
|
||||
<NavLink
|
||||
to={target(item)}
|
||||
className={
|
||||
item === active
|
||||
? "font-semibold text-[#138ba0]"
|
||||
: "text-[#4a6b72] transition-colors hover:text-[#138ba0]"
|
||||
}
|
||||
>
|
||||
{item.label}
|
||||
</NavLink>
|
||||
</div>
|
||||
))}
|
||||
</nav>
|
||||
|
||||
<div className="ml-auto flex items-center gap-4 text-sm text-[#4a6b72]">
|
||||
<span>
|
||||
{user?.name || user?.email}
|
||||
</span>
|
||||
<span>{user?.name || user?.email}</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={handleLogout}
|
||||
|
|
@ -156,25 +150,11 @@ export default function AdminLayout() {
|
|||
)}
|
||||
</header>
|
||||
|
||||
{/* flex-1 rather than a fixed height: the footer sits at the
|
||||
bottom of a short page and below the content of a long one,
|
||||
without ever floating over it. */}
|
||||
<main className="mx-auto w-full max-w-5xl flex-1 px-6 py-10">
|
||||
<main className="mx-auto max-w-5xl px-6 py-10">
|
||||
<AdminTitleContext.Provider value={titleContext}>
|
||||
<Outlet />
|
||||
</AdminTitleContext.Provider>
|
||||
</main>
|
||||
|
||||
<footer className="border-t border-[#138ba0]/15 bg-white">
|
||||
<div className="mx-auto flex max-w-5xl items-center gap-4 px-6 py-3">
|
||||
<Link to={ADMIN_HOME} className="transition-opacity hover:opacity-70">
|
||||
<img src={nguLogo} alt="NGU" className="h-6 w-auto" />
|
||||
</Link>
|
||||
<span className="ml-auto font-mono text-xs text-[#4a6b72]/70">
|
||||
{SITE_VERSION}
|
||||
</span>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
starts working.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { useState, type FormEvent } from "react";
|
||||
import { useState } from "react";
|
||||
import { useLocation, useNavigate } from "react-router-dom";
|
||||
|
||||
import { useAuth } from "../../lib/auth.tsx";
|
||||
|
|
@ -29,12 +29,12 @@ export default function AdminLogin() {
|
|||
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [error, setError] = useState(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
|
||||
const destination = location.state?.from?.pathname ?? "/admin/home";
|
||||
const destination = location.state?.from?.pathname ?? "/admin/feedback";
|
||||
|
||||
async function handleSubmit(event: FormEvent<HTMLFormElement>) {
|
||||
async function handleSubmit(event) {
|
||||
event.preventDefault();
|
||||
if (busy) return;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,380 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
ADMIN PANEL
|
||||
|
||||
Superadmin only, guarded by RequireRole on the route and by
|
||||
requireRole("superadmin") on every endpoint it calls. This page
|
||||
assumes neither: it renders whatever the API gives it and shows
|
||||
whatever the API refuses.
|
||||
|
||||
Three blocks, deliberately boring:
|
||||
|
||||
System — what's actually running, for when something is off
|
||||
Content — row counts, the cheapest "is the database there"
|
||||
Accounts — roles, access and live sessions
|
||||
|
||||
The role select is driven by ROLES from lib/roles.ts, so a new
|
||||
rung on the ladder appears here without this file changing. The
|
||||
legend beside it is the same list — four roles is past the
|
||||
point where "Editor" explains itself.
|
||||
|
||||
Every account write signs that person out, which the server
|
||||
does rather than this page. Two things you can't do here: edit
|
||||
your own row, or take the last active superadmin away. Both are
|
||||
enforced server-side and mirrored in the disabled states, so
|
||||
the reason shows up before the click rather than after it.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { useCallback, useEffect, useState, type ReactNode } from "react";
|
||||
import { del, get, patch } from "../../lib/api.js";
|
||||
import { isUnauthorized, useAuth } from "../../lib/auth.tsx";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { ROLES, ROLE_LABELS, ROLE_NOTES, type Role } from "../../lib/roles.ts";
|
||||
|
||||
/* An admin_users row as panel.js selects it, with its live session count. */
|
||||
type PanelUser = {
|
||||
id: number;
|
||||
email: string;
|
||||
name: string | null;
|
||||
role: Role;
|
||||
is_active: number;
|
||||
created_at: string;
|
||||
last_login_at: string | null;
|
||||
sessions: number;
|
||||
};
|
||||
|
||||
/* GET /api/admin/panel/overview. A count is null when its table
|
||||
doesn't exist yet. */
|
||||
type Overview = {
|
||||
system: {
|
||||
schemaVersion: number;
|
||||
dbPath: string | null;
|
||||
nodeVersion: string;
|
||||
platform: string;
|
||||
uptimeSeconds: number;
|
||||
startedAt: string;
|
||||
sessions: number | null;
|
||||
roles: Role[];
|
||||
};
|
||||
content: Array<{ label: string; count: number | null }>;
|
||||
users: PanelUser[];
|
||||
};
|
||||
|
||||
type UserResponse = { user: PanelUser };
|
||||
|
||||
/* SQLite hands back "2026-09-22 04:11:07" — UTC, but without the
|
||||
marker that says so. Left alone, browsers read it as local time
|
||||
and last-login drifts by the timezone offset. */
|
||||
function when(value: string | null | undefined) {
|
||||
if (!value) return "—";
|
||||
const iso = value.includes("T") ? value : `${value.replace(" ", "T")}Z`;
|
||||
const date = new Date(iso);
|
||||
return Number.isNaN(date.getTime()) ? value : date.toLocaleString();
|
||||
}
|
||||
|
||||
function uptime(seconds: number | null | undefined) {
|
||||
if (seconds == null) return "—";
|
||||
const d = Math.floor(seconds / 86400);
|
||||
const h = Math.floor((seconds % 86400) / 3600);
|
||||
const m = Math.floor((seconds % 3600) / 60);
|
||||
if (d) return `${d}d ${h}h`;
|
||||
if (h) return `${h}h ${m}m`;
|
||||
return `${m}m`;
|
||||
}
|
||||
|
||||
function Block({
|
||||
title,
|
||||
note,
|
||||
children,
|
||||
}: {
|
||||
title: string;
|
||||
note?: string;
|
||||
children: ReactNode;
|
||||
}) {
|
||||
return (
|
||||
<section className="mt-8 first:mt-0">
|
||||
<div className="flex items-baseline gap-3">
|
||||
<h2 className="text-lg font-semibold text-[#138ba0]">{title}</h2>
|
||||
{note && <p className="text-sm text-[#4a6b72]">{note}</p>}
|
||||
</div>
|
||||
<div className="mt-3">{children}</div>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
|
||||
function Stat({ label, value }: { label: string; value: ReactNode }) {
|
||||
return (
|
||||
<div className="rounded-xl border border-[#138ba0]/20 bg-white px-4 py-3">
|
||||
<div className="text-xs font-medium uppercase tracking-wider text-[#4a6b72]/70">
|
||||
{label}
|
||||
</div>
|
||||
<div className="mt-1 break-words text-sm font-medium text-[#0f2f36]">{value}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default function AdminPanel() {
|
||||
const { user: me } = useAuth();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const [data, setData] = useState<Overview | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
// Which row is mid-request, and what went wrong on it. Scoped to
|
||||
// the row so a failure on one account doesn't blank the table.
|
||||
const [busyId, setBusyId] = useState<number | null>(null);
|
||||
const [rowError, setRowError] = useState<{ id: number; message: string } | null>(null);
|
||||
|
||||
const load = useCallback(async () => {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
setData(await get<Overview>("/admin/panel/overview", { ttl: 0 }));
|
||||
} catch (err) {
|
||||
if (isUnauthorized(err)) return navigate("/admin/login", { replace: true });
|
||||
setError((err instanceof Error && err.message) || "Couldn't load the panel.");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [navigate]);
|
||||
|
||||
useEffect(() => {
|
||||
load();
|
||||
}, [load]);
|
||||
|
||||
/* Replace the one row the server returns rather than refetching
|
||||
the whole overview — the counts didn't change. */
|
||||
function mergeUser(updated: PanelUser) {
|
||||
setData((current) =>
|
||||
current
|
||||
? {
|
||||
...current,
|
||||
users: current.users.map((u) => (u.id === updated.id ? updated : u)),
|
||||
}
|
||||
: current,
|
||||
);
|
||||
}
|
||||
|
||||
async function run(id: number, work: () => Promise<PanelUser>) {
|
||||
setBusyId(id);
|
||||
setRowError(null);
|
||||
try {
|
||||
mergeUser(await work());
|
||||
} catch (err) {
|
||||
if (isUnauthorized(err)) return navigate("/admin/login", { replace: true });
|
||||
setRowError({ id, message: (err instanceof Error && err.message) || "That didn't work." });
|
||||
} finally {
|
||||
setBusyId(null);
|
||||
}
|
||||
}
|
||||
|
||||
const changeRole = (row: PanelUser, role: Role) =>
|
||||
run(
|
||||
row.id,
|
||||
async () => (await patch<UserResponse>(`/admin/panel/users/${row.id}`, { role })).user,
|
||||
);
|
||||
|
||||
const setActive = (row: PanelUser, is_active: number) =>
|
||||
run(
|
||||
row.id,
|
||||
async () =>
|
||||
(await patch<UserResponse>(`/admin/panel/users/${row.id}`, { is_active })).user,
|
||||
);
|
||||
|
||||
const revoke = (row: PanelUser) =>
|
||||
run(
|
||||
row.id,
|
||||
async () => (await del<UserResponse>(`/admin/panel/users/${row.id}/sessions`)).user,
|
||||
);
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<p className="py-12 text-[#4a6b72]" role="status">
|
||||
Loading the panel…
|
||||
</p>
|
||||
);
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return (
|
||||
<div className="py-12">
|
||||
<p className="text-[#b3261e]">{error}</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={load}
|
||||
className="mt-3 rounded-full border border-[#138ba0] px-4 py-1.5 text-sm font-medium text-[#138ba0] transition-colors hover:bg-[#eef9fb]"
|
||||
>
|
||||
Try again
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Not loading and no error means the overview arrived.
|
||||
if (!data) return null;
|
||||
|
||||
const { system, content, users } = data;
|
||||
const activeSupers = users.filter(
|
||||
(u) => u.role === "superadmin" && u.is_active === 1,
|
||||
).length;
|
||||
|
||||
return (
|
||||
<div>
|
||||
<h1 className="text-2xl font-bold text-[#138ba0]">Panel</h1>
|
||||
<p className="mt-1 text-[#4a6b72]">
|
||||
Accounts and server state. Everything here is superadmin-only.
|
||||
</p>
|
||||
|
||||
<Block title="System">
|
||||
<div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
||||
<Stat label="Schema version" value={system.schemaVersion} />
|
||||
<Stat label="API uptime" value={uptime(system.uptimeSeconds)} />
|
||||
<Stat label="Started" value={when(system.startedAt)} />
|
||||
<Stat label="Node" value={system.nodeVersion} />
|
||||
<Stat label="Platform" value={system.platform} />
|
||||
<Stat label="Live sessions" value={system.sessions} />
|
||||
</div>
|
||||
{system.dbPath && (
|
||||
<p className="mt-3 font-mono text-xs text-[#4a6b72]/70">{system.dbPath}</p>
|
||||
)}
|
||||
</Block>
|
||||
|
||||
<Block title="Content" note="Row counts, straight from the tables.">
|
||||
<div className="flex flex-wrap gap-2">
|
||||
{content.map((row) => (
|
||||
<span
|
||||
key={row.label}
|
||||
className="rounded-full border border-[#138ba0]/20 bg-white px-3 py-1 text-sm text-[#4a6b72]"
|
||||
>
|
||||
{row.label}{" "}
|
||||
<strong className="font-semibold text-[#0f2f36]">
|
||||
{row.count ?? "—"}
|
||||
</strong>
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
</Block>
|
||||
|
||||
<Block
|
||||
title="Accounts"
|
||||
note="Changing a role or disabling an account signs that person out."
|
||||
>
|
||||
<div className="overflow-x-auto rounded-2xl border border-[#138ba0]/20 bg-white">
|
||||
<table className="w-full min-w-[46rem] text-left text-sm">
|
||||
<thead className="border-b border-[#138ba0]/15 text-xs uppercase tracking-wider text-[#4a6b72]/70">
|
||||
<tr>
|
||||
<th className="px-4 py-3 font-medium">Account</th>
|
||||
<th className="px-4 py-3 font-medium">Role</th>
|
||||
<th className="px-4 py-3 font-medium">Last login</th>
|
||||
<th className="px-4 py-3 font-medium">Sessions</th>
|
||||
<th className="px-4 py-3 font-medium">Access</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-[#138ba0]/10">
|
||||
{users.map((row) => {
|
||||
const isMe = row.id === me?.id;
|
||||
const lastSuper =
|
||||
row.role === "superadmin" && row.is_active === 1 && activeSupers <= 1;
|
||||
const locked = isMe || lastSuper;
|
||||
const busy = busyId === row.id;
|
||||
|
||||
return (
|
||||
<tr key={row.id} className={row.is_active ? "" : "bg-[#f6fbfc]"}>
|
||||
<td className="px-4 py-3">
|
||||
<div className="font-medium text-[#0f2f36]">
|
||||
{row.name || row.email}
|
||||
{isMe && (
|
||||
<span className="ml-2 text-xs font-normal text-[#4a6b72]/70">
|
||||
you
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
{row.name && (
|
||||
<div className="text-xs text-[#4a6b72]/80">{row.email}</div>
|
||||
)}
|
||||
{rowError?.id === row.id && (
|
||||
<div className="mt-1 text-xs text-[#b3261e]">
|
||||
{rowError.message}
|
||||
</div>
|
||||
)}
|
||||
</td>
|
||||
|
||||
<td className="px-4 py-3">
|
||||
<select
|
||||
value={row.role}
|
||||
disabled={locked || busy}
|
||||
onChange={(e) => changeRole(row, e.target.value as Role)}
|
||||
className="rounded-lg border border-[#138ba0]/30 bg-white px-2 py-1 text-sm text-[#0f2f36] disabled:cursor-not-allowed disabled:bg-[#f6fbfc] disabled:text-[#4a6b72]/60"
|
||||
title={
|
||||
isMe
|
||||
? "You can't change your own role."
|
||||
: lastSuper
|
||||
? "The last active superadmin can't be demoted."
|
||||
: ROLE_NOTES[row.role]
|
||||
}
|
||||
>
|
||||
{ROLES.map((r) => (
|
||||
<option key={r} value={r}>
|
||||
{ROLE_LABELS[r]}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</td>
|
||||
|
||||
<td className="px-4 py-3 text-[#4a6b72]">{when(row.last_login_at)}</td>
|
||||
|
||||
<td className="px-4 py-3">
|
||||
<span className="text-[#4a6b72]">{row.sessions}</span>
|
||||
{row.sessions > 0 && (
|
||||
<button
|
||||
type="button"
|
||||
disabled={busy}
|
||||
onClick={() => revoke(row)}
|
||||
className="ml-3 text-xs font-medium text-[#138ba0] underline-offset-4 hover:underline disabled:opacity-50"
|
||||
>
|
||||
Sign out
|
||||
</button>
|
||||
)}
|
||||
</td>
|
||||
|
||||
<td className="px-4 py-3">
|
||||
<button
|
||||
type="button"
|
||||
disabled={locked || busy}
|
||||
onClick={() => setActive(row, row.is_active ? 0 : 1)}
|
||||
className={`rounded-full border px-3 py-1 text-xs font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50 ${
|
||||
row.is_active
|
||||
? "border-[#4a6b72]/30 text-[#4a6b72] hover:border-[#b3261e]/50 hover:text-[#b3261e]"
|
||||
: "border-[#138ba0]/40 text-[#138ba0] hover:bg-[#eef9fb]"
|
||||
}`}
|
||||
>
|
||||
{row.is_active ? "Disable" : "Enable"}
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{/* Each rung adds to the one above it. Worth stating, because
|
||||
"Editor" doesn't tell you where the line falls. */}
|
||||
<dl className="mt-4 grid gap-x-6 gap-y-1.5 text-sm sm:grid-cols-2">
|
||||
{ROLES.map((role) => (
|
||||
<div key={role} className="flex gap-2">
|
||||
<dt className="shrink-0 font-medium text-[#0f2f36]">
|
||||
{ROLE_LABELS[role]}
|
||||
</dt>
|
||||
<dd className="text-[#4a6b72]">{ROLE_NOTES[role]}</dd>
|
||||
</div>
|
||||
))}
|
||||
</dl>
|
||||
|
||||
<p className="mt-4 text-xs text-[#4a6b72]/80">
|
||||
New accounts are still created with <code>admin-cli.js</code> on the server.
|
||||
</p>
|
||||
</Block>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -23,16 +23,6 @@
|
|||
updated_at column simply never get one, and the 409 path stays
|
||||
dormant for them.
|
||||
|
||||
Two capabilities, not one role. An editor may create and update
|
||||
but not delete, so the action bar asks canWrite/canDelete rather
|
||||
than comparing user.role to a string. The comparison this
|
||||
replaced — role === "admin" — locked superadmins out of saving
|
||||
the moment a rank above admin existed, which is what an equality
|
||||
test against a ladder always eventually does.
|
||||
|
||||
None of this is protection. The server refuses the request; this
|
||||
only decides whether to draw a button that would be refused.
|
||||
|
||||
slugFrom may name one field or several. Most ids are unique
|
||||
because the name is: two organizations aren't both called
|
||||
Northwest. Team ids are the exception — teams.id is a global
|
||||
|
|
@ -43,61 +33,37 @@
|
|||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useNavigate, useParams } from "react-router-dom";
|
||||
|
||||
import { get, post, patch, del, ApiError, type FieldErrors } from "../../lib/api.js";
|
||||
import { get, post, patch, del, ApiError } from "../../lib/api.js";
|
||||
import { isUnauthorized, useAuth } from "../../lib/auth.tsx";
|
||||
import { useAdminDetail } from "../../lib/adminTitle.tsx";
|
||||
import {
|
||||
ADMIN_ENTITIES,
|
||||
slugify,
|
||||
type AdminOptions,
|
||||
type AdminRow,
|
||||
type FieldCondition,
|
||||
} from "../../lib/adminSchema.js";
|
||||
import { atLeast } from "../../lib/roles.ts";
|
||||
import { ADMIN_ENTITIES, slugify } from "../../lib/adminSchema.js";
|
||||
import { Field, FieldGrid, Repeater, getPath, setPath } from "../../components/admin/fields.tsx";
|
||||
|
||||
/* A foreign key refusing to budge is the most common way a save or
|
||||
delete fails here, and SQLite's own wording explains nothing to
|
||||
whoever is filling in the form. */
|
||||
function friendly(message: string, singular: string): string {
|
||||
function friendly(message, singular) {
|
||||
if (/FOREIGN KEY constraint failed/i.test(message ?? "")) {
|
||||
return `Something still points at this ${singular}. Reassign or remove those first.`;
|
||||
}
|
||||
return message;
|
||||
}
|
||||
|
||||
type RowResponse = { row: AdminRow };
|
||||
|
||||
type Notice = { tone: "ok" | "error"; text: string; recover?: "reload" };
|
||||
|
||||
export default function EntityEdit() {
|
||||
const { entity: entityKey, id } = useParams();
|
||||
const manifest = entityKey ? ADMIN_ENTITIES[entityKey] : undefined;
|
||||
const manifest = ADMIN_ENTITIES[entityKey];
|
||||
const navigate = useNavigate();
|
||||
const { user } = useAuth();
|
||||
|
||||
const isNew = id === "new";
|
||||
const canWrite = atLeast(user, "editor");
|
||||
const canDelete = atLeast(user, "admin");
|
||||
|
||||
// Some entities have no slug: the table assigns an integer id, so
|
||||
// there is nothing to type on create and nothing to compose from
|
||||
// other fields. Timeline entries are the first — an entry that
|
||||
// references an event has no name of its own.
|
||||
const autoId = manifest?.idKind === "auto";
|
||||
|
||||
// A singleton has one row, made by its migration: no slug to show
|
||||
// or type, no list to go back to, nothing to delete. The server
|
||||
// refuses create and delete regardless; this only stops offering
|
||||
// them.
|
||||
const singleton = Boolean(manifest?.singleton);
|
||||
const canWrite = user?.role === "admin";
|
||||
|
||||
// Hoisted above the loading guards: the title hook below is a
|
||||
// hook, so it can't sit after an early return, and it needs the
|
||||
// same paths the heading uses.
|
||||
const slugPaths: string[] = Array.isArray(manifest?.slugFrom)
|
||||
const slugPaths = Array.isArray(manifest?.slugFrom)
|
||||
? manifest.slugFrom
|
||||
: [manifest?.slugFrom].filter((path): path is string => Boolean(path));
|
||||
: [manifest?.slugFrom].filter(Boolean);
|
||||
|
||||
// Everything before the last path is a qualifier: a fact about
|
||||
// another field rather than something to type. It renders as
|
||||
|
|
@ -107,7 +73,7 @@ export default function EntityEdit() {
|
|||
|
||||
// Empty until every qualifier is chosen, because half a prefix
|
||||
// would be saved into an id that then never matches.
|
||||
const prefixOf = (source: AdminRow | null) => {
|
||||
const prefixOf = (source) => {
|
||||
if (qualifierPaths.length === 0) return "";
|
||||
const parts = qualifierPaths.map((path) => getPath(source, path));
|
||||
if (parts.some((part) => !part)) return "";
|
||||
|
|
@ -119,38 +85,34 @@ export default function EntityEdit() {
|
|||
? `${qualifierPaths.map((path) => path.replace(/_id$/, "")).join("-")}-`
|
||||
: "";
|
||||
|
||||
const tailOf = (source: AdminRow | null) => {
|
||||
const tailOf = (source) => {
|
||||
const prefix = prefixOf(source);
|
||||
const value = String(source?.id ?? "");
|
||||
const value = source?.id ?? "";
|
||||
return prefix && value.startsWith(prefix) ? value.slice(prefix.length) : value;
|
||||
};
|
||||
|
||||
// The heading wants the specific half, not the qualifier: a team
|
||||
// page reads "Board", not "northwest Board". An entity with no slug
|
||||
// names the field to read instead.
|
||||
const headingPath = slugPaths[slugPaths.length - 1] ?? manifest?.titleFrom;
|
||||
// page reads "Board", not "northwest Board".
|
||||
const headingPath = slugPaths[slugPaths.length - 1];
|
||||
|
||||
// Blank when neither is set yet, which reads as "nothing to name".
|
||||
const headingOf = (row: AdminRow) => String(getPath(row, headingPath) || row.id || "");
|
||||
|
||||
const [form, setForm] = useState<AdminRow | null>(null);
|
||||
const [options, setOptions] = useState<AdminOptions>({});
|
||||
const [errors, setErrors] = useState<Partial<FieldErrors>>({});
|
||||
const [message, setMessage] = useState<Notice | null>(null);
|
||||
const [form, setForm] = useState(null);
|
||||
const [options, setOptions] = useState({});
|
||||
const [errors, setErrors] = useState({});
|
||||
const [message, setMessage] = useState(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [slugTouched, setSlugTouched] = useState(false);
|
||||
|
||||
// The last state the server confirmed. Everything else compares
|
||||
// against this to decide whether there's anything to lose.
|
||||
const baseline = useRef<string | null>(null);
|
||||
const baseline = useRef(null);
|
||||
|
||||
const load = useCallback(async () => {
|
||||
if (!manifest) return;
|
||||
setLoading(true);
|
||||
setErrors({});
|
||||
try {
|
||||
const opts = await get<{ options: AdminOptions }>("/admin/options", { ttl: 60_000 });
|
||||
const opts = await get("/admin/options", { ttl: 60_000 });
|
||||
setOptions(opts.options);
|
||||
|
||||
if (isNew) {
|
||||
|
|
@ -158,14 +120,12 @@ export default function EntityEdit() {
|
|||
// touch", which is wrong for a row that doesn't exist yet.
|
||||
// The parent's own fields stay absent on purpose so the
|
||||
// server's column defaults apply to whatever isn't filled in.
|
||||
// No id key for an auto entity: the table assigns it, and
|
||||
// sending "" would be an explicit value rather than an absence.
|
||||
const blank: AdminRow = autoId ? {} : { id: "" };
|
||||
const blank = { id: "" };
|
||||
for (const child of manifest.children ?? []) blank[child.key] = [];
|
||||
setForm(blank);
|
||||
baseline.current = JSON.stringify(blank);
|
||||
} else {
|
||||
const data = await get<RowResponse>(`/admin/${manifest.key}/${id}`, { ttl: 0 });
|
||||
const data = await get(`/admin/${manifest.key}/${id}`, { ttl: 0 });
|
||||
setForm(data.row);
|
||||
baseline.current = JSON.stringify(data.row);
|
||||
}
|
||||
|
|
@ -179,7 +139,7 @@ export default function EntityEdit() {
|
|||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [manifest, id, isNew, autoId, navigate]);
|
||||
}, [manifest, id, isNew, navigate]);
|
||||
|
||||
useEffect(() => {
|
||||
load();
|
||||
|
|
@ -200,7 +160,7 @@ export default function EntityEdit() {
|
|||
: isNew
|
||||
? `New ${manifest.singular}`
|
||||
: form
|
||||
? headingOf(form)
|
||||
? getPath(form, headingPath) || form.id
|
||||
: null,
|
||||
);
|
||||
|
||||
|
|
@ -208,7 +168,7 @@ export default function EntityEdit() {
|
|||
// Router entirely, so the only hook available is this one.
|
||||
useEffect(() => {
|
||||
if (!dirty) return undefined;
|
||||
const warn = (event: BeforeUnloadEvent) => {
|
||||
const warn = (event) => {
|
||||
event.preventDefault();
|
||||
event.returnValue = "";
|
||||
};
|
||||
|
|
@ -221,19 +181,18 @@ export default function EntityEdit() {
|
|||
|
||||
/* ── Heading ───────────────────────────────────────────────── */
|
||||
|
||||
const heading = singleton ? manifest.label : headingOf(form);
|
||||
const updatedAt = typeof form.updated_at === "string" ? form.updated_at : null;
|
||||
const heading = getPath(form, headingPath) || form.id;
|
||||
|
||||
const children = manifest.children ?? [];
|
||||
|
||||
/* ── Actions ───────────────────────────────────────────────── */
|
||||
|
||||
const leave = (to: string) => {
|
||||
const leave = (to) => {
|
||||
if (dirty && !window.confirm("Leave without saving? Your changes will be lost.")) return;
|
||||
navigate(to);
|
||||
};
|
||||
|
||||
const change = (path: string, value: unknown) => {
|
||||
const change = (path, value) => {
|
||||
setForm((prev) => {
|
||||
let next = setPath(prev, path, value);
|
||||
// Recompose the id whenever one of its sources moves. The
|
||||
|
|
@ -255,20 +214,20 @@ export default function EntityEdit() {
|
|||
setErrors((prev) => (prev[path] ? { ...prev, [path]: undefined } : prev));
|
||||
};
|
||||
|
||||
const save = async () => {
|
||||
async function save() {
|
||||
setSaving(true);
|
||||
setErrors({});
|
||||
setMessage(null);
|
||||
try {
|
||||
const data = isNew
|
||||
? await post<RowResponse>(`/admin/${manifest.key}`, form)
|
||||
: await patch<RowResponse>(`/admin/${manifest.key}/${id}`, form);
|
||||
? await post(`/admin/${manifest.key}`, form)
|
||||
: await patch(`/admin/${manifest.key}/${id}`, form);
|
||||
|
||||
setForm(data.row);
|
||||
baseline.current = JSON.stringify(data.row);
|
||||
setMessage({ tone: "ok", text: "Saved." });
|
||||
|
||||
if (isNew) navigate(`/admin/${manifest.key}/${String(data.row.id)}`, { replace: true });
|
||||
if (isNew) navigate(`/admin/${manifest.key}/${data.row.id}`, { replace: true });
|
||||
} catch (err) {
|
||||
if (isUnauthorized(err)) return navigate("/admin/login", { replace: true });
|
||||
|
||||
|
|
@ -293,9 +252,9 @@ export default function EntityEdit() {
|
|||
} finally {
|
||||
setSaving(false);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
const remove = async () => {
|
||||
async function remove() {
|
||||
if (!window.confirm(`Delete ${heading}? Its links, blocks and roles go with it.`)) return;
|
||||
|
||||
try {
|
||||
|
|
@ -311,13 +270,12 @@ export default function EntityEdit() {
|
|||
: "Couldn't delete that.",
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
const visible = (when?: FieldCondition) => !when || getPath(form, when.path) === when.value;
|
||||
const visible = (when) => !when || getPath(form, when.path) === when.value;
|
||||
|
||||
return (
|
||||
<div className="pb-24">
|
||||
{!singleton && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => leave(`/admin/${manifest.key}`)}
|
||||
|
|
@ -325,31 +283,12 @@ export default function EntityEdit() {
|
|||
>
|
||||
← {manifest.label}
|
||||
</button>
|
||||
)}
|
||||
|
||||
<h1 className="mt-2 text-3xl font-bold text-[#138ba0]">
|
||||
{isNew ? `New ${manifest.singular}` : heading}
|
||||
</h1>
|
||||
|
||||
{/* Slug. An auto-id entity has nothing to ask for on create, and
|
||||
nothing editable afterwards — so it gets a plain line rather
|
||||
than a disabled box pretending to be a field. */}
|
||||
{singleton ? (
|
||||
updatedAt && (
|
||||
<div className="mt-6 rounded-2xl border border-[#138ba0]/20 bg-white p-5">
|
||||
<p className="text-sm text-[#4a6b72]">Last saved {updatedAt}</p>
|
||||
</div>
|
||||
)
|
||||
) : autoId ? (
|
||||
!isNew && (
|
||||
<div className="mt-6 rounded-2xl border border-[#138ba0]/20 bg-white p-5">
|
||||
<p className="text-sm text-[#4a6b72]">
|
||||
{manifest.idLabel} #{String(form.id)}
|
||||
{updatedAt && <> · last saved {updatedAt}</>}
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
) : (
|
||||
{/* Slug */}
|
||||
<div className="mt-6 rounded-2xl border border-[#138ba0]/20 bg-white p-5">
|
||||
<Field
|
||||
field={{
|
||||
|
|
@ -372,13 +311,12 @@ export default function EntityEdit() {
|
|||
change("id", `${prefixOf(form)}${slugify(value)}`);
|
||||
}}
|
||||
/>
|
||||
{!isNew && updatedAt && (
|
||||
{!isNew && form.updated_at && (
|
||||
<p className="mt-2 text-xs text-[#4a6b72]">
|
||||
Last saved {updatedAt}
|
||||
Last saved {form.updated_at}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Field groups */}
|
||||
{manifest.groups.filter((group) => visible(group.when)).map((group) => (
|
||||
|
|
@ -394,7 +332,6 @@ export default function EntityEdit() {
|
|||
<Field
|
||||
key={field.path}
|
||||
field={field}
|
||||
row={form}
|
||||
value={getPath(form, field.path)}
|
||||
options={options}
|
||||
error={errors[field.path]}
|
||||
|
|
@ -416,7 +353,7 @@ export default function EntityEdit() {
|
|||
<Repeater
|
||||
key={child.key}
|
||||
spec={child}
|
||||
rows={form[child.key] as AdminRow[] | undefined}
|
||||
rows={form[child.key]}
|
||||
options={options}
|
||||
errors={errors}
|
||||
errorPrefix={`${child.key}.`}
|
||||
|
|
@ -439,7 +376,7 @@ export default function EntityEdit() {
|
|||
>
|
||||
{saving ? "Saving…" : isNew ? "Create" : "Save changes"}
|
||||
</button>
|
||||
{!isNew && !singleton && canDelete && (
|
||||
{!isNew && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={remove}
|
||||
|
|
@ -451,7 +388,7 @@ export default function EntityEdit() {
|
|||
</>
|
||||
) : (
|
||||
<span className="text-sm text-[#4a6b72]">
|
||||
Read-only: your account can view this but not change it.
|
||||
Read-only: your account can't save changes.
|
||||
</span>
|
||||
)}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,55 +4,38 @@
|
|||
One component for organizations, events and people. The :entity
|
||||
route param picks the manifest; nothing here knows what a
|
||||
chapter or a retreat is.
|
||||
|
||||
The "New X" link follows the same rule as EntityEdit's save
|
||||
button: atLeast(user, "editor"), matching requireRole("editor")
|
||||
on POST /api/admin/:entity. Drawing it is not permission — the
|
||||
server decides — it only avoids offering a click that 403s, and
|
||||
avoids hiding one that wouldn't.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import { Link, Navigate, useNavigate, useParams, useSearchParams } from "react-router-dom";
|
||||
import { Link, useNavigate, useParams, useSearchParams } from "react-router-dom";
|
||||
|
||||
import { get, ApiError } from "../../lib/api.js";
|
||||
import { isUnauthorized, useAuth } from "../../lib/auth.tsx";
|
||||
import {
|
||||
ADMIN_ENTITIES,
|
||||
type AdminOptions,
|
||||
type AdminRow,
|
||||
type ListFilter,
|
||||
} from "../../lib/adminSchema.js";
|
||||
import { atLeast } from "../../lib/roles.ts";
|
||||
import { ADMIN_ENTITIES } from "../../lib/adminSchema.js";
|
||||
|
||||
export default function EntityList() {
|
||||
const { entity: entityKey } = useParams();
|
||||
const manifest = entityKey ? ADMIN_ENTITIES[entityKey] : undefined;
|
||||
const manifest = ADMIN_ENTITIES[entityKey];
|
||||
const navigate = useNavigate();
|
||||
const { user } = useAuth();
|
||||
|
||||
const [params, setParams] = useSearchParams();
|
||||
const [rows, setRows] = useState<AdminRow[]>([]);
|
||||
const [options, setOptions] = useState<AdminOptions>({});
|
||||
const [rows, setRows] = useState([]);
|
||||
const [options, setOptions] = useState({});
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [error, setError] = useState(null);
|
||||
const [query, setQuery] = useState(params.get("q") ?? "");
|
||||
|
||||
// Minimum rank, never equality. POST /api/admin/:entity is gated
|
||||
// at "editor", so anyone from editor upward may create — and the
|
||||
// equality test this replaced hid the button from superadmins as
|
||||
// well as editors, which is the failure mode an == against a
|
||||
// ladder always produces once a rank is added above it.
|
||||
const canWrite = atLeast(user, "editor");
|
||||
const canWrite = user?.role === "admin";
|
||||
|
||||
const load = useCallback(async () => {
|
||||
if (!manifest || manifest.singleton) return;
|
||||
if (!manifest) return;
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
const [list, opts] = await Promise.all([
|
||||
get<{ rows: AdminRow[]; total: number }>(`/admin/${manifest.key}?${params}`, { ttl: 0 }),
|
||||
get<{ options: AdminOptions }>("/admin/options", { ttl: 60_000 }),
|
||||
get(`/admin/${manifest.key}?${params}`, { ttl: 0 }),
|
||||
get("/admin/options", { ttl: 60_000 }),
|
||||
]);
|
||||
setRows(list.rows);
|
||||
setOptions(opts.options);
|
||||
|
|
@ -72,23 +55,18 @@ export default function EntityList() {
|
|||
return <p className="text-[#4a6b72]">No such thing to edit.</p>;
|
||||
}
|
||||
|
||||
// One row, so no list: the tab opens the row.
|
||||
if (manifest.singleton) {
|
||||
return <Navigate to={`/admin/${manifest.key}/${manifest.singleton}`} replace />;
|
||||
}
|
||||
|
||||
function setParam(key: string, value: string) {
|
||||
function setParam(key, value) {
|
||||
const next = new URLSearchParams(params);
|
||||
if (value) next.set(key, value);
|
||||
else next.delete(key);
|
||||
setParams(next, { replace: true });
|
||||
}
|
||||
|
||||
function labelFor(filter: ListFilter): Array<readonly [string, string]> {
|
||||
function labelFor(filter, value) {
|
||||
if (filter.optionsFrom) {
|
||||
return (options[filter.optionsFrom] ?? []).map((o) => [o.id, o.label] as const);
|
||||
return (options[filter.optionsFrom] ?? []).map((o) => [o.id, o.label]);
|
||||
}
|
||||
return (filter.options ?? []).map((o) => (typeof o === "string" ? [o, o] : o));
|
||||
return filter.options.map((o) => (Array.isArray(o) ? o : [o, o]));
|
||||
}
|
||||
|
||||
return (
|
||||
|
|
@ -169,7 +147,7 @@ export default function EntityList() {
|
|||
<tbody>
|
||||
{rows.map((row) => (
|
||||
<tr
|
||||
key={String(row.id)}
|
||||
key={row.id}
|
||||
className="cursor-pointer border-b border-[#4a6b72]/10 last:border-0 hover:bg-[#f6fbfc]"
|
||||
onClick={() => navigate(`/admin/${manifest.key}/${row.id}`)}
|
||||
>
|
||||
|
|
@ -184,12 +162,10 @@ export default function EntityList() {
|
|||
? row[column.key]
|
||||
? "Yes"
|
||||
: "—"
|
||||
: row[column.key]
|
||||
? String(row[column.key])
|
||||
: "—"}
|
||||
: row[column.key] || "—"}
|
||||
</td>
|
||||
))}
|
||||
<td className="px-4 py-3 font-mono text-xs text-[#4a6b72]">{String(row.id)}</td>
|
||||
<td className="px-4 py-3 font-mono text-xs text-[#4a6b72]">{row.id}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
ROLE GUARD — src/pages/admin/RequireRole.tsx
|
||||
|
||||
Sits inside RequireAuth, never instead of it: by the time this
|
||||
renders, the session question has already been answered. All
|
||||
this decides is whether the answer was good enough.
|
||||
|
||||
Same caveat as RequireAuth — this hides the interface, not the
|
||||
data. /api/admin/panel/* is superadmin-only on the server, and
|
||||
that's the part that matters. Without it, a bookmarked URL and
|
||||
a disabled select would be the only thing between a viewer and
|
||||
the account list.
|
||||
|
||||
Bounces to Home rather than showing a "denied" page. Someone
|
||||
who lands here has almost always followed a stale link, and a
|
||||
working page beats an explanation of one.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { Navigate, Outlet } from "react-router-dom";
|
||||
import { useAuth } from "../../lib/auth.tsx";
|
||||
import { atLeast, type Role } from "../../lib/roles.ts";
|
||||
import { ADMIN_HOME } from "./adminNav.js";
|
||||
|
||||
export default function RequireRole({ role = "superadmin" }: { role?: Role }) {
|
||||
const { user, loading } = useAuth();
|
||||
|
||||
// RequireAuth is already showing its own placeholder above this.
|
||||
if (loading) return null;
|
||||
|
||||
if (!user) return <Navigate to="/admin/login" replace />;
|
||||
if (!atLeast(user, role)) return <Navigate to={ADMIN_HOME} replace />;
|
||||
|
||||
return <Outlet />;
|
||||
}
|
||||
45
src/pages/admin/adminNav.d.ts
vendored
45
src/pages/admin/adminNav.d.ts
vendored
|
|
@ -1,45 +0,0 @@
|
|||
/* Types for adminNav.js. */
|
||||
|
||||
import type { AdminUser } from "../../lib/auth.tsx";
|
||||
|
||||
export declare const ADMIN_HOME: string;
|
||||
export declare const ADMIN_PANEL: string;
|
||||
|
||||
export type AdminArea = "home" | "cms" | "panel";
|
||||
|
||||
export declare const AREA_TITLES: Record<AdminArea, string>;
|
||||
|
||||
export type AdminNavLink = {
|
||||
to: string;
|
||||
label: string;
|
||||
/** Only read by the home cards. */
|
||||
blurb?: string;
|
||||
};
|
||||
|
||||
type AdminNavBase = {
|
||||
label: string;
|
||||
blurb?: string;
|
||||
separated?: boolean;
|
||||
superOnly?: boolean;
|
||||
};
|
||||
|
||||
/** A tab. One with no `to` of its own opens its first child, so it
|
||||
* must have one. */
|
||||
export type AdminNavItem = AdminNavBase &
|
||||
(
|
||||
| { to: string; children?: AdminNavLink[] }
|
||||
| { to?: undefined; children: [AdminNavLink, ...AdminNavLink[]] }
|
||||
);
|
||||
|
||||
export declare const CMS_NAV: AdminNavItem[];
|
||||
export declare const FORMS_NAV: AdminNavItem & { children: [AdminNavLink, ...AdminNavLink[]] };
|
||||
export declare const PANEL_NAV: AdminNavItem;
|
||||
export declare const NAV: AdminNavItem[];
|
||||
|
||||
export declare function navFor(user: AdminUser | null | undefined): AdminNavItem[];
|
||||
|
||||
export declare const matches: (pathname: string, to: string | null | undefined) => boolean;
|
||||
|
||||
export declare const target: (item: AdminNavItem) => string;
|
||||
|
||||
export declare function areaFor(pathname: string): AdminArea;
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
ADMIN NAVIGATION — src/pages/admin/adminNav.js
|
||||
|
||||
Lifted out of AdminLayout because two things read it now: the
|
||||
header tabs and the card grid on the home page. Adding an entity
|
||||
stays one entry here plus a descriptor — there's still no second
|
||||
list to keep in step, it just isn't inside the layout file
|
||||
any more.
|
||||
|
||||
`blurb` is only read by the home cards. The header ignores it.
|
||||
|
||||
`superOnly` hides an entry from anyone below superadmin. It
|
||||
hides, nothing more: the route still has to be guarded and the
|
||||
API still has to say no. Treating a filtered menu as access
|
||||
control is how you end up with a URL that works.
|
||||
|
||||
Three areas, three titles. The area is derived from the path
|
||||
rather than declared per route, so a page added under
|
||||
/admin/panel/… inherits the right title without registering
|
||||
anything.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { isSuper } from "../../lib/roles.ts";
|
||||
|
||||
export const ADMIN_HOME = "/admin/home";
|
||||
export const ADMIN_PANEL = "/admin/panel";
|
||||
|
||||
export const AREA_TITLES = {
|
||||
home: "NGU Admin Home",
|
||||
cms: "NGU Admin CMS",
|
||||
panel: "NGU Admin Panel",
|
||||
};
|
||||
|
||||
/* The CMS tabs. Teams and Awards live under Organizations because
|
||||
that's where they belong conceptually — a team is part of an org,
|
||||
an award is given by one — even though each is its own table and
|
||||
its own page. */
|
||||
export const CMS_NAV = [
|
||||
{
|
||||
to: "/admin/events",
|
||||
label: "Events",
|
||||
blurb: "Retreats, conferences and gatherings, with their sections and rosters.",
|
||||
},
|
||||
{
|
||||
to: "/admin/organizations",
|
||||
label: "Organizations",
|
||||
blurb: "Regions, chapters and partners — plus the teams and awards they own.",
|
||||
children: [
|
||||
{ to: "/admin/organizations", label: "All organizations" },
|
||||
{ to: "/admin/teams", label: "Teams" },
|
||||
{ to: "/admin/awards", label: "Awards" },
|
||||
],
|
||||
},
|
||||
{
|
||||
to: "/admin/people",
|
||||
label: "People",
|
||||
blurb: "Bios, contact details, affiliations and awards received.",
|
||||
},
|
||||
// Its own tab rather than a child of anything: a timeline entry can
|
||||
// point at an event, an organization, an award, a person or a team,
|
||||
// so filing it under one of them would be arbitrary.
|
||||
{
|
||||
to: "/admin/timeline",
|
||||
label: "Timeline",
|
||||
blurb: "What the history page shows, and the order it shows it in.",
|
||||
},
|
||||
// One record, not a list — the tab opens it directly.
|
||||
{
|
||||
to: "/admin/front_page",
|
||||
label: "Front page",
|
||||
blurb: "The hero, its photos or livestream, and which bands the home page draws.",
|
||||
},
|
||||
];
|
||||
|
||||
/* Forms are submissions coming in rather than content going out, so
|
||||
they get their own group in the header and their own block on the
|
||||
home page. A group with no `to` of its own opens its first child,
|
||||
so clicking the word Forms goes somewhere rather than nowhere. */
|
||||
export const FORMS_NAV = {
|
||||
label: "Forms",
|
||||
blurb: "Whatever the public site has sent us.",
|
||||
separated: true,
|
||||
children: [
|
||||
{
|
||||
to: "/admin/feedback",
|
||||
label: "Website feedback",
|
||||
blurb: "The triage queue for the feedback form.",
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
/* Accounts and server state, not content — which is why it sits
|
||||
outside the CMS rather than as another tab within it. */
|
||||
export const PANEL_NAV = {
|
||||
to: ADMIN_PANEL,
|
||||
label: "Panel",
|
||||
blurb: "Accounts, sessions and the state of the server.",
|
||||
separated: true,
|
||||
superOnly: true,
|
||||
};
|
||||
|
||||
export const NAV = [...CMS_NAV, FORMS_NAV, PANEL_NAV];
|
||||
|
||||
/* What this user may see. Call it with the user from useAuth. */
|
||||
export function navFor(user) {
|
||||
return NAV.filter((item) => !item.superOnly || isSuper(user));
|
||||
}
|
||||
|
||||
/* A tab owns its own page and everything below it, so editing
|
||||
/admin/teams/ngu-board keeps Teams lit. */
|
||||
export const matches = (pathname, to) =>
|
||||
Boolean(to) && (pathname === to || pathname.startsWith(`${to}/`));
|
||||
|
||||
export const target = (item) => item.to ?? item.children?.[0]?.to;
|
||||
|
||||
export function areaFor(pathname) {
|
||||
if (matches(pathname, ADMIN_HOME)) return "home";
|
||||
if (matches(pathname, ADMIN_PANEL)) return "panel";
|
||||
return "cms";
|
||||
}
|
||||
|
|
@ -1,791 +0,0 @@
|
|||
/* ═══════════════════════════════════════════════════════════════
|
||||
EVENT CALENDAR
|
||||
|
||||
Every published event on a month grid, or as a list of the month.
|
||||
Self contained like EventListCards: give it a filter and it
|
||||
fetches, so it can sit on any page.
|
||||
|
||||
<EventCalendar /> everything
|
||||
<EventCalendar host="northwest" /> one host's calendar
|
||||
<EventCalendar section="national" /> one scope
|
||||
<EventCalendar type={["class", "workshop"]} controls={["search"]} />
|
||||
|
||||
Two layers of filtering, and they answer different questions:
|
||||
|
||||
props what this page's calendar is about. Pinned; the
|
||||
visitor can't widen them, and the control for a
|
||||
pinned dimension doesn't render.
|
||||
controls what the visitor can narrow by within that: scope,
|
||||
type, online only, search. All four by default,
|
||||
every one starting at "all".
|
||||
|
||||
What lands on a day:
|
||||
|
||||
one-off every day from starts_on to ends_on, drawn as one
|
||||
bar across the days it spans, broken at the week
|
||||
edge and marked as continuing
|
||||
series every meeting the schedule produces in view (see
|
||||
eventSeries.ts), one day each, with its time
|
||||
undated nowhere — there's no day to put it on. Counted
|
||||
under the grid so it doesn't vanish without a word.
|
||||
|
||||
Bars are laid out per week in lanes, so a long event keeps its
|
||||
row across the days it covers. MAX_LANES rows show; a day with
|
||||
more says "+N more", and clicking any day lists everything on it
|
||||
below the grid.
|
||||
|
||||
Below md the grid would be seven unreadable slivers, so the month
|
||||
view shows the list there instead. The toggle still works; it
|
||||
just has one answer on a phone.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { useMemo, useState } from 'react'
|
||||
import { Link } from 'react-router-dom'
|
||||
|
||||
import { typesPresent, useEvents } from '../../data/eventData.js'
|
||||
import type { EventFilter } from '../../data/eventData.js'
|
||||
import { EVENT_TYPES, eventTypeLabel } from '../../lib/eventTypes.ts'
|
||||
import { firstOccurrenceFrom, occurrencesBetween, seriesTimes } from '../../lib/eventSeries.ts'
|
||||
import { eventHref } from '../../lib/hrefs.ts'
|
||||
import type { EventListItem } from '../../lib/useContent.ts'
|
||||
|
||||
export type CalendarControl = 'scope' | 'type' | 'online' | 'search'
|
||||
export type CalendarView = 'month' | 'list'
|
||||
|
||||
const ALL_CONTROLS: CalendarControl[] = ['scope', 'type', 'online', 'search']
|
||||
|
||||
/* Bar rows drawn per week before a day collapses to "+N more". */
|
||||
const MAX_LANES = 3
|
||||
|
||||
const TEAL = '#138ba0'
|
||||
const INK = '#073d4a'
|
||||
const BODY = '#4a6b72'
|
||||
|
||||
const WEEKDAYS = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
|
||||
|
||||
type EventCalendarProps = EventFilter & {
|
||||
accent?: string
|
||||
/** Which visitor controls render. A pinned prop hides its own. */
|
||||
controls?: CalendarControl[]
|
||||
defaultView?: CalendarView
|
||||
}
|
||||
|
||||
/* One appearance of an event on the calendar: a whole one-off, or a
|
||||
single meeting of a series. Dates are inclusive 'YYYY-MM-DD'. */
|
||||
type Occurrence = {
|
||||
key: string
|
||||
event: EventListItem
|
||||
start: string
|
||||
end: string
|
||||
time: string | null
|
||||
}
|
||||
|
||||
type Segment = Occurrence & {
|
||||
col: number
|
||||
span: number
|
||||
lane: number
|
||||
continuesBefore: boolean
|
||||
continuesAfter: boolean
|
||||
}
|
||||
|
||||
/* ── Dates ───────────────────────────────────────────────────── */
|
||||
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
const iso = (d: Date) => `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
|
||||
|
||||
function parse(date: string): Date {
|
||||
const [y, m, d] = date.split('-').map(Number)
|
||||
return new Date(y, m - 1, d)
|
||||
}
|
||||
|
||||
const addDays = (date: string, n: number) => {
|
||||
const d = parse(date)
|
||||
d.setDate(d.getDate() + n)
|
||||
return iso(d)
|
||||
}
|
||||
|
||||
const dayDiff = (a: string, b: string) =>
|
||||
Math.round((parse(b).getTime() - parse(a).getTime()) / 86_400_000)
|
||||
|
||||
const monthKey = (date: string) => date.slice(0, 7)
|
||||
|
||||
/* The six Sunday-started weeks that cover a month. */
|
||||
function gridFor(month: string): string[][] {
|
||||
const first = parse(`${month}-01`)
|
||||
const start = addDays(iso(first), -first.getDay())
|
||||
return Array.from({ length: 6 }, (_, w) =>
|
||||
Array.from({ length: 7 }, (_, d) => addDays(start, w * 7 + d)),
|
||||
)
|
||||
}
|
||||
|
||||
const monthTitle = (month: string) =>
|
||||
parse(`${month}-01`).toLocaleDateString(undefined, { month: 'long', year: 'numeric' })
|
||||
|
||||
const shiftMonth = (month: string, n: number) => {
|
||||
const d = parse(`${month}-01`)
|
||||
d.setMonth(d.getMonth() + n)
|
||||
return monthKey(iso(d))
|
||||
}
|
||||
|
||||
const longDay = (date: string) =>
|
||||
parse(date).toLocaleDateString(undefined, {
|
||||
weekday: 'long',
|
||||
month: 'long',
|
||||
day: 'numeric',
|
||||
year: 'numeric',
|
||||
})
|
||||
|
||||
function rangeLabel(start: string, end: string): string {
|
||||
const opts: Intl.DateTimeFormatOptions = { month: 'short', day: 'numeric' }
|
||||
if (start === end) return parse(start).toLocaleDateString(undefined, opts)
|
||||
return `${parse(start).toLocaleDateString(undefined, opts)} – ${parse(end).toLocaleDateString(undefined, opts)}`
|
||||
}
|
||||
|
||||
/* ── Occurrences ─────────────────────────────────────────────── */
|
||||
|
||||
function occurrencesIn(events: EventListItem[], from: string, to: string): Occurrence[] {
|
||||
const out: Occurrence[] = []
|
||||
|
||||
for (const event of events) {
|
||||
if (!event.starts_on) continue
|
||||
|
||||
if (event.series) {
|
||||
const time = seriesTimes(event.series)
|
||||
for (const date of occurrencesBetween(event.series, event.starts_on, event.ends_on, from, to)) {
|
||||
out.push({ key: `${event.id}@${date}`, event, start: date, end: date, time })
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
const start = event.starts_on
|
||||
const end = event.ends_on && event.ends_on >= start ? event.ends_on : start
|
||||
if (end < from || start > to) continue
|
||||
out.push({ key: event.id, event, start, end, time: null })
|
||||
}
|
||||
|
||||
// Longest first within a day, so multi-day bars claim the top lanes.
|
||||
return out.sort(
|
||||
(a, b) => a.start.localeCompare(b.start) || dayDiff(b.start, b.end) - dayDiff(a.start, a.end),
|
||||
)
|
||||
}
|
||||
|
||||
/* Greedy lane packing for one week: each segment takes the first
|
||||
lane whose last occupant ended before it starts. */
|
||||
function layoutWeek(week: string[], occurrences: Occurrence[]): Segment[] {
|
||||
const first = week[0]
|
||||
const last = week[6]
|
||||
const laneEnds: number[] = []
|
||||
const segments: Segment[] = []
|
||||
|
||||
for (const occ of occurrences) {
|
||||
if (occ.end < first || occ.start > last) continue
|
||||
const start = occ.start < first ? first : occ.start
|
||||
const end = occ.end > last ? last : occ.end
|
||||
const col = dayDiff(first, start)
|
||||
const span = dayDiff(start, end) + 1
|
||||
|
||||
let lane = laneEnds.findIndex((endCol) => endCol < col)
|
||||
if (lane === -1) lane = laneEnds.length
|
||||
laneEnds[lane] = col + span - 1
|
||||
|
||||
segments.push({
|
||||
...occ,
|
||||
col,
|
||||
span,
|
||||
lane,
|
||||
continuesBefore: occ.start < first,
|
||||
continuesAfter: occ.end > last,
|
||||
})
|
||||
}
|
||||
|
||||
return segments
|
||||
}
|
||||
|
||||
/* The next date after `after` that any of these events lands on. */
|
||||
function nextDateAfter(events: EventListItem[], after: string): string | null {
|
||||
let best: string | null = null
|
||||
const from = addDays(after, 1)
|
||||
for (const event of events) {
|
||||
if (!event.starts_on) continue
|
||||
const date = event.series
|
||||
? firstOccurrenceFrom(event.series, event.starts_on, event.ends_on, from)
|
||||
: event.starts_on >= from
|
||||
? event.starts_on
|
||||
: null
|
||||
if (date && (!best || date < best)) best = date
|
||||
}
|
||||
return best
|
||||
}
|
||||
|
||||
/* ── Component ───────────────────────────────────────────────── */
|
||||
|
||||
export default function EventCalendar({
|
||||
section,
|
||||
host,
|
||||
status,
|
||||
type,
|
||||
accent = TEAL,
|
||||
controls = ALL_CONTROLS,
|
||||
defaultView = 'month',
|
||||
}: EventCalendarProps) {
|
||||
const { events: pinned, sections, loading, error } = useEvents({ section, host, status, type })
|
||||
|
||||
const today = iso(new Date())
|
||||
const [month, setMonth] = useState(monthKey(today))
|
||||
const [view, setView] = useState<CalendarView>(defaultView)
|
||||
const [selected, setSelected] = useState<string | null>(null)
|
||||
|
||||
const [scope, setScope] = useState('')
|
||||
const [kind, setKind] = useState('')
|
||||
const [onlineOnly, setOnlineOnly] = useState(false)
|
||||
const [query, setQuery] = useState('')
|
||||
|
||||
const show = (control: CalendarControl) => controls.includes(control)
|
||||
const showScope = show('scope') && !section
|
||||
const showType = show('type') && !type
|
||||
|
||||
const types = useMemo(() => typesPresent(pinned, EVENT_TYPES), [pinned])
|
||||
const scopes = useMemo(() => {
|
||||
const present = new Set(pinned.map((e) => e.section_id))
|
||||
return sections.filter((s) => present.has(s.id))
|
||||
}, [pinned, sections])
|
||||
|
||||
const events = useMemo(() => {
|
||||
const needle = query.trim().toLowerCase()
|
||||
return pinned.filter((e) => {
|
||||
if (scope && e.section_id !== scope) return false
|
||||
if (kind && e.event_type !== kind) return false
|
||||
if (onlineOnly && !e.is_online) return false
|
||||
if (needle) {
|
||||
const haystack = [
|
||||
e.title,
|
||||
e.theme,
|
||||
e.location_label,
|
||||
e.locality,
|
||||
...(e.hosts ?? []).map((h) => h.name),
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' ')
|
||||
.toLowerCase()
|
||||
if (!haystack.includes(needle)) return false
|
||||
}
|
||||
return true
|
||||
})
|
||||
}, [pinned, scope, kind, onlineOnly, query])
|
||||
|
||||
const weeks = useMemo(() => gridFor(month), [month])
|
||||
const gridFrom = weeks[0][0]
|
||||
const gridTo = weeks[5][6]
|
||||
const monthFrom = `${month}-01`
|
||||
const monthTo = addDays(`${shiftMonth(month, 1)}-01`, -1)
|
||||
|
||||
const occurrences = useMemo(
|
||||
() => occurrencesIn(events, gridFrom, gridTo),
|
||||
[events, gridFrom, gridTo],
|
||||
)
|
||||
const inMonth = occurrences.filter((o) => o.end >= monthFrom && o.start <= monthTo)
|
||||
const undated = events.filter((e) => !e.starts_on).length
|
||||
const filtering = Boolean(scope || kind || onlineOnly || query)
|
||||
const next = inMonth.length === 0 ? nextDateAfter(events, monthTo) : null
|
||||
|
||||
const onDay = (date: string) => occurrences.filter((o) => o.start <= date && o.end >= date)
|
||||
|
||||
const go = (target: string) => {
|
||||
setMonth(target)
|
||||
setSelected(null)
|
||||
}
|
||||
|
||||
const clearFilters = () => {
|
||||
setScope('')
|
||||
setKind('')
|
||||
setOnlineOnly(false)
|
||||
setQuery('')
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mx-auto max-w-6xl px-6" style={{ color: INK }}>
|
||||
{/* ── Month navigation and view ── */}
|
||||
<div className="flex flex-wrap items-center gap-3">
|
||||
<div className="flex items-center gap-2">
|
||||
<NavButton label="Previous month" onClick={() => go(shiftMonth(month, -1))} accent={accent}>
|
||||
‹
|
||||
</NavButton>
|
||||
<NavButton label="Next month" onClick={() => go(shiftMonth(month, 1))} accent={accent}>
|
||||
›
|
||||
</NavButton>
|
||||
</div>
|
||||
|
||||
<h3 className="min-w-[11rem] font-display text-2xl font-bold" aria-live="polite">
|
||||
{monthTitle(month)}
|
||||
</h3>
|
||||
|
||||
{month !== monthKey(today) && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => go(monthKey(today))}
|
||||
className="rounded-full border px-3 py-1 text-sm font-semibold hover:bg-white"
|
||||
style={{ borderColor: accent, color: accent }}
|
||||
>
|
||||
Today
|
||||
</button>
|
||||
)}
|
||||
|
||||
<div
|
||||
className="ml-auto hidden overflow-hidden rounded-full border md:flex"
|
||||
style={{ borderColor: accent }}
|
||||
role="group"
|
||||
aria-label="Calendar view"
|
||||
>
|
||||
{(['month', 'list'] as const).map((option) => (
|
||||
<button
|
||||
key={option}
|
||||
type="button"
|
||||
onClick={() => setView(option)}
|
||||
aria-pressed={view === option}
|
||||
className="px-4 py-1.5 text-sm font-semibold capitalize transition-colors"
|
||||
style={
|
||||
view === option
|
||||
? { background: accent, color: '#ffffff' }
|
||||
: { color: accent }
|
||||
}
|
||||
>
|
||||
{option}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ── Filters ── */}
|
||||
{(showScope || showType || show('online') || show('search')) && (
|
||||
<div className="mt-5 flex flex-wrap items-center gap-3">
|
||||
{showScope && scopes.length > 1 && (
|
||||
<FilterSelect
|
||||
label="Scope"
|
||||
value={scope}
|
||||
onChange={setScope}
|
||||
all="All scopes"
|
||||
options={scopes.map((s) => [s.id, s.name])}
|
||||
/>
|
||||
)}
|
||||
{showType && types.length > 1 && (
|
||||
<FilterSelect
|
||||
label="Type"
|
||||
value={kind}
|
||||
onChange={setKind}
|
||||
all="All types"
|
||||
options={types.map((t) => [t.id, t.plural])}
|
||||
/>
|
||||
)}
|
||||
{show('online') && (
|
||||
<label className="flex cursor-pointer items-center gap-2 rounded-full border border-[#138ba0]/25 bg-white px-4 py-2 text-sm">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={onlineOnly}
|
||||
onChange={(e) => setOnlineOnly(e.target.checked)}
|
||||
className="h-4 w-4 rounded"
|
||||
style={{ accentColor: accent }}
|
||||
/>
|
||||
Online only
|
||||
</label>
|
||||
)}
|
||||
{show('search') && (
|
||||
<input
|
||||
type="search"
|
||||
value={query}
|
||||
onChange={(e) => setQuery(e.target.value)}
|
||||
placeholder="Search events"
|
||||
aria-label="Search events"
|
||||
className="min-w-[12rem] flex-1 rounded-full border border-[#138ba0]/25 bg-white px-4 py-2 text-sm outline-none focus:border-[#138ba0] md:max-w-xs"
|
||||
/>
|
||||
)}
|
||||
{filtering && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={clearFilters}
|
||||
className="text-sm font-semibold hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
Clear filters
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* ── Body ── */}
|
||||
<div className="mt-6">
|
||||
{error ? (
|
||||
<p className="rounded-2xl bg-white p-6 text-[#b3261e]">
|
||||
Couldn’t load events. {error.message}
|
||||
</p>
|
||||
) : loading ? (
|
||||
<div className="h-[32rem] animate-pulse rounded-3xl bg-white/70" aria-hidden="true" />
|
||||
) : (
|
||||
<>
|
||||
{view === 'month' && (
|
||||
<div className="hidden md:block">
|
||||
<MonthGrid
|
||||
weeks={weeks}
|
||||
month={month}
|
||||
today={today}
|
||||
occurrences={occurrences}
|
||||
selected={selected}
|
||||
onSelect={(date) => setSelected((s) => (s === date ? null : date))}
|
||||
accent={accent}
|
||||
/>
|
||||
{selected && (
|
||||
<DayPanel
|
||||
date={selected}
|
||||
items={onDay(selected)}
|
||||
accent={accent}
|
||||
onClose={() => setSelected(null)}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className={view === 'month' ? 'md:hidden' : ''}>
|
||||
<MonthList items={inMonth} monthFrom={monthFrom} accent={accent} />
|
||||
</div>
|
||||
|
||||
{inMonth.length === 0 && (
|
||||
<div className="mt-4 text-center text-sm" style={{ color: BODY }}>
|
||||
{next ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => go(monthKey(next))}
|
||||
className="font-semibold hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
Jump to the next event, {monthTitle(monthKey(next))} →
|
||||
</button>
|
||||
) : filtering ? (
|
||||
'Nothing matches these filters.'
|
||||
) : null}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{undated > 0 && (
|
||||
<p className="mt-4 text-center text-xs" style={{ color: BODY }}>
|
||||
{undated === 1 ? '1 event has' : `${undated} events have`} no dates yet, so{' '}
|
||||
{undated === 1 ? 'isn’t' : 'aren’t'} on the calendar.
|
||||
</p>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/* ── Month grid ──────────────────────────────────────────────── */
|
||||
|
||||
type MonthGridProps = {
|
||||
weeks: string[][]
|
||||
month: string
|
||||
today: string
|
||||
occurrences: Occurrence[]
|
||||
selected: string | null
|
||||
onSelect: (date: string) => void
|
||||
accent: string
|
||||
}
|
||||
|
||||
function MonthGrid({ weeks, month, today, occurrences, selected, onSelect, accent }: MonthGridProps) {
|
||||
return (
|
||||
<div className="overflow-hidden rounded-3xl border border-[#138ba0]/15 bg-white shadow-sm">
|
||||
<div className="grid grid-cols-7 border-b border-[#138ba0]/10 bg-[#f6fbfc]">
|
||||
{WEEKDAYS.map((day) => (
|
||||
<div
|
||||
key={day}
|
||||
className="px-3 py-2 text-xs font-bold uppercase tracking-widest"
|
||||
style={{ color: BODY }}
|
||||
>
|
||||
{day}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{weeks.map((week) => {
|
||||
const segments = layoutWeek(week, occurrences)
|
||||
const visible = segments.filter((s) => s.lane < MAX_LANES)
|
||||
const hiddenOn = (col: number) =>
|
||||
segments.filter((s) => s.lane >= MAX_LANES && s.col <= col && s.col + s.span > col).length
|
||||
const countOn = (col: number) =>
|
||||
segments.filter((s) => s.col <= col && s.col + s.span > col).length
|
||||
|
||||
return (
|
||||
<div key={week[0]} className="relative min-h-[8rem] border-b border-[#138ba0]/10 last:border-b-0">
|
||||
{/* Day cells: the click targets, and the numbers. */}
|
||||
<div className="absolute inset-0 grid grid-cols-7">
|
||||
{week.map((date, col) => {
|
||||
const outside = monthKey(date) !== month
|
||||
const isToday = date === today
|
||||
const isSelected = date === selected
|
||||
const count = countOn(col)
|
||||
const hidden = hiddenOn(col)
|
||||
return (
|
||||
<button
|
||||
key={date}
|
||||
type="button"
|
||||
onClick={() => onSelect(date)}
|
||||
aria-pressed={isSelected}
|
||||
aria-label={`${longDay(date)}${count ? `, ${count} event${count === 1 ? '' : 's'}` : ''}`}
|
||||
className="relative flex flex-col items-start border-r border-[#138ba0]/10 p-2 text-left transition-colors last:border-r-0 hover:bg-[#f6fbfc]"
|
||||
style={{
|
||||
background: isSelected ? `${accent}14` : outside ? '#fbfdfd' : undefined,
|
||||
}}
|
||||
>
|
||||
<span
|
||||
className="flex h-7 w-7 items-center justify-center rounded-full text-sm font-semibold"
|
||||
style={
|
||||
isToday
|
||||
? { background: accent, color: '#ffffff' }
|
||||
: { color: outside ? '#b8c6c9' : INK }
|
||||
}
|
||||
>
|
||||
{Number(date.slice(8))}
|
||||
</span>
|
||||
{hidden > 0 && (
|
||||
<span className="mt-auto text-xs font-semibold" style={{ color: accent }}>
|
||||
+{hidden} more
|
||||
</span>
|
||||
)}
|
||||
</button>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* Bars, laid over the cells. Only the bars take clicks. */}
|
||||
<div
|
||||
className="pointer-events-none relative grid grid-cols-7 gap-y-1 pb-7 pt-10"
|
||||
style={{ gridTemplateRows: `repeat(${MAX_LANES}, 1.5rem)` }}
|
||||
>
|
||||
{visible.map((seg) => (
|
||||
<Bar key={`${seg.key}-${week[0]}`} seg={seg} accent={accent} />
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function Bar({ seg, accent }: { seg: Segment; accent: string }) {
|
||||
const color = seg.event.color || accent
|
||||
const cancelled = seg.event.status === 'cancelled'
|
||||
|
||||
return (
|
||||
<Link
|
||||
to={eventHref(seg.event.id)}
|
||||
title={`${seg.event.title}${seg.time ? ` · ${seg.time}` : ''}`}
|
||||
className={`pointer-events-auto flex items-center gap-1 truncate px-2 text-xs font-semibold text-white transition-[filter] hover:brightness-110 ${
|
||||
seg.continuesBefore ? 'ml-0 rounded-l-none' : 'ml-1 rounded-l-md'
|
||||
} ${seg.continuesAfter ? 'mr-0 rounded-r-none' : 'mr-1 rounded-r-md'} ${
|
||||
cancelled ? 'line-through opacity-60' : ''
|
||||
}`}
|
||||
style={{
|
||||
gridColumn: `${seg.col + 1} / span ${seg.span}`,
|
||||
gridRow: seg.lane + 1,
|
||||
background: color,
|
||||
}}
|
||||
>
|
||||
{seg.continuesBefore && <span aria-hidden="true">←</span>}
|
||||
<span className="truncate">
|
||||
{seg.time && seg.span === 1 && <span className="font-normal opacity-85">{seg.time.split(' – ')[0]} </span>}
|
||||
{seg.event.title}
|
||||
</span>
|
||||
{seg.continuesAfter && (
|
||||
<span className="ml-auto" aria-hidden="true">
|
||||
→
|
||||
</span>
|
||||
)}
|
||||
</Link>
|
||||
)
|
||||
}
|
||||
|
||||
/* ── The selected day ────────────────────────────────────────── */
|
||||
|
||||
function DayPanel({
|
||||
date,
|
||||
items,
|
||||
accent,
|
||||
onClose,
|
||||
}: {
|
||||
date: string
|
||||
items: Occurrence[]
|
||||
accent: string
|
||||
onClose: () => void
|
||||
}) {
|
||||
return (
|
||||
<div className="mt-4 rounded-3xl border bg-white p-6" style={{ borderColor: `${accent}40` }}>
|
||||
<div className="flex items-center gap-4">
|
||||
<h4 className="font-display text-lg font-bold">{longDay(date)}</h4>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onClose}
|
||||
className="ml-auto text-sm font-semibold hover:underline"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
Close
|
||||
</button>
|
||||
</div>
|
||||
{items.length === 0 ? (
|
||||
<p className="mt-3 text-sm" style={{ color: BODY }}>
|
||||
Nothing on this day.
|
||||
</p>
|
||||
) : (
|
||||
<ul className="mt-4 space-y-3">
|
||||
{items.map((item) => (
|
||||
<li key={item.key}>
|
||||
<EventLine item={item} accent={accent} />
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/* ── List view ───────────────────────────────────────────────── */
|
||||
|
||||
/* The month's occurrences by day. An event that began last month
|
||||
files under the 1st, where it's still on. */
|
||||
function MonthList({
|
||||
items,
|
||||
monthFrom,
|
||||
accent,
|
||||
}: {
|
||||
items: Occurrence[]
|
||||
monthFrom: string
|
||||
accent: string
|
||||
}) {
|
||||
if (items.length === 0) {
|
||||
return (
|
||||
<p className="rounded-3xl bg-white p-10 text-center" style={{ color: BODY }}>
|
||||
Nothing on the calendar this month.
|
||||
</p>
|
||||
)
|
||||
}
|
||||
|
||||
const byDay = new Map<string, Occurrence[]>()
|
||||
for (const item of items) {
|
||||
const day = item.start < monthFrom ? monthFrom : item.start
|
||||
const list = byDay.get(day)
|
||||
if (list) list.push(item)
|
||||
else byDay.set(day, [item])
|
||||
}
|
||||
|
||||
return (
|
||||
<ol className="space-y-4">
|
||||
{[...byDay.entries()].map(([day, list]) => {
|
||||
const d = parse(day)
|
||||
return (
|
||||
<li key={day} className="flex gap-5 rounded-3xl bg-white p-5 shadow-sm">
|
||||
<div className="w-14 shrink-0 text-center">
|
||||
<p className="text-xs font-bold uppercase tracking-widest" style={{ color: accent }}>
|
||||
{d.toLocaleDateString(undefined, { weekday: 'short' })}
|
||||
</p>
|
||||
<p className="font-display text-3xl font-extrabold leading-none">{d.getDate()}</p>
|
||||
</div>
|
||||
<ul className="min-w-0 flex-1 space-y-3">
|
||||
{list.map((item) => (
|
||||
<li key={item.key}>
|
||||
<EventLine item={item} accent={accent} />
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</li>
|
||||
)
|
||||
})}
|
||||
</ol>
|
||||
)
|
||||
}
|
||||
|
||||
/* One occurrence as a line of text, shared by the day panel and the
|
||||
list so the two describe an event the same way. */
|
||||
function EventLine({ item, accent }: { item: Occurrence; accent: string }) {
|
||||
const { event } = item
|
||||
const color = event.color || accent
|
||||
const where = event.location_label || (event.is_online ? 'Online' : null)
|
||||
const cancelled = event.status === 'cancelled'
|
||||
|
||||
return (
|
||||
<Link
|
||||
to={eventHref(event.id)}
|
||||
className="group flex items-start gap-3 rounded-xl p-2 transition-colors hover:bg-[#f6fbfc]"
|
||||
>
|
||||
<span className="mt-1.5 h-3 w-3 shrink-0 rounded-full" style={{ background: color }} aria-hidden="true" />
|
||||
<span className="min-w-0">
|
||||
<span className={`block font-semibold group-hover:underline ${cancelled ? 'line-through' : ''}`}>
|
||||
{event.title}
|
||||
{cancelled && <span className="ml-2 text-xs font-bold uppercase text-[#b3261e] no-underline">Cancelled</span>}
|
||||
</span>
|
||||
<span className="block text-sm" style={{ color: BODY }}>
|
||||
{[
|
||||
item.time ?? (item.start !== item.end ? rangeLabel(item.start, item.end) : null),
|
||||
eventTypeLabel(event.event_type),
|
||||
where,
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' · ')}
|
||||
</span>
|
||||
</span>
|
||||
</Link>
|
||||
)
|
||||
}
|
||||
|
||||
/* ── Controls ────────────────────────────────────────────────── */
|
||||
|
||||
function NavButton({
|
||||
label,
|
||||
onClick,
|
||||
accent,
|
||||
children,
|
||||
}: {
|
||||
label: string
|
||||
onClick: () => void
|
||||
accent: string
|
||||
children: string
|
||||
}) {
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
onClick={onClick}
|
||||
aria-label={label}
|
||||
className="flex h-10 w-10 items-center justify-center rounded-full border text-xl transition-colors hover:bg-white"
|
||||
style={{ borderColor: accent, color: accent }}
|
||||
>
|
||||
{children}
|
||||
</button>
|
||||
)
|
||||
}
|
||||
|
||||
function FilterSelect({
|
||||
label,
|
||||
value,
|
||||
onChange,
|
||||
all,
|
||||
options,
|
||||
}: {
|
||||
label: string
|
||||
value: string
|
||||
onChange: (value: string) => void
|
||||
all: string
|
||||
options: Array<[string, string]>
|
||||
}) {
|
||||
return (
|
||||
<select
|
||||
value={value}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
aria-label={label}
|
||||
className="rounded-full border border-[#138ba0]/25 bg-white px-4 py-2 text-sm outline-none focus:border-[#138ba0]"
|
||||
>
|
||||
<option value="">{all}</option>
|
||||
{options.map(([id, name]) => (
|
||||
<option key={id} value={id}>
|
||||
{name}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,16 +1,5 @@
|
|||
import { useEffect, useMemo, useRef, useState, type ReactNode } from "react";
|
||||
import { Link } from "react-router-dom";
|
||||
import {
|
||||
splitByStatus,
|
||||
typesPresent,
|
||||
useEvents,
|
||||
type EventFilter,
|
||||
} from "../../data/eventData.js";
|
||||
import { eventHref } from "../../lib/hrefs.ts";
|
||||
import { EVENT_TYPES, eventTypeLabel, type EventType } from "../../lib/eventTypes.ts";
|
||||
import { seriesLabel } from "../../lib/eventSeries.ts";
|
||||
import type { EventListItem } from "../../lib/useContent.ts";
|
||||
import type { SectionToggleProps } from "../../lib/sections.tsx";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { splitByStatus, useEvents } from "../../data/eventData.js";
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════════
|
||||
EVENT LIST — CARDS
|
||||
|
|
@ -22,17 +11,11 @@ import type { SectionToggleProps } from "../../lib/sections.tsx";
|
|||
|
||||
<EventListCards section="national" view="carousel" />
|
||||
<EventListCards host="northwest" view="grid" />
|
||||
<EventListCards type={["class", "workshop"]} view="grid" />
|
||||
|
||||
`view` and `accent` come from the page's section manifest.
|
||||
|
||||
`type` pre-filters the band the way `section` and `host` do. Left
|
||||
off, the band takes every kind it finds and grows a row of chips
|
||||
to narrow by — but only once it holds more than one, so a band of
|
||||
nothing but retreats shows no control at all.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
const LOGO_FILES = import.meta.glob<string>("../../assets/event-logos/*.svg", {
|
||||
const LOGO_FILES = import.meta.glob("../../assets/event-logos/*.svg", {
|
||||
eager: true,
|
||||
import: "default",
|
||||
});
|
||||
|
|
@ -41,7 +24,7 @@ const LOGOS = Object.fromEntries(
|
|||
Object.entries(LOGO_FILES).map(([path, src]) => [path.split("/").pop(), src])
|
||||
);
|
||||
|
||||
const logoSrc = (file: string | null | undefined) => (file && LOGOS[file]) || null;
|
||||
const logoSrc = file => (file && LOGOS[file]) || null;
|
||||
|
||||
/* Last resort only. The API already falls back to the host
|
||||
organization's logo when an event doesn't name its own, so this
|
||||
|
|
@ -49,15 +32,7 @@ const logoSrc = (file: string | null | undefined) => (file && LOGOS[file]) || nu
|
|||
const DEFAULT_ORG_LOGO = null;
|
||||
|
||||
/* An <img> that removes itself if the file 404s. */
|
||||
function Logo({
|
||||
file,
|
||||
alt = "",
|
||||
className,
|
||||
}: {
|
||||
file: string | null | undefined;
|
||||
alt?: string;
|
||||
className?: string;
|
||||
}) {
|
||||
function Logo({ file, alt = "", className }) {
|
||||
const [failed, setFailed] = useState(false);
|
||||
const src = logoSrc(file);
|
||||
if (!src || failed) return null;
|
||||
|
|
@ -130,31 +105,6 @@ const InstagramIcon = ({ id = "ig-gradient" }) => (
|
|||
</svg>
|
||||
);
|
||||
|
||||
/* The title is the way into the event's own page.
|
||||
|
||||
A link on the title rather than a wrapper around the whole card:
|
||||
the footer already holds anchors, and an anchor inside an anchor
|
||||
is invalid markup that every browser resolves by guessing. The
|
||||
carousel has the same constraint — it needs the card's click to
|
||||
mean "bring this one to the front" on anything that isn't the
|
||||
active slide. */
|
||||
function TitleLink({
|
||||
ev,
|
||||
linked,
|
||||
children,
|
||||
}: {
|
||||
ev: Pick<EventListItem, "id">;
|
||||
linked: boolean;
|
||||
children: ReactNode;
|
||||
}) {
|
||||
if (!linked) return <>{children}</>;
|
||||
return (
|
||||
<Link to={eventHref(ev.id)} className="hover:underline underline-offset-4">
|
||||
{children}
|
||||
</Link>
|
||||
);
|
||||
}
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════════
|
||||
EVENT CARD — one component, two sizes.
|
||||
compact=false → the full card used in the carousel
|
||||
|
|
@ -169,52 +119,23 @@ function TitleLink({
|
|||
Fields arrive pre-resolved from the API — `color` is the event's
|
||||
own or its host's, `status` is derived from the dates when it
|
||||
isn't set — so nothing here reimplements those rules.
|
||||
|
||||
`linked` is the one thing a caller turns off: a card on the
|
||||
event's own page shouldn't link to the page it's already on.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
type CardProps = {
|
||||
ev: EventListItem;
|
||||
defaultColor?: string;
|
||||
accent?: string;
|
||||
compact?: boolean;
|
||||
interactive?: boolean;
|
||||
linked?: boolean;
|
||||
showType?: boolean;
|
||||
};
|
||||
|
||||
export function Card({
|
||||
ev,
|
||||
defaultColor = TEAL,
|
||||
accent = TEAL,
|
||||
compact = false,
|
||||
interactive = true,
|
||||
linked = true,
|
||||
showType = false,
|
||||
}: CardProps) {
|
||||
}) {
|
||||
const past = ev.status === "past";
|
||||
const color = ev.color || defaultColor;
|
||||
const orgLogo = ev.org_logo || DEFAULT_ORG_LOGO;
|
||||
const eventLogo = ev.event_logo;
|
||||
const schedule = seriesLabel(ev.series, ev.starts_on);
|
||||
const links = ev.links ?? [];
|
||||
const igHandle = ev.instagram || null;
|
||||
const igUrl = igHandle
|
||||
? `https://instagram.com/${igHandle.replace(/^@/, "")}`
|
||||
: undefined;
|
||||
|
||||
/* Off unless the caller says the band is mixed. A "Retreat" badge
|
||||
on every card in a row of nothing but retreats is noise, and
|
||||
the card can't tell on its own — it only ever sees one event. */
|
||||
const typeBadge =
|
||||
showType && ev.event_type ? (
|
||||
<span
|
||||
className="inline-block rounded-full px-3 py-0.5 mb-2 text-xs font-700 uppercase tracking-wide"
|
||||
style={{ border: `1px solid ${color}`, color }}
|
||||
>
|
||||
{eventTypeLabel(ev.event_type)}
|
||||
</span>
|
||||
) : null;
|
||||
: null;
|
||||
|
||||
/* An ordered array, so a card can carry one paragraph or five
|
||||
without the component changing. */
|
||||
|
|
@ -247,17 +168,11 @@ export function Card({
|
|||
<div className="ev-grid mb-2">
|
||||
<Logo file={orgLogo} className="ev-ngu h-11 w-auto mb-4" />
|
||||
<div className="ev-info">
|
||||
{typeBadge}
|
||||
<h3 className="text-3xl font-900 leading-tight">
|
||||
<TitleLink ev={ev} linked={linked}>
|
||||
{ev.title}
|
||||
</TitleLink>
|
||||
</h3>
|
||||
<h3 className="text-3xl font-900 leading-tight">{ev.title}</h3>
|
||||
{ev.theme && (
|
||||
<p className="text-xl font-300 font-bold">"{ev.theme}"</p>
|
||||
)}
|
||||
{ev.date_label && <p className="text-xl">{ev.date_label}</p>}
|
||||
{schedule && <p className="text-xl">{schedule}</p>}
|
||||
{ev.location_label && (
|
||||
<p className="text-xl">{ev.location_label}</p>
|
||||
)}
|
||||
|
|
@ -275,17 +190,11 @@ export function Card({
|
|||
<div className="grid grid-cols-1 md:grid-cols-3 gap-x-8 mb-4">
|
||||
<div className="md:col-span-2">
|
||||
<Logo file={orgLogo} className="h-15 w-auto mb-6" />
|
||||
{typeBadge}
|
||||
<h3 className="text-4xl font-900">
|
||||
<TitleLink ev={ev} linked={linked}>
|
||||
{ev.title}
|
||||
</TitleLink>
|
||||
</h3>
|
||||
<h3 className="text-4xl font-900">{ev.title}</h3>
|
||||
{ev.theme && (
|
||||
<p className="text-2xl font-300 font-bold">"{ev.theme}"</p>
|
||||
)}
|
||||
{ev.date_label && <p className="text-2xl">{ev.date_label}</p>}
|
||||
{schedule && <p className="text-2xl">{schedule}</p>}
|
||||
{ev.location_label && (
|
||||
<p className="text-2xl">{ev.location_label}</p>
|
||||
)}
|
||||
|
|
@ -302,32 +211,10 @@ export function Card({
|
|||
</>
|
||||
)}
|
||||
|
||||
{/* Footer — mt-auto pins the whole block to the bottom so
|
||||
buttons line up across every card in a grid row.
|
||||
|
||||
Three registration states, as before: links to follow, a
|
||||
past event, or an announcement still to come. What's new
|
||||
is that all three end in the same row, because every
|
||||
event now has a page and a past one is often the more
|
||||
worth reading — speakers, awards, what actually
|
||||
happened. The notice is what changes; the way in
|
||||
doesn't. */}
|
||||
<div className={`mt-auto ${compact ? "pt-6" : "pt-8"}`}>
|
||||
{links.length === 0 && (
|
||||
<p className="text-center font-600" style={{ color: accent }}>
|
||||
{past
|
||||
? "This event has concluded — thank you to everyone who joined us!"
|
||||
: igHandle
|
||||
? "Registration has not opened yet, follow our instagram for more details."
|
||||
: "Registration has not opened yet — check back soon for more details."}
|
||||
</p>
|
||||
)}
|
||||
|
||||
<div
|
||||
className={`flex flex-wrap justify-center items-center ${
|
||||
compact ? "gap-2" : "gap-3"
|
||||
} ${links.length === 0 ? "mt-4" : ""}`}
|
||||
>
|
||||
{/* Footer — mt-auto pins it to the bottom so buttons line up
|
||||
across every card in a grid row. */}
|
||||
{links.length > 0 ? (
|
||||
<div className={`flex flex-wrap justify-center gap-2 mt-auto ${compact ? "pt-6" : "pt-8 gap-3"}`}>
|
||||
{links.map(item => (
|
||||
<a
|
||||
key={item.label}
|
||||
|
|
@ -340,17 +227,28 @@ export function Card({
|
|||
{item.label}
|
||||
</a>
|
||||
))}
|
||||
|
||||
{/* Only when there's nothing to register for and the
|
||||
event hasn't happened — the same condition as before,
|
||||
just no longer nested inside that branch. */}
|
||||
{igHandle && !past && links.length === 0 && (
|
||||
</div>
|
||||
) : past ? (
|
||||
<p
|
||||
className="mt-auto text-center font-600 pt-8"
|
||||
style={{ color: accent }}
|
||||
>
|
||||
This event has concluded — thank you to everyone who joined us!
|
||||
</p>
|
||||
) : (
|
||||
<div className={`mt-auto ${compact ? "pt-6" : "pt-8"}`}>
|
||||
<p className="text-center font-600" style={{ color: accent }}>
|
||||
{igHandle
|
||||
? "Registration has not opened yet, follow our instagram for more details."
|
||||
: "Registration has not opened yet — check back soon for more details."}
|
||||
</p>
|
||||
{igHandle && (
|
||||
<a
|
||||
href={igUrl}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className={`ig-link flex items-center justify-center rounded-xl font-700 transition-all duration-200 hover:scale-[1.02] gap-3 ${
|
||||
compact ? "py-2.5 px-5" : "py-3 px-6"
|
||||
className={`ig-link mt-4 w-fit mx-auto flex items-center justify-center rounded-xl font-700 transition-all duration-200 hover:scale-[1.02] ${
|
||||
compact ? "gap-3 py-2.5 px-5" : "gap-3 py-3 px-6"
|
||||
}`}
|
||||
style={{ border: `1px solid ${accent}`, color: accent }}
|
||||
>
|
||||
|
|
@ -358,88 +256,18 @@ export function Card({
|
|||
{igHandle}
|
||||
</a>
|
||||
)}
|
||||
|
||||
{/* Last, so Register reads first when there is one. */}
|
||||
{linked && (
|
||||
<Link
|
||||
to={eventHref(ev.id)}
|
||||
className={`rounded-xl font-700 transition-all duration-200 hover:scale-105 text-center ${
|
||||
compact ? "py-2.5 px-5" : "py-2.5 px-6"
|
||||
}`}
|
||||
style={{ border: `1px solid ${color}` }}
|
||||
>
|
||||
Event details
|
||||
</Link>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════════
|
||||
TYPE FILTER
|
||||
|
||||
Drawn only when a band actually holds more than one kind, so it
|
||||
costs nothing today — every event is a retreat — and appears on
|
||||
its own the first time a class or a workshop lands in that band.
|
||||
Nothing on Retreats.tsx has to be reconfigured for it.
|
||||
|
||||
Chips rather than a select: with four or five options, all of
|
||||
them visible is one tap, and the row reads as what the section
|
||||
contains rather than as a form control.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
type TypeFilterValue = EventType | "all";
|
||||
|
||||
type TypeFilterProps = {
|
||||
types: typeof EVENT_TYPES;
|
||||
active: TypeFilterValue;
|
||||
setActive: (id: TypeFilterValue) => void;
|
||||
accent: string;
|
||||
};
|
||||
|
||||
export function TypeFilter({ types, active, setActive, accent }: TypeFilterProps) {
|
||||
const chip = (on: boolean) => ({
|
||||
border: `1px solid ${accent}`,
|
||||
background: on ? accent : "transparent",
|
||||
color: on ? "#ffffff" : accent,
|
||||
});
|
||||
|
||||
const button = (id: TypeFilterValue, label: string) => (
|
||||
<button
|
||||
key={id}
|
||||
onClick={() => setActive(id)}
|
||||
aria-pressed={active === id}
|
||||
className="rounded-full py-1.5 px-4 text-sm font-700 transition-colors duration-200"
|
||||
style={chip(active === id)}
|
||||
>
|
||||
{label}
|
||||
</button>
|
||||
);
|
||||
|
||||
return (
|
||||
<div
|
||||
className="mx-auto mb-6 flex flex-wrap gap-2 px-8 md:px-12 lg:px-16"
|
||||
style={{ maxWidth: GRID_MAX }}
|
||||
role="group"
|
||||
aria-label="Filter events by type"
|
||||
>
|
||||
{button("all", "All")}
|
||||
{types.map(entry => button(entry.id, entry.plural))}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════════
|
||||
TOGGLE — the control for the section heading's action bar
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
export function EventCardsToggle({
|
||||
view,
|
||||
setView,
|
||||
accent,
|
||||
}: Pick<SectionToggleProps, "view" | "setView" | "accent">) {
|
||||
const btn = (active: boolean) => ({
|
||||
export function EventCardsToggle({ view, setView, accent }) {
|
||||
const btn = active => ({
|
||||
background: active ? accent : "transparent",
|
||||
color: active ? "#ffffff" : accent,
|
||||
});
|
||||
|
|
@ -491,69 +319,26 @@ export function EventCardsToggle({
|
|||
differently to someone waiting, so they're distinguished rather
|
||||
than all falling through to "coming soon".
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
type EventListCardsProps = EventFilter & {
|
||||
/** "carousel" or "grid". */
|
||||
view?: string;
|
||||
accent?: string;
|
||||
defaultColor?: string;
|
||||
empty?: string;
|
||||
};
|
||||
|
||||
export default function EventListCards({
|
||||
section,
|
||||
host,
|
||||
status,
|
||||
type,
|
||||
view = "carousel",
|
||||
accent = TEAL,
|
||||
defaultColor,
|
||||
empty = "· Events coming soon, stay connected for announcements ·",
|
||||
}: EventListCardsProps) {
|
||||
const { events: fetched, loading, error } = useEvents({
|
||||
section,
|
||||
host,
|
||||
status,
|
||||
type,
|
||||
});
|
||||
}) {
|
||||
const { events, loading, error } = useEvents({ section, host, status });
|
||||
const cardColor = defaultColor ?? accent;
|
||||
|
||||
const [index, setIndex] = useState(0);
|
||||
const [showPast, setShowPast] = useState(false);
|
||||
const [activeType, setActiveType] = useState<TypeFilterValue>("all");
|
||||
|
||||
/* What this band holds, which is what the chips offer — not the
|
||||
full list of declared types, three quarters of which would be
|
||||
dead buttons. */
|
||||
const availableTypes = useMemo(
|
||||
() => typesPresent(fetched, EVENT_TYPES),
|
||||
[fetched],
|
||||
);
|
||||
|
||||
const mixed = availableTypes.length > 1;
|
||||
|
||||
const events = useMemo(
|
||||
() =>
|
||||
activeType === "all"
|
||||
? fetched
|
||||
: fetched.filter(e => e.event_type === activeType),
|
||||
[fetched, activeType],
|
||||
);
|
||||
|
||||
/* Open on the first upcoming event. The list is empty on the
|
||||
first render, so this can't be a useState initialiser — it has
|
||||
to wait for the data and then run once. Clearing the guard when
|
||||
the list empties means a refetch re-seeds. */
|
||||
const seeded = useRef(false);
|
||||
|
||||
/* Changing the chip is a different list, so the carousel re-seeds
|
||||
on the first upcoming event of that kind rather than holding an
|
||||
index that may now be past the end. Declared before the seed
|
||||
effect so the guard is already clear when it runs. */
|
||||
useEffect(() => {
|
||||
seeded.current = false;
|
||||
setIndex(0);
|
||||
}, [activeType]);
|
||||
|
||||
useEffect(() => {
|
||||
if (events.length === 0) {
|
||||
seeded.current = false;
|
||||
|
|
@ -573,7 +358,7 @@ export default function EventListCards({
|
|||
const next = () => setIndex(i => Math.min(events.length - 1, i + 1));
|
||||
|
||||
// Arrows and dots follow the section accent, not the active card.
|
||||
const arrowStyle = (enabled: boolean) => ({
|
||||
const arrowStyle = enabled => ({
|
||||
border: `1px solid ${accent}`,
|
||||
background: "rgba(255,255,255,0.85)",
|
||||
color: enabled ? accent : "#b8c6c9",
|
||||
|
|
@ -581,7 +366,7 @@ export default function EventListCards({
|
|||
opacity: enabled ? 1 : 0.4,
|
||||
});
|
||||
|
||||
const notice = (text: string) => (
|
||||
const notice = text => (
|
||||
<p className="max-w-6xl mx-auto px-6 font-600" style={{ color: accent }}>
|
||||
{text}
|
||||
</p>
|
||||
|
|
@ -610,24 +395,8 @@ export default function EventListCards({
|
|||
|
||||
return (
|
||||
<div className="overflow-hidden">
|
||||
{mixed && (
|
||||
<TypeFilter
|
||||
types={availableTypes}
|
||||
active={activeType}
|
||||
setActive={setActiveType}
|
||||
accent={accent}
|
||||
/>
|
||||
)}
|
||||
|
||||
{events.length === 0 ? (
|
||||
/* Two different empties. Nothing scheduled is news; nothing
|
||||
of the kind you just picked is a filter you can undo, and
|
||||
the chips are still on screen to undo it with. */
|
||||
notice(
|
||||
activeType === "all"
|
||||
? empty
|
||||
: `· No ${eventTypeLabel(activeType).toLowerCase()} events in this section yet ·`,
|
||||
)
|
||||
notice(empty)
|
||||
) : view === "grid" ? (
|
||||
/* ── GRID VIEW — upcoming first, past events collapsed below ── */
|
||||
<div className="mx-auto px-8 md:px-12 lg:px-16" style={{ maxWidth: GRID_MAX }}>
|
||||
|
|
@ -643,7 +412,6 @@ export default function EventListCards({
|
|||
defaultColor={cardColor}
|
||||
accent={accent}
|
||||
compact
|
||||
showType={mixed}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
|
|
@ -682,7 +450,6 @@ export default function EventListCards({
|
|||
accent={accent}
|
||||
compact
|
||||
interactive={showPast}
|
||||
showType={mixed}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
|
|
@ -747,7 +514,6 @@ export default function EventListCards({
|
|||
defaultColor={cardColor}
|
||||
accent={accent}
|
||||
interactive={active}
|
||||
showType={mixed}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
page to the nav adds it to this form too.
|
||||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
import { useState, type FormEvent, type ReactNode } from "react";
|
||||
import { useState } from "react";
|
||||
import { post, ApiError } from "../../lib/api.js";
|
||||
import { PAGE_LINKS, PAGE_SECTIONS } from "../../navConfig.js";
|
||||
import { FEEDBACK_TYPES } from "../../data/feedbackTypes.js";
|
||||
|
|
@ -46,7 +46,7 @@ function OptionalTag() {
|
|||
);
|
||||
}
|
||||
|
||||
function FieldError({ id, children }: { id: string; children?: ReactNode }) {
|
||||
function FieldError({ id, children }) {
|
||||
if (!children) return null;
|
||||
return (
|
||||
<p id={id} className="mt-2 text-sm text-[#b3261e]">
|
||||
|
|
@ -56,15 +56,7 @@ function FieldError({ id, children }: { id: string; children?: ReactNode }) {
|
|||
}
|
||||
|
||||
// Native select plus a chevron, since appearance-none strips the default one.
|
||||
type SelectProps = {
|
||||
id: string;
|
||||
label: string;
|
||||
value: string;
|
||||
onChange: (value: string) => void;
|
||||
children: ReactNode;
|
||||
};
|
||||
|
||||
function Select({ id, label, value, onChange, children }: SelectProps) {
|
||||
function Select({ id, label, value, onChange, children }) {
|
||||
return (
|
||||
<div>
|
||||
<label htmlFor={id} className="block text-sm font-medium text-[#26454c]">
|
||||
|
|
@ -101,13 +93,7 @@ function Select({ id, label, value, onChange, children }: SelectProps) {
|
|||
|
||||
/* ── Type picker ─────────────────────────────────────────────── */
|
||||
|
||||
function TypePicker({
|
||||
value,
|
||||
onChange,
|
||||
}: {
|
||||
value: string | null;
|
||||
onChange: (id: string) => void;
|
||||
}) {
|
||||
function TypePicker({ value, onChange }) {
|
||||
return (
|
||||
<fieldset>
|
||||
<legend className="text-base font-semibold text-[#26454c]">
|
||||
|
|
@ -165,16 +151,7 @@ function TypePicker({
|
|||
|
||||
/* ── Where on the site ───────────────────────────────────────── */
|
||||
|
||||
type LocationPickerProps = {
|
||||
/** A nav path, or SITE_WIDE. */
|
||||
page: string;
|
||||
/** A nav hash, or WHOLE_PAGE. */
|
||||
section: string;
|
||||
onPageChange: (page: string) => void;
|
||||
onSectionChange: (section: string) => void;
|
||||
};
|
||||
|
||||
function LocationPicker({ page, section, onPageChange, onSectionChange }: LocationPickerProps) {
|
||||
function LocationPicker({ page, section, onPageChange, onSectionChange }) {
|
||||
const sections = page === SITE_WIDE ? [] : PAGE_SECTIONS[page] ?? [];
|
||||
|
||||
return (
|
||||
|
|
@ -228,7 +205,7 @@ function LocationPicker({ page, section, onPageChange, onSectionChange }: Locati
|
|||
}
|
||||
|
||||
// Human-readable version of the picked location, for the thank-you panel.
|
||||
function describeLocation(page: string, section: string) {
|
||||
function describeLocation(page, section) {
|
||||
if (page === SITE_WIDE) return null;
|
||||
const pageLabel = PAGE_LINKS.find((p) => p.path === page)?.label ?? page;
|
||||
const sectionLabel = (PAGE_SECTIONS[page] ?? []).find(
|
||||
|
|
@ -239,11 +216,8 @@ function describeLocation(page: string, section: string) {
|
|||
|
||||
/* ── The form ────────────────────────────────────────────────── */
|
||||
|
||||
/* The fields server/src/routes/feedback.js can reject by name. */
|
||||
type FeedbackFieldErrors = { message?: string; email?: string };
|
||||
|
||||
export default function FeedbackForm() {
|
||||
const [type, setType] = useState<string | null>(null);
|
||||
const [type, setType] = useState(null);
|
||||
const [page, setPage] = useState(SITE_WIDE);
|
||||
const [section, setSection] = useState(WHOLE_PAGE);
|
||||
const [message, setMessage] = useState("");
|
||||
|
|
@ -254,14 +228,14 @@ export default function FeedbackForm() {
|
|||
const [website, setWebsite] = useState("");
|
||||
|
||||
// idle → sending → sent, or back to idle with an error to show.
|
||||
const [status, setStatus] = useState<"idle" | "sending" | "sent">("idle");
|
||||
const [formError, setFormError] = useState<string | null>(null);
|
||||
const [fieldErrors, setFieldErrors] = useState<FeedbackFieldErrors>({});
|
||||
const [status, setStatus] = useState("idle");
|
||||
const [formError, setFormError] = useState(null);
|
||||
const [fieldErrors, setFieldErrors] = useState({});
|
||||
|
||||
const sending = status === "sending";
|
||||
const ready = Boolean(type) && message.trim().length >= MIN_MESSAGE;
|
||||
|
||||
async function handleSubmit(event: FormEvent<HTMLFormElement>) {
|
||||
async function handleSubmit(event) {
|
||||
event.preventDefault();
|
||||
if (!ready || sending) return;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
import { useState, type ReactNode } from "react";
|
||||
import { useState } from "react";
|
||||
import ArrowLink from "../../components/ArrowLink.tsx";
|
||||
import type { OrgKind } from "../../lib/hrefs.ts";
|
||||
import type { OrganizationListItem } from "../../lib/useContent.ts";
|
||||
import {
|
||||
initialsFor,
|
||||
orgPath,
|
||||
|
|
@ -35,13 +33,7 @@ const FALLBACK_COLOR = "#4a6b72";
|
|||
const CARD_MIN = "20rem";
|
||||
const GRID_MAX = "88rem";
|
||||
|
||||
function OrgMark({
|
||||
org,
|
||||
color,
|
||||
}: {
|
||||
org: Pick<OrganizationListItem, "logo" | "name">;
|
||||
color: string;
|
||||
}) {
|
||||
function OrgMark({ org, color }) {
|
||||
const [failed, setFailed] = useState(false);
|
||||
|
||||
if (org.logo && !failed) {
|
||||
|
|
@ -66,14 +58,7 @@ function OrgMark({
|
|||
);
|
||||
}
|
||||
|
||||
type CardLabels = { accent: string; pageLabel: string; siteLabel: string };
|
||||
|
||||
function OrgCard({
|
||||
org,
|
||||
accent,
|
||||
pageLabel,
|
||||
siteLabel,
|
||||
}: CardLabels & { org: OrganizationListItem }) {
|
||||
function OrgCard({ org, accent, pageLabel, siteLabel }) {
|
||||
const color = org.color || accent;
|
||||
const path = orgPath(org);
|
||||
|
||||
|
|
@ -151,13 +136,7 @@ function OrgCard({
|
|||
);
|
||||
}
|
||||
|
||||
function Block({
|
||||
title,
|
||||
orgs,
|
||||
accent,
|
||||
pageLabel,
|
||||
siteLabel,
|
||||
}: CardLabels & { title?: string; orgs: OrganizationListItem[] }) {
|
||||
function Block({ title, orgs, accent, pageLabel, siteLabel }) {
|
||||
if (orgs.length === 0) return null;
|
||||
|
||||
return (
|
||||
|
|
@ -188,30 +167,7 @@ function Block({
|
|||
);
|
||||
}
|
||||
|
||||
const byName = (a: OrganizationListItem, b: OrganizationListItem) =>
|
||||
a.name.localeCompare(b.name);
|
||||
|
||||
/* One heading's worth of the grid. Labels override the grid's own. */
|
||||
type OrgGroup = {
|
||||
key: string;
|
||||
title: string;
|
||||
pageLabel?: string;
|
||||
siteLabel?: string;
|
||||
};
|
||||
|
||||
type OrgListCardsProps = {
|
||||
kind?: OrgKind;
|
||||
title?: string;
|
||||
groups?: OrgGroup[];
|
||||
/** Which group key an organization files under. */
|
||||
groupBy?: (org: OrganizationListItem) => string | null | undefined;
|
||||
accent?: string;
|
||||
pageLabel?: string;
|
||||
siteLabel?: string;
|
||||
/** Null keeps the API's order. */
|
||||
sort?: ((a: OrganizationListItem, b: OrganizationListItem) => number) | null;
|
||||
empty?: string;
|
||||
};
|
||||
const byName = (a, b) => a.name.localeCompare(b.name);
|
||||
|
||||
export default function OrgListCards({
|
||||
kind,
|
||||
|
|
@ -223,10 +179,10 @@ export default function OrgListCards({
|
|||
siteLabel = "Visit site",
|
||||
sort = byName,
|
||||
empty = "· Nothing to show here just yet ·",
|
||||
}: OrgListCardsProps) {
|
||||
}) {
|
||||
const { organizations, loading, error } = useOrganizations(kind);
|
||||
|
||||
const shell = (children: ReactNode) => (
|
||||
const shell = children => (
|
||||
<div className="mx-auto px-8 md:px-12" style={{ maxWidth: GRID_MAX }}>
|
||||
{children}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,9 @@
|
|||
import { useEffect, useRef, useState, type ReactNode, type RefObject } from "react";
|
||||
import {
|
||||
useCommunity,
|
||||
type Chapter,
|
||||
type Community,
|
||||
type Region,
|
||||
} from "../../data/chapters.js";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useCommunity } from "../../data/chapters.js";
|
||||
import { Link } from "react-router-dom";
|
||||
import ArrowLink from "../../components/ArrowLink.tsx";
|
||||
import { initialsFor, orgPath } from "../../data/organizations.js";
|
||||
import { AREAS, AREA_NAMES, type AreaSlice } from "../../data/mapGrid.js";
|
||||
import type { SectionToggleProps } from "../../lib/sections.tsx";
|
||||
import type { ContentBlock, OrganizationListItem } from "../../lib/useContent.ts";
|
||||
import { AREAS, AREA_NAMES } from "../../data/mapGrid.js";
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════════
|
||||
ORGANIZATION LIST — MAP
|
||||
|
|
@ -53,19 +46,6 @@ const RULE = "#cfe3e7";
|
|||
const INK = "#2c4a50";
|
||||
const FALLBACK_COLOR = "#4a6b72";
|
||||
|
||||
/* organizations.color is nullable; an SVG fill left undefined paints
|
||||
black, so an uncoloured region takes the same fallback as a card. */
|
||||
const colorOf = (item: { color?: string | null }) => item.color || FALLBACK_COLOR;
|
||||
|
||||
/* Which region is picked and which is under the pointer, shared by
|
||||
the map, the legend and the list. */
|
||||
type Highlight = {
|
||||
selected: string | null;
|
||||
hovered: string | null;
|
||||
setSelected: (id: string | null) => void;
|
||||
setHovered: (id: string | null) => void;
|
||||
};
|
||||
|
||||
const US_TITLE = "US Unity Regions";
|
||||
const INTL_TITLE = "International Unity Regions";
|
||||
|
||||
|
|
@ -75,7 +55,7 @@ const INTL_TITLE = "International Unity Regions";
|
|||
vanishing. When organization and person pages arrive this should
|
||||
move to a shared component; small enough to live here until then.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
function Blocks({ blocks = [], color }: { blocks?: ContentBlock[]; color: string }) {
|
||||
function Blocks({ blocks = [], color }) {
|
||||
if (blocks.length === 0) return null;
|
||||
|
||||
return (
|
||||
|
|
@ -108,7 +88,7 @@ function Blocks({ blocks = [], color }: { blocks?: ContentBlock[]; color: string
|
|||
case "links":
|
||||
return (
|
||||
<ul key={i} className="list-disc ml-5 flex flex-col gap-1">
|
||||
{(block.items ?? []).map((item, j) => (
|
||||
{block.items.map((item, j) => (
|
||||
<li key={j}>
|
||||
{item.url ? (
|
||||
<a
|
||||
|
|
@ -154,19 +134,6 @@ function Blocks({ blocks = [], color }: { blocks?: ContentBlock[]; color: string
|
|||
subtracts, and the order the slices arrive in doesn't change
|
||||
what's drawn.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
type TileProps = Highlight & {
|
||||
code: string;
|
||||
x: number;
|
||||
y: number;
|
||||
size: number;
|
||||
width?: number;
|
||||
label?: string;
|
||||
slices?: AreaSlice[];
|
||||
count?: number;
|
||||
onPick?: (code: string) => void;
|
||||
fontSize?: number;
|
||||
};
|
||||
|
||||
function Tile({
|
||||
code,
|
||||
x,
|
||||
|
|
@ -182,12 +149,11 @@ function Tile({
|
|||
setHovered,
|
||||
onPick,
|
||||
fontSize = 34,
|
||||
}: TileProps) {
|
||||
}) {
|
||||
if (slices.length === 0) return null;
|
||||
|
||||
const primary = slices[0];
|
||||
// Nullable so indexOf and includes take `selected` as it is.
|
||||
const ids: Array<string | null> = slices.map(s => s.regionId);
|
||||
const ids = slices.map(s => s.regionId);
|
||||
const active = ids.includes(selected) || ids.includes(hovered);
|
||||
const dimmed = selected && !ids.includes(selected);
|
||||
const clipId = `clip-${code}`;
|
||||
|
|
@ -230,7 +196,7 @@ function Tile({
|
|||
y={top}
|
||||
width={width}
|
||||
height={h}
|
||||
fill={colorOf(slice)}
|
||||
fill={slice.color}
|
||||
fillOpacity={opacity}
|
||||
className="transition-all duration-200"
|
||||
/>
|
||||
|
|
@ -245,7 +211,7 @@ function Tile({
|
|||
height={size}
|
||||
rx={14}
|
||||
fill="none"
|
||||
stroke={active ? colorOf(primary) : "#ffffff"}
|
||||
stroke={active ? primary.color : "#ffffff"}
|
||||
strokeOpacity={active ? 1 : 0.55}
|
||||
strokeWidth={active ? 4 : 2}
|
||||
className="transition-all duration-200"
|
||||
|
|
@ -258,7 +224,7 @@ function Tile({
|
|||
dominantBaseline="middle"
|
||||
fontSize={fontSize}
|
||||
fontWeight="800"
|
||||
fill={count ? "#ffffff" : colorOf(primary)}
|
||||
fill={count ? "#ffffff" : primary.color}
|
||||
style={{ pointerEvents: "none" }}
|
||||
>
|
||||
{label || code}
|
||||
|
|
@ -278,13 +244,7 @@ function Tile({
|
|||
);
|
||||
}
|
||||
|
||||
type RegionMapProps = Highlight & {
|
||||
slices: Record<string, AreaSlice[]>;
|
||||
chapterCounts: Record<string, number>;
|
||||
onPick?: (code: string) => void;
|
||||
};
|
||||
|
||||
function RegionMap({ slices, chapterCounts, ...props }: RegionMapProps) {
|
||||
function RegionMap({ slices, chapterCounts, ...props }) {
|
||||
const size = TILE - PAD * 2;
|
||||
|
||||
return (
|
||||
|
|
@ -315,15 +275,8 @@ function RegionMap({ slices, chapterCounts, ...props }: RegionMapProps) {
|
|||
);
|
||||
}
|
||||
|
||||
function LegendButton({
|
||||
region,
|
||||
selected,
|
||||
setSelected,
|
||||
hovered,
|
||||
setHovered,
|
||||
}: Highlight & { region: Region }) {
|
||||
function LegendButton({ region, selected, setSelected, hovered, setHovered }) {
|
||||
const on = selected === region.id || hovered === region.id;
|
||||
const color = colorOf(region);
|
||||
return (
|
||||
<button
|
||||
onClick={() => setSelected(selected === region.id ? null : region.id)}
|
||||
|
|
@ -334,36 +287,29 @@ function LegendButton({
|
|||
aria-pressed={selected === region.id}
|
||||
className="flex items-center gap-2 py-1.5 px-3 rounded-lg text-sm font-700 transition-all duration-200"
|
||||
style={{
|
||||
border: `1px solid ${color}`,
|
||||
background: on ? color : "transparent",
|
||||
color: on ? "#ffffff" : color,
|
||||
border: `1px solid ${region.color}`,
|
||||
background: on ? region.color : "transparent",
|
||||
color: on ? "#ffffff" : region.color,
|
||||
opacity: selected && selected !== region.id ? 0.45 : 1,
|
||||
}}
|
||||
>
|
||||
<span
|
||||
className="h-2.5 w-2.5 rounded-full"
|
||||
style={{ background: on ? "#ffffff" : color }}
|
||||
style={{ background: on ? "#ffffff" : region.color }}
|
||||
/>
|
||||
{region.name}
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
type LegendProps = Highlight & {
|
||||
domestic: Region[];
|
||||
international: Region[];
|
||||
/** Regions that paint at least one tile. */
|
||||
onMapIds: Set<string>;
|
||||
};
|
||||
|
||||
function Legend({ domestic, international, onMapIds, ...props }: LegendProps) {
|
||||
function Legend({ domestic, international, onMapIds, ...props }) {
|
||||
const { selected, setSelected } = props;
|
||||
|
||||
// A region is on the map if it paints a tile. West Central used
|
||||
// to need a hardcoded exception here because its states arrived
|
||||
// only through SPLITS; it has ordinary rows now, so the exception
|
||||
// is gone.
|
||||
const onMap = (region: Region) => onMapIds.has(region.id);
|
||||
const onMap = region => onMapIds.has(region.id);
|
||||
const us = domestic.filter(onMap);
|
||||
const intl = international.filter(onMap);
|
||||
|
||||
|
|
@ -401,15 +347,6 @@ function Legend({ domestic, international, onMapIds, ...props }: LegendProps) {
|
|||
);
|
||||
}
|
||||
|
||||
type RegionBlockProps = Highlight & {
|
||||
region: Region;
|
||||
chapters: Chapter[];
|
||||
subtext: string;
|
||||
indent: boolean;
|
||||
regionRefs?: RefObject<Record<string, HTMLDivElement | null>>;
|
||||
chapterRefs?: RefObject<Record<string, HTMLLIElement | null>>;
|
||||
};
|
||||
|
||||
function RegionBlock({
|
||||
region,
|
||||
chapters,
|
||||
|
|
@ -420,15 +357,12 @@ function RegionBlock({
|
|||
indent,
|
||||
regionRefs,
|
||||
chapterRefs,
|
||||
}: RegionBlockProps) {
|
||||
}) {
|
||||
const on = selected === region.id;
|
||||
const color = colorOf(region);
|
||||
|
||||
return (
|
||||
<div
|
||||
ref={el => {
|
||||
if (regionRefs) regionRefs.current[region.id] = el;
|
||||
}}
|
||||
ref={el => regionRefs && (regionRefs.current[region.id] = el)}
|
||||
className="transition-opacity duration-200"
|
||||
style={{ opacity: selected && !on ? 0.35 : 1, marginLeft: indent ? "0.75rem" : 0 }}
|
||||
>
|
||||
|
|
@ -440,11 +374,11 @@ function RegionBlock({
|
|||
>
|
||||
<span
|
||||
className="h-3 w-3 rounded-full shrink-0"
|
||||
style={{ background: color }}
|
||||
style={{ background: region.color }}
|
||||
/>
|
||||
<h4
|
||||
className={`font-800 ${indent ? "text-lg" : "text-xl"}`}
|
||||
style={{ color: color }}
|
||||
style={{ color: region.color }}
|
||||
>
|
||||
{region.name}
|
||||
</h4>
|
||||
|
|
@ -465,60 +399,55 @@ function RegionBlock({
|
|||
</p>
|
||||
) : (
|
||||
<ul className="ml-5 mb-4 flex flex-col gap-3">
|
||||
{chapters.map(c => {
|
||||
const path = orgPath(c);
|
||||
return (
|
||||
<li
|
||||
key={c.id}
|
||||
ref={el => {
|
||||
if (chapterRefs) chapterRefs.current[c.id] = el;
|
||||
}}
|
||||
className="pl-3 flex items-start gap-3"
|
||||
style={{ borderLeft: `2px solid ${color}` }}
|
||||
>
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="font-700">{c.name}</p>
|
||||
<p className="text-sm" style={{ color: FALLBACK_COLOR }}>
|
||||
{c.location_label}
|
||||
{c.meets ? ` · ${c.meets}` : ""}
|
||||
{chapters.map(c => (
|
||||
<li
|
||||
key={c.id}
|
||||
ref={el => chapterRefs && (chapterRefs.current[c.id] = el)}
|
||||
className="pl-3 flex items-start gap-3"
|
||||
style={{ borderLeft: `2px solid ${region.color}` }}
|
||||
>
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="font-700">{c.name}</p>
|
||||
<p className="text-sm" style={{ color: FALLBACK_COLOR }}>
|
||||
{c.location_label}
|
||||
{c.meets ? ` · ${c.meets}` : ""}
|
||||
</p>
|
||||
{(c.website || c.email) && (
|
||||
<p className="text-sm mt-1 flex gap-4">
|
||||
{c.website && (
|
||||
<a
|
||||
href={c.website}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="font-700 underline"
|
||||
style={{ color: region.color }}
|
||||
>
|
||||
Details
|
||||
</a>
|
||||
)}
|
||||
{c.email && (
|
||||
<a
|
||||
href={`mailto:${c.email}`}
|
||||
className="font-700 underline"
|
||||
style={{ color: region.color }}
|
||||
>
|
||||
Contact
|
||||
</a>
|
||||
)}
|
||||
</p>
|
||||
{(c.website || c.email) && (
|
||||
<p className="text-sm mt-1 flex gap-4">
|
||||
{c.website && (
|
||||
<a
|
||||
href={c.website}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="font-700 underline"
|
||||
style={{ color: color }}
|
||||
>
|
||||
Details
|
||||
</a>
|
||||
)}
|
||||
{c.email && (
|
||||
<a
|
||||
href={`mailto:${c.email}`}
|
||||
className="font-700 underline"
|
||||
style={{ color: color }}
|
||||
>
|
||||
Contact
|
||||
</a>
|
||||
)}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{path && (
|
||||
<ArrowLink
|
||||
to={path}
|
||||
label={`${c.name} — chapter page`}
|
||||
color={color}
|
||||
size="h-8 w-8"
|
||||
/>
|
||||
)}
|
||||
</li>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
{orgPath(c) && (
|
||||
<ArrowLink
|
||||
to={orgPath(c)}
|
||||
label={`${c.name} — chapter page`}
|
||||
color={region.color}
|
||||
size="h-8 w-8"
|
||||
/>
|
||||
)}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</div>
|
||||
|
|
@ -533,15 +462,7 @@ function RegionBlock({
|
|||
═══════════════════════════════════════════════════════════════ */
|
||||
|
||||
/* Logo, or the organization's initials when there's no file. */
|
||||
function OrgLogo({
|
||||
org,
|
||||
color,
|
||||
size = "h-14 w-14",
|
||||
}: {
|
||||
org: Pick<OrganizationListItem, "logo" | "name">;
|
||||
color: string;
|
||||
size?: string;
|
||||
}) {
|
||||
function OrgLogo({ org, color, size = "h-14 w-14" }) {
|
||||
const [failed, setFailed] = useState(false);
|
||||
|
||||
if (org.logo && !failed) {
|
||||
|
|
@ -566,16 +487,7 @@ function OrgLogo({
|
|||
);
|
||||
}
|
||||
|
||||
type ChapterCardProps = {
|
||||
chapter: Chapter;
|
||||
color: string;
|
||||
open: boolean;
|
||||
onOpen: () => void;
|
||||
};
|
||||
|
||||
function ChapterCard({ chapter, color, open, onOpen }: ChapterCardProps) {
|
||||
const path = orgPath(chapter);
|
||||
|
||||
function ChapterCard({ chapter, color, open, onOpen }) {
|
||||
return (
|
||||
<div
|
||||
className="rounded-2xl p-4 flex items-start gap-4 transition-all duration-200"
|
||||
|
|
@ -627,9 +539,9 @@ function ChapterCard({ chapter, color, open, onOpen }: ChapterCardProps) {
|
|||
</svg>
|
||||
</button>
|
||||
|
||||
{path && (
|
||||
{orgPath(chapter) && (
|
||||
<ArrowLink
|
||||
to={path}
|
||||
to={orgPath(chapter)}
|
||||
label={`${chapter.name} — chapter page`}
|
||||
color={color}
|
||||
/>
|
||||
|
|
@ -639,18 +551,7 @@ function ChapterCard({ chapter, color, open, onOpen }: ChapterCardProps) {
|
|||
);
|
||||
}
|
||||
|
||||
function ChapterDetail({
|
||||
chapter,
|
||||
region,
|
||||
onClose,
|
||||
}: {
|
||||
chapter: Chapter;
|
||||
region: Region;
|
||||
onClose: () => void;
|
||||
}) {
|
||||
const path = orgPath(chapter);
|
||||
const color = colorOf(region);
|
||||
|
||||
function ChapterDetail({ chapter, region, onClose }) {
|
||||
/* "Led by" comes from affiliations rather than a text field, so
|
||||
it lists real people and stays empty until they exist. */
|
||||
const leads = (chapter.leadership ?? [])
|
||||
|
|
@ -659,23 +560,21 @@ function ChapterDetail({
|
|||
)
|
||||
.join(", ");
|
||||
|
||||
const rows = (
|
||||
[
|
||||
["Region", region.name],
|
||||
["Where", chapter.venue],
|
||||
["Meets", chapter.meets],
|
||||
["Led by", leads],
|
||||
["Since", chapter.started],
|
||||
] satisfies Array<[label: string, value: string | null | undefined]>
|
||||
).filter(([, v]) => v);
|
||||
const rows = [
|
||||
["Region", region.name],
|
||||
["Where", chapter.venue],
|
||||
["Meets", chapter.meets],
|
||||
["Led by", leads],
|
||||
["Since", chapter.started],
|
||||
].filter(([, v]) => v);
|
||||
|
||||
return (
|
||||
<div
|
||||
className="rounded-2xl p-6 mb-6"
|
||||
style={{ border: `2px solid ${color}`, background: `${color}0f` }}
|
||||
style={{ border: `2px solid ${region.color}`, background: `${region.color}0f` }}
|
||||
>
|
||||
<div className="flex items-start gap-4">
|
||||
<OrgLogo org={chapter} color={color} size="h-20 w-20" />
|
||||
<OrgLogo org={chapter} color={region.color} size="h-20 w-20" />
|
||||
|
||||
<div className="min-w-0 flex-1">
|
||||
<p className="text-2xl font-900 leading-tight">{chapter.name}</p>
|
||||
|
|
@ -686,13 +585,13 @@ function ChapterDetail({
|
|||
onClick={onClose}
|
||||
aria-label="Close details"
|
||||
className="shrink-0 h-8 w-8 rounded-full flex items-center justify-center text-lg font-700 transition-transform duration-200 hover:scale-110"
|
||||
style={{ border: `1px solid ${color}`, color: color }}
|
||||
style={{ border: `1px solid ${region.color}`, color: region.color }}
|
||||
>
|
||||
×
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<Blocks blocks={chapter.blocks} color={color} />
|
||||
<Blocks blocks={chapter.blocks} color={region.color} />
|
||||
|
||||
{rows.length > 0 && (
|
||||
<dl className="mt-4 grid grid-cols-1 sm:grid-cols-2 gap-x-8 gap-y-1 text-sm">
|
||||
|
|
@ -710,11 +609,11 @@ function ChapterDetail({
|
|||
)}
|
||||
|
||||
<div className="mt-5 flex flex-wrap gap-3">
|
||||
{path && (
|
||||
{orgPath(chapter) && (
|
||||
<Link
|
||||
to={path}
|
||||
to={orgPath(chapter)}
|
||||
className="py-2 px-5 rounded-xl font-700 text-sm transition-transform duration-200 hover:scale-105"
|
||||
style={{ background: color, color: "#ffffff" }}
|
||||
style={{ background: region.color, color: "#ffffff" }}
|
||||
>
|
||||
Chapter page
|
||||
</Link>
|
||||
|
|
@ -725,7 +624,7 @@ function ChapterDetail({
|
|||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="py-2 px-5 rounded-xl font-700 text-sm transition-transform duration-200 hover:scale-105"
|
||||
style={{ border: `1px solid ${color}`, color: color }}
|
||||
style={{ border: `1px solid ${region.color}`, color: region.color }}
|
||||
>
|
||||
Visit site
|
||||
</a>
|
||||
|
|
@ -735,7 +634,7 @@ function ChapterDetail({
|
|||
<a
|
||||
href={`mailto:${chapter.email}`}
|
||||
className="py-2 px-5 rounded-xl font-700 text-sm transition-transform duration-200 hover:scale-105"
|
||||
style={{ border: `1px solid ${color}`, color: color }}
|
||||
style={{ border: `1px solid ${region.color}`, color: region.color }}
|
||||
>
|
||||
Get in touch
|
||||
</a>
|
||||
|
|
@ -745,19 +644,7 @@ function ChapterDetail({
|
|||
);
|
||||
}
|
||||
|
||||
type ChapterGridProps = Pick<Community, "regions" | "chapters" | "chaptersIn" | "subtextFor"> & {
|
||||
openId: string | null;
|
||||
setOpenId: (id: string | null) => void;
|
||||
};
|
||||
|
||||
function ChapterGrid({
|
||||
regions,
|
||||
chapters,
|
||||
chaptersIn,
|
||||
subtextFor,
|
||||
openId,
|
||||
setOpenId,
|
||||
}: ChapterGridProps) {
|
||||
function ChapterGrid({ regions, chapters, chaptersIn, subtextFor, openId, setOpenId }) {
|
||||
// Only regions that actually have chapters get a grid.
|
||||
const populated = regions
|
||||
.map(region => ({ region, list: chaptersIn(region.id) }))
|
||||
|
|
@ -769,15 +656,14 @@ function ChapterGrid({
|
|||
<div className="mx-auto px-8 md:px-12" style={{ maxWidth: CONTENT_MAX }}>
|
||||
{populated.map(({ region, list }) => {
|
||||
const subtext = subtextFor(region);
|
||||
const color = colorOf(region);
|
||||
return (
|
||||
<section key={region.id} className="mb-12">
|
||||
<div className="flex items-baseline gap-3 mb-1">
|
||||
<span
|
||||
className="h-3 w-3 rounded-full shrink-0"
|
||||
style={{ background: color }}
|
||||
style={{ background: region.color }}
|
||||
/>
|
||||
<h3 className="text-2xl font-800" style={{ color: color }}>
|
||||
<h3 className="text-2xl font-800" style={{ color: region.color }}>
|
||||
{region.name}
|
||||
</h3>
|
||||
<span className="text-sm" style={{ color: MUTED }}>
|
||||
|
|
@ -810,7 +696,7 @@ function ChapterGrid({
|
|||
<ChapterCard
|
||||
key={c.id}
|
||||
chapter={c}
|
||||
color={color}
|
||||
color={region.color}
|
||||
open={openId === c.id}
|
||||
onOpen={() => setOpenId(openId === c.id ? null : c.id)}
|
||||
/>
|
||||
|
|
@ -831,12 +717,8 @@ function ChapterGrid({
|
|||
}
|
||||
|
||||
/* The control for the section heading's action bar. */
|
||||
export function OrgMapToggle({
|
||||
view,
|
||||
setView,
|
||||
accent,
|
||||
}: Pick<SectionToggleProps, "view" | "setView" | "accent">) {
|
||||
const btn = (active: boolean) => ({
|
||||
export function OrgMapToggle({ view, setView, accent }) {
|
||||
const btn = active => ({
|
||||
background: active ? accent : "transparent",
|
||||
color: active ? "#ffffff" : accent,
|
||||
});
|
||||
|
|
@ -866,14 +748,7 @@ export function OrgMapToggle({
|
|||
);
|
||||
}
|
||||
|
||||
export default function OrgListMap({
|
||||
view = "map",
|
||||
accent = FALLBACK_COLOR,
|
||||
}: {
|
||||
/** "map" or "grid". */
|
||||
view?: string;
|
||||
accent?: string;
|
||||
}) {
|
||||
export default function OrgListMap({ view = "map", accent = FALLBACK_COLOR }) {
|
||||
const {
|
||||
loading,
|
||||
error,
|
||||
|
|
@ -890,16 +765,16 @@ export default function OrgListMap({
|
|||
subtextFor,
|
||||
} = useCommunity();
|
||||
|
||||
const [selected, setSelected] = useState<string | null>(null);
|
||||
const [hovered, setHovered] = useState<string | null>(null);
|
||||
const [openId, setOpenId] = useState<string | null>(null); // no card open on arrival
|
||||
const [selected, setSelected] = useState(null);
|
||||
const [hovered, setHovered] = useState(null);
|
||||
const [openId, setOpenId] = useState(null); // no card open on arrival
|
||||
|
||||
// The list scrolls itself to whatever the map or legend points at.
|
||||
const listRef = useRef<HTMLDivElement>(null);
|
||||
const regionRefs = useRef<Record<string, HTMLDivElement | null>>({});
|
||||
const chapterRefs = useRef<Record<string, HTMLLIElement | null>>({});
|
||||
const listRef = useRef(null);
|
||||
const regionRefs = useRef({});
|
||||
const chapterRefs = useRef({});
|
||||
|
||||
const scrollListTo = (el: HTMLElement | null | undefined) => {
|
||||
const scrollListTo = el => {
|
||||
const box = listRef.current;
|
||||
if (!box || !el) return;
|
||||
// Only when the list is its own scroll area (lg and up). Below
|
||||
|
|
@ -917,7 +792,7 @@ export default function OrgListMap({
|
|||
|
||||
// Clicking a tile jumps to its first chapter when it has one,
|
||||
// otherwise to the region it belongs to.
|
||||
const pickArea = (code: string) => {
|
||||
const pickArea = code => {
|
||||
const chapter = chapters.find(c => c.area_code === code);
|
||||
if (chapter && chapterRefs.current[chapter.id]) {
|
||||
return scrollListTo(chapterRefs.current[chapter.id]);
|
||||
|
|
@ -926,7 +801,7 @@ export default function OrgListMap({
|
|||
if (region) scrollListTo(regionRefs.current[region.id]);
|
||||
};
|
||||
|
||||
const shell = (children: ReactNode) => (
|
||||
const shell = children => (
|
||||
<div className="mx-auto px-8 md:px-12" style={{ maxWidth: CONTENT_MAX }}>
|
||||
{children}
|
||||
</div>
|
||||
|
|
@ -962,7 +837,7 @@ export default function OrgListMap({
|
|||
const shared = { selected, setSelected, hovered, setHovered };
|
||||
const onMapIds = new Set(regionAreas.map(a => a.region_id));
|
||||
|
||||
const block = (region: Region, indent: boolean) => (
|
||||
const block = (region, indent) => (
|
||||
<RegionBlock
|
||||
key={region.id}
|
||||
region={region}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
import {
|
||||
useId,
|
||||
useState,
|
||||
type AnchorHTMLAttributes,
|
||||
type ButtonHTMLAttributes,
|
||||
type ReactNode,
|
||||
} from "react";
|
||||
import { useId, useState } from "react";
|
||||
import ArrowLink from "../../components/ArrowLink.tsx";
|
||||
import type { OrgKind } from "../../lib/hrefs.ts";
|
||||
import type { OrganizationListItem } from "../../lib/useContent.ts";
|
||||
import {
|
||||
areasSentence,
|
||||
initialsFor,
|
||||
|
|
@ -55,14 +47,7 @@ const FALLBACK_COLOR = "#4a6b72";
|
|||
it — a link nested in a button is invalid, and a screen reader
|
||||
announces the whole row as one confused control.
|
||||
───────────────────────────────────────────────────────────── */
|
||||
type RowButtonProps = {
|
||||
as?: "a" | "button";
|
||||
color: string;
|
||||
children: ReactNode;
|
||||
} & AnchorHTMLAttributes<HTMLAnchorElement> &
|
||||
ButtonHTMLAttributes<HTMLButtonElement>;
|
||||
|
||||
function RowButton({ as: As = "button", color, children, ...rest }: RowButtonProps) {
|
||||
function RowButton({ as: As = "button", color, children, ...rest }) {
|
||||
return (
|
||||
<As
|
||||
className="shrink-0 whitespace-nowrap py-2 px-4 rounded-xl font-700 text-sm transition-transform duration-200 hover:scale-105"
|
||||
|
|
@ -74,13 +59,7 @@ function RowButton({ as: As = "button", color, children, ...rest }: RowButtonPro
|
|||
);
|
||||
}
|
||||
|
||||
function OrgMark({
|
||||
org,
|
||||
color,
|
||||
}: {
|
||||
org: Pick<OrganizationListItem, "logo" | "color" | "name">;
|
||||
color: string;
|
||||
}) {
|
||||
function OrgMark({ org, color }) {
|
||||
const [failed, setFailed] = useState(false);
|
||||
|
||||
if (org.logo && !failed) {
|
||||
|
|
@ -115,9 +94,7 @@ function OrgMark({
|
|||
);
|
||||
}
|
||||
|
||||
type RowLabels = { pageLabel: string; siteLabel: string };
|
||||
|
||||
function OrgRow({ org, pageLabel, siteLabel }: RowLabels & { org: OrganizationListItem }) {
|
||||
function OrgRow({ org, pageLabel, siteLabel }) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const panelId = useId();
|
||||
|
||||
|
|
@ -268,12 +245,7 @@ function OrgRow({ org, pageLabel, siteLabel }: RowLabels & { org: OrganizationLi
|
|||
);
|
||||
}
|
||||
|
||||
function Block({
|
||||
title,
|
||||
orgs,
|
||||
pageLabel,
|
||||
siteLabel,
|
||||
}: RowLabels & { title?: string; orgs: OrganizationListItem[] }) {
|
||||
function Block({ title, orgs, pageLabel, siteLabel }) {
|
||||
if (orgs.length === 0) return null;
|
||||
|
||||
return (
|
||||
|
|
@ -290,30 +262,7 @@ function Block({
|
|||
);
|
||||
}
|
||||
|
||||
const byName = (a: OrganizationListItem, b: OrganizationListItem) =>
|
||||
a.name.localeCompare(b.name);
|
||||
|
||||
/* One heading's worth of the list. Labels override the list's own. */
|
||||
type OrgGroup = {
|
||||
key: string;
|
||||
title: string;
|
||||
pageLabel?: string;
|
||||
siteLabel?: string;
|
||||
};
|
||||
|
||||
type OrgListVerticalProps = {
|
||||
kind?: OrgKind;
|
||||
title?: string;
|
||||
groups?: OrgGroup[];
|
||||
/** Which group key an organization files under. */
|
||||
groupBy?: (org: OrganizationListItem) => string | null | undefined;
|
||||
accent?: string;
|
||||
pageLabel?: string;
|
||||
siteLabel?: string;
|
||||
/** Null keeps the API's order. */
|
||||
sort?: ((a: OrganizationListItem, b: OrganizationListItem) => number) | null;
|
||||
empty?: string;
|
||||
};
|
||||
const byName = (a, b) => a.name.localeCompare(b.name);
|
||||
|
||||
export default function OrgListVertical({
|
||||
kind,
|
||||
|
|
@ -325,10 +274,10 @@ export default function OrgListVertical({
|
|||
siteLabel = "Visit site",
|
||||
sort = byName,
|
||||
empty = "· Nothing to show here just yet ·",
|
||||
}: OrgListVerticalProps) {
|
||||
}) {
|
||||
const { organizations, loading, error } = useOrganizations(kind);
|
||||
|
||||
const shell = (children: ReactNode) => (
|
||||
const shell = children => (
|
||||
<div className="mx-auto px-8 md:px-12 max-w-6xl">{children}</div>
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,142 +0,0 @@
|
|||
import { useCallback, useMemo } from 'react'
|
||||
import { useSearchParams } from 'react-router-dom'
|
||||
import {
|
||||
defaultOpenYears,
|
||||
groupTimeline,
|
||||
groupYears,
|
||||
partitionByDate,
|
||||
type DecadeMeta,
|
||||
type SortDirection,
|
||||
type TimelineItem,
|
||||
} from '../../../lib/timeline'
|
||||
import TimelineDecade from './TimelineDecade'
|
||||
import TimelineUpcoming from './TimelineUpcoming'
|
||||
import './timeline.css'
|
||||
|
||||
const PARAM = 'y'
|
||||
|
||||
type Props = {
|
||||
items: TimelineItem[]
|
||||
decades: DecadeMeta[]
|
||||
direction?: SortDirection
|
||||
/** Decades ending before this year get the pre-program treatment. */
|
||||
programStartYear?: number
|
||||
fillGaps?: boolean
|
||||
/** Injectable for tests and for pinning a date in a screenshot. */
|
||||
now?: Date
|
||||
}
|
||||
|
||||
export default function HistoryTimeline({
|
||||
items,
|
||||
decades,
|
||||
direction = 'desc',
|
||||
programStartYear = 2002,
|
||||
fillGaps = true,
|
||||
now,
|
||||
}: Props) {
|
||||
const [searchParams, setSearchParams] = useSearchParams()
|
||||
|
||||
// Upcoming vs recorded is a function of the clock, so an event crosses
|
||||
// over on its own date with nothing to flip.
|
||||
const { upcoming, past } = useMemo(
|
||||
() => partitionByDate(items, now ?? new Date()),
|
||||
[items, now],
|
||||
)
|
||||
|
||||
const upcomingYears = useMemo(
|
||||
() => groupYears(upcoming, { direction }),
|
||||
[upcoming, direction],
|
||||
)
|
||||
|
||||
const grouped = useMemo(
|
||||
() => groupTimeline(past, decades, { direction, programStartYear }),
|
||||
[past, decades, direction, programStartYear],
|
||||
)
|
||||
|
||||
// `?y=2014,2022` deep-links straight to open years. Absence of the
|
||||
// param means "not chosen yet", so fall back to the most recent
|
||||
// featured year; an empty param means everything was collapsed on
|
||||
// purpose.
|
||||
const openYears = useMemo(() => {
|
||||
if (!searchParams.has(PARAM)) return new Set(defaultOpenYears(grouped))
|
||||
const raw = searchParams.get(PARAM) ?? ''
|
||||
return new Set(
|
||||
raw
|
||||
.split(',')
|
||||
.map((part) => Number(part.trim()))
|
||||
.filter((n) => Number.isInteger(n)),
|
||||
)
|
||||
}, [searchParams, grouped])
|
||||
|
||||
const commit = useCallback(
|
||||
(next: Set<number>) => {
|
||||
const params = new URLSearchParams(searchParams)
|
||||
params.set(PARAM, [...next].sort((a, b) => b - a).join(','))
|
||||
// replace: toggling shouldn't fill the back button with history.
|
||||
setSearchParams(params, { replace: true })
|
||||
},
|
||||
[searchParams, setSearchParams],
|
||||
)
|
||||
|
||||
const toggleYear = useCallback(
|
||||
(year: number) => {
|
||||
const next = new Set(openYears)
|
||||
if (next.has(year)) next.delete(year)
|
||||
else next.add(year)
|
||||
commit(next)
|
||||
},
|
||||
[openYears, commit],
|
||||
)
|
||||
|
||||
const allYears = useMemo(() => {
|
||||
const years = grouped.flatMap((decade) =>
|
||||
decade.years.filter((y) => y.count > 0).map((y) => y.year),
|
||||
)
|
||||
return [...years, ...upcomingYears.map((y) => y.year)]
|
||||
}, [grouped, upcomingYears])
|
||||
|
||||
const allOpen = allYears.length > 0 && allYears.every((y) => openYears.has(y))
|
||||
|
||||
if (grouped.length === 0 && upcomingYears.length === 0) {
|
||||
return (
|
||||
<div className="ngu-tl">
|
||||
<p className="ngu-tl__emptyState">
|
||||
The timeline is empty. Add a milestone to start the record.
|
||||
</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="ngu-tl">
|
||||
<div className="ngu-tl__toolbar">
|
||||
<button
|
||||
type="button"
|
||||
className="ngu-tl__toolbarBtn"
|
||||
onClick={() => commit(allOpen ? new Set() : new Set(allYears))}
|
||||
>
|
||||
{allOpen ? 'Collapse all years' : 'Expand all years'}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<TimelineUpcoming
|
||||
years={upcomingYears}
|
||||
count={upcoming.length}
|
||||
direction={direction}
|
||||
openYears={openYears}
|
||||
onToggleYear={toggleYear}
|
||||
/>
|
||||
|
||||
{grouped.map((decade) => (
|
||||
<TimelineDecade
|
||||
key={decade.decade}
|
||||
decade={decade}
|
||||
openYears={openYears}
|
||||
onToggleYear={toggleYear}
|
||||
direction={direction}
|
||||
fillGaps={fillGaps}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
import {
|
||||
decadeLabel,
|
||||
withGapYears,
|
||||
type GroupedDecade,
|
||||
type SortDirection,
|
||||
} from '../../../lib/timeline'
|
||||
import TimelineYear from './TimelineYear'
|
||||
|
||||
type Props = {
|
||||
decade: GroupedDecade
|
||||
openYears: Set<number>
|
||||
onToggleYear: (year: number) => void
|
||||
direction?: SortDirection
|
||||
/** Show years with no records as muted nodes, so gaps stay visible. */
|
||||
fillGaps?: boolean
|
||||
}
|
||||
|
||||
export default function TimelineDecade({
|
||||
decade,
|
||||
openYears,
|
||||
onToggleYear,
|
||||
direction = 'desc',
|
||||
fillGaps = true,
|
||||
}: Props) {
|
||||
const years = fillGaps ? withGapYears(decade.years, direction) : decade.years
|
||||
|
||||
return (
|
||||
<section
|
||||
className={`ngu-tl__decade${decade.preProgram ? ' ngu-tl__decade--pre' : ''}`}
|
||||
aria-labelledby={`ngu-tl-decade-${decade.decade}`}
|
||||
>
|
||||
<header className="ngu-tl__decadeHead">
|
||||
<span className="ngu-tl__decadeNum" aria-hidden="true">
|
||||
{decadeLabel(decade.decade)}
|
||||
</span>
|
||||
<div>
|
||||
<h3 className="ngu-tl__decadeTitle" id={`ngu-tl-decade-${decade.decade}`}>
|
||||
<span className="ngu-tl__srOnly">{decadeLabel(decade.decade)}: </span>
|
||||
{decade.title}
|
||||
</h3>
|
||||
{decade.tagline ? (
|
||||
<p className="ngu-tl__decadeTagline">{decade.tagline}</p>
|
||||
) : null}
|
||||
{decade.blurb ? <p className="ngu-tl__decadeBlurb">{decade.blurb}</p> : null}
|
||||
{decade.preProgram ? (
|
||||
<p className="ngu-tl__gapNote">
|
||||
<span aria-hidden="true">◌</span>
|
||||
Before the program — kept for context, not part of our record
|
||||
</p>
|
||||
) : null}
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{years.map((year) => (
|
||||
<TimelineYear
|
||||
key={year.year}
|
||||
year={year}
|
||||
open={openYears.has(year.year)}
|
||||
onToggle={onToggleYear}
|
||||
/>
|
||||
))}
|
||||
</section>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,155 +0,0 @@
|
|||
import { Link } from 'react-router-dom'
|
||||
import { MONTH_LABELS, type PersonRef, type TimelineItem } from '../../../lib/timeline'
|
||||
import { hrefFor, logoSrc, photoSrc } from '../../../lib/timelineRefs'
|
||||
|
||||
const KIND_NAMES: Record<TimelineItem['kind'], string> = {
|
||||
milestone: 'Milestone',
|
||||
event: 'Event',
|
||||
organization: 'Organization',
|
||||
award: 'Award',
|
||||
people: 'People',
|
||||
}
|
||||
|
||||
/** Day number only — the month node above already carries the month. */
|
||||
function dayMarker(item: TimelineItem): string {
|
||||
if (item.precision !== 'day') return ''
|
||||
const day = Number(item.date.split('-')[2])
|
||||
return Number.isFinite(day) ? String(day) : ''
|
||||
}
|
||||
|
||||
/** Featured entries sit above the month nodes, so they spell out their date. */
|
||||
function fullMarker(item: TimelineItem): string {
|
||||
const [, m, d] = item.date.split('-')
|
||||
if (item.precision === 'year' || !m) return 'Date unrecorded'
|
||||
const month = MONTH_LABELS[Number(m) - 1] ?? ''
|
||||
if (item.precision === 'month' || !d) return month
|
||||
return `${month} ${Number(d)}`
|
||||
}
|
||||
|
||||
/** Initials stand in when a person has no photo on file. */
|
||||
function initials(name: string): string {
|
||||
return name
|
||||
.split(/\s+/)
|
||||
.slice(0, 2)
|
||||
.map((part) => part[0] ?? '')
|
||||
.join('')
|
||||
.toUpperCase()
|
||||
}
|
||||
|
||||
function PersonChip({ person }: { person: PersonRef }) {
|
||||
const src = photoSrc(person.photo)
|
||||
return (
|
||||
<li className="ngu-tl__person">
|
||||
{src ? (
|
||||
<img className="ngu-tl__personPhoto" src={src} alt="" loading="lazy" />
|
||||
) : (
|
||||
<span className="ngu-tl__personPhoto ngu-tl__personPhoto--blank" aria-hidden="true">
|
||||
{initials(person.name)}
|
||||
</span>
|
||||
)}
|
||||
<span className="ngu-tl__personName">
|
||||
{person.name}
|
||||
{person.title ? (
|
||||
<span className="ngu-tl__personTitle">{person.title}</span>
|
||||
) : null}
|
||||
</span>
|
||||
</li>
|
||||
)
|
||||
}
|
||||
|
||||
type Props = {
|
||||
item: TimelineItem
|
||||
/** Featured entries render larger and lead the year. */
|
||||
variant?: 'inline' | 'featured'
|
||||
}
|
||||
|
||||
export default function TimelineEntry({ item, variant = 'inline' }: Props) {
|
||||
const featured = variant === 'featured'
|
||||
const href = hrefFor(item)
|
||||
const logo = logoSrc(item)
|
||||
|
||||
const className = [
|
||||
'ngu-tl__entry',
|
||||
featured ? 'ngu-tl__entry--featured' : '',
|
||||
href ? 'ngu-tl__entry--linked' : '',
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' ')
|
||||
|
||||
const marker = (
|
||||
<span className="ngu-tl__entryDay">
|
||||
{featured ? fullMarker(item) : dayMarker(item)}
|
||||
</span>
|
||||
)
|
||||
|
||||
const body = (
|
||||
<span className="ngu-tl__entryBody">
|
||||
<span className="ngu-tl__entryTitle">
|
||||
{logo ? (
|
||||
<img className="ngu-tl__logo" src={logo} alt="" loading="lazy" />
|
||||
) : (
|
||||
<span
|
||||
className={`ngu-tl__kind ngu-tl__kind--${item.kind}`}
|
||||
aria-hidden="true"
|
||||
/>
|
||||
)}
|
||||
{item.title}
|
||||
</span>
|
||||
{item.meta ? <span className="ngu-tl__entryMeta">{item.meta}</span> : null}
|
||||
{item.blurb ? <p className="ngu-tl__entryBlurb">{item.blurb}</p> : null}
|
||||
</span>
|
||||
)
|
||||
|
||||
// The people list sits outside the link: each name is its own
|
||||
// destination, and nesting anchors is invalid markup anyway.
|
||||
const roster =
|
||||
item.kind === 'people' && item.people && item.people.length > 0 ? (
|
||||
<div
|
||||
className={`ngu-tl__roster${featured ? ' ngu-tl__roster--featured' : ''}`}
|
||||
>
|
||||
{item.team ? (
|
||||
<span className="ngu-tl__rosterTeam">
|
||||
{item.team.name}
|
||||
{item.team.orgName ? ` · ${item.team.orgName}` : ''}
|
||||
</span>
|
||||
) : null}
|
||||
<ul className="ngu-tl__people">
|
||||
{item.people.map((person) => (
|
||||
<PersonChip key={person.id} person={person} />
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
) : null
|
||||
|
||||
const label = `${KIND_NAMES[item.kind]}: ${item.title}`
|
||||
// An explicit href may point off-site; Link is for in-app routes only.
|
||||
const external = !!href && /^(https?:)?\/\//.test(href)
|
||||
|
||||
return (
|
||||
<li className="ngu-tl__entryWrap">
|
||||
{href && external ? (
|
||||
<a
|
||||
href={href}
|
||||
className={className}
|
||||
aria-label={label}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
{marker}
|
||||
{body}
|
||||
</a>
|
||||
) : href ? (
|
||||
<Link to={href} className={className} aria-label={label}>
|
||||
{marker}
|
||||
{body}
|
||||
</Link>
|
||||
) : (
|
||||
<div className={className}>
|
||||
{marker}
|
||||
{body}
|
||||
</div>
|
||||
)}
|
||||
{roster}
|
||||
</li>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
import { useState } from 'react'
|
||||
import type { GroupedYear, SortDirection } from '../../../lib/timeline'
|
||||
import TimelineYear from './TimelineYear'
|
||||
|
||||
type Props = {
|
||||
years: GroupedYear[]
|
||||
count: number
|
||||
direction?: SortDirection
|
||||
openYears: Set<number>
|
||||
onToggleYear: (year: number) => void
|
||||
}
|
||||
|
||||
/**
|
||||
* Scheduled but not yet happened. Sits above the most recent decade and
|
||||
* opens upward: the toggle is first in the DOM and the list is rendered
|
||||
* after it, with `flex-direction: column-reverse` flipping the visual
|
||||
* order. That keeps the button anchored next to the decade marker
|
||||
* instead of drifting up the page as items appear.
|
||||
*
|
||||
* Membership is decided by date, not by a flag — see partitionByDate.
|
||||
* An event moves into the record on its own, with nothing to update.
|
||||
*/
|
||||
export default function TimelineUpcoming({
|
||||
years,
|
||||
count,
|
||||
direction = 'desc',
|
||||
openYears,
|
||||
onToggleYear,
|
||||
}: Props) {
|
||||
const [open, setOpen] = useState(false)
|
||||
if (count === 0) return null
|
||||
|
||||
return (
|
||||
<section
|
||||
className={`ngu-tl__upcoming${open ? ' ngu-tl__upcoming--open' : ''}`}
|
||||
aria-label="Upcoming"
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
className="ngu-tl__upcomingBtn"
|
||||
aria-expanded={open}
|
||||
onClick={() => setOpen((v) => !v)}
|
||||
>
|
||||
<span className="ngu-tl__upcomingDot" aria-hidden="true" />
|
||||
<span className="ngu-tl__upcomingLabel">
|
||||
{open
|
||||
? 'Hide what’s scheduled'
|
||||
: `${count} ${count === 1 ? 'thing' : 'things'} still to come`}
|
||||
</span>
|
||||
<span className="ngu-tl__chevron" aria-hidden="true">
|
||||
{open ? '▾' : '▴'}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
{open ? (
|
||||
<div className="ngu-tl__upcomingList">
|
||||
{years.map((year) => (
|
||||
<TimelineYear
|
||||
key={year.year}
|
||||
year={year}
|
||||
open={openYears.has(year.year)}
|
||||
onToggle={onToggleYear}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
) : null}
|
||||
</section>
|
||||
)
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue