Switch to new CMS structure

.eslintrc.js

@@ -7,6 +7,8 @@ module.exports = {
   rules: {
     'no-console': 'off',
     'comma-dangle': 'off',
-    'max-len': 'off'
-  }
+    'max-len': 'off',
+    indent: 'off',
+  },
+  ignorePatterns: ['node_modules/', 'dist/', 'public/', 'static/'],
 };

.github/workflows/build_pages_native.yml

@@ -1,6 +1,6 @@
 name: build_test_deploy
 run-name: Build and test website (and deploy if needed)
-on: 
+on:
   push:
     branches:
       - main
@@ -20,38 +20,39 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'npm'
+          cache: "npm"
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
           hugo-version: '0.139.4' # See https://github.com/gohugoio/hugo/issues/13150
           extended: true
       - name: Build
-        run:  |
-            npm install
-            npm run gen-people
-            npm run gen-teams
-            npm run update-stats
-            hugo --minify
-            npm run postbuild
-#      - name: Test HTML code
-#        uses: Cyb3r-Jak3/[email protected]
-#        with:
-#          root: public
-#      - name: Upload HTML test report 
-#        uses: actions/upload-artifact@v3
-#        if: success() || failure() # Run even if we had an error
-#        with:
-#          name: html5validator_log
-#          path: log.log
+        run: |
+          npm install
+          npm run gen-people
+          npm run gen-teams
+          npm run update-stats
+          npm run cms-build
+          hugo --minify
+          npm run postbuild
+      #      - name: Test HTML code
+      #        uses: Cyb3r-Jak3/[email protected]
+      #        with:
+      #          root: public
+      #      - name: Upload HTML test report
+      #        uses: actions/upload-artifact@v3
+      #        if: success() || failure() # Run even if we had an error
+      #        with:
+      #          name: html5validator_log
+      #          path: log.log
       - name: Modify .htacess for staging
-        if:   ${{ github.ref == 'refs/heads/staging' }} 
+        if: ${{ github.ref == 'refs/heads/staging' }}
         run: |
-           sed -i 's#www\.divd#staging.divd#' public/.htaccess
-           sed -i 's#\-2024#-staging#g'       public/.htaccess
+          sed -i 's#www\.divd#staging.divd#' public/.htaccess
+          sed -i 's#\-2024#-staging#g'       public/.htaccess
       - name: rsync deploy staging
         uses: burnett01/[email protected]
-        if:   ${{ github.ref == 'refs/heads/staging' }} # && ( success() || failure() ) # Remove the && clause when a HTML check is flawless
+        if: ${{ github.ref == 'refs/heads/staging' }} # && ( success() || failure() ) # Remove the && clause when a HTML check is flawless
         with:
           switches: -avzr --delete
           path: public/
@@ -61,7 +62,7 @@ jobs:
           remote_key: ${{ secrets.DEPLOY_KEY }}
       - name: rsync deploy production
         uses: burnett01/[email protected]
-        if:   ${{ github.ref == 'refs/heads/main' }} # && ( success() || failure() ) # Remove the && clause when a HTML check is flawless
+        if: ${{ github.ref == 'refs/heads/main' }} # && ( success() || failure() ) # Remove the && clause when a HTML check is flawless
         with:
           switches: -avzr --delete
           path: public/
@@ -71,6 +72,6 @@ jobs:
           remote_key: ${{ secrets.DEPLOY_KEY }}
       - name: Deploy GitHub pages
         uses: JamesIves/github-pages-deploy-action@v4
-        if:   ( ${{ github.ref == 'refs/heads/main' }} || ${{ github.ref == 'refs/heads/staging' }} ) # && ( success() || failure() )  # Remove the && clause when a HTML check is flawless
+        if: ( ${{ github.ref == 'refs/heads/main' }} || ${{ github.ref == 'refs/heads/staging' }} ) # && ( success() || failure() )  # Remove the && clause when a HTML check is flawless
         with:
-          folder: admin # The folder the action should deploy.      
+          folder: admin # The folder the action should deploy.

.github/workflows/build_pages_no_push.yml

@@ -1,39 +1,40 @@
 name: build_and_test_no_deploy
 run-name: Build and test website, but not deploy
 on:
-    pull_request:
+  pull_request:
 
 jobs:
-    build_and_test_no_deploy:
-        runs-on: ubuntu-latest
-        steps:
-        - name: Checkout code
-          uses: actions/checkout@v3
-        - name: Setup Node
-          uses: actions/setup-node@v4
-          with:
-            node-version: 20
-            cache: 'npm'
-        - name: Setup Hugo
-          uses: peaceiris/actions-hugo@v2
-          with:
-            hugo-version: '0.139.4' # See https://github.com/gohugoio/hugo/issues/13150
-            extended: true
-        - name: Build
-          run:  |
-                npm install
-                npm run gen-people
-                npm run gen-teams
-                npm run update-stats
-                hugo --minify
-                npm run postbuild
-    #      - name: Test HTML code
-    #        uses: Cyb3r-Jak3/[email protected]
-    #        with:
-    #          root: public
-    #      - name: Upload HTML test report 
-    #        uses: actions/upload-artifact@v3
-    #        if: success() || failure() # Run even if we had an error
-    #        with:
-    #          name: html5validator_log
-    #          path: log.log
+  build_and_test_no_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "npm"
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: '0.139.4' # See https://github.com/gohugoio/hugo/issues/13150
+          extended: true
+      - name: Build
+        run: |
+          npm install
+          npm run gen-people
+          npm run gen-teams
+          npm run update-stats
+          npm run cms-build
+          hugo --minify
+          npm run postbuild
+  #      - name: Test HTML code
+  #        uses: Cyb3r-Jak3/[email protected]
+  #        with:
+  #          root: public
+  #      - name: Upload HTML test report
+  #        uses: actions/upload-artifact@v3
+  #        if: success() || failure() # Run even if we had an error
+  #        with:
+  #          name: html5validator_log
+  #          path: log.log

.gitignore

@@ -8,6 +8,7 @@
 public
 resources
 out
+dist
 
 # Package dependencies
 node_modules/

.prettierrc

@@ -4,7 +4,6 @@
       "files": ["*.html"],
       "options": {
         "parser": "go-template",
-        "goTemplateBracketSpacing": true,
         "bracketSameLine": true
       }
     },
@@ -15,5 +14,6 @@
         "singleQuote": true
       }
     }
-  ]
+  ],
+  "plugins": ["prettier-plugin-go-template"]
 }

README.md

@@ -1,11 +1,11 @@
 # DIVD website
-If you notice anything that might need improvement or is just not working for you, let us know. Feel free to give feedback by sumbitting an issue.  Bonuspoints for a detailled description and screenshots if possible. 
 
+If you notice anything that might need improvement or is just not working for you, let us know. Feel free to give feedback by sumbitting an issue. Bonuspoints for a detailled description and screenshots if possible.
 
 # Chocolate Requests
-A pull request is like a box of chocolate...
-The first 10 pull requests that genuinely improve the website will receive a box of chocolates. Pull requests related to spelling or typographical errors do not count. We all like a challenge right? 
 
+A pull request is like a box of chocolate...
+The first 10 pull requests that genuinely improve the website will receive a box of chocolates. Pull requests related to spelling or typographical errors do not count. We all like a challenge right?
 
 # Prerequisites
 
@@ -42,14 +42,7 @@ npm run gen-teams
 ## Local admin
 
 ```sh
-just admin
-open http://localhost:8000
-just admin-stop #when done
-
-# equivalent to:
-
-npx decap-server
-python3 -m http.server --directory ./admin/development
+npm run cms
 ```
 
 ## Test production version