⏫ upgrade vite-plugin-windicss@0.12.1

ref #108

.devcontainer/Dockerfile

@@ -0,0 +1,2 @@
+ARG VARIANT="14-buster"
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}

.devcontainer/devcontainer.json

@@ -0,0 +1,24 @@
+{
+	"name": "Node.js",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": {
+			"VARIANT": "14"
+		}
+	},
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+	"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",
+	"remoteUser": "node"
+}

.dockerignore

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

.gitignore

@@ -1,11 +1,7 @@
 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

.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,41 +2,9 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [0.8.7](https://git.odit.services/lfk/frontend/compare/0.8.6...0.8.7)
-
-- Fixed listen on wrong permission🐞 [`0844215`](https://git.odit.services/lfk/frontend/commit/08442154f4bf94fc1101808b4585dc1f95afe8b2)
-
-#### [0.8.6](https://git.odit.services/lfk/frontend/compare/0.8.5...0.8.6)
-
-> 25 March 2021
-
-- 🚀RELEASE v0.8.6 [`c3c95bf`](https://git.odit.services/lfk/frontend/commit/c3c95bf2916618efe6764a33d9a42d35764d15be)
-- Merge pull request 'Know Production Bugs 🐞' (#109) from bugfix/107-prod_issues into dev [`d2050b5`](https://git.odit.services/lfk/frontend/commit/d2050b5948890a6077cbb41d82d1a6a1d1106652)
-- Errors now toast errors❌ [`17e0805`](https://git.odit.services/lfk/frontend/commit/17e0805fe64f6d181f55b81afa502ee6443ebabe)
-- Sorted translations 👀 [`82b1811`](https://git.odit.services/lfk/frontend/commit/82b1811971b974b686e7618b8a381e1589c168f6)
-- Fixed missing translations for scanstations🌍 [`aeadef6`](https://git.odit.services/lfk/frontend/commit/aeadef60bbe71da09bb569d20ca7377645beba7f)
-- Sorted translations🌍 [`a1ab65a`](https://git.odit.services/lfk/frontend/commit/a1ab65a0e975c02c01c603bf6d95a79ada1caa0b)
-- Fixed runner import getting triggered with invalid information [`ddd9c39`](https://git.odit.services/lfk/frontend/commit/ddd9c396b6bfd39a7b1627d4975151943b367ebf)
-- Removed middlename search from all files that had it [`6b92405`](https://git.odit.services/lfk/frontend/commit/6b92405bae21e78d694601cbc0b33eed56ef4533)
-- Fixed mail login bug🐞📧 [`0768939`](https://git.odit.services/lfk/frontend/commit/076893981ff4f7f17330746c561acc570339adac)
-- Now disabled search by middlename as a quick workaround 🐞 [`49e87cc`](https://git.odit.services/lfk/frontend/commit/49e87ccb15a7ed5edea22a3c3e235f7bee07d3f4)
-- Fixed conflicting css [`50fffef`](https://git.odit.services/lfk/frontend/commit/50fffef13b8fce885964d8ac277b4ca24d944b2b)
-- Commented out the buggy runner search to prevent bad UX [`fbe74a5`](https://git.odit.services/lfk/frontend/commit/fbe74a5d8090553a35576a17c97019939cf4f386)
-- Fixed outsideclick not clearing import modal🛠 [`ef49e50`](https://git.odit.services/lfk/frontend/commit/ef49e507c175510eeb466d33f222755fac8a2a0b)
-
-#### [0.8.5](https://git.odit.services/lfk/frontend/compare/0.8.4...0.8.5)
-
-> 20 March 2021
-
-- 🚀RELEASE v0.8.5 [`e838e6f`](https://git.odit.services/lfk/frontend/commit/e838e6f321bef1565a7e4316890a3c600b242e5a)
-- Fixed dupliacate mutation 🐞 [`91dd525`](https://git.odit.services/lfk/frontend/commit/91dd5256e9545f62e4342ae5477c36262d6e3401)
-
 #### [0.8.4](https://git.odit.services/lfk/frontend/compare/0.8.3...0.8.4)
 
-> 20 March 2021
-
 - CONFIG: default_username + default_password [`cc926e8`](https://git.odit.services/lfk/frontend/commit/cc926e84fb8bd9d6c9fd37349e25eb802e1bb324)
-- 🚀RELEASE v0.8.4 [`3d4dc2d`](https://git.odit.services/lfk/frontend/commit/3d4dc2d72b129f0134ae9f230810c3301dbd5caa)
 - CONFIG: add 'demo' as default username/password [`ba34710`](https://git.odit.services/lfk/frontend/commit/ba3471068ab00e2d5dbe21d6d763094e662f8347)
 
 #### [0.8.3](https://git.odit.services/lfk/frontend/compare/0.8.2...0.8.3)

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.8.7-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,39 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.8.7",
+	"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.6.4",
-		"csvtojson": "^2.0.10",
-		"gridjs": "3.3.0",
-		"localforage": "1.9.0",
-		"marked": "^2.0.1",
-		"svelte-focus-trap": "1.0.1",
-		"svelte-i18n": "3.3.7",
-		"svelte-select": "^3.17.0",
-		"tailwindcss": "2.0.3",
-		"tinro": "0.6.1",
-		"toastify-js": "1.9.3",
-		"validator": "13.5.2",
-		"xlsx": "^0.16.9"
-	},
 	"devDependencies": {
-		"@odit/license-exporter": "^0.0.11",
+		"@odit/lfk-client-js": "0.9.2",
-		"@snowpack/plugin-svelte": "3.5.2",
+		"csvtojson": "2.0.10",
-		"auto-changelog": "^2.2.1",
+		"gridjs": "3.4.0",
+		"localforage": "1.9.0",
+		"marked": "2.0.1",
+		"svelte-focus-trap": "1.2.0",
+		"svelte-i18n": "3.3.9",
+		"svelte-select": "3.17.0",
+		"tailwindcss": "2.0.4",
+		"tinro": "0.6.1",
+		"toastify-js": "1.10.0",
+		"validator": "13.5.2",
+		"xlsx": "0.16.9",
+		"@odit/license-exporter": "0.0.11",
+		"auto-changelog": "2.2.1",
 		"autoprefixer": "10.2.5",
-		"cross-env": "^7.0.3",
+		"release-it": "14.5.1",
-		"postcss": "8.2.8",
+		"svelte": "3.37.0",
-		"postcss-load-config": "3.0.1",
+		"svelte-preprocess": "4.7.0",
-		"release-it": "^14.4.1",
+		"vite": "2.1.5",
-		"snowpack": "3.0.13",
+		"vite-plugin-windicss": "0.12.1",
-		"svelte": "3.35.0",
+		"@svitejs/vite-plugin-svelte": "0.11.1",
-		"svelte-preprocess": "4.6.9",
+		"@types/html-minifier": "4.0.0",
-		"workbox-cli": "6.1.2"
+		"html-minifier": "4.0.0"
 	},
 	"release-it": {
 		"git": {
@@ -55,7 +49,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"
 		}
 	}
 }

public/imprint_en.md

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

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,7 +1,4 @@
 <script>
-  import "./TailwindStyles.svelte";
-  import "toastify-js/src/toastify.css";
-  import "gridjs/dist/theme/mermaid.css";
   import { Route, router } from "tinro";
   router.subscribe((routeInfo) => {
     window.scrollTo(0, 0);
@@ -53,7 +50,6 @@
   import { OpenAPI } from "@odit/lfk-client-js";
   import UserDetail from "./components/users/UserDetail.svelte";
   OpenAPI.BASE = config.baseurl;
-  import { register as registerSW } from "./swmodule";
   import TeamDetail from "./components/teams/TeamDetail.svelte";
   import UserPermissions from "./components/users/UserPermissions.svelte";
   import GroupPermissions from "./components/groups/GroupPermissions.svelte";
@@ -75,7 +71,6 @@
   import Scans from "./components/scans/Scans.svelte";
 import ScanDetail from "./components/scans/ScanDetail.svelte";
   store.init();
-  registerSW();
 </script>
 
 <Route>

src/TailwindStyles.svelte

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

src/components/auth/Login.svelte

@@ -5,7 +5,6 @@
   store.init();
   import { OpenAPI, AuthService } from "@odit/lfk-client-js";
   import Footer from "../general/Footer.svelte";
-  import isEmail from "validator/es/lib/isEmail";
   import Toastify from "toastify-js";
   // ------
   let username = config.default_username || "";
@@ -37,19 +36,10 @@
         text: $_("login_is_checked"),
         duration: 500,
       }).showToast();
-      let postdata = {};
+      AuthService.authControllerLogin({
-      if (isEmail(username)) {
+        username,
-        postdata = {
+        password,
-          email: username,
+      })
-          password,
-        };
-      } else {
-        postdata = {
-          username,
-          password,
-        };
-      }
-      AuthService.authControllerLogin(postdata)
         .then(async (result) => {
           await localForage.setItem("logindata", result);
           OpenAPI.TOKEN = result.access_token;

src/components/donations/DonationsOverview.svelte

@@ -74,12 +74,20 @@
                 .toLowerCase()
                 .includes(
                   searchvalue.toLowerCase()
-                ) ||  donation.donor.lastname
+                ) || donation.donor.middlename
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || donation.donor.lastname
                   .toLowerCase()
                   .includes(
                     searchvalue.toLowerCase()
                   ) || donation.runner?.firstname
                   .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || donation.runner?.middlename
+                  .toLowerCase()
                   .includes(
                     searchvalue.toLowerCase()
                   ) || donation.runner?.lastname

src/components/donors/DonorsOverview.svelte

@@ -88,7 +88,11 @@
                 .toLowerCase()
                 .includes(
                   searchvalue.toLowerCase()
-                ) ||  donor.lastname
+                ) || donor.middlename
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || donor.lastname
                   .toLowerCase()
                   .includes(
                     searchvalue.toLowerCase()

src/components/general/Imprint.svelte

@@ -6,15 +6,13 @@
   let html = "";
   async function load() {
     let md = await fetch("/imprint_" + getLocaleFromNavigator() + ".md");
-    let text = (await md.text()).toString();
+    if((await md.text()).includes("<meta")){
-    if(text.includes("<meta")){
       md.ok=false
     }
     if (!md.ok) {
       md = await fetch("/imprint_en.md");
-      text = await md.text();
     }
-    html = marked(text);
+    html = marked(await md.text());
   }
   const promise = load();
 </script>

src/components/general/Privacy.svelte

@@ -6,15 +6,13 @@
   let html = "";
   async function load() {
     let md = await fetch("/privacy_" + getLocaleFromNavigator() + ".md");
-    let text = (await md.text()).toString();
+    if((await md.text()).includes("<meta")){
-    if(text.includes("<meta")){
       md.ok=false
     }
     if (!md.ok) {
       md = await fetch("/privacy_en.md");
-      text = await md.text();
     }
-    html = marked(text);
+    html = marked(await md.text());
   }
   const promise = load();
 </script>

src/components/orgs/OrgOverview.svelte

@@ -35,7 +35,7 @@
       duration: -1,
     }).showToast();
     let count = 0;
-    for await (const o of orgs) {
+    for (const o of orgs) {
       const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
         o.id
       );

src/components/runners/ImportRunnerModal.svelte

@@ -19,11 +19,6 @@
   export let current_runners;
   export let import_modal_open;
   $: searchvalue = "";
-  $: importButtonEnabled =
-    recent_processed &&
-    (!(selected_org_or_team == "" || selected_org_or_team == null) ||
-      !(passed_org?.id == null || passed_org?.id == 0) ||
-      !(passed_team?.id == null || passed_team?.id == 0));
   const dispatch = createEventDispatcher();
   function cancelModal() {
     json_output = [];
@@ -49,10 +44,7 @@
     groups = groups.concat(orgs);
     RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
       const teams = val.map((r) => {
-        return {
+        return { label: `${r.parentGroup.name} > ${r.name}`, value: `TEAM_${r.id}` };
-          label: `${r.parentGroup.name} > ${r.name}`,
-          value: `TEAM_${r.id}`,
-        };
       });
       groups = groups.concat(teams);
     });
@@ -128,13 +120,6 @@
           .catch((err) => {
             toast.hideToast();
             recent_processed = true;
-            Toastify({
-              text: $_("error-during-import"),
-              duration: 500,
-              backgroundColor:
-                "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
-            }).showToast();
-            cancelModal();
           });
       }
       if (opened_from === "TeamDetail") {
@@ -152,13 +137,6 @@
           .catch((err) => {
             toast.hideToast();
             recent_processed = true;
-            Toastify({
-              text: $_("error-during-import"),
-              duration: 500,
-              backgroundColor:
-                "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
-            }).showToast();
-            cancelModal();
           });
       }
       if (opened_from === "RunnerOverview") {
@@ -182,13 +160,6 @@
             .catch((err) => {
               toast.hideToast();
               recent_processed = true;
-              Toastify({
-                text: $_("error-during-import"),
-                duration: 500,
-                backgroundColor:
-                  "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
-              }).showToast();
-              cancelModal();
             });
         }
         if (selected_org_or_team.includes("TEAM_")) {
@@ -211,13 +182,6 @@
             .catch((err) => {
               toast.hideToast();
               recent_processed = true;
-              Toastify({
-                text: $_("error-during-import"),
-                duration: 500,
-                backgroundColor:
-                  "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
-              }).showToast();
-              cancelModal();
             });
         }
       }
@@ -231,7 +195,7 @@
     use:focusTrap
     use:clickOutside
     on:click_outside={() => {
-      cancelModal();
+      import_modal_open = false;
     }}>
     <div
       class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
@@ -385,8 +349,6 @@
                   </table>
                 </div>
                 <button
-                  disabled={!importButtonEnabled}
-                  class:opacity-50={!importButtonEnabled}
                   on:click={importAction}
                   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">

src/components/runners/RunnersOverview.svelte

@@ -178,7 +178,7 @@
                       generateSponsoringContract('de');
                     }}
                     type="submit"
-                    class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900"
+                    class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
                     role="menuitem">
                     {$_('german')}
                   </button>
@@ -187,7 +187,7 @@
                       generateSponsoringContract('en');
                     }}
                     type="submit"
-                    class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900"
+                    class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
                     role="menuitem">
                     {$_('english')}
                   </button>
@@ -249,7 +249,11 @@
                 .toLowerCase()
                 .includes(
                   searchvalue.toLowerCase()
-                ) || runner.lastname
+                ) || runner.middlename
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || runner.lastname
                   .toLowerCase()
                   .includes(
                     searchvalue.toLowerCase()

src/components/scans/ScansOverview.svelte

@@ -81,6 +81,10 @@
                 .includes(
                   searchvalue.toLowerCase()
                 ) || scan.runner?.firstname
+                  .toLowerCase()
+                  .includes(
+                    searchvalue.toLowerCase()
+                  ) || scan.runner?.middlename
                   .toLowerCase()
                   .includes(
                     searchvalue.toLowerCase()

src/components/scanstations/CopyScanStationTokenModal.svelte

@@ -86,7 +86,7 @@
               <div class="mt-2 mb-6">
                 <label
                   for="token"
-                  class="block text-sm font-medium text-gray-700">{$_('token')}</label>
+                  class="block text-sm font-medium text-gray-700">Token</label>
                 <div on:click={copy} class="inline-flex">
                   <p
                     name="token"

src/components/teams/Teams.svelte

@@ -10,7 +10,7 @@
 <section class="container p-5">
   <span class="mb-1 text-3xl font-extrabold leading-tight">
     {$_('teams')}
-    {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:CREATE')}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('USER:CREATE')}
       <button
         on:click={() => {
           modal_open = true;
@@ -27,6 +27,6 @@
   <TeamsOverview bind:current_teams />
 </section>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:CREATE')}
+{#if store.state.jwtinfo.userdetails.permissions.includes('USER:CREATE')}
   <AddTeamModal bind:current_teams bind:modal_open />
 {/if}

src/components/teams/TeamsOverview.svelte

@@ -35,7 +35,7 @@
       duration: -1,
     }).showToast();
     let count = 0;
-    for await (const t of teams) {
+    for (const t of teams) {
       count++;
       const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
         t.id

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

@@ -45,7 +45,6 @@
     "change-your-password-here": "Hier kannst du dein Passwort ändern",
     "changing-your-password": "Passwort wird geändert",
     "city": "Stadt",
-    "click-to-copy-token-to-clipboard": "Klicke auf den Token, um ihn in deine Zwischenablage zu kopieren",
     "close": "Schließen",
     "configure-the-tracks-and-minimum-lap-times": "Bearbeite die Tracks und ihre minimale Rundenzeit",
     "confirm": "Bestätigen",
@@ -63,7 +62,6 @@
     "contact-is-not-a-member-in-any-group": "Kontakt gehört zu keiner Gruppe",
     "contacts": "Kontakte",
     "contacts-are-being-loaded": "Kontakte werden geladen ...",
-    "copied-token-to-clipboard": "Token wurde in die Zwischenablage kopiert",
     "count_organizations": "Organisationen (Anzahl)",
     "count_teams": "Teams (Anzahl)",
     "create": "Erstellen",
@@ -126,7 +124,6 @@
     "description-optional": "Beschreibung (optional)",
     "deselect-all": "Alle abwählen",
     "details": "Details",
-    "disabled": "deaktiviert",
     "distance": "Distanz",
     "distance-donation": "Sponsoring",
     "distance-in-km": "Distanz (in KM)",
@@ -154,10 +151,7 @@
     "edit-permissions": "Berechtigungen bearbeiten",
     "email_address_or_username": "E-Mail-Adresse/ Benutzername",
     "enabled": "aktiviert",
-    "enabled_large": "Disabled",
     "english": "Englisch",
-    "error-during-import": "Fehler beim Importieren",
-    "error-whyile-copying-to-clipboard": "Fehler beim Kopieren in die Zwischenablage",
     "error_on_login": "😢Fehler beim Login",
     "erteilte": "Direkt erteilte",
     "everything-concerning-your-profile": "Alles zu deinem Profil",
@@ -262,7 +256,6 @@
     "permissions": "Berechtigungen",
     "permissions-updated": "Berechtigungen aktualisiert!",
     "phone": "Telefon",
-    "please-copy-the-token-and-store-it-somewhere-save": "Bitte kopiere dir den Token und bewahre ihn gut auf.",
     "please-provide-a-password": "Bitte gebe ein Passwort an...",
     "please-provide-the-nessecary-information-to-add-a-new-donor": "Bitte mach die Notwendigen Angaben, um eine neue Sponsor:in zu erstellen",
     "please-provide-the-nessecary-information-to-create-a-new-donation": "Bitte gebe alle für das Sponsoring notwendigen Daten an.",
@@ -275,7 +268,6 @@
     "please-provide-the-required-information-to-add-a-new-team": "Bitte gebe alle nötigen Informationen an, im das neue Team zu erstellen.",
     "please-provide-the-required-information-to-add-a-new-track": "Bitte die benötigten Informationen angeben.",
     "please-provide-the-required-information-to-add-a-new-user": "Bitte gebe alle nötigen Informationen an, im die neue Benutzer:in zu erstellen.",
-    "please-provide-the-required-information-to-create-a-new-scanstation": "Bitte gebe alle für eine Scannerstation notwendigen Informationen an",
     "please-request-a-new-reset-mail": "Bitte eine neue Passwortreset-Mail anfordern...",
     "privacy": "Datenschutz",
     "privacy-loading": "Datenschutzerklärung lädt...",
@@ -305,8 +297,6 @@
     "scans": "Scans",
     "scans-are-being-loaded": "Scans werden geladen",
     "scanstation": "Scanner Station",
-    "scanstation-added": "Station wurde erstellt",
-    "scanstation-is-being-added": "Scannerstation wird angelegt...",
     "scanstations": "Scanner Stationen",
     "scanstations-are-being-loaded": "Scannerstationen werden geladen...",
     "search-for-an-organization-by-name-or-id": "Suche eine Organisation (via Name oder Id)",
@@ -333,7 +323,6 @@
     "teams-are-being-loaded": "Teams werden geladen ...",
     "the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number": "Die angegebene Telefonnummer ist nicht korrekt. <br /> Bitte gebe eine Telefonnummer im internationalen Format an...",
     "the-scans-distance-must-be-greater-than-0m": "Die Distanz muss größer als 0m sein.",
-    "the-scanstations-api-token-will-only-get-displayed-once-you-wont-be-able-to-change-or-view-it-again": "Der Scannerstation Token wird nur einmal angezeigt - du kannst ihn nicht ändern oder ihn dir nochmal anzeigen lassen!",
     "there-are-no-contacts-added-yet": "Es wurden noch keine Kontakte hinzugefügt.",
     "there-are-no-donations-yet": "Es gibt noch keine Sponsorings",
     "there-are-no-donors-yet": "Es gibt noch keine Sponsor:innen",
@@ -345,7 +334,6 @@
     "there-are-no-users-added-yet": "Es wurden noch keine Benutzer hinzugefügt.",
     "this-might-take-a-moment": "Das könnte einen kleinen Moment dauern",
     "this-scanstation-is": "Diese Station ist",
-    "token": "Token",
     "total-distance": "gelaufene Strecke",
     "total-donation-amount": "Gesamtbetrag",
     "total-donations": "Spendensumme",

src/locales/en.json

@@ -45,7 +45,6 @@
     "change-your-password-here": "Change your password here",
     "changing-your-password": "Changing your password",
     "city": "City",
-    "click-to-copy-token-to-clipboard": "Click to copy the token to your clipboard",
     "close": "Close",
     "configure-the-tracks-and-minimum-lap-times": "configure the tracks & minimum lap times",
     "confirm": "Confirm",
@@ -63,7 +62,6 @@
     "contact-is-not-a-member-in-any-group": "Contact is not a member in any group",
     "contacts": "Contacts",
     "contacts-are-being-loaded": "contacts are being loaded...",
-    "copied-token-to-clipboard": "Copied token to clipboard",
     "count_organizations": "# Organizations",
     "count_teams": "# Teams",
     "create": "Create",
@@ -126,7 +124,6 @@
     "description-optional": "Description (optional)",
     "deselect-all": "deselect all",
     "details": "Details",
-    "disabled": "disabled",
     "distance": "Distance",
     "distance-donation": "distance donation",
     "distance-in-km": "Distance in km",
@@ -154,10 +151,7 @@
     "edit-permissions": "edit permissions",
     "email_address_or_username": "Email / username",
     "enabled": "enabled",
-    "enabled_large": "Enabled",
     "english": "English",
-    "error-during-import": "Error during import",
-    "error-whyile-copying-to-clipboard": "Error while copying to clipboard",
     "error_on_login": "Error on login",
     "erteilte": "Directly granted",
     "everything-concerning-your-profile": "Everything concerning your profile",
@@ -262,7 +256,6 @@
     "permissions": "Permissions",
     "permissions-updated": "Permissions updated!",
     "phone": "Phone",
-    "please-copy-the-token-and-store-it-somewhere-save": "Please copy the token and store it somewhere safe.",
     "please-provide-a-password": "Please provide a password...",
     "please-provide-the-nessecary-information-to-add-a-new-donor": "Please provide the nessecary information to add a new donor",
     "please-provide-the-nessecary-information-to-create-a-new-donation": "Please provide the nessecary information to create a new donation",
@@ -275,7 +268,6 @@
     "please-provide-the-required-information-to-add-a-new-team": "Please provide the required information to add a new team.",
     "please-provide-the-required-information-to-add-a-new-track": "Please provide the required information to add a new track.",
     "please-provide-the-required-information-to-add-a-new-user": "Please provide the required information to add a new user.",
-    "please-provide-the-required-information-to-create-a-new-scanstation": "Please provide the required information to create a new scanstation",
     "please-request-a-new-reset-mail": "Please request a new reset mail...",
     "privacy": "Privacy",
     "privacy-loading": "Privacy loading...",
@@ -305,8 +297,6 @@
     "scans": "Scans",
     "scans-are-being-loaded": "Scans are being loaded",
     "scanstation": "Scanstation",
-    "scanstation-added": "Scanstation added",
-    "scanstation-is-being-added": "Adding scanstation...",
     "scanstations": "Scanstations",
     "scanstations-are-being-loaded": "Loading scanstations...",
     "search-for-an-organization-by-name-or-id": "Search for an organization (by name or id)",
@@ -333,7 +323,6 @@
     "teams-are-being-loaded": "teams are being loaded...",
     "the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number": "the provided phone number is invalid.<br />please enter a valid international number...",
     "the-scans-distance-must-be-greater-than-0m": "The scan's distance must be greater than 0m",
-    "the-scanstations-api-token-will-only-get-displayed-once-you-wont-be-able-to-change-or-view-it-again": "The scanstation api token will only get displayed once - you won't be able to change or view it again!",
     "there-are-no-contacts-added-yet": "There are no contacts added yet.",
     "there-are-no-donations-yet": "There are no donations yet",
     "there-are-no-donors-yet": "There are no donors yet",
@@ -345,7 +334,6 @@
     "there-are-no-users-added-yet": "There are no users added yet.",
     "this-might-take-a-moment": "This might take a moment 👀",
     "this-scanstation-is": "This scanstation is",
-    "token": "Token",
     "total-distance": "total distance",
     "total-donation-amount": "total donation amount",
     "total-donations": "total donations",

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 '@svitejs/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
-};