diff --git a/CLAUDE.md b/CLAUDE.md index 6c67a54..946a0b5 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -71,7 +71,7 @@ Descriptor-driven: `server/admin-crud.js` and `admin-schema.js` (server) and `ad ## 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. +- The runner turns foreign keys off around every migration (it can't be done inside the file's transaction) and runs `PRAGMA foreign_key_check` before committing, so a table rebuild needs no `PRAGMA foreign_keys` of its own. A rebuild whose table is named by views or triggers wraps the rename in `PRAGMA legacy_alter_table = ON ... OFF` (see 023). ## Integrations - Church Center (ngu.churchcenteronline.com): Planning Center embeds for giving and the calendar. \ No newline at end of file diff --git a/server/src/admin-schema.js b/server/src/admin-schema.js index e457bb1..b4e01a2 100644 --- a/server/src/admin-schema.js +++ b/server/src/admin-schema.js @@ -299,28 +299,27 @@ const events = { columns: [ "id", "title", - "section_id", + "scope_id", "event_type", "date_label", "starts_on", "status", "is_published", - "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: ["scope_id", "event_type", "status", "is_published"], search: ["title", "id", "theme"], - order: "sort_order, starts_on DESC, title", + order: "starts_on IS NULL, starts_on DESC, title", }, columns: [ - text("section_id", { required: true }), + text("scope_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 + // What kind of gathering, as against scope_id's whose gathering + // it is. 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 @@ -344,7 +343,6 @@ const events = { text("color"), text("gradient"), bool("is_published"), - int("sort_order"), bool("in_timeline"), // A repeating schedule. Columns rather than a side table: the @@ -410,12 +408,11 @@ const people = { "tagline", "locality", "is_published", - "sort_order", "updated_at", ], filters: ["is_published"], search: ["display_name", "sort_name", "id"], - order: "sort_order, sort_name, display_name", + order: "sort_name, display_name", }, columns: [ @@ -433,7 +430,6 @@ const people = { text("country"), text("location_label"), bool("is_published"), - int("sort_order"), ], extensions: [ @@ -505,18 +501,15 @@ const people = { // · deleting a team with members fails the same way, rather than // quietly detaching them. Emptying the members list first is // now something the form can do. -// -// No concurrency column: teams have no updated_at. Adding one -// means rebuilding a STRICT table for a row that one person edits -// at a time, which is not a trade worth making yet. const teams = { key: "teams", table: "teams", idColumn: "id", idKind: "slug", + concurrency: "updated_at", list: { - columns: ["id", "org_id", "name", "tagline", "is_published", "sort_order"], + columns: ["id", "org_id", "name", "tagline", "is_published", "sort_order", "updated_at"], filters: ["org_id", "is_published"], search: ["name", "id", "tagline"], order: "org_id, sort_order, name", @@ -575,8 +568,8 @@ const awards = { idKind: "slug", list: { - columns: ["id", "org_id", "name", "description", "sort_order"], - filters: ["org_id"], + columns: ["id", "org_id", "name", "description", "is_published", "sort_order"], + filters: ["org_id", "is_published"], search: ["name", "id", "description"], order: "org_id, sort_order, name", }, @@ -586,6 +579,7 @@ const awards = { text("name", { required: true }), text("description"), text("logo"), + bool("is_published"), int("sort_order"), ], }; @@ -787,7 +781,7 @@ export const OPTION_QUERIES = { "SELECT id, name AS label, kind FROM organizations ORDER BY kind, name", regions: "SELECT id, name AS label FROM organizations WHERE kind = 'region' ORDER BY name", - event_sections: "SELECT id, name AS label FROM event_sections ORDER BY sort_order", + event_scopes: "SELECT id, name AS label FROM event_scopes ORDER BY sort_order", events: "SELECT id, title AS label FROM events ORDER BY starts_on DESC, title", people: "SELECT id, display_name AS label FROM people ORDER BY sort_name, display_name", diff --git a/server/src/db.js b/server/src/db.js index ad669b6..53f5349 100644 --- a/server/src/db.js +++ b/server/src/db.js @@ -82,6 +82,16 @@ export function tx(db, fn) { Migrations only ever go forward. To undo something, write a new migration. + + Foreign keys are off while migrations run, the recipe from + the SQLite docs for changing a table's shape. PRAGMA + foreign_keys is a no-op inside a transaction, so it has to be + set here, around the per-file transactions, rather than in + the file. With it on, rebuilding a table something references + (drop the old one, rename the new one into place) either + cascades into the children or fails the commit. Instead each + file ends with a foreign_key_check, and any orphan it leaves + rolls that file back. ───────────────────────────────────────────────────────────── */ export function migrate(db, { log = console.log } = {}) { @@ -92,25 +102,41 @@ export function migrate(db, { log = console.log } = {}) { .sort(); let applied = 0; + const enforced = db.prepare("PRAGMA foreign_keys").get().foreign_keys; + db.exec("PRAGMA foreign_keys = OFF"); - for (const file of files) { - const version = Number.parseInt(file.slice(0, 3), 10); + try { + for (const file of files) { + const version = Number.parseInt(file.slice(0, 3), 10); - if (!Number.isInteger(version) || version < 1) { - throw new Error(`Migration "${file}" must start with a number, e.g. 001_`); + if (!Number.isInteger(version) || version < 1) { + throw new Error(`Migration "${file}" must start with a number, e.g. 001_`); + } + if (version <= current) continue; + + const sql = readFileSync(join(MIGRATIONS_DIR, file), "utf8"); + + tx(db, () => { + db.exec(sql); + + const orphans = db.prepare("PRAGMA foreign_key_check").all(); + if (orphans.length > 0) { + const where = orphans + .slice(0, 5) + .map((o) => `${o.table} row ${o.rowid} → ${o.parent}`) + .join(", "); + throw new Error(`${file} leaves ${orphans.length} foreign key violation(s): ${where}`); + } + + // Not parameterisable, but version is a validated integer. + db.exec(`PRAGMA user_version = ${version}`); + }); + + log(`migrated → ${file}`); + applied += 1; } - if (version <= current) continue; - - const sql = readFileSync(join(MIGRATIONS_DIR, file), "utf8"); - - tx(db, () => { - db.exec(sql); - // Not parameterisable, but version is a validated integer. - db.exec(`PRAGMA user_version = ${version}`); - }); - - log(`migrated → ${file}`); - applied += 1; + } finally { + if (enforced) db.exec("PRAGMA foreign_keys = ON"); } const final = db.prepare("PRAGMA user_version").get().user_version; diff --git a/server/src/migrations/020_drop_unused.sql b/server/src/migrations/020_drop_unused.sql new file mode 100644 index 0000000..a389ae2 --- /dev/null +++ b/server/src/migrations/020_drop_unused.sql @@ -0,0 +1,23 @@ +-- ═══════════════════════════════════════════════════════════════ +-- 020 DROP WHAT NOTHING READS +-- +-- people_lists and people_list_members were planned for +-- hand-picked rosters and never got a route, a descriptor or a +-- component. v_chapters and v_person_affiliations have no query +-- against them: the routes read organizations and affiliations +-- directly. +-- +-- Views first, then the child table before its parent. No trigger +-- references either table, and nothing has a foreign key into +-- them, so no rebuild and no PRAGMA foreign_keys dance. +-- +-- PRAGMA user_version; -- reads 19 before this file +-- ═══════════════════════════════════════════════════════════════ + +DROP VIEW IF EXISTS v_chapters; +DROP VIEW IF EXISTS v_person_affiliations; + +DROP TABLE IF EXISTS people_list_members; +DROP TABLE IF EXISTS people_lists; + +PRAGMA user_version = 20; -- ← set to this migration's number diff --git a/server/src/migrations/021_event_scopes.sql b/server/src/migrations/021_event_scopes.sql new file mode 100644 index 0000000..a5ae68a --- /dev/null +++ b/server/src/migrations/021_event_scopes.sql @@ -0,0 +1,32 @@ +-- ═══════════════════════════════════════════════════════════════ +-- 021 event_sections → event_scopes +-- +-- 015 established that the table is a scope list — whose gathering +-- an event is — and kept the old name to avoid a rename across the +-- codebase. This is that rename: the table, and events.section_id +-- to scope_id. The API field and the useEvents filter follow in +-- the same change. +-- +-- Both renames run with legacy_alter_table off (the default), so +-- SQLite carries them into the REFERENCES clause on events, the +-- index on section_id, and v_events, which selects e.*. +-- +-- It also inserts the three scopes 015 only relabelled. The +-- retired seed script was what created national, regional and +-- partner, so a database built from migrations alone had no row +-- for the Retreats page's three bands to point at. INSERT OR +-- IGNORE with 015's names and order: a no-op where they exist. +-- +-- PRAGMA user_version; -- reads 20 before this file +-- ═══════════════════════════════════════════════════════════════ + +ALTER TABLE event_sections RENAME TO event_scopes; + +ALTER TABLE events RENAME COLUMN section_id TO scope_id; + +INSERT OR IGNORE INTO event_scopes (id, name, sort_order) VALUES + ('national', 'National', 10), + ('regional', 'Regional', 20), + ('partner', 'Partner', 50); + +PRAGMA user_version = 21; -- ← set to this migration's number diff --git a/server/src/migrations/022_drop_sort_orders.sql b/server/src/migrations/022_drop_sort_orders.sql new file mode 100644 index 0000000..dde1332 --- /dev/null +++ b/server/src/migrations/022_drop_sort_orders.sql @@ -0,0 +1,36 @@ +-- ═══════════════════════════════════════════════════════════════ +-- 022 DROP events.sort_order AND people.sort_order +-- +-- events.sort_order dates from the seed, when event dates were +-- free text ("March/April 2026") and a typed number was the only +-- way to order a list. Events have real dates now, and a new one +-- landed at 0 — ahead of everything — until someone renumbered. +-- The routes order by date instead. +-- +-- people.sort_order was never read by the public site: people +-- sort by sort_name everywhere. It only reordered the admin list. +-- +-- Every other sort_order stays. On child collections it is the +-- row's position, written by the admin engine from drag order; +-- on organizations, teams, awards, timeline_entries and +-- event_scopes it is an ordering the site actually uses. +-- +-- SQLite refuses DROP COLUMN while an index names the column, so +-- the three indexes that do go first and come back without it. +-- No view names either column (v_events selects e.*). +-- +-- PRAGMA user_version; -- reads 21 before this file +-- ═══════════════════════════════════════════════════════════════ + +DROP INDEX IF EXISTS events_section_idx; +DROP INDEX IF EXISTS events_type_idx; +DROP INDEX IF EXISTS people_sort_idx; + +ALTER TABLE events DROP COLUMN sort_order; +ALTER TABLE people DROP COLUMN sort_order; + +CREATE INDEX events_scope_idx ON events (scope_id, is_published, starts_on); +CREATE INDEX events_type_idx ON events (event_type, is_published, starts_on); +CREATE INDEX people_sort_idx ON people (is_published, sort_name); + +PRAGMA user_version = 22; -- ← set to this migration's number diff --git a/server/src/migrations/023_teams_updated_at.sql b/server/src/migrations/023_teams_updated_at.sql new file mode 100644 index 0000000..7a41651 --- /dev/null +++ b/server/src/migrations/023_teams_updated_at.sql @@ -0,0 +1,87 @@ +-- ═══════════════════════════════════════════════════════════════ +-- 023 teams GETS created_at AND updated_at +-- +-- Every other top-level entity has updated_at, which the admin +-- engine compares on save so two people editing the same row +-- can't silently overwrite each other. teams was left out because +-- ADD COLUMN can't take DEFAULT (datetime('now')) on a STRICT +-- table, so this is the rebuild — the recipe from the SQLite docs. +-- +-- The runner turns foreign keys off around every migration and +-- runs foreign_key_check before committing (see migrate() in +-- db.js). So DROP TABLE doesn't touch affiliations, whose +-- (team_id, org_id) reference keeps pointing at the name `teams`, +-- which the rename puts back underneath it. +-- +-- legacy_alter_table is on for the rename: v_org_leadership, +-- v_timeline and the timeline_entries ref triggers name `teams`. +-- Between the DROP and the RENAME that table doesn't exist, and +-- the modern rename re-parses every view and trigger and fails on +-- them. Legacy mode leaves them alone; they resolve to the new +-- table by name. Turned back off before the end, since the +-- connection outlives this file. +-- +-- DROP TABLE takes the two AFTER DELETE triggers with it (and does +-- not fire them), so they're recreated below exactly as 002 and +-- 007 wrote them, along with teams_touch. Triggers go last: the +-- runner may drop statements that follow a BEGIN...END body. +-- +-- Verify after: +-- +-- PRAGMA user_version; -- 23 +-- PRAGMA foreign_key_check; -- no rows +-- SELECT name FROM sqlite_master WHERE tbl_name = 'teams'; +-- ═══════════════════════════════════════════════════════════════ + +PRAGMA legacy_alter_table = ON; + +CREATE TABLE teams_new ( + id TEXT PRIMARY KEY, -- slug: 'board', 'nw-leadership' + org_id TEXT NOT NULL REFERENCES organizations (id) ON DELETE CASCADE, + name TEXT NOT NULL, + tagline TEXT, + color TEXT, + logo TEXT, + 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')), + UNIQUE (id, org_id) +) STRICT; + +-- Columns listed explicitly rather than SELECT *, so this breaks +-- loudly if the old shape isn't what this file assumes. Existing +-- rows get the migration time for both timestamps. +INSERT INTO teams_new + (id, org_id, name, tagline, color, logo, is_published, sort_order) +SELECT + id, org_id, name, tagline, color, logo, is_published, sort_order + FROM teams; + +DROP TABLE teams; + +ALTER TABLE teams_new RENAME TO teams; + +CREATE INDEX teams_org_idx ON teams (org_id, sort_order); + +PRAGMA legacy_alter_table = OFF; + +CREATE TRIGGER teams_cleanup +AFTER DELETE ON teams +BEGIN + DELETE FROM content_blocks WHERE owner_kind = 'team' AND owner_id = old.id; + DELETE FROM links WHERE owner_kind = 'team' AND owner_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; + +CREATE TRIGGER teams_touch +AFTER UPDATE ON teams +FOR EACH ROW WHEN new.updated_at = old.updated_at +BEGIN + UPDATE teams SET updated_at = datetime('now') WHERE id = new.id; +END; diff --git a/server/src/routes/content.js b/server/src/routes/content.js index 2138905..92b74c8 100644 --- a/server/src/routes/content.js +++ b/server/src/routes/content.js @@ -1,7 +1,7 @@ /* ═══════════════════════════════════════════════════════════════ CONTENT ROUTES — read-only, mounted under /api - GET /events list + the section ids + GET /events list + the event scopes GET /events/:id one event, full body, people GET /organizations list, ?kind=region|chapter|… GET /organizations/:id one organization's page @@ -20,8 +20,8 @@ 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 + `event_type` is orthogonal to `scope_id`: the scope is whose + gathering it is (national, regional, partner…), 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. @@ -120,7 +120,7 @@ function shapeEvent(row, links, cardBlocks, hosts = []) { return { id: row.id, - section_id: row.section_id, + scope_id: row.scope_id, event_type: row.event_type, title: row.title, @@ -399,9 +399,7 @@ function attachTeams(db, orgs) { 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. */ +/* The awards this organization gives, drafts left out. */ function attachAwards(db, orgs) { const ids = orgs.map((o) => o.id); if (ids.length === 0) return; @@ -414,7 +412,7 @@ function attachAwards(db, orgs) { 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)}) + WHERE a.org_id IN (${marks(ids.length)}) AND a.is_published = 1 ORDER BY a.sort_order, a.name`, ) .all(...ids); @@ -437,22 +435,33 @@ function attachAwards(db, orgs) { } /* ── Events ──────────────────────────────────────────────────── - Flat, with the section ids alongside. Retreats.tsx owns the - section titles and colours and filters this list by section_id. + Flat, with the event scopes alongside. Retreats.tsx owns the + band titles and colours and filters this list by scope_id. + + By date, the way the cards split them: upcoming soonest first, + then past most recent first, undated at the end of each. There + is no hand-typed order; a tie falls to the title. ───────────────────────────────────────────────────────────── */ +const EVENT_ORDER = ` + effective_status = 'past', + starts_on IS NULL, + CASE WHEN effective_status = 'past' THEN NULL ELSE starts_on END, + starts_on DESC, + title`; + content.get("/events", (c) => { const db = c.get("db"); - const sections = db - .prepare(`SELECT id, name, sort_order FROM event_sections ORDER BY sort_order`) + const scopes = db + .prepare(`SELECT id, name, sort_order FROM event_scopes ORDER BY sort_order`) .all(); const rows = db .prepare( `SELECT * FROM v_events WHERE is_published = 1 - ORDER BY section_id, sort_order`, + ORDER BY ${EVENT_ORDER}`, ) .all(); @@ -470,7 +479,7 @@ content.get("/events", (c) => { ), ); - return json(c, { sections, events }); + return json(c, { scopes, events }); }); @@ -507,7 +516,7 @@ content.get("/events/:id", (c) => { 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 awards a ON a.id = pa.award_id AND a.is_published = 1 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)`, @@ -622,7 +631,7 @@ content.get("/organizations/:id", (c) => { 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`, + ORDER BY ${EVENT_ORDER}`, ) .all(id); @@ -694,12 +703,8 @@ content.get("/teams/:id", (c) => { 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. + An unpublished award is a draft: left out of the list, and a + 404 at its own URL, the same as any other unpublished row. ───────────────────────────────────────────────────────────── */ content.get("/awards", (c) => { @@ -718,7 +723,7 @@ content.get("/awards", (c) => { 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 = ?" : ""} + WHERE a.is_published = 1 ${org ? "AND a.org_id = ?" : ""} ORDER BY a.sort_order, a.name`, ) .all(...(org ? [org] : [])); @@ -741,7 +746,7 @@ content.get("/awards/:id", (c) => { `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 = ?`, + WHERE a.id = ? AND a.is_published = 1`, ) .get(id); diff --git a/server/src/routes/home.js b/server/src/routes/home.js index bbf14c4..fed4a29 100644 --- a/server/src/routes/home.js +++ b/server/src/routes/home.js @@ -151,7 +151,7 @@ home.get("/front-page", (c) => { .prepare( `SELECT * FROM v_events WHERE ${notOver} - ORDER BY starts_on, sort_order + ORDER BY starts_on, title LIMIT 1`, ) .get(); diff --git a/server/src/routes/people.js b/server/src/routes/people.js index dbc31d9..8d094e9 100644 --- a/server/src/routes/people.js +++ b/server/src/routes/people.js @@ -225,7 +225,7 @@ people.get("/people/:id", (c) => { 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`, + ORDER BY e.starts_on IS NULL, e.starts_on DESC, e.title, x.sort_order`, ) .all(id, id); diff --git a/src/App.tsx.save b/src/App.tsx.save deleted file mode 100644 index 3e0287c..0000000 --- a/src/App.tsx.save +++ /dev/null @@ -1,292 +0,0 @@ -import { useState } from "react"; -import nguLogo from "@/NGU_Logo.svg"; -import fallLogo from "@/Fall Logo.svg"; -import nguLogo_WhiteBG from "@/NGU_Logo_WhiteBG.svg"; - -{/* SVGs */} -const DoveSVG = ({ className = "" }: { className?: string }) => ( - - - - - - - - -); - -const InstagramIcon = () => ( - - - -); - -const FacebookIcon = () => ( - - - -); - -const DiscordIcon = () => ( - - - -); - -{/* Link Tables */} -const Social_Links = [ - { label: "Instagram", href: "https://www.instagram.com/nextgenerationunity/", icon: }, - { label: "Facebook", href: "https://www.facebook.com/NextGenerationofUnity", icon: }, - { label: "Discord", href: "https://discord.com/invite/AtngzpqaX5", icon: }, -] - -const Nav_Links = [ - { label: "About", href: "#about"}, - { label: "Events", href: "#events"}, - { label: "Connect", href: "#connect"}, -] - -const Footer_Links = [ - { label: "Privacy Policy", href: "#"}, - { label: "Terms of Service", href: "#"}, - { label: "Contact Us", href: "mailto:info@nextgenerationofunity.org"}, -] - -{/* Functions */} -function WaveText({ text, baseDelay = 0, step = 0.1 }) { - return ( - <> - {text.split("").map((char, i) => ( - - {char === " " ? "\u00A0" : char} - - ))} - - ); -} - -export default function App() { - const [mobileMenuOpen, setMobileMenuOpen] = useState(false); - const [activeTab, setActiveTab] = useState("main"); - - return ( -
- - {/* ── NAV ─────────────────────────────────────────────── */} - - - {/* Mobile menu */} - {mobileMenuOpen && ( -
- - {Nav_Links.map((link) => ( - setMobileMenuOpen(false)}> - {link.label} - - ))} - setMobileMenuOpen(false)}> - Give - -
- )} - - {/* ── HERO/ABOUT ─────────────────────────────────────────────── */} -
- {/* Floating doves */} -
-
-
- -
-

- Next Generation
- - - -

- -

- 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. -

-

- We are the future of the Unity Movement. -

- - -
-
- - {/* ── ABOUT/INFO ─────────────────────────────────────── */} -
-
-
-

A Ministry Designed For
Young Adults

-

- NGU exists to connect young adults across Unity ministries and create spaces for authentic spiritual exploration, community, and conscious living. -

-
- -
- {[ - { 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) => ( -
-
{card.icon}
-

{card.title}

-

{card.desc}

-
- ))} -
-
-
- {/* ── EVENTS ─────────────────────────────────────────────── */} -
-
-
-

- Upcoming Events -

-
- - {/* Featured event card */} -
-
-
-
- Next Generation of Unity -

Fall Retreat 2026

-

"Consciousness Creates"

-

November 12-15th, 2026

-

Unity Village, MO

-
-
- Next Generation of Unity -
-
-

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 your highest self.

-

Registration starting at $150, and $75 loding cost.

- -
- {[ - { label: "Register Now!", link:"https://ngu.churchcenter.com/registrations/events/3761999"}, - { label: "Workshop Signup", link:"https://ngu.churchcenter.com/people/forms/1285943"}, - { label: "Scholarship Application", link:"https://ngu.churchcenter.com/people/forms/1261992"}, - ].map(item => ( - - {item.label} - - ))} -
-
-
- -

· More events coming soon, stay connected for announcements ·

-
-
- {/* ── CONNECT / SOCIALS ─────────────────────────────────── */} -
-
-
-

- Ready to Connect? -

-

Find your place in the NGU community

-
- -
- {[ - { 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 => ( - -
-

{item.label}

-

{item.desc}

-
- {/* Arrow */} - - - - - ))} -
- - - -
-
- - {/* ── FOOTER - Using #042f3a for BG ─────────────────────────────────────── */} -
-
-
-
- Next Generation of Unity -
- -
- {Social_Links.map((link) => ( - - {link.icon} - - ))} -
-
- -
-

© 2026 Next Generation of Unity. All rights reserved.

-
- {Footer_Links.map((link) => ( - {link.label} - ))} -
-
-
-
-
- ); -} diff --git a/src/data/eventData.ts b/src/data/eventData.ts index b704721..7788638 100644 --- a/src/data/eventData.ts +++ b/src/data/eventData.ts @@ -1,25 +1,25 @@ /* ═══════════════════════════════════════════════════════════════ EVENT DATA - One request, filtered per section. The Retreats page has three + One request, filtered per band. The Retreats page has three bands of events, and all three call this hook — the cache in api.ts keys on the path, so they share a single fetch and each narrows the result to what it shows. - useEvents({ section: "national" }) one band + useEvents({ scope: "national" }) one band useEvents({ host: "northwest" }) one host's 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" }. + `scope` and `type` are different questions and stack rather + than overlap: the scope is whose gathering an event is, the type + is what kind of gathering it is. A regional class matches both + { scope: "regional" } and { type: "class" }. - The event_sections rows (the scope list) come back alongside, for - anything that offers a scope filter. + The event_scopes rows 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 @@ -35,15 +35,15 @@ import { useMemo } from "react"; import { useResource } from "../lib/useResource.ts"; -/* One shared empty list, so a memo keyed on `sections` doesn't +/* One shared empty list, so a memo keyed on `scopes` doesn't restart on every render before the data arrives. */ -const NO_SECTIONS: any[] = []; +const NO_SCOPES: any[] = []; -export function useEvents({ section, host, status, type }: any = {}) { +export function useEvents({ scope, host, status, type }: any = {}) { const { data, error, loading } = useResource("/events"); const all = data?.events; - const sections = data?.sections ?? NO_SECTIONS; + const scopes = data?.scopes ?? NO_SCOPES; /* An array prop is a new identity on every render, which would restart the memo each time. Joining it gives the dependency @@ -52,7 +52,7 @@ export function useEvents({ section, host, status, type }: any = {}) { const events = useMemo(() => { let list = all ?? []; - if (section) list = list.filter(e => e.section_id === section); + if (scope) list = list.filter(e => e.scope_id === scope); // `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. @@ -63,9 +63,9 @@ export function useEvents({ section, host, status, type }: any = {}) { list = list.filter(e => wanted.has(e.event_type)); } return list; - }, [all, section, host, status, typeKey]); + }, [all, scope, host, status, typeKey]); - return { events, sections, loading, error }; + return { events, scopes, loading, error }; } /* Past and upcoming, split. `status` arrives already resolved — the diff --git a/src/lib/adminSchema.ts b/src/lib/adminSchema.ts index 04fc24f..bd01281 100644 --- a/src/lib/adminSchema.ts +++ b/src/lib/adminSchema.ts @@ -27,8 +27,12 @@ const PLACE_FIELDS = [ { path: "is_online", label: "Online", widget: "checkbox" }, ]; +const PUBLISHED_FIELD = { path: "is_published", label: "Published", widget: "checkbox" }; + +/* For entities whose lists the site orders by hand. Events sort by + date and people by sort_name, so they take PUBLISHED_FIELD alone. */ const PUBLISH_FIELDS = [ - { path: "is_published", label: "Published", widget: "checkbox" }, + PUBLISHED_FIELD, { path: "sort_order", label: "Sort order", widget: "number" }, ]; @@ -392,14 +396,14 @@ const events = { list: { columns: [ { key: "title", label: "Title", primary: true }, - { key: "section_id", label: "Scope" }, + { key: "scope_id", label: "Scope" }, { key: "event_type", label: "Type" }, { 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: "scope_id", label: "Scope", optionsFrom: "event_scopes" }, { key: "event_type", label: "Type", @@ -414,15 +418,11 @@ 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", + path: "scope_id", label: "Scope", widget: "select", - optionsFrom: "event_sections", + optionsFrom: "event_scopes", required: true, help: "Whose gathering this is. Only national, regional and partner appear on the Retreats page", }, @@ -477,7 +477,7 @@ const events = { }, timelineGroup("event"), timelineDetailGroup("event"), - { legend: "Publishing", fields: PUBLISH_FIELDS }, + { legend: "Publishing", fields: [PUBLISHED_FIELD] }, ], children: [ @@ -592,7 +592,7 @@ const people = { { legend: "Publishing", note: "Unpublished people are invisible everywhere, including as chapter leads.", - fields: PUBLISH_FIELDS, + fields: [PUBLISHED_FIELD], }, ], @@ -757,10 +757,11 @@ const awards = { { key: "name", label: "Name", primary: true }, { key: "org_id", label: "Awarded by" }, { key: "description", label: "Description" }, - { key: "sort_order", label: "Order" }, + { key: "is_published", label: "Live", widget: "bool" }, ], filters: [ { key: "org_id", label: "Awarded by", optionsFrom: "organizations" }, + { key: "is_published", label: "Published", options: [["1", "Live"], ["0", "Hidden"]] }, ], }, @@ -782,9 +783,13 @@ const awards = { { path: "name", label: "Name", required: true }, { path: "description", label: "Description", widget: "textarea", full: true }, { path: "logo", label: "Logo", help: "Filename in public/org-logos/" }, - { path: "sort_order", label: "Sort order", widget: "number" }, ], }, + { + legend: "Publishing", + note: "An unpublished award is a draft: off the site, and a 404 at its own page.", + fields: PUBLISH_FIELDS, + }, ], }; diff --git a/src/lib/eventTypes.ts b/src/lib/eventTypes.ts index fbc0d96..91f8898 100644 --- a/src/lib/eventTypes.ts +++ b/src/lib/eventTypes.ts @@ -5,9 +5,9 @@ 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 — + What this is not: event_scopes. A scope 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, + an unrecognised scope_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. diff --git a/src/lib/useContent.ts b/src/lib/useContent.ts index ddf380e..df27c41 100644 --- a/src/lib/useContent.ts +++ b/src/lib/useContent.ts @@ -79,9 +79,9 @@ export type EventAward = { 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. */ + /** Whose gathering it is: an event_scopes id. */ + scope_id: string + /** What kind of gathering it is. Orthogonal to scope_id. */ event_type: EventType title: string theme?: string | null @@ -117,10 +117,10 @@ export type EventRecord = { * blocks, people and awards. */ export type EventListItem = Omit -/** An event_sections row, as GET /events sends it beside the list. */ -export type EventSection = { id: string; name: string; sort_order: number } +/** An event_scopes row, as GET /events sends it beside the list. */ +export type EventScope = { id: string; name: string; sort_order: number } -export type EventsResponse = { sections: EventSection[]; events: EventListItem[] } +export type EventsResponse = { scopes: EventScope[]; events: EventListItem[] } export const useEvent = (id?: string): Resource => useRecord(detailPath('/events', id), 'event') diff --git a/src/pages/Retreats.tsx b/src/pages/Retreats.tsx index 17d3bbd..2025932 100644 --- a/src/pages/Retreats.tsx +++ b/src/pages/Retreats.tsx @@ -11,8 +11,8 @@ import EventListCards, { EventCardsToggle } from "./sections/EventList-Cards.tsx 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. + scope whose gathering it is. event_scopes 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 @@ -45,7 +45,7 @@ const SECTIONS = [ accent: "#138ba0", background: "#eef9fb", Component: EventListCards, - props: { section: "national", ...RETREATS }, + props: { scope: "national", ...RETREATS }, views: { ...CARD_VIEWS, default: "carousel" }, }, { @@ -55,7 +55,7 @@ const SECTIONS = [ accent: "#aac992", background: "#ffffff", Component: EventListCards, - props: { section: "regional", ...RETREATS }, + props: { scope: "regional", ...RETREATS }, views: { ...CARD_VIEWS, default: "grid" }, }, { @@ -65,13 +65,13 @@ const SECTIONS = [ accent: "#7a5ea8", background: "#eef9fb", Component: EventListCards, - props: { section: "partner", ...RETREATS }, + props: { scope: "partner", ...RETREATS }, 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. + here, not in event_scopes. { id: "local", @@ -80,7 +80,7 @@ const SECTIONS = [ accent: "#d08a3c", background: "#ffffff", Component: EventListCards, - props: { section: "local", ...RETREATS_ONLY }, + props: { scope: "local", ...RETREATS_ONLY }, views: { ...CARD_VIEWS, default: "grid" }, }, { @@ -90,7 +90,7 @@ const SECTIONS = [ accent: "#3c7fd0", background: "#eef9fb", Component: EventListCards, - props: { section: "international", ...RETREATS_ONLY }, + props: { scope: "international", ...RETREATS_ONLY }, views: { ...CARD_VIEWS, default: "grid" }, }, { @@ -100,7 +100,7 @@ const SECTIONS = [ accent: "#7a8a8e", background: "#ffffff", Component: EventListCards, - props: { section: "other", ...RETREATS_ONLY }, + props: { scope: "other", ...RETREATS_ONLY }, views: { ...CARD_VIEWS, default: "grid" }, }, diff --git a/src/pages/sections/EventCalendar.tsx b/src/pages/sections/EventCalendar.tsx index 71d7aa9..5a44bc3 100644 --- a/src/pages/sections/EventCalendar.tsx +++ b/src/pages/sections/EventCalendar.tsx @@ -7,7 +7,7 @@ everything one host's calendar - one scope + one scope Two layers of filtering, and they answer different questions: @@ -63,7 +63,7 @@ const BODY = '#4a6b72' const WEEKDAYS = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'] type EventCalendarProps = { - section?: string + scope?: string host?: string status?: EventListItem['status'] type?: EventType | EventType[] @@ -223,7 +223,7 @@ function nextDateAfter(events: EventListItem[], after: string): string | null { /* ── Component ───────────────────────────────────────────────── */ export default function EventCalendar({ - section, + scope, host, status, type, @@ -231,32 +231,32 @@ export default function EventCalendar({ controls = ALL_CONTROLS, defaultView = 'month', }: EventCalendarProps) { - const { events: pinned, sections, loading, error } = useEvents({ section, host, status, type }) + const { events: pinned, scopes, loading, error } = useEvents({ scope, host, status, type }) const today = iso(new Date()) const [month, setMonth] = useState(monthKey(today)) const [view, setView] = useState(defaultView) const [selected, setSelected] = useState(null) - const [scope, setScope] = useState('') + const [pickedScope, setPickedScope] = 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 showScope = show('scope') && !scope 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 scopeOptions = useMemo(() => { + const present = new Set(pinned.map((e) => e.scope_id)) + return scopes.filter((s) => present.has(s.id)) + }, [pinned, scopes]) const events = useMemo(() => { const needle = query.trim().toLowerCase() return pinned.filter((e) => { - if (scope && e.section_id !== scope) return false + if (pickedScope && e.scope_id !== pickedScope) return false if (kind && e.event_type !== kind) return false if (onlineOnly && !e.is_online) return false if (needle) { @@ -274,7 +274,7 @@ export default function EventCalendar({ } return true }) - }, [pinned, scope, kind, onlineOnly, query]) + }, [pinned, pickedScope, kind, onlineOnly, query]) const weeks = useMemo(() => gridFor(month), [month]) const gridFrom = weeks[0][0] @@ -288,7 +288,7 @@ export default function EventCalendar({ ) 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 filtering = Boolean(pickedScope || 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) @@ -299,7 +299,7 @@ export default function EventCalendar({ } const clearFilters = () => { - setScope('') + setPickedScope('') setKind('') setOnlineOnly(false) setQuery('') @@ -361,13 +361,13 @@ export default function EventCalendar({ {/* ── Filters ── */} {(showScope || showType || show('online') || show('search')) && (
- {showScope && scopes.length > 1 && ( + {showScope && scopeOptions.length > 1 && ( [s.id, s.name])} + options={scopeOptions.map((s) => [s.id, s.name])} /> )} {showType && types.length > 1 && ( diff --git a/src/pages/sections/EventList-Cards.tsx b/src/pages/sections/EventList-Cards.tsx index dce0c0e..00f1068 100644 --- a/src/pages/sections/EventList-Cards.tsx +++ b/src/pages/sections/EventList-Cards.tsx @@ -10,16 +10,16 @@ import { seriesLabel } from "../../lib/eventSeries.ts"; A band of event cards, as a peek carousel or a grid. Self contained: give it a filter and it fetches, so the same section - appears three times on Retreats with a different `section` each + appears three times on Retreats with a different `scope` each time, and could appear on a region's page with `host` instead. - + `view` and `accent` come from the page's section manifest. - `type` pre-filters the band the way `section` and `host` do. Left + `type` pre-filters the band the way `scope` 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. @@ -446,7 +446,7 @@ export function EventCardsToggle({ view, setView, accent }) { than all falling through to "coming soon". ═══════════════════════════════════════════════════════════════ */ export default function EventListCards({ - section, + scope, host, status, type, @@ -456,7 +456,7 @@ export default function EventListCards({ empty = "· Events coming soon, stay connected for announcements ·", }: any) { const { events: fetched, loading, error } = useEvents({ - section, + scope, host, status, type, diff --git a/src/pages/sections/home/RetreatsBand.tsx b/src/pages/sections/home/RetreatsBand.tsx index dcd3fae..b21e8af 100644 --- a/src/pages/sections/home/RetreatsBand.tsx +++ b/src/pages/sections/home/RetreatsBand.tsx @@ -34,7 +34,7 @@ export default function RetreatsBand({ id, title, blurb }: RetreatsBandProps) {
- + ) }