Merge pull request 'increase cache busting' (!38) from fix/increase-cache-busting into main

Reviewed-on: pub-solar/pub.solar#38
Reviewed-by: teutat3s <teutat3s@noreply.git.pub.solar>

.drone.yml

@@ -1,33 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: build
-    when: 
-      event:
-        - push
-        - pull_request
-    image: denoland/deno:alpine-1.43.6
-    commands:
-      - deno task build
-
-  - name: publish
-    when: 
-      event:
-        - push
-      branch:
-        - main
-    image: appleboy/drone-scp
-    settings:
-      host: 10.7.6.1 # nachtigall.pub.solar
-      port: 22
-      username:
-        from_secret: ps_ssh_user
-      key:
-        from_secret: ps_ssh_key
-      source:
-        - ./_site/*
-      target: /srv/www/pub.solar/
-      overwrite: true
-      strip_components: 1

.forgejo/workflows/build.yml

@@ -0,0 +1,22 @@
+name: Build
+on:
+  pull_request:
+    branches: main
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Install Deno
+        uses: https://github.com/denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+
+      - name: Build step
+        run: "deno task build"
+

.forgejo/workflows/deploy.yml

@@ -0,0 +1,33 @@
+name: Deploy
+on:
+  push:
+    branches: main
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Install Deno
+        uses: https://github.com/denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+
+      - name: Build step
+        run: "deno task build"
+
+      - name: copy file via ssh key
+        uses: https://github.com/appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SCP_HOST }}
+          username: ${{ secrets.SCP_USERNAME }}
+          port: ${{ secrets.SCP_PORT }}
+          key: ${{ secrets.SCP_KEY }}
+          source: "_site/*"
+          target: /srv/www/pub.solar
+          strip_components: 1
+          rm: true

README.md

@@ -43,7 +43,7 @@ command was used to generate it.
 
 ### Deployment
 
-Our [Drone CI](https://ci.pub.solar/pub-solar/pub.solar) is configured to
+Our [Forgejo Actions CI](https://git.pub.solar/pub-solar/pub.solar/actions) is configured to
 deploy the `main` branch to the production website. To integrate any changes,
 first create a pull request, which will be reviewed. After merging it, the new
 version will get deployed automatically.

_data/cacheBust.yml

@@ -1 +1 @@
-'?v=5'
+'?v=6'

_data/hakken.yml

@@ -1,11 +1,4 @@
 dates:
-  - name: Winter 2025
-    id: winter-2025
-    theme: Winter Hakken
-    location:
-      en: Cologne @ [MiOM space](https://miom.space)
-      de: Köln @ [MiOM Kreativraum](https://miom.space)
-
   - name: Spring 2025
     id: spring-2025
     theme: Spring Hakken
@@ -27,6 +20,13 @@ dates:
       en: Cologne @ [MiOM space](https://miom.space)
       de: Köln @ [MiOM Kreativraum](https://miom.space)
 
+  - name: Winter 2026
+    id: winter-2026
+    theme: Winter Hakken
+    location:
+      en: Cologne @ [MiOM space](https://miom.space)
+      de: Köln @ [MiOM Kreativraum](https://miom.space)
+
 strings:
   when:
     en: 'When'

_includes/styles/logo.scss

@@ -13,6 +13,10 @@
     animation-play-state: paused;
     animation-iteration-count: infinite;
 
+    @media screen and (prefers-reduced-motion: reduce) {
+       animation-name: none !important;
+    }
+
     &:hover {
       animation-play-state: running;
     }
@@ -33,6 +37,7 @@
     height: 100%;
     border-radius: 50%;
   }
+
 }
 
 @keyframes rotate {

de/hakken.yml

@@ -32,7 +32,7 @@ content: |
 
   ## Was kostet das?
 
-  Die Teilnahme kostet nichts, aber wenn wir mal Essen bestellen oder beim Kiosk was holen wärs cool wenn du etwas dazu gibst. Eine kleine Spende an den Verein ist auch immer gerne gesehen.
+  Die Teilnahme kostet nichts, aber wenn wir mal Essen bestellen oder beim Kiosk was holen wärs cool wenn du etwas dazu gibst. Eine kleine Spende an den Verein ist auch immer gerne gesehen. Wir haben ein Spendenschwein, in das jeder etwas reinwerfen kann.
 
   ## Wo schlafe ich?
 

deno.json

@@ -13,5 +13,8 @@
     "types": [
       "lume/types.ts"
     ]
-  }
+  },
+  "unstable": [
+    "temporal"
+  ]
 }

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1717285511,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717602782,
-        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
+        "lastModified": 1744463964,
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
         "type": "github"
       },
       "original": {
@@ -36,14 +36,17 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1717284937,
-        "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
+        "lastModified": 1743296961,
+        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
       }
     },
     "root": {

hakken.yml

@@ -30,7 +30,7 @@ content: |
 
   ## What do I have to pay?
 
-  It's free, but if we order food or get some stuff at a kiosk it'd be cool if you chip in. A small donation to the association is also always welcome.
+  It's free, but if we order food or get some stuff at a kiosk it'd be cool if you chip in. A small donation to the association is also always welcome. We will have a little donation box going around.
 
   ## Where do I sleep?
 

import_map.json

@@ -1,8 +1,9 @@
 {
   "imports": {
-    "lume/": "https://deno.land/x/lume@v2.2.1/",
+    "lume/": "https://deno.land/x/lume@v2.5.3/",
     "react/jsx-runtime": "https://deno.land/x/lume@v2.2.1/deps/react_runtime.ts",
     "react": "https://deno.land/x/lume@v2.2.1/deps/react.ts",
-    "markdown-it": "https://jspm.dev/markdown-it@13.0.2"
+    "markdown-it": "https://jspm.dev/markdown-it@13.0.2",
+    "lume/jsx-runtime": "https://deno.land/x/ssx@v0.1.8/jsx-runtime.ts"
   }
 }