Merge pull request #4 from scout-ch/feature/restructure-tina-astro

restructure tina & astro

.github/workflows/deploy.yml

@@ -23,32 +23,20 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
-          cache: 'yarn'
+          node-version: 20
+          cache: 'npm'
       - name: Install and build astro
         shell: 'bash'
-        run: |
-          yarn
-          yarn build
-      # - name: Install, build, and upload your site
-      #  uses: withastro/action@v0
-        # with:
-            # path: . # The root location of your Astro project inside the repository. (optional)
-            # node-version: 16 # The specific version of Node that should be used to build your site. Defaults to 16. (optional)
-            # package-manager: yarn # The Node package manager that should be used to install dependencies and build your site. Automatically detected based on your lockfile. (optional)
-      - name: Install TinaCMS
-        working-directory: backend
-        run: npm ci
-      - name: Build TinaCMS
-        working-directory: backend
         env:
           NEXT_PUBLIC_TINA_CLIENT_ID: ${{ secrets.TINA_PUBLIC_CLIENT_ID }}
           TINA_TOKEN: ${{ secrets.TINA_TOKEN }}
           NEXT_PUBLIC_TINA_BRANCH: main
-        run: npx tinacms build
+        run: |
+          npm install
+          npm run build
       - name: Copy TinaCMS artifacts
         run: |
-          cp -R ./backend/public/it-landscape/admin/ ./dist/
+          cp -R ./public/it-landscape/admin/ ./dist/
           rm ./dist/admin/.gitignore
       - name: Create Pages Artifact
         uses: actions/upload-pages-artifact@v1

.github/workflows/pr-open.yml

@@ -1,23 +1,17 @@
+
 name: Build Pull request
 on:
   pull_request:
     types: [opened, synchronize, reopened]
-env:
-  NEXT_PUBLIC_TINA_CLIENT_ID: ${{ secrets.NEXT_PUBLIC_TINA_CLIENT_ID }}
-  TINA_TOKEN: ${{ secrets.TINA_TOKEN }}
-  NEXT_PUBLIC_TINA_BRANCH: ${{ github.head_ref }}
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: ["14", "16", "17"]
-    name: Node ${{ matrix.node }} sample
+    name: build astro
     steps:
       - uses: actions/checkout@v3
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node }}
-      - run: yarn install
-      - run: yarn build
+          node-version: 20
+      - run: npm install
+      - run: npm run build-astro

.gitignore

@@ -1,21 +1,35 @@
-# build output
-dist/
-
-# generated types
-.astro/
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-node_modules/
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
 
-# logs
+# misc
+.DS_Store
+*.pem
+
+# debug
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-pnpm-debug.log*
 
-# environment variables
+# local env files
 .env
-.env.production
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
 
-# macOS-specific files
-.DS_Store
+# vercel
+.vercel