Fix build, restore lost content, and recreate the boxed two-column design

.envrc

@@ -1 +1 @@
-use flake
+use flake . --impure

.github/workflows/build-and-deploy.yml

@@ -9,149 +9,9 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  setup:
-    name: Merge Repos
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout this repo
-        uses: actions/checkout@v4
-        with:
-          path: source
-
-      - name: Checkout Chobble Template
-        uses: actions/checkout@v4
-        with:
-          repository: chobble-mirror/chobble-template
-          ref: main
-          path: template
-          sparse-checkout-cone-mode: false
-          sparse-checkout: |
-            .eleventy.js
-            package.json
-            bun.lock
-            bunfig.toml
-            flake.nix
-            flake.lock
-            bin
-            scripts
-            packages
-            src
-
-      - name: Copy template files to combined dir
-        run: |
-          mkdir -p combined
-          rsync \
-            --recursive \
-            --verbose \
-            --delete \
-            --exclude=".git" \
-            --exclude="*.md" \
-            --exclude="images" \
-            template/ \
-            combined/
-
-      - name: Overlay our repo files into combined src
-        run: |
-          rsync \
-            --recursive \
-            --verbose \
-            --exclude=".*" \
-            --exclude="README.md" \
-            --exclude="package.json" \
-            source/ \
-            combined/src/
-
-      - name: Update site.json with secrets
-        run: |
-          sed -i \
-            's/"formspark_id": null/"formspark_id": "${{ secrets.FORMSPARK_ID }}"/g' \
-            "combined/src/_data/config.json"
-          sed -i \
-            's/"botpoison_public_key": null/"botpoison_public_key": "${{ secrets.BOTPOISON_PUBLIC_KEY }}"/g' \
-            "combined/src/_data/config.json"
-
-      - name: Upload combined directory
-        uses: actions/upload-artifact@v4
-        with:
-          name: combined-files
-          path: combined/
-          retention-days: 1
-          include-hidden-files: true
-
   build:
-    name: Build Site
-    needs: setup
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download combined directory
-        uses: actions/download-artifact@v4
-        with:
-          name: combined-files
-          path: combined
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-
-      - name: Restore cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            combined/node_modules
-            combined/.image-cache
-          key: ${{ runner.os }}-bun-${{ hashFiles('combined/bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-bun-
-
-      - name: Build with Bun
-        run: |
-          cd combined
-          bun install --frozen-lockfile
-          bun scripts/eleventy-build.js
-          mkdir -p ../_site
-          mv _site/* ../_site/
-
-      - name: Upload built site
-        uses: actions/upload-artifact@v4
-        with:
-          name: built-site
-          path: _site/
-          retention-days: 1
-
-  deploy:
-    name: Deploy
-    needs: [setup, build]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download built site
-        uses: actions/download-artifact@v4
-        with:
-          name: built-site
-          path: _site
-
-      - name: Deploy to Bunny
-        uses: R-J-dev/bunny-deploy@v2.0.6
-        with:
-          access-key: ${{ secrets.BUNNY_ACCESS_KEY }}
-          directory-to-upload: _site
-          storage-endpoint: "https://uk.storage.bunnycdn.com"
-          storage-zone-name: "uke-group-north"
-          storage-zone-password: ${{ secrets.BUNNY_STORAGE_ZONE_PASSWORD }}
-          concurrency: "5"
-          enable-delete-action: true
-          enable-purge-pull-zone: true
-          pull-zone-id: "4574563"
-          replication-timeout: "15000"
-
-  notify-failure:
-    name: Notify on Failure
-    runs-on: ubuntu-latest
-    needs: [setup, build, deploy]
-    if: failure()
-    steps:
-      - name: Send failure notification
-        uses: NiNiyas/ntfy-action@master
-        with:
-          url: 'https://ntfy.sh'
-          topic: ${{ secrets.NTFY_TOPIC }}
+    uses: chobbledotcom/chobble-client/.github/workflows/shared-build-and-deploy.yml@main
+    with:
+      bunny-storage-endpoint: "https://uk.storage.bunnycdn.com"
+      deploy-only-on-main: true
+    secrets: inherit

.gitignore

@@ -6,3 +6,4 @@ yarn-debug.log*
 yarn-error.log*
 .DS_Store
 .direnv
+screenshots/

.pages.yml

@@ -22,13 +22,11 @@ content:
     type: collection
     subfolders: false
     view:
-      fields: [permalink, meta_title, header_text]
-      primary: header_text
-      sort: [header_text]
+      fields: [permalink, meta_title, name]
+      primary: name
+      sort: [name]
     fields:
-      - { name: header_image, type: image, label: Header Image }
-      - { name: header_text, type: string, label: Header Text }
-      - { name: subtitle, type: string, label: Subtitle }
+      - { name: name, type: string, label: Name }
       - { name: body, label: Body, type: code, options: { language: markdown } }
       - { name: meta_description, type: string, label: Meta Description }
       - { name: meta_title, type: string, label: Meta Title }
@@ -48,11 +46,9 @@ content:
     subfolders: false
     fields:
       - { name: title, type: string, label: Title }
-      - { name: header_image, type: image, label: Header Image }
       - { name: date, label: Date, type: date }
       - { name: subtitle, type: string, label: Subtitle }
       - { name: body, label: Body, type: code, options: { language: markdown } }
-      - { name: header_text, type: string, label: Header Text }
       - { name: meta_description, type: string, label: Meta Description }
       - { name: meta_title, type: string, label: Meta Title }
 
@@ -66,7 +62,6 @@ content:
       - { name: title, type: string, label: Name }
       - { name: snippet, type: string, label: Role }
       - { name: image, type: image, label: Profile Image }
-      - { name: header_image, type: image, label: Header Image }
       - {
           name: body,
           label: Biography,
@@ -82,7 +77,9 @@ content:
     fields:
       - { name: name, type: string, label: Name }
       - { name: url, type: string, label: URL }
-      - { name: body, label: Body, type: code, options: { language: markdown } }
+      - { name: date, type: date, label: Date }
+      - { name: rating, type: number, label: Rating (1-5), required: false }
+      - { name: body, label: Review Text, type: code, options: { language: markdown } }
       - name: products
         label: Products
         type: reference
@@ -104,15 +101,13 @@ content:
       primary: title
       sort: [title]
     fields:
-      - { name: header_image, type: image, label: Header Image }
       - { name: title, type: string, label: Title }
       - { name: subtitle, type: string, label: Subtitle }
       - { name: event_date, label: Event Date, type: date, required: false }
       - { name: recurring_date, type: string, label: Recurring Date (e.g. "Every Friday at 2 PM"), required: false }
       - { name: event_location, type: string, label: Event Location }
       - { name: map_embed_src, type: string, label: Map Embed URL, required: false }
       - { name: body, label: Body, type: code, options: { language: markdown } }
-      - { name: header_text, type: string, label: Header Text }
       - { name: meta_title, type: string, label: Meta Title }
       - { name: meta_description, type: string, label: Meta Description }