Merge pull request 'Mergin dev - new header, updated servants' (#29) from dev into main

Reviewed-on: #29

.forgejo/workflows/build_preview.yml

@@ -0,0 +1,70 @@
+on:
+  push:
+    tags:
+      - '[0-9]+\.[0-9]+\.[0-9]+pre[0-9]+'
+
+jobs:
+  checking:
+    runs-on: docker
+    container: node:lts
+    steps:
+      - name: Checkout source code
+        uses: https://code.forgejo.org/actions/checkout@v3
+      - name: Install packages
+        run: npm install
+      - name: Run astro check (linting +  static analysis)
+        run: npm run astro check
+
+  build-site:
+    needs: [checking]
+    if: success()
+    runs-on: dind
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: forgejo.neshweb.net
+          username: ${{ secrets.FORGEJO_USERNAME }}
+          password: ${{ secrets.FORGEJO_TOKEN }}
+      - name: Push to Package Registry
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: forgejo.neshweb.net/firq/firq-dev-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/firq-dev-website:preview
+
+  publish:
+    needs: [build-site]
+    if: success()
+    runs-on: docker
+    steps:
+      - name: Release New Version
+        uses: https://code.forgejo.org/actions/forgejo-release@v1
+        with:
+          direction: upload
+          url: https://forgejo.neshweb.net
+          release-dir: release
+          token: ${{ secrets.FORGEJO_TOKEN }}
+          tag: ${{  github.ref_name }}
+          prerelease: true
+
+  # doesn't work atm
+  # unlighthouse:
+  #   needs: [publish]
+  #   if: success()
+  #   runs-on: docker
+  #   container: registry.gitlab.com/gitlab-ci-utils/lighthouse:latest
+  #   services:
+  #     website:
+  #       image: forgejo.neshweb.net/firq/firq-dev-website:preview
+  #   steps:
+  #     - name: Install Dependencies
+  #       run: npm install @unlighthouse/cli puppeteer
+  #     - name: Run unlighthouse
+  #       run: node_modules/.bin/unlighthouse-ci
+  #     - name: Upload reports
+  #       uses: actions/upload-artifact@v3
+  #       with:
+  #         name: unlighthouse-reports
+  #         path: unlighthouse-reports/

.forgejo/workflows/build_release.yml

@@ -0,0 +1,49 @@
+on:
+  push:
+    tags:
+      - '[0-9]+\.[0-9]+\.[0-9]+'
+
+jobs:
+  checking:
+    runs-on: docker
+    container: node:lts
+    steps:
+      - name: Checkout source code
+        uses: https://code.forgejo.org/actions/checkout@v3
+      - name: Install packages
+        run: npm install
+      - name: Run astro check (linting +  static analysis)
+        run: npm run astro check
+
+  build-site:
+    needs: [checking]
+    if: success()
+    runs-on: dind
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: forgejo.neshweb.net
+          username: ${{ secrets.FORGEJO_USERNAME }}
+          password: ${{ secrets.FORGEJO_TOKEN }}
+      - name: Push to Package Registry
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: forgejo.neshweb.net/firq/firq-dev-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/firq-dev-website:latest
+
+  release:
+    needs: [build-site]
+    if: success()
+    runs-on: docker
+    steps:
+      - name: Release New Version
+        uses: https://code.forgejo.org/actions/forgejo-release@v1
+        with:
+          direction: upload
+          url: https://forgejo.neshweb.net
+          release-dir: release
+          token: ${{ secrets.FORGEJO_TOKEN }}
+          tag: ${{  github.ref_name }}

.forgejo/workflows/linting.yml

@@ -0,0 +1,16 @@
+on:
+  push:
+    branches:
+      - "**"
+
+jobs:
+  checking:
+    runs-on: docker
+    container: node:lts
+    steps:
+      - name: Checkout source code
+        uses: https://code.forgejo.org/actions/checkout@v3
+      - name: Install packages
+        run: npm install
+      - name: Run astro check (linting +  static analysis)
+        run: npm run astro check

.forgejo/workflows/unlighthouse.yml

@@ -0,0 +1,98 @@
+on:
+  push:
+    tags:
+      - '[0-9]+\.[0-9]+\.[0-9]+unlighthouse[0-9]+'
+      - '[0-9]+\.[0-9]+\.[0-9]+ulh[0-9]+'
+
+jobs:
+  unlighthouse:
+    runs-on: docker
+    container: forgejo.neshweb.net/ci-docker-images/unlighthouse:latest
+    steps:
+      - name: Checkout repository
+        uses: https://code.forgejo.org/actions/checkout@v3 
+      - name: Run unlighthouse
+        run: unlighthouse-ci --site "https://preview.firq.dev/"
+      - name: Prepare artifacts
+        run: cp serve.json unlighthouse-reports
+      - name: Upload reports
+        uses: actions/upload-artifact@v3
+        with:
+          name: unlighthouse-reports
+          path: unlighthouse-reports/
+
+  deploy-unlighthouse-files:
+    needs: [ unlighthouse ]
+    if: success()
+    runs-on: docker
+    env: 
+      DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+      DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+    steps:
+      - name: Install and update ssh + rsync
+        run: |
+            which rsync || ( apt update -y && apt install rsync -y)
+            which ssh-agent || ( apt update -y && apt install openssh-client -y)            
+      - name: Downloading static site artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: unlighthouse-reports
+          path: public
+      - name: Install SSH Key
+        uses: https://github.com/shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          known_hosts: unnecessary
+      - name: Adding Known Hosts
+        run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
+      - name: Stop screen session, delete old files
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            screen -X -S firq_dev-unlighthouse kill
+            rm -r -f firq_dev/unlighthouse/*            
+      - name: Copy files using rsync
+        run: rsync -az --stats public/* ${{ env.DEPLOY_USER }}@${{ env.DEPLOY_HOST }}:~/firq_dev/unlighthouse
+      - name: Check files on deploy target
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd firq_dev
+            find unlighthouse -maxdepth 1 -printf "%p\n"            
+
+  deploy-unlighthouse-site:
+    needs: [ deploy-unlighthouse-files ]
+    if: success()
+    runs-on: docker
+    env: 
+      DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+      DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+    steps:
+      - name: Install and update ssh + rsync
+        run: |
+            which rsync || ( apt update -y && apt install rsync -y)
+            which ssh-agent || ( apt update -y && apt install openssh-client -y)            
+      - name: Install SSH Key
+        uses: https://github.com/shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          known_hosts: unnecessary
+      - name: Adding Known Hosts
+        run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
+      - name: Start new screen session
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            PATH="$HOME/.local/bin:$PATH"
+            screen -ls | grep 'firq_dev-unlighthouse' | awk '{print $1}' | xargs -I % -t screen -X -S % quit
+            cd firq_dev
+            screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p ${{ secrets.UNLIGHTHOUSE_DEPLOY_PORT }}   

.gitlab-ci.yml

@@ -2,6 +2,7 @@ stages:
   - validate
   - build
   - deploy
+  - benchmark
   - post_deploy
   - scripts
 
@@ -60,11 +61,11 @@ deploy-site:
     - echo "Getting artifacts"
     - ls public
     - echo "Stopping screen session, cleaning"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S website-firq-npx kill; rm -r -f public/*;"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill; rm -r -f firq_dev/public/*;"
     - echo "Copying to proxmox machine"
-    - rsync -az --stats public $DEPLOY_USER@$DEPLOY_HOST:~/.
+    - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/public
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "find maintenance public -maxdepth 1 -printf '%p\n'; screen -S website-firq-npx -dm npx serve public/ -p 9000 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find maintenance public -maxdepth 1 -printf "%p\n"; screen -S firq_dev-public -dm serve public/ -p 9000'
     - echo "Website is up on https://firq.dev/"
 
 deploy-testing:
@@ -79,13 +80,52 @@ deploy-testing:
     - echo "Getting artifacts"
     - ls public
     - echo "Stopping screen session, cleaning"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S staging-firq-npx kill; rm -r -f staging/*;"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-staging kill; rm -r -f firq_dev/staging/*;"
     - echo "Copying to proxmox machine"
-    - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/staging
+    - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/staging
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "find staging -maxdepth 1 -printf '%p\n'; screen -S staging-firq-npx -dm npx serve staging/ -p 9100 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find staging -maxdepth 1 -printf "%p\n"; screen -S firq_dev-staging -dm serve staging/ -p 9100'
     - echo "Staging environment is up!"
 
+unlighthouse:
+  image: registry.gitlab.com/gitlab-ci-utils/lighthouse:latest
+  stage: benchmark
+  when: manual
+  except:
+    - main
+    - tags
+  before_script:
+    - npm install @unlighthouse/cli puppeteer
+    - mkdir unlighthouse-reports
+  script:
+    - node_modules/.bin/unlighthouse-ci
+    - cp public/serve.json unlighthouse-reports
+  artifacts:
+    paths:
+      - unlighthouse-reports
+    expire_in: 1 day
+
+unlighthouse-publish:
+  stage: benchmark
+  when: on_success
+  needs:
+    - unlighthouse
+  except:
+    - tags
+    - main
+  before_script:
+    - *ssh_default
+  script:
+    - echo "Getting artifacts"
+    - ls unlighthouse-reports
+    - echo "Stopping screen session, cleaning"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-unlighthouse kill; rm -r -f firq_dev/unlighthouse/*;"
+    - echo "Copying to proxmox machine"
+    - rsync -az --stats unlighthouse-reports/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/unlighthouse
+    - echo "Restarting screen session"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find unlighthouse -maxdepth 1 -printf "%p\n"; screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p 9101'
+    - echo "Unlighthouse results are up!"
+
 success_notification:
   stage: post_deploy
   before_script:
@@ -123,9 +163,9 @@ maintenance-mode:
     - main
   script:
     - echo "Stopping screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S website-firq-npx kill;"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill;" || true
     - echo "Enabeling maintenance mode"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S website-firq-npx -dm npx serve maintenance/ -p 9000 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000'
     - echo "Maintenance Website is up on https://firq.dev/"
 
 redeploy-site:
@@ -139,9 +179,9 @@ redeploy-site:
     - *ssh_default
   script:
     - echo "Stopping screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S website-firq-npx kill" || true
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill" || true
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S website-firq-npx -dm npx serve public/ -p 9000 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-public -dm serve firq_dev/public/ -p 9000'
     - echo "Website is up on https://firq.dev/"
 
 redeploy-staging:
@@ -154,9 +194,24 @@ redeploy-staging:
     - *ssh_default
   script:
     - echo "Stopping screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S staging-firq-npx kill" || true
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-staging kill" || true
     - echo "Restarting screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S staging-firq-npx -dm npx serve staging/ -p 9100 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-staging -dm serve firq_dev/staging/ -p 9100'
+    - echo "Staging environment is up!"
+
+redeploy-unlighthouse:
+  stage: scripts
+  when: manual
+  except:
+    - main
+    - tags
+  before_script:
+    - *ssh_default
+  script:
+    - echo "Stopping screen session"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-unlighthouse kill" || true
+    - echo "Restarting screen session"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-unlighthouse -dm serve firq_dev/unlighthouse/ -p 9101'
     - echo "Staging environment is up!"
 
 maintenance-deploy:
@@ -169,7 +224,7 @@ maintenance-deploy:
     - *ssh_default
   script:
     - echo "Stopping screen session"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S website-firq-npx kill;" || true
+    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill;" || true
     - echo "Enabeling maintenance mode"
-    - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S website-firq-npx -dm npx serve maintenance/ -p 9000 -c serve.json"
+    - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000'
     - echo "Maintenance Website is up on https://firq.dev/"

.old.gitlab-ci.yml

@@ -1,14 +0,0 @@
-image: node:lts
-pages:
-  cache:
-    paths:
-      - node_modules/
-  script:
-    - npm install
-    - npm run build
-  artifacts:
-    paths:
-      - public
-    expire_in: 3 days
-  only:
-    - main

.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true,
+        "**/Thumbs.db": true,
+        "**/__pycache__": true
+    },
+    "hide-files.files": []
+}

Dockerfile

@@ -0,0 +1,16 @@
+FROM node:lts AS build
+WORKDIR /app
+COPY . .
+RUN npm i
+RUN npm run build
+
+FROM forgejo.neshweb.net/ci-docker-images/website-serve:latest AS runtime
+
+COPY --from=build /app/dist /public
+COPY --from=build /app/serve.json /public/serve.json
+RUN rm -r /public/data/
+
+ENV PORT 8081
+EXPOSE 8081
+
+CMD [ "serve", "public/", "-p", "8081" ]

astro.config.mjs

@@ -1,14 +1,14 @@
 import { defineConfig } from 'astro/config';
 
-// https://astro.build/config
 import sitemap from "@astrojs/sitemap";
+import mdx from "@astrojs/mdx";
 
 // https://astro.build/config
 export default defineConfig({
   sitemap: true,
   base: '/',
-  outDir: 'public',
+  outDir: 'dist',
   publicDir: 'static',
   site: 'https://firq.dev/',
-  integrations: [sitemap()]
+  integrations: [sitemap(), mdx()]
 });

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@firq/fgosite",
 	"type": "module",
-	"version": "0.1.3",
+	"version": "0.1.27",
 	"private": true,
 	"scripts": {
 		"dev": "astro dev",
@@ -11,8 +11,18 @@
 		"astro": "astro"
 	},
 	"dependencies": {
-		"@astrojs/sitemap": "^1.2.1",
-		"astro": "^2.8.0",
-		"iconoir": "^6.1.0"
-	}
+		"@astro-community/astro-embed-youtube": "^0.4.3",
+		"@astrojs/check": "^0.3.3",
+		"@astrojs/mdx": "^2.0.3",
+		"@astrojs/sitemap": "^3.0.3",
+		"astro": "^4.2.1",
+		"autoprefixer": "^10.4.16",
+		"iconoir": "^7.2.0",
+		"postcss-preset-env": "^9.3.0",
+		"typescript": "^5.3.3"
+	},
+	"browserslist": [
+		"last 2 versions",
+		">0.5% and not dead"
+	]
 }

postcss.config.cjs

@@ -0,0 +1,13 @@
+module.exports = {
+  plugins: {
+    "postcss-preset-env": {
+      autoprefixer: { flexbox: "no-2009" },
+      stage: 2,
+      features: {
+        "custom-properties": false,
+        "custom-media-queries": true,
+        "nesting-rules": true
+      }
+    }
+  }
+};

serve.json

@@ -1,14 +1,28 @@
 {
-  "directoryListing": ["/!assets/**"],
+  "cleanUrls": true,
+  "directoryListing": false,
+  "etag": true,
   "headers": [
     {
-      "source": "**/*.@(jpg|jpeg|gif|png|webp)",
-      "headers": [
-        {
-          "key": "Cache-Control",
-          "value": "no-cache"
-        }
-      ]
+      "source" : "**/*.html",
+      "headers" : [{
+        "key" : "Cache-Control",
+        "value" : "no-cache"
+      }]
+    },
+    {
+      "source" : "**/*.css",
+      "headers" : [{
+        "key" : "Cache-Control",
+        "value" : "max-age=31536000"
+      }]
+    },
+    {
+      "source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
+      "headers" : [{
+        "key" : "Cache-Control",
+        "value" : "max-age=31536000"
+      }]
     }
   ]
 }