chore: Try simplified approach

Author: benjamsf

.github/workflows/deploypages.yml

@@ -82,53 +82,30 @@ jobs:
         url:  ${{ steps.deployment.outputs.page_url }}
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          fetch-depth: 0
 
-      - name: Make build.sh executable 
-        run: chmod +x build.sh
+      - name: Download Built Docs Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: docs-raw
+          path: ${{ github.workspace }}/build
 
-      - name: Install deps
-        run: npm ci
+      - name: Install Dependencies
+        run: npm install
 
-      # ----- Build Docusaurus site (./build) -----
-      - name: Build docs site
+      - name: Build TinaCMS and Docusaurus Site
         env:
-          ENABLE_TINA_ADMIN: true
           TINA_PUBLIC_CLIENT_ID: ${{ secrets.TINA_PUBLIC_CLIENT_ID }}
-          TINA_TOKEN:            ${{ secrets.TINA_TOKEN }}
-          DOCS_BASEURL: ${{ secrets.DOCS_BASEURL }}   # e.g. /Docusaurus-docs/
+          TINA_TOKEN: ${{ secrets.TINA_TOKEN }}
+          DOCS_BASEURL: ${{ secrets.DOCS_BASEURL }}
         run: npm run build
-
-          # ----- Build Tina admin (./admin) -----
-      - name: Build TinaCMS admin
-        env:
-          TINA_PUBLIC_CLIENT_ID: ${{ secrets.TINA_PUBLIC_CLIENT_ID }}
-          TINA_TOKEN:            ${{ secrets.TINA_TOKEN }}
-          ENABLE_TINA_ADMIN: true
-        run: npx tinacms build
-
-      # ----- Copy Tina into <baseUrl>/admin -----
-      - name: Relocate Tina admin inside baseUrl
-        run: |
-            set -euo pipefail
-            BASE="${DOCS_BASEURL#/}"   # strip leading /
-            BASE="${BASE%/}"           # strip trailing /
-            SRC="./public/admin"       # <<— correct location from tinacms build
-            # If you still move it to static/cms-admin elsewhere, use that path instead
-            if [[ ! -d "$SRC" ]]; then
-            echo "Tina admin folder not found at $SRC"; exit 1;
-            fi
-            if [[ -z "$BASE" ]]; then
-            DEST="./build/admin"
-            else
-            DEST="./build/${BASE}/admin"
-            fi
-            echo "Copying $SRC → $DEST"
-            mkdir -p "$DEST"
-            cp -a "$SRC"/. "$DEST"/
-            ls -R "$DEST" | head
-        env:
-            DOCS_BASEURL: ${{ secrets.DOCS_BASEURL }}
+        
+      - name: Remove gitignore file
+        run: rm ./build/admin/.gitignore
 
       # --- Upload static site as artifact ---
       - name: Upload Pages artifact

build.sh

@@ -17,32 +17,18 @@ if [ ! -f "src/sidebars/index.json" ]; then
   echo '{"items": []}' > src/sidebars/index.json
 fi
 
+# Copy Tina admin to Docusaurus static folder
+rm -rf static/admin
+cp -r public/admin static/admin
+
 PROJECT_ROOT="$(pwd)"
 SRC_DIR="$PROJECT_ROOT/src/decks/prebuilds"
 OUT_DIR="$PROJECT_ROOT/static/decks"
-
-echo "🎞️ Inlining Reveal.js HTML decks..."
-find "$SRC_DIR" -name 'index.html' | while read -r html; do
-  rel_path="${html#$SRC_DIR/}"
-  out_path="$OUT_DIR/$rel_path"
-  out_dir="$(dirname "$out_path")"
-
-  mkdir -p "$out_dir"
-  echo "✨ Inlining: $rel_path"
+@@ -18,5 +25,9 @@ find "$SRC_DIR" -name 'index.html' | while read -r html; do
   npx html-inline --nocompress --inlinemin --root "$PROJECT_ROOT" "$html" > "$out_path"
 done
 
-if [[ "${ENABLE_TINA_ADMIN:-}" == "true" ]]; then
-  BASE="${DOCS_BASEURL:-/}"
-  BASE="${BASE#/}" ; BASE="${BASE%/}"     # trim slashes
-
-  dest="build"
-  [[ -n "$BASE" ]] && dest="${dest}/${BASE}"
-  dest="${dest}/admin"
-
-  echo "🚚  Copying  public/admin → ${dest}"
-  mkdir -p "${dest}"
-  cp -a public/admin/. "${dest}/"
-fi
+echo "✅ All slide decks inlined to: $OUT_DIR"
 
-echo "✅ All slide decks inlined to: $OUT_DIR"
+echo "🛠️ Building Docusaurus site..."
+npm run build