.dockerignore

@@ -1,4 +1,3 @@
 public/env.sample.js
-.pnpm-store
-.yarn
-.pnp.*
+public/workbox-*.js
+public/workbox-*.js.map

.drone.yml

@@ -0,0 +1,84 @@
+---
+kind: secret
+name: docker_username
+get:
+  path: odit-registry-builder
+  name: username
+
+---
+kind: secret
+name: docker_password
+get:
+  path: odit-registry-builder
+  name: password
+
+---
+kind: secret
+name: git_ssh
+get:
+  path: odit-git-bot
+  name: sshkey
+
+---
+kind: pipeline
+type: kubernetes
+name: build:dev
+
+steps:
+  - name: run full license export
+    depends_on: ["clone"]
+    image: node:alpine
+    commands:
+      - yarn
+      - yarn licenses:export
+  - name: push new licenses file to repo
+    depends_on: ["run full license export"]
+    image: appleboy/drone-git-push
+    settings:
+      branch: dev
+      commit: true
+      commit_message: new license file version [CI SKIP]
+      author_email: bot@odit.services
+      remote: git@git.odit.services:lfk/frontend.git
+      ssh_key:
+        from_secret: git_ssh
+  - name: build dev
+    image: plugins/docker
+    depends_on: [clone]
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: registry.odit.services/lfk/frontend
+      tags:
+        - dev
+      registry: registry.odit.services
+      mtu: 1000
+trigger:
+  branch:
+    - dev
+  event:
+    - push
+
+---
+kind: pipeline
+type: kubernetes
+name: build:tags
+steps:
+  - name: build $DRONE_TAG
+    image: plugins/docker
+    depends_on: [clone]
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: registry.odit.services/lfk/frontend
+      tags:
+        - '${DRONE_TAG}'
+      registry: registry.odit.services
+      mtu: 1000
+trigger:
+  event:
+  - tag

.gitea/workflows/release.yaml

@@ -1,33 +0,0 @@
-name: Build release images
-on:
-  push:
-    tags:
-      - "*.*.*"
-
-jobs:
-  build-container:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 19
-      - run: npm i -g pnpm@10.8 && pnpm i
-      - run: pnpm licenses:export
-      - name: Login to registry
-        uses: docker/login-action@v3
-        with:
-          registry: registry.odit.services
-          username: ${{ vars.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          tags: |
-            ${{ vars.REGISTRY }}/lfk/frontend:${{ github.ref_name }}
-          platforms: linux/amd64,linux/arm64

.gitignore

@@ -1,8 +1,11 @@
 node_modules
+build
+package-lock.json
+yarn.lock
 *.map
 public/env.js
+public/sw.js
+public/index.html
+public/workbox-*.js
+svelte.config.js
 public/index.html
-/dist
-.pnpm-store
-.yarn
-.pnp.*

.vscode/extensions.json

@@ -1,12 +1,13 @@
 {
-  "recommendations": [
-    "2gua.rainbow-brackets",
-    "christian-kohler.npm-intellisense",
-    "remimarsal.prettier-now",
-    "svelte.svelte-vscode",
-    "lokalise.i18n-ally",
-    "fivethree.vscode-svelte-snippets",
-    "voorjaar.windicss-intellisense"
-  ],
-  "unwantedRecommendations": ["antfu.i18n-ally"]
-}
+    "recommendations": [
+        "2gua.rainbow-brackets",
+        "christian-kohler.npm-intellisense",
+        "remimarsal.prettier-now",
+        "svelte.svelte-vscode",
+        "lokalise.i18n-ally",
+        "fivethree.vscode-svelte-snippets"
+    ],
+    "unwantedRecommendations": [
+        "antfu.i18n-ally"
+    ]
+}

.vscode/i18n-ally-custom-framework.yml

@@ -1,7 +1,7 @@
 languageIds:
-  - javascript
-  - svelte
-  - html
+    - javascript
+    - svelte
+    - html
 monopoly: false
 refactorTemplates:
-  - "{$_('$1')}"
+    - "{$_('$1')}"

.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-  "i18n-ally.localesPaths": "src/locales",
-  "i18n-ally.keystyle": "nested",
-  "windicss.enableCodeFolding": false
-}
+    "i18n-ally.localesPaths": "src/locales",
+    "i18n-ally.keystyle": "nested"
+}

Dockerfile

@@ -1,16 +1,18 @@
-FROM registry.odit.services/hub/library/node:23.10.0-alpine3.21 AS build
-ARG NPM_REGISTRY_URL=https://registry.npmjs.org
+FROM node:15.5.1-alpine3.12
 WORKDIR /app
-
-COPY package.json pnpm-lock.yaml vite.config.js index.html ./
-RUN npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@10.8
-RUN mkdir /pnpm && pnpm config set store-dir /pnpm && pnpm i
-
+RUN npm i -g pnpm
+COPY package.json ./
+RUN pnpm i
+COPY package.json *.config.js workbox-config.js template-copy.js index.template.html s-config.template.js ./
 COPY src ./src
 COPY public ./public
-RUN pnpm build
-
+RUN pnpm run build
 # final image
-FROM registry.odit.services/library/nginx-brotli:3.15 AS final
-COPY --from=build /app/dist /usr/share/nginx/html
+FROM alpine
+COPY --from=0 /app/build /app
+RUN rm -rf /app/build/_dist_/components
+RUN rm -rf /app/build/_dist_/locales
+RUN rm -rf /app/build-manifest.json
+FROM fholzer/nginx-brotli:v1.19.1
+COPY --from=1 /app /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf

README.md

@@ -1,27 +0,0 @@
-# @odit/lfk-frontend
-
-## ✒️ Overview
-
-This is an API client for [https://git.odit.services/lfk/backend](@lfk/backend)
-
-This application is intended for use by admin users/ members only.
-
-## 🚀 Getting Started
-
-```
-pnpm i
-```
-
-## Development
-
-```
-pnpm dev
-/
-pnpm dev --open
-```
-
-## Build
-
-```
-pnpm build
-```

docker-compose.yml

@@ -1,8 +1,8 @@
 version: "3"
 services:
-  httpd:
-    build: .
-    volumes:
-      - ./public/env.sample.js:/usr/share/nginx/html/env.js
-    ports:
-      - 4050:80
+    httpd:
+        build: .
+        volumes:
+            - ./public/env.sample.js:/usr/share/nginx/html/env.js
+        ports:
+            - 4050:80

env.sample.js

@@ -0,0 +1,7 @@
+const config = {
+	baseurl: 'https://dev.lauf-fuer-kaya.de',
+	documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe',
+	fallback_username: 'admin',
+	fallback_password: '72fpTzsev4xUu78QPs2FCbwZ3',
+	prefersHashRouting: true
+};

index.html

@@ -1,22 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="/favicon.png" />
-    <link rel="manifest" href="/manifest.webmanifest" />
-    <link rel="apple-touch-icon" href="/lfk-logo.png" />
-    <meta name="theme-color" content="#FFFFFF" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-    <meta name="description" content="Lauf Für Kaya! - Admin" />
-    <title>Lauf für Kaya! - Admin</title>
-  </head>
-
-  <body>
-    <span style="display: none; visibility: hidden" id="buildinfo"
-      >RELEASE_INFO-1.14.2-RELEASE_INFO</span
-    >
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <script src="/env.js"></script>
-    <script type="module" src="/src/main.js"></script>
-  </body>
-</html>

index.template.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <link rel="icon" href="/favicon.png" />
+  <link rel="manifest" href="/manifest.webmanifest">
+  <link rel="apple-touch-icon" href="/lfk-logo.png">
+  <meta name="theme-color" content="#FFFFFF">
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="description" content="Lauf Für Kaya! - Admin" />
+  <title>Lauf für Kaya! - Admin</title>
+  __TAILWIND_INSERT__
+</head>
+
+<body>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.8.1-RELEASE_INFO</span>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <script src="/env.js"></script>
+  <script defer type="module" src="/_dist_/index.js"></script>
+</body>
+
+</html>

nginx.conf

@@ -6,20 +6,6 @@ http {
     server {
         error_page 404 /index.html;
         root /usr/share/nginx/html;
-        location /assets {
-            expires 1y;
-            log_not_found off;
-            access_log off;
-        }
-        location = /index.html {
-            add_header Cache-Control 'no-store';
-        }
-        location = / {
-            add_header Cache-Control 'no-store';
-        }
-        location = /env.js {
-            add_header Cache-Control 'no-store';
-        }
         location / {
             try_files $uri $uri/ /index.html;
         }

order.js

@@ -1,18 +1,16 @@
-import fs from "fs";
+const fs = require('fs');
 // get all language files
-const files = fs.readdirSync("./src/locales/");
+const files = fs.readdirSync('./src/locales/');
 files.forEach((f) => {
-  // read file as object
-  const unordered = JSON.parse(fs.readFileSync(`src/locales/${f}`));
-  // order object by keys alpabetically A-Z
-  const ordered = Object.keys(unordered)
-    .sort()
-    .reduce((obj, key) => {
-      obj[key] = unordered[key];
-      return obj;
-    }, {});
-  // format output as json for commit diff compatibility
-  const out = JSON.stringify(ordered, 0, 4);
-  // write output file
-  fs.writeFileSync(`src/locales/${f}`, out);
+	// read file as object
+	const unordered = JSON.parse(fs.readFileSync(`src/locales/${f}`));
+	// order object by keys alpabetically A-Z
+	const ordered = Object.keys(unordered).sort().reduce((obj, key) => {
+		obj[key] = unordered[key];
+		return obj;
+	}, {});
+	// format output as json for commit diff compatibility
+	const out = JSON.stringify(ordered, 0, 4);
+	// write output file
+	fs.writeFileSync(`src/locales/${f}`, out);
 });

package.json

@@ -1,67 +1,61 @@
-{
-  "name": "@odit/lfk-frontend",
-  "version": "1.14.2",
-  "type": "module",
-  "scripts": {
-    "i18n-order": "node order.js",
-    "dev": "vite",
-    "format": "prettier --write --plugin-search-dir=. .",
-    "build": "vite build",
-    "release": "release-it --only-version",
-    "licenses:export": "license-exporter --json -o public"
-  },
-  "license": "CC-BY-NC-SA-4.0",
-  "devDependencies": {
-    "@odit/license-exporter": "0.2.0",
-    "@sveltejs/vite-plugin-svelte": "2.1.1",
-    "@types/papaparse": "^5.3.15",
-    "@types/underscore": "^1.13.0",
-    "auto-changelog": "2.5.0",
-    "prettier": "3.5.3",
-    "prettier-plugin-svelte": "3.3.3",
-    "release-it": "17.10.0",
-    "svelte-select": "3.17.0",
-    "vite": "6.3.2",
-    "vite-plugin-mkcert": "^1.17.8"
-  },
-  "release-it": {
-    "git": {
-      "commit": true,
-      "requireCleanWorkingDir": false,
-      "commitMessage": "chore(release): ${version}",
-      "push": true,
-      "tag": true,
-      "tagName": "${version}",
-      "tagAnnotation": "${version}"
-    },
-    "npm": {
-      "publish": false
-    },
-    "hooks": {
-      "after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node versionbuilder.js  && git add index.html && node order.js  && git add src/locales"
-    }
-  },
-  "dependencies": {
-    "@bwip-js/browser": "^4.6.0",
-    "@fontsource/athiti": "^5.2.5",
-    "@odit/lfk-client-js": "1.2.7",
-    "@paralleldrive/cuid2": "2.2.2",
-    "@tailwindcss/vite": "^4.1.4",
-    "@tanstack/svelte-table": "8.9.1",
-    "check-password-strength": "2.0.10",
-    "html5-qrcode": "^2.3.8",
-    "localforage": "1.10.0",
-    "papaparse": "^5.5.2",
-    "svelte": "3.58.0",
-    "svelte-french-toast": "1.2.0",
-    "svelte-i18n": "4.0.1",
-    "tailwindcss": "^4.1.4",
-    "tinro": "0.6.12",
-    "underscore": "^1.13.7",
-    "validator": "13.15.0",
-    "xlsx": "0.18.5"
-  },
-  "volta": {
-    "node": "20.0.0"
-  }
-}
+{
+	"name": "@odit/lfk-frontend",
+	"version": "0.8.1",
+	"scripts": {
+		"i18n-order": "node order.js",
+		"dev:all": "yarn prebuild && snowpack dev",
+		"dev": "cross-env NODE_ENV_ODIT=development_fast node template-copy.js && yarn build:sw && snowpack dev",
+		"build": "yarn prebuild && snowpack build",
+		"prebuild": "cross-env NODE_ENV_ODIT=production node template-copy.js && yarn build:sw",
+		"build:sw": "workbox generateSW workbox-config.js",
+		"release": "release-it",
+		"licenses:export": "license-exporter --json -o public"
+	},
+	"license": "CC-BY-NC-SA-4.0",
+	"dependencies": {
+		"@odit/lfk-client-js": "0.6.4",
+		"csvtojson": "^2.0.10",
+		"gridjs": "3.3.0",
+		"localforage": "1.9.0",
+		"marked": "^2.0.1",
+		"svelte-focus-trap": "1.0.1",
+		"svelte-i18n": "3.3.7",
+		"svelte-select": "^3.17.0",
+		"tailwindcss": "2.0.3",
+		"tinro": "0.6.1",
+		"toastify-js": "1.9.3",
+		"validator": "13.5.2",
+		"xlsx": "^0.16.9"
+	},
+	"devDependencies": {
+		"@odit/license-exporter": "^0.0.11",
+		"@snowpack/plugin-svelte": "3.5.2",
+		"auto-changelog": "^2.2.1",
+		"autoprefixer": "10.2.5",
+		"cross-env": "^7.0.3",
+		"postcss": "8.2.8",
+		"postcss-load-config": "3.0.1",
+		"release-it": "^14.4.1",
+		"snowpack": "3.0.13",
+		"svelte": "3.35.0",
+		"svelte-preprocess": "4.6.9",
+		"workbox-cli": "6.1.2"
+	},
+	"release-it": {
+		"git": {
+			"commit": true,
+			"requireCleanWorkingDir": false,
+			"commitMessage": "🚀RELEASE v${version}",
+			"push": false,
+			"tag": true,
+			"tagName": null,
+			"tagAnnotation": "v${version}"
+		},
+		"npm": {
+			"publish": false
+		},
+		"hooks": {
+			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node versionbuilder.js  && git add index.template.html && node order.js  && git add src/locales"
+		}
+	}
+}

pnpm-workspace.yaml

@@ -1,3 +0,0 @@
-onlyBuiltDependencies:
-  - es5-ext
-  - esbuild

public/env.sample.js

@@ -1,12 +1,6 @@
 const config = {
-  baseurl: "http://localhost:4010",
-  baseurl_selfservice: "http://localhost:5174",
-  baseurl_documentserver: "http://localhost:4010/documents",
-  documentserver_key:
-    "NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe",
-  // optional
-  default_username: "demo",
-  default_password: "demo",
-  prefersHashRouting: true,
+	baseurl: 'http://localhost:4010',
+	documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe'
+	// optional
+	prefersHashRouting: true
 };
-window.config = config;

public/imprint_en.md

@@ -0,0 +1 @@
+Nostrud tempor dolor aute ea excepteur aute mollit elit eiusmod exercitation. Magna laborum pariatur adipisicing pariatur cupidatat exercitation duis aliquip pariatur sint exercitation deserunt labore. Consectetur id laboris dolore nostrud do velit ipsum. Eu laboris velit do commodo ad ea sint ex cillum. Cillum ipsum qui eiusmod laborum mollit sunt dolore incididunt. Cillum sunt culpa veniam voluptate et qui ut magna anim occaecat ut mollit dolor. Duis irure proident eu incididunt dolore sunt nisi aute dolore amet eu fugiat laboris quis.

public/logo.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 98.1 118">
+  <path fill="#ff3e00" d="M91.8 15.6C80.9-.1 59.2-4.7 43.6 5.2L16.1 22.8A31.25 31.25 0 001.9 43.9c-1.3 7.3-.2 14.8 3.3 21.3-2.4 3.6-4 7.6-4.7 11.8-1.6 8.9.5 18.1 5.7 25.4 11 15.7 32.6 20.3 48.2 10.4l27.5-17.5c7.5-4.7 12.7-12.4 14.2-21.1 1.3-7.3.2-14.8-3.3-21.3 2.4-3.6 4-7.6 4.7-11.8 1.7-9-.4-18.2-5.7-25.5"/>
+  <path fill="#fff" d="M40.9 103.9a21.8 21.8 0 01-23.4-8.7c-3.2-4.4-4.4-9.9-3.5-15.3l.6-2.6.5-1.6 1.4 1c3.3 2.4 6.9 4.2 10.8 5.4l1 .3-.1 1c-.1 1.4.3 2.9 1.1 4.1a6.62 6.62 0 008.8 2L65.5 72c1.4-.9 2.3-2.2 2.6-3.8.3-1.6-.1-3.3-1-4.6a6.56 6.56 0 00-8.8-1.9l-10.5 6.7a18.6 18.6 0 01-5.6 2.4 21.8 21.8 0 01-23.4-8.7 20.2 20.2 0 01-3.4-15.3c.9-5.2 4.1-9.9 8.6-12.7l27.5-17.5c1.7-1.1 3.6-1.9 5.6-2.5a21.8 21.8 0 0123.4 8.7c3.2 4.4 4.4 9.9 3.5 15.3-.2.9-.4 1.7-.7 2.6l-.5 1.6-1.4-1c-3.3-2.4-6.9-4.2-10.8-5.4l-1-.3.1-1c.1-1.4-.3-2.9-1.1-4.1a6.56 6.56 0 00-8.8-1.9L32.4 46.1c-1.4.9-2.3 2.2-2.6 3.8s.1 3.3 1 4.6a6.56 6.56 0 008.8 1.9l10.5-6.7c1.7-1.1 3.6-1.9 5.6-2.5a21.8 21.8 0 0123.4 8.7c3.2 4.4 4.4 9.9 3.5 15.3-.9 5.2-4.1 9.9-8.6 12.7l-27.5 17.5c-1.7 1.1-3.6 1.9-5.6 2.5"/>
+</svg>

public/manifest.webmanifest

@@ -1,39 +1,34 @@
 {
-  "name": "Lauf für Kaya! - Admin",
-  "short_name": "LfK!Admin",
-  "start_url": "/?utm_source=pwa",
-  "orientation": "portrait-primary",
-  "display": "standalone",
-  "background_color": "#fff",
-  "theme_color": "#fff",
-  "description": "Lauf für Kaya! - Admin",
-  "shortcuts": [
-    {
-      "name": "Users",
-      "url": "/users/?utm_source=pwa"
-    }
-  ],
-  "icons": [
-    {
-      "src": "/favicon.png",
-      "sizes": "48x48",
-      "type": "image/png"
-    },
-    {
-      "src": "/favicon.png",
-      "sizes": "144x144",
-      "type": "image/png"
-    },
-    {
-      "src": "/lfk-logo.png",
-      "sizes": "1540x144",
-      "type": "image/png"
-    },
-    {
-      "src": "/maskable_icon_x1.png",
-      "sizes": "750x750",
-      "type": "image/png",
-      "purpose": "any maskable"
-    }
-  ]
+	"name": "Lauf für Kaya! - Admin",
+	"short_name": "LfK!Admin",
+	"start_url": "/?utm_source=pwa",
+	"orientation": "portrait-primary",
+	"display": "standalone",
+	"background_color": "#fff",
+	"theme_color": "#fff",
+	"description": "Lauf für Kaya! - Admin",
+	"shortcuts": [
+		{
+			"name": "Users",
+			"url": "/users/?utm_source=pwa"
+		}
+	],
+	"icons": [
+		{
+			"src": "/favicon.png",
+			"sizes": "48x48",
+			"type": "image/png"
+		},
+		{
+			"src": "/favicon.png",
+			"sizes": "144x144",
+			"type": "image/png"
+		},
+		{
+			"src": "/lfk-logo.png",
+			"sizes": "1540x144",
+			"type": "image/png"
+		},
+		{ "src": "/maskable_icon_x1.png", "sizes": "750x750", "type": "image/png", "purpose": "any maskable" }
+	]
 }

public/privacy_en.md

@@ -0,0 +1 @@
+Nostrud tempor dolor aute ea excepteur aute mollit elit eiusmod exercitation. Magna laborum pariatur adipisicing pariatur cupidatat exercitation duis aliquip pariatur sint exercitation deserunt labore. Consectetur id laboris dolore nostrud do velit ipsum. Eu laboris velit do commodo ad ea sint ex cillum. Cillum ipsum qui eiusmod laborum mollit sunt dolore incididunt. Cillum sunt culpa veniam voluptate et qui ut magna anim occaecat ut mollit dolor. Duis irure proident eu incididunt dolore sunt nisi aute dolore amet eu fugiat laboris quis.

s-config.template.js

@@ -0,0 +1,6 @@
+const sveltePreprocess = require('svelte-preprocess');
+const preprocess = sveltePreprocess(__insert__);
+
+module.exports = {
+	preprocess
+};

snowpack.config.js

@@ -0,0 +1,26 @@
+/** @type {import("snowpack").SnowpackUserConfig } */
+module.exports = {
+	mount: {
+		public: '/',
+		src: '/_dist_'
+	},
+	plugins: [ '@snowpack/plugin-svelte' ],
+	routes: [
+		/* Enable an SPA Fallback in development: */
+		{ match: 'routes', src: '.*', dest: '/index.html' }
+	],
+	packageOptions: {
+		/* ... */
+		sourceMap: false
+	},
+	devOptions: {
+		/* ... */
+	},
+	buildOptions: {
+		/* ... */
+	},
+	alias: {
+		/* ... */
+	},
+	optimize: { bundle: true, minify: true }
+};

src/App.svelte

@@ -1,4 +1,7 @@
 <script>
+  import "./TailwindStyles.svelte";
+  import "toastify-js/src/toastify.css";
+  import "gridjs/dist/theme/mermaid.css";
   import { Route, router } from "tinro";
   router.subscribe((routeInfo) => {
     window.scrollTo(0, 0);
@@ -22,10 +25,11 @@
     name: "lfk_admin",
     version: 1.0,
     storeName: "lfk_admin",
-    description: "LfK! admin dashboard",
+    description: "LfK! admin dashbaord",
   });
   window.onunhandledrejection = (event) => {
     if (event.reason.toString() == "Error: Unauthorized") {
+      console.log("Found 1");
       localForage.clear();
       location.replace("/");
     }
@@ -41,7 +45,6 @@
   import Settings from "./components/settings/Settings.svelte";
   import Transition from "./components/base/Transition.svelte";
   import Orgs from "./components/orgs/Orgs.svelte";
-  import CardAssignment from "./components/tools/CardAssignment.svelte";
   import Runners from "./components/runners/Runners.svelte";
   import Footer from "./components/general/Footer.svelte";
   import TracksOverview from "./components/tracks/TracksOverview.svelte";
@@ -50,10 +53,13 @@
   import { OpenAPI } from "@odit/lfk-client-js";
   import UserDetail from "./components/users/UserDetail.svelte";
   OpenAPI.BASE = config.baseurl;
+  import { register as registerSW } from "./swmodule";
   import TeamDetail from "./components/teams/TeamDetail.svelte";
   import UserPermissions from "./components/users/UserPermissions.svelte";
   import GroupPermissions from "./components/groups/GroupPermissions.svelte";
   import RunnerDetail from "./components/runners/RunnerDetail.svelte";
+  import Imprint from "./components/general/Imprint.svelte";
+  import Privacy from "./components/general/Privacy.svelte";
   import ResetPassword from "./components/auth/ResetPassword.svelte";
   import Contacts from "./components/contacts/Contacts.svelte";
   import ContactDetail from "./components/contacts/ContactDetail.svelte";
@@ -63,32 +69,36 @@
   import Donations from "./components/donations/Donations.svelte";
   import DonationDetail from "./components/donations/DonationDetail.svelte";
   import GroupDetail from "./components/groups/GroupDetail.svelte";
+  import ScanStationsOverview from "./components/scanstations/ScanStationsOverview.svelte";
   import ScanStations from "./components/scanstations/ScanStations.svelte";
   import ScanStationDetail from "./components/scanstations/ScanStationDetail.svelte";
   import Scans from "./components/scans/Scans.svelte";
-  import ScanDetail from "./components/scans/ScanDetail.svelte";
-  import Cards from "./components/cards/Cards.svelte";
-  import StatsClients from "./components/statsclients/StatsClients.svelte";
-  import StatsClientDetail from "./components/statsclients/StatsClientDetail.svelte";
-  import CardReplacement from "./components/tools/CardReplacement.svelte";
-  import ScanClient from "./components/tools/ScanClient.svelte";
-  import DonationCreate from "./components/tools/DonationCreate.svelte";
+import ScanDetail from "./components/scans/ScanDetail.svelte";
   store.init();
+  registerSW();
 </script>
 
 <Route>
-  {#if $router.path === "/forgot_password"}
+  {#if $router.path === '/forgot_password'}
     <Route path="/forgot_password">
       <ForgotPassword />
     </Route>
-  {:else if $router.path.includes("/reset")}
+  {:else if $router.path.includes('/reset')}
     <Route path="/reset/:resetkey" let:params>
       <ResetPassword {params} />
     </Route>
-  {:else if $router.path === "/about"}
+  {:else if $router.path === '/about'}
     <Route path="/about">
       <About />
     </Route>
+  {:else if $router.path === '/imprint'}
+    <Route path="/imprint">
+      <Imprint />
+    </Route>
+  {:else if $router.path === '/privacy'}
+    <Route path="/privacy">
+      <Privacy />
+    </Route>
   {:else if $store.isLoggedIn}
     <Dashboard>
       <Transition>
@@ -128,27 +138,13 @@
           <Route path="/:trackid" let:params />
         </Route>
         <Route path="/runners/*">
-          <Route path="/" let:meta>
-            <Runners created_via={meta.query.created_via} />
+          <Route path="/">
+            <Runners />
           </Route>
           <Route path="/:runnerid" let:params>
             <RunnerDetail {params} />
           </Route>
         </Route>
-        <Route path="/tools/*">
-          <Route path="/cardassignment/">
-              <CardAssignment />
-          </Route>
-          <Route path="/cardreplacement/">
-              <CardReplacement />
-          </Route>
-          <Route path="/scanclient/">
-              <ScanClient />
-          </Route>
-          <Route path="/donationcreate/">
-              <DonationCreate />
-          </Route>
-        </Route>
         <Route path="/teams/*">
           <Route path="/">
             <Teams />
@@ -189,14 +185,6 @@
             <DonationDetail {params} />
           </Route>
         </Route>
-        <Route path="/cards/*">
-          <Route path="/">
-            <Cards />
-          </Route>
-          <!-- <Route path="/:scanid" let:params>
-            <ScanDetail {params} />
-          </Route> -->
-        </Route>
         <Route path="/scans/*">
           <Route path="/">
             <Scans />
@@ -213,14 +201,6 @@
             <ScanStationDetail {params} />
           </Route>
         </Route>
-        <Route path="/statsclients/*">
-          <Route path="/">
-            <StatsClients />
-          </Route>
-          <Route path="/:clientid" let:params>
-            <StatsClientDetail {params} />
-          </Route>
-        </Route>
         <Route path="/about">
           <About />
         </Route>

src/TailwindStyles.svelte

@@ -0,0 +1,6 @@
+<style global>
+  /*! @import */
+  @tailwind base;
+  @tailwind components;
+  @tailwind utilities;
+</style>

src/components/auth/ForgotPassword.svelte

@@ -1,22 +1,28 @@
 <script>
-  import { AuthService } from "@odit/lfk-client-js";
-  import toast from "svelte-french-toast";
+  import { ApiError, AuthService } from "@odit/lfk-client-js";
   import { _ } from "svelte-i18n";
+  import Toastify from "toastify-js";
+  import "toastify-js/src/toastify.css";
   import isEmail from "validator/es/lib/isEmail";
 
   let reset_mail_sent = false;
   let usersEmail = "";
   function reset() {
     if (isEmail(usersEmail)) {
-      toast.loading($_("mail-validation-in-progress"));
-      AuthService.authControllerGetResetToken("de", { email: usersEmail })
+      AuthService.authControllerGetResetToken({ email: usersEmail })
         .then((resp) => {
-          toast.dismiss();
+          Toastify({
+            text: $_("mail-validation-in-progress"),
+            duration: 3500,
+          }).showToast();
           reset_mail_sent = true;
         })
         .catch((err) => {});
     } else {
-      toast($_("invalid-mail-reset"));
+      Toastify({
+        text: $_("invalid-mail-reset"),
+        duration: 3500,
+      }).showToast();
     }
   }
 </script>
@@ -26,18 +32,17 @@
     <div class="max-w-md w-full py-12 px-6">
       <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
       <p class="mt-6 text-lg text-center font-bold text-gray-900">
-        {$_("application_name")}
+        {$_('application_name')}
       </p>
       <p class="mt-2 mb-2 text-sm text-center text-gray-900">
-        {$_("password-reset-mail-sent", { values: { usersEmail: usersEmail } })}
+        {$_('password-reset-mail-sent', { values: { usersEmail: usersEmail } })}
       </p>
       <div class="mt-6">
         <div class="mt-6">
           <a
             href="/"
-            class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md text-gray-900 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
-          >
-            {$_("goback")}
+            class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md text-gray-900 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm">
+            {$_('goback')}
           </a>
         </div>
       </div>
@@ -48,26 +53,25 @@
     <div class="max-w-md w-full py-12 px-6">
       <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
       <p class="mt-6 text-lg text-center font-bold text-gray-900">
-        {$_("application_name")}
+        {$_('application_name')}
       </p>
       <p class="mt-6 text-sm text-center text-gray-900">
-        {$_("forgot_password")}
+        {$_('forgot_password')}
       </p>
       <p class="mt-2 mb-2 text-sm text-center text-gray-900">
-        {$_("dont-panic-were-resetting-it")}
+        {$_('dont-panic-were-resetting-it')}
       </p>
       <div>
         <div class="rounded-md shadow-sm">
           <div>
             <input
-              aria-label={$_("e-mail-adress")}
+              aria-label={$_('e-mail-adress')}
               name="email"
               type="email"
               required=""
               class="border-gray-300 placeholder-gray-500 appearance-none rounded-none relative block w-full px-3 py-2 border text-gray-900 rounded-t-md focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
-              placeholder={$_("e-mail-adress")}
-              bind:value={usersEmail}
-            />
+              placeholder={$_('e-mail-adress')}
+              bind:value={usersEmail} />
           </div>
         </div>
 
@@ -75,22 +79,19 @@
           <button
             on:click={reset}
             type="submit"
-            class="relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm"
-          >
+            class="relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm">
             <span class="absolute left-0 inset-y pl-3">
               <svg
                 class="h-5 w-5 text-gray-500"
                 fill="currentColor"
-                viewBox="0 0 20 20"
-              >
+                viewBox="0 0 20 20">
                 <path
                   fill-rule="evenodd"
                   d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                  clip-rule="evenodd"
-                />
+                  clip-rule="evenodd" />
               </svg>
             </span>
-            {$_("reset-my-password")}
+            {$_('reset-my-password')}
           </button>
         </div>
         <div class="mt-6">
@@ -99,30 +100,24 @@
               <div class="w-full border-t border-gray-300" />
             </div>
             <div class="relative flex justify-center text-sm">
-              <span class="px-2 bg-gray-100 text-gray-500"
-                >{$_("dont-have-your-email-connected")}</span
-              >
+              <span
+                class="px-2 bg-gray-100 text-gray-500">{$_('dont-have-your-email-connected')}</span>
             </div>
           </div>
           <span
-            class="mt-2 text-sm px-2 bg-gray-100 text-gray-500 justify-center relative flex"
-            >{$_("cannot-reset-your-password-directly")}</span
-          >
+            class="mt-2 text-sm px-2 bg-gray-100 text-gray-500 justify-center relative flex">{$_('cannot-reset-your-password-directly')}</span>
 
           <div class="mt-6">
             <a
               href="mailto:lfk@odit.services"
-              class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md text-gray-900 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
-            >
-              {$_("send-a-mail-to-lfk-odit-services")}
+              class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md text-gray-900 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm">
+              {$_('send-a-mail-to-lfk-odit-services')}
             </a>
           </div>
           <div class="mt-6">
             <a
               href="/"
-              class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md text-gray-900 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
-              >{$_("goback")}</a
-            >
+              class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md text-gray-900 font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm">{$_('goback')}</a>
           </div>
         </div>
       </div>

src/components/auth/Login.svelte

@@ -5,11 +5,10 @@
   store.init();
   import { OpenAPI, AuthService } from "@odit/lfk-client-js";
   import Footer from "../general/Footer.svelte";
-  import isEmail from "validator/es/lib/isEmail";
-  import toast from "svelte-french-toast";
+  import Toastify from "toastify-js";
   // ------
-  let username = config.default_username || "";
-  let password = config.default_password || "";
+  let username = "demo";
+  let password = "demo";
   let is_blocked_by_autologin = false;
   let last_loginclick_processed = true;
 
@@ -20,6 +19,11 @@
         OpenAPI.TOKEN = value.access_token;
         const jwtinfo = JSON.parse(atob(OpenAPI.TOKEN.split(".")[1]));
         store.login(value, jwtinfo);
+        Toastify({
+          text: $_("welcome_wavinghand"),
+          duration: 500,
+          backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+        }).showToast();
       }
     }
   });
@@ -28,38 +32,45 @@
     // prevent login button spamming
     if (last_loginclick_processed && is_blocked_by_autologin === false) {
       last_loginclick_processed = false;
-      toast.loading($_("login_is_checked"));
-      let postdata = {};
-      if (isEmail(username)) {
-        postdata = {
-          email: username,
-          password,
-        };
-      } else {
-        postdata = {
-          username,
-          password,
-        };
-      }
-      AuthService.authControllerLogin(postdata)
+      Toastify({
+        text: $_("login_is_checked"),
+        duration: 500,
+      }).showToast();
+      AuthService.authControllerLogin({
+        username,
+        password,
+      })
         .then(async (result) => {
           await localForage.setItem("logindata", result);
           OpenAPI.TOKEN = result.access_token;
           const jwtinfo = JSON.parse(atob(OpenAPI.TOKEN.split(".")[1]));
           store.login(result.access_token, jwtinfo);
           location.replace("/");
-          toast.dismiss();
+          Toastify({
+            text: $_("welcome_wavinghand"),
+            duration: 500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
         })
         .catch((err) => {
-          toast.dismiss();
-          toast.error($_("error_on_login"));
+          Toastify({
+            text: $_("error_on_login"),
+            duration: 500,
+            backgroundColor:
+              "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
+          }).showToast();
         })
         .finally(() => {
           last_loginclick_processed = true;
         });
       // last login was not processed yet
     } else {
-      toast($_("please-wait-a-moment-your-login-is-still-being-processed"));
+      Toastify({
+        text: "chill...",
+        duration: 1500,
+        backgroundColor:
+          "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
+      }).showToast();
     }
   };
   function handleKeydown(e) {
@@ -70,37 +81,34 @@
 </script>
 
 <div
-  class="min-h-screen flex items-center justify-center bg-gray-100 text-gray-900"
->
+  class="min-h-screen flex items-center justify-center bg-gray-100 text-gray-900">
   <div class="max-w-md w-full py-12 px-6" role="main">
     <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
-    <p class="mt-6 text-xl text-center font-bold">{$_("application_name")}</p>
-    <p class="mt-2 mb-6 text-sm text-center">{$_("log_in_to_your_account")}</p>
+    <p class="mt-6 text-lg text-center font-bold">{$_('application_name')}</p>
+    <p class="mt-6 text-sm text-center">{$_('log_in_to_your_account')}</p>
     <div>
       <div class="rounded-md shadow-sm">
         <div>
           <!-- svelte-ignore a11y-autofocus -->
           <input
             autofocus
-            aria-label={$_("email_address_or_username")}
+            aria-label={$_('email_address_or_username')}
             type="text"
             required=""
             class="border-gray-300 placeholder-gray-500 appearance-none rounded-none relative block w-full px-3 py-2 border rounded-t-md focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
             on:keydown={handleKeydown}
-            placeholder={$_("email_address_or_username")}
-            bind:value={username}
-          />
+            placeholder={$_('email_address_or_username')}
+            bind:value={username} />
         </div>
         <div class="-mt-px relative">
           <input
-            aria-label={$_("password")}
+            aria-label={$_('password')}
             type="password"
             required=""
             bind:value={password}
             class="border-gray-300 placeholder-gray-500 appearance-none rounded-none relative block w-full px-3 py-2 border rounded-b-md focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
             on:keydown={handleKeydown}
-            placeholder={$_("password")}
-          />
+            placeholder={$_('password')} />
         </div>
       </div>
 
@@ -108,33 +116,29 @@
         <button
           on:click={login}
           type="submit"
-          class="relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm"
-        >
+          class="relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm">
           <span class="absolute left-0 inset-y pl-3">
             <svg
               class="h-5 w-5 text-gray-500"
               fill="currentColor"
-              viewBox="0 0 20 20"
-            >
+              viewBox="0 0 20 20">
               <path
                 fill-rule="evenodd"
                 d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                clip-rule="evenodd"
-              />
+                clip-rule="evenodd" />
             </svg>
           </span>
-          {$_("log_in")}
+          {$_('log_in')}
         </button>
       </div>
     </div>
-    <!-- <div class="mt-2">
+    <div class="mt-2">
       <a
         href="/forgot_password"
-        class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm"
-      >
-        {$_("forgot_password")}
+        class="block w-full text-center py-2 px-3 border border-gray-300 rounded-md font-medium hover:border-gray-400 focus:outline-none focus:border-gray-400 sm:text-sm">
+        {$_('forgot_password')}
       </a>
-    </div> -->
+    </div>
   </div>
 </div>
 <Footer />

src/components/auth/PasswordStrength.svelte

@@ -1,52 +0,0 @@
-<script context="module">
-  import { passwordStrength } from "check-password-strength";
-  export function password_strong_enough(password_change) {
-    let strength = passwordStrength(password_change);
-    return (
-      strength?.contains.includes("lowercase") &&
-      strength?.contains.includes("uppercase") &&
-      strength?.contains.includes("number") &&
-      strength?.length > 9
-    );
-  }
-  export function password_strong_enough_and_equal(
-    password_change,
-    password_confirm
-  ) {
-    return (
-      password_strong_enough(password_change) &&
-      password_change === password_confirm
-    );
-  }
-</script>
-
-<script>
-  import { getLocaleFromNavigator, _ } from "svelte-i18n";
-  import { passwordStrength as Strength } from "check-password-strength";
-  export let password_change;
-  export let password_confirm;
-
-  $: strength = Strength(password_change);
-  $: passwords_match =
-    !password_confirm || password_confirm === password_change;
-</script>
-
-<div class="ml-4">
-  <ul class="list-disc font-medium tracking-wide text-red-500 text-xs">
-    {#if !strength.contains.includes("lowercase")}
-      <li>{$_("must-contain-a-lowercase-letter")}</li>
-    {/if}
-    {#if !strength.contains.includes("uppercase")}
-      <li>{$_("must-contain-a-uppercase-letter")}</li>
-    {/if}
-    {#if !strength.contains.includes("number")}
-      <li>{$_("must-contain-a-number")}</li>
-    {/if}
-    {#if !(strength.length > 9)}
-      <li>{$_("must-be-at-least-10-characters-long")}</li>
-    {/if}
-    {#if !(passwords_match == true)}
-      <li>{$_("passwords-dont-match")}</li>
-    {/if}
-  </ul>
-</div>

src/components/auth/ResetPassword.svelte

@@ -1,132 +1,126 @@
 <script>
-  import { AuthService } from "@odit/lfk-client-js";
+  import {  AuthService } from "@odit/lfk-client-js";
   import { _ } from "svelte-i18n";
-  import toast from "svelte-french-toast";
-  import PasswordStrength, {
-    password_strong_enough,
-  } from "../auth/PasswordStrength.svelte";
+  import Toastify from "toastify-js";
+  import "toastify-js/src/toastify.css";
   let state = "reset_in_progress";
   let password = "";
   export let params;
   function set_new_password() {
-    if (password.trim() !== "") {
-      toast.loading($_("password-reset-in-progress"));
-      AuthService.authControllerResetPassword(atob(params.resetkey), {
-        password,
-      })
+      if(password.trim() !== ""){
+        Toastify({
+          text: $_('password-reset-in-progress'),
+          duration: 3500,
+        }).showToast();
+        AuthService.authControllerResetPassword(atob(params.resetkey),{ password })
         .then((resp) => {
-          toast.dismiss();
-          toast($_("password-reset-successful"));
-          state = "reset_success";
+          Toastify({
+            text: $_('password-reset-successful'),
+            duration: 3500,
+          }).showToast();
+          state="reset_success";
         })
         .catch((err) => {
-          state = "reset_error";
+          state="reset_error";
         });
-    } else {
-      toast.dismiss();
-      toast.error($_("please-provide-a-password"));
+      } else {
+      Toastify({
+        text: $_('please-provide-a-password'),
+        duration: 3500,
+      }).showToast();
     }
   }
 </script>
 
-{#if state === "reset_success"}
+{#if state==="reset_success"}
   <div class="min-h-screen flex items-center justify-center bg-gray-100">
     <div class="max-w-md w-full py-12 px-6">
       <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
       <p class="mt-6 text-lg text-center font-bold text-gray-900">
-        {$_("application_name")}
+        {$_('application_name')}
       </p>
       <p class="mt-2 mb-2 text-sm text-center text-gray-900 font-bold">
-        {$_("successful-password-reset")}
+        {$_('successful-password-reset')}
       </p>
       <p class="mt-2 mb-2 text-sm text-center text-gray-900">
-        {$_("you-can-now-use-your-new-password-to-log-in-to-your-account")}
+        {$_('you-can-now-use-your-new-password-to-log-in-to-your-account')}
       </p>
       <div class="mt-6">
         <div class="mt-6">
           <a
             href="/login/"
-            class="text-center relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm"
-          >
-            {$_("go-to-login")}
+            class="text-center relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm">
+            {$_('go-to-login')}
           </a>
         </div>
       </div>
     </div>
   </div>
-{:else if state === "reset_error"}
-  <div class="min-h-screen flex items-center justify-center bg-gray-100">
-    <div class="max-w-md w-full py-12 px-6">
-      <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
-      <p class="mt-6 text-lg text-center font-bold text-gray-900">
-        {$_("application_name")}
-      </p>
-      <p class="mt-2 mb-2 text-sm text-center text-gray-900 font-bold">
-        {$_("password-reset-failed")}
-      </p>
-      <p class="mt-2 mb-2 text-sm text-center text-gray-900">
-        {$_("please-request-a-new-reset-mail")}
-      </p>
+{:else if state==="reset_error"}
+<div class="min-h-screen flex items-center justify-center bg-gray-100">
+  <div class="max-w-md w-full py-12 px-6">
+    <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
+    <p class="mt-6 text-lg text-center font-bold text-gray-900">
+      {$_('application_name')}
+    </p>
+    <p class="mt-2 mb-2 text-sm text-center text-gray-900 font-bold">
+      {$_('password-reset-failed')}
+    </p>
+    <p class="mt-2 mb-2 text-sm text-center text-gray-900">
+      {$_('please-request-a-new-reset-mail')}
+    </p>
+    <div class="mt-6">
       <div class="mt-6">
-        <div class="mt-6">
-          <a
-            href="/forgot_password/"
-            class="text-center relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm"
-          >
-            {$_("request-a-new-reset-mail")}
-          </a>
-        </div>
+        <a
+          href="/forgot_password/"
+          class="text-center relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm">
+          {$_('request-a-new-reset-mail')}
+        </a>
       </div>
     </div>
   </div>
-{:else if state === "reset_in_progress"}
+</div>
+{:else if state==="reset_in_progress"}
   <div class="min-h-screen flex items-center justify-center bg-gray-100">
     <div class="max-w-md w-full py-12 px-6">
       <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
       <p class="mt-6 text-lg text-center font-bold text-gray-900">
-        {$_("application_name")}
+        {$_('application_name')}
       </p>
       <p class="mt-2 mb-4 text-md text-center text-gray-900">
-        {$_("reset-password")}
+        {$_('reset-password')}
       </p>
       <div>
         <div class="rounded-md shadow-sm">
           <div>
             <input
-              aria-label={$_("new-password")}
+              aria-label={$_('new-password')}
               name="password"
               type="password"
               required=""
               class="border-gray-300 placeholder-gray-500 appearance-none rounded-md relative block w-full px-3 py-2 border text-gray-900 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
-              placeholder={$_("new-password")}
-              bind:value={password}
-            />
+              placeholder={$_('new-password')}
+              bind:value={password} />
           </div>
-          <PasswordStrength bind:password_change={password} />
         </div>
 
         <div class="mt-5">
           <button
             on:click={set_new_password}
-            disabled={!password_strong_enough(password)}
-            class:opacity-50={!password_strong_enough(password)}
             type="submit"
-            class="relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm"
-          >
+            class="relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm">
             <span class="absolute left-0 inset-y pl-3">
               <svg
                 class="h-5 w-5 text-gray-500"
                 fill="currentColor"
-                viewBox="0 0 20 20"
-              >
+                viewBox="0 0 20 20">
                 <path
                   fill-rule="evenodd"
                   d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                  clip-rule="evenodd"
-                />
+                  clip-rule="evenodd" />
               </svg>
             </span>
-            {$_("reset-my-password")}
+            {$_('reset-my-password')}
           </button>
         </div>
       </div>

src/components/base/FormLayout.svelte

@@ -0,0 +1,274 @@
+<!--
+  This example requires Tailwind CSS v2.0+ 
+  
+  This example requires some changes to your config:
+  
+  ```
+  // tailwind.config.js
+  module.exports = {
+    // ...
+    plugins: [
+      // ...
+      require('@tailwindcss/forms'),
+    ]
+  }
+  ```
+-->
+<div>
+  <div class="md:grid md:grid-cols-3 md:gap-6">
+    <div class="md:col-span-1">
+      <div class="px-4 sm:px-0">
+        <h3 class="text-lg font-medium leading-6 text-gray-900">Profile</h3>
+        <p class="mt-1 text-sm text-gray-600">
+          This information will be displayed publicly so be careful what you share.
+        </p>
+      </div>
+    </div>
+    <div class="mt-5 md:mt-0 md:col-span-2">
+      <form action="#" method="POST">
+        <div class="shadow sm:rounded-md sm:overflow-hidden">
+          <div class="px-4 py-5 bg-white space-y-6 sm:p-6">
+            <div class="grid grid-cols-3 gap-6">
+              <div class="col-span-3 sm:col-span-2">
+                <label for="company_website" class="block text-sm font-medium text-gray-700">
+                  Website
+                </label>
+                <div class="mt-1 flex rounded-md shadow-sm">
+                  <span class="inline-flex items-center px-3 rounded-l-md border border-r-0 border-gray-300 bg-gray-50 text-gray-500 text-sm">
+                    http://
+                  </span>
+                  <input type="text" name="company_website" id="company_website" class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-r-md sm:text-sm border-gray-300" placeholder="www.example.com">
+                </div>
+              </div>
+            </div>
+
+            <div>
+              <label for="about" class="block text-sm font-medium text-gray-700">
+                About
+              </label>
+              <div class="mt-1">
+                <textarea id="about" name="about" rows="3" class="shadow-sm focus:ring-indigo-500 focus:border-indigo-500 mt-1 block w-full sm:text-sm border-gray-300 rounded-md" placeholder="you@example.com"></textarea>
+              </div>
+              <p class="mt-2 text-sm text-gray-500">
+                Brief description for your profile. URLs are hyperlinked.
+              </p>
+            </div>
+
+            <div>
+              <!-- svelte-ignore a11y-label-has-associated-control -->
+              <label class="block text-sm font-medium text-gray-700">
+                Photo
+              </label>
+              <div class="mt-2 flex items-center">
+                <span class="inline-block h-12 w-12 rounded-full overflow-hidden bg-gray-100">
+                  <svg class="h-full w-full text-gray-300" fill="currentColor" viewBox="0 0 24 24">
+                    <path d="M24 20.993V24H0v-2.996A14.977 14.977 0 0112.004 15c4.904 0 9.26 2.354 11.996 5.993zM16.002 8.999a4 4 0 11-8 0 4 4 0 018 0z" />
+                  </svg>
+                </span>
+                <button type="button" class="ml-5 bg-white py-2 px-3 border border-gray-300 rounded-md shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+                  Change
+                </button>
+              </div>
+            </div>
+
+            <div>
+              <!-- svelte-ignore a11y-label-has-associated-control -->
+              <label class="block text-sm font-medium text-gray-700">
+                Cover photo
+              </label>
+              <div class="mt-2 flex justify-center px-6 pt-5 pb-6 border-2 border-gray-300 border-dashed rounded-md">
+                <div class="space-y-1 text-center">
+                  <svg class="mx-auto h-12 w-12 text-gray-400" stroke="currentColor" fill="none" viewBox="0 0 48 48" aria-hidden="true">
+                    <path d="M28 8H12a4 4 0 00-4 4v20m32-12v8m0 0v8a4 4 0 01-4 4H12a4 4 0 01-4-4v-4m32-4l-3.172-3.172a4 4 0 00-5.656 0L28 28M8 32l9.172-9.172a4 4 0 015.656 0L28 28m0 0l4 4m4-24h8m-4-4v8m-12 4h.02" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+                  </svg>
+                  <div class="flex text-sm text-gray-600">
+                    <label for="file-upload" class="relative cursor-pointer bg-white rounded-md font-medium text-indigo-600 hover:text-indigo-500 focus-within:outline-none focus-within:ring-2 focus-within:ring-offset-2 focus-within:ring-indigo-500">
+                      <span>Upload a file</span>
+                      <input id="file-upload" name="file-upload" type="file" class="sr-only">
+                    </label>
+                    <p class="pl-1">or drag and drop</p>
+                  </div>
+                  <p class="text-xs text-gray-500">
+                    PNG, JPG, GIF up to 10MB
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="px-4 py-3 bg-gray-50 text-right sm:px-6">
+            <button type="submit" class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+              Save
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<div class="hidden sm:block" aria-hidden="true">
+  <div class="py-5">
+    <div class="border-t border-gray-200"></div>
+  </div>
+</div>
+
+<div class="mt-10 sm:mt-0">
+  <div class="md:grid md:grid-cols-3 md:gap-6">
+    <div class="md:col-span-1">
+      <div class="px-4 sm:px-0">
+        <h3 class="text-lg font-medium leading-6 text-gray-900">Personal Information</h3>
+        <p class="mt-1 text-sm text-gray-600">
+          Use a permanent address where you can receive mail.
+        </p>
+      </div>
+    </div>
+    <div class="mt-5 md:mt-0 md:col-span-2">
+      <form action="#" method="POST">
+        <div class="shadow overflow-hidden sm:rounded-md">
+          <div class="px-4 py-5 bg-white sm:p-6">
+            <div class="grid grid-cols-6 gap-6">
+              <div class="col-span-6 sm:col-span-3">
+                <label for="first_name" class="block text-sm font-medium text-gray-700">First name</label>
+                <input type="text" name="first_name" id="first_name" autocomplete="given-name" class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
+              </div>
+
+              <div class="col-span-6 sm:col-span-3">
+                <label for="last_name" class="block text-sm font-medium text-gray-700">Last name</label>
+                <input type="text" name="last_name" id="last_name" autocomplete="family-name" class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
+              </div>
+
+              <div class="col-span-6 sm:col-span-4">
+                <label for="email_address" class="block text-sm font-medium text-gray-700">Email address</label>
+                <input type="text" name="email_address" id="email_address" autocomplete="email" class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
+              </div>
+
+              <div class="col-span-6 sm:col-span-3">
+                <label for="country" class="block text-sm font-medium text-gray-700">Country / Region</label>
+                <select id="country" name="country" autocomplete="country" class="mt-1 block w-full py-2 px-3 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+                  <option>United States</option>
+                  <option>Canada</option>
+                  <option>Mexico</option>
+                </select>
+              </div>
+
+              <div class="col-span-6">
+                <label for="street_address" class="block text-sm font-medium text-gray-700">Street address</label>
+                <input type="text" name="street_address" id="street_address" autocomplete="street-address" class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
+              </div>
+
+              <div class="col-span-6 sm:col-span-6 lg:col-span-2">
+                <label for="city" class="block text-sm font-medium text-gray-700">City</label>
+                <input type="text" name="city" id="city" class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
+              </div>
+
+              <div class="col-span-6 sm:col-span-3 lg:col-span-2">
+                <label for="state" class="block text-sm font-medium text-gray-700">State / Province</label>
+                <input type="text" name="state" id="state" class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
+              </div>
+
+              <div class="col-span-6 sm:col-span-3 lg:col-span-2">
+                <label for="postal_code" class="block text-sm font-medium text-gray-700">ZIP / Postal</label>
+                <input type="text" name="postal_code" id="postal_code" autocomplete="postal-code" class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
+              </div>
+            </div>
+          </div>
+          <div class="px-4 py-3 bg-gray-50 text-right sm:px-6">
+            <button type="submit" class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+              Save
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<div class="hidden sm:block" aria-hidden="true">
+  <div class="py-5">
+    <div class="border-t border-gray-200"></div>
+  </div>
+</div>
+
+<div class="mt-10 sm:mt-0">
+  <div class="md:grid md:grid-cols-3 md:gap-6">
+    <div class="md:col-span-1">
+      <div class="px-4 sm:px-0">
+        <h3 class="text-lg font-medium leading-6 text-gray-900">Notifications</h3>
+        <p class="mt-1 text-sm text-gray-600">
+          Decide which communications you'd like to receive and how.
+        </p>
+      </div>
+    </div>
+    <div class="mt-5 md:mt-0 md:col-span-2">
+      <form action="#" method="POST">
+        <div class="shadow overflow-hidden sm:rounded-md">
+          <div class="px-4 py-5 bg-white space-y-6 sm:p-6">
+            <fieldset>
+              <legend class="text-base font-medium text-gray-900">By Email</legend>
+              <div class="mt-4 space-y-4">
+                <div class="flex items-start">
+                  <div class="flex items-center h-5">
+                    <input id="comments" name="comments" type="checkbox" class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded">
+                  </div>
+                  <div class="ml-3 text-sm">
+                    <label for="comments" class="font-medium text-gray-700">Comments</label>
+                    <p class="text-gray-500">Get notified when someones posts a comment on a posting.</p>
+                  </div>
+                </div>
+                <div class="flex items-start">
+                  <div class="flex items-center h-5">
+                    <input id="candidates" name="candidates" type="checkbox" class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded">
+                  </div>
+                  <div class="ml-3 text-sm">
+                    <label for="candidates" class="font-medium text-gray-700">Candidates</label>
+                    <p class="text-gray-500">Get notified when a candidate applies for a job.</p>
+                  </div>
+                </div>
+                <div class="flex items-start">
+                  <div class="flex items-center h-5">
+                    <input id="offers" name="offers" type="checkbox" class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded">
+                  </div>
+                  <div class="ml-3 text-sm">
+                    <label for="offers" class="font-medium text-gray-700">Offers</label>
+                    <p class="text-gray-500">Get notified when a candidate accepts or rejects an offer.</p>
+                  </div>
+                </div>
+              </div>
+            </fieldset>
+            <fieldset>
+              <div>
+                <legend class="text-base font-medium text-gray-900">Push Notifications</legend>
+                <p class="text-sm text-gray-500">These are delivered via SMS to your mobile phone.</p>
+              </div>
+              <div class="mt-4 space-y-4">
+                <div class="flex items-center">
+                  <input id="push_everything" name="push_notifications" type="radio" class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300">
+                  <label for="push_everything" class="ml-3 block text-sm font-medium text-gray-700">
+                    Everything
+                  </label>
+                </div>
+                <div class="flex items-center">
+                  <input id="push_email" name="push_notifications" type="radio" class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300">
+                  <label for="push_email" class="ml-3 block text-sm font-medium text-gray-700">
+                    Same as email
+                  </label>
+                </div>
+                <div class="flex items-center">
+                  <input id="push_nothing" name="push_notifications" type="radio" class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300">
+                  <label for="push_nothing" class="ml-3 block text-sm font-medium text-gray-700">
+                    No push notifications
+                  </label>
+                </div>
+              </div>
+            </fieldset>
+          </div>
+          <div class="px-4 py-3 bg-gray-50 text-right sm:px-6">
+            <button type="submit" class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+              Save
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>

src/components/base/NoComponentLoaded.svelte

@@ -4,22 +4,19 @@
 
 <body class="antialiased font-sans">
   <div class="flex min-h-screen">
-    <div class="w-full bg-white flex items-center justify-center">
+    <div class="w-full bg-white flex items-center justify-center ">
       <div class="max-w-sm m-8">
         <div class="text-black text-5xl md:text-15xl font-black">
-          {$_("internal-error")}
+          {$_('internal-error')}
         </div>
         <div class="w-16 h-1 bg-purple-light my-3 md:my-6" />
         <p
-          class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal"
-        >
-          {$_("generic-ui-logic-error")}
+          class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal">
+          {$_('generic-ui-logic-error')}
         </p>
         <a
           href="/"
-          class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg"
-          >{$_("goback")}</a
-        >
+          class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">{$_('goback')}</a>
       </div>
     </div>
   </div>

src/components/base/PromiseError.svelte

@@ -5,7 +5,7 @@
 
 <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
   <span class="inline-block align-middle mr-8">
-    <b>{$_("general_promise_error")}</b>
+    <b class="capitalize">{$_('general_promise_error')}</b>
     {error}
   </span>
 </div>

src/components/base/datatable_i18n.js

@@ -1,25 +1,24 @@
 export function getlang(langkeys) {
-  return {
-    search: {
-      placeholder: langkeys.search,
-    },
-    sort: {
-      sortAsc: langkeys.sort_column_ascending,
-      sortDesc: langkeys.sort_column_descending,
-    },
-    pagination: {
-      previous: langkeys.previous,
-      next: langkeys.next,
-      navigate: (page, pages) =>
-        `${langkeys.page} ${page} ${langkeys.of} ${pages}`,
-      page: (page) => `${langkeys.page} ${page}`,
-      showing: langkeys.showing,
-      of: langkeys.of,
-      to: langkeys.to,
-      results: langkeys.records,
-    },
-    loading: langkeys.loading,
-    noRecordsFound: langkeys.no_matching_records_found,
-    error: langkeys.an_error_happened_while_fetching_the_data,
-  };
+	return {
+		search: {
+			placeholder: langkeys.search
+		},
+		sort: {
+			sortAsc: langkeys.sort_column_ascending,
+			sortDesc: langkeys.sort_column_descending
+		},
+		pagination: {
+			previous: langkeys.previous,
+			next: langkeys.next,
+			navigate: (page, pages) => `${langkeys.page} ${page} ${langkeys.of} ${pages}`,
+			page: (page) => `${langkeys.page} ${page}`,
+			showing: langkeys.showing,
+			of: langkeys.of,
+			to: langkeys.to,
+			results: langkeys.records
+		},
+		loading: langkeys.loading,
+		noRecordsFound: langkeys.no_matching_records_found,
+		error: langkeys.an_error_happened_while_fetching_the_data
+	};
 }

src/components/base/importfixes.svelte

@@ -1,6 +0,0 @@
-<!--
-    Temporary tailwind import fixes for classes that wouldn't be directly used otherwise. 
-    Or as others may call it: Real big bullshit time.
-    Issue: https://git.odit.services/lfk/frontend/issues/136
- -->
-<div class="opacity-50" />

src/components/base/outsideclick.js

@@ -1,10 +1,10 @@
 /** Dispatch event on click outside of node */
 export function clickOutside(node) {
-  const handleClick = (event) => {
-    if (event.target.getAttribute("data-id") === "modal_backdrop") {
-      node.dispatchEvent(new CustomEvent("click_outside", node));
-    }
-  };
-  document.removeEventListener("click", handleClick, true);
-  document.addEventListener("click", handleClick, true);
+	const handleClick = (event) => {
+		if (event.target.getAttribute('data-id') === 'modal_backdrop') {
+			node.dispatchEvent(new CustomEvent('click_outside', node));
+		}
+	};
+	document.removeEventListener('click', handleClick, true);
+	document.addEventListener('click', handleClick, true);
 }

src/components/cards/AddCardBulkModal.svelte

@@ -1,218 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import { clickOutside } from "../base/outsideclick";
-
-  import { RunnerCardService } from "@odit/lfk-client-js";
-  import { createEventDispatcher } from "svelte";
-  import toast from "svelte-french-toast";
-  import DocumentServer from "../pdf_generation/DocumentServer";
-  export let bulk_modal_open;
-  const dispatch = createEventDispatcher();
-  const documentServer = new DocumentServer(config.baseurl_documentserver,config.documentserver_key);
-
-
-  $: card_count = 0;
-  $: is_card_count_valid = card_count > 0;
-  $: processed_last_submit = true;
-  $: createbtnenabled = is_card_count_valid;
-  (() => {
-    document.onkeydown = (e) => {
-      e = e || window.event;
-      if (e.key === "Escape") {
-        bulk_modal_open = false;
-      }
-      if (e.keyCode === 13) {
-        if (createbtnenabled === true) {
-          createbtnenabled = false;
-          submit_with_print();
-        }
-      }
-    };
-  })();
-  function submit_without_print() {
-    if (processed_last_submit === true) {
-      processed_last_submit = false;
-      toast.loading($_("creating-blanco-cards"));
-      RunnerCardService.runnerCardControllerPostBlancoBulk(card_count, true)
-        .then((result) => {
-          bulk_modal_open = false;
-          //
-          toast.dismiss();
-          toast.success($_("created-blanco-cards"));
-          dispatch("created", { cards: result });
-        })
-        .catch((err) => {
-          //
-        })
-        .finally(() => {
-          processed_last_submit = true;
-        });
-    }
-  }
-
-  function submit_with_print() {
-    if (processed_last_submit === true) {
-      processed_last_submit = false;
-      toast.dismiss();
-      toast.loading($_("creating-blanco-cards"));
-      RunnerCardService.runnerCardControllerPostBlancoBulk(card_count, true)
-        .then((result) => {
-          bulk_modal_open = false;
-          //
-          toast.dismiss();
-          toast.success($_("created-blanco-cards"));
-          toast.loading($_("generating-pdf"));
-          dispatch("created", { cards: result });
-          documentServer.generateCards(result, "de")
-            .then((blob) => {
-              const url = window.URL.createObjectURL(blob);
-              let a = document.createElement("a");
-              a.href = url;
-              a.download = "Bulkcards.pdf";
-              document.body.appendChild(a);
-              a.click();
-              a.remove();
-              toast.dismiss();
-              toast.success($_("pdf-successfully-generated"));
-            })
-            .catch((err) => {
-              console.error(err);
-            });
-        })
-        .catch((err) => {
-          //
-        })
-        .finally(() => {
-          processed_last_submit = true;
-        });
-    }
-  }
-</script>
-
-{#if bulk_modal_open}
-  <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
-    use:clickOutside
-    on:click_outside={() => {
-      bulk_modal_open = false;
-    }}
-  >
-    <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
-      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
-        <div
-          class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
-      </div>
-      <span
-        class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
-      <div
-        class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-2xl sm:w-full relative z-10"
-        role="dialog"
-        aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
-            <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
-              <svg
-                class="size-6 text-blue-600"
-                fill="currentColor"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
-                <path
-                  fill="currentColor"
-                  d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z"
-                /></svg
-              >
-            </div>
-            <div class="mt-3 sm:mt-0">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("create-bulk-blanco-cards")}
-              </h3>
-              <div class="mb-6">
-                <p class="text-sm text-gray-500">
-                  {$_(
-                    "just-enter-how-many-you-want-and-the-system-will-create-them"
-                  )}
-                </p>
-              </div>
-              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
-                <div class="col-span-6">
-                  <label
-                    for="amount"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("amount")}</label
-                  >
-                  <div class="mt-1 flex rounded-md shadow-sm">
-                    <input
-                      autocomplete="off"
-                      class:border-red-500={!is_card_count_valid}
-                      class:focus:border-red-500={!is_card_count_valid}
-                      class:focus:ring-red-500={!is_card_count_valid}
-                      bind:value={card_count}
-                      type="number"
-                      step="1"
-                      name="amount"
-                      class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 p-2"
-                      placeholder="400"
-                    />
-                    <span
-                      class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 text-sm"
-                      >{$_("cards")}</span
-                    >
-                  </div>
-                  {#if !is_card_count_valid}
-                    <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("you-must-create-at-least-one-card-or-cancel")}
-                    </span>
-                  {/if}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-          <button
-            disabled={!createbtnenabled}
-            class:opacity-50={!createbtnenabled}
-            on:click={submit_with_print}
-            type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("create-and-generate-pdf")}
-          </button>
-          <button
-            disabled={!createbtnenabled}
-            class:opacity-50={!createbtnenabled}
-            on:click={submit_without_print}
-            type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-400 text-base font-medium text-white hover:bg-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("create-without-pdf")}
-          </button>
-          <button
-            on:click={() => {
-              bulk_modal_open = false;
-            }}
-            type="button"
-            class="mr-auto w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
-          >
-            {$_("cancel")}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}

src/components/cards/AddCardModal.svelte

@@ -1,191 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import { clickOutside } from "../base/outsideclick";
-
-  import { RunnerCardService, RunnerService } from "@odit/lfk-client-js";
-  import Select from "svelte-select";
-  import { createEventDispatcher } from "svelte";
-  import toast from "svelte-french-toast";
-  export let modal_open;
-
-  const dispatch = createEventDispatcher();
-  const getRunnerLabel = (option) => {
-    if (option.middlename) {
-      return option.firstname + " " + option.middlename + " " + option.lastname;
-    }
-    return option.firstname + " " + option.lastname;
-  };
-
-  const filterRunners = (label, filterText, option) => {
-    if (filterText.startsWith("#")) {
-      return option.value.id == parseInt(filterText.replace("#", ""));
-    }
-    return (
-      label.toLowerCase().includes(filterText.toLowerCase()) ||
-      option.value.toString().startsWith(filterText.toLowerCase())
-    );
-  };
-  function focus(el) {
-    el.focus();
-  }
-  $: runner = 0;
-  $: enabled = true;
-  $: processed_last_submit = true;
-
-  let loading = true;
-  let runners = [];
-  RunnerService.runnerControllerGetAll().then((val) => {
-    runners = val.map((r) => {
-      return { label: getRunnerLabel(r), value: r };
-    });
-    loading = false;
-  });
-  $: createbtnenabled = true;
-  (() => {
-    document.onkeydown = (e) => {
-      e = e || window.event;
-      if (e.key === "Escape") {
-        modal_open = false;
-      }
-      if (e.keyCode === 13) {
-        if (createbtnenabled === true) {
-          createbtnenabled = false;
-          submit();
-        }
-      }
-    };
-  })();
-  function submit() {
-    if (processed_last_submit === true) {
-      processed_last_submit = false;
-      toast.loading($_("adding-card"));
-      let postdata = {
-        runner,
-        enabled,
-      };
-      RunnerCardService.runnerCardControllerPost(postdata)
-        .then((result) => {
-          runner = 0;
-          modal_open = false;
-          //
-          toast.dismiss();
-          toast.success($_("card-added"));
-          dispatch("created", { cards: [result] });
-        })
-        .catch((err) => {
-          //
-        })
-        .finally(() => {
-          processed_last_submit = true;
-        });
-    }
-  }
-</script>
-
-{#if modal_open}
-  <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
-    use:clickOutside
-    on:click_outside={() => {
-      modal_open = false;
-    }}
-  >
-    <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
-      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
-        <div
-          class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
-      </div>
-      <span
-        class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
-      <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-        role="dialog"
-        aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
-            <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
-              <svg
-                class="size-6 text-blue-600"
-                fill="currentColor"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
-                <path
-                  fill="currentColor"
-                  d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z"
-                /></svg
-              >
-            </div>
-            <div class="mt-3 sm:mt-0">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("create-a-new-card")}
-              </h3>
-              <div class="mb-6">
-                <p class="text-sm text-gray-500">
-                  {$_("you-can-provide-a-runner-but-you-dont-have-to")}
-                  {$_(
-                    "if-you-want-to-create-multiple-blanco-cards-try-the-add-bulk-button"
-                  )}
-                </p>
-              </div>
-              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
-                <div class="col-span-6">
-                  <label
-                    for="donor"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("runner")}</label
-                  >
-                  <Select
-                    containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    itemFilter={(label, filterText, option) =>
-                      filterRunners(label, filterText, option)}
-                    items={runners}
-                    bind:loading
-                    showChevron={!loading}
-                    placeholder={$_("search-for-runner-by-name-or-id")}
-                    noOptionsMessage={$_("no-runners-found")}
-                    on:select={(selectedValue) =>
-                      (runner = selectedValue.detail.value.id)}
-                    on:clear={() => (runner = null)}
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-          <button
-            disabled={!createbtnenabled}
-            class:opacity-50={!createbtnenabled}
-            on:click={submit}
-            type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("create")}
-          </button>
-          <button
-            on:click={() => {
-              modal_open = false;
-            }}
-            type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}

src/components/cards/CardDetailModal.svelte

@@ -1,200 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import { clickOutside } from "../base/outsideclick";
-
-  import { RunnerCardService, RunnerService } from "@odit/lfk-client-js";
-  import Select from "svelte-select";
-  import { createEventDispatcher } from "svelte";
-  import toast from "svelte-french-toast";
-  export let edit_modal_open;
-  export let runner = {};
-  export let editable = {};
-  export let original_data = {};
-  const getRunnerLabel = (option) =>
-    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
-  const filterRunners = (label, filterText, option) => {
-    if (filterText.startsWith("#")) {
-      return option.value.id == parseInt(filterText.replace("#", ""));
-    }
-    return (
-      label.toLowerCase().includes(filterText.toLowerCase()) ||
-      option.value.toString().startsWith(filterText.toLowerCase())
-    );
-  };
-
-  function focus(el) {
-    el.focus();
-  }
-  $: runners = [];
-  $: enabled = true;
-  $: processed_last_submit = true;
-  const dispatch = createEventDispatcher();
-  RunnerService.runnerControllerGetAll().then((val) => {
-    runners = val.map((r) => {
-      return { label: getRunnerLabel(r), value: r };
-    });
-  });
-  $: createbtnenabled = !(
-    JSON.stringify(editable) === JSON.stringify(original_data)
-  );
-  (() => {
-    document.onkeydown = (e) => {
-      e = e || window.event;
-      if (e.key === "Escape") {
-        edit_modal_open = false;
-      }
-      if (e.keyCode === 13) {
-        if (createbtnenabled === true) {
-          createbtnenabled = false;
-          submit();
-        }
-      }
-    };
-  })();
-  function submit() {
-    if (processed_last_submit === true) {
-      processed_last_submit = false;
-      toast.loading($_("updating-card"));
-      RunnerCardService.runnerCardControllerPut(original_data.id, editable)
-        .then((result) => {
-          runner = {};
-          editable = {};
-          original_data = {};
-          edit_modal_open = false;
-          //
-          toast.dismiss();
-          toast.success($_("card-updated"));
-          dispatch("dataUpdated", { card: result });
-        })
-        .catch((err) => {
-          //
-        })
-        .finally(() => {
-          processed_last_submit = true;
-        });
-    }
-  }
-</script>
-
-{#if edit_modal_open}
-  <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
-    use:clickOutside
-    on:click_outside={() => {
-      edit_modal_open = false;
-    }}
-  >
-    <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
-      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
-        <div
-          class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
-      </div>
-      <span
-        class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
-      <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-        role="dialog"
-        aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
-            <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
-              <svg
-                class="size-6 text-blue-600"
-                fill="currentColor"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
-                <path
-                  fill="currentColor"
-                  d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z"
-                /></svg
-              >
-            </div>
-            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("edit-a-card")}
-              </h3>
-              <div class="mb-6">
-                <p class="text-sm text-gray-500">
-                  {$_("you-can-provide-a-runner-but-you-dont-have-to")}
-                </p>
-              </div>
-              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
-                <div class="col-span-6">
-                  <label
-                    for="runner"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("runner")}</label
-                  >
-                  <Select
-                    containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    itemFilter={(label, filterText, option) =>
-                      filterRunners(label, filterText, option)}
-                    items={runners}
-                    showChevron={true}
-                    placeholder={$_("search-for-runner-by-name-or-id")}
-                    noOptionsMessage={$_("no-runners-found")}
-                    bind:selectedValue={runner}
-                    on:select={(selectedValue) =>
-                      (editable.runner = selectedValue.detail.value.id)}
-                    on:clear={() => (editable.runner = null)}
-                  />
-                </div>
-                <div class="col-span-6">
-                  <p class="text-gray-500">
-                    <input
-                      id="enabled"
-                      on:change={() => {
-                        editable.enabled = !editable.enabled;
-                      }}
-                      name="enabled"
-                      type="checkbox"
-                      checked={editable.enabled}
-                      class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-                    />
-                    {$_("this-card-is")}
-                    {#if editable.enabled}
-                      {$_("enabled")}
-                    {:else}{$_("disabled")}{/if}
-                  </p>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-          <button
-            disabled={!createbtnenabled}
-            class:opacity-50={!createbtnenabled}
-            on:click={submit}
-            type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("save-changes")}
-          </button>
-          <button
-            on:click={() => {
-              edit_modal_open = false;
-            }}
-            type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}

src/components/cards/CardRunner.svelte

@@ -1,16 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  export let runner;
-</script>
-
-{#if !runner}
-  {$_("non-blanko")}
-{:else}
-  <a class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-blue-100 text-blue-800" href={`/runners/${runner.id}`}>
-    {#if runner.middlename}
-      {runner.firstname} {runner.middlename} {runner.lastname}
-    {:else}
-      {runner.firstname} {runner.lastname}
-    {/if}
-  </a>
-{/if}

src/components/cards/CardStatus.svelte

@@ -1,16 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  export let enabled = false;
-</script>
-
-{#if enabled}
-  <span
-    class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-green-100 text-green-800"
-    >{$_("enabled")}</span
-  >
-{:else}
-  <span
-    class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-red-100 text-red-800"
-    >{$_("disabled")}</span
-  >
-{/if}

src/components/cards/Cards.svelte

@@ -1,53 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import store from "../../store";
-  import AddCardBulkModal from "./AddCardBulkModal.svelte";
-  import AddCardModal from "./AddCardModal.svelte";
-  import CardsOverview from "./CardsOverview.svelte";
-  $: current_cards = [];
-  export let modal_open = false;
-  export let bulk_modal_open = false;
-  let addCards;
-</script>
-
-<section class="container p-5">
-  <h4 class="mb-1 text-3xl font-extrabold leading-tight">
-    {$_("cards")}
-  </h4>
-  {#if store.state.jwtinfo.userdetails.permissions.includes("CARD:CREATE")}
-    <button
-      on:click={() => {
-        modal_open = true;
-      }}
-      type="button"
-      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm  mb-1 lg:mb-0"
-    >
-      {$_("add-card")}
-    </button>
-    <button
-      on:click={() => {
-        bulk_modal_open = true;
-      }}
-      type="button"
-      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm  mb-1 lg:mb-0"
-    >
-      {$_("create-bulk-cards")}
-    </button>
-  {/if}
-  <CardsOverview bind:current_cards bind:addCards />
-</section>
-
-{#if store.state.jwtinfo.userdetails.permissions.includes("CARD:CREATE")}
-  <AddCardModal
-    bind:modal_open
-    on:created={(event) => {
-      addCards(event.detail.cards);
-    }}
-  />
-  <AddCardBulkModal
-    bind:bulk_modal_open
-    on:created={(event) => {
-      addCards(event.detail.cards);
-    }}
-  />
-{/if}

src/components/cards/CardsEmptyState.svelte

@@ -1,12 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import cards_empty from "./cards.svg";
-</script>
-
-<div class="text-center items-center justify-center">
-  <p class="mb-16 text-lg text-gray-500">
-    <img class="m-auto mt-2" style="height:15rem" src={cards_empty} alt="" />
-    <span class="font-bold">{$_("there-are-no-cards-yet")}</span><br />
-    <span>{$_("add-your-first-card")}</span>
-  </p>
-</div>

src/components/cards/CardsOverview.svelte

@@ -1,314 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import { RunnerCardService } from "@odit/lfk-client-js";
-  import store from "../../store";
-  import toast from "svelte-french-toast";
-  import CardsEmptyState from "./CardsEmptyState.svelte";
-  import CardDetailModal from "./CardDetailModal.svelte";
-  import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
-  import InputElement from "../shared/InputElement.svelte";
-  import {
-    createSvelteTable,
-    flexRender,
-    getCoreRowModel,
-    getFilteredRowModel,
-    getPaginationRowModel,
-    getSortedRowModel,
-    renderComponent,
-  } from "@tanstack/svelte-table";
-  import { writable } from "svelte/store";
-  import TableBottom from "../shared/TableBottom.svelte";
-  import TableActions from "../shared/TableActions.svelte";
-  import TableHeader from "../shared/TableHeader.svelte";
-  import CardStatus from "./CardStatus.svelte";
-  import CardRunner from "./CardRunner.svelte";
-  import { onMount } from "svelte";
-  import { runnerFilter, statusFilter } from "../shared/tablefilters";
-  import DeleteCardModal from "./DeleteCardModal.svelte";
-
-  export let edit_modal_open = false;
-  export let runner = {};
-  export let editable = {};
-  export let original_data = {};
-  export let current_cards = [];
-  export const addCards = (cards) => {
-    current_cards = current_cards.concat(...cards);
-    options.update((options) => ({
-      ...options,
-      data: current_cards,
-    }));
-  };
-
-  $: dataLoaded = false;
-  $: selected =
-    $table?.getSelectedRowModel().rows.map((row) => row.index) || [];
-  $: selectedCards =
-    $table?.getSelectedRowModel().rows.map((row) => row.original) || [];
-  $: active_delete = undefined;
-  $: cards_show = generate_cards.length > 0;
-  $: generate_cards = [];
-
-  const columns = [
-    {
-      accessorKey: "code",
-      header: () => $_("code"),
-      filterFn: `includesString`,
-    },
-    {
-      accessorKey: "runner",
-      header: () => $_("runner"),
-      cell: (info) => {
-        return renderComponent(CardRunner, { runner: info.getValue() });
-      },
-      filterFn: `runner`,
-    },
-    {
-      accessorKey: "enabled",
-      cell: (info) => {
-        return renderComponent(CardStatus, { enabled: info.getValue() });
-      },
-      header: () => $_("status"),
-      filterFn: `status`,
-    },
-    {
-      accessorKey: "actions",
-      header: () => $_("action"),
-      cell: (info) => {
-        return renderComponent(TableActions, {
-          detailsAction: () => {
-            open_edit_modal(
-              current_cards[
-                current_cards.findIndex((r) => r.id == info.row.original.id)
-              ]
-            );
-          },
-          deleteAction: () => {
-            active_delete =
-              current_cards[
-                current_cards.findIndex((r) => r.id == info.row.original.id)
-              ];
-          },
-          deleteEnabled:
-            store.state.jwtinfo.userdetails.permissions.includes("CARD:DELETE"),
-        });
-      },
-      enableColumnFilter: false,
-      enableSorting: false,
-    },
-  ];
-
-  const options = writable({
-    data: [],
-    columns: columns,
-    initialState: {
-      pagination: {
-        pageSize: 50,
-      },
-    },
-    filterFns: {
-      runner: runnerFilter,
-      status: statusFilter,
-    },
-    enableRowSelection: true,
-    getCoreRowModel: getCoreRowModel(),
-    getFilteredRowModel: getFilteredRowModel(),
-    getPaginationRowModel: getPaginationRowModel(),
-    getSortedRowModel: getSortedRowModel(),
-  });
-
-  const table = createSvelteTable(options);
-
-  function open_edit_modal(card) {
-    const getRunnerLabel = (option) =>
-      option.firstname +
-      " " +
-      (option.middlename || "") +
-      " " +
-      option.lastname;
-    if (card.runner?.id) {
-      runner = Object.assign(
-        { runner },
-        { label: getRunnerLabel(card.runner), value: card.runner }
-      );
-      card.runner = card.runner.id;
-    } else {
-      card.runner = null;
-      runner = null;
-    }
-    editable = Object.assign(editable, card);
-    original_data = Object.assign(original_data, card);
-    edit_modal_open = true;
-  }
-
-  async function deleteCard(delete_card_id) {
-    await RunnerCardService.runnerCardControllerRemove(delete_card_id, true);
-    current_cards = current_cards.filter((r) => r.id !== delete_card_id);
-    options.update((options) => ({
-      ...options,
-      data: current_cards,
-    }));
-    toast.success($_("card-deleted"));
-  }
-
-  onMount(async () => {
-    let page = 0;
-    let pagesize = 500;
-    while (page >= 0) {
-      const cards = await RunnerCardService.runnerCardControllerGetAll(
-        page,
-        pagesize
-      );
-      if (cards.length == 0) {
-        page = -2;
-      }
-
-      current_cards = current_cards.concat(...cards);
-      options.update((options) => ({
-        ...options,
-        data: current_cards,
-      }));
-
-      dataLoaded = true;
-      page++;
-    }
-  });
-</script>
-
-{#if store.state.jwtinfo.userdetails.permissions.includes("CARD:UPDATE")}
-  <CardDetailModal
-    bind:edit_modal_open
-    bind:runner
-    bind:editable
-    bind:original_data
-    on:dataUpdated={(editevent) => {
-      console.log(editevent.detail.card)
-      current_cards = current_cards.filter((c) => c.id !== editevent.detail.card.id).concat([editevent.detail.card]).sort((a, b) => a.code - b.code);
-      options.update((options) => ({
-        ...options,
-        data: current_cards,
-      }));
-    }}
-  />
-{/if}
-
-{#if store.state.jwtinfo.userdetails.permissions.includes("CARD:GET")}
-  <DeleteCardModal
-    delete_card={active_delete}
-    modal_open={active_delete != undefined}
-    on:delete={(event) => {
-      deleteCard(event.detail.id);
-    }}
-  />
-  {#if !dataLoaded}
-    <div
-      class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-      role="alert"
-    >
-      <p class="font-bold">{$_("loading-cards")}</p>
-      <p class="text-sm">{$_("this-might-take-a-moment")}</p>
-    </div>
-  {:else if current_cards.length === 0}
-    <CardsEmptyState />
-  {:else}
-    <div class="h-12 mt-1">
-      {#if selected.length > 0}
-        <button
-          type="button"
-          class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm inline-flex"
-          id="options-menu"
-          on:click={async () => {
-            const prom = [];
-            for (const card of selectedCards) {
-              prom.push(
-                await RunnerCardService.runnerCardControllerRemove(
-                  card.id,
-                  true
-                )
-              );
-            }
-            await Promise.all(prom);
-            for (const card of selectedCards) {
-              current_cards = current_cards.filter((r) => r.id !== card.id);
-            }
-            options.update((options) => ({
-              ...options,
-              data: current_cards,
-            }));
-            $table.resetRowSelection();
-          }}
-        >
-          {$_("delete-cards")}
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke-width="1.5"
-            stroke="currentColor"
-            class="w-5 h-5"
-          >
-            <path
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
-            />
-          </svg>
-        </button>
-      {/if}
-      <GenerateRunnerCards
-        cards_show={selected.length > 0}
-        bind:generate_cards={selectedCards}
-      />
-    </div>
-    <div class="overflow-x-auto">
-      <table class="w-full">
-        <thead class="border-b border-gray-400">
-          {#each $table.getHeaderGroups() as headerGroup}
-            <tr class="select-none">
-              <th class="inset-y-0 left-0 px-4 py-2 text-left w-px">
-                <InputElement
-                  type="checkbox"
-                  checked={$table.getIsAllRowsSelected()}
-                  indeterminate={$table.getIsSomeRowsSelected()}
-                  on:change={() => $table.toggleAllRowsSelected()}
-                />
-              </th>
-              {#each headerGroup.headers as header}
-                <TableHeader {header} />
-              {/each}
-            </tr>
-          {/each}
-        </thead>
-        <tbody>
-          {#each $table.getRowModel().rows as row}
-            <tr class="odd:bg-white even:bg-gray-100">
-              <td class="inset-y-0 left-0 px-4 py-2 text-center w-px">
-                <InputElement
-                  type="checkbox"
-                  checked={row.getIsSelected()}
-                  on:change={() => row.toggleSelected()}
-                />
-              </td>
-              {#each row.getVisibleCells() as cell}
-                <td>
-                  <svelte:component
-                    this={flexRender(
-                      cell.column.columnDef.cell,
-                      cell.getContext()
-                    )}
-                  />
-                </td>
-              {/each}
-            </tr>
-          {/each}
-        </tbody>
-      </table>
-    </div>
-    <TableBottom {table} {selected} />
-  {/if}
-{/if}
-
-<style>
-  table tbody tr td:nth-child(2) {
-    font-family: monospace;
-  }
-</style>

src/components/cards/DeleteCardModal.svelte

@@ -1,123 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import { clickOutside } from "../base/outsideclick";
-  import { createEventDispatcher, onMount } from "svelte";
-  export let modal_open;
-  export let delete_card = {
-    id: 0,
-    code: "",
-    runner: {
-      firstname: "",
-      lastname: "",
-    },
-  };
-  const dispatch = createEventDispatcher();
-  onMount(() => {
-    document.onkeydown = (e) => {
-      e = e || window.event;
-      if (e.key === "Escape") {
-        modal_open = false;
-      }
-      if (e.keyCode === 13) {
-        if (createbtnenabled === true) {
-          createbtnenabled = false;
-          submit();
-        }
-      }
-    };
-  });
-  async function submit() {
-    dispatch("delete", { id: delete_card.id });
-    modal_open = false;
-  }
-</script>
-
-{#if modal_open}
-  <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
-    use:clickOutside
-    on:click_outside={() => {
-      modal_open = false;
-    }}
-  >
-    <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
-      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
-        <div
-          class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
-      </div>
-      <span
-        class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
-      <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-        role="dialog"
-        aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
-            <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
-              <svg
-                class="size-6 text-blue-600"
-                fill="currentColor"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
-                <path
-                  fill="currentColor"
-                  d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z"
-                /></svg
-              >
-            </div>
-            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("please-confirm-the-deletion-of-card")}
-              </h3>
-              <div class="w-full">
-                {$_("card")} #{delete_card.code}<br />
-                <span class="inline-block">
-                  {$_("runner")}:
-                  {#if delete_card.runner}
-                    <span class="inline-block"
-                      >{delete_card.runner.firstname}
-                      {delete_card.runner.lastname}</span
-                    >
-                  {:else}
-                    {$_("non-blanko")}
-                  {/if}</span
-                >
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-          <button
-            on:click={submit}
-            type="button"
-            class="confirm_deletion_button"
-          >
-            {$_("delete")}
-          </button>
-          <button
-            on:click={() => {
-              modal_open = false;
-            }}
-            type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}

src/components/cards/cards.svg

@@ -1 +0,0 @@
-<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 653.9 247.6"><path d="M272 211l-53 12s-11-2-1-17l4-4 27-14v-2l-6-41-2-16 17-17 4-3 44 41v1l-19 33z" fill="#ffb7b7"/><path d="M253 198l-54 13a6 6 0 01-5-7 16 16 0 012-5 48 48 0 016-9l28-14-4-24-1-12-2-8-2-16 21-19 22 21 22 20-3 5-3 7-17 30-3 6z" fill="#ffb7b7"/><path d="M346 190s-20-1-28-15a24 24 0 01-3-14l-8-17-11-23-30-4-2 1-21 19-7 6-10 9-49 44a37 37 0 01-7 9 50 50 0 01-9 7c-10 5-24 9-44 7L10 248 0 176l89-29 131-86 89 23 41 58z" fill="#ffb7b7"/><path d="M648 0H275a5 5 0 00-5 5v221a5 5 0 005 6h373a5 5 0 006-6V5a5 5 0 00-6-5z" fill="#fff"/><path d="M648 0H275a5 5 0 00-5 5v221a5 5 0 005 6h373a5 5 0 006-6V5a5 5 0 00-6-5zm4 226a4 4 0 01-4 4H275a4 4 0 01-3-4V5a4 4 0 013-3h373a4 4 0 014 3z" fill="#3f3d56"/><path d="M312 30a9 9 0 119-9 9 9 0 01-9 9zm0-17a8 8 0 107 8 8 8 0 00-7-8z" fill="#6c63ff"/><path d="M297 21a8 8 0 016-8 8 8 0 100 16 8 8 0 01-6-8zM349 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM368 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM386 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM415 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM434 130a7 7 0 01-7-7v-20a7 7 0 0113 0v20a7 7 0 01-6 7zM452 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM481 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM499 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM518 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM546 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM565 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7zM583 130a7 7 0 01-7-7v-20a7 7 0 0114 0v20a7 7 0 01-7 7z" fill="#6c63ff"/><path d="M396 208h-99a5 5 0 110-10h99a5 5 0 010 10zM364 188h-35a5 5 0 110-10h35a5 5 0 110 10z" fill="#e6e6e6"/><path fill="#3f3d56" d="M271 46h381v2H271z"/><path opacity=".1" d="M228 203l-1-2 33-15 8-27-12-10 1-1 13 10-8 30-34 15zM196 199l-9 4-17 2a50 50 0 01-9 7l-16-1-26-1 88-74 18 4-29 59z"/><path d="M318 175l-8 1-47 4-29 1-38 18-9 4-70 8 95-81 11 2 20 5 22 5 18 1 24 1 20 1a13 13 0 0112 13c0 7-5 14-21 17z" fill="#ffb7b7"/><path d="M325 170s-7-2-9-9c-2-4-1-9 3-15l1 1c-3 6-4 10-3 14 2 5 9 7 9 7zM197 197l34-16v2l-33 16zM218 135l48-19v2l-41 16 35 6v2l-42-7z" opacity=".1"/></svg>

src/components/contacts/AddContactModal.svelte

@@ -1,7 +1,7 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-
+  import { focusTrap } from "svelte-focus-trap";
   import {
     GroupContactService,
     RunnerTeamService,
@@ -9,7 +9,7 @@
   } from "@odit/lfk-client-js";
   import isEmail from "validator/es/lib/isEmail";
   import isMobilePhone from "validator/es/lib/isMobilePhone";
-  import toast from "svelte-french-toast";
+  import Toastify from "toastify-js";
   export let modal_open;
   export let current_contacts;
   $: selected_team = [];
@@ -43,7 +43,7 @@
   $: address_zipcode_value = "";
   $: address_city_value = "";
   $: processed_last_submit = true;
-  $: address_checked = false;
+  $: address_checked = true;
   $: isPhoneValidOrEmpty =
     (phone_input_value.includes("+") &&
       isMobilePhone(
@@ -85,7 +85,10 @@
   function submit() {
     if (processed_last_submit === true) {
       processed_last_submit = false;
-      toast.loading($_("contact-is-being-added"));
+      const toast = Toastify({
+        text: "Contact is being added...",
+        duration: -1,
+      }).showToast();
       let address = {};
       if (address_checked === true) {
         address = {
@@ -119,8 +122,11 @@
           email_input_value = "";
           modal_open = false;
           //
-          toast.dismiss();
-          toast.success($_("contact-added"));
+          Toastify({
+            text: "Contact added",
+            duration: 500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
           current_contacts.push(result);
           current_contacts = current_contacts;
         })
@@ -129,6 +135,8 @@
         })
         .finally(() => {
           processed_last_submit = true;
+          //
+          toast.hideToast();
         });
     }
   }
@@ -136,71 +144,59 @@
 
 {#if modal_open}
   <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
+    class="fixed z-10 inset-0 overflow-y-auto"
+    use:focusTrap
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;
-    }}
-  >
+    }}>
     <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
       <div class="fixed inset-0 transition-opacity" aria-hidden="true">
         <div
           class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
+          data-id="modal_backdrop" />
       </div>
       <span
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
+        aria-hidden="true">&#8203;</span>
       <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
+        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
         role="dialog"
         aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
+        aria-labelledby="modal-headline">
+        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+          <div class="sm:flex sm:items-start">
             <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
               <svg
-                class="size-6 text-blue-600"
+                class="h-6 w-6 text-blue-600"
                 fill="currentColor"
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 24 24"
                 width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
                 <path
-                  d="M2 22a8 8 0 1 1 16 0H2zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm10 4h4v2h-4v-2zm-3-5h7v2h-7v-2zm2-5h5v2h-5V7z"
-                /></svg
-              >
+                  d="M2 22a8 8 0 1 1 16 0H2zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm10 4h4v2h-4v-2zm-3-5h7v2h-7v-2zm2-5h5v2h-5V7z" /></svg>
             </div>
-            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("create-a-new-contact")}
+                {$_('create-a-new-contact')}
               </h3>
-              <div class="mb-6">
+              <div class="mt-2 mb-6">
                 <p class="text-sm text-gray-500">
-                  {$_(
-                    "please-provide-the-required-information-to-add-a-new-contact"
-                  )}
+                  {$_('please-provide-the-required-information-to-add-a-new-contact')}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
+              <div class="grid grid-cols-6 gap-6">
                 <div class="col-span-6">
                   <label
                     for="firstname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("first-name")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('first-name')}</label>
                   <input
                     use:focus
                     autocomplete="off"
-                    placeholder={$_("first-name")}
+                    placeholder={$_('first-name')}
                     class:border-red-500={!isFirstnameValid}
                     class:focus:border-red-500={!isFirstnameValid}
                     class:focus:ring-red-500={!isFirstnameValid}
@@ -208,41 +204,34 @@
                     bind:this={firstname_input}
                     type="text"
                     name="firstname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isFirstnameValid}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("first-name-is-required")}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('first-name-is-required')}
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
                     for="trackname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("middle-name")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('middle-name')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("middle-name")}
+                    placeholder={$_('middle-name')}
                     bind:value={middlename_input_value}
                     bind:this={middlename_input}
                     type="text"
                     name="trackname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                 </div>
                 <div class="col-span-6">
                   <label
                     for="lastname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("last-name")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('last-name')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("last-name")}
+                    placeholder="{$_('last-name')}"
                     class:border-red-500={!isLastnameValid}
                     class:focus:border-red-500={!isLastnameValid}
                     class:focus:ring-red-500={!isLastnameValid}
@@ -250,28 +239,23 @@
                     bind:this={lastname_input}
                     type="text"
                     name="lastname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isLastnameValid}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("last-name-is-required")}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('last-name-is-required')}
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
                     for="team"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("teams")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('teams')}</label>
                   <select
                     name="team"
                     multiple
                     bind:value={selected_team}
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  >
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
                     {#each teams as team}
                       <option value={team.id}>
                         {team.parentGroup.name}
@@ -287,12 +271,10 @@
                 <div class="col-span-6">
                   <label
                     for="phone"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("phone")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('phone')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("phone")}
+                    placeholder={$_('phone')}
                     class:border-red-500={!isPhoneValidOrEmpty}
                     class:focus:border-red-500={!isPhoneValidOrEmpty}
                     class:focus:ring-red-500={!isPhoneValidOrEmpty}
@@ -300,27 +282,21 @@
                     bind:this={phone_input}
                     type="tel"
                     name="phone"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isPhoneValidOrEmpty}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {@html $_(
-                        "the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number"
-                      )}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {@html $_('the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number')}
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
                     for="email"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("e-mail-adress")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('e-mail-adress')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("e-mail-adress")}
+                    placeholder={$_('e-mail-adress')}
                     class:border-red-500={!isEmailValidOrEmpty}
                     class:focus:border-red-500={!isEmailValidOrEmpty}
                     class:focus:ring-red-500={!isEmailValidOrEmpty}
@@ -328,13 +304,11 @@
                     bind:this={email_input}
                     type="email"
                     name="email"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isEmailValidOrEmpty}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("valid-email-is-required")}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('valid-email-is-required')}
                     </span>
                   {/if}
                 </div>
@@ -345,25 +319,22 @@
                       id="comments"
                       name="comments"
                       type="checkbox"
-                      class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-                    />
+                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
                   </div>
                   <div class="ml-3 text-sm">
-                    <label for="comments" class="font-semibold text-gray-700"
-                      >{$_("address")}</label
-                    >
+                    <label
+                      for="comments"
+                      class="font-medium text-gray-700">{$_('address')}</label>
                   </div>
                 </div>
                 {#if address_checked === true}
                   <div class="col-span-6">
                     <label
                       for="address1"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("address")}</label
-                    >
+                      class="block text-sm font-medium text-gray-700">{$_('address')}</label>
                     <input
                       autocomplete="off"
-                      placeholder={$_("address")}
+                      placeholder="{$_('address')}"
                       class:border-red-500={!isAddress1Valid}
                       class:focus:border-red-500={!isAddress1Valid}
                       class:focus:ring-red-500={!isAddress1Valid}
@@ -371,41 +342,34 @@
                       bind:this={address_input1}
                       type="text"
                       name="address1"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
+                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                     {#if !isAddress1Valid}
                       <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("address-is-required")}
+                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                        {$_('address-is-required')}
                       </span>
                     {/if}
                   </div>
                   <div class="col-span-6">
                     <label
                       for="address2"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("apartment-suite-etc")}</label
-                    >
+                      class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
                     <input
                       autocomplete="off"
-                      placeholder={$_("apartment-suite-etc")}
+                      placeholder={$_('apartment-suite-etc')}
                       bind:value={address_input2_value}
                       bind:this={address_input2}
                       type="text"
                       name="address2"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
+                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   </div>
                   <div class="col-span-6">
                     <label
                       for="zipcode"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("zip-postal-code")}</label
-                    >
+                      class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')}</label>
                     <input
                       autocomplete="off"
-                      placeholder={$_("zip-postal-code")}
+                      placeholder={$_('zip-postal-code')}
                       class:border-red-500={!iszipcodevalid}
                       class:focus:border-red-500={!iszipcodevalid}
                       class:focus:ring-red-500={!iszipcodevalid}
@@ -413,25 +377,21 @@
                       bind:this={address_zipcode}
                       type="text"
                       name="zipcode"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
+                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                     {#if !iszipcodevalid}
                       <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("valid-zipcode-postal-code-is-required")}
+                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                        {$_('valid-zipcode-postal-code-is-required')}
                       </span>
                     {/if}
                   </div>
                   <div class="col-span-6">
                     <label
                       for="city"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("city")}</label
-                    >
+                      class="block text-sm font-medium text-gray-700">{$_('city')}</label>
                     <input
                       autocomplete="off"
-                      placeholder={$_("city")}
+                      placeholder="{$_('city')}"
                       class:border-red-500={!iscityvalid}
                       class:focus:border-red-500={!iscityvalid}
                       class:focus:ring-red-500={!iscityvalid}
@@ -439,13 +399,11 @@
                       bind:this={address_city}
                       type="text"
                       name="city"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
+                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                     {#if !iscityvalid}
                       <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("valid-city-is-required")}
+                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                        {$_('valid-city-is-required')}
                       </span>
                     {/if}
                   </div>
@@ -454,24 +412,22 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
+        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
             on:click={submit}
             type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("create")}
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('create')}
           </button>
           <button
             on:click={() => {
               modal_open = false;
             }}
             type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
+            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('cancel')}
           </button>
         </div>
       </div>

src/components/contacts/ContactDetail.svelte

@@ -1,399 +1,394 @@
 <script>
-	import { _ } from "svelte-i18n";
-	import store from "../../store";
-	import {
-		GroupContactService,
-		RunnerTeamService,
-		RunnerOrganizationService,
-	} from "@odit/lfk-client-js";
-	import PromiseError from "../base/PromiseError.svelte";
-	import isEmail from "validator/es/lib/isEmail";
-	import toast from "svelte-french-toast";
-	let data_loaded = false;
-	let orgs = [];
-	let teams = [];
-	export let params;
-	$: delete_triggered = false;
-	$: original_data = {};
-	$: editable = {};
-	$: changes_performed = !(
-		JSON.stringify(original_data) === JSON.stringify(editable)
-	);
-	$: isEmailValid =
-		(editable.email || "") === "" ||
-		(editable.email && isEmail(editable.email || ""));
-	$: isFirstnameValid = editable.firstname !== "";
-	$: isLastnameValid = editable.lastname !== "";
-	$: save_enabled =
-		changes_performed &&
-		isFirstnameValid &&
-		isLastnameValid &&
-		isEmailValid &&
-		isPhoneValidOrEmpty &&
-		((isAddress1Valid && iszipcodevalid && iscityvalid) ||
-			editable.address_checked === false);
-	const promise = GroupContactService.groupContactControllerGetOne(
-		params.contact
-	).then((data) => {
-		data_loaded = true;
-		original_data = Object.assign(original_data, data);
-		editable = Object.assign(editable, original_data);
-		editable.groups = editable.groups.map((g) => g.id);
-		original_data.groups = original_data.groups.map((g) => g.id);
-		editable.address_checked = editable.address.address1 !== null;
-		original_data.address_checked = editable.address.address1 !== null;
-		if (editable.address_checked === false) {
-			editable.address = {
-				address1: "",
-				address2: "",
-				city: "",
-				postalcode: "",
-				country: "",
-			};
-		}
-	});
-	RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
-		orgs = val;
-	});
-	RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
-		teams = val;
-	});
-	$: isPhoneValidOrEmpty =
-		editable.phone?.includes("+") ||
-		editable.phone === "" ||
-		editable.phone === null;
-	$: isAddress1Valid = editable.address?.address1?.trim().length !== 0;
-	$: iszipcodevalid = editable.address?.postalcode?.trim().length !== 0;
-	$: iscityvalid = editable.address?.city?.trim().length !== 0;
-	function submit() {
-		if (data_loaded === true && save_enabled) {
-			toast.loading($_("contact-is-being-updated"));
-			editable.address.country = "DE";
-			if (editable.address_checked === false) {
-				editable.address = null;
-			}
-			if (editable.email) editable.email = editable.email;
-			if (editable.phone) editable.phone = editable.phone;
-			if (editable.middlename) editable.middlename = editable.middlename;
-			GroupContactService.groupContactControllerPut(original_data.id, editable)
-				.then((resp) => {
-					Object.assign(original_data, editable);
-					original_data = original_data;
-					toast.dismiss();
-					toast.success($_("updated-contact"));
-				})
-				.catch((err) => {});
-		} else {
-		}
-	}
-	function deleteContact() {
-		GroupContactService.groupContactControllerRemove(original_data.id, true)
-			.then((resp) => {
-				location.replace("./");
-			})
-			.catch((err) => {});
-	}
+  import { _ } from "svelte-i18n";
+  import store from "../../store";
+  import {
+    GroupContactService,
+    RunnerTeamService,
+    RunnerOrganizationService,
+  } from "@odit/lfk-client-js";
+  import Toastify from "toastify-js";
+  import PromiseError from "../base/PromiseError.svelte";
+  import isEmail from "validator/es/lib/isEmail";
+  let data_loaded = false;
+  let orgs = [];
+  let teams = [];
+  export let params;
+  $: delete_triggered = false;
+  $: original_data = {};
+  $: editable = {};
+  $: changes_performed = !(
+    JSON.stringify(original_data) === JSON.stringify(editable)
+  );
+  $: isEmailValid =
+    (editable.email || "") === "" ||
+    (editable.email && isEmail(editable.email || ""));
+  $: isFirstnameValid = editable.firstname !== "";
+  $: isLastnameValid = editable.lastname !== "";
+  $: save_enabled =
+    changes_performed &&
+    isFirstnameValid &&
+    isLastnameValid &&
+    isEmailValid &&
+    isPhoneValidOrEmpty &&
+    ((isAddress1Valid && iszipcodevalid && iscityvalid) ||
+    editable.address_checked === false);
+  const promise = GroupContactService.groupContactControllerGetOne(
+    params.contact
+  ).then((data) => {
+    data_loaded = true;
+    original_data = Object.assign(original_data, data);
+    editable = Object.assign(editable, original_data);
+    editable.groups = editable.groups.map((g) => g.id);
+    original_data.groups = original_data.groups.map((g) => g.id);
+    editable.address_checked = editable.address.address1 !== null;
+    original_data.address_checked = editable.address.address1 !== null;
+    if(editable.address_checked===false){
+      editable.address = {
+        address1: "",
+        address2: "",
+        city: "",
+        postalcode: "",
+        country: ""
+      }
+    }
+  });
+  RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
+    orgs = val;
+  });
+  RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
+    teams = val;
+  });
+  $: isPhoneValidOrEmpty =
+    editable.phone?.includes("+") ||
+    editable.phone === "" ||
+    editable.phone === null;
+  $: isAddress1Valid = editable.address?.address1?.trim().length !== 0;
+  $: iszipcodevalid = editable.address?.postalcode?.trim().length !== 0;
+  $: iscityvalid = editable.address?.city?.trim().length !== 0;
+  function submit() {
+    if (data_loaded === true && save_enabled) {
+      Toastify({
+        text: $_("contact-is-being-updated"),
+        duration: 2500,
+      }).showToast();
+      editable.address.country = "DE";
+      if (editable.address_checked === false) {
+        editable.address = null;
+      }
+      if (editable.email) editable.email = editable.email;
+      if (editable.phone) editable.phone = editable.phone;
+      if (editable.middlename) editable.middlename = editable.middlename;
+      GroupContactService.groupContactControllerPut(original_data.id, editable)
+        .then((resp) => {
+          Object.assign(original_data, editable);
+          original_data=original_data;
+          Toastify({
+            text: $_("updated-contact"),
+            duration: 2500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
+        })
+        .catch((err) => {});
+    } else {
+    }
+  }
+  function deleteContact() {
+    GroupContactService.groupContactControllerRemove(original_data.id, true)
+      .then((resp) => {
+        location.replace("./");
+      })
+      .catch((err) => {});
+  }
 </script>
 
 {#await promise}
-	{$_("loading-contact-details")}
+  {$_('loading-contact-details')}
 {:then}
-	<section class="container p-5 select-none">
-		<div class="flex flex-row mb-4">
-			<div class="w-full">
-				<nav class="w-full flex">
-					<ol class="list-none flex flex-row items-center justify-start">
-						<li class="flex items-center">
-							<a class="mr-2" href="./"
-								><svg
-									xmlns="http://www.w3.org/2000/svg"
-									width="24"
-									height="24"
-									viewBox="0 0 24 24"
-									fill="none"
-									stroke="currentColor"
-									stroke-width="2"
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									class="inline-block"
-									><path d="m12 19-7-7 7-7" /><path d="M19 12H5" /></svg
-								>
-								{$_("contacts")}</a
-							>
-						</li>
-					</ol>
-				</nav>
-			</div>
-		</div>
-		<div class="mb-4 text-3xl font-extrabold leading-tight">
-			{original_data.firstname}
-			{original_data.middlename || ""}
-			{original_data.lastname}
-			<div data-id="contact_actions_${editable.id}">
-				{#if store.state.jwtinfo.userdetails.permissions.includes("CONTACT:DELETE")}
-					{#if delete_triggered}
-						<button
-							on:click={deleteContact}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-							>{$_("confirm-deletion")}</button
-						>
-						<button
-							on:click={() => {
-								delete_triggered = !delete_triggered;
-							}}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm"
-							>{$_("cancel")}</button
-						>
-					{/if}
-					{#if !delete_triggered}
-						<button
-							on:click={() => {
-								delete_triggered = true;
-							}}
-							type="button"
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-							>{$_("delete-contact")}</button
-						>
-					{/if}
-				{/if}
-				{#if !delete_triggered}
-					<button
-						disabled={!save_enabled}
-						class:opacity-50={!save_enabled}
-						type="button"
-						on:click={submit}
-						class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-						>{$_("save-changes")}</button
-					>
-				{/if}
-			</div>
-		</div>
-		<!--  -->
-		<div class="text-sm w-full mt-2">
-			<label for="firstname" class="font-semibold text-gray-700"
-				>{$_("first-name")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("first-name")}
-				type="text"
-				class:border-red-500={!isFirstnameValid}
-				class:focus:border-red-500={!isFirstnameValid}
-				class:focus:ring-red-500={!isFirstnameValid}
-				bind:value={editable.firstname}
-				name="firstname"
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isFirstnameValid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("first-name-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="text-sm w-full mt-2">
-			<label for="middlename" class="font-semibold text-gray-700"
-				>{$_("middle-name")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("middle-name")}
-				type="text"
-				bind:value={editable.middlename}
-				name="middlename"
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-		</div>
-		<div class="text-sm w-full mt-2">
-			<label for="lastname" class="font-semibold text-gray-700"
-				>{$_("last-name")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("last-name")}
-				type="text"
-				bind:value={editable.lastname}
-				class:border-red-500={!isLastnameValid}
-				class:focus:border-red-500={!isLastnameValid}
-				class:focus:ring-red-500={!isLastnameValid}
-				name="lastname"
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isLastnameValid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("last-name-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="text-sm w-full mt-2">
-			<label for="email" class="font-semibold text-gray-700"
-				>{$_("e-mail-adress")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("e-mail-adress")}
-				type="email"
-				bind:value={editable.email}
-				class:border-red-500={!isEmailValid}
-				class:focus:border-red-500={!isEmailValid}
-				class:focus:ring-red-500={!isEmailValid}
-				name="email"
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isEmailValid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("valid-email-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="text-sm w-full mt-2">
-			<label for="phone" class="font-semibold text-gray-700">{$_("phone")}</label>
-			<input
-				autocomplete="off"
-				placeholder={$_("phone")}
-				type="tel"
-				class:border-red-500={!isPhoneValidOrEmpty}
-				class:focus:border-red-500={!isPhoneValidOrEmpty}
-				class:focus:ring-red-500={!isPhoneValidOrEmpty}
-				bind:value={editable.phone}
-				name="phone"
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isPhoneValidOrEmpty}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("valid-international-phone-number-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="text-sm w-full mt-2">
-			<span class="font-semibold text-gray-700">{$_("groups")}</span>
-			<select
-				bind:value={editable.groups}
-				name="team"
-				multiple
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			>
-				{#each teams as team}
-					<option value={team.id}>
-						{team.parentGroup.name}
-						&gt;
-						{team.name}
-					</option>
-				{/each}
-				{#each orgs as org}
-					<option value={org.id}>{org.name}</option>
-				{/each}
-			</select>
-		</div>
-		<!--  -->
-		<div class="flex items-start mt-2">
-			<div class="flex items-center h-5">
-				<input
-					bind:checked={editable.address_checked}
-					id="comments"
-					name="comments"
-					type="checkbox"
-					class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-				/>
-			</div>
-			<div class="ml-3 text-sm">
-				<label for="comments" class="font-semibold text-gray-700"
-					>{$_("address")}</label
-				>
-			</div>
-		</div>
-		{#if editable.address_checked === true}
-			<div class="col-span-6">
-				<label for="address1" class="block text-sm font-medium text-gray-700"
-					>{$_("address")}</label
-				>
-				<input
-					autocomplete="off"
-					placeholder="Address"
-					class:border-red-500={!isAddress1Valid}
-					class:focus:border-red-500={!isAddress1Valid}
-					class:focus:ring-red-500={!isAddress1Valid}
-					bind:value={editable.address.address1}
-					type="text"
-					name="address1"
-					class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-				{#if !isAddress1Valid}
-					<span
-						class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-					>
-						{$_("address-is-required")}
-					</span>
-				{/if}
-			</div>
-			<div class="col-span-6">
-				<label for="address2" class="block text-sm font-medium text-gray-700"
-					>{$_("apartment-suite-etc")}</label
-				>
-				<input
-					autocomplete="off"
-					placeholder={$_("apartment-suite-etc")}
-					bind:value={editable.address.address2}
-					type="text"
-					name="address2"
-					class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-			</div>
-			<div class="col-span-6">
-				<label for="zipcode" class="block text-sm font-medium text-gray-700"
-					>{$_("zip-postal-code")}</label
-				>
-				<input
-					autocomplete="off"
-					placeholder={$_("zip-postal-code")}
-					class:border-red-500={!iszipcodevalid}
-					class:focus:border-red-500={!iszipcodevalid}
-					class:focus:ring-red-500={!iszipcodevalid}
-					bind:value={editable.address.postalcode}
-					type="text"
-					name="zipcode"
-					class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-				{#if !iszipcodevalid}
-					<span
-						class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-					>
-						{$_("valid-zipcode-postal-code-is-required")}
-					</span>
-				{/if}
-			</div>
-			<div class="col-span-6">
-				<label for="city" class="block text-sm font-medium text-gray-700"
-					>{$_("city")}</label
-				>
-				<input
-					autocomplete="off"
-					placeholder={$_("city")}
-					class:border-red-500={!iscityvalid}
-					class:focus:border-red-500={!iscityvalid}
-					class:focus:ring-red-500={!iscityvalid}
-					bind:value={editable.address.city}
-					type="text"
-					name="city"
-					class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-				{#if !iscityvalid}
-					<span
-						class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-					>
-						{$_("valid-city-is-required")}
-					</span>
-				{/if}
-			</div>
-		{/if}
-	</section>
+  <section class="container p-5 select-none">
+    <div class="flex flex-row mb-4">
+      <div class="w-full">
+        <nav class="w-full flex">
+          <ol class="list-none flex flex-row items-center justify-start">
+            <li class="flex items-center">
+              <svg
+                fill="currentColor"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                width="24"
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
+                <path
+                  d="M2 22a8 8 0 1 1 16 0H2zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm10 4h4v2h-4v-2zm-3-5h7v2h-7v-2zm2-5h5v2h-5V7z" /></svg>
+            </li>
+            <li class="flex items-center ml-2">
+              <a class="mr-2" href="./">{$_('contacts')}</a><svg
+                stroke="currentColor"
+                fill="none"
+                stroke-width="2"
+                viewBox="0 0 24 24"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="h-3 w-3 mr-2 stroke-current"
+                height="1em"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"><line
+                  x1="5"
+                  y1="12"
+                  x2="19"
+                  y2="12" />
+                <polyline points="12 5 19 12 12 19" /></svg>
+            </li>
+            <li class="flex items-center">
+              <span class="mr-2">{original_data.firstname}
+                {original_data.middlename || ''}
+                {original_data.lastname}</span>
+            </li>
+          </ol>
+        </nav>
+      </div>
+    </div>
+    <div class="mb-8 text-3xl font-extrabold leading-tight">
+      {original_data.firstname}
+      {original_data.middlename || ''}
+      {original_data.lastname}
+      <span data-id="contact_actions_${editable.id}">
+        {#if store.state.jwtinfo.userdetails.permissions.includes('CONTACT:DELETE')}
+          {#if delete_triggered}
+            <button
+              on:click={deleteContact}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('confirm-deletion')}</button>
+            <button
+              on:click={() => {
+                delete_triggered = !delete_triggered;
+              }}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm">{$_('cancel')}</button>
+          {/if}
+          {#if !delete_triggered}
+            <button
+              on:click={() => {
+                delete_triggered = true;
+              }}
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('delete-contact')}</button>
+          {/if}
+        {/if}
+        {#if !delete_triggered}
+          <button
+            disabled={!save_enabled}
+            class:opacity-50={!save_enabled}
+            type="button"
+            on:click={submit}
+            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('save-changes')}</button>
+        {/if}
+      </span>
+    </div>
+    <!--  -->
+    <div class="text-sm w-full">
+      <label
+        for="firstname"
+        class="font-medium text-gray-700">{$_('first-name')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('first-name')}
+        type="text"
+        class:border-red-500={!isFirstnameValid}
+        class:focus:border-red-500={!isFirstnameValid}
+        class:focus:ring-red-500={!isFirstnameValid}
+        bind:value={editable.firstname}
+        name="firstname"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isFirstnameValid}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('first-name-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class="text-sm w-full">
+      <label
+        for="middlename"
+        class="font-medium text-gray-700">{$_('middle-name')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('middle-name')}
+        type="text"
+        bind:value={editable.middlename}
+        name="middlename"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+    </div>
+    <div class="text-sm w-full">
+      <label
+        for="lastname"
+        class="font-medium text-gray-700">{$_('last-name')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('last-name')}
+        type="text"
+        bind:value={editable.lastname}
+        class:border-red-500={!isLastnameValid}
+        class:focus:border-red-500={!isLastnameValid}
+        class:focus:ring-red-500={!isLastnameValid}
+        name="lastname"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isLastnameValid}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('last-name-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class="text-sm w-full">
+      <label
+        for="email"
+        class="font-medium text-gray-700">{$_('e-mail-adress')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('e-mail-adress')}
+        type="email"
+        bind:value={editable.email}
+        class:border-red-500={!isEmailValid}
+        class:focus:border-red-500={!isEmailValid}
+        class:focus:ring-red-500={!isEmailValid}
+        name="email"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isEmailValid}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('valid-email-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class="text-sm w-full">
+      <label for="phone" class="font-medium text-gray-700">{$_('phone')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('phone')}
+        type="tel"
+        class:border-red-500={!isPhoneValidOrEmpty}
+        class:focus:border-red-500={!isPhoneValidOrEmpty}
+        class:focus:ring-red-500={!isPhoneValidOrEmpty}
+        bind:value={editable.phone}
+        name="phone"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isPhoneValidOrEmpty}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('valid-international-phone-number-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class="text-sm w-full">
+      <span class="font-medium text-gray-700">{$_('groups')}</span>
+      <select
+        bind:value={editable.groups}
+        name="team"
+        multiple
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
+        {#each teams as team}
+          <option value={team.id}>
+            {team.parentGroup.name}
+            &gt;
+            {team.name}
+          </option>
+        {/each}
+        {#each orgs as org}
+          <option value={org.id}>{org.name}</option>
+        {/each}
+      </select>
+    </div>
+    <!--  -->
+    <div class="flex items-start mt-2">
+      <div class="flex items-center h-5">
+        <input
+          bind:checked={editable.address_checked}
+          id="comments"
+          name="comments"
+          type="checkbox"
+          class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+      </div>
+      <div class="ml-3 text-sm">
+        <label
+          for="comments"
+          class="font-medium text-gray-700">{$_('address')}</label>
+      </div>
+    </div>
+    {#if editable.address_checked === true}
+      <div class="col-span-6">
+        <label
+          for="address1"
+          class="block text-sm font-medium text-gray-700">{$_('address')}</label>
+        <input
+          autocomplete="off"
+          placeholder="Address"
+          class:border-red-500={!isAddress1Valid}
+          class:focus:border-red-500={!isAddress1Valid}
+          class:focus:ring-red-500={!isAddress1Valid}
+          bind:value={editable.address.address1}
+          type="text"
+          name="address1"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !isAddress1Valid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('address-is-required')}
+          </span>
+        {/if}
+      </div>
+      <div class="col-span-6">
+        <label
+          for="address2"
+          class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('apartment-suite-etc')}
+          bind:value={editable.address.address2}
+          type="text"
+          name="address2"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      </div>
+      <div class="col-span-6">
+        <label
+          for="zipcode"
+          class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('zip-postal-code')}
+          class:border-red-500={!iszipcodevalid}
+          class:focus:border-red-500={!iszipcodevalid}
+          class:focus:ring-red-500={!iszipcodevalid}
+          bind:value={editable.address.postalcode}
+          type="text"
+          name="zipcode"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !iszipcodevalid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('valid-zipcode-postal-code-is-required')}
+          </span>
+        {/if}
+      </div>
+      <div class="col-span-6">
+        <label
+          for="city"
+          class="block text-sm font-medium text-gray-700">{$_('city')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('city')}
+          class:border-red-500={!iscityvalid}
+          class:focus:border-red-500={!iscityvalid}
+          class:focus:ring-red-500={!iscityvalid}
+          bind:value={editable.address.city}
+          type="text"
+          name="city"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !iscityvalid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('valid-city-is-required')}
+          </span>
+        {/if}
+      </div>
+    {/if}
+  </section>
 {:catch error}
-	<PromiseError {error} />
+  <PromiseError {error} />
 {/await}

src/components/contacts/Contacts.svelte

@@ -8,23 +8,22 @@
 </script>
 
 <section class="container p-5">
-  <h4 class="mb-1 text-3xl font-extrabold leading-tight">
-    {$_("contacts")}
-  </h4>
-  {#if store.state.jwtinfo.userdetails.permissions.includes("CONTACT:CREATE")}
-    <button
-      on:click={() => {
-        modal_open = true;
-      }}
-      type="button"
-      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm"
-    >
-      {$_("create-a-new-contact")}
-    </button>
-  {/if}
+  <span class="mb-1 text-3xl font-extrabold leading-tight">
+    {$_('contacts')}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('CONTACT:CREATE')}
+      <button
+        on:click={() => {
+          modal_open = true;
+        }}
+        type="button"
+        class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+        {$_('create-a-new-contact')}
+      </button>
+    {/if}
+  </span>
   <ContactsOverview bind:current_contacts />
 </section>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes("CONTACT:CREATE")}
+{#if store.state.jwtinfo.userdetails.permissions.includes('CONTACT:CREATE')}
   <AddContactModal bind:current_contacts bind:modal_open />
 {/if}

src/components/contacts/ContactsEmptyState.svelte

@@ -9,8 +9,8 @@
 <div class="text-center items-center justify-center">
   <p class="mb-16 text-lg text-gray-500">
     <img class="w-full h-44" src={team_empty} alt="" />
-    <span class="font-bold">{$_("there-are-no-contacts-added-yet")}</span><br />
-    <span>{$_("add-your-first-contact")}</span>
+    <span class="font-bold">{$_('there-are-no-contacts-added-yet')}</span><br />
+    <span>{$_('add-your-first-contact')}</span>
   </p>
 </div>
 

src/components/contacts/ContactsOverview.svelte

@@ -1,198 +1,177 @@
 <script>
-	import { _ } from "svelte-i18n";
-	import { GroupContactService } from "@odit/lfk-client-js";
-	const promise = GroupContactService.groupContactControllerGetAll().then(
-		(result) => {
-			current_contacts = result;
-		}
-	);
-	import store from "../../store";
-	import ContactsEmptyState from "./ContactsEmptyState.svelte";
-	import toast from "svelte-french-toast";
-	$: searchvalue = "";
-	$: active_deletes = [];
-	export let current_contacts = [];
+  import { _ } from "svelte-i18n";
+  import Toastify from "toastify-js";
+  import { GroupContactService } from "@odit/lfk-client-js";
+  const promise = GroupContactService.groupContactControllerGetAll().then(
+    (result) => {
+      current_contacts = result;
+    }
+  );
+  import store from "../../store";
+  import ContactsEmptyState from "./ContactsEmptyState.svelte";
+  $: searchvalue = "";
+  $: active_deletes = [];
+  export let current_contacts = [];
 </script>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes("TEAM:GET")}
-	{#await promise}
-		<div
-			class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-			role="alert"
-		>
-			<p class="font-bold">{$_("contacts-are-being-loaded")}</p>
-			<p class="text-sm">{$_("this-might-take-a-moment")}</p>
-		</div>
-	{:then}
-		{#if current_contacts.length === 0}
-			<ContactsEmptyState />
-		{:else}
-			<input
-				type="search"
-				bind:value={searchvalue}
-				placeholder={$_("datatable.search")}
-				aria-label={$_("datatable.search")}
-				class="mb-2 w-full sm:w-auto mt-1 sm:mt-0 p-2 rounded-md border"
-			/>
-			<div
-				class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll"
-			>
-				<table class="divide-y divide-gray-200 w-full">
-					<thead class="bg-gray-50">
-						<tr class="odd:bg-white even:bg-gray-100">
-							<th
-								scope="col"
-								class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-							>
-								{$_("name")}
-							</th>
-							<th
-								scope="col"
-								class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-							>
-								{$_("groups")}
-							</th>
-							<th
-								scope="col"
-								class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-							>
-								{$_("address")}
-							</th>
-							<th scope="col" class="relative px-6 py-3">
-								<span class="sr-only">{$_("action")}</span>
-							</th>
-						</tr>
-					</thead>
-					<tbody class="divide-y divide-gray-200">
-						{#each current_contacts as t}
-							{#if Object.values(t)
-								.toString()
-								.toLowerCase()
-								.includes(searchvalue)}
-								<tr
-									class="odd:bg-white even:bg-gray-100"
-									data-rowid="team_{t.id}"
-								>
-									<td class="px-6 py-4 whitespace-nowrap">
-										<div class="flex items-center">
-											<div class="ml-4">
-												<div class="text-sm font-medium text-gray-900">
-													{t.firstname}
-													{t.middlename || ""}
-													{t.lastname}
-												</div>
-											</div>
-										</div>
-									</td>
-									<td class="px-6 py-4 whitespace-nowrap">
-										<div class="flex items-center">
-											<div
-												class="text-sm font-medium text-gray-900 gap-0.5 flex flex-wrap"
-											>
-												{#if t.groups.length > 0}
-													{#each t.groups as g}
-														{#if g.responseType === "RUNNERORGANIZATION"}
-															<a
-																href="../orgs/{g.id}"
-																class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800 border border-current"
-																>{g.name}</a
-															>
-														{:else}
-															<a
-																href="../teams/{g.id}"
-																class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800 border border-current"
-																>{g.parentGroup.name}
-																&gt;
-																{g.name}</a
-															>
-														{/if}
-													{/each}
-												{:else}
-													{$_("contact-is-not-a-member-in-any-group")}
-												{/if}
-											</div>
-										</div>
-									</td>
-									<td class="px-6 py-4 whitespace-nowrap">
-										<div class="flex items-center">
-											<div class="ml-4">
-												<div class="text-sm font-medium text-gray-900">
-													{#if t.address.address1 !== null}
-														{t.address.address1}<br />
-														{t.address.address2 || ""}<br />
-														{t.address.postalcode}
-														{t.address.city}
-														{t.address.country}
-													{/if}
-												</div>
-											</div>
-										</div>
-									</td>
-									{#if active_deletes[t.id] === true}
-										<td
-											class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
-										>
-											<button
-												on:click={() => {
-													active_deletes[t.id] = false;
-												}}
-												tabindex="0"
-												class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer"
-												>{$_("cancel-delete")}</button
-											>
-											<button
-												on:click={() => {
-													toast.loading($_("deleting-contact"));
-													GroupContactService.groupContactControllerRemove(
-														t.id,
-														false
-													).then((resp) => {
-														current_contacts = current_contacts.filter(
-															(obj) => obj.id !== t.id
-														);
-														toast.dismiss();
-														toast.success($_("contact-deleted"));
-													});
-												}}
-												tabindex="0"
-												class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-												>{$_("confirm-delete")}</button
-											>
-										</td>
-									{:else}
-										<td
-											class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
-										>
-											<a
-												href="./{t.id}"
-												class="text-indigo-600 hover:text-indigo-900"
-												>{$_("details")}</a
-											>
-											{#if store.state.jwtinfo.userdetails.permissions.includes("TEAM:DELETE")}
-												<button
-													on:click={() => {
-														active_deletes[t.id] = true;
-													}}
-													tabindex="0"
-													class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-													>{$_("delete")}</button
-												>
-											{/if}
-										</td>
-									{/if}
-								</tr>
-							{/if}
-						{/each}
-					</tbody>
-				</table>
-			</div>
-		{/if}
-	{:catch error}
-		<div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
-			<span class="inline-block align-middle mr-8">
-				<b>{$_("general_promise_error")}</b>
-				{error}
-			</span>
-		</div>
-	{/await}
+{#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:GET')}
+  {#await promise}
+    <div
+      class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
+      role="alert">
+      <p class="font-bold">{$_('contacts-are-being-loaded')}</p>
+      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
+    </div>
+  {:then}
+    {#if current_contacts.length === 0}
+      <ContactsEmptyState />
+    {:else}
+      <input
+        type="search"
+        bind:value={searchvalue}
+        placeholder={$_('datatable.search')}
+        aria-label={$_('datatable.search')}
+        class="gridjs-input gridjs-search-input mb-4" />
+      <div
+        class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
+        <table class="divide-y divide-gray-200 w-full">
+          <thead class="bg-gray-50">
+            <tr>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('name')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('groups')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('address')}
+              </th>
+              <th scope="col" class="relative px-6 py-3">
+                <span class="sr-only">{$_('action')}</span>
+              </th>
+            </tr>
+          </thead>
+          <tbody class="divide-y divide-gray-200">
+            {#each current_contacts as t}
+              {#if Object.values(t)
+                .toString()
+                .toLowerCase()
+                .includes(searchvalue)}
+                <tr data-rowid="team_{t.id}">
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="flex items-center">
+                      <div class="ml-4">
+                        <div class="text-sm font-medium text-gray-900">
+                          {t.firstname}
+                          {t.middlename || ''}
+                          {t.lastname}
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="flex items-center">
+                      <div class="ml-4">
+                        <div class="text-sm font-medium text-gray-900">
+                          {#if t.groups.length > 0}
+                            {#each t.groups as g}
+                              {#if g.responseType === 'RUNNERORGANIZATION'}
+                                <a
+                                  href="../orgs/{g.id}"
+                                  class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{g.name}</a>
+                              {:else}
+                                <a
+                                  href="../teams/{g.id}"
+                                  class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{g.parentGroup.name}
+                                  &gt;
+                                  {g.name}</a>
+                              {/if}
+                            {/each}
+                          {:else}
+                            {$_('contact-is-not-a-member-in-any-group')}
+                          {/if}
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="flex items-center">
+                      <div class="ml-4">
+                        <div class="text-sm font-medium text-gray-900">
+                          {#if t.address.address1 !== null}
+                            {t.address.address1}<br />
+                            {t.address.address2 || ''}<br />
+                            {t.address.postalcode}
+                            {t.address.city}
+                            {t.address.country}
+                          {/if}
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                  {#if active_deletes[t.id] === true}
+                    <td
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                      <button
+                        on:click={() => {
+                          active_deletes[t.id] = false;
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
+                      <button
+                        on:click={() => {
+                          GroupContactService.groupContactControllerRemove(t.id, false).then(
+                            (resp) => {
+                              current_contacts = current_contacts.filter(
+                                (obj) => obj.id !== t.id
+                              );
+                              Toastify({
+                                text: $_('contact-deleted'),
+                                duration: 500,
+                                backgroundColor:
+                                  'linear-gradient(to right, #00b09b, #96c93d)',
+                              }).showToast();
+                            }
+                          );
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
+                    </td>
+                  {:else}
+                    <td
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                      <a
+                        href="./{t.id}"
+                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
+                      {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:DELETE')}
+                        <button
+                          on:click={() => {
+                            active_deletes[t.id] = true;
+                          }}
+                          tabindex="0"
+                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
+                      {/if}
+                    </td>
+                  {/if}
+                </tr>
+              {/if}
+            {/each}
+          </tbody>
+        </table>
+      </div>
+    {/if}
+  {:catch error}
+    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+      <span class="inline-block align-middle mr-8">
+        <b class="capitalize">{$_('general_promise_error')}</b>
+        {error}
+      </span>
+    </div>
+  {/await}
 {/if}

src/components/dashboard/Dashboard.svelte

@@ -5,7 +5,6 @@
   import { router } from "tinro";
   import NoComponentLoaded from "../base/NoComponentLoaded.svelte";
   import { AuthService } from "@odit/lfk-client-js";
-  import { Toaster } from "svelte-french-toast";
   $: navOpen = false;
   function logout() {
     localForage.clear();
@@ -14,521 +13,296 @@
 </script>
 
 <section class="min-h-screen bg-gray-50">
-  <div
-    class:collapsed_navigation={!navOpen}
-    style="z-index:11;"
-    class="select-none fixed top-0 left-0 h-full pb-10 overflow-x-hidden overflow-y-auto transition origin-left transform border-r w-60 bg-gray-50"
-  >
+  <nav
+    class:-translate-x-full={!navOpen}
+    class:translate-x-0={navOpen}
+    class="select-none fixed top-0 left-0 z-20 h-full pb-10 overflow-x-hidden overflow-y-auto transition origin-left transform border-r w-60 md:translate-x-0 bg-gray-50">
     <a href="/" class="flex items-center px-4 py-5">
       <img src="/lfk-logo.png" alt="Logo" class="h-10" />
-      <h3 class="text-lg font-bold">LfK!Admin</h3>
+      <h3 class="text-lg">Lauf für Kaya! Admin</h3>
     </a>
     <nav class="text-sm font-medium text-gray-600" aria-label="Main Navigation">
       <a
-        class:activenav={$router.path === "/"}
-        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-        href="/"
-      >
+        class:bg-gray-100={$router.path === '/'}
+        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+        href="/">
         <svg
-          class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+          class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
           xmlns="http://www.w3.org/2000/svg"
           viewBox="0 0 20 20"
-          fill="currentColor"
-        >
+          fill="currentColor">
           <path
-            d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z"
-          />
+            d="M10.707 2.293a1 1 0 00-1.414 0l-7 7a1 1 0 001.414 1.414L4 10.414V17a1 1 0 001 1h2a1 1 0 001-1v-2a1 1 0 011-1h2a1 1 0 011 1v2a1 1 0 001 1h2a1 1 0 001-1v-6.586l.293.293a1 1 0 001.414-1.414l-7-7z" />
         </svg>
-        <span>{$_("dashboard-title")}</span>
+        <span>{$_('dashboard-title')}</span>
       </a>
-      <h2 class="px-4 py-2 text-xs font-semibold text-gray-600 uppercase">
-        {$_("quick-tools")}
-      </h2>
-      {#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:GET") && store.state.jwtinfo.userdetails.permissions.includes("CARD:GET")}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:GET')}
         <a
-          class:activenav={$router.path.includes("/tools/cardassignment/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/tools/cardassignment/"
-        >
+          class:bg-gray-100={$router.path.includes('/orgs/')}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/orgs/">
           <svg
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
+            fill="currentColor"
             xmlns="http://www.w3.org/2000/svg"
             viewBox="0 0 24 24"
-            fill="currentColor"
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-          >
-            <path
-              fill-rule="evenodd"
-              d="M14.615 1.595a.75.75 0 0 1 .359.852L12.982 9.75h7.268a.75.75 0 0 1 .548 1.262l-10.5 11.25a.75.75 0 0 1-1.272-.71l1.992-7.302H3.75a.75.75 0 0 1-.548-1.262l10.5-11.25a.75.75 0 0 1 .913-.143Z"
-              clip-rule="evenodd"
-            />
-          </svg>
-
-          <span>{$_("card_assignment_menu")}</span>
-        </a>
-        <a
-          class:activenav={$router.path.includes("/tools/cardreplacement/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/tools/cardreplacement/"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            fill="currentColor"
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-          >
-            <path
-              fill-rule="evenodd"
-              d="M14.615 1.595a.75.75 0 0 1 .359.852L12.982 9.75h7.268a.75.75 0 0 1 .548 1.262l-10.5 11.25a.75.75 0 0 1-1.272-.71l1.992-7.302H3.75a.75.75 0 0 1-.548-1.262l10.5-11.25a.75.75 0 0 1 .913-.143Z"
-              clip-rule="evenodd"
-            />
-          </svg>
-
-          <span>{$_("card-replacement-menu")}</span>
-        </a>
-        {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("SCAN:CREATE")}
-        <a
-          class:activenav={$router.path.includes("/tools/scanclient/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/tools/scanclient/"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            fill="currentColor"
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-          >
-            <path
-              fill-rule="evenodd"
-              d="M14.615 1.595a.75.75 0 0 1 .359.852L12.982 9.75h7.268a.75.75 0 0 1 .548 1.262l-10.5 11.25a.75.75 0 0 1-1.272-.71l1.992-7.302H3.75a.75.75 0 0 1-.548-1.262l10.5-11.25a.75.75 0 0 1 .913-.143Z"
-              clip-rule="evenodd"
-            />
-          </svg>
-
-          <span>{$_("scanclient")}</span>
-        </a>
-        {/if}
-        {#if store.state.jwtinfo.userdetails.permissions.includes("DONATION:CREATE")}
-        <a
-          class:activenav={$router.path.includes("/tools/donationcreate/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/tools/donationcreate/"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            fill="currentColor"
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-          >
-            <path
-              fill-rule="evenodd"
-              d="M14.615 1.595a.75.75 0 0 1 .359.852L12.982 9.75h7.268a.75.75 0 0 1 .548 1.262l-10.5 11.25a.75.75 0 0 1-1.272-.71l1.992-7.302H3.75a.75.75 0 0 1-.548-1.262l10.5-11.25a.75.75 0 0 1 .913-.143Z"
-              clip-rule="evenodd"
-            />
-          </svg>
-
-          <span>{$_("donation-quick-add")}</span>
-        </a>
-        {/if}
-        <h2 class="px-4 py-2 text-xs font-semibold text-gray-600 uppercase">
-          {$_("management")}
-        </h2>
-        {#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:GET")}
-        <a
-          class:activenav={$router.path.includes("/runners/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/runners/"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-            fill="currentColor"
             width="24"
-            height="24"
-            ><path fill="none" d="M0 0h24v24H0z" />
+            height="24"><path fill="none" d="M0 0h24v24H0z" />
             <path
-              d="M9.83 8.79L8 9.456V13H6V8.05h.015l5.268-1.918c.244-.093.51-.14.782-.131a2.616 2.616 0 0 1 2.427 1.82c.186.583.356.977.51 1.182A4.992 4.992 0 0 0 19 11v2a6.986 6.986 0 0 1-5.402-2.547l-.581 3.297L15 15.67V23h-2v-5.986l-2.05-1.987-.947 4.298-6.894-1.215.348-1.97 4.924.868L9.83 8.79zM13.5 5.5a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"
-            /></svg
-          >
-          <span>{$_("runners")}</span>
+              d="M17 19h2v-8h-6v8h2v-6h2v6zM3 19V4a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v5h2v10h1v2H2v-2h1zm4-8v2h2v-2H7zm0 4v2h2v-2H7zm0-8v2h2V7H7z" /></svg>
+          <span>{$_('orgs')}</span>
         </a>
       {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("TEAM:GET")}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('USER:GET')}
         <a
-          class:activenav={$router.path.includes("/teams/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/teams/"
-        >
+          class:bg-gray-100={$router.path === '/users/'}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/users/">
           <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+            xmlns="http://www.w3.org/2000/svg"
+            width="24"
+            height="24"
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
+            fill="currentColor"
+            viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z" />
+            <path
+              d="M12 14v8H4a8 8 0 018-8zm0-1a6 6 0 110-12 6 6 0 010 12zm2.6 5.81a3.51 3.51 0 010-1.62l-1-.57 1-1.74 1 .58a3.5 3.5 0 011.4-.82V13.5h2v1.15a3.5 3.5 0 011.4.8l1-.57 1 1.74-1 .57a3.51 3.51 0 010 1.62l1 .57-1 1.74-1-.58a3.5 3.5 0 01-1.4.82v1.14h-2v-1.15a3.5 3.5 0 01-1.4-.8l-1 .57-1-1.74 1-.57zM18 17a1 1 0 100 2 1 1 0 000-2z" /></svg>
+          <span>{$_('users')}</span>
+        </a>
+      {/if}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('USERGROUP:GET')}
+        <a
+          class:bg-gray-100={$router.path === '/groups/'}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/groups/">
+          <svg
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
             fill="currentColor"
             width="24"
             height="24"
             xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 640 512"
-            ><path
+            viewBox="0 0 640 512"><path
               fill="currentColor"
-              d="M96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112S381.9 32 320 32 208 82.1 208 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"
-            /></svg
-          >
-          <span>{$_("teams")}</span>
+              d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z" /></svg>
+          <span>{$_('user-groups')}</span>
         </a>
       {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("ORGANIZATION:GET")}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:GET')}
         <a
-          class:activenav={$router.path.includes("/orgs/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/orgs/"
-        >
+          class:bg-gray-100={$router.path === '/runners/'}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/runners/">
           <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-            fill="currentColor"
             xmlns="http://www.w3.org/2000/svg"
             viewBox="0 0 24 24"
-            width="24"
-            height="24"
-            ><path fill="none" d="M0 0h24v24H0z" />
-            <path
-              d="M17 19h2v-8h-6v8h2v-6h2v6zM3 19V4a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v5h2v10h1v2H2v-2h1zm4-8v2h2v-2H7zm0 4v2h2v-2H7zm0-8v2h2V7H7z"
-            /></svg
-          >
-          <span>{$_("orgs")}</span>
-        </a>
-      {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("DONOR:GET")}
-        <a
-          class:activenav={$router.path.includes("/donors/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/donors/"
-        >
-          <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
             fill="currentColor"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
             width="24"
-            height="24"
-            ><path fill="none" d="M0 0h24v24H0z" />
+            height="24"><path fill="none" d="M0 0h24v24H0z" />
             <path
-              d="M9.33 11.5h2.17A4.5 4.5 0 0 1 16 16H8.999L9 17h8v-1a5.578 5.578 0 0 0-.886-3H19a5 5 0 0 1 4.516 2.851C21.151 18.972 17.322 21 13 21c-2.761 0-5.1-.59-7-1.625L6 10.071A6.967 6.967 0 0 1 9.33 11.5zM5 19a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v9zM18 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm-7-3a3 3 0 1 1 0 6 3 3 0 0 1 0-6z"
-            /></svg
-          >
-          <span>{$_("donors")}</span>
+              d="M9.83 8.79L8 9.456V13H6V8.05h.015l5.268-1.918c.244-.093.51-.14.782-.131a2.616 2.616 0 0 1 2.427 1.82c.186.583.356.977.51 1.182A4.992 4.992 0 0 0 19 11v2a6.986 6.986 0 0 1-5.402-2.547l-.581 3.297L15 15.67V23h-2v-5.986l-2.05-1.987-.947 4.298-6.894-1.215.348-1.97 4.924.868L9.83 8.79zM13.5 5.5a2 2 0 1 1 0-4 2 2 0 0 1 0 4z" /></svg>
+          <span>{$_('runners')}</span>
         </a>
       {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("DONATION:GET")}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:GET')}
         <a
-          class:activenav={$router.path.includes("/donations/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/donations/"
-        >
+          class:bg-gray-100={$router.path === '/teams/'}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/teams/">
           <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-            fill="currentColor"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            width="24"
-            height="24"
-            ><path fill="none" d="M0 0h24v24H0z" />
-            <path
-              d="M14 2a8 8 0 013.3 15.3A8 8 0 116.7 6.7 8 8 0 0114 2zm-3 7H9v1a2.5 2.5 0 00-.16 5h2.25a.5.5 0 010 1H7v2h2v1h2v-1a2.5 2.5 0 00.16-5H8.91a.5.5 0 010-1H13v-2h-2V9zm3-5a5.99 5.99 0 00-4.48 2.01 8 8 0 018.47 8.47A6 6 0 0014 4z"
-            /></svg
-          >
-          <span>{$_("donations")}</span>
-        </a>
-      {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("TRACK:GET")}
-        <a
-          class:activenav={$router.path === "/tracks/"}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/tracks/"
-        >
-          <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
             fill="currentColor"
             width="24"
             height="24"
             xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 640 512"
-            ><path
+            viewBox="0 0 640 512"><path
               fill="currentColor"
-              d="M635.7 167.2L556.1 31.7c-8.8-15-28.3-20.1-43.5-11.5l-69 39.1L503.3 161c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L416 75l-55.2 31.3 27.9 47.4c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L333.2 122 278 153.3 337.8 255c2.2 3.7.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9l-59.7-101.7-55.2 31.3 27.9 47.4c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9l-27.9-47.5-55.2 31.3 59.7 101.7c2.2 3.7.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L84.9 262.9l-69 39.1C.7 310.7-4.6 329.8 4.2 344.8l79.6 135.6c8.8 15 28.3 20.1 43.5 11.5L624.1 210c15.2-8.6 20.4-27.8 11.6-42.8z"
-            /></svg
-          >
-          <span>{$_("tracks")}</span>
+              d="M96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112S381.9 32 320 32 208 82.1 208 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z" /></svg>
+          <span>{$_('teams')}</span>
         </a>
       {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("CARD:GET")}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('DONOR:GET')}
         <a
-          class:activenav={$router.path === "/cards/"}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/cards/"
-        >
+          class:bg-gray-100={$router.path.includes('/donors/')}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/donors/">
           <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
+            fill="currentColor"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"
+            width="24"
+            height="24"><path fill="none" d="M0 0h24v24H0z" />
+            <path
+              d="M9.33 11.5h2.17A4.5 4.5 0 0 1 16 16H8.999L9 17h8v-1a5.578 5.578 0 0 0-.886-3H19a5 5 0 0 1 4.516 2.851C21.151 18.972 17.322 21 13 21c-2.761 0-5.1-.59-7-1.625L6 10.071A6.967 6.967 0 0 1 9.33 11.5zM5 19a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v9zM18 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm-7-3a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" /></svg>
+          <span>{$_('donors')}</span>
+        </a>
+      {/if}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:GET')}
+        <a
+          class:bg-gray-100={$router.path.includes('/donations/')}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/donations/">
+          <svg
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
+            fill="currentColor"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"
+            width="24"
+            height="24"><path fill="none" d="M0 0h24v24H0z" />
+            <path
+              d="M14 2a8 8 0 013.3 15.3A8 8 0 116.7 6.7 8 8 0 0114 2zm-3 7H9v1a2.5 2.5 0 00-.16 5h2.25a.5.5 0 010 1H7v2h2v1h2v-1a2.5 2.5 0 00.16-5H8.91a.5.5 0 010-1H13v-2h-2V9zm3-5a5.99 5.99 0 00-4.48 2.01 8 8 0 018.47 8.47A6 6 0 0014 4z" /></svg>
+          <span>{$_('donations')}</span>
+        </a>
+      {/if}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('TRACK:GET')}
+        <a
+          class:bg-gray-100={$router.path === '/tracks/'}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/tracks/">
+          <svg
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
             fill="currentColor"
             width="24"
             height="24"
             xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-          >
-            <path fill="none" d="M0 0h24v24H0z" />
+            viewBox="0 0 640 512"><path
+              fill="currentColor"
+              d="M635.7 167.2L556.1 31.7c-8.8-15-28.3-20.1-43.5-11.5l-69 39.1L503.3 161c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L416 75l-55.2 31.3 27.9 47.4c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L333.2 122 278 153.3 337.8 255c2.2 3.7.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9l-59.7-101.7-55.2 31.3 27.9 47.4c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9l-27.9-47.5-55.2 31.3 59.7 101.7c2.2 3.7.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L84.9 262.9l-69 39.1C.7 310.7-4.6 329.8 4.2 344.8l79.6 135.6c8.8 15 28.3 20.1 43.5 11.5L624.1 210c15.2-8.6 20.4-27.8 11.6-42.8z" /></svg>
+          <span>{$_('tracks')}</span>
+        </a>
+      {/if}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('SCAN:GET')}
+        <a
+          class:bg-gray-100={$router.path === '/scans/'}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/scans/">
+          <svg
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
+            fill="currentColor"
+            width="24"
+            height="24"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z" />
             <path
               fill="currentColor"
-              d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z"
-            /></svg
-          >
-          <span>{$_("cards")}</span>
-        </a>
-      {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("SCAN:GET")}
-        <a
-          class:activenav={$router.path.includes("/scans/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/scans/"
-        >
-          <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-            fill="currentColor"
-            width="24"
-            height="24"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 24 24"
-            ><path fill="none" d="M0 0h24v24H0z" />
-            <path
-              fill="currentColor"
-              d="M2 4h2v16H2V4zm4 0h1v16H6V4zm2 0h2v16H8V4zm3 0h2v16h-2V4zm3 0h2v16h-2V4zm3 0h1v16h-1V4zm2 0h3v16h-3V4z"
-            /></svg
-          >
+              d="M2 4h2v16H2V4zm4 0h1v16H6V4zm2 0h2v16H8V4zm3 0h2v16h-2V4zm3 0h2v16h-2V4zm3 0h1v16h-1V4zm2 0h3v16h-3V4z" /></svg>
           <span>Scans</span>
         </a>
       {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("CONTACT:GET")}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('CONTACT:GET')}
         <a
-          class:activenav={$router.path.includes("/contacts/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/contacts/"
-        >
+          class:bg-gray-100={$router.path === '/contacts/'}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/contacts/">
           <svg
             fill="currentColor"
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
             xmlns="http://www.w3.org/2000/svg"
             viewBox="0 0 24 24"
             width="24"
-            height="24"
-            ><path fill="none" d="M0 0h24v24H0z" />
+            height="24"><path fill="none" d="M0 0h24v24H0z" />
             <path
-              d="M2 22a8 8 0 1 1 16 0H2zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm10 4h4v2h-4v-2zm-3-5h7v2h-7v-2zm2-5h5v2h-5V7z"
-            /></svg
-          >
-          <span>{$_("contacts")}</span>
+              d="M2 22a8 8 0 1 1 16 0H2zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm10 4h4v2h-4v-2zm-3-5h7v2h-7v-2zm2-5h5v2h-5V7z" /></svg>
+          <span>{$_('contacts')}</span>
         </a>
       {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("STATION:GET")}
+      {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:GET')}
         <a
-          class:activenav={$router.path.includes("/scanstations/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/scanstations/"
-        >
+          class:bg-gray-100={$router.path === '/scanstations/'}
+          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+          href="/scanstations/">
           <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+            class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
             fill="currentColor"
             width="24"
             height="24"
             viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg"
-            ><path fill="none" d="M0 0h24v24H0z" />
+            xmlns="http://www.w3.org/2000/svg"><path
+              fill="none"
+              d="M0 0h24v24H0z" />
             <path
               fill="currentColor"
-              d="M4 5v11h16V5H4zM2 4a1 1 0 011-1h18a1 1 0 011 1v14H2V4zM1 19h22v2H1v-2z"
-            /></svg
-          >
-          <span>{$_("scanstations")}</span>
+              d="M4 5v11h16V5H4zM2 4a1 1 0 011-1h18a1 1 0 011 1v14H2V4zM1 19h22v2H1v-2z" /></svg>
+          <span>{$_('scanstations')}</span>
         </a>
       {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("STATSCLIENT:GET")}
-        <a
-          class:activenav={$router.path.includes("/statsclients/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/statsclients/"
-        >
-          <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-            fill="currentColor"
-            width="24"
-            height="24"
-            viewBox="0 0 24 24"
-            xmlns="http://www.w3.org/2000/svg"
-            ><path fill="none" d="M0 0h24v24H0z" />
-            <path
-              fill="currentColor"
-              d="M4 5v11h16V5H4zM2 4a1 1 0 011-1h18a1 1 0 011 1v14H2V4zM1 19h22v2H1v-2z"
-            /></svg
-          >
-          <span>{$_("statsclients")}</span>
-        </a>
-      {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("USER:GET")}
-        <a
-          class:activenav={$router.path.includes("/users/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/users/"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            width="24"
-            height="24"
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-            fill="currentColor"
-            viewBox="0 0 24 24"
-            ><path fill="none" d="M0 0h24v24H0z" />
-            <path
-              d="M12 14v8H4a8 8 0 018-8zm0-1a6 6 0 110-12 6 6 0 010 12zm2.6 5.81a3.51 3.51 0 010-1.62l-1-.57 1-1.74 1 .58a3.5 3.5 0 011.4-.82V13.5h2v1.15a3.5 3.5 0 011.4.8l1-.57 1 1.74-1 .57a3.51 3.51 0 010 1.62l1 .57-1 1.74-1-.58a3.5 3.5 0 01-1.4.82v1.14h-2v-1.15a3.5 3.5 0 01-1.4-.8l-1 .57-1-1.74 1-.57zM18 17a1 1 0 100 2 1 1 0 000-2z"
-            /></svg
-          >
-          <span>{$_("users")}</span>
-        </a>
-      {/if}
-      {#if store.state.jwtinfo.userdetails.permissions.includes("USERGROUP:GET")}
-        <a
-          class:activenav={$router.path.includes("/groups/")}
-          class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-          href="/groups/"
-        >
-          <svg
-            class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
-            fill="currentColor"
-            width="24"
-            height="24"
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 640 512"
-            ><path
-              fill="currentColor"
-              d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"
-            /></svg
-          >
-          <span>{$_("user-groups")}</span>
-        </a>
-      {/if}
-	  <h2 class="px-4 py-2 text-xs font-semibold text-gray-600 uppercase">
-		  {$_("system")}
-        </h2>
       <a
-        class:activenav={$router.path === "/settings/"}
-        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-        href="/settings/"
-      >
+        class:bg-gray-100={$router.path === '/settings/'}
+        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+        href="/settings/">
         <svg
-          class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+          class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
           xmlns="http://www.w3.org/2000/svg"
           viewBox="0 0 20 20"
-          fill="currentColor"
-        >
+          fill="currentColor">
           <path
             fill-rule="evenodd"
             d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z"
-            clip-rule="evenodd"
-          />
+            clip-rule="evenodd" />
         </svg>
-        <span>{$_("settings")}</span>
+        <span>{$_('settings')}</span>
       </a>
       <a
-        class:activenav={$router.path === "/about/"}
-        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
-        href="/about/"
-      >
+        class:bg-gray-100={$router.path === '/about/'}
+        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
+        href="/about/">
         <svg
-          class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+          class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
           xmlns="http://www.w3.org/2000/svg"
           fill="none"
           stroke="currentColor"
           stroke-width="2"
           stroke-linecap="round"
           stroke-linejoin="round"
-          viewBox="0 0 24 24"
-          ><circle cx="12" cy="12" r="10" />
-          <path d="M12 16v-4M12 8h.01" /></svg
-        >
-        <span>{$_("about")}</span>
+          viewBox="0 0 24 24"><circle cx="12" cy="12" r="10" />
+          <path d="M12 16v-4M12 8h.01" /></svg>
+        <span>{$_('about')}</span>
       </a>
-      <button
+      <span
         tabindex="0"
-        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
+        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
         on:click={() => {
           AuthService.authControllerLogout();
           logout();
-        }}
-      >
+        }}>
         <svg
-          class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+          class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
           fill="currentColor"
           width="24"
           height="24"
           xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 24 24"
-          ><path fill="none" d="M0 0h24v24H0z" />
+          viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z" />
           <path
-            d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2a9.985 9.985 0 0 1 8 4h-2.71a8 8 0 1 0 .001 12h2.71A9.985 9.985 0 0 1 12 22zm7-6v-3h-8v-2h8V8l5 4-5 4z"
-          /></svg
-        >
-        <span>{$_("logout")}</span>
-      </button>
+            d="M12 22C6.477 22 2 17.523 2 12S6.477 2 12 2a9.985 9.985 0 0 1 8 4h-2.71a8 8 0 1 0 .001 12h2.71A9.985 9.985 0 0 1 12 22zm7-6v-3h-8v-2h8V8l5 4-5 4z" /></svg>
+        <span>{$_('logout')}</span>
+      </span>
     </nav>
-  </div>
+  </nav>
   <div class="ml-0 transition md:ml-60">
     <header
-      class="flex items-center w-full px-4 bg-white border-b h-14 md:hidden"
-    >
-      <button
-        on:click={() => {
-          navOpen = true;
-        }}
-        class="block btn btn-light md:hidden"
-      >
+      on:click={() => {
+        navOpen = true;
+      }}
+      class="flex items-center justify-between w-full px-4 bg-white border-b h-14 md:hidden">
+      <button class="block btn btn-light md:hidden">
         <span class="sr-only">Menu</span><svg
+          class="w-4 h-4"
           xmlns="http://www.w3.org/2000/svg"
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke-width="1.5"
-          stroke="currentColor"
-          class="size-6"
-        >
-          <path
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5"
-          />
-        </svg>
-      </button>
-      <span class="inline-block">
-        <img src="/lfk-logo.png" alt="Logo" class="h-8 inline-block" />
-        <span class="text-lg font-bold">LfK!Admin</span>
-      </span>
+          viewBox="0 0 20 20"
+          fill="currentcolor"><path
+            fill-rule="evenodd"
+            d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4A1 1 0 013 5zm0 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm0 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z"
+            clip-rule="evenodd" /></svg></button>
     </header>
-    <Toaster position="top-right" />
     <slot>
       <NoComponentLoaded />
     </slot>
   </div>
-  {#if navOpen === true}
-    <button
-      on:click={() => {
-        navOpen = false;
-      }}
-      class:hidden={!navOpen}
-      class="fixed inset-0 z-10 w-screen h-screen bg-black bg-opacity-25 md:hidden"
-    />
-  {/if}
+  <div
+    on:click={() => {
+      navOpen = false;
+    }}
+    class:hidden={!navOpen}
+    class="fixed inset-0 z-10 w-screen h-screen bg-black bg-opacity-25 md:hidden" />
 </section>
-
-<style>
-  .collapsed_navigation {
-    transform: translateX(-100%);
-  }
-  @media (min-width: 768px) {
-    .collapsed_navigation {
-      transform: translateX(0px);
-    }
-  }
-</style>

src/components/dashboard/MainDashContent.svelte

@@ -1,263 +1,23 @@
 <script>
-	import { _ } from "svelte-i18n";
-	import { StatsService } from "@odit/lfk-client-js";
-	import store from "../../store";
-	import StatCard from "./StatCard.svelte";
-	const stats_promise = StatsService.statsControllerGet();
+  import { _ } from "svelte-i18n";
+  import StatCards from "./StatCards.svelte";
+  import store from "../../store";
+  let navOpen = false;
 </script>
 
-<div class="p-2 md:p-5 overflow-x-hidden">
-	<h4 class="mb-1 text-3xl font-extrabold leading-tight">
-		{$_("dashboard-greeting")}
-		<span class="text-blue-500"
-			>{store.state.jwtinfo.userdetails.firstname}
-			{store.state.jwtinfo.userdetails.lastname}</span
-		>
-	</h4>
-	{#await stats_promise}
-		<div
-			class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-			role="alert"
-		>
-			<p class="font-bold">{$_("stats-are-being-loaded")}</p>
-			<p class="text-sm">{$_("this-might-take-a-moment")}</p>
-		</div>
-	{:then stats}
-		<div
-			class="grid gap-1 grid-cols-2 lg:grid-cols-3 xl:grid-cols-5 2xl:grid-cols-6 sm:gap-4"
-		>
-			<StatCard
-				title={$_("runners")}
-				value={stats.total_runners}
-				href="/runners/"
-			>
-				<svg
-					height="24"
-					width="24"
-					fill="currentColor"
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 24 24"
-					><path d="M0 0h24v24H0z" fill="none" />
-					<path
-						d="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm-3.6 13.9l1-4.4 2.1 2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9 0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5.1-.8.1l-5.2 2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2 7 1.4z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("total-scans")}
-				value={stats.total_scans}
-				href="/scans/"
-			>
-				<svg
-					fill="currentColor"
-					width="24"
-					height="24"
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 24 24"
-					><path fill="none" d="M0 0h24v24H0z" />
-					<path
-						fill="currentColor"
-						d="M2 4h2v16H2V4zm4 0h1v16H6V4zm2 0h2v16H8V4zm3 0h2v16h-2V4zm3 0h2v16h-2V4zm3 0h1v16h-1V4zm2 0h3v16h-3V4z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("total-donors")}
-				value={stats.total_donors}
-				href="/donors/"
-			>
-				<svg
-					fill="currentColor"
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 24 24"
-					width="24"
-					height="24"
-					><path fill="none" d="M0 0h24v24H0z" />
-					<path
-						d="M9.33 11.5h2.17A4.5 4.5 0 0 1 16 16H8.999L9 17h8v-1a5.578 5.578 0 0 0-.886-3H19a5 5 0 0 1 4.516 2.851C21.151 18.972 17.322 21 13 21c-2.761 0-5.1-.59-7-1.625L6 10.071A6.967 6.967 0 0 1 9.33 11.5zM5 19a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v9zM18 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm-7-3a3 3 0 1 1 0 6 3 3 0 0 1 0-6z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("total-donation-count")}
-				value={stats.total_donations}
-				href="/donations/"
-			>
-				<svg
-					fill="currentColor"
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 24 24"
-					width="24"
-					height="24"
-					><path fill="none" d="M0 0h24v24H0z" />
-					<path
-						d="M14 2a8 8 0 013.3 15.3A8 8 0 116.7 6.7 8 8 0 0114 2zm-3 7H9v1a2.5 2.5 0 00-.16 5h2.25a.5.5 0 010 1H7v2h2v1h2v-1a2.5 2.5 0 00.16-5H8.91a.5.5 0 010-1H13v-2h-2V9zm3-5a5.99 5.99 0 00-4.48 2.01 8 8 0 018.47 8.47A6 6 0 0014 4z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("average-donation")}
-				value={`${parseFloat(stats.average_donation / 100).toLocaleString(
-					undefined,
-					{
-						minimumFractionDigits: 2,
-						maximumFractionDigits: 2,
-					}
-				)}`}
-				href="/donations/"
-			>
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					height="24"
-					fill="currentColor"
-					width="24"
-					><path d="M0 0h24v24H0z" fill="none" />
-					<path
-						d="M15 18.5A6.48 6.48 0 019.24 15H15v-2H8.58c-.05-.33-.08-.66-.08-1s.03-.67.08-1H15V9H9.24A6.491 6.491 0 0115 5.5c1.61 0 3.09.59 4.23 1.57L21 5.3A8.955 8.955 0 0015 3c-3.92 0-7.24 2.51-8.48 6H3v2h3.06a8.262 8.262 0 000 2H3v2h3.52c1.24 3.49 4.56 6 8.48 6 2.31 0 4.41-.87 6-2.3l-1.78-1.77c-1.13.98-2.6 1.57-4.22 1.57z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("total-donations")}
-				value={`${parseFloat(stats.total_donation / 100).toLocaleString(
-					undefined,
-					{
-						minimumFractionDigits: 2,
-						maximumFractionDigits: 2,
-					}
-				)}`}
-				href="/donations/"
-			>
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					height="24"
-					fill="currentColor"
-					width="24"
-					><path d="M0 0h24v24H0z" fill="none" />
-					<path
-						d="M15 18.5A6.48 6.48 0 019.24 15H15v-2H8.58c-.05-.33-.08-.66-.08-1s.03-.67.08-1H15V9H9.24A6.491 6.491 0 0115 5.5c1.61 0 3.09.59 4.23 1.57L21 5.3A8.955 8.955 0 0015 3c-3.92 0-7.24 2.51-8.48 6H3v2h3.06a8.262 8.262 0 000 2H3v2h3.52c1.24 3.49 4.56 6 8.48 6 2.31 0 4.41-.87 6-2.3l-1.78-1.77c-1.13.98-2.6 1.57-4.22 1.57z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("total-distance")}
-				value={`${stats.total_distance / 1000}km`}
-				href="/scans/"
-			>
-				<svg
-					fill="currentColor"
-					xmlns="http://www.w3.org/2000/svg"
-					height="24"
-					width="24"
-					><path d="M0 0h24v24H0z" fill="none" />
-					<path
-						d="M21 6H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 10H3V8h2v4h2V8h2v4h2V8h2v4h2V8h2v4h2V8h2v8z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("average-distance")}
-				value={`${parseFloat(stats.average_distance / 1000).toLocaleString(
-					undefined,
-					{
-						minimumFractionDigits: 2,
-						maximumFractionDigits: 2,
-					}
-				)}km`}
-				href="/scans/"
-			>
-				<svg
-					fill="currentColor"
-					xmlns="http://www.w3.org/2000/svg"
-					height="24"
-					width="24"
-					><path d="M0 0h24v24H0z" fill="none" />
-					<path
-						d="M21 6H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 10H3V8h2v4h2V8h2v4h2V8h2v4h2V8h2v4h2V8h2v8z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("count_teams")}
-				value={stats.total_teams}
-				href="/teams/"
-			>
-				<svg
-					stroke="currentColor"
-					fill="none"
-					stroke-width="2"
-					viewBox="0 0 24 24"
-					stroke-linecap="round"
-					stroke-linejoin="round"
-					size="24"
-					class="stroke-current text-grey-500"
-					height="24"
-					width="24"
-					xmlns="http://www.w3.org/2000/svg"
-					><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" />
-					<circle cx="9" cy="7" r="4" />
-					<path d="M23 21v-2a4 4 0 0 0-3-3.87" />
-					<path d="M16 3.13a4 4 0 0 1 0 7.75" /></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("count_organizations")}
-				value={stats.total_orgs}
-				href="/orgs/"
-			>
-				<svg
-					height="24"
-					fill="currentColor"
-					width="24"
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 24 24"
-					><path fill="none" d="M0 0h24v24H0z" />
-					<path
-						d="M17 11V3H7v4H3v14h8v-4h2v4h8V11h-4zM7 19H5v-2h2v2zm0-4H5v-2h2v2zm0-4H5V9h2v2zm4 4H9v-2h2v2zm0-4H9V9h2v2zm0-4H9V5h2v2zm4 8h-2v-2h2v2zm0-4h-2V9h2v2zm0-4h-2V5h2v2zm4 12h-2v-2h2v2zm0-4h-2v-2h2v2z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_("runner_via_selfservice")}
-				value={stats.runnersViaSelfservice}
-				href="/runners/?created_via=selfservice"
-			>
-				<svg
-					height="24"
-					width="24"
-					fill="currentColor"
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 24 24"
-					><path d="M0 0h24v24H0z" fill="none" />
-					<path
-						d="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm-3.6 13.9l1-4.4 2.1 2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9 0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5.1-.8.1l-5.2 2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2 7 1.4z"
-					/></svg
-				>
-			</StatCard>
-			<StatCard
-				title={$_('runners_via_kiosk')}
-				value={stats.runnersViaKiosk}
-				href="/runners/?created_via=kiosk"
-			>
-				<svg
-					height="24"
-					width="24"
-					fill="currentColor"
-					xmlns="http://www.w3.org/2000/svg"
-					viewBox="0 0 24 24"
-					><path d="M0 0h24v24H0z" fill="none" />
-					<path
-						d="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm-3.6 13.9l1-4.4 2.1 2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9 0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5.1-.8.1l-5.2 2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2 7 1.4z"
-					/></svg
-				>
-			</StatCard>
-		</div>
-	{:catch error}
-		<div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
-			<span class="inline-block align-middle mr-8">
-				<b>{$_("general_promise_error")}</b>
-				{error}
-			</span>
-		</div>
-	{/await}
+<div
+  class="p-5 overflow-x-hidden"
+  on:click={() => {
+    navOpen = false;
+  }}>
+  <h1 class="text-3xl leading-tight">
+    <span class="font-extrabold">{$_('dashboard-title')}</span>
+    <span>
+      -
+      {$_('dashboard-greeting')},
+      <span
+        class="text-blue-500">{store.state.jwtinfo.userdetails.firstname}</span>
+      👋</span>
+  </h1>
+  <StatCards />
 </div>

src/components/dashboard/StatCard.svelte

@@ -1,21 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-
-  export let href = "#";
-  export let title = "";
-  export let value = "";
-</script>
-
-<a {href}>
-  <div class="p-3 py-4 sm:p-4 rounded-lg bg-white border border-grey-100">
-    <div class="flex flex-row items-center justify-between">
-      <div class="flex flex-col">
-        <div class="text-md sm:text-xs uppercase font-normal text-grey-500">
-          {title}
-        </div>
-        <div class="text-2xl sm:text-xl font-bold font-mono">{value}</div>
-      </div>
-      <slot />
-    </div>
-  </div>
-</a>

src/components/dashboard/StatCards.svelte

@@ -0,0 +1,165 @@
+<script>
+  import { StatsService } from "@odit/lfk-client-js";
+  import { _ } from "svelte-i18n";
+  const stats_promise = StatsService.statsControllerGet();
+</script>
+
+<!--  -->
+<h1>{$_('general-stats')}</h1>
+{#await stats_promise}
+  <div
+    class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
+    role="alert">
+    <p class="font-bold">{$_('stats-are-being-loaded')}</p>
+    <p class="text-sm">{$_('this-might-take-a-moment')}</p>
+  </div>
+{:then stats}
+  <div
+    class="flex flex-col lg:flex-row w-full lg:space-x-2 space-y-2 lg:space-y-0 mb-2 lg:mb-4">
+    <a href="/runners/" class="w-full lg:w-1/4">
+      <div
+        class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
+        <div class="flex flex-row items-center justify-between">
+          <div class="flex flex-col">
+            <div class="text-xs uppercase font-light text-grey-500">
+              {$_('runners')}
+            </div>
+            <div class="text-xl font-bold">{stats.total_runners}</div>
+          </div>
+          <svg
+            height="24"
+            width="24"
+            fill="currentColor"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"><path d="M0 0h24v24H0z" fill="none" />
+            <path
+              d="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm-3.6 13.9l1-4.4 2.1 2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9 0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5.1-.8.1l-5.2 2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2 7 1.4z" /></svg>
+        </div>
+      </div>
+    </a>
+    <div class="w-full lg:w-1/4">
+      <div
+        class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
+        <div class="flex flex-row items-center justify-between">
+          <div class="flex flex-col">
+            <div class="text-xs uppercase font-light text-grey-500">
+              {$_('total-scans')}
+            </div>
+            <div class="text-xl font-bold">{stats.total_scans}</div>
+          </div><svg
+            stroke="currentColor"
+            fill="currentColor"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            size="24"
+            class="stroke-current text-grey-500"
+            height="24"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"><polyline
+              points="22 12 18 12 15 21 9 3 6 12 2 12" /></svg>
+        </div>
+      </div>
+    </div>
+    <div class="w-full lg:w-1/4">
+      <div
+        class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
+        <div class="flex flex-row items-center justify-between">
+          <div class="flex flex-col">
+            <div class="text-xs uppercase font-light text-grey-500">
+              {$_('total-donations')}
+            </div>
+            <div class="text-xl font-bold">{stats.total_donation} €</div>
+          </div><svg
+            xmlns="http://www.w3.org/2000/svg"
+            height="24"
+            fill="currentColor"
+            width="24"><path d="M0 0h24v24H0z" fill="none" />
+            <path
+              d="M15 18.5A6.48 6.48 0 019.24 15H15v-2H8.58c-.05-.33-.08-.66-.08-1s.03-.67.08-1H15V9H9.24A6.491 6.491 0 0115 5.5c1.61 0 3.09.59 4.23 1.57L21 5.3A8.955 8.955 0 0015 3c-3.92 0-7.24 2.51-8.48 6H3v2h3.06a8.262 8.262 0 000 2H3v2h3.52c1.24 3.49 4.56 6 8.48 6 2.31 0 4.41-.87 6-2.3l-1.78-1.77c-1.13.98-2.6 1.57-4.22 1.57z" /></svg>
+        </div>
+      </div>
+    </div>
+    <div class="w-full lg:w-1/4">
+      <div
+        class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
+        <div class="flex flex-row items-center justify-between">
+          <div class="flex flex-col">
+            <div class="text-xs uppercase font-light text-grey-500">
+              {$_('total-distance')}
+            </div>
+            <div class="text-xl font-bold">
+              {stats.total_distance / 1000}
+              km
+            </div>
+          </div>
+          <svg
+            fill="currentColor"
+            xmlns="http://www.w3.org/2000/svg"
+            height="24"
+            width="24"><path d="M0 0h24v24H0z" fill="none" />
+            <path
+              d="M21 6H3c-1.1 0-2 .9-2 2v8c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm0 10H3V8h2v4h2V8h2v4h2V8h2v4h2V8h2v4h2V8h2v8z" /></svg>
+        </div>
+      </div>
+    </div>
+    <a href="/teams/" class="w-full lg:w-1/4">
+      <div
+        class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
+        <div class="flex flex-row items-center justify-between">
+          <div class="flex flex-col">
+            <div class="text-xs uppercase font-light text-grey-500">
+              {$_('count_teams')}
+            </div>
+            <div class="text-xl font-bold">{stats.total_teams}</div>
+          </div>
+          <svg
+            stroke="currentColor"
+            fill="none"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            size="24"
+            class="stroke-current text-grey-500"
+            height="24"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"><path
+              d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" />
+            <circle cx="9" cy="7" r="4" />
+            <path d="M23 21v-2a4 4 0 0 0-3-3.87" />
+            <path d="M16 3.13a4 4 0 0 1 0 7.75" /></svg>
+        </div>
+      </div>
+    </a>
+    <a href="/orgs/" class="w-full lg:w-1/4">
+      <div
+        class="widget w-full p-4 rounded-lg bg-white border border-grey-100">
+        <div class="flex flex-row items-center justify-between">
+          <div class="flex flex-col">
+            <div class="text-xs uppercase font-light text-grey-500">
+              {$_('count_organizations')}
+            </div>
+            <div class="text-xl font-bold">{stats.total_orgs}</div>
+          </div>
+          <svg
+            height="24"
+            fill="currentColor"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"
+            viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z" />
+            <path
+              d="M17 11V3H7v4H3v14h8v-4h2v4h8V11h-4zM7 19H5v-2h2v2zm0-4H5v-2h2v2zm0-4H5V9h2v2zm4 4H9v-2h2v2zm0-4H9V9h2v2zm0-4H9V5h2v2zm4 8h-2v-2h2v2zm0-4h-2V9h2v2zm0-4h-2V5h2v2zm4 12h-2v-2h2v2zm0-4h-2v-2h2v2z" /></svg>
+        </div>
+      </div>
+    </a>
+  </div>
+{:catch error}
+  <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+    <span class="inline-block align-middle mr-8">
+      <b class="capitalize">{$_('general_promise_error')}</b>
+      {error}
+    </span>
+  </div>
+{/await}

src/components/donations/AddDonationModal.svelte

@@ -1,380 +1,295 @@
 <script>
-	import { _ } from "svelte-i18n";
-	import { clickOutside } from "../base/outsideclick";
-
-	import {
-		DonationService,
-		DonorService,
-		RunnerService,
-	} from "@odit/lfk-client-js";
-	import Select from "svelte-select";
-	import { createEventDispatcher, onMount } from "svelte";
-	import toast from "svelte-french-toast";
-	export let modal_open;
-	const dispatch = createEventDispatcher();
-	const getDonorLabel = (option) =>
-		option.firstname + " " + (option.middlename || "") + " " + option.lastname;
-	const filterDonors = (label, filterText, option) =>
-		label.toLowerCase().includes(filterText.toLowerCase()) ||
-		option.value.id.toString().startsWith(filterText.toLowerCase());
-	$: donor = 0;
-	$: runner = 0;
-	$: donors = [];
-	$: runners = [];
-	$: type = "distance";
-	$: is_paid = false;
-	$: amount_input = 0;
-	$: processed_last_submit = true;
-	$: is_amount_valid = amount_input > 0;
-	$: createbtnenabled = is_amount_valid;
-	(() => {
-		document.onkeydown = (e) => {
-			e = e || window.event;
-			if (e.key === "Escape") {
-				modal_open = false;
-			}
-			if (e.keyCode === 13) {
-				if (createbtnenabled === true) {
-					createbtnenabled = false;
-					submit();
-				}
-			}
-		};
-	})();
-	function submit() {
-		if (processed_last_submit === true) {
-			let amount_cent = Math.floor(amount_input * 100);
-			processed_last_submit = false;
-			toast.loading($_("adding-donation"));
-			if (type === "fixed") {
-				let postdata = {
-					donor,
-					amount: amount_cent,
-					paidAmount: 0,
-				};
-				if (is_paid) {
-					postdata.paidAmount = amount_cent;
-				}
-				DonationService.donationControllerPostFixed(postdata)
-					.then((result) => {
-						donor = donors[0].id || 0;
-						runner = runners[0].id || 0;
-						amount_input = 0;
-						modal_open = false;
-						//
-						toast.dismiss();
-						toast.success($_("donation_added"));
-						dispatch("created", { donations: [result] });
-					})
-					.catch((err) => {
-						//
-					})
-					.finally(() => {
-						processed_last_submit = true;
-					});
-			} else if (type === "anonymous") {
-				let postdata = {
-					amount: amount_cent,
-				};
-				DonationService.donationControllerPostAnonymous(postdata)
-					.then((result) => {
-						amount_input = 0;
-						modal_open = false;
-						//
-						toast.dismiss();
-						toast.success($_("donation_added"));
-						dispatch("created", { donations: [result] });
-					})
-					.catch((err) => {
-						//
-					})
-					.finally(() => {
-						processed_last_submit = true;
-					});
-			} else if (type === "distance") {
-				let postdata = {
-					donor,
-					runner,
-					amountPerDistance: amount_cent,
-				};
-				DonationService.donationControllerPostDistance(postdata)
-					.then((result) => {
-						donor = donors[0].id || 0;
-						runner = runners[0].id || 0;
-						amount_input = 0;
-						modal_open = false;
-						//
-						toast.dismiss();
-						toast.success($_("donation_added"));
-						dispatch("created", { donations: [result] });
-					})
-					.catch((err) => {
-						//
-					})
-					.finally(() => {
-						processed_last_submit = true;
-					});
-			}
-		}
-	}
-
-	onMount(async () => {
-		donors = (await DonorService.donorControllerGetAll()).map((r) => {
-			return { label: getDonorLabel(r), value: r };
-		});
-		runners = (await RunnerService.runnerControllerGetAll()).map((r) => {
-			return { label: getDonorLabel(r), value: r };
-		});
-	});
+  import { _ } from "svelte-i18n";
+  import { clickOutside } from "../base/outsideclick";
+  import { focusTrap } from "svelte-focus-trap";
+  import {
+    DonationService,
+    DonorService,
+    RunnerService,
+  } from "@odit/lfk-client-js";
+  import Select from "svelte-select";
+  import Toastify from "toastify-js";
+  export let modal_open;
+  export let current_donations;
+  const getDonorLabel = (option) =>
+    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
+  const filterDonors = (label, filterText, option) =>
+    label.toLowerCase().includes(filterText.toLowerCase()) ||
+    option.value.id.toString().startsWith(filterText.toLowerCase());
+  function focus(el) {
+    el.focus();
+  }
+  $: donor = 0;
+  $: runner = 0;
+  $: donors = [];
+  $: runners = [];
+  $: is_fixed = false;
+  DonorService.donorControllerGetAll().then((val) => {
+    donors = val.map((r) => {
+      return { label: getDonorLabel(r), value: r };
+    });
+  });
+  RunnerService.runnerControllerGetAll().then((val) => {
+    runners = val.map((r) => {
+      return { label: getDonorLabel(r), value: r };
+    });
+  });
+  $: amount_input = 0;
+  $: processed_last_submit = true;
+  $: is_amount_valid = amount_input > 0;
+  $: createbtnenabled = is_amount_valid;
+  (() => {
+    document.onkeydown = (e) => {
+      e = e || window.event;
+      if (e.key === "Escape") {
+        modal_open = false;
+      }
+      if (e.keyCode === 13) {
+        if (createbtnenabled === true) {
+          createbtnenabled = false;
+          submit();
+        }
+      }
+    };
+  })();
+  function submit() {
+    if (processed_last_submit === true) {
+      let amount_cent = Math.floor(amount_input * 100);
+      processed_last_submit = false;
+      const toast = Toastify({
+        text: "adding donation",
+        duration: -1,
+      }).showToast();
+      if (is_fixed) {
+        let postdata = {
+          donor,
+          amount: amount_cent,
+        };
+        DonationService.donationControllerPostFixed(postdata)
+          .then((result) => {
+            donor = donors[0].id || 0;
+            runner = runners[0].id || 0;
+            amount_input = 0;
+            modal_open = false;
+            //
+            Toastify({
+              text: "donation_added",
+              duration: 500,
+              backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+            }).showToast();
+            current_donations.push(result);
+            current_donations = current_donations;
+          })
+          .catch((err) => {
+            //
+          })
+          .finally(() => {
+            processed_last_submit = true;
+            //
+            toast.hideToast();
+          });
+      } else {
+        let postdata = {
+          donor,
+          runner,
+          amountPerDistance: amount_cent,
+        };
+        DonationService.donationControllerPostDistance(postdata)
+          .then((result) => {
+            donor = donors[0].id || 0;
+            runner = runners[0].id || 0;
+            amount_input = 0;
+            modal_open = false;
+            //
+            Toastify({
+              text: "donation_added",
+              duration: 500,
+              backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+            }).showToast();
+            current_donations.push(result);
+            current_donations = current_donations;
+          })
+          .catch((err) => {
+            //
+          })
+          .finally(() => {
+            processed_last_submit = true;
+            //
+            toast.hideToast();
+          });
+      }
+    }
+  }
 </script>
 
-{#if modal_open}
-	<div
-		class="fixed z-10 inset-0 overflow-y-hidden"
-		use:clickOutside
-		on:click_outside={() => {
-			modal_open = false;
-		}}
-	>
-		<div
-			class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-		>
-			<div class="fixed inset-0 transition-opacity" aria-hidden="true">
-				<div
-					class="absolute inset-0 bg-neutral-500 opacity-75"
-					data-id="modal_backdrop"
-				/>
-			</div>
-			<span
-				class="hidden sm:inline-block sm:align-middle sm:h-screen"
-				aria-hidden="true">&#8203;</span
-			>
-			<div
-				class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-				role="dialog"
-				aria-modal="true"
-				aria-labelledby="modal-headline"
-			>
-				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-					<div class="">
-						<div
-							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-						>
-							<svg
-								class="size-6 text-blue-600"
-								fill="currentColor"
-								xmlns="http://www.w3.org/2000/svg"
-								viewBox="0 0 24 24"
-								width="24"
-								height="24"
-								><path fill="none" d="M0 0h24v24H0z" />
-								<path
-									d="M14 2a8 8 0 013.3 15.3A8 8 0 116.7 6.7 8 8 0 0114 2zm-3 7H9v1a2.5 2.5 0 00-.16 5h2.25a.5.5 0 010 1H7v2h2v1h2v-1a2.5 2.5 0 00.16-5H8.91a.5.5 0 010-1H13v-2h-2V9zm3-5a5.99 5.99 0 00-4.48 2.01 8 8 0 018.47 8.47A6 6 0 0014 4z"
-								/></svg
-							>
-						</div>
-						<div class="mt-3">
-              <h3 class="text-xl leading-6 font-medium text-neutral-900">
-                {$_("add-donation")}
-              </h3>
-							<nav
-								class="relative z-0 flex border border-neutral-200 rounded-xl overflow-hidden mb-2"
-							>
-								<button
-									on:click={() => {
-										type = "distance";
-									}}
-									type="button"
-									id="bar-with-underline-item-1"
-									class:donation_active_tab={type === "distance"}
-									class:donation_inactive_tab={type !== "distance"}
-									aria-selected={type === "distance"}
-									role="tab"
-								>
-									{$_("spende_pro_km")}
-								</button>
-								<button
-									on:click={() => {
-										type = "fixed";
-									}}
-									type="button"
-									id="bar-with-underline-item-2"
-									class:donation_active_tab={type === "fixed"}
-									class:donation_inactive_tab={type !== "fixed"}
-									aria-selected={type === "fixed"}
-									role="tab"
-								>
-									{$_("festbetrag")}
-								</button>
-								<button
-									on:click={() => {
-										type = "anonymous";
-									}}
-									type="button"
-									id="bar-with-underline-item-3"
-									class:donation_active_tab={type === "anonymous"}
-									class:donation_inactive_tab={type !== "anonymous"}
-									aria-selected={type === "anonymous"}
-									role="tab"
-								>
-									{$_("anonyme_spende")}
-								</button>
-							</nav>
+<style>
+  input:before {
+    content: "";
+    position: absolute;
+    width: 1.25rem;
+    height: 1.25rem;
+    border-radius: 50%;
+    top: 0;
+    left: 0;
+    transform: scale(1.1);
+    box-shadow: 0 0.125rem 0.5rem rgba(0, 0, 0, 0.2);
+    background-color: white;
+    transition: 0.2s ease-in-out;
+  }
 
-							<div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
-								{#if type === "anonymous"}
-									<div class="col-span-6">
-										<label
-											for="donation_amount_eur"
-											class="block text-sm font-medium text-neutral-900"
-										>
-											{$_("donation-amount")}</label
-										>
-										<div class="mt-1 flex rounded-md shadow-sm">
-											<input
-												autocomplete="off"
-												class:border-red-500={!is_amount_valid}
-												class:focus:border-red-500={!is_amount_valid}
-												class:focus:ring-red-500={!is_amount_valid}
-												bind:value={amount_input}
-												type="number"
-												step="0.01"
-												name="donation_amount_eur"
-												class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm border-neutral-300 border bg-neutral-50 text-neutral-800 p-2"
-												placeholder="2.00"
-											/>
-											<span
-												class="inline-flex items-center px-3 rounded-r-md border border-neutral-300 bg-neutral-50 text-neutral-500 text-sm"
-												>€</span
-											>
-										</div>
-										{#if !is_amount_valid}
-											<span
-												class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-											>
-												{$_("donation-amount-must-be-greater-that-0-00eur")}
-											</span>
-										{/if}
-									</div>
-								{:else}
-									<div class="col-span-6">
-										<label
-											for="donor"
-											class="block text-sm font-medium text-neutral-900"
-											>{$_("donor")}</label
-										>
-										<Select
-											containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-neutral-300 border bg-neutral-50 text-neutral-800 rounded-md p-2"
-											itemFilter={(label, filterText, option) =>
-												filterDonors(label, filterText, option)}
-											items={donors}
-											showChevron={true}
-											placeholder={$_("search-for-donor-name-or-id")}
-											noOptionsMessage={$_("no-donors-found")}
-											on:select={(selectedValue) =>
-												(donor = selectedValue.detail.value.id)}
-											on:clear={() => (donors = null)}
-										/>
-									</div>
-									{#if type === "distance"}
-										<div class="col-span-6">
-											<label
-												for="donor"
-												class="block text-sm font-medium text-neutral-900"
-												>{$_("runner")}</label
-											>
-											<Select
-												containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-neutral-300 border bg-neutral-50 text-neutral-800 rounded-md p-2"
-												itemFilter={(label, filterText, option) =>
-													filterDonors(label, filterText, option)}
-												items={runners}
-												showChevron={true}
-												placeholder={$_("search-for-runner-by-name-or-id")}
-												noOptionsMessage={$_("no-runners-found")}
-												on:select={(selectedValue) =>
-													(runner = selectedValue.detail.value.id)}
-												on:clear={() => (runner = null)}
-											/>
-										</div>
-									{/if}
-									<div class="col-span-6">
-										<label
-											for="donation_amount_eur"
-											class="block text-sm font-medium text-neutral-900"
-										>
-											{#if type === "fixed"}
-												{$_("donation-amount")}
-											{:else}{$_("amount-per-kilometer")}{/if}</label
-										>
-										<div class="mt-1 flex rounded-md shadow-sm">
-											<input
-												autocomplete="off"
-												class:border-red-500={!is_amount_valid}
-												class:focus:border-red-500={!is_amount_valid}
-												class:focus:ring-red-500={!is_amount_valid}
-												bind:value={amount_input}
-												type="number"
-												step="0.01"
-												name="donation_amount_eur"
-												class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm border-neutral-300 border bg-neutral-50 text-neutral-800 p-2"
-												placeholder="2.00"
-											/>
-											<span
-												class="inline-flex items-center px-3 rounded-r-md border border-neutral-300 bg-neutral-50 text-neutral-500 text-sm"
-												>€</span
-											>
-										</div>
-										{#if !is_amount_valid}
-											<span
-												class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-											>
-												{$_("donation-amount-must-be-greater-that-0-00eur")}
-											</span>
-										{/if}
-									</div>
-								{/if}
-								{#if type === "fixed"}
-									<div class="flex">
-										<input
-											bind:checked={is_paid}
-											type="checkbox"
-											class="shrink-0 mt-0.5 border-neutral-200 rounded-sm text-blue-600 focus:ring-blue-500 checked:border-blue-500 disabled:opacity-50 disabled:pointer-events-none"
-											id="hs-default-checkbox"
-										/>
-										<label
-											for="hs-default-checkbox"
-											class="text-base text-neutral-900 ms-2 font-medium"
-											>{$_("already-paid")}</label
-										>
-									</div>
-								{/if}
-							</div>
-						</div>
-					</div>
-				</div>
-				<div
-					class="bg-neutral-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10"
-				>
-					<button
-						disabled={!createbtnenabled}
-						class:opacity-50={!createbtnenabled}
-						on:click={submit}
-						type="button"
-						class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-					>
-						{$_("create")}
-					</button>
-					<button
-						on:click={() => {
-							modal_open = false;
-						}}
-						type="button"
-						class="w-full justify-center rounded-md border border-neutral-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-neutral-900 hover:bg-neutral-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 hidden lg:block"
-					>
-						{$_("cancel")}
-					</button>
-				</div>
-			</div>
-		</div>
-	</div>
+  input:checked {
+    /* @apply: bg-indigo-400; */
+    background-color: #7f9cf5;
+  }
+
+  input:checked:before {
+    left: 1.25rem;
+  }
+</style>
+
+{#if modal_open}
+  <div
+    class="fixed z-10 inset-0 overflow-y-auto"
+    use:focusTrap
+    use:clickOutside
+    on:click_outside={() => {
+      modal_open = false;
+    }}>
+    <div
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
+      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
+        <div
+          class="absolute inset-0 bg-gray-500 opacity-75"
+          data-id="modal_backdrop" />
+      </div>
+      <span
+        class="hidden sm:inline-block sm:align-middle sm:h-screen"
+        aria-hidden="true">&#8203;</span>
+      <div
+        class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="modal-headline">
+        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+          <div class="sm:flex sm:items-start">
+            <div
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
+              <svg
+                class="h-6 w-6 text-blue-600"
+                fill="currentColor"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                width="24"
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
+                <path
+                  d="M14 2a8 8 0 013.3 15.3A8 8 0 116.7 6.7 8 8 0 0114 2zm-3 7H9v1a2.5 2.5 0 00-.16 5h2.25a.5.5 0 010 1H7v2h2v1h2v-1a2.5 2.5 0 00.16-5H8.91a.5.5 0 010-1H13v-2h-2V9zm3-5a5.99 5.99 0 00-4.48 2.01 8 8 0 018.47 8.47A6 6 0 0014 4z" /></svg>
+            </div>
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+              <h3 class="text-lg leading-6 font-medium text-gray-900">
+                {#if is_fixed}
+                  {$_('create-a-new-fixed-donation')}
+                {:else}{$_('create-a-new-distance-donation')}{/if}
+              </h3>
+              <label class="content-center align-middle object-center">
+                <span
+                  class="ml-2 text-base"
+                  class:text-gray-300={is_fixed}>{$_('distance-donation')}</span>
+                <input
+                  class="relative w-10 h-5 transition-all duration-200 ease-in-out bg-gray-400 rounded-full shadow-inner outline-none appearance-none align-middle"
+                  type="checkbox"
+                  bind:checked={is_fixed} />
+                <span
+                  class="ml-2 text-base	"
+                  class:text-gray-300={!is_fixed}>{$_('fixed-donation')}</span>
+              </label>
+              <div class="mt-2 mb-6">
+                <p class="text-sm text-gray-500">
+                  {$_('please-provide-the-nessecary-information-to-create-a-new-donation')}
+                </p>
+              </div>
+              <div class="grid grid-cols-6 gap-6">
+                <div class="col-span-6">
+                  <label
+                    for="donor"
+                    class="block text-sm font-medium text-gray-700">{$_('donor')}</label>
+                  <Select
+                    containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
+                    itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
+                    items={donors}
+                    showChevron={true}
+                    placeholder={$_('search-for-donor-name-or-id')}
+                    noOptionsMessage={$_('no-donors-found')}
+                    on:select={(selectedValue) => (donor = selectedValue.detail.value.id)}
+                    on:clear={() => (donors = null)} />
+                </div>
+                {#if !is_fixed}
+                  <div class="col-span-6">
+                    <label
+                      for="donor"
+                      class="block text-sm font-medium text-gray-700">{$_('runner')}</label>
+                    <Select
+                      containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
+                      itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
+                      items={runners}
+                      showChevron={true}
+                      placeholder={$_('search-for-runner-by-name-or-id')}
+                      noOptionsMessage={$_('no-runners-found')}
+                      on:select={(selectedValue) => (runner = selectedValue.detail.value.id)}
+                      on:clear={() => (runner = null)} />
+                  </div>
+                {/if}
+                <div class="col-span-6">
+                  <label
+                    for="donation_amount_eur"
+                    class="block text-sm font-medium text-gray-700">
+                    {#if !is_fixed}
+                      {$_('amount-per-kilometer')}
+                    {:else}{$_('donation-amount')}{/if}</label>
+                  <div class="mt-1 flex rounded-md shadow-sm">
+                    <input
+                      autocomplete="off"
+                      class:border-red-500={!is_amount_valid}
+                      class:focus:border-red-500={!is_amount_valid}
+                      class:focus:ring-red-500={!is_amount_valid}
+                      bind:value={amount_input}
+                      type="number"
+                      step="0.01"
+                      name="donation_amount_eur"
+                      class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 p-2"
+                      placeholder="2.00" />
+                    <span
+                      class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 text-sm">€</span>
+                  </div>
+                  {#if !is_amount_valid}
+                    <span
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('donation-amount-must-be-greater-that-0-00eur')}
+                    </span>
+                  {/if}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+          <button
+            disabled={!createbtnenabled}
+            class:opacity-50={!createbtnenabled}
+            on:click={submit}
+            type="button"
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('create')}
+          </button>
+          <button
+            on:click={() => {
+              modal_open = false;
+            }}
+            type="button"
+            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('cancel')}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
 {/if}

src/components/donations/AddDonationPaymentModal.svelte

@@ -1,205 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import { clickOutside } from "../base/outsideclick";
-  import { DonationService } from "@odit/lfk-client-js";
-  import { createEventDispatcher } from "svelte";
-  import toast from "svelte-french-toast";
-  export let payment_modal_open = false;
-  export let original_data = {};
-  export let paid_amount_input = 0;
-  const dispatch = createEventDispatcher();
-  $: processed_last_submit = true;
-  $: createbtnenabled =
-    is_paid_amount_valid &&
-    !(paid_amount_input * 100 == original_data.paidAmount);
-  $: is_paid_amount_valid = paid_amount_input > 0;
-  (() => {
-    document.onkeydown = (e) => {
-      e = e || window.event;
-      if (e.key === "Escape") {
-        payment_modal_open = false;
-      }
-      if (e.keyCode === 13) {
-        if (createbtnenabled === true) {
-          createbtnenabled = false;
-          submit();
-        }
-      }
-    };
-  })();
-  function submit() {
-    if (processed_last_submit === true) {
-      processed_last_submit = false;
-      toast.loading($_("updating-donation"));
-      const editable = Object.assign({}, original_data);
-      editable.donor = editable.donor.id;
-      editable.paidAmount = Math.round(paid_amount_input * 100);
-      if (editable.responseType == "DISTANCEDONATION" || editable.runner) {
-        editable.runner = editable.runner.id;
-        DonationService.donationControllerPutDistance(
-          original_data.id,
-          editable
-        )
-          .then((result) => {
-            payment_modal_open = false;
-            //
-            toast.dismiss();
-
-            toast.success($_("donation-updated"));
-            dispatch("created", { donation: result });
-          })
-          .catch((err) => {
-            //
-          })
-          .finally(() => {
-            processed_last_submit = true;
-          });
-      } else {
-        DonationService.donationControllerPutFixed(original_data.id, editable)
-          .then((result) => {
-            payment_modal_open = false;
-            //
-            toast.dismiss();
-            toast.success($_("donation-updated"));
-            dispatch("created", { donation: result });
-          })
-          .catch((err) => {
-            //
-          })
-          .finally(() => {
-            processed_last_submit = true;
-          });
-      }
-    }
-  }
-</script>
-
-{#if payment_modal_open}
-  <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
-    use:clickOutside
-    on:click_outside={() => {
-      payment_modal_open = false;
-    }}
-  >
-    <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
-      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
-        <div
-          class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
-      </div>
-      <span
-        class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
-      <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-        role="dialog"
-        aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
-            <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
-              <svg
-                class="size-6 text-blue-600"
-                fill="currentColor"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
-                <path
-                  fill="currentColor"
-                  d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z"
-                /></svg
-              >
-            </div>
-            <div class="mt-3 text-left">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("enter-payment")}
-              </h3>
-              <div class="mb-6">
-                <p class="text-sm text-gray-500">
-                  {$_(
-                    "you-can-enter-the-donations-paid-amount-manually-or-use-the-max-button-to-use-the-donations-exact-amount"
-                  )}
-                </p>
-              </div>
-              <div class="grid grid-cols gap-2 lg:gap-6">
-                <div class="w-full">
-                  <label
-                    for="token"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("paid-amount")}</label
-                  >
-                  <div
-                    class="inline-flex border-gray-300 border rounded-l-md rounded-r-md bg-gray-50 text-gray-500 w-full"
-                  >
-                    <input
-                      autocomplete="off"
-                      class:border-red-500={!is_paid_amount_valid}
-                      class:focus:border-red-500={!is_paid_amount_valid}
-                      class:focus:ring-red-500={!is_paid_amount_valid}
-                      bind:value={paid_amount_input}
-                      type="number"
-                      step="0.01"
-                      name="donation_amount_eur"
-                      class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm p-2"
-                      placeholder="2.00"
-                    />
-                    <button
-                      on:click={() => {
-                        paid_amount_input = paid_amount_input = (
-                          original_data.amount / 100
-                        ).toFixed(2);
-                      }}
-                      class="inline-flex items-center p-r-2 text-indigo-300 hover:text-indigo-700 text-sm"
-                      >MAX</button
-                    >
-                    <span
-                      class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 text-sm"
-                      >€</span
-                    >
-                  </div>
-                  {#if !is_paid_amount_valid}
-                    <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("payment-amount-must-be-greater-than-0-00eur")}
-                    </span>
-                  {/if}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-          <button
-            disabled={!createbtnenabled}
-            class:opacity-50={!createbtnenabled}
-            on:click={submit}
-            type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("save-changes")}
-          </button>
-          <button
-            on:click={() => {
-              payment_modal_open = false;
-            }}
-            type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}

src/components/donations/DeleteDonationModal.svelte

@@ -1,122 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import { clickOutside } from "../base/outsideclick";
-  import { createEventDispatcher, onMount } from "svelte";
-  export let modal_open;
-  export let delete_donation = {
-    id: 0,
-    runner: {
-      firstname: "",
-      lastname: "",
-    },
-    donor: {
-      firstname: "",
-      lastname: "",
-    },
-    amount: 0,
-  };
-  const dispatch = createEventDispatcher();
-  onMount(() => {
-    document.onkeydown = (e) => {
-      e = e || window.event;
-      if (e.key === "Escape") {
-        modal_open = false;
-      }
-      if (e.keyCode === 13) {
-        if (createbtnenabled === true) {
-          createbtnenabled = false;
-          submit();
-        }
-      }
-    };
-  });
-  async function submit() {
-    dispatch("delete", { id: delete_donation.id });
-    modal_open = false;
-  }
-</script>
-
-{#if modal_open}
-  <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
-    use:clickOutside
-    on:click_outside={() => {
-      modal_open = false;
-    }}
-  >
-    <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
-      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
-        <div
-          class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
-      </div>
-      <span
-        class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
-      <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-        role="dialog"
-        aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
-            <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
-              <svg
-                class="size-6 text-blue-600"
-                fill="currentColor"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 24 24"
-                width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
-                <path
-                  d="M14 2a8 8 0 013.3 15.3A8 8 0 116.7 6.7 8 8 0 0114 2zm-3 7H9v1a2.5 2.5 0 00-.16 5h2.25a.5.5 0 010 1H7v2h2v1h2v-1a2.5 2.5 0 00.16-5H8.91a.5.5 0 010-1H13v-2h-2V9zm3-5a5.99 5.99 0 00-4.48 2.01 8 8 0 018.47 8.47A6 6 0 0014 4z"
-                /></svg
-              >
-            </div>
-            <div class="mt-3 sm:text-left max-h-[75vh]">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("please-confirm-the-deletion-of-donation")}
-              </h3>
-              <div class="w-full">
-                <span class="inline-block"
-                  >{#if delete_donation.donor}<b>{$_("donor")}</b>: {delete_donation.donor.firstname}
-                  {delete_donation.donor.lastname}{:else}{$_("anonymer_sponsor")}{/if}
-                  <br>
-                  <b>{$_("amount")}</b>: {`${(delete_donation.amount / 100)
-          .toFixed(2)
-          .toLocaleString("de-DE", { valute: "EUR" })}€`}</span
-                >
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-          <button
-            on:click={submit}
-            type="button"
-            class="confirm_deletion_button"
-          >
-            {$_("delete")}
-          </button>
-          <button
-            on:click={() => {
-              modal_open = false;
-            }}
-            type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}

src/components/donations/DonationDetail.svelte

@@ -1,352 +1,286 @@
 <script>
-	import { _ } from "svelte-i18n";
-	import store from "../../store";
-	import {
-		DonationService,
-		DonorService,
-		RunnerService,
-	} from "@odit/lfk-client-js";
-	import toast from "svelte-french-toast";
+  import { _ } from "svelte-i18n";
+  import store from "../../store";
+  import {
+    DonationService,
+    DonorService,
+    RunnerService,
+  } from "@odit/lfk-client-js";
+  import Toastify from "toastify-js";
+  import PromiseError from "../base/PromiseError.svelte";
+  import Select from "svelte-select";
+  let data_loaded = false;
+  export let params;
+  $: delete_triggered = false;
+  $: original_data = {};
+  $: editable = {};
+  $: donor = {};
+  $: runner = {};
+  $: current_donors = [];
+  $: current_runners = [];
+  $: amount_input = 0;
+  $: is_amount_valid = amount_input > 0;
+  $: is_everything_set =
+    editable.donor != null &&
+    ((original_data.responseType == "DISTANCEDONATION" &&
+      editable?.runner != null) ||
+      original_data.responseType !== "DISTANCEDONATION");
+  $: changes_performed =
+    !(JSON.stringify(original_data) === JSON.stringify(editable)) ||
+    (original_data.responseType == "DISTANCEDONATION" &&
+      !(Math.floor(amount_input * 100) === original_data.amountPerDistance)) ||
+    (original_data.responseType !== "DISTANCEDONATION" &&
+      !(Math.floor(amount_input * 100) === original_data.amount));
+  $: save_enabled = changes_performed && is_amount_valid && is_everything_set;
 
-	import PromiseError from "../base/PromiseError.svelte";
-	import Select from "svelte-select";
-	let data_loaded = false;
-	export let params;
-	$: delete_triggered = false;
-	$: original_data = {};
-	$: editable = {};
-	$: donor = {};
-	$: runner = {};
-	$: current_donors = [];
-	$: current_runners = [];
-	$: amount_input = 0;
-	$: is_amount_valid = amount_input > 0;
-	$: paid_amount_input = 0;
-	$: is_paid_amount_valid = paid_amount_input > 0;
-	$: is_everything_set =
-		editable.donor != null &&
-		((original_data.responseType == "DISTANCEDONATION" &&
-			editable?.runner != null) ||
-			original_data.responseType !== "DISTANCEDONATION");
-	$: changes_performed =
-		!(JSON.stringify(original_data) === JSON.stringify(editable)) ||
-		(original_data.responseType == "DISTANCEDONATION" &&
-			!(Math.floor(amount_input * 100) === original_data.amountPerDistance)) ||
-		(original_data.responseType !== "DISTANCEDONATION" &&
-			!(Math.floor(amount_input * 100) === original_data.amount)) ||
-		!(Math.floor(paid_amount_input * 100) === original_data.paidAmount);
-	$: save_enabled = changes_performed && is_amount_valid && is_everything_set;
+  const promise = DonationService.donationControllerGetOne(
+    params.donationid
+  ).then((data) => {
+    data_loaded = true;
+    original_data = Object.assign(original_data, data);
+    editable = Object.assign(editable, original_data);
+    if (data.responseType == "DISTANCEDONATION") {
+      amount_input = data.amountPerDistance / 100;
+      RunnerService.runnerControllerGetAll().then((val) => {
+        current_runners = val.map((r) => {
+          return { label: getDonorLabel(r), value: r };
+        });
+        runner = current_runners.find((g) => g.value.id == editable.runner.id);
+      });
+    } else {
+      amount_input = data.amount / 100;
+    }
+    DonorService.donorControllerGetAll().then((val) => {
+      current_donors = val.map((r) => {
+        return { label: getDonorLabel(r), value: r };
+      });
+      donor = current_donors.find((g) => g.value.id == editable.donor.id);
+    });
+  });
+  const getDonorLabel = (option) =>
+    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
+  const filterDonors = (label, filterText, option) =>
+    label.toLowerCase().includes(filterText.toLowerCase()) ||
+    option.value.id.toString().startsWith(filterText.toLowerCase());
 
-	const promise = DonationService.donationControllerGetOne(
-		params.donationid
-	).then((data) => {
-		data_loaded = true;
-		original_data = Object.assign({}, data);
-		editable = Object.assign({}, original_data);
-		paid_amount_input = data.paidAmount / 100;
-		if (data.responseType == "DISTANCEDONATION") {
-			amount_input = data.amountPerDistance / 100;
-			RunnerService.runnerControllerGetAll().then((val) => {
-				current_runners = val.map((r) => {
-					return { label: getDonorLabel(r), value: r };
-				});
-				runner = current_runners.find((g) => g.value.id == editable.runner.id);
-			});
-		} else {
-			amount_input = data.amount / 100;
-		}
-		DonorService.donorControllerGetAll().then((val) => {
-			current_donors = val.map((r) => {
-				return { label: getDonorLabel(r), value: r };
-			});
-			donor = current_donors.find((g) => g.value.id == editable.donor.id);
-		});
-	});
-	const getDonorLabel = (option) =>
-		option.firstname + " " + (option.middlename || "") + " " + option.lastname;
-	const filterDonors = (label, filterText, option) =>
-		label.toLowerCase().includes(filterText.toLowerCase()) ||
-		option.value.id.toString().startsWith(filterText.toLowerCase());
-
-	function submit() {
-		if (data_loaded === true && save_enabled) {
-			toast($_("updating-donation"));
-			let postdata = {};
-			editable.paidAmount = paid_amount_input * 100;
-			if (original_data.responseType === "DISTANCEDONATION") {
-				editable.amountPerDistance = Math.floor(amount_input * 100);
-				postdata = Object.assign(postdata, editable);
-				postdata.runner = postdata.runner.id;
-				postdata.donor = postdata.donor.id;
-				DonationService.donationControllerPutDistance(
-					original_data.id,
-					postdata
-				)
-					.then((resp) => {
-						Object.assign(original_data, editable);
-						original_data = original_data;
-						toast.success($_("donation-updated"));
-					})
-					.catch((err) => {});
-			} else {
-				editable.amount = Math.floor(amount_input * 100);
-				postdata = Object.assign(postdata, editable);
-				postdata.donor = postdata.donor.id;
-				DonationService.donationControllerPutFixed(original_data.id, postdata)
-					.then((resp) => {
-						Object.assign(original_data, editable);
-						original_data = original_data;
-						toast.success($_("donation-updated"));
-					})
-					.catch((err) => {});
-			}
-		} else {
-		}
-	}
-	function deleteDonation() {
-		DonationService.donationControllerRemove(original_data.id, false)
-			.then((resp) => {
-				toast.success($_("donation-deleted"));
-				location.replace("./");
-			})
-			.catch((err) => {
-				modal_open = true;
-				delete_donor = original_data;
-			});
-	}
+  function submit() {
+    if (data_loaded === true && save_enabled) {
+      Toastify({
+        text: "Donation is being updated",
+        duration: 2500,
+      }).showToast();
+      let postdata = {};
+      if (original_data.responseType === "DISTANCEDONATION") {
+        editable.amountPerDistance = Math.floor(amount_input * 100);
+        postdata = Object.assign(postdata, editable);
+        postdata.runner = postdata.runner.id;
+        postdata.donor = postdata.donor.id;
+        DonationService.donationControllerPutDistance(
+          original_data.id,
+          postdata
+        )
+          .then((resp) => {
+            Object.assign(original_data, editable);
+            original_data = original_data;
+            Toastify({
+              text: "updated donation",
+              duration: 2500,
+              backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+            }).showToast();
+          })
+          .catch((err) => {});
+      } else {
+        editable.amount = Math.floor(amount_input * 100);
+        postdata = Object.assign(postdata, editable);
+        postdata.donor = postdata.donor.id;
+        DonationService.donationControllerPutFixed(original_data.id, postdata)
+          .then((resp) => {
+            Object.assign(original_data, editable);
+            original_data = original_data;
+            Toastify({
+              text: "updated donation",
+              duration: 2500,
+              backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+            }).showToast();
+          })
+          .catch((err) => {});
+      }
+    } else {
+    }
+  }
+  function deleteDonation() {
+    DonationService.donationControllerRemove(original_data.id, false)
+      .then((resp) => {
+        Toastify({
+          text: "Donation delete",
+          duration: 500,
+          backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+        }).showToast();
+        location.replace("./");
+      })
+      .catch((err) => {
+        modal_open = true;
+        delete_donor = original_data;
+      });
+  }
 </script>
 
 {#await promise}
-	{$_("loading-donation-details")}
+  {$_('loading-donation-details')}
 {:then}
-	<section class="container p-5 select-none">
-		<div class="flex flex-row mb-4">
-			<div class="mt-2 w-full">
-				<nav class="w-full flex">
-					<ol class="list-none flex flex-row items-center justify-start">
-						<li class="flex items-center">
-							<a class="mr-2" href="./"
-								><svg
-									xmlns="http://www.w3.org/2000/svg"
-									width="24"
-									height="24"
-									viewBox="0 0 24 24"
-									fill="none"
-									stroke="currentColor"
-									stroke-width="2"
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									class="inline-block"
-									><path d="m12 19-7-7 7-7" /><path d="M19 12H5" /></svg
-								>
-								{$_("donations")}</a
-							>
-						</li>
-					</ol>
-				</nav>
-			</div>
-		</div>
-		<div class="mb-4 text-3xl font-extrabold leading-tight">
-			{original_data.donor.firstname}
-			{original_data.donor.middlename || ""}
-			{original_data.donor.lastname}
-			&gt;
-			{#if original_data.responseType == "DISTANCEDONATION"}
-				{original_data.runner.firstname}
-				{original_data.runner.middlename || ""}
-				{original_data.runner.lastname}
-			{:else}
-				{$_("fixed-donation")}:
-				{amount_input.toFixed(2).toLocaleString("de-DE", { valute: "EUR" })}€
-			{/if}
-			[#{original_data.id}]
-			<div data-id="donation_actions_${original_data.id}">
-				{#if store.state.jwtinfo.userdetails.permissions.includes("DONATION:DELETE")}
-					{#if delete_triggered}
-						<button
-							on:click={deleteDonation}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-							>{$_("confirm-deletion")}</button
-						>
-						<button
-							on:click={() => {
-								delete_triggered = !delete_triggered;
-							}}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm"
-							>{$_("cancel")}</button
-						>
-					{/if}
-					{#if !delete_triggered}
-						<button
-							on:click={() => {
-								delete_triggered = true;
-							}}
-							type="button"
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-							>{$_("delete-donation")}</button
-						>
-					{/if}
-				{/if}
-				{#if !delete_triggered}
-					<button
-						disabled={!save_enabled}
-						class:opacity-50={!save_enabled}
-						type="button"
-						on:click={submit}
-						class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-						>{$_("save-changes")}</button
-					>
-				{/if}
-			</div>
-		</div>
-		<!--  -->
-		<div>
-			<span class="font-semibold text-gray-700"
-				>{$_("total-donation-amount")}:</span
-			>
-			<span
-				>{(editable.amount / 100)
-					.toFixed(2)
-					.toLocaleString("de-DE", { valute: "EUR" })}€</span
-			>
-			|
-			<span class="font-semibold text-gray-700">{$_("paid-amount")}:</span>
-			<span
-				>{(editable.paidAmount / 100)
-					.toFixed(2)
-					.toLocaleString("de-DE", { valute: "EUR" })}€</span
-			>
-			|
-			<span class="font-semibold text-gray-700">{$_("status")}:</span>
-			{#if editable.status == "PAID"}
-				<span
-					class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-green-100 text-green-800"
-					>{$_("paid")}</span
-				>
-			{:else}
-				<span
-					class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-red-100 text-red-800"
-					>{$_("open")}</span
-				>
-			{/if}
-		</div>
-		<br />
-		<div class=" mt-2 w-full">
-			<label for="donor" class="block font-semibold text-gray-700"
-				>{$_("donor")}</label
-			>
-			<Select
-				containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				itemFilter={(label, filterText, option) =>
-					filterDonors(label, filterText, option)}
-				items={current_donors}
-				showChevron={true}
-				placeholder={$_("search-for-donor-name-or-id")}
-				noOptionsMessage={$_("no-donors-found")}
-				bind:selectedValue={donor}
-				on:select={(selectedValue) => {
-					editable.donor = selectedValue.detail.value;
-					editable.donor.donationAmount = original_data.donor.donationAmount;
-					editable.donor.paidDonationAmount =
-						original_data.donor.paidDonationAmount;
-				}}
-				on:clear={() => (editable.donor = null)}
-			/>
-		</div>
-		{#if original_data.responseType == "DISTANCEDONATION"}
-			<div class=" mt-2 w-full">
-				<label for="donor" class="block font-semibold text-gray-700"
-					>{$_("runner")}</label
-				>
-				<Select
-					containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-					itemFilter={(label, filterText, option) =>
-						filterDonors(label, filterText, option)}
-					items={current_runners}
-					showChevron={true}
-					placeholder={$_("search-for-runner-by-name-or-id")}
-					noOptionsMessage={$_("no-runners-found")}
-					bind:selectedValue={runner}
-					on:select={(selectedValue) =>
-						(editable.runner = selectedValue.detail.value)}
-					on:clear={() => (editable.runner = null)}
-				/>
-			</div>
-		{/if}
-		<div class=" mt-2 w-full">
-			<label for="lastname" class="font-semibold text-gray-700">
-				{#if original_data.responseType == "DISTANCEDONATION"}
-					{$_("amount-per-kilometer")}
-				{:else}{$_("donation-amount")}{/if}
-			</label>
-			<div class="mt-1 flex rounded-md shadow-sm">
-				<input
-					autocomplete="off"
-					class:border-red-500={!is_amount_valid}
-					class:focus:border-red-500={!is_amount_valid}
-					class:focus:ring-red-500={!is_amount_valid}
-					bind:value={amount_input}
-					type="number"
-					step="0.01"
-					name="donation_amount_eur"
-					class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 p-2"
-					placeholder="2.00"
-				/>
-				<span
-					class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500"
-					>€</span
-				>
-			</div>
-			{#if !is_amount_valid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("donation-amount-must-be-greater-that-0-00eur")}
-				</span>
-			{/if}
-		</div>
-		<div class="mt-2 w-full">
-			<label for="token" class="block font-semibold text-gray-700"
-				>{$_("paid-amount")}</label
-			>
-			<div
-				class="inline-flex border-gray-300 border rounded-l-md rounded-r-md bg-gray-50 text-gray-500 w-full"
-			>
-				<input
-					autocomplete="off"
-					class:border-red-500={!is_amount_valid}
-					class:focus:border-red-500={!is_amount_valid}
-					class:focus:ring-red-500={!is_amount_valid}
-					bind:value={paid_amount_input}
-					type="number"
-					step="0.01"
-					name="donation_amount_eur"
-					class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm p-2"
-					placeholder="2.00"
-				/>
-				<button
-					on:click={() => {
-						paid_amount_input = paid_amount_input = (
-							original_data.amount / 100
-						).toFixed(2);
-					}}
-					class="inline-flex items-center p-r-2 text-indigo-300 hover:text-indigo-700 text-sm"
-					>MAX</button
-				>
-				<span
-					class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 text-sm"
-					>€</span
-				>
-			</div>
-			{#if !is_paid_amount_valid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("payment-amount-must-be-greater-than-0-00eur")}
-				</span>
-			{/if}
-		</div>
-	</section>
+  <section class="container p-5 select-none">
+    <div class="flex flex-row mb-4">
+      <div class="w-full">
+        <nav class="w-full flex">
+          <ol class="list-none flex flex-row items-center justify-start">
+            <li class="flex items-center">
+              <svg
+                fill="currentColor"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                width="24"
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
+                <path
+                  d="M14 2a8 8 0 013.3 15.3A8 8 0 116.7 6.7 8 8 0 0114 2zm-3 7H9v1a2.5 2.5 0 00-.16 5h2.25a.5.5 0 010 1H7v2h2v1h2v-1a2.5 2.5 0 00.16-5H8.91a.5.5 0 010-1H13v-2h-2V9zm3-5a5.99 5.99 0 00-4.48 2.01 8 8 0 018.47 8.47A6 6 0 0014 4z" /></svg>
+            </li>
+            <li class="flex items-center ml-2">
+              <a class="mr-2" href="./">{$_('donations')}</a><svg
+                stroke="currentColor"
+                fill="none"
+                stroke-width="2"
+                viewBox="0 0 24 24"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="h-3 w-3 mr-2 stroke-current"
+                height="1em"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"><line
+                  x1="5"
+                  y1="12"
+                  x2="19"
+                  y2="12" />
+                <polyline points="12 5 19 12 12 19" /></svg>
+            </li>
+            <li class="flex items-center">
+              <span class="mr-2">{original_data.id}</span>
+            </li>
+          </ol>
+        </nav>
+      </div>
+    </div>
+    <div class="mb-8 text-3xl font-extrabold leading-tight">
+      {original_data.donor.firstname}
+      {original_data.donor.middlename || ''}
+      {original_data.donor.lastname}
+      &gt;
+      {#if original_data.responseType == 'DISTANCEDONATION'}
+        {original_data.runner.firstname}
+        {original_data.runner.middlename || ''}
+        {original_data.runner.lastname}
+      {:else}
+        {$_('fixed-donation')}:
+        {amount_input.toFixed(2).toLocaleString('de-DE', { valute: 'EUR' })}€
+      {/if}
+      <span data-id="donation_actions_${original_data.id}">
+        {#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:DELETE')}
+          {#if delete_triggered}
+            <button
+              on:click={deleteDonation}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:">{$_('confirm-deletion')}</button>
+            <button
+              on:click={() => {
+                delete_triggered = !delete_triggered;
+              }}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:">{$_('cancel')}</button>
+          {/if}
+          {#if !delete_triggered}
+            <button
+              on:click={() => {
+                delete_triggered = true;
+              }}
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:">{$_('delete-donation')}</button>
+          {/if}
+        {/if}
+        {#if !delete_triggered}
+          <button
+            disabled={!save_enabled}
+            class:opacity-50={!save_enabled}
+            type="button"
+            on:click={submit}
+            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:">{$_('save-changes')}</button>
+        {/if}
+      </span>
+    </div>
+    <!--  -->
+    <div>
+      <span
+        class="font-medium text-gray-700">{$_('total-donation-amount')}:</span>
+      <span>{(editable.amount / 100)
+          .toFixed(2)
+          .toLocaleString('de-DE', { valute: 'EUR' })}€</span>
+    </div>
+    <div class=" w-full">
+      <label
+        for="donor"
+        class="block  font-medium text-gray-700">{$_('donor')}</label>
+      <Select
+        containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
+        itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
+        items={current_donors}
+        showChevron={true}
+        placeholder={$_('search-for-donor-name-or-id')}
+        noOptionsMessage={$_('no-donors-found')}
+        bind:selectedValue={donor}
+        on:select={(selectedValue) => (editable.donor = selectedValue.detail.value)}
+        on:clear={() => (editable.donor = null)} />
+    </div>
+    {#if original_data.responseType == 'DISTANCEDONATION'}
+      <div class=" w-full">
+        <label
+          for="donor"
+          class="block  font-medium text-gray-700">{$_('runner')}</label>
+        <Select
+          containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
+          itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
+          items={current_runners}
+          showChevron={true}
+          placeholder={$_('search-for-runner-by-name-or-id')}
+          noOptionsMessage={$_('no-runners-found')}
+          bind:selectedValue={runner}
+          on:select={(selectedValue) => (editable.runner = selectedValue.detail.value)}
+          on:clear={() => (editable.runner = null)} />
+      </div>
+    {/if}
+    <div class=" w-full">
+      <label for="lastname" class="font-medium text-gray-700">
+        {#if original_data.responseType == 'DISTANCEDONATION'}
+          {$_('amount-per-kilometer')}
+        {:else}{$_('donation-amount')}{/if}
+      </label>
+      <div class="mt-1 flex rounded-md shadow-sm">
+        <input
+          autocomplete="off"
+          class:border-red-500={!is_amount_valid}
+          class:focus:border-red-500={!is_amount_valid}
+          class:focus:ring-red-500={!is_amount_valid}
+          bind:value={amount_input}
+          type="number"
+          step="0.01"
+          name="donation_amount_eur"
+          class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 p-2"
+          placeholder="2.00" />
+        <span
+          class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 ">€</span>
+      </div>
+      {#if !is_amount_valid}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('donation-amount-must-be-greater-that-0-00eur')}
+        </span>
+      {/if}
+    </div>
+  </section>
 {:catch error}
-	<PromiseError {error} />
+  <PromiseError {error} />
 {/await}

src/components/donations/DonationDonor.svelte

@@ -1,21 +0,0 @@
-<script>
-	import { _ } from "svelte-i18n";
-	export let donor;
-</script>
-
-{#if !donor || donor.firstname == 0}
-	<span
-		class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800 border border-current"
-		>{$_('anonymer_sponsor')}</span
-	>
-{:else}
-	<div class="flex items-center">
-		<a
-			href="../donors/{donor.id}"
-			class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800 border border-current"
-			>{donor.firstname}
-			{#if donor.middlename}{donor.middlename}{/if}
-			{donor.lastname}</a
-		>
-	</div>
-{/if}

src/components/donations/DonationRunner.svelte

@@ -1,18 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  export let runner;
-</script>
-
-{#if !runner || runner.firstname == 0}
-  {$_("fixed-donation")}
-{:else}
-  <div class="text-sm font-medium text-gray-900">
-    <a
-      href="../runners/{runner.id}"
-      class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800 border border-current"
-      >{runner.firstname}
-      {#if runner.middlename}{runner.middlename}{/if}
-      {runner.lastname}</a
-    >
-  </div>
-{/if}

src/components/donations/DonationStatus.svelte

@@ -1,16 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  export let status;
-</script>
-
-{#if status == "PAID"}
-  <span
-    class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-green-100 text-green-800"
-    >{$_("paid")}</span
-  >
-{:else}
-  <span
-    class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-red-100 text-red-800"
-    >{$_("open")}</span
-  >
-{/if}

src/components/donations/DonationTableAction.svelte

@@ -1,28 +0,0 @@
-<script>
-	import { _ } from "svelte-i18n";
-	import TableActions from "../shared/TableActions.svelte";
-
-	export let detailsLink;
-	export let detailsAction;
-	export let deleteEnabled;
-	export let deleteAction;
-	export let paymentAction;
-</script>
-
-{#if paymentAction}
-	<button
-		on:click={paymentAction}
-		class="text-[#025a21] cursor-pointer hover:text-green-900 mr-4"
-		>{$_("enter-payment")}</button
-	>
-{:else}
-	<span class="inline-block opacity-0 cursor-default mr-4" style=""
-		>{$_("enter-payment")}</span
-	>
-{/if}
-<TableActions
-	bind:detailsAction
-	bind:detailsLink
-	bind:deleteAction
-	bind:deleteEnabled
-/>

src/components/donations/Donations.svelte

@@ -5,32 +5,25 @@
   import DonationsOverview from "./DonationsOverview.svelte";
   $: current_donations = [];
   export let modal_open = false;
-  let addDonations;
 </script>
 
 <section class="container p-5">
-  <h4 class="mb-1 text-3xl font-extrabold leading-tight">
-    {$_("donations")}
-  </h4>
-  {#if store.state.jwtinfo.userdetails.permissions.includes("DONATION:CREATE")}
-    <button
-      on:click={() => {
-        modal_open = true;
-      }}
-      type="button"
-      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm"
-    >
-      {$_("add-donation")}
-    </button>
-  {/if}
-  <DonationsOverview bind:current_donations bind:addDonations />
+  <span class="mb-1 text-3xl font-extrabold leading-tight">
+    {$_('donations')}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:CREATE')}
+      <button
+        on:click={() => {
+          modal_open = true;
+        }}
+        type="button"
+        class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+        {$_('add-donation')}
+      </button>
+    {/if}
+  </span>
+  <DonationsOverview bind:current_donations />
 </section>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes("DONATION:CREATE")}
-  <AddDonationModal
-    on:created={(event) => {
-      addDonations(event.detail.donations);
-    }}
-    bind:modal_open
-  />
+{#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:CREATE')}
+  <AddDonationModal bind:current_donations bind:modal_open />
 {/if}

src/components/donations/DonationsEmptyState.svelte

@@ -5,8 +5,8 @@
 
 <div class="text-center items-center justify-center">
   <p class="mb-16 text-lg text-gray-500">
-    <img class="m-auto mt-2" style="height:15rem" src={donations_empty} alt="" />
-    <span class="font-bold">{$_("there-are-no-donations-yet")}</span><br />
-    <span>{$_("add-your-fist-donation")}</span>
+    <img class="w-full" style="height:15rem" src={donations_empty} alt="" />
+    <span class="font-bold">There are no donations yet</span><br />
+    <span>add your fist donation</span>
   </p>
 </div>

src/components/donations/DonationsOverview.svelte

@@ -1,283 +1,202 @@
 <script>
-  import { _ } from "svelte-i18n";
-  import { DonationService } from "@odit/lfk-client-js";
+  import { getLocaleFromNavigator, _ } from "svelte-i18n";
+  import { DonationService, DonorService } from "@odit/lfk-client-js";
   import store from "../../store";
+  import Toastify from "toastify-js";
   import DonationsEmptyState from "./DonationsEmptyState.svelte";
-  import AddDonationPaymentModal from "./AddDonationPaymentModal.svelte";
-  import { onMount } from "svelte";
-  import {
-    createSvelteTable,
-    flexRender,
-    getCoreRowModel,
-    getFilteredRowModel,
-    getPaginationRowModel,
-    getSortedRowModel,
-    renderComponent,
-  } from "@tanstack/svelte-table";
-  import { writable } from "svelte/store";
-  import TableBottom from "../shared/TableBottom.svelte";
-  import InputElement from "../shared/InputElement.svelte";
-  import TableHeader from "../shared/TableHeader.svelte";
-  import DonationDonor from "./DonationDonor.svelte";
-  import DonationRunner from "./DonationRunner.svelte";
-  import DonationStatus from "./DonationStatus.svelte";
-  import DonationTableAction from "./DonationTableAction.svelte";
-  import DeleteDonationModal from "./DeleteDonationModal.svelte";
-  import {
-    donationDonorFilter,
-    donationRunnerFilter,
-  } from "../shared/tablefilters";
-  import toast from "svelte-french-toast";
   $: searchvalue = "";
   $: active_deletes = [];
-  $: active_edits = [];
-  $: selected =
-    $table?.getSelectedRowModel().rows.map((row) => row.index) || [];
-  $: dataLoaded = false;
-
   export let current_donations = [];
-  export const addDonations = (donations) => {
-    current_donations = current_donations.concat(...donations);
-    options.update((options) => ({
-      ...options,
-      data: current_donations,
-    }));
-  };
-
-  //Section table
-  const columns = [
-    {
-      accessorKey: "id",
-      header: () => "id",
-      filterFn: `equalsString`,
-    },
-    {
-      accessorKey: "donor",
-      header: () => $_("donor"),
-      cell: (info) => {
-        return renderComponent(DonationDonor, { donor: info.getValue() });
-      },
-      filterFn: `donor`,
-    },
-    {
-      accessorKey: "runner",
-      header: () => $_("runner"),
-      cell: (info) => {
-        return renderComponent(DonationRunner, { runner: info.getValue() });
-      },
-      filterFn: `runner`,
-    },
-    {
-      accessorKey: "amountPerDistance",
-      header: () => $_("amount-per-kilometer"),
-      cell: (info) => {
-        if (!info.getValue()) {
-          return $_("fixed-donation");
-        }
-        return `${(info.getValue() / 100)
-          .toFixed(2)
-          .toLocaleString("de-DE", { valute: "EUR" })} €`;
-      },
-      enableColumnFilter: false,
-    },
-    {
-      accessorKey: "amount",
-      header: () => $_("donation-amount"),
-      cell: (info) => {
-        return `${(info.getValue() / 100)
-          .toFixed(2)
-          .toLocaleString("de-DE", { valute: "EUR" })} €`;
-      },
-      enableColumnFilter: false,
-    },
-    {
-      accessorKey: "paidAmount",
-      header: () => $_("total-paid-amount"),
-      cell: (info) => {
-        return `${(info.getValue() / 100)
-          .toFixed(2)
-          .toLocaleString("de-DE", { valute: "EUR" })} €`;
-      },
-      enableColumnFilter: false,
-    },
-    {
-      accessorKey: "status",
-      header: () => $_("status"),
-      cell: (info) => {
-        return renderComponent(DonationStatus, { status: info.getValue() });
-      },
-      enableColumnFilter: false,
-    },
-    {
-      accessorKey: "actions",
-      header: () => $_("action"),
-      cell: (info) => {
-        let detailsLink
-        let paymentAction
-        if (info.row.original.donor != undefined){
-          detailsLink = `./${info.row.original.id}`
-          paymentAction = () => {
-            active_edits = current_donations.filter(
-              (r) => r.id == info.row.original.id
-            );
-          }
-        }
-        
-        return renderComponent(DonationTableAction, {
-          detailsLink: detailsLink,
-          deleteAction: () => {
-            active_deletes = current_donations.filter(
-              (r) => r.id == info.row.original.id
-            );
-          },
-          paymentAction: paymentAction,
-          deleteEnabled:
-            store.state.jwtinfo.userdetails.permissions.includes(
-              "DONATION:DELETE"
-            ),
-        });
-      },
-      enableColumnFilter: false,
-      enableSorting: false,
-    },
-  ];
-  const options = writable({
-    data: [],
-    columns: columns,
-    initialState: {
-      pagination: {
-        pageSize: 50,
-      },
-    },
-    filterFns: {
-      donor: donationDonorFilter,
-      runner: donationRunnerFilter,
-    },
-    enableRowSelection: true,
-    getCoreRowModel: getCoreRowModel(),
-    getFilteredRowModel: getFilteredRowModel(),
-    getPaginationRowModel: getPaginationRowModel(),
-    getSortedRowModel: getSortedRowModel(),
-  });
-  const table = createSvelteTable(options);
-
-  async function deleteDonation(delete_donation_id) {
-    await DonationService.donationControllerRemove(delete_donation_id, true);
-    current_donations = current_donations.filter(
-      (r) => r.id !== delete_donation_id
-    );
-    options.update((options) => ({
-      ...options,
-      data: current_donations,
-    }));
-    toast.success($_("donation-deleted"));
-  }
-
-  onMount(async () => {
-    let page = 0;
-    let pagesize = 300;
-    while (page >= 0) {
-      const donations = await DonationService.donationControllerGetAll(
-        page,
-        pagesize
-      );
-      if (donations.length == 0) {
-        page = -2;
-      }
-
-      current_donations = current_donations.concat(...donations);
-      options.update((options) => ({
-        ...options,
-        data: current_donations,
-      }));
-
-      dataLoaded = true;
-      page++;
+  const donations_promise = DonationService.donationControllerGetAll().then(
+    (val) => {
+      current_donations = val;
     }
-  });
+  );
+  function should_display_based_on_id(id) {
+    if (searchvalue.toString().slice(-1) === "*") {
+      return id.toString().startsWith(searchvalue.replace("*", ""));
+    }
+    return id.toString() === searchvalue;
+  }
 </script>
 
-<AddDonationPaymentModal
-  original_data={active_edits[0]}
-  payment_modal_open={active_edits.length > 0}
-  paid_amount_input={(active_edits[0]?.paidAmount || 0) / 100}
-  on:created={(event) => {
-    current_donations = current_donations.map((d)=>{
-      if(d.id === event.detail.donation.id){
-        d.paidAmount = event.detail.donation.paidAmount;
-      }
-      return d;
-    })
-    options.update((options) => ({
-      ...options,
-      data: current_donations,
-    }));
-  }}
-/>
-<DeleteDonationModal
-  delete_donation={active_deletes[0]}
-  modal_open={active_deletes.length > 0}
-  on:delete={(event) => {
-    deleteDonation(event.detail.id);
-  }}
-/>
-{#if store.state.jwtinfo.userdetails.permissions.includes("DONATION:GET")}
-  {#if !dataLoaded}
+{#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:GET')}
+  {#await donations_promise}
     <div
       class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-      role="alert"
-    >
-      <p class="font-bold">{$_("donations-are-being-loaded")}</p>
-      <p class="text-sm">{$_("this-might-take-a-moment")}</p>
+      role="alert">
+      <p class="font-bold">donations are being loaded</p>
+      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
     </div>
-  {:else if current_donations.length === 0}
-    <DonationsEmptyState />
-  {:else}
-    <input
-      type="search"
-      bind:value={searchvalue}
-      placeholder={$_("datatable.search")}
-      aria-label={$_("datatable.search")}
-      class="mb-2 w-full sm:w-auto mt-1 sm:mt-0 p-2 rounded-md border"
-    />
-    <div
-      class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll"
-    >
-      <table class="w-full">
-        <thead class="border-b border-gray-400">
-          {#each $table.getHeaderGroups() as headerGroup}
-            <tr class="select-none">
-              {#each headerGroup.headers as header}
-                <TableHeader {header} />
-              {/each}
+  {:then}
+    {#if current_donations.length === 0}
+      <DonationsEmptyState />
+    {:else}
+      <input
+        type="search"
+        bind:value={searchvalue}
+        placeholder={$_('datatable.search')}
+        aria-label={$_('datatable.search')}
+        class="gridjs-input gridjs-search-input mb-4" />
+      <div
+        class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
+        <table class="divide-y divide-gray-200 w-full">
+          <thead class="bg-gray-50">
+            <tr>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('donor')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('runner')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('amount-per-kilometer')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('donation-amount')}
+              </th>
+              <th scope="col" class="relative px-6 py-3">
+                <span class="sr-only">{$_('action')}</span>
+              </th>
             </tr>
-          {/each}
-        </thead>
-        <tbody>
-          {#each $table.getRowModel().rows as row}
-            <tr class="odd:bg-white even:bg-gray-100">
-              {#each row.getVisibleCells() as cell}
-                <td>
-                  <svelte:component
-                    this={flexRender(
-                      cell.column.columnDef.cell,
-                      cell.getContext()
-                    )}
-                  />
-                </td>
-              {/each}
-            </tr>
-          {/each}
-        </tbody>
-      </table>
+          </thead>
+          <tbody class="divide-y divide-gray-200">
+            {#each current_donations as donation}
+              {#if donation.donor.firstname
+                .toLowerCase()
+                .includes(
+                  searchvalue.toLowerCase()
+                ) || donation.donor.middlename
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || donation.donor.lastname
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || donation.runner?.firstname
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || donation.runner?.middlename
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || donation.runner?.lastname
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || should_display_based_on_id(donation.id)}
+                <tr data-rowid="donation_{donation.id}">
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="flex items-center">
+                      <a
+                        href="../donors/{donation.donor.id}"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{donation.donor.firstname}
+                        {donation.donor.middlename || ''}
+                        {donation.donor.lastname}</a>
+                    </div>
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    {#if donation.runner}
+                      <div class="text-sm font-medium text-gray-900">
+                        <a
+                          href="../runners/{donation.runner.id}"
+                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{donation.runner.firstname}
+                          {donation.runner.middlename || ''}
+                          {donation.runner.lastname}</a>
+                      </div>
+                    {:else}
+                      <div class="text-sm font-medium text-gray-900">
+                        {$_('fixed-donation')}
+                      </div>
+                    {/if}
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    {#if donation.amountPerDistance}
+                      <div class="text-sm font-medium text-gray-900">
+                        {(donation.amountPerDistance / 100)
+                          .toFixed(2)
+                          .toLocaleString('de-DE', { valute: 'EUR' })}€
+                      </div>
+                    {:else}
+                      <div class="text-sm font-medium text-gray-900">
+                        {$_('fixed-donation')}
+                      </div>
+                    {/if}
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="text-sm font-medium text-gray-900">
+                      {(donation.amount / 100)
+                        .toFixed(2)
+                        .toLocaleString('de-DE', { valute: 'EUR' })}€
+                    </div>
+                  </td>
+                  {#if active_deletes[donation.id] === true}
+                    <td
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                      <button
+                        on:click={() => {
+                          active_deletes[donation.id] = false;
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
+                      <button
+                        on:click={() => {
+                          DonationService.donationControllerRemove(donation.id, false).then(
+                            (resp) => {
+                              current_donations = current_donations.filter(
+                                (obj) => obj.id !== donation.id
+                              );
+                              Toastify({
+                                text: 'Donation deleted',
+                                duration: 500,
+                                backgroundColor:
+                                  'linear-gradient(to right, #00b09b, #96c93d)',
+                              }).showToast();
+                            }
+                          );
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
+                    </td>
+                  {:else}
+                    <td
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                      <a
+                        href="./{donation.id}"
+                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
+                      {#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:DELETE')}
+                        <button
+                          on:click={() => {
+                            active_deletes[donation.id] = true;
+                          }}
+                          tabindex="0"
+                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
+                      {/if}
+                    </td>
+                  {/if}
+                </tr>
+              {/if}
+            {/each}
+          </tbody>
+        </table>
+      </div>
+    {/if}
+  {:catch error}
+    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+      <span class="inline-block align-middle mr-8">
+        <b class="capitalize">{$_('general_promise_error')}</b>
+        {error}
+      </span>
     </div>
-    <div class="h-2" />
-    <TableBottom {table} {selected} />
-  {/if}
+  {/await}
 {/if}
-
-<style>
-  table tbody tr td:nth-child(2) {
-    font-family: monospace;
-  }
-</style>

src/components/donors/AddDonorModal.svelte

@@ -1,14 +1,15 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-
-  import { DonorService } from "@odit/lfk-client-js";
+  import { focusTrap } from "svelte-focus-trap";
+  import {
+    DonorService
+  } from "@odit/lfk-client-js";
   import isEmail from "validator/es/lib/isEmail";
   import isMobilePhone from "validator/es/lib/isMobilePhone";
-
-  import { createEventDispatcher } from "svelte";
-  import toast from "svelte-french-toast";
+  import Toastify from "toastify-js";
   export let modal_open;
+  export let current_donors;
   let firstname_input;
   let lastname_input;
   let middlename_input;
@@ -18,7 +19,6 @@
   let address_input2;
   let address_zipcode;
   let address_city;
-  const dispatch = createEventDispatcher();
   function focus(el) {
     el.focus();
   }
@@ -74,7 +74,10 @@
   function submit() {
     if (processed_last_submit === true) {
       processed_last_submit = false;
-      toast.loading($_("donor-is-being-added"));
+      const toast = Toastify({
+        text: $_('donor-is-being-added'),
+        duration: -1,
+      }).showToast();
       let address = {};
       if (address_checked === true) {
         address = {
@@ -89,7 +92,7 @@
         firstname: firstname_input_value,
         lastname: lastname_input_value,
         address,
-        receiptNeeded: address_checked,
+        receiptNeeded: address_checked
       };
       if (middlename_input_value) {
         postdata.middlename = middlename_input_value;
@@ -108,15 +111,21 @@
           email_input_value = "";
           modal_open = false;
           //
-          toast.dismiss();
-          toast.success($_("donor-added"));
-          dispatch("created", { donors: [result] });
+          Toastify({
+            text: $_('donor-added'),
+            duration: 500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
+          current_donors.push(result);
+          current_donors = current_donors;
         })
         .catch((err) => {
           //
         })
         .finally(() => {
           processed_last_submit = true;
+          //
+          toast.hideToast();
         });
     }
   }
@@ -124,71 +133,59 @@
 
 {#if modal_open}
   <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
+    class="fixed z-10 inset-0 overflow-y-auto"
+    use:focusTrap
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;
-    }}
-  >
+    }}>
     <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
       <div class="fixed inset-0 transition-opacity" aria-hidden="true">
         <div
           class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
+          data-id="modal_backdrop" />
       </div>
       <span
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
+        aria-hidden="true">&#8203;</span>
       <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
+        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
         role="dialog"
         aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
+        aria-labelledby="modal-headline">
+        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+          <div class="sm:flex sm:items-start">
             <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
               <svg
-                class="size-6 text-blue-600"
+                class="h-6 w-6 text-blue-600"
                 fill="currentColor"
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 24 24"
                 width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
                 <path
-                  d="M9.33 11.5h2.17A4.5 4.5 0 0 1 16 16H8.999L9 17h8v-1a5.578 5.578 0 0 0-.886-3H19a5 5 0 0 1 4.516 2.851C21.151 18.972 17.322 21 13 21c-2.761 0-5.1-.59-7-1.625L6 10.071A6.967 6.967 0 0 1 9.33 11.5zM5 19a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v9zM18 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm-7-3a3 3 0 1 1 0 6 3 3 0 0 1 0-6z"
-                /></svg
-              >
+        d="M9.33 11.5h2.17A4.5 4.5 0 0 1 16 16H8.999L9 17h8v-1a5.578 5.578 0 0 0-.886-3H19a5 5 0 0 1 4.516 2.851C21.151 18.972 17.322 21 13 21c-2.761 0-5.1-.59-7-1.625L6 10.071A6.967 6.967 0 0 1 9.33 11.5zM5 19a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v9zM18 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm-7-3a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" /></svg>
             </div>
-            <div class="mt-3">
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("create-a-new-donor")}
+                {$_('create-a-new-donor')}
               </h3>
-              <div class="mb-6">
+              <div class="mt-2 mb-6">
                 <p class="text-sm text-gray-500">
-                  {$_(
-                    "please-provide-the-nessecary-information-to-add-a-new-donor"
-                  )}
+                  {$_('please-provide-the-nessecary-information-to-add-a-new-donor')}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
+              <div class="grid grid-cols-6 gap-6">
                 <div class="col-span-6">
                   <label
                     for="firstname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("first-name")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('first-name')}</label>
                   <input
                     use:focus
                     autocomplete="off"
-                    placeholder={$_("first-name")}
+                    placeholder={$_('first-name')}
                     class:border-red-500={!isFirstnameValid}
                     class:focus:border-red-500={!isFirstnameValid}
                     class:focus:ring-red-500={!isFirstnameValid}
@@ -196,41 +193,34 @@
                     bind:this={firstname_input}
                     type="text"
                     name="firstname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isFirstnameValid}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("first-name-is-required")}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('first-name-is-required')}
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
                     for="trackname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("middle-name")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('middle-name')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("middle-name")}
+                    placeholder={$_('middle-name')}
                     bind:value={middlename_input_value}
                     bind:this={middlename_input}
                     type="text"
                     name="trackname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                 </div>
                 <div class="col-span-6">
                   <label
                     for="lastname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("last-name")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('last-name')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("last-name")}
+                    placeholder="{$_('last-name')}"
                     class:border-red-500={!isLastnameValid}
                     class:focus:border-red-500={!isLastnameValid}
                     class:focus:ring-red-500={!isLastnameValid}
@@ -238,25 +228,21 @@
                     bind:this={lastname_input}
                     type="text"
                     name="lastname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isLastnameValid}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("last-name-is-required")}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('last-name-is-required')}
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
                     for="phone"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("phone")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('phone')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("phone")}
+                    placeholder={$_('phone')}
                     class:border-red-500={!isPhoneValidOrEmpty}
                     class:focus:border-red-500={!isPhoneValidOrEmpty}
                     class:focus:ring-red-500={!isPhoneValidOrEmpty}
@@ -264,27 +250,21 @@
                     bind:this={phone_input}
                     type="tel"
                     name="phone"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isPhoneValidOrEmpty}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {@html $_(
-                        "the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number"
-                      )}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {@html $_('the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number')}
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
                     for="email"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("e-mail-adress")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('e-mail-adress')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("e-mail-adress")}
+                    placeholder={$_('e-mail-adress')}
                     class:border-red-500={!isEmailValidOrEmpty}
                     class:focus:border-red-500={!isEmailValidOrEmpty}
                     class:focus:ring-red-500={!isEmailValidOrEmpty}
@@ -292,13 +272,11 @@
                     bind:this={email_input}
                     type="email"
                     name="email"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isEmailValidOrEmpty}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("valid-email-is-required")}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('valid-email-is-required')}
                     </span>
                   {/if}
                 </div>
@@ -309,22 +287,19 @@
                       id="comments"
                       name="comments"
                       type="checkbox"
-                      class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-                    />
+                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
                   </div>
                   <div class="ml-3 text-sm">
-                    <label for="comments" class="font-semibold text-gray-700"
-                      >{$_("receipt-needed")}</label
-                    >
+                    <label
+                      for="comments"
+                      class="font-medium text-gray-700">{$_('receipt-needed')}</label>
                   </div>
                 </div>
                 {#if address_checked === true}
                   <div class="col-span-6">
                     <label
                       for="address1"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("address")}</label
-                    >
+                      class="block text-sm font-medium text-gray-700">{$_('address')}</label>
                     <input
                       autocomplete="off"
                       placeholder="Address"
@@ -335,41 +310,34 @@
                       bind:this={address_input1}
                       type="text"
                       name="address1"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
+                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                     {#if !isAddress1Valid}
                       <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("address-is-required")}
+                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                        {$_('address-is-required')}
                       </span>
                     {/if}
                   </div>
                   <div class="col-span-6">
                     <label
                       for="address2"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("apartment-suite-etc")}</label
-                    >
+                      class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
                     <input
                       autocomplete="off"
-                      placeholder={$_("apartment-suite-etc")}
+                      placeholder={$_('apartment-suite-etc')}
                       bind:value={address_input2_value}
                       bind:this={address_input2}
                       type="text"
                       name="address2"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
+                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   </div>
                   <div class="col-span-6">
                     <label
                       for="zipcode"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("zip-postal-code")}</label
-                    >
+                      class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')}</label>
                     <input
                       autocomplete="off"
-                      placeholder={$_("zip-postal-code")}
+                      placeholder={$_('zip-postal-code')}
                       class:border-red-500={!iszipcodevalid}
                       class:focus:border-red-500={!iszipcodevalid}
                       class:focus:ring-red-500={!iszipcodevalid}
@@ -377,22 +345,18 @@
                       bind:this={address_zipcode}
                       type="text"
                       name="zipcode"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
+                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                     {#if !iszipcodevalid}
                       <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("valid-zipcode-postal-code-is-required")}
+                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                        {$_('valid-zipcode-postal-code-is-required')}
                       </span>
                     {/if}
                   </div>
                   <div class="col-span-6">
                     <label
                       for="city"
-                      class="block text-sm font-medium text-gray-700"
-                      >City</label
-                    >
+                      class="block text-sm font-medium text-gray-700">City</label>
                     <input
                       autocomplete="off"
                       placeholder="City"
@@ -403,13 +367,11 @@
                       bind:this={address_city}
                       type="text"
                       name="city"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
+                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                     {#if !iscityvalid}
                       <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("valid-city-is-required")}
+                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                        {$_('valid-city-is-required')}
                       </span>
                     {/if}
                   </div>
@@ -418,24 +380,22 @@
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
+        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
             on:click={submit}
             type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("create")}
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('create')}
           </button>
           <button
             on:click={() => {
               modal_open = false;
             }}
             type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
+            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('cancel')}
           </button>
         </div>
       </div>

src/components/donors/ConfirmDonorDeletion.svelte

@@ -1,90 +1,92 @@
 <script>
-	import { _ } from "svelte-i18n";
-	import { clickOutside } from "../base/outsideclick";
-	import { createEventDispatcher } from "svelte";
-	export let modal_open;
-	export let delete_donor;
-	const dispatch = createEventDispatcher();
-	function cancelDelete() {
-		modal_open = false;
-		dispatch("cancelDelete", { id: delete_donor.id });
-	}
-	function deleteDonor() {
-		dispatch("delete", { id: delete_donor.id });
-	}
+  import { _ } from "svelte-i18n";
+  import { clickOutside } from "../base/outsideclick";
+  import { focusTrap } from "svelte-focus-trap";
+  import { DonorService } from "@odit/lfk-client-js";
+  import Toastify from "toastify-js";
+  import { createEventDispatcher } from "svelte";
+  export let modal_open;
+  export let delete_donor;
+  const dispatch = createEventDispatcher();
+  function cancelDelete() {
+    modal_open = false;
+    dispatch("cancelDelete", { id: delete_donor.id });
+  }
+  function deleteDonor() {
+    DonorService.donorControllerRemove(
+      delete_donor.id,
+      true
+    )
+      .then((resp) => {
+        Toastify({
+          text: "Donor deleted",
+          duration: 500,
+          backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+        }).showToast();
+        location.replace("./");
+      })
+      .catch((err) => {});
+  }
 </script>
 
 {#if modal_open}
-	<div
-		class="fixed z-10 inset-0 overflow-y-hidden"
-		use:clickOutside
-		on:click_outside={cancelDelete}
-	>
-		<div
-			class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-		>
-			<div class="fixed inset-0 transition-opacity" aria-hidden="true">
-				<div
-					class="absolute inset-0 bg-gray-500 opacity-75"
-					data-id="modal_backdrop"
-				/>
-			</div>
-			<span
-				class="hidden sm:inline-block sm:align-middle sm:h-screen"
-				aria-hidden="true">&#8203;</span
-			>
-			<div
-				class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-				role="dialog"
-				aria-modal="true"
-				aria-labelledby="modal-headline"
-			>
-				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-					<div class="">
-						<div
-							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-						>
-							<svg
-								class="size-6 text-blue-600"
-								fill="currentColor"
-								xmlns="http://www.w3.org/2000/svg"
-								viewBox="0 0 24 24"
-								><path fill="none" d="M0 0h24v24H0z" /><path
-									d="M9.33 11.5h2.17A4.5 4.5 0 0116 16H9v1h8v-1a5.58 5.58 0 00-.89-3H19a5 5 0 014.52 2.85A13.15 13.15 0 0113 21c-2.76 0-5.1-.59-7-1.63v-9.3a6.97 6.97 0 013.33 1.43zM5 19a1 1 0 01-1 1H2a1 1 0 01-1-1v-9a1 1 0 011-1h2a1 1 0 011 1v9zM18 5a3 3 0 110 6 3 3 0 010-6zm-7-3a3 3 0 110 6 3 3 0 010-6z"
-								/></svg
-							>
-						</div>
-						<div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
-							<h3 class="text-lg leading-6 font-medium text-gray-900">
-								{$_(
-									"do-you-want-to-delete-this-donor-with-all-related-donations"
-								)}
-							</h3>
-							<div class="mb-6">
-								<p class="text-sm text-gray-500">
-									{$_("all-associated-donations-will-get-deleted-as-well")}
-								</p>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-					<button
-						on:click={deleteDonor}
-						type="button"
-						class="confirm_deletion_button"
-					>
-						{$_("confirm-delete-donor-with-all-donations")}
-					</button>
-					<button
-						on:click={cancelDelete}
-						type="button"
-						class="cancel_modal_button"
-					>
-						{$_("cancel-keep-donor")}
-					</button>
-				</div>
-			</div>
-		</div>
-	</div>
+  <div
+    class="fixed z-10 inset-0 overflow-y-auto"
+    use:focusTrap
+    use:clickOutside
+    on:click_outside={cancelDelete}>
+    <div
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
+      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
+        <div
+          class="absolute inset-0 bg-gray-500 opacity-75"
+          data-id="modal_backdrop" />
+      </div>
+      <span
+        class="hidden sm:inline-block sm:align-middle sm:h-screen"
+        aria-hidden="true">&#8203;</span>
+      <div
+        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="modal-headline">
+        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+          <div class="sm:flex sm:items-start">
+            <div
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
+              <svg class="h-6 w-6 text-blue-600" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M9.33 11.5h2.17A4.5 4.5 0 0116 16H9v1h8v-1a5.58 5.58 0 00-.89-3H19a5 5 0 014.52 2.85A13.15 13.15 0 0113 21c-2.76 0-5.1-.59-7-1.63v-9.3a6.97 6.97 0 013.33 1.43zM5 19a1 1 0 01-1 1H2a1 1 0 01-1-1v-9a1 1 0 011-1h2a1 1 0 011 1v9zM18 5a3 3 0 110 6 3 3 0 010-6zm-7-3a3 3 0 110 6 3 3 0 010-6z"/></svg>
+            </div>
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+              <h3 class="text-lg leading-6 font-medium text-gray-900">
+                {$_('attention')}
+              </h3>
+              <div class="mt-2 mb-6">
+                <p class="text-sm text-gray-500">
+                  {$_(
+                    'do-you-want-to-delete-this-donor-with-all-related-donations'
+                  )}
+                  <br /> 
+                  {$_('all-associated-donations-will-get-deleted-as-well')}
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+          <button
+            on:click={deleteDonor}
+            type="button"
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('confirm-delete-donor-with-all-donations')}
+          </button>
+          <button
+            on:click={cancelDelete}
+            type="button"
+            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('cancel-keep-donor')}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
 {/if}

src/components/donors/DonorAddress.svelte

@@ -1,14 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  export let address;
-</script>
-
-{#if !address || !address.address1}
-  {$_("no-address")}
-{:else}
-  {address.address1}<br />
-  <!-- {address.address2 || ''}<br /> -->
-  {address.postalcode}
-  {address.city}
-  {address.country}
-{/if}

src/components/donors/DonorDetail.svelte

@@ -1,413 +1,406 @@
 <script>
-	import { DonorService } from "@odit/lfk-client-js";
-	import { _ } from "svelte-i18n";
-	import store from "../../store";
-	import toast from "svelte-french-toast";
-	import isEmail from "validator/es/lib/isEmail";
-	import PromiseError from "../base/PromiseError.svelte";
-	let data_loaded = false;
-	export let params;
-	$: delete_triggered = false;
-	$: original_data = {};
-	$: editable = {};
-	$: changes_performed = !(
-		JSON.stringify(original_data) === JSON.stringify(editable)
-	);
-	$: isEmailValid =
-		(editable.email || "") === "" ||
-		(editable.email && isEmail(editable.email || ""));
-	$: isFirstnameValid = editable.firstname !== "";
-	$: isLastnameValid = editable.lastname !== "";
-	$: save_enabled =
-		changes_performed &&
-		isFirstnameValid &&
-		isLastnameValid &&
-		isEmailValid &&
-		isPhoneValidOrEmpty &&
-		((isAddress1Valid && iszipcodevalid && iscityvalid) ||
-			editable.address_checked === false);
-	const promise = DonorService.donorControllerGetOne(params.donorid).then(
-		(data) => {
-			data_loaded = true;
-			original_data = Object.assign(original_data, data);
-			editable = Object.assign(editable, original_data);
-			editable.address_checked = editable.address.address1 !== null;
-			original_data.address_checked = editable.address.address1 !== null;
-			if (editable.address_checked === false) {
-				editable.address = {
-					address1: "",
-					address2: "",
-					city: "",
-					postalcode: "",
-					country: "",
-				};
-			}
-		}
-	);
-	$: isPhoneValidOrEmpty =
-		editable.phone?.includes("+") ||
-		editable.phone === "" ||
-		editable.phone === null;
-	$: isAddress1Valid = editable.address?.address1?.trim().length !== 0;
-	$: iszipcodevalid = editable.address?.postalcode?.trim().length !== 0;
-	$: iscityvalid = editable.address?.city?.trim().length !== 0;
-	function submit() {
-		if (data_loaded === true && save_enabled) {
-			toast($_("donor-is-being-updated"));
-			editable.address.country = "DE";
-			if (editable.address_checked === false) {
-				editable.address = null;
-			}
-			if (editable.email) editable.email = editable.email;
-			else editable.email = null;
-			if (editable.phone) editable.phone = editable.phone;
-			else editable.phone = null;
-			if (editable.middlename) editable.middlename = editable.middlename;
-			editable.receiptNeeded = editable.address_checked;
-			DonorService.donorControllerPut(original_data.id, editable)
-				.then((resp) => {
-					Object.assign(original_data, editable);
-					original_data = original_data;
-					toast.success($_("updated-donor"));
-				})
-				.catch((err) => {});
-		} else {
-		}
-	}
-	function deleteDonor() {
-		DonorService.donorControllerRemove(original_data.id, true)
-			.then((resp) => {
-				toast.success($_("donor-deleted"));
-				location.replace("./");
-			})
-			.catch((err) => {
-				console.log(err);
-			});
-	}
+  import { _ } from "svelte-i18n";
+  import store from "../../store";
+  import { DonorService, DonationService } from "@odit/lfk-client-js";
+  import Toastify from "toastify-js";
+  import PromiseError from "../base/PromiseError.svelte";
+  import isEmail from "validator/es/lib/isEmail";
+  import ConfirmDonorDeletion from "./ConfirmDonorDeletion.svelte";
+  let data_loaded = false;
+  export let params;
+  $: delete_triggered = false;
+  $: original_data = {};
+  $: editable = {};
+  $: current_donations = [];
+  $: changes_performed = !(
+    JSON.stringify(original_data) === JSON.stringify(editable)
+  );
+  $: isEmailValid =
+    (editable.email || "") === "" ||
+    (editable.email && isEmail(editable.email || ""));
+  $: isFirstnameValid = editable.firstname !== "";
+  $: isLastnameValid = editable.lastname !== "";
+  $: save_enabled =
+    changes_performed &&
+    isFirstnameValid &&
+    isLastnameValid &&
+    isEmailValid &&
+    isPhoneValidOrEmpty &&
+    ((isAddress1Valid && iszipcodevalid && iscityvalid) ||
+      editable.address_checked === false);
+  const donation_promise = DonationService.donationControllerGetAll().then(
+    (val) => {
+      current_donations = val;
+    }
+  );
+  const promise = DonorService.donorControllerGetOne(params.donorid).then(
+    (data) => {
+      data_loaded = true;
+      original_data = Object.assign(original_data, data);
+      editable = Object.assign(editable, original_data);
+      editable.address_checked = editable.address.address1 !== null;
+      original_data.address_checked = editable.address.address1 !== null;
+      if (editable.address_checked === false) {
+        editable.address = {
+          address1: "",
+          address2: "",
+          city: "",
+          postalcode: "",
+          country: "",
+        };
+      }
+    }
+  );
+  $: isPhoneValidOrEmpty =
+    editable.phone?.includes("+") ||
+    editable.phone === "" ||
+    editable.phone === null;
+  $: isAddress1Valid = editable.address?.address1?.trim().length !== 0;
+  $: iszipcodevalid = editable.address?.postalcode?.trim().length !== 0;
+  $: iscityvalid = editable.address?.city?.trim().length !== 0;
+  let modal_open = false;
+  let delete_donor = {};
+  function submit() {
+    if (data_loaded === true && save_enabled) {
+      Toastify({
+        text: $_("donor-is-being-updated"),
+        duration: 2500,
+      }).showToast();
+      editable.address.country = "DE";
+      if (editable.address_checked === false) {
+        editable.address = null;
+      }
+      if (editable.email) editable.email = editable.email;
+      if (editable.phone) editable.phone = editable.phone;
+      if (editable.middlename) editable.middlename = editable.middlename;
+      editable.receiptNeeded = editable.address_checked;
+      DonorService.donorControllerPut(original_data.id, editable)
+        .then((resp) => {
+          Object.assign(original_data, editable);
+          original_data = original_data;
+          Toastify({
+            text: $_("updated-donor"),
+            duration: 2500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
+        })
+        .catch((err) => {});
+    } else {
+    }
+  }
+  function deleteDonor() {
+    DonorService.donorControllerRemove(original_data.id, false)
+      .then((resp) => {
+        Toastify({
+          text: $_("donor-deleted"),
+          duration: 500,
+          backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+        }).showToast();
+        location.replace("./");
+      })
+      .catch((err) => {
+        modal_open = true;
+        delete_donor = original_data;
+      });
+  }
 </script>
 
-{#await promise}
-	{$_("loading-donor-details")}
+<ConfirmDonorDeletion bind:modal_open bind:delete_donor />
+{#await promise && donation_promise}
+  {$_('loading-donor-details')}
 {:then}
-	<section class="container p-5 select-none">
-		<div class="flex flex-row mb-4">
-			<div class="w-full">
-				<nav class="w-full flex">
-					<ol class="list-none flex flex-row items-center justify-start">
-						<li class="flex items-center">
-							<a class="mr-2" href="./"
-								><svg
-									xmlns="http://www.w3.org/2000/svg"
-									width="24"
-									height="24"
-									viewBox="0 0 24 24"
-									fill="none"
-									stroke="currentColor"
-									stroke-width="2"
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									class="inline-block"
-									><path d="m12 19-7-7 7-7" /><path d="M19 12H5" /></svg
-								>
-								{$_("donors")}</a
-							>
-						</li>
-					</ol>
-				</nav>
-			</div>
-		</div>
-		<div class="mb-4 text-3xl font-extrabold leading-tight">
-			{original_data.firstname}
-			{original_data.middlename || ""}
-			{original_data.lastname}
-			<div data-id="donor_actions_${editable.id}">
-				{#if store.state.jwtinfo.userdetails.permissions.includes("DONOR:DELETE")}
-					{#if delete_triggered}
-						<button
-							on:click={deleteDonor}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-							>{$_("confirm-deletion")}</button
-						>
-						<button
-							on:click={() => {
-								delete_triggered = !delete_triggered;
-							}}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm"
-							>{$_("cancel")}</button
-						>
-					{/if}
-					{#if !delete_triggered}
-						<button
-							on:click={() => {
-								delete_triggered = true;
-							}}
-							type="button"
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-							>{$_("delete-donor")}</button
-						>
-					{/if}
-				{/if}
-				{#if !delete_triggered}
-					<button
-						disabled={!save_enabled}
-						class:opacity-50={!save_enabled}
-						type="button"
-						on:click={submit}
-						class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-						>{$_("save-changes")}</button
-					>
-				{/if}
-			</div>
-		</div>
-		<!--  -->
-		<div>
-			<span class="font-semibold text-gray-700"
-				>{$_("total-donation-amount")}:</span
-			>
-			<span
-				>{(editable.donationAmount / 100)
-					.toFixed(2)
-					.toLocaleString("de-DE", { valute: "EUR" })}€</span
-			>
-			|
-			<span class="font-semibold text-gray-700">{$_("total-paid-amount")}:</span
-			>
-			<span
-				>{(editable.paidDonationAmount / 100)
-					.toFixed(2)
-					.toLocaleString("de-DE", { valute: "EUR" })}€</span
-			>
-			<br />
-			<span class="font-semibold text-gray-700">{$_("donations")}:</span>
-			{#if original_data.donations.length > 0}
-				{#each original_data.donations as d}
-					{#if d.responseType === "DISTANCEDONATION"}
-						<a
-							href="../donations/{d.id}"
-							class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-600 text-white mr-1"
-							>{d.runner.firstname}
-							{d.runner.middlename || ""}
-							{d.runner.lastname}</a
-						>
-					{:else}
-						<a
-							href="../donations/{d.id}"
-							class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-green-700 text-white mr-1"
-							>{$_("fixed-donation")}:
-							{(d.amount / 100)
-								.toFixed(2)
-								.toLocaleString("de-DE", { valute: "EUR" })}€</a
-						>
-					{/if}
-				{/each}
-			{:else}{$_("donor-has-no-associated-donations")}{/if}
-		</div>
-		<div class="mt-2 w-full">
-			<label for="firstname" class="font-semibold text-gray-700"
-				>{$_("first-name")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("first-name")}
-				type="text"
-				class:border-red-500={!isFirstnameValid}
-				class:focus:border-red-500={!isFirstnameValid}
-				class:focus:ring-red-500={!isFirstnameValid}
-				bind:value={editable.firstname}
-				name="firstname"
-				class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isFirstnameValid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("first-name-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="mt-2 w-full">
-			<label for="middlename" class="font-semibold text-gray-700"
-				>{$_("middle-name")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("middle-name")}
-				type="text"
-				bind:value={editable.middlename}
-				name="middlename"
-				class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-		</div>
-		<div class="mt-2 w-full">
-			<label for="lastname" class="font-semibold text-gray-700"
-				>{$_("last-name")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("last-name")}
-				type="text"
-				bind:value={editable.lastname}
-				class:border-red-500={!isLastnameValid}
-				class:focus:border-red-500={!isLastnameValid}
-				class:focus:ring-red-500={!isLastnameValid}
-				name="lastname"
-				class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isLastnameValid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("last-name-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="mt-2 w-full">
-			<label for="email" class="font-semibold text-gray-700"
-				>{$_("e-mail-adress")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("e-mail-adress")}
-				type="email"
-				bind:value={editable.email}
-				class:border-red-500={!isEmailValid}
-				class:focus:border-red-500={!isEmailValid}
-				class:focus:ring-red-500={!isEmailValid}
-				name="email"
-				class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isEmailValid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("valid-email-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="mt-2 w-full">
-			<label for="phone" class="font-semibold text-gray-700"
-				>{$_("phone")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("phone")}
-				type="tel"
-				class:border-red-500={!isPhoneValidOrEmpty}
-				class:focus:border-red-500={!isPhoneValidOrEmpty}
-				class:focus:ring-red-500={!isPhoneValidOrEmpty}
-				bind:value={editable.phone}
-				name="phone"
-				class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isPhoneValidOrEmpty}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("valid-international-phone-number-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="flex items-start mt-2">
-			<div class="flex items-center h-5">
-				<input
-					bind:checked={editable.address_checked}
-					id="comments"
-					name="comments"
-					type="checkbox"
-					class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-				/>
-			</div>
-			<div class="ml-3">
-				<label for="comments" class="font-semibold text-gray-700"
-					>{$_("receipt-needed")}</label
-				>
-			</div>
-		</div>
-		{#if editable.address_checked === true}
-			<div class="col-span-6">
-				<label for="address1" class="block font-medium text-gray-700"
-					>{$_("address")}</label
-				>
-				<input
-					autocomplete="off"
-					placeholder="Address"
-					class:border-red-500={!isAddress1Valid}
-					class:focus:border-red-500={!isAddress1Valid}
-					class:focus:ring-red-500={!isAddress1Valid}
-					bind:value={editable.address.address1}
-					type="text"
-					name="address1"
-					class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-				{#if !isAddress1Valid}
-					<span
-						class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-					>
-						{$_("address-is-required")}
-					</span>
-				{/if}
-			</div>
-			<div class="col-span-6">
-				<label for="address2" class="block font-medium text-gray-700"
-					>{$_("apartment-suite-etc")}</label
-				>
-				<input
-					autocomplete="off"
-					placeholder={$_("apartment-suite-etc")}
-					bind:value={editable.address.address2}
-					type="text"
-					name="address2"
-					class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-			</div>
-			<div class="col-span-6">
-				<label for="zipcode" class="block font-medium text-gray-700"
-					>{$_("zip-postal-code")}</label
-				>
-				<input
-					autocomplete="off"
-					placeholder={$_("zip-postal-code")}
-					class:border-red-500={!iszipcodevalid}
-					class:focus:border-red-500={!iszipcodevalid}
-					class:focus:ring-red-500={!iszipcodevalid}
-					bind:value={editable.address.postalcode}
-					type="text"
-					name="zipcode"
-					class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-				{#if !iszipcodevalid}
-					<span
-						class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-					>
-						{$_("valid-zipcode-postal-code-is-required")}
-					</span>
-				{/if}
-			</div>
-			<div class="col-span-6">
-				<label for="city" class="block font-medium text-gray-700"
-					>{$_("city")}</label
-				>
-				<input
-					autocomplete="off"
-					placeholder={$_("city")}
-					class:border-red-500={!iscityvalid}
-					class:focus:border-red-500={!iscityvalid}
-					class:focus:ring-red-500={!iscityvalid}
-					bind:value={editable.address.city}
-					type="text"
-					name="city"
-					class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-				{#if !iscityvalid}
-					<span
-						class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-					>
-						{$_("valid-city-is-required")}
-					</span>
-				{/if}
-			</div>
-		{/if}
-	</section>
+  <section class="container p-5 select-none">
+    <div class="flex flex-row mb-4">
+      <div class="w-full">
+        <nav class="w-full flex">
+          <ol class="list-none flex flex-row items-center justify-start">
+            <li class="flex items-center">
+              <svg
+                fill="currentColor"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                width="24"
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
+                <path
+                  d="M9.33 11.5h2.17A4.5 4.5 0 0 1 16 16H8.999L9 17h8v-1a5.578 5.578 0 0 0-.886-3H19a5 5 0 0 1 4.516 2.851C21.151 18.972 17.322 21 13 21c-2.761 0-5.1-.59-7-1.625L6 10.071A6.967 6.967 0 0 1 9.33 11.5zM5 19a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-9a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v9zM18 5a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm-7-3a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" /></svg>
+            </li>
+            <li class="flex items-center ml-2">
+              <a class="mr-2" href="./">{$_('donors')}</a><svg
+                stroke="currentColor"
+                fill="none"
+                stroke-width="2"
+                viewBox="0 0 24 24"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="h-3 w-3 mr-2 stroke-current"
+                height="1em"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"><line
+                  x1="5"
+                  y1="12"
+                  x2="19"
+                  y2="12" />
+                <polyline points="12 5 19 12 12 19" /></svg>
+            </li>
+            <li class="flex items-center">
+              <span class="mr-2">{original_data.firstname}
+                {original_data.middlename || ''}
+                {original_data.lastname}</span>
+            </li>
+          </ol>
+        </nav>
+      </div>
+    </div>
+    <div class="mb-8 text-3xl font-extrabold leading-tight">
+      {original_data.firstname}
+      {original_data.middlename || ''}
+      {original_data.lastname}
+      <span data-id="donor_actions_${editable.id}">
+        {#if store.state.jwtinfo.userdetails.permissions.includes('DONOR:DELETE')}
+          {#if delete_triggered}
+            <button
+              on:click={deleteDonor}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:">{$_('confirm-deletion')}</button>
+            <button
+              on:click={() => {
+                delete_triggered = !delete_triggered;
+              }}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:">{$_('cancel')}</button>
+          {/if}
+          {#if !delete_triggered}
+            <button
+              on:click={() => {
+                delete_triggered = true;
+              }}
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:">{$_('delete-donor')}</button>
+          {/if}
+        {/if}
+        {#if !delete_triggered}
+          <button
+            disabled={!save_enabled}
+            class:opacity-50={!save_enabled}
+            type="button"
+            on:click={submit}
+            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:">{$_('save-changes')}</button>
+        {/if}
+      </span>
+    </div>
+    <!--  -->
+    <div>
+      <span
+        class="font-medium text-gray-700">{$_('total-donation-amount')}:</span>
+      <span>{(editable.donationAmount / 100)
+          .toFixed(2)
+          .toLocaleString('de-DE', { valute: 'EUR' })}€</span>
+      <br />
+      <span class="font-medium text-gray-700">{$_('donations')}:</span>
+      {#if current_donations.filter((d) => d.donor.id == editable.id).length > 0}
+        {#each current_donations.filter((o) => o.donor.id == editable.id) as d}
+          {#if d.responseType === 'DISTANCEDONATION'}
+            <a
+              href="../donations/{d.id}"
+              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-600 text-white mr-1">{d.runner.firstname}
+              {d.runner.middlename}
+              {d.runner.lastname}</a>
+          {:else}
+            <a
+              href="../donations/{d.id}"
+              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-700 text-white mr-1">{$_('fixed-donation')}:
+              {(d.amount / 100)
+                .toFixed(2)
+                .toLocaleString('de-DE', { valute: 'EUR' })}€</a>
+          {/if}
+        {/each}
+      {:else}{$_('donor-has-no-associated-donations')}{/if}
+    </div>
+    <div class=" w-full">
+      <label
+        for="firstname"
+        class="font-medium text-gray-700">{$_('first-name')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('first-name')}
+        type="text"
+        class:border-red-500={!isFirstnameValid}
+        class:focus:border-red-500={!isFirstnameValid}
+        class:focus:ring-red-500={!isFirstnameValid}
+        bind:value={editable.firstname}
+        name="firstname"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isFirstnameValid}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('first-name-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class=" w-full">
+      <label
+        for="middlename"
+        class="font-medium text-gray-700">{$_('middle-name')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('middle-name')}
+        type="text"
+        bind:value={editable.middlename}
+        name="middlename"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+    </div>
+    <div class=" w-full">
+      <label
+        for="lastname"
+        class="font-medium text-gray-700">{$_('last-name')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('last-name')}
+        type="text"
+        bind:value={editable.lastname}
+        class:border-red-500={!isLastnameValid}
+        class:focus:border-red-500={!isLastnameValid}
+        class:focus:ring-red-500={!isLastnameValid}
+        name="lastname"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isLastnameValid}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('last-name-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class=" w-full">
+      <label
+        for="email"
+        class="font-medium text-gray-700">{$_('e-mail-adress')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('e-mail-adress')}
+        type="email"
+        bind:value={editable.email}
+        class:border-red-500={!isEmailValid}
+        class:focus:border-red-500={!isEmailValid}
+        class:focus:ring-red-500={!isEmailValid}
+        name="email"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isEmailValid}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('valid-email-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class=" w-full">
+      <label for="phone" class="font-medium text-gray-700">{$_('phone')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('phone')}
+        type="tel"
+        class:border-red-500={!isPhoneValidOrEmpty}
+        class:focus:border-red-500={!isPhoneValidOrEmpty}
+        class:focus:ring-red-500={!isPhoneValidOrEmpty}
+        bind:value={editable.phone}
+        name="phone"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isPhoneValidOrEmpty}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('valid-international-phone-number-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class="flex items-start mt-2">
+      <div class="flex items-center h-5">
+        <input
+          bind:checked={editable.address_checked}
+          id="comments"
+          name="comments"
+          type="checkbox"
+          class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+      </div>
+      <div class="ml-3 ">
+        <label
+          for="comments"
+          class="font-medium text-gray-700">{$_('receipt-needed')}</label>
+      </div>
+    </div>
+    {#if editable.address_checked === true}
+      <div class="col-span-6">
+        <label
+          for="address1"
+          class="block  font-medium text-gray-700">{$_('address')}</label>
+        <input
+          autocomplete="off"
+          placeholder="Address"
+          class:border-red-500={!isAddress1Valid}
+          class:focus:border-red-500={!isAddress1Valid}
+          class:focus:ring-red-500={!isAddress1Valid}
+          bind:value={editable.address.address1}
+          type="text"
+          name="address1"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !isAddress1Valid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('address-is-required')}
+          </span>
+        {/if}
+      </div>
+      <div class="col-span-6">
+        <label
+          for="address2"
+          class="block  font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('apartment-suite-etc')}
+          bind:value={editable.address.address2}
+          type="text"
+          name="address2"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      </div>
+      <div class="col-span-6">
+        <label
+          for="zipcode"
+          class="block  font-medium text-gray-700">{$_('zip-postal-code')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('zip-postal-code')}
+          class:border-red-500={!iszipcodevalid}
+          class:focus:border-red-500={!iszipcodevalid}
+          class:focus:ring-red-500={!iszipcodevalid}
+          bind:value={editable.address.postalcode}
+          type="text"
+          name="zipcode"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !iszipcodevalid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('valid-zipcode-postal-code-is-required')}
+          </span>
+        {/if}
+      </div>
+      <div class="col-span-6">
+        <label
+          for="city"
+          class="block  font-medium text-gray-700">{$_('city')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('city')}
+          class:border-red-500={!iscityvalid}
+          class:focus:border-red-500={!iscityvalid}
+          class:focus:ring-red-500={!iscityvalid}
+          bind:value={editable.address.city}
+          type="text"
+          name="city"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !iscityvalid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('valid-city-is-required')}
+          </span>
+        {/if}
+      </div>
+    {/if}
+  </section>
 {:catch error}
-	<PromiseError {error} />
+  <PromiseError {error} />
 {/await}

src/components/donors/DonorDonations.svelte

@@ -1,29 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  export let donations;
-</script>
-
-{#if !donations || donations.length == 0}
-  {$_("donor-has-no-associated-donations")}
-{:else}
-  {#each donations as donation}
-    {#if donation.responseType === "DISTANCEDONATION"}
-      <a
-        href="../donations/{donation.id}"
-        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-600 text-white mr-1"
-        >{donation.runner.firstname}
-        {donation.runner.middlename || ""}
-        {donation.runner.lastname}</a
-      >
-    {:else}
-      <a
-        href="../donations/{donation.id}"
-        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full border border-current bg-green-700 text-white mr-1"
-        >{$_("fixed-donation")}:
-        {(donation.amount / 100)
-          .toFixed(2)
-          .toLocaleString("de-DE", { valute: "EUR" })}€</a
-      >
-    {/if}
-  {/each}
-{/if}

src/components/donors/Donors.svelte

@@ -5,73 +5,25 @@
   import DonorsOverview from "./DonorsOverview.svelte";
   $: current_donors = [];
   export let modal_open = false;
-  let addDonors;
 </script>
 
 <section class="container p-5">
-  <h4 class="mb-1 text-3xl font-extrabold leading-tight">
-    {$_("donors")}
-  </h4>
-  {#if store.state.jwtinfo.userdetails.permissions.includes("DONOR:CREATE")}
-    <button
-      on:click={() => {
-        modal_open = true;
-      }}
-      type="button"
-      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm  mb-1 lg:mb-0"
-    >
-      {$_("add-donor")}
-    </button>
-  {/if}
-  {#if store.state.jwtinfo.userdetails.permissions.includes("DONOR:GET")}
-    <button
-      on:click={() => {
-        const data = current_donors
-          .filter((d) => d.receiptNeeded === true)
-          .map(function (d) {
-            d.address.address2 =
-              d.address.address2 === "" ? "" : " " + d.address.address2;
-            const address = `${d.address.address1}${d.address.address2}, ${d.address.postalcode} ${d.address.city}, ${d.address.country}`;
-            return [
-              d.firstname,
-              d.middlename,
-              d.lastname,
-              (d.paidDonationAmount/100).toFixed(2),
-              address,
-            ];
-          });
-        let csv = `${$_("csv_import__firstname")};${$_(
-          "csv_import__middlename"
-        )};${$_("csv_import__lastname")};${$_(
-          "total_donation_amount_in_eur"
-        )};${$_("address")}\n`;
-        data.forEach(function (row) {
-          csv += row.join(";");
-          csv += "\n";
-        });
-        let hiddenElement = document.createElement("a");
-        hiddenElement.href = "data:text/csv;charset=utf-8," + encodeURI(csv);
-        hiddenElement.target = "_blank";
-        hiddenElement.download = `${$_(
-          "filename_sponsoringquittungsliste"
-        )}.csv`;
-        hiddenElement.click();
-        hiddenElement.remove();
-      }}
-      type="button"
-      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm  mb-1 lg:mb-0"
-    >
-      {$_("sponsoring-quittungs-liste_herunterladen")}
-    </button>
-  {/if}
-  <DonorsOverview bind:current_donors bind:addDonors />
+  <span class="mb-1 text-3xl font-extrabold leading-tight">
+    {$_('donors')}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('DONOR:CREATE')}
+      <button
+        on:click={() => {
+          modal_open = true;
+        }}
+        type="button"
+        class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+        {$_('add-donor')}
+      </button>
+    {/if}
+  </span>
+  <DonorsOverview bind:current_donors />
 </section>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes("DONOR:CREATE")}
-  <AddDonorModal
-    on:created={(event) => {
-      addDonors(event.detail.donors);
-    }}
-    bind:modal_open
-  />
+{#if store.state.jwtinfo.userdetails.permissions.includes('DONOR:CREATE')}
+  <AddDonorModal bind:current_donors bind:modal_open />
 {/if}

src/components/donors/DonorsEmptyState.svelte

@@ -6,7 +6,7 @@
 <div class="text-center items-center justify-center">
   <p class="mb-16 text-lg text-gray-500">
     <img class="w-full" style="height:15rem" src={donors_empty} alt="" />
-    <span class="font-bold">{$_("there-are-no-donors-yet")}</span><br />
-    <span>{$_("add-your-first-donor")}</span>
+    <span class="font-bold">{$_('there-are-no-donors-yet')}</span><br />
+    <span>{$_('add-your-first-donor')}</span>
   </p>
 </div>

src/components/donors/DonorsOverview.svelte

@@ -1,262 +1,212 @@
 <script>
-  import { _ } from "svelte-i18n";
-  import { DonorService } from "@odit/lfk-client-js";
+  import { getLocaleFromNavigator, _ } from "svelte-i18n";
+  import { DonationService, DonorService } from "@odit/lfk-client-js";
   import store from "../../store";
   import DonorsEmptyState from "./DonorsEmptyState.svelte";
   import ConfirmDonorDeletion from "./ConfirmDonorDeletion.svelte";
-  import TableBottom from "../shared/TableBottom.svelte";
-  import {
-    createSvelteTable,
-    flexRender,
-    getCoreRowModel,
-    getFilteredRowModel,
-    getPaginationRowModel,
-    getSortedRowModel,
-    renderComponent,
-  } from "@tanstack/svelte-table";
-  import { writable } from "svelte/store";
-  import { onMount } from "svelte";
-  import InputElement from "../shared/InputElement.svelte";
-  import TableHeader from "../shared/TableHeader.svelte";
-  import TableActions from "../shared/TableActions.svelte";
-  import DonorAddress from "./DonorAddress.svelte";
-  import DonorDonations from "./DonorDonations.svelte";
-  import { filterAddress, filterName } from "../shared/tablefilters";
-  import toast from "svelte-french-toast";
+  import Toastify from "toastify-js";
   $: searchvalue = "";
   $: active_deletes = [];
-  $: selectedDonors =
-    $table?.getSelectedRowModel().rows.map((row) => row.original) || [];
-  $: selected =
-    $table?.getSelectedRowModel().rows.map((row) => row.index) || [];
-
-  $: dataLoaded = false;
-
+  $: current_donations = [];
+  let modal_open = false;
+  let delete_donor = {};
   export let current_donors = [];
-  export const addDonors = (donors) => {
-    current_donors = current_donors.concat(...donors);
-    options.update((options) => ({
-      ...options,
-      data: current_donors,
-    }));
-  };
-
-  //Section table
-  const columns = [
-    {
-      accessorKey: "id",
-      header: () => "id",
-      filterFn: `equalsString`,
-    },
-    {
-      accessorKey: "name",
-      header: () => $_("name"),
-      cell: (info) => {
-        const d = info.row.original;
-        if (d.middlename) {
-          return `${d.firstname} ${d.middlename} ${d.lastname}`;
-        } else {
-          return `${d.firstname} ${d.lastname}`;
-        }
-      },
-      filterFn: `name`,
-    },
-    {
-      accessorKey: "address",
-      header: () => $_("contact-information"),
-      cell: (info) => {
-        return renderComponent(DonorAddress, { address: info.getValue() });
-      },
-      filterFn: `address`,
-    },
-    {
-      accessorKey: "donations",
-      header: () => $_("sponsorings"),
-      cell: (info) => {
-        return renderComponent(DonorDonations, { donations: info.getValue() });
-      },
-      enableColumnFilter: false,
-    },
-    {
-      accessorKey: "donationAmount",
-      header: () => $_("total-donation-amount"),
-      cell: (info) => {
-        return `${(info.getValue() / 100)
-          .toFixed(2)
-          .toLocaleString("de-DE", { valute: "EUR" })}€`;
-      },
-      enableColumnFilter: false,
-    },
-    {
-      accessorKey: "paidDonationAmount",
-      header: () => $_("total-paid-amount"),
-      cell: (info) => {
-        return `${(info.getValue() / 100)
-          .toFixed(2)
-          .toLocaleString("de-DE", { valute: "EUR" })}€`;
-      },
-      enableColumnFilter: false,
-    },
-    {
-      accessorKey: "actions",
-      header: () => $_("action"),
-      cell: (info) => {
-        return renderComponent(TableActions, {
-          detailsLink: `./${info.row.original.id}`,
-          deleteAction: () => {
-            active_deletes = current_donors.filter(
-              (r) => r.id == info.row.original.id
-            );
-          },
-          deleteEnabled:
-            store.state.jwtinfo.userdetails.permissions.includes(
-              "DONOR:DELETE"
-            ),
-        });
-      },
-      enableColumnFilter: false,
-      enableSorting: false,
-    },
-  ];
-  const options = writable({
-    data: [],
-    columns: columns,
-    initialState: {
-      pagination: {
-        pageSize: 50,
-      },
-    },
-    filterFns: {
-      name: filterName,
-      address: filterAddress,
-    },
-    enableRowSelection: true,
-    getCoreRowModel: getCoreRowModel(),
-    getFilteredRowModel: getFilteredRowModel(),
-    getPaginationRowModel: getPaginationRowModel(),
-    getSortedRowModel: getSortedRowModel(),
+  const donors_promise = DonorService.donorControllerGetAll().then((val) => {
+    current_donors = val;
   });
-  const table = createSvelteTable(options);
-
+  const donation_promise = DonationService.donationControllerGetAll().then(
+    (val) => {
+      current_donations = val;
+    }
+  );
   function should_display_based_on_id(id) {
     if (searchvalue.toString().slice(-1) === "*") {
       return id.toString().startsWith(searchvalue.replace("*", ""));
     }
     return id.toString() === searchvalue;
   }
-
-  onMount(async () => {
-    let page = 0;
-    let pagesize = 300;
-    while (page >= 0) {
-      const donors = await DonorService.donorControllerGetAll(page, pagesize);
-      if (donors.length == 0) {
-        page = -2;
-      }
-
-      current_donors = current_donors.concat(...donors);
-      options.update((options) => ({
-        ...options,
-        data: current_donors,
-      }));
-
-      dataLoaded = true;
-      page++;
-    }
-  });
 </script>
 
 <ConfirmDonorDeletion
   on:cancelDelete={(event) => {
-    active_deletes = active_deletes.filter((a) => a.id !== event.detail.id);
+    modal_open = false;
+    active_deletes[event.detail.id] = false;
   }}
-  on:delete={async (event) => {
-    toast.loading($_("deleting-donor"));
-    await DonorService.donorControllerRemove(event.detail.id, true);
-    toast.dismiss();
-    toast.success($_("donor-deleted"));
-    current_donors = current_donors.filter((d) => d.id !== event.detail.id);
-    active_deletes = active_deletes.filter((a) => a.id !== event.detail.id);
-    options.update((options) => ({
-      ...options,
-      data: current_donors,
-    }));
-  }}
-  modal_open={active_deletes.length > 0}
-  delete_donor={active_deletes[0]}
-/>
-{#if store.state.jwtinfo.userdetails.permissions.includes("DONOR:GET")}
-  {#if !dataLoaded}
+  bind:modal_open
+  bind:delete_donor />
+{#if store.state.jwtinfo.userdetails.permissions.includes('DONOR:GET')}
+  {#await donors_promise && donation_promise}
     <div
       class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-      role="alert"
-    >
-      <p class="font-bold">{$_("donors-are-being-loaded")}</p>
-      <p class="text-sm">{$_("this-might-take-a-moment")}</p>
+      role="alert">
+      <p class="font-bold">{$_('donors-are-being-loaded')}</p>
+      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
     </div>
-  {:else if current_donors.length === 0}
-    <DonorsEmptyState />
-  {:else}
-    <input
-      type="search"
-      bind:value={searchvalue}
-      placeholder={$_("datatable.search")}
-      aria-label={$_("datatable.search")}
-      class="mb-2 w-full sm:w-auto mt-1 sm:mt-0 p-2 rounded-md border"
-    />
-    <div
-      class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll"
-    >
-      <table class="w-full">
-        <thead class="border-b border-gray-400">
-          {#each $table.getHeaderGroups() as headerGroup}
-            <tr class="select-none">
-              <th class="inset-y-0 left-0 px-4 py-2 text-left w-px">
-                <InputElement
-                  type="checkbox"
-                  checked={$table.getIsAllRowsSelected()}
-                  indeterminate={$table.getIsSomeRowsSelected()}
-                  on:change={() => $table.toggleAllRowsSelected()}
-                />
+  {:then}
+    {#if current_donors.length === 0}
+      <DonorsEmptyState />
+    {:else}
+      <input
+        type="search"
+        bind:value={searchvalue}
+        placeholder={$_('datatable.search')}
+        aria-label={$_('datatable.search')}
+        class="gridjs-input gridjs-search-input mb-4" />
+      <div
+        class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
+        <table class="divide-y divide-gray-200 w-full">
+          <thead class="bg-gray-50">
+            <tr>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('name')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('contact-information')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('donations')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('total-donation-amount')}
+              </th>
+              <th scope="col" class="relative px-6 py-3">
+                <span class="sr-only">{$_('action')}</span>
               </th>
-              {#each headerGroup.headers as header}
-                <TableHeader {header} />
-              {/each}
             </tr>
-          {/each}
-        </thead>
-        <tbody>
-          {#each $table.getRowModel().rows as row}
-            <tr class="odd:bg-white even:bg-gray-100">
-              <td class="inset-y-0 left-0 px-4 py-2 text-center w-px">
-                <InputElement
-                  type="checkbox"
-                  checked={row.getIsSelected()}
-                  on:change={() => row.toggleSelected()}
-                />
-              </td>
-              {#each row.getVisibleCells() as cell}
-                <td>
-                  <svelte:component
-                    this={flexRender(
-                      cell.column.columnDef.cell,
-                      cell.getContext()
-                    )}
-                  />
-                </td>
-              {/each}
-            </tr>
-          {/each}
-        </tbody>
-      </table>
+          </thead>
+          <tbody class="divide-y divide-gray-200">
+            {#each current_donors as donor}
+              {#if donor.firstname
+                .toLowerCase()
+                .includes(
+                  searchvalue.toLowerCase()
+                ) || donor.middlename
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || donor.lastname
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || should_display_based_on_id(donor.id)}
+                <tr data-rowid="donor_{donor.id}">
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="flex items-center">
+                      <div class="ml-4">
+                        <div class="text-sm font-medium text-gray-900">
+                          {donor.firstname}
+                          {donor.middlename || ''}
+                          {donor.lastname}
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    {#if donor.email}
+                      <div class="text-sm text-gray-500">{donor.email}</div>
+                    {/if}
+                    {#if donor.phone}
+                      <div class="text-sm text-gray-500">{donor.phone}</div>
+                    {/if}
+                    {#if donor.address.address1 !== null}
+                      {donor.address.address1}<br />
+                      {donor.address.address2 || ''}<br />
+                      {donor.address.postalcode}
+                      {donor.address.city}
+                      {donor.address.country}
+                    {/if}
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    {#if current_donations.filter((d) => d.donor.id == donor.id).length > 0}
+                      {#each current_donations.filter((o) => o.donor.id == donor.id) as d}
+                        {#if d.responseType === 'DISTANCEDONATION'}
+                          <a
+                            href="../donations/{d.id}"
+                            class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-600 text-white mr-1">{d.runner.firstname}
+                            {d.runner.middlename}
+                            {d.runner.lastname}</a>
+                        {:else}
+                          <a
+                            href="../donations/{d.id}"
+                            class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-700 text-white mr-1">{$_('fixed-donation')}:
+                            {(d.amount / 100)
+                              .toFixed(2)
+                              .toLocaleString('de-DE', { valute: 'EUR' })}€</a>
+                        {/if}
+                      {/each}
+                    {:else}{$_('donor-has-no-associated-donations')}{/if}
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    {(donor.donationAmount / 100)
+                      .toFixed(2)
+                      .toLocaleString('de-DE', { valute: 'EUR' })}€
+                  </td>
+                  {#if active_deletes[donor.id] === true}
+                    <td
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                      <button
+                        on:click={() => {
+                          active_deletes[donor.id] = false;
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
+                      <button
+                        on:click={() => {
+                          DonorService.donorControllerRemove(donor.id, false)
+                            .then((resp) => {
+                              current_donors = current_donors.filter((obj) => obj.id !== donor.id);
+                              Toastify({
+                                text: 'Donor deleted',
+                                duration: 500,
+                                backgroundColor:
+                                  'linear-gradient(to right, #00b09b, #96c93d)',
+                              }).showToast();
+                            })
+                            .catch((err) => {
+                              modal_open = true;
+                              delete_donor = donor;
+                            });
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
+                    </td>
+                  {:else}
+                    <td
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                      <a
+                        href="./{donor.id}"
+                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
+                      {#if store.state.jwtinfo.userdetails.permissions.includes('DONOR:DELETE')}
+                        <button
+                          on:click={() => {
+                            active_deletes[donor.id] = true;
+                          }}
+                          tabindex="0"
+                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
+                      {/if}
+                    </td>
+                  {/if}
+                </tr>
+              {/if}
+            {/each}
+          </tbody>
+        </table>
+      </div>
+    {/if}
+  {:catch error}
+    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+      <span class="inline-block align-middle mr-8">
+        <b class="capitalize">{$_('general_promise_error')}</b>
+        {error}
+      </span>
     </div>
-    <div class="h-2" />
-    <TableBottom {table} {selected} />
-  {/if}
+  {/await}
 {/if}
-
-<style>
-  table tbody tr td:nth-child(2) {
-    font-family: monospace;
-  }
-</style>

src/components/general/About.svelte

@@ -1,196 +1,222 @@
 <script>
-	import { _ } from "svelte-i18n";
-	import { clickOutside } from "../base/outsideclick";
-
-	let modal_open = false;
-	(function () {
-		document.onkeydown = function (e) {
-			e = e || window.event;
-			if (e.key === "Escape") {
-				modal_open = false;
-			}
-		};
-	})();
-	const license_promise = fetch("/licenses.json");
-	let licenses = [];
-	$: currentlicense = "";
-	$: licensetext = "";
-	license_promise
-		.then((response) => response.json())
-		.then((json) => {
-			licenses = json;
-		});
+  import { _ } from "svelte-i18n";
+  import { clickOutside } from "../base/outsideclick";
+  import { focusTrap } from "svelte-focus-trap";
+  export let modal_open;
+  (function () {
+    document.onkeydown = function (e) {
+      e = e || window.event;
+      if (e.key === "Escape") {
+        modal_open = false;
+      }
+    };
+  })();
+  const license_promise = fetch("/licenses.json");
+  let licenses = [];
+  $: currentlicense = "";
+  $: licensetext = "";
+  license_promise
+    .then((response) => response.json())
+    .then((json) => {
+      licenses = json;
+    });
 </script>
 
 {#if modal_open}
-	<div
-		class="fixed z-10 inset-0 overflow-y-hidden"
-		use:clickOutside
-		on:click_outside={() => {
-			modal_open = false;
-		}}
-	>
-		<div
-			class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 sm:block sm:p-0"
-		>
-			<div class="fixed inset-0 transition-opacity" aria-hidden="true">
-				<div
-					class="absolute inset-0 bg-gray-500 opacity-75"
-					data-id="modal_backdrop"
-				/>
-			</div>
-			<span
-				class="hidden sm:inline-block sm:align-middle sm:h-screen"
-				aria-hidden="true">&#8203;</span
-			>
-			<div
-				class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-				role="dialog"
-				aria-modal="true"
-				aria-labelledby="modal-headline"
-			>
-				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-					<div class="">
-						<div
-							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-						>
-							<svg
-								fill="currentColor"
-								class="size-6 text-blue-600"
-								xmlns="http://www.w3.org/2000/svg"
-								viewBox="0 0 24 24"
-								width="24"
-								height="24"
-								><path fill="none" d="M0 0h24v24H0z" />
-								<path
-									d="M14 20v2H2v-2h12zM14.586.686l7.778 7.778L20.95 9.88l-1.06-.354L17.413 12l5.657 5.657-1.414 1.414L16 13.414l-2.404 2.404.283 1.132-1.415 1.414-7.778-7.778 1.415-1.414 1.13.282 6.294-6.293-.353-1.06L14.586.686z"
-								/></svg
-							>
-						</div>
-						<div class="mt-3 sm:mt-0 sm:ml-4 sm:text-left">
-							<h3 class="text-lg leading-6 font-medium">
-								{$_("read-license")}
-							</h3>
-							<div class="mb-6">
-								<p class="text-sm text-gray-500">{currentlicense}</p>
-							</div>
-							<div class="mb-6">
-								<p class="text-sm text-gray-500">{licensetext}</p>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-					<button
-						on:click={() => {
-							modal_open = false;
-						}}
-						type="button"
-						class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm"
-					>
-						{$_("close")}
-					</button>
-				</div>
-			</div>
-		</div>
-	</div>
+  <div
+    class="fixed z-10 inset-0 overflow-y-auto"
+    use:focusTrap
+    use:clickOutside
+    on:click_outside={() => {
+      modal_open = false;
+    }}>
+    <div
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
+      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
+        <div
+          class="absolute inset-0 bg-gray-500 opacity-75"
+          data-id="modal_backdrop" />
+      </div>
+      <span
+        class="hidden sm:inline-block sm:align-middle sm:h-screen"
+        aria-hidden="true">&#8203;</span>
+      <div
+        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="modal-headline">
+        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+          <div class="sm:flex sm:items-start">
+            <div
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
+              <svg
+                fill="currentColor"
+                class="h-6 w-6 text-blue-600"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                width="24"
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
+                <path
+                  d="M14 20v2H2v-2h12zM14.586.686l7.778 7.778L20.95 9.88l-1.06-.354L17.413 12l5.657 5.657-1.414 1.414L16 13.414l-2.404 2.404.283 1.132-1.415 1.414-7.778-7.778 1.415-1.414 1.13.282 6.294-6.293-.353-1.06L14.586.686z" /></svg>
+            </div>
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+              <h3 class="text-lg leading-6 font-medium">
+                {$_('read-license')}
+              </h3>
+              <div class="mt-2 mb-6">
+                <p class="text-sm text-gray-500">{currentlicense}</p>
+              </div>
+              <div class="mt-2 mb-6">
+                <p class="text-sm text-gray-500">{licensetext}</p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+          <button
+            on:click={() => {
+              modal_open = false;
+            }}
+            type="button"
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('close')}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
 {/if}
 <!-- /// -->
-<section class="container p-5">
-	<h4 class="mb-1 text-3xl font-extrabold leading-tight">
-		{$_("about")}
-	</h4>
-	<p class="mt-2 mb-2">
-		Lauf für Kaya!
-		<strong class="font-medium">
-			{$_("by")}
-			<a href="https://odit.services" class="underline">ODIT.Services</a>
-		</strong>
-		<br />
-		<span>{$_("lfk-is-os")}</span>
-	</p>
-	<h4 class="mb-1 text-3xl font-extrabold leading-tight">
-		{$_("credits")}
-	</h4>
-	<p class="text-left">{$_("oss_credit_description")}</p>
-	<div class="mt-5 overflow-x-auto">
-		{#await license_promise}
-			<p>{$_("licenses-are-being-loaded")}</p>
-		{:then}
-			<table class="font-mono">
-				<thead class="border-b border-gray-400">
-					<tr class="odd:bg-white even:bg-gray-100">
-						<th>{$_("dependency_name")}</th>
-						<th>{$_("license")}</th>
-						<th>{$_("repo_link")}</th>
-						<th>{$_("installed-version")}</th>
-						<th>{$_("author")}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{#each licenses as l}
-						<tr class="odd:bg-white even:bg-gray-100 *:p-2">
-							<td>{l.name}</td>
-							<td>
-								<button
-									class="underline cursor-pointer"
-									on:click={() => {
-										modal_open = true;
-										currentlicense = l.name + "@" + l.version;
-										licensetext =
-											l.licensetext || $_("no-license-text-could-be-found");
-									}}>{l.license || "?"}</button
-								>
-							</td>
-							<td>
-								{(l.repo?.url || l.repo)
-									.replace("git+", "")
-									.replace("git://", "")}
-							</td>
-							<td>{l.version || "?"}</td>
-							<td>{l.author?.name || l.author || "?"}</td>
-						</tr>
-					{/each}
-				</tbody>
-			</table>
-		{:catch error}
-			<div
-				class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500"
-			>
-				<span class="inline-block align-middle mr-8">
-					<b>{$_("general_promise_error")}</b>
-					{error}
-				</span>
-			</div>
-		{/await}
-	</div>
-	<div class="w-full mt-8">
-		<p class="font-medium">{$_("icon-image-credits")}</p>
-		<ul class="list-disc ml-6">
-			<li>
-				<a
-					class="underline"
-					target="_blank"
-					rel="noopener noreferrer"
-					href="https://storyset.com">https://storyset.com</a
-				>
-			</li>
-			<li>
-				<a
-					class="underline"
-					target="_blank"
-					rel="noopener noreferrer"
-					href="https://undraw.co">https://undraw.co</a
-				>
-			</li>
-			<li>
-				<a
-					class="underline"
-					target="_blank"
-					rel="noopener noreferrer"
-					href="https://remixicon.com">https://remixicon.com</a
-				>
-			</li>
-		</ul>
-	</div>
-</section>
+<div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
+  <div class="text-center mb-8">
+    <h1
+      class="mt-9 font-display text-4xl leading-none font-semibold text-white sm:text-5xl lg:text-6xl">
+      {$_('about')}
+      🧾
+    </h1>
+    <p
+      class="mt-2 max-w-xl mx-auto text-xl lg:max-w-3xl lg:text-2xl text-gray-300">
+      Lauf für Kaya!
+      <strong class="text-white font-medium">
+        {$_('by')}
+        <a href="https://odit.services" class="underline">ODIT.Services</a>
+      </strong>
+      <br />
+      <span class="text-lg">{$_('lfk-is-os')}</span>
+    </p>
+  </div>
+</div>
+
+<div class="pt-0 pb-16 overflow-hidden lg:pt-12 lg:py-24">
+  <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
+    <h2 class="text-4xl font-display font-semibold md:text-5xl">
+      {$_('credits')}
+    </h2>
+    <div class="max-w-3xl mx-auto text-xl leading-8 font-medium mt-8">
+      <p class="text-center">{$_('oss_credit_description')}</p>
+    </div>
+    <div class="w-screen leading-8 pl-5 mt-5">
+      {#await license_promise}
+        <p class="text-center w-full">{$_('licenses-are-being-loaded')}</p>
+      {:then}
+        <table>
+          <thead>
+            <tr>
+              <th>{$_('dependency_name')}</th>
+              <th>{$_('license')}</th>
+              <th>{$_('repo_link')}</th>
+              <th>{$_('installed-version')}</th>
+              <th>{$_('author')}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {#each licenses as l}
+              <tr>
+                <td>{l.name}</td>
+                <td>
+                  {l.license || '?'}<br /><span
+                    class="underline cursor-pointer"
+                    on:click={() => {
+                      modal_open = true;
+                      currentlicense = l.name + '@' + l.version;
+                      licensetext = l.licensetext || $_('no-license-text-could-be-found');
+                    }}>{$_('read-license')}</span>
+                </td>
+                <td>
+                  {(l.repo?.url || l.repo)
+                    .replace('git+', '')
+                    .replace('git://', '')}
+                </td>
+                <td>{l.version || '?'}</td>
+                <td>{l.author?.name || l.author || '?'}</td>
+              </tr>
+            {/each}
+          </tbody>
+        </table>
+      {:catch error}
+        <div
+          class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+          <span class="inline-block align-middle mr-8">
+            <b class="capitalize">{$_('general_promise_error')}</b>
+            {error}
+          </span>
+        </div>
+      {/await}
+    </div>
+    <div class="w-full leading-8 mt-8">
+      <p class="text-xl font-medium">{$_('icon-image-credits')}</p>
+      <ul class="list-disc">
+        <li>
+          <a
+            class="underline"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://storyset.com">https://storyset.com</a>
+        </li>
+        <li>
+          <a
+            class="underline"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://undraw.co">https://undraw.co</a>
+        </li>
+        <li>
+          <a
+            class="underline"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://remixicon.com">https://remixicon.com</a>
+        </li>
+      </ul>
+    </div>
+    <h2 class="mt-4 text-4xl font-display font-semibold md:text-5xl">
+      {$_('faq')}
+    </h2>
+    <div class="mt-6 border-t-2 border-gray-100 pt-10">
+      <dl class="md:grid md:grid-cols-2 md:gap-8">
+        <div>
+          <div>
+            <dt class="text-lg leading-6 font-medium">Q</dt>
+            <dd class="mt-2">
+              <p class="text-base text-gray-500">A</p>
+            </dd>
+          </div>
+        </div>
+        <div class="mt-12 sm:mt-0">
+          <div id="team-pricing">
+            <dt class="text-lg leading-6 font-medium">Q</dt>
+            <dd class="mt-2">
+              <p class="text-base text-gray-500">A</p>
+            </dd>
+          </div>
+          <div class="mt-12">
+            <dt class="text-lg leading-6 font-medium">Q</dt>
+            <dd class="mt-2">
+              <p class="text-base text-gray-500">A</p>
+            </dd>
+          </div>
+        </div>
+      </dl>
+    </div>
+  </div>
+</div>

src/components/general/Footer.svelte

@@ -1,55 +1,40 @@
 <script>
-	import { onMount } from "svelte";
-	import { _ } from "svelte-i18n";
-	$: releaseinfo = "";
-	onMount(() => {
-		releaseinfo = document
-			.getElementById("buildinfo")
-			.textContent.replace("RELEASE_INFO-", "")
-			.replace("-RELEASE_INFO", "");
-	});
-	const year = new Date().getFullYear();
+  import { onMount } from "svelte";
+  import { _ } from "svelte-i18n";
+  $: releaseinfo = "";
+  onMount(() => {
+    releaseinfo = document
+      .getElementById("buildinfo")
+      .textContent.replace("RELEASE_INFO-", "")
+      .replace("-RELEASE_INFO", "");
+  });
+  const year = new Date().getFullYear();
 </script>
 
 <footer class="p-5 w-full">
-	<p class="text-sm text-gray-500 mt-4">
-		Lauf für Kaya! Läufersystem - Copyright ©
-		{year}
-		+ proudly powered by
-		<a
-			class="underline"
-			href="https://odit.services"
-			rel="noopener,noreferrer"
-			target="_blank">ODIT.Services</a
-		>
-	</p>
-	<p class="text-sm text-gray-500 mt-4">
-		<a
-			class="underline"
-			target="_blank"
-			rel="noopener, noreferrer"
-			href="https://git.odit.services/lfk/frontend/">LfK!Frontend</a
-		>@<a
-			class="underline"
-			target="_blank"
-			rel="noopener, noreferrer"
-			href="https://git.odit.services/lfk/frontend/src/tag/{releaseinfo}"
-			>{releaseinfo}</a
-		>
-		-
-		<a
-			rel="noopener, noreferrer"
-			class="underline"
-			href="https://docs.lauf-fuer-kaya.de"
-			target="_blank">{$_("documentation")}</a
-		>
-		-
-		<a class="underline" href="https://lauf-fuer-kaya.de/datenschutz/"
-			>{$_("privacy")}</a
-		>
-		-
-		<a class="underline" href="https://lauf-fuer-kaya.de/impressum/"
-			>{$_("imprint")}</a
-		>
-	</p>
+  <p class="text-sm text-gray-500 mt-4">
+    Lauf für Kaya! Läufersystem - Copyright ©
+    {year}
+    + proudly powered by
+    <a
+      class="underline"
+      href="https://odit.services"
+      rel="noopener,noreferrer"
+      target="_blank">ODIT.Services</a>
+  </p>
+  <p class="text-sm text-gray-500 mt-4">
+    <a
+      class="underline"
+      target="_blank"
+      rel="noopener, noreferrer"
+      href="https://git.odit.services/lfk/frontend/">LfK!Frontend</a>@<a
+      class="underline"
+      target="_blank"
+      rel="noopener, noreferrer"
+      href="https://git.odit.services/lfk/frontend/src/tag/{releaseinfo}">{releaseinfo}</a>
+    -
+    <a class="underline" href="/privacy">{$_('privacy')}</a>
+    -
+    <a class="underline" href="/imprint">{$_('imprint')}</a>
+  </p>
 </footer>

src/components/general/Imprint.svelte

@@ -0,0 +1,48 @@
+<script>
+  import { _, getLocaleFromNavigator } from "svelte-i18n";
+  import marked from "marked";
+  import Footer from "./Footer.svelte";
+  import * as css from "../base/simple.css";
+  let html = "";
+  async function load() {
+    let md = await fetch("/imprint_" + getLocaleFromNavigator() + ".md");
+    if((await md.text()).includes("<meta")){
+      md.ok=false
+    }
+    if (!md.ok) {
+      md = await fetch("/imprint_en.md");
+    }
+    html = marked(await md.text());
+  }
+  const promise = load();
+</script>
+
+<div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
+  <div class="text-center mb-8">
+    <h1
+      class="mt-9 font-display text-4xl leading-none font-semibold text-white sm:text-5xl lg:text-6xl">
+      {$_('imprint')}
+    </h1>
+  </div>
+</div>
+
+<div class="pt-0 pb-16 overflow-hidden lg:pt-12 lg:py-24">
+  <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
+    {#await promise}
+      <p class="text-center w-full">{$_('imprint-loading')}</p>
+    {:then}
+      <div class="simplecontent">
+        {@html html}
+      </div>
+    {:catch error}
+      <div
+        class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+        <span class="inline-block align-middle mr-8">
+          <b class="capitalize">{$_('general_promise_error')}</b>
+          {error}
+        </span>
+      </div>
+    {/await}
+  </div>
+</div>
+<Footer />

src/components/general/NotFound.svelte

@@ -4,22 +4,19 @@
 
 <body class="antialiased font-sans">
   <div class="flex min-h-screen">
-    <div class="w-full bg-white flex items-center justify-center">
+    <div class="w-full bg-white flex items-center justify-center ">
       <div class="max-w-sm m-8">
         <div class="text-black text-5xl md:text-15xl font-black">
-          {$_("404title")}
+          {$_('404title')}
         </div>
         <div class="w-16 h-1 bg-purple-light my-3 md:my-6" />
         <p
-          class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal"
-        >
-          {$_("404message")}
+          class="text-grey-darker text-2xl md:text-3xl font-light mb-8 leading-normal">
+          {$_('404message')}
         </p>
         <a
           href="/"
-          class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg"
-          >{$_("goback")}</a
-        >
+          class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">{$_('goback')}</a>
       </div>
     </div>
   </div>

src/components/general/Privacy.svelte

@@ -0,0 +1,48 @@
+<script>
+  import { _, getLocaleFromNavigator } from "svelte-i18n";
+  import marked from "marked";
+  import Footer from "./Footer.svelte";
+  import * as css from "../base/simple.css";
+  let html = "";
+  async function load() {
+    let md = await fetch("/privacy_" + getLocaleFromNavigator() + ".md");
+    if((await md.text()).includes("<meta")){
+      md.ok=false
+    }
+    if (!md.ok) {
+      md = await fetch("/privacy_en.md");
+    }
+    html = marked(await md.text());
+  }
+  const promise = load();
+</script>
+
+<div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
+  <div class="text-center mb-8">
+    <h1
+      class="mt-9 font-display text-4xl leading-none font-semibold text-white sm:text-5xl lg:text-6xl">
+      {$_('privacy')}
+    </h1>
+  </div>
+</div>
+
+<div class="pt-0 pb-16 overflow-hidden lg:pt-12 lg:py-24">
+  <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
+    {#await promise}
+      <p class="text-center w-full">{$_('privacy-loading')}</p>
+    {:then}
+      <div class="simplecontent">
+        {@html html}
+      </div>
+    {:catch error}
+      <div
+        class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+        <span class="inline-block align-middle mr-8">
+          <b class="capitalize">{$_('general_promise_error')}</b>
+          {error}
+        </span>
+      </div>
+    {/await}
+  </div>
+</div>
+<Footer />

src/components/general/Sidebar.svelte

@@ -0,0 +1,82 @@
+<script>
+  let open = false;
+</script>
+
+<div class="md:flex flex-col md:flex-row h-screen w-full">
+  <div
+    class="flex flex-col w-full md:w-64 text-gray-700 bg-white dark-mode:text-gray-200 dark-mode:bg-gray-800 flex-shrink-0">
+    <div
+      class="flex-shrink-0 px-8 py-4 flex flex-row items-center justify-between">
+      <a
+        href="/#/test"
+        class="text-lg font-semibold tracking-widest text-gray-900 uppercase rounded-lg dark-mode:text-white focus:outline-none focus:shadow-outline">Sidebar</a>
+      <button
+        class="rounded-lg md:hidden focus:outline-none focus:shadow-outline">
+        <svg fill="currentColor" viewBox="0 0 20 20" class="w-6 h-6">
+          {#if open}
+            <path
+              fill-rule="evenodd"
+              d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+              clip-rule="evenodd" />
+          {/if}
+          {#if !open}
+            <path
+              fill-rule="evenodd"
+              d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 10a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM9 15a1 1 0 011-1h6a1 1 0 110 2h-6a1 1 0 01-1-1z"
+              clip-rule="evenodd" />
+          {/if}
+        </svg>
+      </button>
+    </div>
+    <nav
+      :class:block={open}
+      :class:hidden={!open}
+      class="flex-grow md:block px-4 pb-4 md:pb-0 md:overflow-y-auto">
+      <a
+        class="block px-4 py-2 mt-2 text-sm font-semibold text-gray-900 bg-gray-200 rounded-lg dark-mode:bg-gray-700 dark-mode:hover:bg-gray-600 dark-mode:focus:bg-gray-600 dark-mode:focus:text-white dark-mode:hover:text-white dark-mode:text-gray-200 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
+        href="#">Blog</a>
+      <a
+        class="block px-4 py-2 mt-2 text-sm font-semibold text-gray-900 bg-transparent rounded-lg dark-mode:bg-transparent dark-mode:hover:bg-gray-600 dark-mode:focus:bg-gray-600 dark-mode:focus:text-white dark-mode:hover:text-white dark-mode:text-gray-200 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
+        href="#">Portfolio</a>
+      <a
+        class="block px-4 py-2 mt-2 text-sm font-semibold text-gray-900 bg-transparent rounded-lg dark-mode:bg-transparent dark-mode:hover:bg-gray-600 dark-mode:focus:bg-gray-600 dark-mode:focus:text-white dark-mode:hover:text-white dark-mode:text-gray-200 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
+        href="#">About</a>
+      <a
+        class="block px-4 py-2 mt-2 text-sm font-semibold text-gray-900 bg-transparent rounded-lg dark-mode:bg-transparent dark-mode:hover:bg-gray-600 dark-mode:focus:bg-gray-600 dark-mode:focus:text-white dark-mode:hover:text-white dark-mode:text-gray-200 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
+        href="#">Contact</a>
+      <div class="relative">
+        <button
+          on:click={() => {
+            open = !open;
+          }}
+          class="flex flex-row items-center w-full px-4 py-2 mt-2 text-sm font-semibold text-left bg-transparent rounded-lg dark-mode:bg-transparent dark-mode:focus:text-white dark-mode:hover:text-white dark-mode:focus:bg-gray-600 dark-mode:hover:bg-gray-600 md:block hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline">
+          <span>Dropdown</span>
+          <svg
+            fill="currentColor"
+            viewBox="0 0 20 20"
+            class="inline w-4 h-4 mt-1 ml-1 transition-transform duration-200 transform md:-mt-1"><path
+              fill-rule="evenodd"
+              d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
+              clip-rule="evenodd" /></svg>
+        </button>
+        <div
+          class:block={open}
+          class:hidden={!open}
+          class="absolute right-0 w-full mt-2 origin-top-right rounded-md shadow-lg">
+          <div
+            class="px-2 py-2 bg-white rounded-md shadow dark-mode:bg-gray-800">
+            <a
+              class="block px-4 py-2 mt-2 text-sm font-semibold bg-transparent rounded-lg dark-mode:bg-transparent dark-mode:hover:bg-gray-600 dark-mode:focus:bg-gray-600 dark-mode:focus:text-white dark-mode:hover:text-white dark-mode:text-gray-200 md:mt-0 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
+              href="#">Link #1</a>
+            <a
+              class="block px-4 py-2 mt-2 text-sm font-semibold bg-transparent rounded-lg dark-mode:bg-transparent dark-mode:hover:bg-gray-600 dark-mode:focus:bg-gray-600 dark-mode:focus:text-white dark-mode:hover:text-white dark-mode:text-gray-200 md:mt-0 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
+              href="#">Link #2</a>
+            <a
+              class="block px-4 py-2 mt-2 text-sm font-semibold bg-transparent rounded-lg dark-mode:bg-transparent dark-mode:hover:bg-gray-600 dark-mode:focus:bg-gray-600 dark-mode:focus:text-white dark-mode:hover:text-white dark-mode:text-gray-200 md:mt-0 hover:text-gray-900 focus:text-gray-900 hover:bg-gray-200 focus:bg-gray-200 focus:outline-none focus:shadow-outline"
+              href="#">Link #3</a>
+          </div>
+        </div>
+      </div>
+    </nav>
+  </div>
+</div>

src/components/groups/AddGroupModal.svelte

@@ -1,8 +1,9 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
+  import { focusTrap } from "svelte-focus-trap";
+  import Toastify from "toastify-js";
   import { UserGroupService } from "@odit/lfk-client-js";
-  import toast from "svelte-french-toast";
   export let modal_open;
   export let current_groups;
   let description_input_value;
@@ -31,7 +32,10 @@
   function submit() {
     if (processed_last_submit === true) {
       processed_last_submit = false;
-      toast.loading($_("group-is-being-added"));
+      const toast = Toastify({
+        text: $_('group-is-being-added'),
+        duration: -1,
+      }).showToast();
       let postdata = {
         name: name_input_value,
         description: description_input_value,
@@ -42,8 +46,11 @@
           description_input_value = "";
           modal_open = false;
           //
-          toast.dismiss();
-          toast.success($_("group-added"));
+          Toastify({
+            text: $_('group-added'),
+            duration: 500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
           current_groups.push(result);
           current_groups = current_groups;
         })
@@ -52,6 +59,8 @@
         })
         .finally(() => {
           processed_last_submit = true;
+          //
+          toast.hideToast();
         });
     }
   }
@@ -59,124 +68,105 @@
 
 {#if modal_open}
   <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
+    class="fixed z-10 inset-0 overflow-y-auto"
+    use:focusTrap
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;
-    }}
-  >
+    }}>
     <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
       <div class="fixed inset-0 transition-opacity" aria-hidden="true">
         <div
           class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
+          data-id="modal_backdrop" />
       </div>
       <span
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
+        aria-hidden="true">&#8203;</span>
       <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
+        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
         role="dialog"
         aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
+        aria-labelledby="modal-headline">
+        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+          <div class="sm:flex sm:items-start">
             <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 640 512"
-                class="size-6 text-blue-600"
+                class="h-6 w-6 text-blue-600"
                 fill="currentColor"
                 width="24"
-                height="24"
-                ><path fill="none" d="M0 0h24v24H0z" />
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
                 <path
-                  d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"
-                /></svg
-              >
+                  d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z" /></svg>
             </div>
-            <div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("create-a-new-user-group")}
+                {$_('create-a-new-user-group')}
               </h3>
-              <div class="mb-6">
+              <div class="mt-2 mb-6">
                 <p class="text-sm text-gray-500">
-                  {$_(
-                    "please-provide-the-required-information-for-creating-a-new-user-group"
-                  )}
+                  {$_('please-provide-the-required-information-for-creating-a-new-user-group')}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
+              <div class="grid grid-cols-6 gap-6">
                 <div class="col-span-6">
                   <label
                     for="firstname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("name")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('name')}</label>
                   <input
                     use:focus
                     autocomplete="off"
-                    placeholder={$_("name")}
+                    placeholder="{$_('name')}"
                     class:border-red-500={!isNameValid}
                     class:focus:border-red-500={!isNameValid}
                     class:focus:ring-red-500={!isNameValid}
                     bind:value={name_input_value}
                     type="text"
                     name="firstname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isNameValid}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("name-is-required")}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('name-is-required')}
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
                     for="trackname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("description-optional")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('description-optional')}</label>
                   <input
                     autocomplete="off"
-                    placeholder={$_("something-about-the-group")}
+                    placeholder="{$_('something-about-the-group')}"
                     bind:value={description_input_value}
                     type="text"
                     name="trackname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
+        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
             on:click={submit}
             type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("create")}
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('create')}
           </button>
           <button
             on:click={() => {
               modal_open = false;
             }}
             type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
+            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('cancel')}
           </button>
         </div>
       </div>

src/components/groups/GroupDetail.svelte

@@ -1,227 +1,220 @@
-<script>
-	import { _ } from "svelte-i18n";
-	import store from "../../store";
-	import { UserGroupService } from "@odit/lfk-client-js";
-	import toast from "svelte-french-toast";
-
-	import PromiseError from "../base/PromiseError.svelte";
-	let data_loaded = false;
-	export let params;
-	const promise = UserGroupService.userGroupControllerGetOne(params.groupid);
-	const colors = [
-		"#f3558e",
-		"#17b978",
-		"#3498db",
-		"#3f3b3b",
-		"#775ada",
-		"#7ed6df_#000000",
-		"#000000",
-		"#21e6c1_#000000",
-		"#c0392b",
-		"#d35400",
-		"#7f8c8d",
-		"#6ab04c",
-		"#4834d4",
-		"#ff1f5a",
-		"#eac100",
-	];
-	let matched_colors = [];
-	$: delete_triggered = false;
-	$: search_permission = "";
-	$: original_data = {};
-	$: editable = {};
-	$: changes_performed = !(
-		JSON.stringify(original_data) == JSON.stringify(editable)
-	);
-	$: isGroupnameValid = editable.name !== "";
-	$: save_enabled = changes_performed && isGroupnameValid;
-	promise.then((data) => {
-		let current_target = "";
-		let colorindex = -1;
-		data.permissions = data.permissions.sort();
-		data.permissions.forEach((p) => {
-			const target = p.split(":")[0];
-			if (current_target !== p.split(":")[0]) {
-				colorindex++;
-				current_target = p.split(":")[0];
-			}
-			let background = colors[colorindex];
-			let foreground = "#fff";
-			if (background.includes("_")) {
-				foreground = background.split("_")[1];
-				background = background.split("_")[0];
-			}
-			matched_colors[target] = [background, foreground];
-		});
-		data_loaded = true;
-		original_data = Object.assign(original_data, data);
-		editable = Object.assign(editable, original_data);
-	});
-	function submit() {
-		if (data_loaded === true && save_enabled) {
-			toast($_("updating-group"));
-			UserGroupService.userGroupControllerPut(original_data.id, editable)
-				.then((resp) => {
-					Object.assign(original_data, editable);
-					original_data = editable;
-					Object.assign(original_data, editable);
-					toast.success($_("group-updated"));
-				})
-				.catch((err) => {});
-		} else {
-		}
-	}
-	function deleteGroup() {
-		UserGroupService.userGroupControllerRemove(original_data.id, true)
-			.then((resp) => {
-				location.replace("./");
-			})
-			.catch((err) => {});
-	}
-</script>
-
-{#await promise}
-	{$_("loading-group-detail")}
-{:then}
-	<section class="container p-5 select-none">
-		<div class="flex flex-row mb-4">
-			<div class="w-full">
-				<nav class="w-full flex">
-					<ol class="list-none flex flex-row items-center justify-start">
-						<li class="flex items-center"></li>
-						<li class="flex items-center">
-							<a class="mr-2" href="../"
-								><svg
-									xmlns="http://www.w3.org/2000/svg"
-									width="24"
-									height="24"
-									viewBox="0 0 24 24"
-									fill="none"
-									stroke="currentColor"
-									stroke-width="2"
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									class="inline-block"
-									><path d="m12 19-7-7 7-7" /><path d="M19 12H5" /></svg
-								>
-								{$_("groups")}</a
-							>
-						</li>
-					</ol>
-				</nav>
-			</div>
-		</div>
-		<div class="mb-4 text-3xl font-extrabold leading-tight">
-			{editable.name}
-			<div data-id="group_actions_${editable.id}">
-				{#if store.state.jwtinfo.userdetails.permissions.includes("USERGROUP:DELETE")}
-					{#if delete_triggered}
-						<button
-							on:click={deleteGroup}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-							>{$_("confirm-deletion")}</button
-						>
-						<button
-							on:click={() => {
-								delete_triggered = !delete_triggered;
-							}}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm"
-							>{$_("cancel")}</button
-						>
-					{/if}
-					{#if !delete_triggered}
-						<button
-							on:click={() => {
-								delete_triggered = true;
-							}}
-							type="button"
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-							>{$_("delete-group")}</button
-						>
-					{/if}
-				{/if}
-				{#if !delete_triggered}
-					<button
-						disabled={!save_enabled}
-						class:opacity-50={!save_enabled}
-						type="button"
-						on:click={submit}
-						class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-						>{$_("save-changes")}</button
-					>
-				{/if}
-			</div>
-		</div>
-		<!--  -->
-		<div class="text-sm w-full mt-2">
-			<label for="title" class="font-semibold text-gray-700">{$_("name")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("name")}
-				type="text"
-				bind:value={editable.name}
-				class:border-red-500={!isGroupnameValid}
-				class:focus:border-red-500={!isGroupnameValid}
-				class:focus:ring-red-500={!isGroupnameValid}
-				name="title"
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-			{#if !isGroupnameValid}
-				<span
-					class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-				>
-					{$_("group-name-is-required")}
-				</span>
-			{/if}
-		</div>
-		<div class="text-sm w-full mt-2">
-			<label for="groupdescription" class="font-semibold text-gray-700"
-				>{$_("description")}</label
-			>
-			<input
-				autocomplete="off"
-				placeholder={$_("description")}
-				type="text"
-				bind:value={editable.description}
-				name="groupdescription"
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-		</div>
-		<div class="text-sm w-full mt-2">
-			<p class="font-semibold mb-4">
-				{$_("permissions")}
-			</p>
-			<div>
-				<a
-					class="px-4 py-2 bg-gray-500 rounded-md text-white"
-					href="/groups/{params.groupid}/permissions/"
-					>{$_("edit-permissions")}</a
-				>
-			</div>
-			<div class="w-full sm:my-px sm:px-px sm:w-1/2">
-				<input
-					autocomplete="off"
-					placeholder={$_("search-for-permission")}
-					type="text"
-					bind:value={search_permission}
-					class="mt-4 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				/>
-			</div>
-			{#each original_data.permissions as p}
-				{#if p.toLowerCase().includes(search_permission.toLowerCase())}
-					<span
-						style="background:{matched_colors[
-							p.split(':')[0]
-						][0]};color:{matched_colors[p.split(':')[0]][1]};"
-						class="mt-1 inline-flex items-center justify-center px-2 py-1 text-xs font-bold leading-none text-indigo-100 rounded"
-						>{p}</span
-					>
-					<!--  -->
-				{/if}
-			{/each}
-		</div>
-	</section>
-{:catch error}
-	<PromiseError {error} />
-{/await}
+<script>
+  import { _ } from "svelte-i18n";
+  import store from "../../store";
+  import {
+    UserGroupService
+  } from "@odit/lfk-client-js";
+  import Toastify from "toastify-js";
+  import PromiseError from "../base/PromiseError.svelte";
+  let data_loaded = false;
+  export let params;
+  const promise = UserGroupService.userGroupControllerGetOne(params.groupid);
+  const colors = [
+    "#f3558e",
+    "#17b978",
+    "#3498db",
+    "#3f3b3b",
+    "#775ada",
+    "#7ed6df_#000000",
+    "#000000",
+    "#21e6c1_#000000",
+    "#c0392b",
+    "#d35400",
+    "#7f8c8d",
+    "#6ab04c",
+    "#4834d4",
+    "#ff1f5a",
+    "#eac100",
+  ];
+  let matched_colors = [];
+  $: delete_triggered = false;
+  $: search_permission = "";
+  $: original_data = {};
+  $: editable = {};
+  $: changes_performed = !(JSON.stringify(original_data) == JSON.stringify(editable));
+  $: isGroupnameValid = editable.name !== "";
+  $: save_enabled =
+    changes_performed && isGroupnameValid 
+  promise.then((data) => {
+    let current_target = "";
+    let colorindex = -1;
+    data.permissions = data.permissions.sort();
+    data.permissions.forEach((p) => {
+      const target = p.split(":")[0];
+      if (current_target !== p.split(":")[0]) {
+        colorindex++;
+        current_target = p.split(":")[0];
+      }
+      let background = colors[colorindex];
+      let foreground = "#fff";
+      if (background.includes("_")) {
+        foreground = background.split("_")[1];
+        background = background.split("_")[0];
+      }
+      matched_colors[target] = [background, foreground];
+    });
+    data_loaded = true;
+    original_data = Object.assign(original_data, data);
+    editable = Object.assign(editable, original_data);
+  });
+  function submit() {
+    if (data_loaded === true && save_enabled) {
+      Toastify({
+        text: $_('updateing-group'),
+        duration: 2500,
+      }).showToast();
+      UserGroupService.userGroupControllerPut(original_data.id, editable)
+        .then((resp) => {
+          Object.assign(original_data, editable);
+          original_data = editable;
+          Object.assign(original_data, editable);
+          Toastify({
+            text: $_('group-updated'),
+            duration: 2500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
+        })
+        .catch((err) => {});
+    } else {
+    }
+  }
+  function deleteGroup() {
+    UserGroupService.userGroupControllerRemove(original_data.id, true)
+      .then((resp) => {
+        location.replace("./");
+      })
+      .catch((err) => {});
+  }
+</script>
+
+{#await promise}
+  {$_('loading-group-detail')}
+{:then}
+  <section class="container p-5 select-none">
+    <div class="flex flex-row mb-4">
+      <div class="w-full">
+        <nav class="w-full flex">
+          <ol class="list-none flex flex-row items-center justify-start">
+            <li class="flex items-center">
+              <svg class="flex-shrink-0 w-5 h-5 mr-2" fill="currentColor" width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"></path></svg>
+            </li>
+            <li class="flex items-center">
+              <a class="mr-2" href="../">{$_('groups')}</a><svg
+                stroke="currentColor"
+                fill="none"
+                stroke-width="2"
+                viewBox="0 0 24 24"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="h-3 w-3 mr-2 stroke-current"
+                height="1em"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"><line
+                  x1="5"
+                  y1="12"
+                  x2="19"
+                  y2="12" />
+                <polyline points="12 5 19 12 12 19" /></svg>
+            </li>
+            <li class="flex items-center">
+              <span class="mr-2">{editable.name}</span>
+            </li>
+          </ol>
+        </nav>
+      </div>
+    </div>
+    <div class="mb-8 text-3xl font-extrabold leading-tight">
+      {original_data.name}
+      <span data-id="group_actions_${editable.id}">
+        {#if store.state.jwtinfo.userdetails.permissions.includes('USERGROUP:DELETE')}
+          {#if delete_triggered}
+            <button
+              on:click={deleteGroup}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('confirm-deletion')}</button>
+            <button
+              on:click={() => {
+                delete_triggered = !delete_triggered;
+              }}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm">{$_('cancel')}</button>
+          {/if}
+          {#if !delete_triggered}
+            <button
+              on:click={() => {
+                delete_triggered = true;
+              }}
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('delete-group')}</button>
+          {/if}
+        {/if}
+        {#if !delete_triggered}
+          <button
+            disabled={!save_enabled}
+            class:opacity-50={!save_enabled}
+            type="button"
+            on:click={submit}
+            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('save-changes')}</button>
+        {/if}
+      </span>
+    </div>
+    <!--  -->
+    <div class="text-sm w-full">
+      <label
+        for="title"
+        class="font-medium text-gray-700">{$_('name')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('name')}
+        type="text"
+        bind:value={editable.name}
+        class:border-red-500={!isGroupnameValid}
+        class:focus:border-red-500={!isGroupnameValid}
+        class:focus:ring-red-500={!isGroupnameValid}
+        name="title"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      {#if !isGroupnameValid}
+        <span
+          class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+          {$_('group-name-is-required')}
+        </span>
+      {/if}
+    </div>
+    <div class="text-sm w-full">
+      <label
+        for="firstname"
+        class="font-medium text-gray-700">{$_('description')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('description')}
+        type="text"
+        bind:value={editable.description}
+        name="firstname"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+    </div>
+    <div class="text-sm w-full mt-8">
+      <p class="font-medium mb-4">
+        {$_('permissions')}
+        <a
+          class="px-4 py-2 bg-gray-500 rounded-md text-white"
+          href="/groups/{params.groupid}/permissions/">{$_('edit-permissions')}</a>
+      </p>
+      <div class="w-full sm:my-px sm:px-px sm:w-1/2">
+        <input
+          autocomplete="off"
+          placeholder="{$_('search-for-permission')}"
+          type="text"
+          bind:value={search_permission}
+          class="mt-4 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
+      </div>
+      {#each original_data.permissions as p}
+        {#if p.toLowerCase().includes(search_permission.toLowerCase())}
+          <span
+            style="background:{matched_colors[p.split(':')[0]][0]};color:{matched_colors[p.split(':')[0]][1]};"
+            class="mt-1 inline-flex items-center justify-center px-2 py-1 text-xs font-bold leading-none text-indigo-100 rounded">{p}</span>
+          <!--  -->
+        {/if}
+      {/each}
+    </div>
+  </section>
+{:catch error}
+  <PromiseError {error} />
+{/await}

src/components/groups/GroupPermissions.svelte

@@ -3,10 +3,9 @@
   import {
     PermissionService,
     CreatePermission,
-    UserGroupService,
+UserGroupService,
   } from "@odit/lfk-client-js";
-  import toast from 'svelte-french-toast'
-
+  import Toastify from "toastify-js";
   import PromiseError from "../base/PromiseError.svelte";
   export let params;
   let [
@@ -21,14 +20,15 @@
   $: save_enabled =
     JSON.stringify(grantedPermissions) ===
     JSON.stringify(grantedPermissions_initial);
-  const group_promise = UserGroupService.userGroupControllerGetOne(
-    params.groupid
-  );
+  const group_promise = UserGroupService.userGroupControllerGetOne(params.groupid);
   group_promise.then((data) => {
     original_data = Object.assign(original_data, data);
   });
   function submit() {
-    toast.loading($_("updating-permissions"));
+    Toastify({
+      text: $_('updating-permissions'),
+      duration: 2500,
+    }).showToast();
     to_delete.forEach((d) => {
       promises = promises.concat([
         PermissionService.permissionControllerRemove(d, true),
@@ -50,7 +50,11 @@
         );
       });
       grantedPermissions_initial = grantedPermissions;
-      toast.success($_("permissions-updated"));
+      Toastify({
+        text: $_("permissions-updated"),
+        duration: 2500,
+        backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+      }).showToast();
     });
   }
   Object.values(CreatePermission.target).forEach((t) => {
@@ -58,15 +62,13 @@
       allpermissions = allpermissions.concat([{ target: t, action: a }]);
     });
   });
-  UserGroupService.userGroupControllerGetPermissions(params.groupid).then(
-    (val) => {
-      val.directlyGranted.forEach((p) => {
-        delete p.responseType;
-        grantedPermissions = grantedPermissions.concat([p]);
-      });
-      grantedPermissions_initial = grantedPermissions;
-    }
-  );
+  UserGroupService.userGroupControllerGetPermissions(params.groupid).then((val) => {
+    val.directlyGranted.forEach((p) => {
+      delete p.responseType;
+      grantedPermissions = grantedPermissions.concat([p]);
+    });
+    grantedPermissions_initial = grantedPermissions;
+  });
 </script>
 
 {#await group_promise}
@@ -84,15 +86,12 @@
                 width="24"
                 height="24"
                 xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 640 512"
-                ><path
+                viewBox="0 0 640 512"><path
                   fill="currentColor"
-                  d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"
-                /></svg
-              >
+                  d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z" /></svg>
             </li>
             <li class="flex items-center">
-              <a class="mr-2" href="../../">{$_("user-groups")}</a><svg
+              <a class="mr-2" href="../../">{$_('user-groups')}</a><svg
                 stroke="currentColor"
                 fill="none"
                 stroke-width="2"
@@ -102,10 +101,12 @@
                 class="h-3 w-3 mr-2 stroke-current"
                 height="1em"
                 width="1em"
-                xmlns="http://www.w3.org/2000/svg"
-                ><line x1="5" y1="12" x2="19" y2="12" />
-                <polyline points="12 5 19 12 12 19" /></svg
-              >
+                xmlns="http://www.w3.org/2000/svg"><line
+                  x1="5"
+                  y1="12"
+                  x2="19"
+                  y2="12" />
+                <polyline points="12 5 19 12 12 19" /></svg>
             </li>
             <li class="flex items-center">
               <span class="mr-2"><a href="../">{original_data.name}</a></span>
@@ -121,45 +122,45 @@
                 class="h-3 w-3 mr-2 stroke-current"
                 height="1em"
                 width="1em"
-                xmlns="http://www.w3.org/2000/svg"
-                ><line x1="5" y1="12" x2="19" y2="12" />
-                <polyline points="12 5 19 12 12 19" /></svg
-              >
+                xmlns="http://www.w3.org/2000/svg"><line
+                  x1="5"
+                  y1="12"
+                  x2="19"
+                  y2="12" />
+                <polyline points="12 5 19 12 12 19" /></svg>
             </li>
             <li class="flex items-center">
-              <span class="mr-2">{$_("permissions")}</span>
+              <span class="mr-2">{$_('permissions')}</span>
             </li>
           </ol>
         </nav>
       </div>
     </div>
-    <div class="mb-4 text-3xl font-extrabold">
-      <div>
+    <div class="mb-8 text-3xl font-extrabold">
+      {$_('permissions')}:
+      {original_data.name}
+      <span>
         {#if promises.length === 0}
           <button
             disabled={save_enabled}
             class:opacity-50={save_enabled}
             type="button"
             on:click={submit}
-            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-            >{$_("save-changes")}</button
-          >
+            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('save-changes')}</button>
         {:else}
           <button
             type="button"
-            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-yellow-600 text-base font-medium text-white hover:bg-yellow-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-yellow-500 sm:w-auto sm:text-sm"
-            >{$_("applying-changes")}</button
-          >
+            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-yellow-600 text-base font-medium text-white hover:bg-yellow-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-yellow-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('applying-changes')}</button>
         {/if}
-      </div>
+      </span>
     </div>
     <!--  -->
     <div class="flex flex-wrap -mx-1 overflow-hidden">
       <div class="my-1 px-1 w-full overflow-hidden sm:w-1/2">
-        {$_("available-permissions")}
+        {$_('verfuegbare')}
       </div>
       <div class="my-1 px-1 w-full overflow-hidden sm:w-1/2">
-        {$_("granted")}
+        {$_('granted')}
       </div>
     </div>
     <!--  -->
@@ -167,14 +168,12 @@
       {#if allpermissions.length > 0}
         <div class="my-1 px-1 w-full overflow-hidden sm:w-1/2">
           <div
-            class="border-4 border-dashed rounded mb-4 p-5 text-lg text-center"
-          >
+            class="border-4 border-dashed rounded mb-4 p-5 text-lg text-center">
             {#each allpermissions as p}
-              {#if !(grantedPermissions.filter((o) => p.target == o.target && p.action == o.action).length > 0)}
+              {#if !(grantedPermissions.filter((o)=>p.target == o.target && p.action == o.action).length > 0)}
                 <p
-                  class="block w-full mt-1 text-sm bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple form-input"
-                >
-                  {p.target + ":" + p.action}
+                  class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input">
+                  {p.target + ':' + p.action}
                   <button
                     on:click={() => {
                       grantedPermissions = grantedPermissions.concat([p]);
@@ -191,9 +190,7 @@
                       }
                     }}
                     type="button"
-                    class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-green-200 text-base font-medium text-black hover:bg-green-700 hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500 sm:w-auto sm:text-sm"
-                    >+</button
-                  >
+                    class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-green-200 text-base font-medium text-black hover:bg-green-700 hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500 sm:ml-3 sm:w-auto sm:text-sm">+</button>
                 </p>
               {/if}
             {/each}
@@ -201,39 +198,22 @@
         </div>
         <div class="my-1 px-1 w-full overflow-hidden sm:w-1/2">
           <div
-            class="border-4 border-dashed rounded mb-4 p-5 text-lg text-center"
-          >
+            class="border-4 border-dashed rounded mb-4 p-5 text-lg text-center">
             {#each grantedPermissions as p}
               <p
-                class="block w-full mt-1 text-sm bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple form-input"
-              >
-                {p.target + ":" + p.action}
+                class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input">
+                {p.target + ':' + p.action}
                 <button
                   on:click={() => {
-                    grantedPermissions = grantedPermissions.filter(
-                      (o) =>
-                        o.target + ":" + o.action !== p.target + ":" + p.action
-                    );
-                    if (
-                      to_add.some(
-                        (o) =>
-                          o.target + ":" + o.action ===
-                          p.target + ":" + p.action
-                      )
-                    ) {
-                      to_add = to_add.filter(
-                        (o) =>
-                          o.target + ":" + o.action !==
-                          p.target + ":" + p.action
-                      );
+                    grantedPermissions = grantedPermissions.filter((o) => o.target + ':' + o.action !== p.target + ':' + p.action);
+                    if (to_add.some((o) => o.target + ':' + o.action === p.target + ':' + p.action)) {
+                      to_add = to_add.filter((o) => o.target + ':' + o.action !== p.target + ':' + p.action);
                     } else {
                       to_delete = to_delete.concat([p.id]);
                     }
                   }}
                   type="button"
-                  class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-300 text-base font-medium text-black hover:bg-red-700 hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:w-auto sm:text-sm"
-                  >-</button
-                >
+                  class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-300 text-base font-medium text-black hover:bg-red-700 hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm">-</button>
               </p>
             {/each}
           </div>

src/components/groups/Groups.svelte

@@ -8,23 +8,22 @@
 </script>
 
 <section class="container p-5">
-  <h4 class="mb-1 text-3xl font-extrabold leading-tight">
-    {$_("user-groups")}
-  </h4>
-  {#if store.state.jwtinfo.userdetails.permissions.includes("USERGROUP:CREATE")}
-    <button
-      on:click={() => {
-        modal_open = true;
-      }}
-      type="button"
-      class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm"
-    >
-      {$_("add-user-group")}
-    </button>
-  {/if}
+  <span class="mb-1 text-3xl font-extrabold leading-tight">
+    {$_('user-groups')}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('USERGROUP:CREATE')}
+      <button
+        on:click={() => {
+          modal_open = true;
+        }}
+        type="button"
+        class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+        {$_('add-user-group')}
+      </button>
+    {/if}
+  </span>
   <UserGroupsOverview bind:current_groups />
 </section>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes("USERGROUP:CREATE")}
+{#if store.state.jwtinfo.userdetails.permissions.includes('USERGROUP:CREATE')}
   <AddGroupModal bind:current_groups bind:modal_open />
 {/if}

src/components/groups/UserGroupsEmptyState.svelte

@@ -6,7 +6,7 @@
 <div class="text-center items-center justify-center">
   <p class="mb-16 text-lg text-gray-500">
     <img class="w-full h-44" src={groups_empty} alt="" />
-    <span class="font-bold">{$_("there-are-no-groups-yet")}.</span><br />
-    <span>{$_("add-your-first-group")}</span>
+    <span class="font-bold">{$_('there-are-no-groups-yet')}.</span><br />
+    <span>{$_('add-your-first-group')}</span>
   </p>
-</div>
+</div>

src/components/groups/UserGroupsOverview.svelte

@@ -13,14 +13,13 @@
   );
 </script>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes("USERGROUP:GET")}
+{#if store.state.jwtinfo.userdetails.permissions.includes('USERGROUP:GET')}
   {#await groups_promise}
     <div
       class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-      role="alert"
-    >
-      <p class="font-bold">{$_("groups-are-being-loaded")}</p>
-      <p class="text-sm">{$_("this-might-take-a-moment")}</p>
+      role="alert">
+      <p class="font-bold">{$_('groups-are-being-loaded')}</p>
+      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
     </div>
   {:then}
     {#if current_groups.length === 0}
@@ -29,30 +28,26 @@
       <input
         type="search"
         bind:value={searchvalue}
-        placeholder={$_("datatable.search")}
-        aria-label={$_("datatable.search")}
-        class="mb-2 w-full sm:w-auto mt-1 sm:mt-0 p-2 rounded-md border"
-      />
+        placeholder={$_('datatable.search')}
+        aria-label={$_('datatable.search')}
+        class="gridjs-input gridjs-search-input mb-4" />
       <div
-        class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll"
-      >
+        class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
         <table class="divide-y divide-gray-200 w-full">
           <thead class="bg-gray-50">
-            <tr class="odd:bg-white even:bg-gray-100">
+            <tr>
               <th
                 scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-              >
-                {$_("name")}
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('name')}
               </th>
               <th
                 scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-              >
-                {$_("description")}
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('description')}
               </th>
               <th scope="col" class="relative px-6 py-3">
-                <span class="sr-only">{$_("action")}</span>
+                <span class="sr-only">{$_('action')}</span>
               </th>
             </tr>
           </thead>
@@ -62,10 +57,7 @@
                 .toString()
                 .toLowerCase()
                 .includes(searchvalue)}
-                <tr
-                  class="odd:bg-white even:bg-gray-100"
-                  data-rowid="user_{group.id}"
-                >
+                <tr data-rowid="user_{group.id}">
                   <td class="px-6 py-4 whitespace-nowrap">
                     <div class="flex items-center">
                       <div class="ml-4">
@@ -80,53 +72,39 @@
                   </td>
                   {#if active_deletes[group.id] === true}
                     <td
-                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
-                    >
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
                       <button
                         on:click={() => {
                           active_deletes[group.id] = false;
                         }}
                         tabindex="0"
-                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer"
-                        >{$_("cancel-delete")}</button
-                      >
+                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
                       <button
                         on:click={() => {
-                          UserGroupService.userGroupControllerRemove(
-                            group.id,
-                            true
-                          )
+                          UserGroupService.userGroupControllerRemove(group.id, true)
                             .then((resp) => {
-                              current_groups = current_groups.filter(
-                                (obj) => obj.id !== group.id
-                              );
+                              current_groups = current_groups.filter((obj) => obj.id !== group.id);
                             })
                             .catch((err) => {
                               // error deleting user
                             });
                         }}
                         tabindex="0"
-                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-                        >{$_("confirm-delete")}</button
-                      >
+                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
                     </td>
                   {:else}
                     <td
-                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
-                    >
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
                       <a
                         href="./{group.id}"
-                        class="text-indigo-600 hover:text-indigo-900">Details</a
-                      >
-                      {#if store.state.jwtinfo.userdetails.permissions.includes("USERGROUP:DELETE")}
+                        class="text-indigo-600 hover:text-indigo-900">Details</a>
+                      {#if store.state.jwtinfo.userdetails.permissions.includes('USERGROUP:DELETE')}
                         <button
                           on:click={() => {
                             active_deletes[group.id] = true;
                           }}
                           tabindex="0"
-                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-                          >{$_("delete")}</button
-                        >
+                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
                       {/if}
                     </td>
                   {/if}
@@ -140,7 +118,7 @@
   {:catch error}
     <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
       <span class="inline-block align-middle mr-8">
-        <b>{$_("general_promise_error")}</b>
+        <b class="capitalize">{$_('general_promise_error')}</b>
         {error}
       </span>
     </div>

src/components/orgs/AddOrgModal.svelte

@@ -1,10 +1,9 @@
 <script>
   import { _ } from "svelte-i18n";
   import { clickOutside } from "../base/outsideclick";
-
+  import { focusTrap } from "svelte-focus-trap";
   import { RunnerOrganizationService } from "@odit/lfk-client-js";
-
-  import toast from "svelte-french-toast";
+  import Toastify from "toastify-js";
   export let modal_open;
   export let current_organizations;
   let name_input_dom;
@@ -25,7 +24,7 @@
   $: address_input2_value = "";
   $: address_zipcode_value = "";
   $: address_city_value = "";
-  $: address_checked = false;
+  $: address_checked = true;
 
   let address_input1;
   let address_input2;
@@ -49,7 +48,10 @@
   function submit() {
     if (processed_last_submit === true) {
       processed_last_submit = false;
-      toast.loading($_("organization-is-being-added"));
+      const toast = Toastify({
+        text: $_("organization-is-being-added"),
+        duration: -1,
+      }).showToast();
       let address = {};
       if (address_checked === true) {
         address = {
@@ -68,13 +70,17 @@
         .then((result) => {
           name = "";
           modal_open = false;
-          toast.dismiss();
-          toast.success($_("organization-added"));
+          Toastify({
+            text: $_("organization-added"),
+            duration: 500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
           current_organizations = current_organizations.concat([result]);
         })
         .catch((err) => {})
         .finally(() => {
           processed_last_submit = true;
+          toast.hideToast();
         });
     }
   }
@@ -82,70 +88,58 @@
 
 {#if modal_open}
   <div
-    class="fixed z-10 inset-0 overflow-y-hidden"
+    class="fixed z-10 inset-0 overflow-y-auto"
+    use:focusTrap
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;
-    }}
-  >
+    }}>
     <div
-      class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-    >
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
       <div class="fixed inset-0 transition-opacity" aria-hidden="true">
         <div
           class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
+          data-id="modal_backdrop" />
       </div>
       <span
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
+        aria-hidden="true">&#8203;</span>
       <div
-        class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
+        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
         role="dialog"
         aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-          <div class="">
+        aria-labelledby="modal-headline">
+        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+          <div class="sm:flex sm:items-start">
             <div
-              class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
               <svg
-                class="size-6 text-blue-600"
+                class="h-6 w-6 text-blue-600"
                 fill="currentColor"
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 24 24"
                 width="24"
-                height="24"
-                ><path
-                  d="M17 19h2v-8h-6v8h2v-6h2v6zM3 19V4a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v5h2v10h1v2H2v-2h1zm4-8v2h2v-2H7zm0 4v2h2v-2H7zm0-8v2h2V7H7z"
-                /></svg
-              >
+                height="24"><path
+                  d="M17 19h2v-8h-6v8h2v-6h2v6zM3 19V4a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v5h2v10h1v2H2v-2h1zm4-8v2h2v-2H7zm0 4v2h2v-2H7zm0-8v2h2V7H7z" /></svg>
             </div>
-            <div class="mt-3 sm:text-left">
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("create-a-new-organization")}
+                {$_('create-a-new-organization')}
               </h3>
-              <div class="mb-6">
+              <div class="mt-2 mb-6">
                 <p class="text-sm text-gray-500">
-                  {$_(
-                    "please-provide-the-required-information-to-add-a-new-organization"
-                  )}
+                  {$_('please-provide-the-required-information-to-add-a-new-organization')}
                 </p>
               </div>
-              <div class="grid grid-cols-6 gap-2 lg:gap-6 text-left">
+              <div class="grid grid-cols-6 gap-6">
                 <div class="col-span-6">
                   <label
                     for="firstname"
-                    class="block text-sm font-medium text-gray-700"
-                    >{$_("name")}</label
-                  >
+                    class="block text-sm font-medium text-gray-700">{$_('name')}</label>
                   <input
                     use:focus
                     autocomplete="off"
-                    placeholder={$_("name")}
+                    placeholder={$_('name')}
                     class:border-red-500={!isOrgnameValid}
                     class:focus:border-red-500={!isOrgnameValid}
                     class:focus:ring-red-500={!isOrgnameValid}
@@ -153,13 +147,11 @@
                     bind:this={name_input_dom}
                     type="text"
                     name="firstname"
-                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                  />
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
                   {#if !isOrgnameValid}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                    >
-                      {$_("organization-name-is-required")}
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('organization-name-is-required')}
                     </span>
                   {/if}
                 </div>
@@ -170,133 +162,115 @@
                       id="comments"
                       name="comments"
                       type="checkbox"
-                      class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-                    />
+                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
                   </div>
                   <div class="ml-3 text-sm">
-                    <label for="comments" class="font-semibold text-gray-700"
-                      >{$_("address")}</label
-                    >
+                    <label
+                      for="comments"
+                      class="font-medium text-gray-700">{$_('address')}</label>
                   </div>
                 </div>
-                {#if address_checked === true}
-                  <div class="col-span-6">
-                    <label
-                      for="address1"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("address")}</label
-                    >
-                    <input
-                      autocomplete="off"
-                      placeholder={$_("address")}
-                      class:border-red-500={!isAddress1Valid}
-                      class:focus:border-red-500={!isAddress1Valid}
-                      class:focus:ring-red-500={!isAddress1Valid}
-                      bind:value={address_input1_value}
-                      bind:this={address_input1}
-                      type="text"
-                      name="address1"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
-                    {#if !isAddress1Valid}
-                      <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("address-is-required")}
-                      </span>
-                    {/if}
-                  </div>
-                  <div class="col-span-6">
-                    <label
-                      for="address2"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("apartment-suite-etc")}</label
-                    >
-                    <input
-                      autocomplete="off"
-                      placeholder={$_("apartment-suite-etc")}
-                      bind:value={address_input2_value}
-                      bind:this={address_input2}
-                      type="text"
-                      name="address2"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
-                  </div>
-                  <div class="col-span-2">
-                    <label
-                      for="zipcode"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("zip-postal-code")}</label
-                    >
-                    <input
-                      autocomplete="off"
-                      placeholder={$_("zip-postal-code")}
-                      class:border-red-500={!iszipcodevalid}
-                      class:focus:border-red-500={!iszipcodevalid}
-                      class:focus:ring-red-500={!iszipcodevalid}
-                      bind:value={address_zipcode_value}
-                      bind:this={address_zipcode}
-                      type="text"
-                      name="zipcode"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
-                    {#if !iszipcodevalid}
-                      <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("valid-zipcode-postal-code-is-required")}
-                      </span>
-                    {/if}
-                  </div>
-                  <div class="col-span-4">
-                    <label
-                      for="city"
-                      class="block text-sm font-medium text-gray-700"
-                      >{$_("city")}</label
-                    >
-                    <input
-                      autocomplete="off"
-                      placeholder={$_("city")}
-                      class:border-red-500={!iscityvalid}
-                      class:focus:border-red-500={!iscityvalid}
-                      class:focus:ring-red-500={!iscityvalid}
-                      bind:value={address_city_value}
-                      bind:this={address_city}
-                      type="text"
-                      name="city"
-                      class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-                    />
-                    {#if !iscityvalid}
-                      <span
-                        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-                      >
-                        {$_("valid-city-is-required")}
-                      </span>
-                    {/if}
-                  </div>
-                {/if}
-              </div>
+              {#if address_checked === true}
+                <div class="col-span-6">
+                  <label
+                    for="address1"
+                    class="block text-sm font-medium text-gray-700">{$_('address')}</label>
+                  <input
+                    autocomplete="off"
+                    placeholder="{$_('address')}"
+                    class:border-red-500={!isAddress1Valid}
+                    class:focus:border-red-500={!isAddress1Valid}
+                    class:focus:ring-red-500={!isAddress1Valid}
+                    bind:value={address_input1_value}
+                    bind:this={address_input1}
+                    type="text"
+                    name="address1"
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+                  {#if !isAddress1Valid}
+                    <span
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('address-is-required')}
+                    </span>
+                  {/if}
+                </div>
+                <div class="col-span-6">
+                  <label
+                    for="address2"
+                    class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
+                  <input
+                    autocomplete="off"
+                    placeholder="{$_('apartment-suite-etc')}"
+                    bind:value={address_input2_value}
+                    bind:this={address_input2}
+                    type="text"
+                    name="address2"
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+                </div>
+                <div class="col-span-6">
+                  <label
+                    for="zipcode"
+                    class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')}</label>
+                  <input
+                    autocomplete="off"
+                    placeholder="{$_('zip-postal-code')}"
+                    class:border-red-500={!iszipcodevalid}
+                    class:focus:border-red-500={!iszipcodevalid}
+                    class:focus:ring-red-500={!iszipcodevalid}
+                    bind:value={address_zipcode_value}
+                    bind:this={address_zipcode}
+                    type="text"
+                    name="zipcode"
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+                  {#if !iszipcodevalid}
+                    <span
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('valid-zipcode-postal-code-is-required')}
+                    </span>
+                  {/if}
+                </div>
+                <div class="col-span-6">
+                  <label
+                    for="city"
+                    class="block text-sm font-medium text-gray-700">{$_('city')}</label>
+                  <input
+                    autocomplete="off"
+                    placeholder="{$_('city')}"
+                    class:border-red-500={!iscityvalid}
+                    class:focus:border-red-500={!iscityvalid}
+                    class:focus:ring-red-500={!iscityvalid}
+                    bind:value={address_city_value}
+                    bind:this={address_city}
+                    type="text"
+                    name="city"
+                    class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+                  {#if !iscityvalid}
+                    <span
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('valid-city-is-required')}
+                    </span>
+                  {/if}
+                </div>
+              {/if}
+            </div>
             </div>
           </div>
         </div>
-        <div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
+        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
             on:click={submit}
             type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-          >
-            {$_("create")}
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('create')}
           </button>
           <button
             on:click={() => {
               modal_open = false;
             }}
             type="button"
-            class="cancel_modal_button"
-          >
-            {$_("cancel")}
+            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('cancel')}
           </button>
         </div>
       </div>

src/components/orgs/ConfirmOrgDeletion.svelte

@@ -0,0 +1,102 @@
+<script>
+  import { _ } from "svelte-i18n";
+  import { clickOutside } from "../base/outsideclick";
+  import { focusTrap } from "svelte-focus-trap";
+  import { RunnerOrganizationService } from "@odit/lfk-client-js";
+  import Toastify from "toastify-js";
+  import { createEventDispatcher } from "svelte";
+  export let modal_open;
+  export let delete_org;
+  const dispatch = createEventDispatcher();
+  function cancelDelete() {
+    modal_open = false;
+    dispatch("cancelDelete", { id: delete_org.id });
+  }
+  function deleteOrg() {
+    RunnerOrganizationService.runnerOrganizationControllerRemove(
+      delete_org.id,
+      true
+    )
+      .then((resp) => {
+        Toastify({
+          text: "Organization deleted",
+          duration: 500,
+          backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+        }).showToast();
+        location.replace("./");
+      })
+      .catch((err) => {});
+  }
+</script>
+
+{#if modal_open}
+  <div
+    class="fixed z-10 inset-0 overflow-y-auto"
+    use:focusTrap
+    use:clickOutside
+    on:click_outside={cancelDelete}>
+    <div
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
+      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
+        <div
+          class="absolute inset-0 bg-gray-500 opacity-75"
+          data-id="modal_backdrop" />
+      </div>
+      <span
+        class="hidden sm:inline-block sm:align-middle sm:h-screen"
+        aria-hidden="true">&#8203;</span>
+      <div
+        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="modal-headline">
+        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+          <div class="sm:flex sm:items-start">
+            <div
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
+              <svg
+                class="h-6 w-6 text-blue-600"
+                fill="currentColor"
+                width="24"
+                height="24"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 640 512"><path
+                  fill="currentColor"
+                  d="M96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112S381.9 32 320 32 208 82.1 208 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z" /></svg>
+            </div>
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+              <h3 class="text-lg leading-6 font-medium text-gray-900">
+                {$_('attention')}
+              </h3>
+              <div class="mt-2 mb-6">
+                <p class="text-sm text-gray-500">
+                  {$_(
+                    'do-you-want-to-delete-the-organization-delete_org-name',
+                    {
+                      values: { orgname: delete_org.name },
+                    }
+                  )}<br />
+                  {$_('all-associated-teams-and-runners-will-be-deleted-too')}
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+          <button
+            on:click={deleteOrg}
+            type="button"
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('confirm-delete-organization-and-associated-teams-runners')}
+          </button>
+          <button
+            on:click={cancelDelete}
+            type="button"
+            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('cancel-keep-organization')}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+{/if}

src/components/orgs/ConfirmOrgDeletionModal.svelte

@@ -1,104 +0,0 @@
-<script>
-	import { _ } from "svelte-i18n";
-	import { clickOutside } from "../base/outsideclick";
-
-	import { RunnerOrganizationService } from "@odit/lfk-client-js";
-
-	import { createEventDispatcher } from "svelte";
-	export let modal_open;
-	export let delete_org;
-	const dispatch = createEventDispatcher();
-	function cancelDelete() {
-		modal_open = false;
-		dispatch("cancelDelete", { id: delete_org.id });
-	}
-	function deleteOrg() {
-		RunnerOrganizationService.runnerOrganizationControllerRemove(
-			delete_org.id,
-			true
-		)
-			.then((resp) => {
-				toast.success($_("organization-deleted"));
-				location.replace("./");
-			})
-			.catch((err) => {});
-	}
-</script>
-
-{#if modal_open}
-	<div
-		class="fixed z-10 inset-0 overflow-y-hidden"
-		use:clickOutside
-		on:click_outside={cancelDelete}
-	>
-		<div
-			class="flex items-end justify-center h-screen text-center sm:block p-0 lg:p-4"
-		>
-			<div class="fixed inset-0 transition-opacity" aria-hidden="true">
-				<div
-					class="absolute inset-0 bg-gray-500 opacity-75"
-					data-id="modal_backdrop"
-				/>
-			</div>
-			<span
-				class="hidden sm:inline-block sm:align-middle sm:h-screen"
-				aria-hidden="true">&#8203;</span
-			>
-			<div
-				class="inline-block align-bottom text-left shadow-xl transform transition-all sm:align-middle w-full lg:w-auto min-w-auto lg:min-w-[35vw] relative z-10"
-				role="dialog"
-				aria-modal="true"
-				aria-labelledby="modal-headline"
-			>
-				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4 rounded-t-xl">
-					<div class="">
-						<div
-							class="flex-shrink-0 flex items-center justify-center size-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-						>
-							<svg
-								class="size-6 text-blue-600"
-								fill="currentColor"
-								width="24"
-								height="24"
-								xmlns="http://www.w3.org/2000/svg"
-								viewBox="0 0 640 512"
-								><path
-									fill="currentColor"
-									d="M96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112S381.9 32 320 32 208 82.1 208 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"
-								/></svg
-							>
-						</div>
-						<div class="mt-3 sm:text-left max-h-[75vh] overflow-y-auto">
-							<h3 class="text-lg leading-6 font-medium text-gray-900">
-								{$_("do-you-want-to-delete-the-organization-delete_org-name", {
-									values: { orgname: delete_org.name },
-								})}
-							</h3>
-							<div class="mb-6">
-								<p class="text-sm text-gray-500">
-									{$_("all-associated-teams-and-runners-will-be-deleted-too")}
-								</p>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="bg-gray-50 px-4 lg:py-3 sm:px-6 grid gap-2 lg:rounded-b-xl pt-3 pb-10">
-					<button
-						on:click={deleteOrg}
-						type="button"
-						class="confirm_deletion_button"
-					>
-						{$_("confirm-delete-organization-and-associated-teams-runners")}
-					</button>
-					<button
-						on:click={cancelDelete}
-						type="button"
-						class="cancel_modal_button"
-					>
-						{$_("cancel-keep-organization")}
-					</button>
-				</div>
-			</div>
-		</div>
-	</div>
-{/if}

src/components/orgs/OrgDetail.svelte

@@ -1,421 +1,485 @@
-<script>
-	import {
-		GroupContactService,
-		RunnerOrganizationService,
-	} from "@odit/lfk-client-js";
-	import toast from "svelte-french-toast";
-	import { _ } from "svelte-i18n";
-	import { tick } from "svelte";
-	import Select from "svelte-select";
-	import store from "../../store";
-	import PromiseError from "../base/PromiseError.svelte";
-	import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
-	import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
-	import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
-	import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
-	import ConfirmOrgDeletionModal from "./ConfirmOrgDeletionModal.svelte";
-	$: address_valid_or_none =
-		(isAddress1Valid && iszipcodevalid && iscityvalid) ||
-		editable.address_checked === false;
-	$: save_enabled = data_changed && address_valid_or_none;
-	let original = "";
-	let original_object = {};
-	let contacts = [];
-	let valueCopy = null;
-	let areaDom;
-	export let params;
-	$: editable = {};
-	$: contact = {};
-	$: data_loaded = false;
-	$: data_changed = !(JSON.stringify(editable) === original);
-	$: isAddress1Valid = editable.address?.address1?.trim().length !== 0;
-	$: iszipcodevalid = editable.address?.postalcode?.trim().length !== 0;
-	$: iscityvalid = editable.address?.city?.trim().length !== 0;
-	$: sponsoring_contracts_show = true;
-	$: cards_show = true;
-	$: certificates_show = true;
-	$: generate_orgs = [original_object];
-	$: registrationLink = `${config.baseurl_selfservice}/register/${editable.registrationKey}`;
-	const getContactLabel = (option) =>
-		option.firstname + " " + (option.middlename || "") + " " + option.lastname;
-	const promise = RunnerOrganizationService.runnerOrganizationControllerGetOne(
-		params.orgid
-	).then((value) => {
-		data_loaded = true;
-		value.address_checked = value.address.address1 !== null;
-		if (value.address_checked === false) {
-			value.address = {
-				address1: "",
-				address2: "",
-				city: "",
-				postalcode: "",
-				country: "",
-			};
-		}
-		editable = Object.assign(editable, value);
-		editable = editable;
-		original_object = Object.assign(editable, value);
-		original = JSON.stringify(value);
-		GroupContactService.groupContactControllerGetAll().then((val) => {
-			contacts = val.map((r) => {
-				return { label: getContactLabel(r), value: r };
-			});
-			if (editable.contact) {
-				contact = contacts.find((g) => g.value.id == editable.contact.id);
-			} else {
-				contact = null;
-			}
-		});
-	});
-	let modal_open = false;
-	let delete_org = {};
-	function deleteOrganization() {
-		RunnerOrganizationService.runnerOrganizationControllerRemove(
-			original_object.id,
-			false
-		)
-			.then((resp) => {
-				toast.success($_("organization-deleted"));
-				location.replace("./");
-			})
-			.catch((err) => {});
-	}
-	function submit() {
-		if (data_loaded === true && save_enabled) {
-			toast($_("updating-organization"));
-			let postdata = Object.assign({}, editable);
-			if (postdata.address_checked === false) {
-				postdata.address = null;
-			}
-			postdata.contact = postdata.contact?.id;
-			RunnerOrganizationService.runnerOrganizationControllerPut(
-				original_object.id,
-				postdata
-			)
-				.then((resp) => {
-					editable.registrationKey = resp.registrationKey;
-					original_object = Object.assign({}, editable);
-					original = JSON.stringify(original_object);
-					toast.success($_("updated-organization"));
-				})
-				.catch((err) => {});
-		} else {
-		}
-	}
-	async function copy() {
-		if (!editable.registrationKey) {
-			toast.error($_("you-have-to-save-your-changes-to-generate-a-link"));
-			return;
-		}
-		valueCopy = registrationLink;
-		await tick();
-		areaDom.focus();
-		areaDom.select();
-		try {
-			const successful = document.execCommand("copy");
-			if (!successful) {
-				throw new Error();
-			}
-			toast($_("copied-link-to-clipboard"));
-		} catch (err) {
-			toast.error($_("error-whyile-copying-to-clipboard"));
-		}
-		// we can notifi by event or storage about copy status
-		valueCopy = null;
-	}
-	export let import_modal_open = false;
-</script>
-
-{#if valueCopy != null}<textarea bind:this={areaDom}>{valueCopy}</textarea>{/if}
-<ImportRunnerModal
-	on:cancelDelete={(event) => {
-		import_modal_open = false;
-	}}
-	current_runners={[]}
-	passed_team={{}}
-	passed_orgs={[]}
-	passed_org={editable}
-	opened_from="OrgDetail"
-	bind:import_modal_open
-/>
-<ConfirmOrgDeletionModal bind:modal_open bind:delete_org />
-{#if data_loaded}
-	<section class="container p-5">
-		<div class="flex flex-row mb-4">
-			<div class="w-full">
-				<nav class="w-full flex">
-					<ol class="list-none flex flex-row items-center justify-start">
-						<li class="flex items-center">
-							<a class="mr-2" href="./"
-								><svg
-									xmlns="http://www.w3.org/2000/svg"
-									width="24"
-									height="24"
-									viewBox="0 0 24 24"
-									fill="none"
-									stroke="currentColor"
-									stroke-width="2"
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									class="inline-block"
-									><path d="m12 19-7-7 7-7" /><path d="M19 12H5" /></svg
-								>
-								{$_("organizations")}</a
-							>
-						</li>
-					</ol>
-				</nav>
-			</div>
-		</div>
-		<div class="mb-4 text-3xl font-extrabold leading-tight">
-			{original_object.name} [#{params.orgid}]
-			<div data-id="org_actions_${editable.id}">
-				<GenerateSponsoringContracts
-					bind:sponsoring_contracts_show
-					bind:generate_orgs
-				/>
-				<GenerateRunnerCards bind:cards_show bind:generate_orgs />
-				<GenerateRunnerCertificates bind:certificates_show bind:generate_orgs />
-				{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:IMPORT")}
-					<button
-						on:click={() => {
-							import_modal_open = true;
-						}}
-						type="button"
-						class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm"
-					>
-						{$_("import-runners")}
-					</button>
-				{/if}
-				{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:DELETE")}
-					<button
-						on:click={() => {
-							modal_open = true;
-							delete_org = original_object;
-						}}
-						type="button"
-						class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm"
-						>{$_("delete-organization")}</button
-					>
-				{/if}
-				<button
-					on:click={submit}
-					disabled={!save_enabled}
-					class:opacity-50={!save_enabled}
-					type="button"
-					class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-					>{$_("save-changes")}</button
-				>
-			</div>
-		</div>
-		<div class="text-sm w-full mt-2">
-			<label for="name" class="font-semibold text-gray-700">{$_("name")}</label>
-			<input
-				autocomplete="off"
-				placeholder={$_("name")}
-				type="text"
-				bind:value={editable.name}
-				name="name"
-				class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-			/>
-		</div>
-		<div class="text-sm w-full mt-2">
-			<label for="contact" class="font-semibold text-gray-700"
-				>{$_("contact")}</label
-			>
-			<Select
-				containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-				itemFilter={(label, filterText, option) =>
-					label.toLowerCase().includes(filterText.toLowerCase()) ||
-					option.value.id.toString().startsWith(filterText.toLowerCase())}
-				items={contacts}
-				showChevron={true}
-				placeholder={$_("no-contact-selected")}
-				noOptionsMessage={$_("no-contact-found")}
-				bind:selectedValue={contact}
-				on:select={(selectedValue) =>
-					(editable.contact = selectedValue.detail.value)}
-				on:clear={() => (editable.contact = null)}
-			/>
-		</div>
-		<div>
-			<div class="flex items-start mt-2">
-				<div class="flex items-center h-5">
-					<input
-						bind:checked={editable.registrationEnabled}
-						id="toggle_selfservice_feature"
-						name="toggle_selfservice_feature"
-						type="checkbox"
-						class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-					/>
-				</div>
-				<div class="ml-3 text-sm">
-					<label
-						for="toggle_selfservice_feature"
-						class="font-semibold text-gray-700"
-						>{$_("selfservice-registration")}</label
-					>
-				</div>
-			</div>
-			<div>
-				{#if editable.registrationEnabled}
-					<div class="text-sm w-full mt-2">
-						<button on:click={copy} class="inline-flex w-full">
-							<p
-								name="token"
-								class="focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 p-2 break-all font-mono text-left"
-							>
-								{#if editable.registrationKey}
-									{registrationLink}
-								{:else}
-									{$_("you-have-to-save-your-changes-to-generate-a-link")}
-								{/if}
-							</p>
-							<div
-								class="bg-gray-200 border-gray-300 border-t border-b border-r text-black rounded-r-md sm:text-sm p-2 cursor-pointer flex items-center justify-center"
-							>
-								<svg
-									xmlns="http://www.w3.org/2000/svg"
-									viewBox="0 0 24 24"
-									width="24"
-									height="24"
-									><path fill="none" d="M0 0h24v24H0z" />
-									<path
-										fill="currentColor"
-										d="M7 4V2h10v2h3l1 1v16a1 1 0 01-1 1H4a1 1 0 01-1-1V5l1-1h3zm0 2H5v14h14V6h-2v2H7V6zm2-2v2h6V4H9z"
-									/></svg
-								>
-							</div>
-						</button>
-						{#if editable.registrationKey}
-							<p class="text-gray-500 text-xs">
-								{$_("click-to-copy-the-link-into-your-clipboard")}
-							</p>
-						{/if}
-					</div>
-				{/if}
-				<!--  -->
-				<div>
-					<div class="flex items-start mt-2">
-						<div class="flex items-center h-5">
-							<input
-								bind:checked={editable.address_checked}
-								id="toggle_address_checkbox"
-								name="toggle_address_checkbox"
-								type="checkbox"
-								class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-							/>
-						</div>
-						<div class="ml-3 text-sm">
-							<label
-								for="toggle_address_checkbox"
-								class="font-semibold text-gray-700">{$_("address")}</label
-							>
-						</div>
-					</div>
-				</div>
-				{#if editable.address_checked === true}
-					<div class="col-span-6">
-						<label
-							for="address1"
-							class="block text-sm font-medium text-gray-700"
-							>{$_("address")}</label
-						>
-						<input
-							autocomplete="off"
-							placeholder="Address"
-							class:border-red-500={!isAddress1Valid}
-							class:focus:border-red-500={!isAddress1Valid}
-							class:focus:ring-red-500={!isAddress1Valid}
-							bind:value={editable.address.address1}
-							type="text"
-							name="address1"
-							class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-						/>
-						{#if !isAddress1Valid}
-							<span
-								class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-							>
-								{$_("address-is-required")}
-							</span>
-						{/if}
-					</div>
-					<div class="col-span-6">
-						<label
-							for="address2"
-							class="block text-sm font-medium text-gray-700"
-							>{$_("apartment-suite-etc")}</label
-						>
-						<input
-							autocomplete="off"
-							placeholder={$_("apartment-suite-etc")}
-							bind:value={editable.address.address2}
-							type="text"
-							name="address2"
-							class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-						/>
-					</div>
-					<div class="col-span-6">
-						<label for="zipcode" class="block text-sm font-medium text-gray-700"
-							>{$_("zip-postal-code")}</label
-						>
-						<input
-							autocomplete="off"
-							placeholder={$_("zip-postal-code")}
-							class:border-red-500={!iszipcodevalid}
-							class:focus:border-red-500={!iszipcodevalid}
-							class:focus:ring-red-500={!iszipcodevalid}
-							bind:value={editable.address.postalcode}
-							type="text"
-							name="zipcode"
-							class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-						/>
-						{#if !iszipcodevalid}
-							<span
-								class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-							>
-								{$_("valid-zipcode-postal-code-is-required")}
-							</span>
-						{/if}
-					</div>
-					<div class="col-span-6">
-						<label for="city" class="block text-sm font-medium text-gray-700"
-							>{$_("city")}</label
-						>
-						<input
-							autocomplete="off"
-							placeholder={$_("city")}
-							class:border-red-500={!iscityvalid}
-							class:focus:border-red-500={!iscityvalid}
-							class:focus:ring-red-500={!iscityvalid}
-							bind:value={editable.address.city}
-							type="text"
-							name="city"
-							class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-neutral-800 rounded-md p-2"
-						/>
-						{#if !iscityvalid}
-							<span
-								class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1"
-							>
-								{$_("valid-city-is-required")}
-							</span>
-						{/if}
-					</div>
-				{/if}
-				<div class="text-sm w-full mt-2">
-					<span class="font-semibold text-gray-700">{$_("distance")}</span>
-					<br />
-					<span class="text-gray-700"
-						>{(original_object.total_distance / 1000).toFixed(2)} km</span
-					>
-				</div>
-			</div>
-		</div>
-	</section>
-{:else}
-	{#await promise}
-		{$_("organization-detail-is-being-loaded")}
-	{:catch error}
-		<PromiseError />
-	{/await}
-{/if}
+<script>
+  import {
+    GroupContactService,
+    RunnerOrganizationService,
+  } from "@odit/lfk-client-js";
+  import { getLocaleFromNavigator, _ } from "svelte-i18n";
+  import Toastify from "toastify-js";
+  import store from "../../store";
+  import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
+  import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
+  import PromiseError from "../base/PromiseError.svelte";
+  import Select from "svelte-select";
+  $: delete_triggered = false;
+  $: address_valid_or_none =
+    (isAddress1Valid && iszipcodevalid && iscityvalid) ||
+    editable.address_checked === false;
+  $: save_enabled = data_changed && address_valid_or_none;
+  let original = "";
+  let original_object = {};
+  let contacts = [];
+  export let params;
+  $: editable = {};
+  $: contact = {};
+  $: data_loaded = false;
+  $: data_changed = !(JSON.stringify(editable) === original);
+  $: isAddress1Valid = editable.address?.address1?.trim().length !== 0;
+  $: iszipcodevalid = editable.address?.postalcode?.trim().length !== 0;
+  $: iscityvalid = editable.address?.city?.trim().length !== 0;
+  $: sponsoring_contracts_download_open = false;
+  const getContactLabel = (option) =>
+    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
+  const promise = RunnerOrganizationService.runnerOrganizationControllerGetOne(
+    params.orgid
+  ).then((value) => {
+    data_loaded = true;
+    value.address_checked = value.address.address1 !== null;
+    if (value.address_checked === false) {
+      value.address = {
+        address1: "",
+        address2: "",
+        city: "",
+        postalcode: "",
+        country: "",
+      };
+    }
+    editable = Object.assign(editable, value);
+    editable = editable;
+    original_object = Object.assign(editable, value);
+    original = JSON.stringify(value);
+    GroupContactService.groupContactControllerGetAll().then((val) => {
+      contacts = val.map((r) => {
+        return { label: getContactLabel(r), value: r };
+      });
+      if (editable.contact) {
+        contact = contacts.find((g) => g.value.id == editable.contact.id);
+      } else {
+        contact = null;
+      }
+    });
+  });
+  let modal_open = false;
+  let delete_org = {};
+  document.addEventListener("click", function (e) {
+    if (
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
+    ) {
+      sponsoring_contracts_download_open = false;
+    }
+  });
+  function deleteOrganization() {
+    RunnerOrganizationService.runnerOrganizationControllerRemove(
+      original_object.id,
+      false
+    )
+      .then((resp) => {
+        Toastify({
+          text: $_("organization-deleted"),
+          duration: 500,
+          backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+        }).showToast();
+        location.replace("./");
+      })
+      .catch((err) => {
+        modal_open = true;
+        delete_org = original_object;
+      });
+  }
+  function submit() {
+    if (data_loaded === true && save_enabled) {
+      Toastify({
+        text: $_("updating-organization"),
+        duration: 2500,
+      }).showToast();
+      let postdata = Object.assign({}, editable);
+      if (postdata.address_checked === false) {
+        postdata.address = null;
+      }
+      postdata.contact = postdata.contact?.id;
+      RunnerOrganizationService.runnerOrganizationControllerPut(
+        original_object.id,
+        postdata
+      )
+        .then((resp) => {
+          original_object = Object.assign({}, editable);
+          original = JSON.stringify(original_object);
+          Toastify({
+            text: $_("updated-organization"),
+            duration: 2500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
+        })
+        .catch((err) => {});
+    } else {
+    }
+  }
+  export let import_modal_open = false;
+  async function generateSponsoringContract(locale) {
+    sponsoring_contracts_download_open = false;
+    const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
+      original_object.id
+    );
+    const toast = Toastify({
+      text: $_("generating-pdf"),
+      duration: -1,
+    }).showToast();
+    fetch(
+      `https://dev.lauf-fuer-kaya.de/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(runners),
+      }
+    )
+      .then((response) => {
+        if (response.status != "200") {
+          toast.hideToast();
+          Toastify({
+            text: $_("pdf-generation-failed"),
+            duration: 3500,
+            backgroundColor:
+              "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
+          }).showToast();
+        } else {
+          return response.blob();
+        }
+      })
+      .then((blob) => {
+        const url = window.URL.createObjectURL(blob);
+        let a = document.createElement("a");
+        a.href = url;
+        a.download = "Sponsorings_" + original_object.name + ".pdf";
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+        toast.hideToast();
+        Toastify({
+          text: $_("pdf-successfully-generated"),
+          duration: 3500,
+          backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+        }).showToast();
+      })
+      .catch((err) => {});
+  }
+</script>
+
+<ImportRunnerModal
+  on:cancelDelete={(event) => {
+    import_modal_open = false;
+  }}
+  current_runners={[]}
+  passed_team={{}}
+  passed_orgs={[]}
+  passed_org={editable}
+  opened_from="OrgDetail"
+  bind:import_modal_open />
+<ConfirmOrgDeletion bind:modal_open bind:delete_org />
+{#if data_loaded}
+  <section class="container p-5">
+    <div class="mb-8 text-3xl font-extrabold leading-tight">
+      {original_object.name}
+      <span data-id="org_actions_${editable.id}">
+        <div id="sponsoring:dropdown" class="relative inline-block">
+          <div>
+            <button
+              on:click={() => {
+                sponsoring_contracts_download_open = !sponsoring_contracts_download_open;
+              }}
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-600 text-base font-medium text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
+              id="options-menu"
+              aria-haspopup="true"
+              aria-expanded="true">
+              {$_('generate-sponsoring-contracts')}
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                class="-mr-1 ml-2 h-5 w-5"><path
+                  fill="none"
+                  d="M0 0h24v24H0z" />
+                <path
+                  fill="currentColor"
+                  d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z" /></svg>
+            </button>
+          </div>
+          {#if sponsoring_contracts_download_open}
+            <div
+              class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5"
+              id="sponsoring:dropdown:menu">
+              <div
+                class="py-1"
+                role="menu"
+                aria-orientation="vertical"
+                aria-labelledby="options-menu">
+                <span
+                  class="block w-full text-left px-4 py-2 text-sm text-gray-700">{$_('select-language')}</span>
+                <button
+                  on:click={() => {
+                    generateSponsoringContract('de');
+                  }}
+                  type="submit"
+                  class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
+                  role="menuitem">
+                  {$_('german')}
+                </button>
+                <button
+                  on:click={() => {
+                    generateSponsoringContract('en');
+                  }}
+                  type="submit"
+                  class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
+                  role="menuitem">
+                  {$_('english')}
+                </button>
+              </div>
+            </div>
+          {/if}
+        </div>
+        {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')}
+          <button
+            on:click={() => {
+              import_modal_open = true;
+            }}
+            type="button"
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('import-runners')}
+          </button>
+        {/if}
+        {#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')}
+          {#if delete_triggered}
+            <button
+              on:click={deleteOrganization}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('confirm-delete')}</button>
+            <button
+              on:click={() => {
+                delete_triggered = !delete_triggered;
+              }}
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm">{$_('cancel')}</button>
+          {/if}
+          {#if !delete_triggered}
+            <button
+              on:click={() => {
+                delete_triggered = true;
+              }}
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('delete-organization')}</button>
+          {/if}
+        {/if}
+        {#if !delete_triggered}
+          <button
+            on:click={submit}
+            disabled={!save_enabled}
+            class:opacity-50={!save_enabled}
+            type="button"
+            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('save-changes')}</button>
+        {/if}
+      </span>
+    </div>
+    <div class="flex flex-row mb-4">
+      <div class="w-full">
+        <nav class="w-full flex">
+          <ol class="list-none flex flex-row items-center justify-start">
+            <li class="mr-2 flex items-center">
+              <svg
+                stroke="currentColor"
+                fill="none"
+                stroke-width="2"
+                viewBox="0 0 24 24"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="h-3 w-3 stroke-current"
+                height="1em"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"><path
+                  d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
+                <polyline points="9 22 9 12 15 12 15 22" /></svg>
+            </li>
+            <li class="flex items-center">
+              <a class="mr-2" href="/">{$_('home')}</a><svg
+                stroke="currentColor"
+                fill="none"
+                stroke-width="2"
+                viewBox="0 0 24 24"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="h-3 w-3 mr-2 stroke-current"
+                height="1em"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"><line
+                  x1="5"
+                  y1="12"
+                  x2="19"
+                  y2="12" />
+                <polyline points="12 5 19 12 12 19" /></svg>
+            </li>
+            <li class="mr-2 flex items-center">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                width="24"
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
+                <path
+                  d="M21 20h2v2H1v-2h2V3a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v17zm-2 0V4H5v16h14zM8 11h3v2H8v-2zm0-4h3v2H8V7zm0 8h3v2H8v-2zm5 0h3v2h-3v-2zm0-4h3v2h-3v-2zm0-4h3v2h-3V7z" /></svg>
+            </li>
+            <li class="flex items-center">
+              <a class="mr-2" href="./">{$_('organizations')}</a><svg
+                stroke="currentColor"
+                fill="none"
+                stroke-width="2"
+                viewBox="0 0 24 24"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                class="h-3 w-3 mr-2 stroke-current"
+                height="1em"
+                width="1em"
+                xmlns="http://www.w3.org/2000/svg"><line
+                  x1="5"
+                  y1="12"
+                  x2="19"
+                  y2="12" />
+                <polyline points="12 5 19 12 12 19" /></svg>
+            </li>
+            <li class="flex items-center">
+              <span class="mr-2">Org-Details #{params.orgid}</span>
+            </li>
+          </ol>
+        </nav>
+      </div>
+    </div>
+    <div class="text-sm w-full">
+      <label for="name" class="font-medium text-gray-700">{$_('name')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('name')}
+        type="text"
+        bind:value={editable.name}
+        name="name"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+    </div>
+    <div class="text-sm w-full">
+      <label
+        for="contact"
+        class="font-medium text-gray-700">{$_('contact')}</label>
+      <Select
+        containerClasses="rounded-l-md mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"
+        itemFilter={(label, filterText, option) => label
+            .toLowerCase()
+            .includes(
+              filterText.toLowerCase()
+            ) || option.value.id
+            .toString()
+            .startsWith(filterText.toLowerCase())}
+        items={contacts}
+        showChevron={true}
+        placeholder={$_('no-contact-selected')}
+        noOptionsMessage={$_('no-contact-found')}
+        bind:selectedValue={contact}
+        on:select={(selectedValue) => (editable.contact = selectedValue.detail.value)}
+        on:clear={() => (editable.contact = null)} />
+    </div>
+    <!--  -->
+    <div class="flex items-start mt-2">
+      <div class="flex items-center h-5">
+        <input
+          bind:checked={editable.address_checked}
+          id="comments"
+          name="comments"
+          type="checkbox"
+          class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+      </div>
+      <div class="ml-3 text-sm">
+        <label
+          for="comments"
+          class="font-medium text-gray-700">{$_('address')}</label>
+      </div>
+    </div>
+    {#if editable.address_checked === true}
+      <div class="col-span-6">
+        <label
+          for="address1"
+          class="block text-sm font-medium text-gray-700">{$_('address')}</label>
+        <input
+          autocomplete="off"
+          placeholder="Address"
+          class:border-red-500={!isAddress1Valid}
+          class:focus:border-red-500={!isAddress1Valid}
+          class:focus:ring-red-500={!isAddress1Valid}
+          bind:value={editable.address.address1}
+          type="text"
+          name="address1"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !isAddress1Valid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('address-is-required')}
+          </span>
+        {/if}
+      </div>
+      <div class="col-span-6">
+        <label
+          for="address2"
+          class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('apartment-suite-etc')}
+          bind:value={editable.address.address2}
+          type="text"
+          name="address2"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      </div>
+      <div class="col-span-6">
+        <label
+          for="zipcode"
+          class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('zip-postal-code')}
+          class:border-red-500={!iszipcodevalid}
+          class:focus:border-red-500={!iszipcodevalid}
+          class:focus:ring-red-500={!iszipcodevalid}
+          bind:value={editable.address.postalcode}
+          type="text"
+          name="zipcode"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !iszipcodevalid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('valid-zipcode-postal-code-is-required')}
+          </span>
+        {/if}
+      </div>
+      <div class="col-span-6">
+        <label
+          for="city"
+          class="block text-sm font-medium text-gray-700">{$_('city')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('city')}
+          class:border-red-500={!iscityvalid}
+          class:focus:border-red-500={!iscityvalid}
+          class:focus:ring-red-500={!iscityvalid}
+          bind:value={editable.address.city}
+          type="text"
+          name="city"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !iscityvalid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('valid-city-is-required')}
+          </span>
+        {/if}
+      </div>
+    {/if}
+  </section>
+{:else}
+  {#await promise}
+    {$_('organization-detail-is-being-loaded')}
+  {:catch error}
+    <PromiseError />
+  {/await}
+{/if}

src/components/orgs/OrgOverview.svelte

@@ -0,0 +1,318 @@
+<script>
+  import { getLocaleFromNavigator, _ } from "svelte-i18n";
+  let modal_open = false;
+  let delete_org = {};
+  import { RunnerOrganizationService } from "@odit/lfk-client-js";
+  import store from "../../store";
+  import OrgsEmptyState from "./OrgsEmptyState.svelte";
+  import Toastify from "toastify-js";
+  import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
+  $: searchvalue = "";
+  $: active_deletes = [];
+  $: sponsoring_contracts_download_open = false;
+  export let current_organizations = [];
+
+  const promise = RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
+    (val) => {
+      current_organizations = val;
+    }
+  );
+
+  document.addEventListener("click", function (e) {
+    if (
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
+    ) {
+      sponsoring_contracts_download_open = false;
+    }
+  });
+
+  async function generateSponsoringContract(locale) {
+    sponsoring_contracts_download_open = false;
+    const orgs = current_organizations.filter((r) => r.is_selected === true);
+    const toast = Toastify({
+      text: $_("generating-pdfs"),
+      duration: -1,
+    }).showToast();
+    let count = 0;
+    for await (const o of orgs) {
+      const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
+        o.id
+      );
+      fetch(
+        `https://dev.lauf-fuer-kaya.de/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(runners),
+        }
+      )
+        .then((response) => {
+          if (response.status != "200") {
+            toast.hideToast();
+            Toastify({
+              text: $_("pdf-generation-failed"),
+              duration: 3500,
+              backgroundColor:
+                "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
+            }).showToast();
+          } else {
+            return response.blob();
+          }
+        })
+        .then((blob) => {
+          count++;
+          const url = window.URL.createObjectURL(blob);
+          let a = document.createElement("a");
+          a.href = url;
+          a.download = "Sponsorings_" + o.name + ".pdf";
+          document.body.appendChild(a);
+          a.click();
+          a.remove();
+          if (count === orgs.length) {
+            toast.hideToast();
+            Toastify({
+              text: $_("pdfs-successfully-generated"),
+              duration: 3500,
+              backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+            }).showToast();
+          }
+        })
+        .catch((err) => {});
+    }
+  }
+</script>
+
+<ConfirmOrgDeletion
+  on:cancelDelete={(event) => {
+    modal_open = false;
+    active_deletes[event.detail.id] = false;
+  }}
+  bind:modal_open
+  bind:delete_org />
+{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:GET')}
+  {#await promise}
+    <div
+      class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
+      role="alert">
+      <p class="font-bold">{$_('organizations-are-being-loaded')}</p>
+      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
+    </div>
+  {:then}
+    {#if current_organizations.length === 0}
+      <OrgsEmptyState />
+    {:else}
+      <input
+        type="search"
+        bind:value={searchvalue}
+        placeholder={$_('datatable.search')}
+        aria-label={$_('datatable.search')}
+        class="gridjs-input gridjs-search-input mb-4" />
+      <div class="h-12">
+        {#if current_organizations.some((r) => r.is_selected === true)}
+        <div id="sponsoring:dropdown" class="relative inline-block">
+          <div>
+            <button
+              on:click={() => {
+                sponsoring_contracts_download_open = !sponsoring_contracts_download_open;
+              }}
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-600 text-base font-medium text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
+              id="options-menu"
+              aria-haspopup="true"
+              aria-expanded="true">
+              {$_('generate-sponsoring-contracts')}
+              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" class="-mr-1 ml-2 h-5 w-5"><path fill="none" d="M0 0h24v24H0z"/><path fill="currentColor" d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z"/></svg>
+            </button>
+          </div>
+          {#if sponsoring_contracts_download_open}
+            <div
+              class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5"
+              id="sponsoring:dropdown:menu">
+              <div
+                class="py-1"
+                role="menu"
+                aria-orientation="vertical"
+                aria-labelledby="options-menu">
+                <span
+                  class="block w-full text-left px-4 py-2 text-sm text-gray-700">{$_('select-language')}</span>
+                <button
+                  on:click={() => {
+                    generateSponsoringContract('de');
+                  }}
+                  type="submit"
+                  class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
+                  role="menuitem">
+                  {$_('german')}
+                </button>
+                <button
+                  on:click={() => {
+                    generateSponsoringContract('en');
+                  }}
+                  type="submit"
+                  class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
+                  role="menuitem">
+                  {$_('english')}
+                </button>
+              </div>
+            </div>
+          {/if}
+        </div>
+        {/if}
+      </div>
+      <div
+        class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
+        <table class="divide-y divide-gray-200 w-full">
+          <thead class="bg-gray-50">
+            <tr>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                <span
+                  on:click={() => {
+                    const newstate = !current_organizations.some((r) => r.is_selected === true);
+                    current_organizations = current_organizations.map((r) => {
+                      r.is_selected = newstate;
+                      return r;
+                    });
+                  }}
+                  class="underline cursor-pointer select-none">{#if current_organizations.some((r) => r.is_selected === true)}
+                    {$_('deselect-all')}
+                  {:else}{$_('select-all')}{/if}
+                </span>
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('name')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('address')}
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                {$_('contact')}
+              </th>
+              <th scope="col" class="relative px-6 py-3">
+                <span class="sr-only">{$_('action')}</span>
+              </th>
+            </tr>
+          </thead>
+          <tbody class="divide-y divide-gray-200">
+            {#each current_organizations as o}
+              {#if Object.values(o)
+                .toString()
+                .toLowerCase()
+                .includes(searchvalue)}
+                <tr data-rowid="org_{o.id}">
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <input
+                      bind:checked={o.is_selected}
+                      type="checkbox"
+                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="flex items-center">
+                      <div class="ml-4">
+                        <div class="text-sm font-medium text-gray-900">
+                          {o.name}
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="flex items-center">
+                      <div class="ml-4">
+                        <div class="text-sm font-medium text-gray-900">
+                          {#if o.address.address1 !== null}
+                            {o.address.address1}<br />
+                            {o.address.address2 || ''}<br />
+                            {o.address.postalcode}
+                            {o.address.city}
+                            {o.address.country}
+                          {/if}
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    <div class="flex items-center">
+                      <div class="ml-4">
+                        <div class="text-sm font-medium text-gray-900">
+                          {#if o.contact}
+                            <a
+                              href="../contacts/{o.contact.id}"
+                              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{o.contact.firstname}
+                              {o.contact.middlename || ''}
+                              {o.contact.lastname}</a>
+                          {:else}{$_('no-contact-specified')}{/if}
+                        </div>
+                      </div>
+                    </div>
+                  </td>
+                  {#if active_deletes[o.id] === true}
+                    <td
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                      <button
+                        on:click={() => {
+                          active_deletes[o.id] = false;
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
+                      <button
+                        on:click={() => {
+                          RunnerOrganizationService.runnerOrganizationControllerRemove(o.id, false)
+                            .then((resp) => {
+                              current_organizations = current_organizations.filter((obj) => obj.id !== o.id);
+                              Toastify({
+                                text: 'Organization deleted',
+                                duration: 500,
+                                backgroundColor:
+                                  'linear-gradient(to right, #00b09b, #96c93d)',
+                              }).showToast();
+                            })
+                            .catch((err) => {
+                              modal_open = true;
+                              delete_org = o;
+                            });
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
+                    </td>
+                  {:else}
+                    <td
+                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                      <a
+                        href="./{o.id}"
+                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
+                      {#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:DELETE')}
+                        <button
+                          on:click={() => {
+                            active_deletes[o.id] = true;
+                          }}
+                          tabindex="0"
+                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
+                      {/if}
+                    </td>
+                  {/if}
+                </tr>
+              {/if}
+            {/each}
+          </tbody>
+        </table>
+      </div>
+    {/if}
+  {:catch error}
+    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+      <span class="inline-block align-middle mr-8">
+        <b class="capitalize">{$_('general_promise_error')}</b>
+        {error}
+      </span>
+    </div>
+  {/await}
+{/if}

src/components/orgs/Orgs.svelte

@@ -1,253 +1,51 @@
 <script>
-	import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
-	let delete_org = {};
-	import { RunnerOrganizationService } from "@odit/lfk-client-js";
-	import store from "../../store";
-	import OrgsEmptyState from "./OrgsEmptyState.svelte";
-	import ConfirmOrgDeletionModal from "./ConfirmOrgDeletionModal.svelte";
-	import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
-	import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
-	import toast from "svelte-french-toast";
-	$: searchvalue = "";
-	$: active_deletes = [];
-	$: sponsoring_contracts_show = current_organizations.some(
-		(r) => r.is_selected === true
-	);
-	$: cards_show = current_organizations.some((r) => r.is_selected === true);
-	$: generate_orgs = current_organizations.filter(
-		(r) => r.is_selected === true
-	);
-	$: certificates_show = current_organizations.some(
-		(r) => r.is_selected === true
-	);
-	let current_organizations = [];
-
-	const promise =
-		RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
-			(val) => {
-				current_organizations = val;
-			}
-		);
-	import { _ } from "svelte-i18n";
-	import AddOrgModal from "./AddOrgModal.svelte";
-	let delete_modal_open = false;
-	let modal_open = false;
-	import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
-	let import_modal_open = false;
+  import { _ } from "svelte-i18n";
+  import store from "../../store";
+  import AddOrgModal from "./AddOrgModal.svelte";
+  export let modal_open = false;
+  import OrgOverview from "./OrgOverview.svelte";
+  import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
+  let current_organizations = [];
+  export let import_modal_open = false;
 </script>
 
 <section class="container p-5">
-	<h4 class="mb-1 text-3xl font-extrabold leading-tight">
-		{$_("organizations")}
-	</h4>
-	{#if store.state.jwtinfo.userdetails.permissions.includes("ORGANIZATION:CREATE")}
-		<button
-			on:click={() => {
-				modal_open = true;
-			}}
-			type="button"
-			class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-		>
-			{$_("create-organization")}
-		</button>
-	{/if}
-	{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:IMPORT")}
-		<button
-			on:click={() => {
-				import_modal_open = true;
-			}}
-			type="button"
-			class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-		>
-			{$_("import-runners")}
-		</button>
-	{/if}
-	<ConfirmOrgDeletionModal
-		on:cancelDelete={(event) => {
-			delete_modal_open = false;
-			active_deletes[event.detail.id] = false;
-		}}
-		bind:modal_open={delete_modal_open}
-		bind:delete_org
-	/>
-	{#if store.state.jwtinfo.userdetails.permissions.includes("ORGANIZATION:GET")}
-		{#await promise}
-			<div
-				class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-				role="alert"
-			>
-				<p class="font-bold">{$_("organizations-are-being-loaded")}</p>
-				<p class="text-sm">{$_("this-might-take-a-moment")}</p>
-			</div>
-		{:then}
-			{#if current_organizations.length === 0}
-				<OrgsEmptyState />
-			{:else}
-				<input
-					type="search"
-					bind:value={searchvalue}
-					placeholder={$_("datatable.search")}
-					aria-label={$_("datatable.search")}
-					class="w-full sm:w-auto sm:mt-0 p-2 rounded-md border mb-1 lg:mb-0"
-				/>
-				<GenerateSponsoringContracts
-					bind:sponsoring_contracts_show
-					bind:generate_orgs
-				/>
-				<GenerateRunnerCards bind:cards_show bind:generate_orgs />
-				<GenerateRunnerCertificates bind:certificates_show bind:generate_orgs />
-				<div
-					class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll"
-				>
-					<table class="divide-y divide-gray-200 w-full">
-						<thead class="bg-gray-50">
-							<tr class="odd:bg-white even:bg-gray-100">
-								<th
-									scope="col"
-									class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-								>
-									<button
-										on:click={() => {
-											const newstate = !current_organizations.some(
-												(r) => r.is_selected === true
-											);
-											current_organizations = current_organizations.map((r) => {
-												r.is_selected = newstate;
-												return r;
-											});
-										}}
-										class="underline cursor-pointer select-none"
-										>{#if current_organizations.some((r) => r.is_selected === true)}
-											{$_("deselect-all")}
-										{:else}{$_("select-all")}{/if}
-									</button>
-								</th>
-								<th
-									scope="col"
-									class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-								>
-									{$_("name")}
-								</th>
-								<th
-									scope="col"
-									class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-								>
-									{$_("address")}
-								</th>
-								<th
-									scope="col"
-									class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
-								>
-									{$_("contact")}
-								</th>
-								<th scope="col" class="relative px-6 py-3">
-									<span class="sr-only">{$_("action")}</span>
-								</th>
-							</tr>
-						</thead>
-						<tbody class="divide-y divide-gray-200">
-							{#each current_organizations as o}
-								{#if Object.values(o)
-									.toString()
-									.toLowerCase()
-									.includes(searchvalue)}
-									<tr
-										class="odd:bg-white even:bg-gray-100"
-										data-rowid="org_{o.id}"
-									>
-										<td class="px-6 py-4 whitespace-nowrap">
-											<input
-												bind:checked={o.is_selected}
-												type="checkbox"
-												class="focus:ring-indigo-500 size-4 text-indigo-600 border-gray-300 rounded"
-											/>
-										</td>
-										<td class="px-6 py-4 whitespace-nowrap">
-											<div class="flex items-center">
-												<div class="text-sm font-medium text-gray-900">
-													{o.name}
-												</div>
-											</div>
-										</td>
-										<td class="px-6 py-4 whitespace-nowrap">
-											<div class="flex items-center">
-												<div class="text-sm font-medium text-gray-900">
-													{#if o.address.address1 !== null}
-														{o.address.address1}<br />
-														<!-- {o.address.address2 || ''}<br /> -->
-														{o.address.postalcode}
-														{o.address.city}
-														{o.address.country}
-													{/if}
-												</div>
-											</div>
-										</td>
-										<td class="px-6 py-4 whitespace-nowrap">
-											<div class="flex items-center">
-												<div class="text-sm font-medium text-gray-900">
-													{#if o.contact}
-														<a
-															href="../contacts/{o.contact.id}"
-															class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800 border border-current"
-															>{o.contact.firstname}
-															{o.contact.middlename || ""}
-															{o.contact.lastname}</a
-														>
-													{:else}{$_("no-contact-specified")}{/if}
-												</div>
-											</div>
-										</td>
-										<td
-											class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
-										>
-											<a
-												href="./{o.id}"
-												class="text-indigo-600 hover:text-indigo-900"
-												>{$_("details")}</a
-											>
-											{#if store.state.jwtinfo.userdetails.permissions.includes("ORGANIZATION:DELETE")}
-												<button
-													on:click={() => {
-														active_deletes[o.id] = true;
-														delete_modal_open = true;
-														delete_org = o;
-													}}
-													tabindex="0"
-													class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-													>{$_("delete")}</button
-												>
-											{/if}
-										</td>
-									</tr>
-								{/if}
-							{/each}
-						</tbody>
-					</table>
-				</div>
-			{/if}
-		{:catch error}
-			<div
-				class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500"
-			>
-				<span class="inline-block align-middle mr-8">
-					<b>{$_("general_promise_error")}</b>
-					{error}
-				</span>
-			</div>
-		{/await}
-	{/if}
+  <span class="mb-1 text-3xl font-extrabold leading-tight">
+    {$_('organizations')}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:CREATE')}
+      <button
+        on:click={() => {
+          modal_open = true;
+        }}
+        type="button"
+        class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+        {$_('create-organization')}
+      </button>
+    {/if}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')}
+      <button
+        on:click={() => {
+          import_modal_open = true;
+        }}
+        type="button"
+        class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
+        {$_('import-runners')}
+      </button>
+    {/if}
+  </span>
+  <OrgOverview bind:current_organizations />
 </section>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes("ORGANIZATION:CREATE")}
-	<AddOrgModal bind:current_organizations bind:modal_open />
-	<ImportRunnerModal
-		on:cancelDelete={(event) => {
-			import_modal_open = false;
-		}}
-		passed_team={{}}
-		passed_org={{}}
-		passed_orgs={current_organizations}
-		opened_from="OrgOverview"
-		bind:import_modal_open
-	/>
+{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:CREATE')}
+  <AddOrgModal bind:current_organizations bind:modal_open />
+  <ImportRunnerModal
+    on:cancelDelete={(event) => {
+      import_modal_open = false;
+    }}
+    passed_team={{}}
+    passed_org={{}}
+    passed_orgs={current_organizations}
+    opened_from="OrgOverview"
+    current_runners={[]}
+    bind:import_modal_open />
 {/if}

src/components/orgs/OrgsEmptyState.svelte

@@ -9,9 +9,9 @@
 <div class="text-center items-center justify-center">
   <p class="mb-16 text-lg text-gray-500">
     <img class="w-full h-44" src={org_empty} alt="" />
-    <span class="font-bold">{$_("there-are-no-organizations-added-yet")}</span
-    ><br />
-    <span>{$_("add-your-first-organization")}</span>
+    <span
+      class="font-bold">{$_('there-are-no-organizations-added-yet')}</span><br />
+    <span>{$_('add-your-first-organization')}</span>
   </p>
 </div>
 

src/components/pdf_generation/DocumentServer.ts

@@ -1,152 +0,0 @@
-
-class DocumentServer {
-  baseUrl: string;
-  apiKey: string;
-
-  constructor(baseUrl: string, apiKey: string) {
-    this.baseUrl = baseUrl;
-    this.apiKey = apiKey;
-  }
-
-  async generateCards(cards: any[], locale: string) {
-    const generateCards = new Array<any>();
-
-    for (let i = 0; i < cards.length; i++) {
-      const card = {
-        id: parseInt(cards[i].id),
-        enabled: cards[i].enabled,
-        code: cards[i].code,
-        runner: {
-          id: parseInt(cards[i]?.runner?.id),
-          first_name: cards[i]?.runner?.firstname,
-          middle_name: cards[i]?.runner?.middlename,
-          last_name: cards[i]?.runner?.lastname,
-          group: {
-            id: parseInt(cards[i]?.runner?.group?.id),
-            name: cards[i]?.runner?.group.name,
-            parent_group: {
-              id: parseInt(cards[i]?.runner?.group?.parentGroup?.id),
-              name: cards[i]?.runner?.group?.parentGroup?.name,
-            },
-          },
-        },
-      };
-      generateCards.push(card);
-    }
-
-    const response = await fetch(
-      `${this.baseUrl}/v1/pdfs/cards?key=${this.apiKey}`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          locale,
-          cards: generateCards,
-        }),
-      },
-    );
-
-    const blob = await response.blob();
-    return blob;
-  }
-
-  async generateContracts(runners: any[], locale: string) {
-    const generateRunners = new Array<any>();
-
-    for (let i = 0; i < runners.length; i++) {
-      console.log(runners[i]);
-      const card = {
-        id: parseInt(runners[i].id),
-        first_name: runners[i].firstname,
-        middle_name: runners[i].middlename,
-        last_name: runners[i].lastname,
-        group: {
-          id: parseInt(runners[i].group.id),
-          name: runners[i].group.name,
-          parent_group: {
-            id: parseInt(runners[i]?.group?.parentGroup?.id),
-            name: runners[i]?.group?.parentGroup?.name,
-          },
-        },
-      };
-      generateRunners.push(card);
-    }
-
-    const response = await fetch(
-      `${this.baseUrl}/v1/pdfs/contracts?key=${this.apiKey}`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          locale,
-          runners: generateRunners,
-        }),
-      },
-    );
-
-    const blob = await response.blob();
-    return blob;
-  }
-
-  async generateCertificates(runners: any[], locale: string) {
-    const generateRunners = new Array<any>();
-
-    for (let i = 0; i < runners.length; i++) {
-      const certificate = {
-        id: parseInt(runners[i].id),
-        first_name: runners[i].firstname,
-        middle_name: runners[i].middlename,
-        last_name: runners[i].lastname,
-        self_service_link: runners[i].selfserviceLink,
-        group: {
-          id: parseInt(runners[i].group.id),
-          name: runners[i].group.name,
-          parent_group: {
-            id: parseInt(runners[i]?.group?.parentGroup?.id),
-            name: runners[i]?.group?.parentGroup?.name,
-          },
-        },
-        distance: parseInt(runners[i].distance),
-        distance_donations: runners[i].distanceDonations.map(
-          (distanceDonation: any) => {
-            return {
-              id: distanceDonation.id,
-              amount: parseInt(distanceDonation.amount),
-              amount_per_distance: parseInt(distanceDonation.amountPerDistance),
-              donor: {
-                id: parseInt(distanceDonation.donor.id),
-                first_name: distanceDonation.donor.firstname,
-                middle_name: distanceDonation.donor.middlename,
-                last_name: distanceDonation.donor.lastname,
-              },
-            };
-          },
-        ),
-      };
-      generateRunners.push(certificate);
-    }
-
-    const response = await fetch(
-      `${this.baseUrl}/v1/pdfs/certificates?key=${this.apiKey}`,
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          locale,
-          runners: generateRunners,
-        }),
-      },
-    );
-
-    const blob = await response.blob();
-    return blob;
-  }
-}
-
-export default DocumentServer;