New design 🎉

.env

@@ -26,6 +26,7 @@ AUTHENTIK_API_TOKEN=
 AUTHENTIK_ENDPOINT=https://auth.dsek.se/api/v3
 AUTHENTIK_ENABLED=false # set to false to avoid syncing with authentik
 
+
 # FILE STORAGE
 # Used to connect to the MinIO file server.
 # Different types of files are stored in different buckets.
@@ -51,7 +52,7 @@ SHLINK_API_KEY=
 SHLINK_ENDPOINT=https://link.dsek.se
 
 # MEDIAWIKI
-PUBLIC_MEDIAWIKI_ENDPOINT=https://wiki.dsek.se/api.php
+PUBLIC_MEDIAWIKI_ENDPOINT=https://dwiki.se/api.php
 # Setup in https://wiki.dsek.se/wiki/Special:BotPasswords
 MEDIAWIKI_USERNAME=
 MEDIAWIKI_PASSWORD=
@@ -97,6 +98,9 @@ BOOKKEEPING_CC_TO_ADDRESS=skattm@dsek.se # comma separated list
 
 SYNC_PASSWORD=password123
 
+PUBLIC_OTLP_TRACE_EXPORT_URL=http://localhost:4318/v1/traces
+PUBLIC_OTLP_SERVICE_NAME="dsek.se"
+
 # SCHEDULER
 SCHEDULER_ENDPOINT=http://localhost:8080/schedule
 SCHEDULER_PASSWORD=supersecretpassword

.github/workflows/deploy-beta.yml

@@ -0,0 +1,54 @@
+name: Deploy beta
+permissions:
+  contents: read
+
+on:
+  push:
+    branches:
+      - new-design
+
+jobs:
+  website:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to image registry
+        id: registry-login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.IMAGEREPO_USERNAME }}
+          password: ${{ secrets.IMAGEREPO_PASSWORD }}
+          registry: registry.dsek.se
+      - name: Build and push website
+        uses: docker/build-push-action@v6
+        with:
+          build-args: |
+            "PUBLIC_MINIO_ENDPOINT=files-sandbox.dsek.se"
+            "PUBLIC_MINIO_PORT=443"
+            "PUBLIC_MINIO_USE_SSL=true"
+            "PUBLIC_BUCKETS_DOCUMENTS=documents"
+            "PUBLIC_BUCKETS_FILES=files"
+            "PUBLIC_BUCKETS_MEMBERS=members"
+            "VERSION=${{ github.ref_name }}"
+          push: true
+          tags: registry.dsek.se/web-beta/website:${{ github.ref_name }},registry.dsek.se/web-beta/website:latest
+
+  poppler:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to image registry
+        id: registry-login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.IMAGEREPO_USERNAME }}
+          password: ${{ secrets.IMAGEREPO_PASSWORD }}
+          registry: registry.dsek.se
+      - name: Build and push poppler
+        uses: docker/build-push-action@v6
+        with:
+          context: "{{defaultContext}}:poppler-server"
+          push: true
+          tags: registry.dsek.se/web-beta/poppler:${{ github.ref_name }},registry.dsek.se/web-beta/poppler:latest

.github/workflows/node.js.yml

@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: ["main"]
+    branches: ["main", "new-design"]
   pull_request:
-    branches: ["main"]
+    branches: ["main", "new-design"]
 
 env:
   HUSKY: 0
@@ -46,8 +46,10 @@ jobs:
       - run: pnpm i
       - run: pnpm prisma migrate deploy
       - run: pnpm snaplet-seed sync
-      - run: pnpm run lint
+      - run: pnpm run lint --max-warnings 0
       - run: pnpm run format
       - run: pnpm run test
-      - run: pnpm run check
+      - run: pnpm run check --fail-on-warnings
+      - run: pnpm run check-translations
       - run: pnpm run build
+      # When adding a step to the list above, please consider adding it to the `ci-check` script in `package.json`.

.vscode/settings.json

@@ -2,7 +2,7 @@
   "npm.packageManager": "pnpm",
   "editor.formatOnSave": true,
   "[svelte]": {
-    "editor.defaultFormatter": "svelte.svelte-vscode"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -21,6 +21,7 @@
     "class:(.+)", // for svelte class: directive
     ".*icon: \"(.+)\"", // for icon property in routes.ts
   ],
+  "tailwindCSS.experimental.configFile": "src/app.css",
   "workbench.editor.labelFormat": "short", // show filename + route in tab
   "explorer.compactFolders": false, // present folders in explorer as a tree
   "git.inputValidation": true,

README.md

@@ -41,7 +41,6 @@ This project is the main web page for the D-guild within TLTH, a non-profit orga
 
 ![builtwith][builtwith]
 [![svelte][svelte]][svelte-url]
-[![daisy][daisy]][daisy-url]
 [![typescript][typescript]][typescript-url]
 [![prisma][prisma]][prisma-url]
 [![zenstack][zenstack]][zenstack-url]
@@ -121,8 +120,6 @@ https://www.dsek.se/en/info/contact
 [typescript-url]: https://www.typescriptlang.org/
 [svelte]: https://img.shields.io/badge/svelte-FF3E00?style=for-the-badge&logo=svelte&logoColor=white
 [svelte-url]: https://svelte.dev/
-[daisy]: https://img.shields.io/badge/daisyui-107f65?style=for-the-badge&logo=data:image/svg+xml;base64,Cjxzdmcgd2lkdGg9IjEwMjQiIGhlaWdodD0iMTAyNCIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHJlY3QgeD0iMjU2IiB5PSI2NzAuNzIiIHdpZHRoPSI1MTIiIGhlaWdodD0iMjU2IiByeD0iMTI4IiBmaWxsPSIjMUFEMUE1Ii8+CjxjaXJjbGUgY3g9IjUxMiIgY3k9IjM1My4yOCIgcj0iMjU2IiBmaWxsPSJ3aGl0ZSIvPgo8Y2lyY2xlIGN4PSI1MTIiIGN5PSIzNTMuMjgiIHI9IjI2MSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLW9wYWNpdHk9IjAuMiIgc3Ryb2tlLXdpZHRoPSIxMCIvPgo8Y2lyY2xlIGN4PSI1MTIiIGN5PSIzNTMuMjgiIHI9IjExNC42ODgiIGZpbGw9IiNGRjk5MDMiLz4KPC9zdmc+Cg==
-[daisy-url]: https://daisyui.com/
 [expo]: https://img.shields.io/badge/expo-000020?style=for-the-badge&logo=expo&logoColor=white
 [expo-url]: https://expo.dev/
 [prisma]: https://img.shields.io/badge/prisma-2D3748?style=for-the-badge&logo=prisma&logoColor=white

components.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://shadcn-svelte.com/schema.json",
+  "tailwind": {
+    "css": "src/app.css",
+    "baseColor": "zinc"
+  },
+  "aliases": {
+    "components": "$lib/components",
+    "utils": "$lib/utils",
+    "ui": "$lib/components/ui",
+    "hooks": "$lib/hooks",
+    "lib": "$lib"
+  },
+  "typescript": true,
+  "registry": "https://shadcn-svelte.com/registry"
+}

dev/check_translations.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+tmp="$(mktemp -d)"
+trap 'rm -rf "$tmp"' EXIT
+
+jq --raw-output 'keys[]' src/translations/en.json >"$tmp/en-keys"
+jq --raw-output 'keys[]' src/translations/sv.json >"$tmp/sv-keys"
+
+if cmp --quiet "$tmp/en-keys" "$tmp/sv-keys"; then
+    exit 0
+fi
+
+only_en_keys="$(comm -23 "$tmp/en-keys" "$tmp/sv-keys")"
+only_sv_keys="$(comm -13 "$tmp/en-keys" "$tmp/sv-keys")"
+
+if [[ -n "$only_en_keys" ]]; then
+    printf 'The following translation keys are only set in English:\n\n%s\n\n' "$only_en_keys"
+fi
+
+if [[ -n "$only_sv_keys" ]]; then
+    printf 'The following translation keys are only set in Swedish:\n\n%s\n\n' "$only_sv_keys"
+fi
+
+exit 1

eslint.config.mjs

@@ -6,6 +6,8 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import js from "@eslint/js";
 import { FlatCompat } from "@eslint/eslintrc";
+import svelte from "eslint-plugin-svelte";
+import eslintComments from "@eslint-community/eslint-plugin-eslint-comments/configs";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -33,15 +35,15 @@ export default [
       "**/yarn.lock",
     ],
   },
+  js.configs.recommended,
+  eslintComments.recommended,
   ...compat.extends(
-    "eslint:recommended",
-    "plugin:eslint-comments/recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:@typescript-eslint/stylistic",
-    "plugin:svelte/recommended",
-    "plugin:svelte/prettier",
     "prettier",
   ),
+  ...svelte.configs.recommended,
+  ...svelte.configs.prettier,
   {
     plugins: {
       "@typescript-eslint": typescriptEslint,
@@ -67,7 +69,7 @@ export default [
     },
 
     rules: {
-      "eslint-comments/require-description": "warn",
+      "@eslint-community/eslint-comments/require-description": "warn",
 
       "no-restricted-imports": [
         "warn",
@@ -78,16 +80,6 @@ export default [
               message:
                 "\nIt looks like you're importing from a different subtree. Consider whether the imported code should really be shared. Suggestions:\n1) Write new code specific to your usage.\n2) Move the imported code to a shared location, e.g. a parent folder.\n3) Verify that you're using the correct path alias, e.g. $lib.",
             },
-            {
-              importNamePattern: "^(goto|redirect)",
-              group: [
-                "$app/navigation",
-                "sveltekit-flash-message/server",
-                "@sveltejs/kit",
-              ],
-              message:
-                "Use the goto and redirect wrappers from $lib/utils/redirect instead",
-            },
             {
               importNamePattern: "^(superForm)",
               group: ["sveltekit-superforms", "sveltekit-superforms/client"],
@@ -106,6 +98,9 @@ export default [
           default: "array-simple",
         },
       ],
+
+      // TODO: turn on after upgrading to SvelteKit >= 2.26
+      "svelte/no-navigation-without-resolve": ["warn", { ignoreLinks: true }],
     },
   },
   {