new license file version [CI SKIP]

Reviewed-on: #118
close #108

.devcontainer/Dockerfile

@@ -0,0 +1,6 @@
+FROM mcr.microsoft.com/vscode/devcontainers/base:alpine-3.12
+RUN apk update
+RUN apk add --upgrade nodejs-current npm
+RUN npm i -g yarn rimraf
+RUN rimraf node_modules
+RUN yarn set version berry

.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+{
+	"name": "Node.js",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/sh"
+	},
+	"extensions": [
+		"dbaeumer.vscode-eslint",
+		"2gua.rainbow-brackets",
+		"christian-kohler.npm-intellisense",
+		"remimarsal.prettier-now",
+		"svelte.svelte-vscode",
+		"lokalise.i18n-ally",
+		"fivethree.vscode-svelte-snippets",
+		"voorjaar.windicss-intellisense"
+	],
+	"postCreateCommand": "yarn && yarn dev --open"
+}

.dockerignore

@@ -1,3 +1 @@
-public/env.sample.js
+public/env.sample.js
-public/workbox-*.js
-public/workbox-*.js.map

.gitignore

@@ -1,11 +1,10 @@
 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
+.yarn
+.pnp.js
+.yarnrc.yml

.vscode/extensions.json

@@ -5,7 +5,8 @@
         "remimarsal.prettier-now",
         "svelte.svelte-vscode",
         "lokalise.i18n-ally",
-        "fivethree.vscode-svelte-snippets"
+        "fivethree.vscode-svelte-snippets",
+        "voorjaar.windicss-intellisense"
     ],
     "unwantedRecommendations": [
         "antfu.i18n-ally"

.vscode/settings.json

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

CHANGELOG.md

@@ -2,8 +2,47 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.11.0](https://git.odit.services/lfk/frontend/compare/0.10.0...0.11.0)
+
+- Merge pull request 'Generate and print bulk blank cards feature/116-download_blanc_cards' (#117) from feature/116-download_blanc_cards into dev [`25d8b86`](https://git.odit.services/lfk/frontend/commit/25d8b86efd89c442d1bf308a8743134820acfd1f)
+- Added button (including translations [`0614c76`](https://git.odit.services/lfk/frontend/commit/0614c76e924b18b512bab59933a26fec07cf483d)
+- Added button (including translations [`97e338f`](https://git.odit.services/lfk/frontend/commit/97e338f9d4f388596d550990457254c7fa1a3492)
+- Sorted translations [`89bb9c2`](https://git.odit.services/lfk/frontend/commit/89bb9c215e356e0940678f5cabd9e38bc203040e)
+- Added function for generating cards with pdf [`c8d6390`](https://git.odit.services/lfk/frontend/commit/c8d639024a5f2f72d6e30d2ce990b08bd71a5471)
+- Fixed button styling [`08cb079`](https://git.odit.services/lfk/frontend/commit/08cb079e9798392e26515d559af2637e74deea97)
+- Now returning cards on creation with pdf [`1d999d4`](https://git.odit.services/lfk/frontend/commit/1d999d4910acb5efa21b3f9922cdb359babff404)
+- Added comment [`636f018`](https://git.odit.services/lfk/frontend/commit/636f018daa33b99468a257bfc33477e1e644d081)
+- Bumped lfk client js version [`2d18686`](https://git.odit.services/lfk/frontend/commit/2d18686ce782a434ca7bd34c07c36a35b9497273)
+- Bumped lfk-client-js [`7dfaa75`](https://git.odit.services/lfk/frontend/commit/7dfaa7579a22b13194fcdd1c02b4437958261472)
+
+#### [0.10.0](https://git.odit.services/lfk/frontend/compare/0.9.1...0.10.0)
+
+> 26 March 2021
+
+- Added translations [`79c447b`](https://git.odit.services/lfk/frontend/commit/79c447b4c65e55ebb5af71fb0b09174c36e2cecf)
+- Sorted translations 🌍 [`5bd3a46`](https://git.odit.services/lfk/frontend/commit/5bd3a463f00abaf2c98ab554f88e5542d01f364a)
+- Reset can now only be triggered if pw is strong enoug [`75d8f73`](https://git.odit.services/lfk/frontend/commit/75d8f7331b6ae78f3979bb62148188a16f83cb8d)
+- Module now exports functions that check if a password is strong enough and equal to a potential confirmation field [`b2509e9`](https://git.odit.services/lfk/frontend/commit/b2509e9e53ab6b51dfd55e26712e8928160cd64b)
+- 🚀RELEASE v0.10.0 [`f7fc196`](https://git.odit.services/lfk/frontend/commit/f7fc1967a50f302af1d8b668628be2f4ab2975a3)
+- Added more cirteria to the password strength component [`5fa9939`](https://git.odit.services/lfk/frontend/commit/5fa9939696a35d60d762feb0cebef61d31869218)
+- Now using pw strength component [`6aaf838`](https://git.odit.services/lfk/frontend/commit/6aaf8384512185a3a319ce6b3e2505e910468e64)
+- Added a password strength verification [`ad3bd31`](https://git.odit.services/lfk/frontend/commit/ad3bd312e9a5785f81029ea2b7e302ea1addd988)
+- Implemented a custom password strength component [`4956bb0`](https://git.odit.services/lfk/frontend/commit/4956bb0e9c3c1d22d60e849aea5664e35330f897)
+- User creation can now only be triggered if pw is strong enoug [`540304f`](https://git.odit.services/lfk/frontend/commit/540304f947f60a7072c592ca8088996ce7e95cb4)
+- Now using pw strength component for user creation [`7862f44`](https://git.odit.services/lfk/frontend/commit/7862f446532903f1a2eac7b21d5c80c3245785e5)
+- Added missing exports [`962dd0c`](https://git.odit.services/lfk/frontend/commit/962dd0c1bbc0df7f20bcec5b4247188c8935c87e)
+- new license file version [CI SKIP] [`aedb8a7`](https://git.odit.services/lfk/frontend/commit/aedb8a765ba053545adbba9eb014b3bb0e5aac8c)
+- Bumped lfk-client version 🔝 [`cf58bd1`](https://git.odit.services/lfk/frontend/commit/cf58bd15c3541c417ab2be83d96135e931a2b6f6)
+- new license file version [CI SKIP] [`34f4f68`](https://git.odit.services/lfk/frontend/commit/34f4f68524918fd3d1963966a1e259d5b60efaca)
+- Merge pull request 'Implemented password strength test feature/106-password_strength' (#115) from feature/106-password_strength into dev [`09b8144`](https://git.odit.services/lfk/frontend/commit/09b81440804cf98303fcb723a9717d6d0f432da8)
+- Formatting🛠 [`4167819`](https://git.odit.services/lfk/frontend/commit/4167819e7a864d3b1dd95ba48ab1525a454f7f30)
+- Now using pw strength component for reset [`5d5f7c7`](https://git.odit.services/lfk/frontend/commit/5d5f7c7f5c6a69146f41996f4facfeff95791be0)
+
 #### [0.9.1](https://git.odit.services/lfk/frontend/compare/0.9.0...0.9.1)
 
+> 26 March 2021
+
+- 🚀RELEASE v0.9.1 [`2ca63fd`](https://git.odit.services/lfk/frontend/commit/2ca63fd1f675f0da2b18ba43095074dd4823991d)
 - Merge pull request 'Org selfservice Link feature/112-org_registration_links' (#114) from feature/112-org_registration_links into dev [`a5d25e7`](https://git.odit.services/lfk/frontend/commit/a5d25e7d92c7c37e90dbb4ba74b787873f920c6b)
 - Added checkbox to enable registration [`f9fe793`](https://git.odit.services/lfk/frontend/commit/f9fe79357317653b46c09eb95b0db13845cddcf9)
 - Sorted translations [`c074c12`](https://git.odit.services/lfk/frontend/commit/c074c12be75f285612f7a732c106404d9fb4538a)

Dockerfile

@@ -1,18 +1,14 @@
 FROM node:15.5.1-alpine3.12
 WORKDIR /app
-RUN npm i -g pnpm
 COPY package.json ./
-RUN pnpm i
+RUN yarn
-COPY package.json *.config.js workbox-config.js template-copy.js index.template.html s-config.template.js ./
+COPY package.json *.config.js index.html ./
 COPY src ./src
 COPY public ./public
-RUN pnpm run build
+RUN yarn build
 # final image
 FROM alpine
-COPY --from=0 /app/build /app
+COPY --from=0 /app/dist /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

@@ -0,0 +1,22 @@
+# @odit/lfk-frontend
+
+## ✒️ Overview
+This is an API client for [https://git.odit.services/lfk/backend](@lfk/backend)
+- WebApp built with [Svelte](https://svelte.dev), [WindiCSS](https://windicss.org/) (to compile [TailwindCSS](https://tailwindcss.com/)) and [Vite](https://vitejs.dev).
+
+This application is intended for use by admin users/ members only.
+
+## 🚀 Getting Started
+```
+yarn
+```
+## Development
+```
+yarn dev
+/
+yarn dev --open
+```
+## Build
+```
+yarn build
+```

index.html

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

nginx.conf

@@ -6,6 +6,15 @@ http {
     server {
         error_page 404 /index.html;
         root /usr/share/nginx/html;
+        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;
         }

package.json

@@ -1,45 +1,40 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.9.1",
+	"version": "0.8.4",
 	"scripts": {
 		"i18n-order": "node order.js",
-		"dev:all": "yarn prebuild && snowpack dev",
+		"dev": "vite",
-		"dev": "cross-env NODE_ENV_ODIT=development_fast node template-copy.js && yarn build:sw && snowpack dev",
+		"build": "vite build",
-		"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.7.0",
-		"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",
+		"check-password-strength": "2.0.2",
-		"@snowpack/plugin-svelte": "3.5.2",
+		"@odit/lfk-client-js": "0.10.1",
-		"auto-changelog": "^2.2.1",
+		"@odit/license-exporter": "0.0.11",
+		"@sveltejs/vite-plugin-svelte": "1.0.0-next.5",
+		"@types/html-minifier": "4.0.0",
+		"auto-changelog": "2.2.1",
 		"autoprefixer": "10.2.5",
-		"cross-env": "^7.0.3",
+		"csvtojson": "2.0.10",
-		"postcss": "8.2.8",
+		"gridjs": "3.4.0",
-		"postcss-load-config": "3.0.1",
+		"html-minifier": "4.0.0",
-		"release-it": "^14.4.1",
+		"localforage": "1.9.0",
-		"snowpack": "3.0.13",
+		"marked": "2.0.1",
-		"svelte": "3.35.0",
+		"release-it": "14.5.1",
-		"svelte-preprocess": "4.6.9",
+		"svelte": "3.37.0",
-		"workbox-cli": "6.1.2"
+		"svelte-focus-trap": "1.2.0",
+		"svelte-i18n": "3.3.9",
+		"svelte-preprocess": "4.7.0",
+		"svelte-select": "3.17.0",
+		"tailwindcss": "2.0.4",
+		"tinro": "0.6.1",
+		"toastify-js": "1.10.0",
+		"validator": "13.5.2",
+		"vite": "2.1.5",
+		"vite-plugin-windicss": "0.12.2",
+		"xlsx": "0.16.9"
 	},
 	"release-it": {
 		"git": {
@@ -55,7 +50,7 @@
 			"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"
+			"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"
 		}
 	}
 }

s-config.template.js

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

snowpack.config.js

@@ -1,26 +0,0 @@
-/** @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,224 +1,221 @@
-<script>
+<script>
-  import "./TailwindStyles.svelte";
+  import "toastify-js/src/toastify.css";
-  import "toastify-js/src/toastify.css";
+  import "gridjs/dist/theme/mermaid.css";
-  import "gridjs/dist/theme/mermaid.css";
+  import { Route, router } from "tinro";
-  import { Route, router } from "tinro";
+  router.subscribe((routeInfo) => {
-  router.subscribe((routeInfo) => {
+    window.scrollTo(0, 0);
-    window.scrollTo(0, 0);
+  });
-  });
+  if (config.prefersHashRouting) {
-  if (config.prefersHashRouting) {
+    if (config.prefersHashRouting === true) {
-    if (config.prefersHashRouting === true) {
+      router.useHashNavigation();
-      router.useHashNavigation();
+    }
-    }
+  }
-  }
+  import localForage from "localforage";
-  import localForage from "localforage";
+  import { addMessages, init, getLocaleFromNavigator } from "svelte-i18n";
-  import { addMessages, init, getLocaleFromNavigator } from "svelte-i18n";
+  import en from "./locales/en.json";
-  import en from "./locales/en.json";
+  import de from "./locales/de.json";
-  import de from "./locales/de.json";
+  addMessages("en", en);
-  addMessages("en", en);
+  addMessages("de", de);
-  addMessages("de", de);
+  init({
-  init({
+    fallbackLocale: "en",
-    fallbackLocale: "en",
+    initialLocale: getLocaleFromNavigator(),
-    initialLocale: getLocaleFromNavigator(),
+  });
-  });
+  localForage.config({
-  localForage.config({
+    name: "lfk_admin",
-    name: "lfk_admin",
+    version: 1.0,
-    version: 1.0,
+    storeName: "lfk_admin",
-    storeName: "lfk_admin",
+    description: "LfK! admin dashbaord",
-    description: "LfK! admin dashbaord",
+  });
-  });
+  window.onunhandledrejection = (event) => {
-  window.onunhandledrejection = (event) => {
+    if (event.reason.toString() == "Error: Unauthorized") {
-    if (event.reason.toString() == "Error: Unauthorized") {
+      console.log("Found 1");
-      console.log("Found 1");
+      localForage.clear();
-      localForage.clear();
+      location.replace("/");
-      location.replace("/");
+    }
-    }
+  };
-  };
+  //
-  //
+  import Login from "./components/auth/Login.svelte";
-  import Login from "./components/auth/Login.svelte";
+  import Dashboard from "./components/dashboard/Dashboard.svelte";
-  import Dashboard from "./components/dashboard/Dashboard.svelte";
+  import store from "./store.js";
-  import store from "./store.js";
+  import ForgotPassword from "./components/auth/ForgotPassword.svelte";
-  import ForgotPassword from "./components/auth/ForgotPassword.svelte";
+  import MainDashContent from "./components/dashboard/MainDashContent.svelte";
-  import MainDashContent from "./components/dashboard/MainDashContent.svelte";
+  import Users from "./components/users/Users.svelte";
-  import Users from "./components/users/Users.svelte";
+  import About from "./components/general/About.svelte";
-  import About from "./components/general/About.svelte";
+  import Settings from "./components/settings/Settings.svelte";
-  import Settings from "./components/settings/Settings.svelte";
+  import Transition from "./components/base/Transition.svelte";
-  import Transition from "./components/base/Transition.svelte";
+  import Orgs from "./components/orgs/Orgs.svelte";
-  import Orgs from "./components/orgs/Orgs.svelte";
+  import Runners from "./components/runners/Runners.svelte";
-  import Runners from "./components/runners/Runners.svelte";
+  import Footer from "./components/general/Footer.svelte";
-  import Footer from "./components/general/Footer.svelte";
+  import TracksOverview from "./components/tracks/TracksOverview.svelte";
-  import TracksOverview from "./components/tracks/TracksOverview.svelte";
+  import OrgDetail from "./components/orgs/OrgDetail.svelte";
-  import OrgDetail from "./components/orgs/OrgDetail.svelte";
+  import Teams from "./components/teams/Teams.svelte";
-  import Teams from "./components/teams/Teams.svelte";
+  import { OpenAPI } from "@odit/lfk-client-js";
-  import { OpenAPI } from "@odit/lfk-client-js";
+  import UserDetail from "./components/users/UserDetail.svelte";
-  import UserDetail from "./components/users/UserDetail.svelte";
+  OpenAPI.BASE = config.baseurl;
-  OpenAPI.BASE = config.baseurl;
+  import TeamDetail from "./components/teams/TeamDetail.svelte";
-  import { register as registerSW } from "./swmodule";
+  import UserPermissions from "./components/users/UserPermissions.svelte";
-  import TeamDetail from "./components/teams/TeamDetail.svelte";
+  import GroupPermissions from "./components/groups/GroupPermissions.svelte";
-  import UserPermissions from "./components/users/UserPermissions.svelte";
+  import RunnerDetail from "./components/runners/RunnerDetail.svelte";
-  import GroupPermissions from "./components/groups/GroupPermissions.svelte";
+  import Imprint from "./components/general/Imprint.svelte";
-  import RunnerDetail from "./components/runners/RunnerDetail.svelte";
+  import Privacy from "./components/general/Privacy.svelte";
-  import Imprint from "./components/general/Imprint.svelte";
+  import ResetPassword from "./components/auth/ResetPassword.svelte";
-  import Privacy from "./components/general/Privacy.svelte";
+  import Contacts from "./components/contacts/Contacts.svelte";
-  import ResetPassword from "./components/auth/ResetPassword.svelte";
+  import ContactDetail from "./components/contacts/ContactDetail.svelte";
-  import Contacts from "./components/contacts/Contacts.svelte";
+  import Donors from "./components/donors/Donors.svelte";
-  import ContactDetail from "./components/contacts/ContactDetail.svelte";
+  import Groups from "./components/groups/Groups.svelte";
-  import Donors from "./components/donors/Donors.svelte";
+  import DonorDetail from "./components/donors/DonorDetail.svelte";
-  import Groups from "./components/groups/Groups.svelte";
+  import Donations from "./components/donations/Donations.svelte";
-  import DonorDetail from "./components/donors/DonorDetail.svelte";
+  import DonationDetail from "./components/donations/DonationDetail.svelte";
-  import Donations from "./components/donations/Donations.svelte";
+  import GroupDetail from "./components/groups/GroupDetail.svelte";
-  import DonationDetail from "./components/donations/DonationDetail.svelte";
+  import ScanStations from "./components/scanstations/ScanStations.svelte";
-  import GroupDetail from "./components/groups/GroupDetail.svelte";
+  import ScanStationDetail from "./components/scanstations/ScanStationDetail.svelte";
-  import ScanStations from "./components/scanstations/ScanStations.svelte";
+  import Scans from "./components/scans/Scans.svelte";
-  import ScanStationDetail from "./components/scanstations/ScanStationDetail.svelte";
+  import ScanDetail from "./components/scans/ScanDetail.svelte";
-  import Scans from "./components/scans/Scans.svelte";
+  import Cards from "./components/cards/Cards.svelte";
-  import ScanDetail from "./components/scans/ScanDetail.svelte";
+  store.init();
-  import Cards from "./components/cards/Cards.svelte";
+</script>
-  store.init();
+
-  registerSW();
+<Route>
-</script>
+  {#if $router.path === '/forgot_password'}
-
+    <Route path="/forgot_password">
-<Route>
+      <ForgotPassword />
-  {#if $router.path === '/forgot_password'}
+    </Route>
-    <Route path="/forgot_password">
+  {:else if $router.path.includes('/reset')}
-      <ForgotPassword />
+    <Route path="/reset/:resetkey" let:params>
-    </Route>
+      <ResetPassword {params} />
-  {:else if $router.path.includes('/reset')}
+    </Route>
-    <Route path="/reset/:resetkey" let:params>
+  {:else if $router.path === '/about'}
-      <ResetPassword {params} />
+    <Route path="/about">
-    </Route>
+      <About />
-  {:else if $router.path === '/about'}
+    </Route>
-    <Route path="/about">
+  {:else if $router.path === '/imprint'}
-      <About />
+    <Route path="/imprint">
-    </Route>
+      <Imprint />
-  {:else if $router.path === '/imprint'}
+    </Route>
-    <Route path="/imprint">
+  {:else if $router.path === '/privacy'}
-      <Imprint />
+    <Route path="/privacy">
-    </Route>
+      <Privacy />
-  {:else if $router.path === '/privacy'}
+    </Route>
-    <Route path="/privacy">
+  {:else if $store.isLoggedIn}
-      <Privacy />
+    <Dashboard>
-    </Route>
+      <Transition>
-  {:else if $store.isLoggedIn}
+        <Route path="/">
-    <Dashboard>
+          <MainDashContent />
-      <Transition>
+        </Route>
-        <Route path="/">
+        <Route path="/users/*">
-          <MainDashContent />
+          <Route path="/">
-        </Route>
+            <Users />
-        <Route path="/users/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:userid/*" let:params>
-            <Users />
+            <Route path="/">
-          </Route>
+              <UserDetail {params} />
-          <Route path="/:userid/*" let:params>
+            </Route>
-            <Route path="/">
+            <Route path="/permissions/">
-              <UserDetail {params} />
+              <UserPermissions {params} />
-            </Route>
+            </Route>
-            <Route path="/permissions/">
+          </Route>
-              <UserPermissions {params} />
+        </Route>
-            </Route>
+        <Route path="/groups/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <Groups />
-        <Route path="/groups/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:groupid/*" let:params>
-            <Groups />
+            <Route path="/">
-          </Route>
+              <GroupDetail {params} />
-          <Route path="/:groupid/*" let:params>
+            </Route>
-            <Route path="/">
+            <Route path="/permissions/">
-              <GroupDetail {params} />
+              <GroupPermissions {params} />
-            </Route>
+            </Route>
-            <Route path="/permissions/">
+          </Route>
-              <GroupPermissions {params} />
+        </Route>
-            </Route>
+        <Route path="/tracks/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <TracksOverview />
-        <Route path="/tracks/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:trackid" let:params />
-            <TracksOverview />
+        </Route>
-          </Route>
+        <Route path="/runners/*">
-          <Route path="/:trackid" let:params />
+          <Route path="/">
-        </Route>
+            <Runners />
-        <Route path="/runners/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:runnerid" let:params>
-            <Runners />
+            <RunnerDetail {params} />
-          </Route>
+          </Route>
-          <Route path="/:runnerid" let:params>
+        </Route>
-            <RunnerDetail {params} />
+        <Route path="/teams/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <Teams />
-        <Route path="/teams/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:teamid" let:params>
-            <Teams />
+            <TeamDetail {params} />
-          </Route>
+          </Route>
-          <Route path="/:teamid" let:params>
+        </Route>
-            <TeamDetail {params} />
+        <Route path="/contacts/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <Contacts />
-        <Route path="/contacts/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:contact" let:params>
-            <Contacts />
+            <ContactDetail {params} />
-          </Route>
+          </Route>
-          <Route path="/:contact" let:params>
+        </Route>
-            <ContactDetail {params} />
+        <Route path="/orgs/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <Orgs />
-        <Route path="/orgs/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:orgid" let:params>
-            <Orgs />
+            <OrgDetail {params} />
-          </Route>
+          </Route>
-          <Route path="/:orgid" let:params>
+        </Route>
-            <OrgDetail {params} />
+        <Route path="/donors/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <Donors />
-        <Route path="/donors/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:donorid" let:params>
-            <Donors />
+            <DonorDetail {params} />
-          </Route>
+          </Route>
-          <Route path="/:donorid" let:params>
+        </Route>
-            <DonorDetail {params} />
+        <Route path="/donations/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <Donations />
-        <Route path="/donations/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:donationid" let:params>
-            <Donations />
+            <DonationDetail {params} />
-          </Route>
+          </Route>
-          <Route path="/:donationid" let:params>
+        </Route>
-            <DonationDetail {params} />
+        <Route path="/cards/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <Cards />
-        <Route path="/cards/*">
+          </Route>
-          <Route path="/">
+          <!-- <Route path="/:scanid" let:params>
-            <Cards />
+            <ScanDetail {params} />
-          </Route>
+          </Route> -->
-          <!-- <Route path="/:scanid" let:params>
+        </Route>
-            <ScanDetail {params} />
+        <Route path="/scans/*">
-          </Route> -->
+          <Route path="/">
-        </Route>
+            <Scans />
-        <Route path="/scans/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:scanid" let:params>
-            <Scans />
+            <ScanDetail {params} />
-          </Route>
+          </Route>
-          <Route path="/:scanid" let:params>
+        </Route>
-            <ScanDetail {params} />
+        <Route path="/scanstations/*">
-          </Route>
+          <Route path="/">
-        </Route>
+            <ScanStations />
-        <Route path="/scanstations/*">
+          </Route>
-          <Route path="/">
+          <Route path="/:stationid" let:params>
-            <ScanStations />
+            <ScanStationDetail {params} />
-          </Route>
+          </Route>
-          <Route path="/:stationid" let:params>
+        </Route>
-            <ScanStationDetail {params} />
+        <Route path="/about">
-          </Route>
+          <About />
-        </Route>
+        </Route>
-        <Route path="/about">
+        <Route path="/settings">
-          <About />
+          <Settings />
-        </Route>
+        </Route>
-        <Route path="/settings">
+      </Transition>
-          <Settings />
+      <Footer />
-        </Route>
+    </Dashboard>
-      </Transition>
+  {:else}
-      <Footer />
+    <Login />
-    </Dashboard>
+  {/if}
-  {:else}
+</Route>
-    <Login />
-  {/if}
-</Route>

src/TailwindStyles.svelte

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

src/components/auth/PasswordStrength.svelte

@@ -0,0 +1,52 @@
+<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,38 +1,43 @@
 <script>
-  import {  AuthService } from "@odit/lfk-client-js";
+  import { AuthService } from "@odit/lfk-client-js";
   import { _ } from "svelte-i18n";
   import Toastify from "toastify-js";
   import "toastify-js/src/toastify.css";
+  import PasswordStrength, {
+    password_strong_enough,
+  } from "../auth/PasswordStrength.svelte";
   let state = "reset_in_progress";
   let password = "";
   export let params;
   function set_new_password() {
-      if(password.trim() !== ""){
+    if (password.trim() !== "") {
-        Toastify({
+      Toastify({
-          text: $_('password-reset-in-progress'),
+        text: $_("password-reset-in-progress"),
-          duration: 3500,
+        duration: 3500,
-        }).showToast();
+      }).showToast();
-        AuthService.authControllerResetPassword(atob(params.resetkey),{ password })
+      AuthService.authControllerResetPassword(atob(params.resetkey), {
+        password,
+      })
         .then((resp) => {
           Toastify({
-            text: $_('password-reset-successful'),
+            text: $_("password-reset-successful"),
             duration: 3500,
           }).showToast();
-          state="reset_success";
+          state = "reset_success";
         })
         .catch((err) => {
-          state="reset_error";
+          state = "reset_error";
         });
-      } else {
+    } else {
       Toastify({
-        text: $_('please-provide-a-password'),
+        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="" />
@@ -56,31 +61,31 @@
       </div>
     </div>
   </div>
-{:else if state==="reset_error"}
+{:else if state === 'reset_error'}
-<div class="min-h-screen flex items-center justify-center bg-gray-100">
+  <div class="min-h-screen flex items-center justify-center bg-gray-100">
-  <div class="max-w-md w-full py-12 px-6">
+    <div class="max-w-md w-full py-12 px-6">
-    <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
+      <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">
+      <p class="mt-6 text-lg text-center font-bold text-gray-900">
-      {$_('application_name')}
+        {$_('application_name')}
-    </p>
+      </p>
-    <p class="mt-2 mb-2 text-sm text-center text-gray-900 font-bold">
+      <p class="mt-2 mb-2 text-sm text-center text-gray-900 font-bold">
-      {$_('password-reset-failed')}
+        {$_('password-reset-failed')}
-    </p>
+      </p>
-    <p class="mt-2 mb-2 text-sm text-center text-gray-900">
+      <p class="mt-2 mb-2 text-sm text-center text-gray-900">
-      {$_('please-request-a-new-reset-mail')}
+        {$_('please-request-a-new-reset-mail')}
-    </p>
+      </p>
-    <div class="mt-6">
       <div class="mt-6">
-        <a
+        <div class="mt-6">
-          href="/forgot_password/"
+          <a
-          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">
+            href="/forgot_password/"
-          {$_('request-a-new-reset-mail')}
+            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">
-        </a>
+            {$_('request-a-new-reset-mail')}
+          </a>
+        </div>
       </div>
     </div>
   </div>
-</div>
+{:else if state === 'reset_in_progress'}
-{: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="" />
@@ -102,11 +107,14 @@
               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">
             <span class="absolute left-0 inset-y pl-3">

src/components/cards/AddCardBulkModal.svelte

@@ -22,19 +22,19 @@
       if (e.keyCode === 13) {
         if (createbtnenabled === true) {
           createbtnenabled = false;
-          submit();
+          submit_with_print();
         }
       }
     };
   })();
-  function submit() {
+  function submit_without_print() {
     if (processed_last_submit === true) {
       processed_last_submit = false;
       const toast = Toastify({
         text: $_("creating-blanco-cards"),
         duration: -1,
       }).showToast();
-      RunnerCardService.runnerCardControllerPostBlancoBulk(card_count)
+      RunnerCardService.runnerCardControllerPostBlancoBulk(card_count, false)
         .then((result) => {
           bulk_modal_open = false;
           //
@@ -54,6 +54,80 @@
         });
     }
   }
+
+  function submit_with_print() {
+    if (processed_last_submit === true) {
+      processed_last_submit = false;
+      const toast = Toastify({
+        text: $_("creating-blanco-cards"),
+        duration: -1,
+      }).showToast();
+      RunnerCardService.runnerCardControllerPostBlancoBulk(card_count, true)
+        .then((result) => {
+          bulk_modal_open = false;
+          //
+          Toastify({
+            text: $_("created-blanco-cards"),
+            duration: 500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
+          current_cards = current_cards.concat(result);
+          const toast = Toastify({
+            text: $_("generating-pdf"),
+            duration: -1,
+          }).showToast();
+          fetch(
+            `${config.baseurl}/documents/cards?&download=true&key=${config.documentserver_key}`,
+            {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json",
+              },
+              body: JSON.stringify(result),
+            }
+          )
+            .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 = "Bulkcards.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) => {
+              console.error(err);
+            });
+        })
+        .catch((err) => {
+          //
+        })
+        .finally(() => {
+          processed_last_submit = true;
+          //
+          toast.hideToast();
+        });
+    }
+  }
 </script>
 
 {#if bulk_modal_open}
@@ -75,14 +149,14 @@
         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"
+        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"
         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">
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w- 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"
@@ -138,17 +212,25 @@
           <button
             disabled={!createbtnenabled}
             class:opacity-50={!createbtnenabled}
-            on:click={submit}
+            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 sm:ml-3 sm:w-auto sm:text-sm">
-            {$_('create')}
+            {$_('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 sm:ml-3 sm:w-auto sm:text-sm">
+            {$_('create-without-pdf')}
           </button>
           <button
             on:click={() => {
               bulk_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">
+            class="mr-auto 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>

src/components/orgs/OrgOverview.svelte

@@ -1,212 +1,212 @@
-<script>
+<script>
-  import { getLocaleFromNavigator, _ } from "svelte-i18n";
+  import { getLocaleFromNavigator, _ } from "svelte-i18n";
-  import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
+  import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
-  let modal_open = false;
+  let modal_open = false;
-  let delete_org = {};
+  let delete_org = {};
-  import { RunnerOrganizationService } from "@odit/lfk-client-js";
+  import { RunnerOrganizationService } from "@odit/lfk-client-js";
-  import store from "../../store";
+  import store from "../../store";
-  import OrgsEmptyState from "./OrgsEmptyState.svelte";
+  import OrgsEmptyState from "./OrgsEmptyState.svelte";
-  import Toastify from "toastify-js";
+  import Toastify from "toastify-js";
-  import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
+  import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
-  import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
+  import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
-  $: searchvalue = "";
+  $: searchvalue = "";
-  $: active_deletes = [];
+  $: active_deletes = [];
-  $: sponsoring_contracts_show = current_organizations.some((r) => r.is_selected === true);
+  $: sponsoring_contracts_show = current_organizations.some((r) => r.is_selected === true);
-  $: cards_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);
+  $: generate_orgs = current_organizations.filter((r) => r.is_selected === true);
-  export let current_organizations = [];
+  export let current_organizations = [];
-
+
-  const promise = RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
+  const promise = RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
-    (val) => {
+    (val) => {
-      current_organizations = val;
+      current_organizations = val;
-    }
+    }
-  );
+  );
-</script>
+</script>
-
+
-<ConfirmOrgDeletion
+<ConfirmOrgDeletion
-  on:cancelDelete={(event) => {
+  on:cancelDelete={(event) => {
-    modal_open = false;
+    modal_open = false;
-    active_deletes[event.detail.id] = false;
+    active_deletes[event.detail.id] = false;
-  }}
+  }}
-  bind:modal_open
+  bind:modal_open
-  bind:delete_org />
+  bind:delete_org />
-{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:GET')}
+{#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:GET')}
-  {#await promise}
+  {#await promise}
-    <div
+    <div
-      class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
+      class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-      role="alert">
+      role="alert">
-      <p class="font-bold">{$_('organizations-are-being-loaded')}</p>
+      <p class="font-bold">{$_('organizations-are-being-loaded')}</p>
-      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
+      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
-    </div>
+    </div>
-  {:then}
+  {:then}
-    {#if current_organizations.length === 0}
+    {#if current_organizations.length === 0}
-      <OrgsEmptyState />
+      <OrgsEmptyState />
-    {:else}
+    {:else}
-      <input
+      <input
-        type="search"
+        type="search"
-        bind:value={searchvalue}
+        bind:value={searchvalue}
-        placeholder={$_('datatable.search')}
+        placeholder={$_('datatable.search')}
-        aria-label={$_('datatable.search')}
+        aria-label={$_('datatable.search')}
-        class="gridjs-input gridjs-search-input mb-4" />
+        class="gridjs-input gridjs-search-input mb-4" />
-      <div class="h-12">
+      <div class="h-12">
-        <GenerateSponsoringContracts
+        <GenerateSponsoringContracts
-            bind:sponsoring_contracts_show
+            bind:sponsoring_contracts_show
-            bind:generate_orgs />
+            bind:generate_orgs />
-        <GenerateRunnerCards
+        <GenerateRunnerCards
-            bind:cards_show
+            bind:cards_show
-            bind:generate_orgs />
+            bind:generate_orgs />
-      </div>
+      </div>
-      <div
+      <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">
+        <table class="divide-y divide-gray-200 w-full">
-          <thead class="bg-gray-50">
+          <thead class="bg-gray-50">
-            <tr>
+            <tr>
-              <th
+              <th
-                scope="col"
+                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                <span
+                <span
-                  on:click={() => {
+                  on:click={() => {
-                    const newstate = !current_organizations.some((r) => r.is_selected === true);
+                    const newstate = !current_organizations.some((r) => r.is_selected === true);
-                    current_organizations = current_organizations.map((r) => {
+                    current_organizations = current_organizations.map((r) => {
-                      r.is_selected = newstate;
+                      r.is_selected = newstate;
-                      return r;
+                      return r;
-                    });
+                    });
-                  }}
+                  }}
-                  class="underline cursor-pointer select-none">{#if current_organizations.some((r) => r.is_selected === true)}
+                  class="underline cursor-pointer select-none">{#if current_organizations.some((r) => r.is_selected === true)}
-                    {$_('deselect-all')}
+                    {$_('deselect-all')}
-                  {:else}{$_('select-all')}{/if}
+                  {:else}{$_('select-all')}{/if}
-                </span>
+                </span>
-              </th>
+              </th>
-              <th
+              <th
-                scope="col"
+                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('name')}
+                {$_('name')}
-              </th>
+              </th>
-              <th
+              <th
-                scope="col"
+                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('address')}
+                {$_('address')}
-              </th>
+              </th>
-              <th
+              <th
-                scope="col"
+                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('contact')}
+                {$_('contact')}
-              </th>
+              </th>
-              <th scope="col" class="relative px-6 py-3">
+              <th scope="col" class="relative px-6 py-3">
-                <span class="sr-only">{$_('action')}</span>
+                <span class="sr-only">{$_('action')}</span>
-              </th>
+              </th>
-            </tr>
+            </tr>
-          </thead>
+          </thead>
-          <tbody class="divide-y divide-gray-200">
+          <tbody class="divide-y divide-gray-200">
-            {#each current_organizations as o}
+            {#each current_organizations as o}
-              {#if Object.values(o)
+              {#if Object.values(o)
-                .toString()
+                .toString()
-                .toLowerCase()
+                .toLowerCase()
-                .includes(searchvalue)}
+                .includes(searchvalue)}
-                <tr data-rowid="org_{o.id}">
+                <tr data-rowid="org_{o.id}">
-                  <td class="px-6 py-4 whitespace-nowrap">
+                  <td class="px-6 py-4 whitespace-nowrap">
-                    <input
+                    <input
-                      bind:checked={o.is_selected}
+                      bind:checked={o.is_selected}
-                      type="checkbox"
+                      type="checkbox"
-                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
-                  </td>
+                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
+                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
+                    <div class="flex items-center">
-                      <div class="ml-4">
+                      <div class="ml-4">
-                        <div class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
-                          {o.name}
+                          {o.name}
-                        </div>
+                        </div>
-                      </div>
+                      </div>
-                    </div>
+                    </div>
-                  </td>
+                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
+                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
+                    <div class="flex items-center">
-                      <div class="ml-4">
+                      <div class="ml-4">
-                        <div class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
-                          {#if o.address.address1 !== null}
+                          {#if o.address.address1 !== null}
-                            {o.address.address1}<br />
+                            {o.address.address1}<br />
-                            {o.address.address2 || ''}<br />
+                            {o.address.address2 || ''}<br />
-                            {o.address.postalcode}
+                            {o.address.postalcode}
-                            {o.address.city}
+                            {o.address.city}
-                            {o.address.country}
+                            {o.address.country}
-                          {/if}
+                          {/if}
-                        </div>
+                        </div>
-                      </div>
+                      </div>
-                    </div>
+                    </div>
-                  </td>
+                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
+                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
+                    <div class="flex items-center">
-                      <div class="ml-4">
+                      <div class="ml-4">
-                        <div class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
-                          {#if o.contact}
+                          {#if o.contact}
-                            <a
+                            <a
-                              href="../contacts/{o.contact.id}"
+                              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}
+                              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.middlename || ''}
-                              {o.contact.lastname}</a>
+                              {o.contact.lastname}</a>
-                          {:else}{$_('no-contact-specified')}{/if}
+                          {:else}{$_('no-contact-specified')}{/if}
-                        </div>
+                        </div>
-                      </div>
+                      </div>
-                    </div>
+                    </div>
-                  </td>
+                  </td>
-                  {#if active_deletes[o.id] === true}
+                  {#if active_deletes[o.id] === true}
-                    <td
+                    <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
+                      <button
-                        on:click={() => {
+                        on:click={() => {
-                          active_deletes[o.id] = false;
+                          active_deletes[o.id] = false;
-                        }}
+                        }}
-                        tabindex="0"
+                        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
+                      <button
-                        on:click={() => {
+                        on:click={() => {
-                          RunnerOrganizationService.runnerOrganizationControllerRemove(o.id, false)
+                          RunnerOrganizationService.runnerOrganizationControllerRemove(o.id, false)
-                            .then((resp) => {
+                            .then((resp) => {
-                              current_organizations = current_organizations.filter((obj) => obj.id !== o.id);
+                              current_organizations = current_organizations.filter((obj) => obj.id !== o.id);
-                              Toastify({
+                              Toastify({
-                                text: 'Organization deleted',
+                                text: 'Organization deleted',
-                                duration: 500,
+                                duration: 500,
-                                backgroundColor:
+                                backgroundColor:
-                                  'linear-gradient(to right, #00b09b, #96c93d)',
+                                  'linear-gradient(to right, #00b09b, #96c93d)',
-                              }).showToast();
+                              }).showToast();
-                            })
+                            })
-                            .catch((err) => {
+                            .catch((err) => {
-                              modal_open = true;
+                              modal_open = true;
-                              delete_org = o;
+                              delete_org = o;
-                            });
+                            });
-                        }}
+                        }}
-                        tabindex="0"
+                        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>
+                    </td>
-                  {:else}
+                  {:else}
-                    <td
+                    <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
+                      <a
-                        href="./{o.id}"
+                        href="./{o.id}"
-                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
+                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
-                      {#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:DELETE')}
+                      {#if store.state.jwtinfo.userdetails.permissions.includes('ORGANIZATION:DELETE')}
-                        <button
+                        <button
-                          on:click={() => {
+                          on:click={() => {
-                            active_deletes[o.id] = true;
+                            active_deletes[o.id] = true;
-                          }}
+                          }}
-                          tabindex="0"
+                          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}
+                      {/if}
-                    </td>
+                    </td>
-                  {/if}
+                  {/if}
-                </tr>
+                </tr>
-              {/if}
+              {/if}
-            {/each}
+            {/each}
-          </tbody>
+          </tbody>
-        </table>
+        </table>
-      </div>
+      </div>
-    {/if}
+    {/if}
-  {:catch error}
+  {:catch error}
-    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+    <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">
+      <span class="inline-block align-middle mr-8">
-        <b class="capitalize">{$_('general_promise_error')}</b>
+        <b class="capitalize">{$_('general_promise_error')}</b>
-        {error}
+        {error}
-      </span>
+      </span>
-    </div>
+    </div>
-  {/await}
+  {/await}
-{/if}
+{/if}

src/components/pdf_generation/GenerateRunnerCards.svelte

@@ -149,7 +149,7 @@
         }).showToast();
         let count = 0;
         const current_cards = await RunnerCardService.runnerCardControllerGetAll();
-        for await (const t of generate_teams) {
+        for (const t of generate_teams) {
             const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
                 t.id
             );
@@ -216,7 +216,7 @@
         }).showToast();
         let count = 0;
         const current_cards = await RunnerCardService.runnerCardControllerGetAll();
-        for await (const o of generate_orgs) {
+        for (const o of generate_orgs) {
             const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
                 o.id
             );

src/components/pdf_generation/GenerateSponsoringContracts.svelte

@@ -1,6 +1,9 @@
 <script>
     import { getLocaleFromNavigator, _ } from "svelte-i18n";
-    import { RunnerOrganizationService, RunnerTeamService } from "@odit/lfk-client-js";
+    import {
+        RunnerOrganizationService,
+        RunnerTeamService,
+    } from "@odit/lfk-client-js";
     import Toastify from "toastify-js";
     export let sponsoring_contracts_show = false;
     export let generate_runners = [];
@@ -34,7 +37,7 @@
             duration: -1,
         }).showToast();
         let count = 0;
-        for await (const t of generate_teams) {
+        for (const t of generate_teams) {
             count++;
             const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
                 t.id
@@ -89,7 +92,7 @@
             text: $_("generating-pdf"),
             duration: -1,
         }).showToast();
-        for await (const o of generate_orgs) {
+        for (const o of generate_orgs) {
             const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
                 o.id
             );

src/components/settings/Settings.svelte

@@ -4,6 +4,9 @@
   import { MeService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import ConfirmProfileDeletion from "./ConfirmProfileDeletion.svelte";
+  import PasswordStrength, {
+    password_strong_enough_and_equal,
+  } from "../auth/PasswordStrength.svelte";
   $: data_loaded = false;
   $: delete_triggered = false;
   $: original_data = {};
@@ -15,8 +18,10 @@
     JSON.stringify(editable) === JSON.stringify(original_data)
   );
   $: save_enabled = changes_performed && isEmail(editable.email);
-  $: update_password_enabled =
+  $: update_password_enabled = password_strong_enough_and_equal(
-    password_change.length > 0 && password_change === password_confirm;
+    password_change,
+    password_confirm
+  );
   const user_promise = MeService.meControllerGet().then((data) => {
     data_loaded = true;
     data.groups = data.groups.map((g) => g.id);
@@ -45,7 +50,7 @@
   function changePassword() {
     if (data_loaded === true && update_password_enabled) {
       Toastify({
-        text: $_('changing-your-password'),
+        text: $_("changing-your-password"),
         duration: 2500,
       }).showToast();
       let postdata = Object.assign({}, original_data);
@@ -56,7 +61,7 @@
           password_change = "";
           postdata = {};
           Toastify({
-            text: $_('password-changed'),
+            text: $_("password-changed"),
             duration: 2500,
             backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
           }).showToast();
@@ -242,10 +247,7 @@
                     class="border-gray-300 placeholder-gray-500 appearance-none rounded-md relative block w-full px-3 py-2 border focus:outline-none focus:shadow-outline-blue focus:border-blue-300 focus:z-10 sm:text-sm"
                     placeholder={$_('password')} />
                 </div>
-                {#if password_change != password_confirm && password_change.length > 0}
+                <PasswordStrength bind:password_change bind:password_confirm />
-                  <span
-                    class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">{$_('passwords-dont-match')}</span>
-                {/if}
               </div>
               <div class="px-4 py-3 bg-gray-50 text-right sm:px-6">
                 <button
@@ -257,9 +259,9 @@
                   {$_('update-password')}
                 </button>
                 {#if update_password_enabled}
-                <p>
+                  <p>
-                  {$_('after-the-update-youll-get-logged-out-please-login-with-your-new-password-after-that')}
+                    {$_('after-the-update-youll-get-logged-out-please-login-with-your-new-password-after-that')}
-                </p>
+                  </p>
                 {/if}
               </div>
             </div>

src/components/teams/TeamsOverview.svelte

@@ -1,217 +1,217 @@
-<script>
+<script>
-  import { getLocaleFromNavigator, t, _ } from "svelte-i18n";
+  import { getLocaleFromNavigator, t, _ } from "svelte-i18n";
-  import Toastify from "toastify-js";
+  import Toastify from "toastify-js";
-  import { RunnerTeamService } from "@odit/lfk-client-js";
+  import { RunnerTeamService } from "@odit/lfk-client-js";
-  const teams_promise = RunnerTeamService.runnerTeamControllerGetAll();
+  const teams_promise = RunnerTeamService.runnerTeamControllerGetAll();
-  import store, { users as usersstore } from "../../store.js";
+  import store, { users as usersstore } from "../../store.js";
-  import TeamsEmptyState from "./TeamsEmptyState.svelte";
+  import TeamsEmptyState from "./TeamsEmptyState.svelte";
-  import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
+  import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
-  import { clickOutside } from "../base/outsideclick";
+  import { clickOutside } from "../base/outsideclick";
-  import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
+  import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
-  import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
+  import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
-  $: searchvalue = "";
+  $: searchvalue = "";
-  $: active_deletes = [];
+  $: active_deletes = [];
-  $: sponsoring_contracts_show = current_teams.some(
+  $: sponsoring_contracts_show = current_teams.some(
-    (r) => r.is_selected === true
+    (r) => r.is_selected === true
-  );
+  );
-  $: cards_show = current_teams.some(
+  $: cards_show = current_teams.some(
-    (r) => r.is_selected === true
+    (r) => r.is_selected === true
-  );
+  );
-  $: generate_teams = current_teams.filter((r) => r.is_selected === true);
+  $: generate_teams = current_teams.filter((r) => r.is_selected === true);
-  export let current_teams = [];
+  export let current_teams = [];
-  let modal_open = false;
+  let modal_open = false;
-  let delete_team = {};
+  let delete_team = {};
-  usersstore.subscribe((val) => {
+  usersstore.subscribe((val) => {
-    current_teams = val;
+    current_teams = val;
-  });
+  });
-  teams_promise.then((data) => {
+  teams_promise.then((data) => {
-    usersstore.set(data);
+    usersstore.set(data);
-  });
+  });
-</script>
+</script>
-
+
-<ConfirmTeamDeletion
+<ConfirmTeamDeletion
-  on:cancelDelete={(event) => {
+  on:cancelDelete={(event) => {
-    modal_open = false;
+    modal_open = false;
-    active_deletes[event.detail.id] = false;
+    active_deletes[event.detail.id] = false;
-  }}
+  }}
-  bind:modal_open
+  bind:modal_open
-  bind:delete_team />
+  bind:delete_team />
-{#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:GET')}
+{#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:GET')}
-  {#await teams_promise}
+  {#await teams_promise}
-    <div
+    <div
-      class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
+      class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-      role="alert">
+      role="alert">
-      <p class="font-bold">{$_('teams-are-being-loaded')}</p>
+      <p class="font-bold">{$_('teams-are-being-loaded')}</p>
-      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
+      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
-    </div>
+    </div>
-  {:then}
+  {:then}
-    {#if current_teams.length === 0}
+    {#if current_teams.length === 0}
-      <TeamsEmptyState />
+      <TeamsEmptyState />
-    {:else}
+    {:else}
-      <input
+      <input
-        type="search"
+        type="search"
-        bind:value={searchvalue}
+        bind:value={searchvalue}
-        placeholder={$_('datatable.search')}
+        placeholder={$_('datatable.search')}
-        aria-label={$_('datatable.search')}
+        aria-label={$_('datatable.search')}
-        class="gridjs-input gridjs-search-input mb-4" />
+        class="gridjs-input gridjs-search-input mb-4" />
-      <div class="h-12">
+      <div class="h-12">
-        <GenerateSponsoringContracts
+        <GenerateSponsoringContracts
-          bind:sponsoring_contracts_show
+          bind:sponsoring_contracts_show
-          bind:generate_teams />
+          bind:generate_teams />
-        <GenerateRunnerCards
+        <GenerateRunnerCards
-          bind:cards_show
+          bind:cards_show
-          bind:generate_teams />
+          bind:generate_teams />
-      </div>
+      </div>
-      <div
+      <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">
+        <table class="divide-y divide-gray-200 w-full">
-          <thead class="bg-gray-50">
+          <thead class="bg-gray-50">
-            <tr>
+            <tr>
-              <th
+              <th
-                scope="col"
+                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                <span
+                <span
-                  on:click={() => {
+                  on:click={() => {
-                    const newstate = !current_teams.some((r) => r.is_selected === true);
+                    const newstate = !current_teams.some((r) => r.is_selected === true);
-                    current_teams = current_teams.map((r) => {
+                    current_teams = current_teams.map((r) => {
-                      r.is_selected = newstate;
+                      r.is_selected = newstate;
-                      return r;
+                      return r;
-                    });
+                    });
-                  }}
+                  }}
-                  class="underline cursor-pointer select-none">{#if current_teams.some((r) => r.is_selected === true)}
+                  class="underline cursor-pointer select-none">{#if current_teams.some((r) => r.is_selected === true)}
-                    {$_('deselect-all')}
+                    {$_('deselect-all')}
-                  {:else}{$_('select-all')}{/if}
+                  {:else}{$_('select-all')}{/if}
-                </span>
+                </span>
-              </th>
+              </th>
-              <th
+              <th
-                scope="col"
+                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('name')}
+                {$_('name')}
-              </th>
+              </th>
-              <th
+              <th
-                scope="col"
+                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('organization')}
+                {$_('organization')}
-              </th>
+              </th>
-              <th
+              <th
-                scope="col"
+                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('contact')}
+                {$_('contact')}
-              </th>
+              </th>
-              <th scope="col" class="relative px-6 py-3">
+              <th scope="col" class="relative px-6 py-3">
-                <span class="sr-only">{$_('action')}</span>
+                <span class="sr-only">{$_('action')}</span>
-              </th>
+              </th>
-            </tr>
+            </tr>
-          </thead>
+          </thead>
-          <tbody class="divide-y divide-gray-200">
+          <tbody class="divide-y divide-gray-200">
-            {#each current_teams as t}
+            {#each current_teams as t}
-              {#if Object.values(t)
+              {#if Object.values(t)
-                .toString()
+                .toString()
-                .toLowerCase()
+                .toLowerCase()
-                .includes(searchvalue)}
+                .includes(searchvalue)}
-                <tr data-rowid="team_{t.id}">
+                <tr data-rowid="team_{t.id}">
-                  <td class="px-6 py-4 whitespace-nowrap">
+                  <td class="px-6 py-4 whitespace-nowrap">
-                    <input
+                    <input
-                      bind:checked={t.is_selected}
+                      bind:checked={t.is_selected}
-                      type="checkbox"
+                      type="checkbox"
-                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+                      class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
-                  </td>
+                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
+                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
+                    <div class="flex items-center">
-                      <div class="ml-4">
+                      <div class="ml-4">
-                        <div class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
-                          {t.name}
+                          {t.name}
-                        </div>
+                        </div>
-                      </div>
+                      </div>
-                    </div>
+                    </div>
-                  </td>
+                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
+                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
+                    <div class="flex items-center">
-                      <div class="ml-4">
+                      <div class="ml-4">
-                        <div class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
-                          {#if t.parentGroup}
+                          {#if t.parentGroup}
-                            <a
+                            <a
-                              href="../orgs/{t.parentGroup.id}"
+                              href="../orgs/{t.parentGroup.id}"
-                              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{t.parentGroup.name}</a>
+                              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{t.parentGroup.name}</a>
-                          {:else}{$_('no-organization-specified')}{/if}
+                          {:else}{$_('no-organization-specified')}{/if}
-                        </div>
+                        </div>
-                      </div>
+                      </div>
-                    </div>
+                    </div>
-                  </td>
+                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
+                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
+                    <div class="flex items-center">
-                      <div class="ml-4">
+                      <div class="ml-4">
-                        <div class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
-                          {#if t.contact}
+                          {#if t.contact}
-                            <a
+                            <a
-                              href="../contacts/{t.contact.id}"
+                              href="../contacts/{t.contact.id}"
-                              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{t.contact.firstname}
+                              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{t.contact.firstname}
-                              {t.contact.middlename || ''}
+                              {t.contact.middlename || ''}
-                              {t.contact.lastname}</a>
+                              {t.contact.lastname}</a>
-                          {:else}{$_('no-contact-specified')}{/if}
+                          {:else}{$_('no-contact-specified')}{/if}
-                        </div>
+                        </div>
-                      </div>
+                      </div>
-                    </div>
+                    </div>
-                  </td>
+                  </td>
-                  {#if active_deletes[t.id] === true}
+                  {#if active_deletes[t.id] === true}
-                    <td
+                    <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
+                      <button
-                        on:click={() => {
+                        on:click={() => {
-                          active_deletes[t.id] = false;
+                          active_deletes[t.id] = false;
-                        }}
+                        }}
-                        tabindex="0"
+                        tabindex="0"
-                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">Cancel
+                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">Cancel
-                        Delete</button>
+                        Delete</button>
-                      <button
+                      <button
-                        on:click={() => {
+                        on:click={() => {
-                          RunnerTeamService.runnerTeamControllerRemove(t.id, false)
+                          RunnerTeamService.runnerTeamControllerRemove(t.id, false)
-                            .then((resp) => {
+                            .then((resp) => {
-                              current_teams = current_teams.filter((obj) => obj.id !== t.id);
+                              current_teams = current_teams.filter((obj) => obj.id !== t.id);
-                              Toastify({
+                              Toastify({
-                                text: $_('organization-deleted'),
+                                text: $_('organization-deleted'),
-                                duration: 500,
+                                duration: 500,
-                                backgroundColor:
+                                backgroundColor:
-                                  'linear-gradient(to right, #00b09b, #96c93d)',
+                                  'linear-gradient(to right, #00b09b, #96c93d)',
-                              }).showToast();
+                              }).showToast();
-                            })
+                            })
-                            .catch((err) => {
+                            .catch((err) => {
-                              modal_open = true;
+                              modal_open = true;
-                              delete_team = t;
+                              delete_team = t;
-                            });
+                            });
-                        }}
+                        }}
-                        tabindex="0"
+                        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>
+                    </td>
-                  {:else}
+                  {:else}
-                    <td
+                    <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
+                      <a
-                        href="./{t.id}"
+                        href="./{t.id}"
-                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
+                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
-                      {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:DELETE')}
+                      {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:DELETE')}
-                        <button
+                        <button
-                          on:click={() => {
+                          on:click={() => {
-                            active_deletes[t.id] = true;
+                            active_deletes[t.id] = true;
-                          }}
+                          }}
-                          tabindex="0"
+                          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}
+                      {/if}
-                    </td>
+                    </td>
-                  {/if}
+                  {/if}
-                </tr>
+                </tr>
-              {/if}
+              {/if}
-            {/each}
+            {/each}
-          </tbody>
+          </tbody>
-        </table>
+        </table>
-      </div>
+      </div>
-    {/if}
+    {/if}
-  {:catch error}
+  {:catch error}
-    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+    <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">
+      <span class="inline-block align-middle mr-8">
-        <b class="capitalize">{$_('general_promise_error')}</b>
+        <b class="capitalize">{$_('general_promise_error')}</b>
-        {error}
+        {error}
-      </span>
+      </span>
-    </div>
+    </div>
-  {/await}
+  {/await}
-{/if}
+{/if}

src/components/users/AddUserModal.svelte

@@ -5,6 +5,9 @@
   import { UserService } from "@odit/lfk-client-js";
   import isEmail from "validator/es/lib/isEmail";
   import Toastify from "toastify-js";
+  import PasswordStrength, {
+    password_strong_enough,
+  } from "../auth/PasswordStrength.svelte";
   export let modal_open;
   export let current_users;
   let firstname_input;
@@ -28,7 +31,10 @@
   $: isLastnameValid = lastname_input_value.trim().length !== 0;
   $: isFirstnameValid = firstname_input_value.trim().length !== 0;
   $: createbtnenabled =
-    isFirstnameValid && isLastnameValid && isPasswordValid && isEmailValid;
+    isFirstnameValid &&
+    isLastnameValid &&
+    password_strong_enough(password_input_value) &&
+    isEmailValid;
   (function () {
     document.onkeydown = function (e) {
       e = e || window.event;
@@ -203,12 +209,8 @@
                     type="password"
                     name="password"
                     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 !isPasswordValid}
+                  <PasswordStrength
-                    <span
+                    bind:password_change={password_input_value} />
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                      {$_('password-is-required')}
-                    </span>
-                  {/if}
                 </div>
                 <div class="col-span-6">
                   <label

src/index.js

@@ -1,14 +0,0 @@
-import App from './App.svelte';
-
-const app = new App({
-	target: document.body
-});
-
-export default app;
-// HMR
-if (import.meta.hot) {
-	import.meta.hot.accept();
-	import.meta.hot.dispose(() => {
-		app.$destroy();
-	});
-}

src/locales/de.json

@@ -92,12 +92,14 @@
     "create-a-new-track": "Neuen Track erstellen",
     "create-a-new-user": "Neue Benutzer:in anlegen",
     "create-a-new-user-group": "Erstelle eine neue Gruppe",
+    "create-and-generate-pdf": "Erstellen und PDF herunterladen",
     "create-bulk-blanco-cards": "Blankokarten erstellen",
     "create-bulk-cards": "Blankokarten erstellen",
     "create-organization": "Organisation erstellen",
     "create-team": "Team erstellen",
     "create-track": "Track erstellen",
     "create-user": "Benutzer anlegen",
+    "create-without-pdf": "Ohne PDF erstellen",
     "created-blanco-cards": "Blankokarten wurden erstellt",
     "creating-blanco-cards": "Erstelle Blankokarten",
     "credits": "Credits",
@@ -245,6 +247,10 @@
     "middle-name": "Mittelname",
     "minimum-lap-time-in-s": "Minimale Rundenzeit (in Sekunden)",
     "minimum-lap-time-must-be-a-positive-number-or-0": "Die minimale Rundenzeit muss eine positive Zahl oder 0 sein",
+    "must-be-at-least-10-characters-long": "Passwort muss mindestens 10 Zeichen lang sein!",
+    "must-contain-a-lowercase-letter": "Passwort muss einen Großbuchstaben enthalten!",
+    "must-contain-a-number": "Passwort muss eine Zahl enthalten!",
+    "must-contain-a-uppercase-letter": "Passwort muss einen Kleinbuchstaben enthalten!",
     "name": "Name",
     "name-is-required": "Der Gruppenname muss angegeben werden",
     "new-password": "Neues Passwort",
@@ -276,7 +282,7 @@
     "password-reset-in-progress": "Passwort wird zurückgesetzt...",
     "password-reset-mail-sent": "Passwort-Reset Mail wurde an \"{usersEmail}\" geschickt.",
     "password-reset-successful": "Passwort erfolgreich zurückgesetzt!",
-    "passwords-dont-match": "Die Passwörter stimmen nicht überein.",
+    "passwords-dont-match": "Die Passwörter stimmen nicht überein!",
     "pdf-generation-failed": "PDF Generierung fehlgeschlagen!",
     "pdf-successfully-generated": "PDF wurde erfolgreich generiert!",
     "pdfs-successfully-generated": "Alle PDFs wurden generiert!",

src/locales/en.json

@@ -92,12 +92,14 @@
     "create-a-new-track": "Create a new Track",
     "create-a-new-user": "Create a new User",
     "create-a-new-user-group": "Create a new user group",
+    "create-and-generate-pdf": "Create and generate PDF",
     "create-bulk-blanco-cards": "Create bulk blanco cards",
     "create-bulk-cards": "Add blanco cards",
     "create-organization": "Create Organization",
     "create-team": "Create Team",
     "create-track": "Create Track",
     "create-user": "Create User",
+    "create-without-pdf": "Create without PDF",
     "created-blanco-cards": "Created blanco cards",
     "creating-blanco-cards": "Creating blanco cards",
     "credits": "Credits",
@@ -245,6 +247,10 @@
     "middle-name": "Middle name",
     "minimum-lap-time-in-s": "minimum lap time in s",
     "minimum-lap-time-must-be-a-positive-number-or-0": "minimum lap time must be a positive number or 0",
+    "must-be-at-least-10-characters-long": "Must be at least 10 characters long!",
+    "must-contain-a-lowercase-letter": "Must contain a lowercase letter!",
+    "must-contain-a-number": "Must contain a number!",
+    "must-contain-a-uppercase-letter": "Must contain a uppercase letter!",
     "name": "Name",
     "name-is-required": "Name is required",
     "new-password": "New password",
@@ -276,7 +282,7 @@
     "password-reset-in-progress": "Password Reset in Progress...",
     "password-reset-mail-sent": "Password reset mail was sent to \"{usersEmail}\".",
     "password-reset-successful": "Password Reset successful!",
-    "passwords-dont-match": "Passwords don't match",
+    "passwords-dont-match": "Passwords don't match!",
     "pdf-generation-failed": "PDF generation failed!",
     "pdf-successfully-generated": "PDF successfully generated!",
     "pdfs-successfully-generated": "PDFs successfully generated!",

src/main.js

@@ -0,0 +1,9 @@
+import 'windi.css';
+import "toastify-js/src/toastify.css";
+import "gridjs/dist/theme/mermaid.css";
+import App from './App.svelte';
+
+const app = new App({
+	target: document.body
+});
+export default app;

src/swmodule.js

@@ -1,14 +0,0 @@
-export const register = () => {
-	if ('serviceWorker' in navigator) {
-		window.addEventListener('load', () => {
-			navigator.serviceWorker.register('/sw.js').then(
-				(registration) => {
-					// console.log(`sw successful with scope: ${registration.scope}`);
-				},
-				(err) => {
-					// console.log(`sw failed: ${err}`);
-				}
-			);
-		});
-	}
-};

tailwind.config.js

@@ -1,14 +1,13 @@
 module.exports = {
-	purge: {
-		content: [ './src/**/*.svelte' ]
-	},
-	// darkMode: 'media',
-	variants: {},
-	plugins: [],
 	theme: {
-		container: {
+		extend: {
-			center: true,
+			colors: {
-			padding: '1.5rem'
+				reepolee: {
+					500: '#b40000',
+					600: '#9c0000',
+					700: '#750000'
+				}
+			}
 		}
 	}
 };

template-copy.js

@@ -1,19 +0,0 @@
-const fs = require('fs');
-let content_svelteconfig = fs.readFileSync('./s-config.template.js', { encoding: 'utf8' });
-let content_html = fs.readFileSync('./index.template.html', { encoding: 'utf8' });
-if (process.env.NODE_ENV_ODIT == 'development_fast') {
-	content_html = content_html.replace(
-		'__TAILWIND_INSERT__',
-		'<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tailwindcss@2.0.2/dist/tailwind.min.css">'
-	);
-	content_svelteconfig = content_svelteconfig.replace('__insert__', '{postcss:{}}');
-} else {
-	content_html = content_html.replace('__TAILWIND_INSERT__', '');
-	content_svelteconfig = content_svelteconfig.replace(
-		'__insert__',
-		"{postcss:{plugins:[require('tailwindcss'),require('autoprefixer')]}}"
-	);
-}
-fs.writeFileSync('./public/index.html', content_html);
-fs.writeFileSync('./svelte.config.js', content_svelteconfig);
-console.info('dev setup script done');

versionbuilder.js

@@ -1,5 +1,5 @@
 const fs = require('fs');
 const package = JSON.parse(fs.readFileSync(`./package.json`, { encoding: 'utf-8' }));
-const original = fs.readFileSync(`./index.template.html`, { encoding: 'utf-8' });
+const original = fs.readFileSync(`./index.html`, { encoding: 'utf-8' });
 let out = original.replace(/RELEASE_INFO-(\S)+-RELEASE_INFO/gi, 'RELEASE_INFO-' + package.version + '-RELEASE_INFO');
-fs.writeFileSync(`./index.template.html`, out);
+fs.writeFileSync(`./index.html`, out);

vite.config.js

@@ -0,0 +1,50 @@
+import svelte from '@sveltejs/vite-plugin-svelte';
+import windiCSS from 'vite-plugin-windicss';
+import { minify } from 'html-minifier';
+import { defineConfig } from 'vite';
+//
+const indexReplace = () => {
+	return {
+		name: 'html-transform',
+		transformIndexHtml(html) {
+			return minify(html, {
+				collapseWhitespace: true
+			});
+		}
+	};
+};
+
+export default defineConfig(({ command, mode }) => {
+	const isProduction = mode === 'production';
+	return {
+		// base: './',
+		build: {
+			polyfillDynamicImport: false,
+			cssCodeSplit: false,
+			minify: isProduction
+		},
+		plugins: [
+			windiCSS({
+				//@ts-ignore
+				verbose: true,
+				silent: false,
+				debug: true,
+				config: 'tailwind.config.js', // tailwind config file path (optional)
+				compile: false, // false: interpretation mode; true: compilation mode
+				prefix: 'windi-', // set compilation mode style prefix
+				globalPreflight: true, // set preflight style is global or scoped
+				globalUtility: true // set utility style is global or scoped
+			}),
+			svelte({
+				//@ts-ignore
+				hot: !isProduction,
+				emitCss: true,
+				extensions: [ '.md', '.svx', '.svelte' ],
+				preprocess: [
+					//
+				]
+			}),
+			indexReplace()
+		]
+	};
+});

workbox-config.js

@@ -1,9 +0,0 @@
-module.exports = {
-	globDirectory: 'public',
-	globPatterns: [ '**/*.{js,ico,png,svg,html,webmanifest,txt,json}' ],
-	globIgnores: [ 'env.js', 'env.sample.js' ],
-	swDest: 'public/sw.js',
-	cleanupOutdatedCaches: true,
-	mode: 'production',
-	sourcemap: false
-};