create-goodfellow 0.1.0 → 0.3.0

package/templates/parish/.github/workflows/deploy.yml

@@ -1,7 +1,10 @@
 # Builds the site and publishes it with GitHub Pages whenever the main branch
 # changes (including every Publish in the admin panel), and once a night so
-# date-based content stays current. In the repository's Settings → Pages, set
-# "Source" to "GitHub Actions". See README.md.
+# date-based content stays current. Each night it first installs Goodfellow's
+# newest fixes, and publishes them only if the site still builds with them,
+# unless content/updates.json turns automatic updates off.
+# In the repository's Settings → Pages, set "Source" to "GitHub Actions".
+# See README.md.
 name: Deploy to GitHub Pages
 
 on:
@@ -10,6 +13,11 @@ on:
   schedule:
     - cron: "17 4 * * *"
   workflow_dispatch:
+    inputs:
+      update:
+        description: "Update Goodfellow first: fixes, latest, or a release such as 0.5.0 (an older one goes back to it). Leave empty to only build."
+        required: false
+        default: ""
 
 permissions:
   contents: read
@@ -21,10 +29,36 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
+  update:
+    # Each night, and when the admin panel's Updates screen asks.
+    if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.update != '')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    outputs:
+      sha: ${{ steps.update.outputs.sha }}
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v5
+        with:
+          node-version: 22
+          cache: npm
+      - run: npm ci
+      - id: update
+        env:
+          TO: ${{ inputs.update || 'automatic' }}
+        run: npx goodfellow update --publish --to "$TO"
+
   build:
+    needs: update
+    # Also when there was no update to run, or it didn't work: the site is built either way.
+    if: ${{ !cancelled() }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
+        with:
+          # The update's commit, when it published one.
+          ref: ${{ needs.update.outputs.sha || github.sha }}
       - uses: actions/setup-node@v5
         with:
           node-version: 22
@@ -40,6 +74,7 @@ jobs:
 
   deploy:
     needs: build
+    if: ${{ !cancelled() && needs.build.result == 'success' }}
     runs-on: ubuntu-latest
     environment:
       name: github-pages

package/templates/parish/.gitlab-ci.yml

@@ -1,6 +1,11 @@
 # Builds the site and publishes it with GitLab Pages whenever the default
-# branch changes (including every Publish in the admin panel). For nightly
-# rebuilds, add a schedule under Build → Pipeline schedules. See README.md.
+# branch changes (including every Publish in the admin panel). On scheduled
+# pipelines, which the admin panel's Updates screen sets up to run each night,
+# it first installs Goodfellow's newest fixes, unless content/updates.json turns
+# automatic updates off (or the release GOODFELLOW_UPDATE names), and publishes
+# them only if the site still builds with them. That
+# needs "Allow Git push requests to the repository" under Settings → CI/CD →
+# Job token permissions, which the Updates screen turns on. See README.md.
 pages:
   image: node:22
   cache:
@@ -9,6 +14,11 @@ pages:
     paths: [.npm/]
   script:
     - npm ci --cache .npm --prefer-offline
+    - |
+      if [ "$CI_PIPELINE_SOURCE" = "schedule" ] || [ -n "$GOODFELLOW_UPDATE" ]; then
+        git remote set-url origin "https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_FQDN:-$CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"
+        npx goodfellow update --publish --to "${GOODFELLOW_UPDATE:-automatic}" || echo "The update wasn't published; building the site as it is."
+      fi
     # Pages may serve the site from a subfolder, such as https://group.gitlab.io/site/.
     - export GOODFELLOW_BASE="$(node -e 'console.log(new URL(process.env.CI_PAGES_URL).pathname)')"
     - npx goodfellow build

package/templates/parish/README.md

@@ -1,6 +1,6 @@
 # St. Joseph Parish (example)
 
-An example parish website built with [Goodfellow](https://github.com/chartung17/goodfellow-cms). **St. Joseph Parish is made up**: its name, address, phone number, staff, history, Mass times and events are invented, and the pictures are simple drawings. Replace them all with your own before putting the site online.
+An example parish website built with [Goodfellow](https://github.com/goodfellow-cms/goodfellow-cms). **St. Joseph Parish is made up**: its name, address, phone number, staff, history, Mass times and events are invented, and the pictures are simple drawings. Replace them all with your own before putting the site online.
 
 Start a site from this example with `npm create goodfellow@latest my-parish -- --template parish`.
 
@@ -28,13 +28,13 @@ On your own computer, the admin panel saves straight to the files in `content/`.
   - **Bulletins:** each one links to a PDF uploaded on the **Media** screen.
   - **Staff**, listed on the About us page. They have no pages of their own, and the **Order** field sets who comes first.
 - **Contact details** (address, phone and email) are set once in **Site settings → General**, and shown in the footer and on the contact page by the **Contact details** block.
-- **More blocks**, such as an FAQ and tabs, can be added on the admin panel's **Blocks** screen. See [Blocks from block registries](https://github.com/chartung17/goodfellow-cms#blocks-from-block-registries).
+- **More blocks**, such as an FAQ and tabs, can be added on the admin panel's **Blocks** screen. See [Add blocks](https://goodfellow-cms.github.io/goodfellow-cms/docs/add-blocks).
 - **The parish's own blocks**, in `blocks/`, show how a developer adds blocks to a site. They're listed under **Parish** in the editor:
   - **Mass times:** a list of days and times, each with an optional note.
   - **Scripture quote:** a short passage with its reference. The example uses the Douay-Rheims Bible (Challoner revision), a Catholic translation in the public domain; most modern translations need permission to quote.
   - **Notice:** an announcement that stands out from the text around it.
 
-  Each block is a React component plus the fields the editor shows for it. They're added to the editor in `goodfellow.config.tsx`. Never rename a block's key or its fields once pages use them, since content files refer to them by name. Parts of a block that respond to visitors, such as a button that shows more, go in a file starting with `"use client"`, and only pages that use them load JavaScript: see [Interactive blocks](https://github.com/chartung17/goodfellow-cms#interactive-blocks).
+  Each block is a React component plus the fields the editor shows for it. They're added to the editor in `goodfellow.config.tsx`. Never rename a block's key or its fields once pages use them, since content files refer to them by name. Parts of a block that respond to visitors, such as a button that shows more, go in a file starting with `"use client"`, and only pages that use them load JavaScript: see [Interactive blocks](https://goodfellow-cms.github.io/goodfellow-cms/docs/interactive-blocks).
 
 ## Making it yours
 
@@ -49,7 +49,14 @@ Setup takes four steps. It's done once, usually by whoever set up the site.
 
 ### 1. Store the site on GitHub or GitLab
 
-Create a repository and push this folder to it, including `package-lock.json`.
+Create an empty repository on GitHub or GitLab, without a README, and push this folder to it:
+
+```sh
+git remote add origin https://github.com/your-name/your-site.git   # unless origin is already set
+git push -u origin main
+```
+
+`create-goodfellow` makes the new site a git repository on the branch `main`, with everything, `package-lock.json` included, in its first commit, and sets `origin` when it's given the repository. Commit any changes since (`git add -A` and `git commit`) before pushing.
 
 ### 2. Tell Goodfellow where the site is stored
 
@@ -71,7 +78,7 @@ Also set the site's address under **Site settings → General → Site address**
 
 ### 3. Choose a host
 
-Each host's free plan has its own rules about business use. If the site is for a business, sells anything, shows ads, or is built or looked after by someone who's paid for it, check those rules first. As of October 2026, GitHub Pages and Vercel's free plan don't allow most of these, and GitLab Pages has no rule against them that we know of. See [Commercial sites](https://github.com/chartung17/goodfellow-cms#requirements-and-limits) in Goodfellow's README.
+Each host's free plan has its own rules about business use. If the site is for a business, sells anything, shows ads, or is built or looked after by someone who's paid for it, check those rules first. As of October 2026, GitHub Pages and Vercel's free plan don't allow most of these, and GitLab Pages has no rule against them that we know of. See [Hosts and business sites](https://goodfellow-cms.github.io/goodfellow-cms/docs/hosts) in Goodfellow's documentation.
 
 **GitHub Pages** (free for public repositories; not for online businesses or shops)
 
@@ -86,7 +93,7 @@ Each host's free plan has its own rules about business use. If the site is for a
 
 **Vercel** (works with GitHub and GitLab; the free plan is for non-commercial sites only)
 
-1. Import the repository in Vercel. `vercel.json` already has the right settings.
+1. Import the repository in Vercel. `vercel.ts` already has the right settings, and has Vercel send the site's redirects itself.
 2. For nightly rebuilds, create a deploy hook under **Settings → Git → Deploy Hooks**, and call it from a scheduled GitHub Action or GitLab pipeline schedule.
 
 Delete the setup files for the hosts you don't use.
@@ -114,7 +121,7 @@ Upload images and files, such as the weekly bulletin, on the admin panel's **Med
 
 ## Writing with AI
 
-The admin panel's **AI** tab can draft pages, rewrite blocks and fill in events and news stories. Each editor picks an AI service there. Claude and some others need the editor's own API key and charge for use; there are free options, including copying the request into a chat app such as Claude.ai. To offer only some services, or to turn the assistant off, see `ai` in [Goodfellow's README](https://github.com/chartung17/goodfellow-cms#ai-services).
+The admin panel's **AI** tab can draft pages, rewrite blocks and fill in events and news stories. Each editor picks an AI service there. Claude and some others need the editor's own API key and charge for use; there are free options, including copying the request into a chat app such as Claude.ai. To offer only some services, or to turn the assistant off, see `ai` in [Configuration](https://goodfellow-cms.github.io/goodfellow-cms/docs/configuration).
 
 ## Publishing
 

package/templates/parish/content/collections/events/_collection.json

@@ -1,5 +1,10 @@
 {
   "version": 1,
+  "calendar": {
+    "place": "place",
+    "summary": "summary",
+    "when": "when"
+  },
   "entryName": "Event",
   "fields": [
     {
@@ -9,17 +14,11 @@
       "required": true
     },
     {
-      "type": "date",
-      "label": "Date",
-      "name": "date",
+      "type": "event",
+      "label": "Date and time",
+      "name": "when",
       "required": true
     },
-    {
-      "type": "text",
-      "hint": "Such as 7:00 pm, or 11:00 am to 5:00 pm.",
-      "label": "Time",
-      "name": "time"
-    },
     {
       "type": "text",
       "hint": "Such as the church or the parish hall.",
@@ -46,7 +45,7 @@
   "name": "Events",
   "path": "/events/{slug}",
   "sort": {
-    "field": "date",
+    "field": "when",
     "order": "asc"
   },
   "template": {
@@ -64,7 +63,7 @@
               "props": {
                 "id": "EntryField-date",
                 "className": "",
-                "field": "date",
+                "field": "when",
                 "style": "small"
               }
             },
@@ -86,15 +85,6 @@
                 "direction": "row",
                 "gap": "lg",
                 "items": [
-                  {
-                    "type": "EntryField",
-                    "props": {
-                      "id": "EntryField-time",
-                      "className": "",
-                      "field": "time",
-                      "style": "text"
-                    }
-                  },
                   {
                     "type": "EntryField",
                     "props": {
@@ -109,6 +99,15 @@
                 "wrap": true
               }
             },
+            {
+              "type": "AddToCalendar",
+              "props": {
+                "id": "AddToCalendar-event",
+                "addLabel": "Add to calendar",
+                "className": "mt-4",
+                "otherCalendarsLabel": "Apple Calendar and others"
+              }
+            },
             {
               "type": "EntryField",
               "props": {

package/templates/parish/content/collections/events/advent-penance-service.json

@@ -1,12 +1,14 @@
 {
   "version": 1,
   "fields": {
-    "date": "2026-12-09",
     "image": "/media/candles.svg",
     "place": "Church",
     "summary": "Prepare for Christmas with a short service and individual confession, with several priests available.",
     "text": "<p>The service begins with readings and an examination of conscience, followed by the chance to go to confession. It usually ends by 8:30 pm.</p>",
-    "time": "7:00 pm",
-    "title": "Advent penance service"
+    "title": "Advent penance service",
+    "when": {
+      "end": "2026-12-09T20:30",
+      "start": "2026-12-09T19:00"
+    }
   }
 }

package/templates/parish/content/collections/events/all-souls.json

@@ -1,12 +1,14 @@
 {
   "version": 1,
   "fields": {
-    "date": "2026-11-02",
     "image": "/media/candles.svg",
     "place": "Church",
     "summary": "On All Souls' Day, we pray for parishioners and loved ones who have died this year.",
     "text": "<p>Families of those whose funerals were held at St. Joseph this year are invited to light a candle in their memory. Anyone may add a name to the Book of Remembrance at the back of the church.</p>",
-    "time": "7:00 pm",
-    "title": "Mass of Remembrance"
+    "title": "Mass of Remembrance",
+    "when": {
+      "end": "2026-11-02T20:00",
+      "start": "2026-11-02T19:00"
+    }
   }
 }

package/templates/parish/content/collections/events/christmas-concert.json

@@ -1,12 +1,14 @@
 {
   "version": 1,
   "fields": {
-    "date": "2026-12-13",
     "image": "/media/gathering.svg",
     "place": "Church",
     "summary": "The parish choir and children's choir sing carols old and new. Free, with a collection for the food pantry.",
     "text": "<p>Bring family and friends for an afternoon of carols, followed by hot chocolate in the parish hall.</p>",
-    "time": "3:00 pm",
-    "title": "Christmas concert"
+    "title": "Christmas concert",
+    "when": {
+      "end": "2026-12-13T16:30",
+      "start": "2026-12-13T15:00"
+    }
   }
 }

package/templates/parish/content/collections/events/fall-festival.json

@@ -1,12 +1,14 @@
 {
   "version": 1,
   "fields": {
-    "date": "2026-10-17",
     "image": "/media/gathering.svg",
     "place": "Church grounds",
     "summary": "Food, games, music and a bake sale for the whole family.",
     "text": "<p>Our biggest day of the year! There's a barbecue lunch, games and face painting for children, live music in the afternoon and the famous bake sale.</p><p>Volunteers are always welcome: sign up after any weekend Mass.</p>",
-    "time": "11:00 am to 5:00 pm",
-    "title": "Fall festival"
+    "title": "Fall festival",
+    "when": {
+      "end": "2026-10-17T17:00",
+      "start": "2026-10-17T11:00"
+    }
   }
 }

package/templates/parish/content/collections/events/youth-group.json

@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "fields": {
+    "image": "/media/gathering.svg",
+    "place": "Parish hall",
+    "summary": "Games, food and conversation for high school students, every Wednesday during the school year.",
+    "text": "<p>All high school students are welcome, whether or not they're parishioners. There's no youth group the day before Thanksgiving or over the Christmas break.</p>",
+    "title": "Youth group",
+    "when": {
+      "end": "2026-09-09T20:30",
+      "repeat": {
+        "every": "week",
+        "skip": [
+          "2026-11-25",
+          "2026-12-23",
+          "2026-12-30"
+        ],
+        "until": "2027-06-09"
+      },
+      "start": "2026-09-09T19:00"
+    }
+  }
+}

package/templates/parish/content/collections/news/_collection.json

@@ -20,6 +20,30 @@
       "label": "Summary",
       "name": "summary"
     },
+    {
+      "type": "tags",
+      "hint": "News pages list stories by topic.",
+      "label": "Topics",
+      "name": "topics",
+      "options": [
+        {
+          "label": "Parish life",
+          "value": "parish-life"
+        },
+        {
+          "label": "Youth",
+          "value": "youth"
+        },
+        {
+          "label": "Outreach",
+          "value": "outreach"
+        },
+        {
+          "label": "Music",
+          "value": "music"
+        }
+      ]
+    },
     {
       "type": "image",
       "label": "Picture",

package/templates/parish/content/collections/news/bell-tower-repairs.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "fields": {
+    "date": "2026-07-19",
+    "image": "/media/placeholder.svg",
+    "summary": "After a summer of scaffolding, the bells ring again every Sunday morning.",
+    "text": "<p>Thank you for your patience while the tower was repaired, and to everyone who gave to the building fund to make it possible.</p>",
+    "title": "Bell tower repairs are finished",
+    "topics": [
+      "parish-life"
+    ]
+  }
+}

package/templates/parish/content/collections/news/choir-new-voices.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "fields": {
+    "date": "2026-09-14",
+    "image": "/media/placeholder.svg",
+    "summary": "Six new singers joined the parish choir this fall, and there is room for more.",
+    "text": "<p>The choir rehearses on Thursday evenings in the church. No experience is needed, only a love of singing. Speak to the music director after any Sunday Mass.</p>",
+    "title": "Choir welcomes new voices",
+    "topics": [
+      "music",
+      "parish-life"
+    ]
+  }
+}

package/templates/parish/content/collections/news/food-drive.json

@@ -5,6 +5,9 @@
     "image": "/media/placeholder.svg",
     "summary": "Parishioners filled the shelves of the local food pantry for the months ahead.",
     "text": "<p>Thank you to everyone who brought food, sorted donations and drove deliveries. The pantry is open every Tuesday and Thursday, and always needs volunteers.</p>",
-    "title": "Thank you for supporting the food drive"
+    "title": "Thank you for supporting the food drive",
+    "topics": [
+      "outreach"
+    ]
   }
 }

package/templates/parish/content/collections/news/new-website.json

@@ -5,6 +5,9 @@
     "image": "/media/church.svg",
     "summary": "Mass times, events and the weekly bulletin are now easier to find, on any phone or computer.",
     "text": "<p>The parish office can now keep the website up to date themselves, so you'll always find this week's times and news here. Something missing? Let us know.</p>",
-    "title": "Welcome to our new website"
+    "title": "Welcome to our new website",
+    "topics": [
+      "parish-life"
+    ]
   }
 }

package/templates/parish/content/collections/news/winter-coats.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "fields": {
+    "date": "2026-10-04",
+    "image": "/media/placeholder.svg",
+    "summary": "Bring clean, warm coats for children and adults to the parish hall in October.",
+    "text": "<p>Coats go to families in the neighborhood through the parish outreach team. Hats, gloves and scarves are welcome too.</p>",
+    "title": "Winter coat collection begins",
+    "topics": [
+      "outreach"
+    ]
+  }
+}

package/templates/parish/content/collections/news/youth-group.json

@@ -5,6 +5,9 @@
     "image": "/media/gathering.svg",
     "summary": "High school students meet on Sunday evenings after the 6:00 pm Mass, with pizza.",
     "text": "<p>Every week there's food, games, conversation and a short reflection. New members are always welcome, and parents can contact the parish office for details.</p>",
-    "title": "Youth group starts again"
+    "title": "Youth group starts again",
+    "topics": [
+      "youth"
+    ]
   }
 }

package/templates/parish/content/collections/news/youth-service-day.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "fields": {
+    "date": "2026-06-21",
+    "image": "/media/placeholder.svg",
+    "summary": "Twenty young people painted, gardened and cooked lunch for neighbors.",
+    "text": "<p>The youth group plans a service day every summer. Parents and parishioners who would like to help next year can contact the parish office.</p>",
+    "title": "Teens spend a day serving the neighborhood",
+    "topics": [
+      "youth",
+      "outreach"
+    ]
+  }
+}

package/templates/parish/content/menus.json

@@ -38,6 +38,10 @@
             "href": "/events",
             "label": "Events"
           },
+          {
+            "href": "/calendar",
+            "label": "Calendar"
+          },
           {
             "href": "/news",
             "label": "News"

package/templates/parish/content/pages/about.json

@@ -76,20 +76,63 @@
               }
             },
             {
-              "type": "CollectionList",
+              "type": "CollectionLoop",
               "props": {
-                "id": "CollectionList-staff",
+                "id": "CollectionLoop-staff",
+                "allLabel": "All",
+                "choicePages": "",
                 "className": "",
                 "collection": "staff",
                 "columns": "4",
                 "dateField": "",
+                "design": [
+                  {
+                    "type": "Image",
+                    "props": {
+                      "id": "Image-staff-photo",
+                      "alt": "",
+                      "aspect": "square",
+                      "caption": "",
+                      "className": "",
+                      "rounded": true,
+                      "src": "{photo}"
+                    }
+                  },
+                  {
+                    "type": "Heading",
+                    "props": {
+                      "id": "Heading-staff-name",
+                      "align": "left",
+                      "className": "text-lg",
+                      "level": "h3",
+                      "text": "{title}"
+                    }
+                  },
+                  {
+                    "type": "Text",
+                    "props": {
+                      "id": "Text-staff-role",
+                      "align": "left",
+                      "className": "text-muted-foreground",
+                      "content": "<p>{role}</p>"
+                    }
+                  }
+                ],
                 "emptyText": "",
-                "imageField": "photo",
-                "layout": "cards",
+                "filterField": "",
+                "filterValue": "",
+                "gap": "md",
+                "items": [],
                 "limit": 0,
+                "linkToPage": false,
+                "nextLabel": "Next",
                 "order": "default",
+                "pageTitle": "Page {number}",
+                "pagesLabel": "Pages",
+                "paginate": false,
+                "previousLabel": "Previous",
                 "show": "all",
-                "summaryField": "role"
+                "sortField": ""
               }
             }
           ],

package/templates/parish/content/pages/calendar.json

@@ -0,0 +1,59 @@
+{
+  "version": 1,
+  "data": {
+    "content": [
+      {
+        "type": "Section",
+        "props": {
+          "id": "Section-calendar",
+          "background": "none",
+          "backgroundImage": "",
+          "className": "",
+          "content": [
+            {
+              "type": "Heading",
+              "props": {
+                "id": "Heading-calendar",
+                "align": "left",
+                "className": "mb-8",
+                "level": "h1",
+                "text": "Calendar"
+              }
+            },
+            {
+              "type": "Calendar",
+              "props": {
+                "id": "Calendar-month",
+                "addLabel": "Add to calendar",
+                "className": "",
+                "collection": "events",
+                "days": 90,
+                "emptyText": "Nothing is planned this month yet.",
+                "feed": "",
+                "limit": 0,
+                "monthsAfter": 12,
+                "monthsBefore": 1,
+                "nextLabel": "Next month",
+                "otherCalendarsLabel": "Apple Calendar and others",
+                "previousLabel": "Previous month",
+                "subscribeLabel": "Subscribe to the parish calendar",
+                "view": "month",
+                "weekStart": "sunday"
+              }
+            }
+          ],
+          "padding": "lg",
+          "width": "normal"
+        }
+      }
+    ],
+    "root": {
+      "props": {
+        "className": "",
+        "description": "St. Joseph Parish's events, a month at a time.",
+        "image": "",
+        "title": "Calendar"
+      }
+    }
+  }
+}