⏫ bump vite to 2.1.3

ref #108

.dockerignore

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

.drone.yml

@@ -59,4 +59,26 @@ trigger:
   branch:
     - dev
   event:
-    - push
+    - push
+
+---
+kind: pipeline
+type: kubernetes
+name: build:tags
+steps:
+  - name: build $DRONE_TAG
+    image: plugins/docker
+    depends_on: [clone]
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: registry.odit.services/lfk/frontend
+      tags:
+        - '${DRONE_TAG}'
+      registry: registry.odit.services
+      mtu: 1000
+trigger:
+  event:
+  - tag

.gitignore

@@ -6,6 +6,6 @@ yarn.lock
 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,8 +2,39 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+#### [0.8.4](https://git.odit.services/lfk/frontend/compare/0.8.3...0.8.4)
+
+- CONFIG: default_username + default_password [`cc926e8`](https://git.odit.services/lfk/frontend/commit/cc926e84fb8bd9d6c9fd37349e25eb802e1bb324)
+- 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)
+
+> 20 March 2021
+
+- Sorted translation 🌍 [`d6f6d10`](https://git.odit.services/lfk/frontend/commit/d6f6d10cb6b639a1f988e0da4811355750b0f027)
+- Smaller bugfixes [`8e04377`](https://git.odit.services/lfk/frontend/commit/8e0437728bd04223a23cdf1879c6c739ca8ebef7)
+- More small fixes [`1249904`](https://git.odit.services/lfk/frontend/commit/12499045824c13a3ee35c6cc8c3c3a3130dbec12)
+- 🚀RELEASE v0.8.3 [`fff16e6`](https://git.odit.services/lfk/frontend/commit/fff16e6650cce1231a8d0db43531bf8e3e01f84a)
+
+#### [0.8.2](https://git.odit.services/lfk/frontend/compare/0.8.1...0.8.2)
+
+> 20 March 2021
+
+- Now using env base url [`aa8196d`](https://git.odit.services/lfk/frontend/commit/aa8196db3a9ff1bcd2b5f0ce655957bfa4e310ab)
+- 🚀RELEASE v0.8.2 [`fb0c071`](https://git.odit.services/lfk/frontend/commit/fb0c0718e405312f239bc3829b3d9c203d246458)
+
+#### [0.8.1](https://git.odit.services/lfk/frontend/compare/0.8.0...0.8.1)
+
+> 20 March 2021
+
+- ⚡ CI - add build:tags pipeline [`910a086`](https://git.odit.services/lfk/frontend/commit/910a0860a0bd240c5ff9d23dc33923f941b1e10b)
+- 🚀RELEASE v0.8.1 [`b2223b5`](https://git.odit.services/lfk/frontend/commit/b2223b5110cc31740e69de66c74ab3f83a046308)
+
 #### [0.8.0](https://git.odit.services/lfk/frontend/compare/0.7.0...0.8.0)
 
+> 20 March 2021
+
+- 🚀RELEASE v0.8.0 [`009431f`](https://git.odit.services/lfk/frontend/commit/009431fb98bc84c71590644a5d3606805d432202)
 - new license file version [CI SKIP] [`579ece6`](https://git.odit.services/lfk/frontend/commit/579ece625651c8bf37b5704e82264a8833811f68)
 - Merge pull request 'User settings feature/103-settings_page' (#104) from feature/103-settings_page into dev [`822e97d`](https://git.odit.services/lfk/frontend/commit/822e97d3c35be57ecf9ed6bd6af474fd89e7d8d8)
 - Sorted translations🌍 [`120d3c9`](https://git.odit.services/lfk/frontend/commit/120d3c9dc81a0878d0dd64b66caadc6201651bda)

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
-COPY package.json *.config.js workbox-config.js template-copy.js index.template.html s-config.template.js ./
+RUN yarn
+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
-RUN rm -rf /app/build/_dist_/components
-RUN rm -rf /app/build/_dist_/locales
-RUN rm -rf /app/build-manifest.json
+COPY --from=0 /app/dist /app
 FROM fholzer/nginx-brotli:v1.19.1
 COPY --from=1 /app /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf

env.sample.js

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

index.html

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

nginx.conf

@@ -6,6 +6,14 @@ http {
     server {
         error_page 404 /index.html;
         root /usr/share/nginx/html;
+        location = /index.html {
+            internal;
+            add_header Cache-Control 'no-store';
+        }
+        location = / {
+            internal;
+            add_header Cache-Control 'no-store';
+        }
         location / {
             try_files $uri $uri/ /index.html;
         }

package.json

@@ -1,18 +1,15 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.8.0",
+	"version": "0.8.4",
 	"scripts": {
 		"i18n-order": "node order.js",
-		"dev:all": "yarn prebuild && snowpack dev",
-		"dev": "cross-env NODE_ENV_ODIT=development_fast node template-copy.js && yarn build:sw && snowpack dev",
-		"build": "yarn prebuild && snowpack build",
-		"prebuild": "cross-env NODE_ENV_ODIT=production node template-copy.js && yarn build:sw",
-		"build:sw": "workbox generateSW workbox-config.js",
+		"dev": "vite dev",
+		"build": "vite build",
 		"release": "release-it",
 		"licenses:export": "license-exporter --json -o public"
 	},
 	"license": "CC-BY-NC-SA-4.0",
-	"dependencies": {
+	"devDependencies": {
 		"@odit/lfk-client-js": "0.6.4",
 		"csvtojson": "^2.0.10",
 		"gridjs": "3.3.0",
@@ -25,21 +22,21 @@
 		"tinro": "0.6.1",
 		"toastify-js": "1.9.3",
 		"validator": "13.5.2",
-		"xlsx": "^0.16.9"
-	},
-	"devDependencies": {
+		"xlsx": "^0.16.9",
 		"@odit/license-exporter": "^0.0.11",
-		"@snowpack/plugin-svelte": "3.5.2",
 		"auto-changelog": "^2.2.1",
 		"autoprefixer": "10.2.5",
 		"cross-env": "^7.0.3",
 		"postcss": "8.2.8",
 		"postcss-load-config": "3.0.1",
 		"release-it": "^14.4.1",
-		"snowpack": "3.0.13",
 		"svelte": "3.35.0",
 		"svelte-preprocess": "4.6.9",
-		"workbox-cli": "6.1.2"
+		"vite": "2.1.3",
+		"vite-plugin-windicss": "^0.9.6",
+		"@svitejs/vite-plugin-svelte": "^0.11.1",
+		"@types/html-minifier": "^4.0.0",
+		"html-minifier": "^4.0.0"
 	},
 	"release-it": {
 		"git": {
@@ -55,7 +52,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/env.sample.js

@@ -1,6 +1,8 @@
 const config = {
 	baseurl: 'http://localhost:4010',
-	documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe'
+	documentserver_key: 'NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe',
 	// optional
+	default_username: 'demo',
+	default_password: 'demo',
 	prefersHashRouting: true
 };

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/ForgotPassword.svelte

@@ -9,7 +9,7 @@
   let usersEmail = "";
   function reset() {
     if (isEmail(usersEmail)) {
-      AuthService.authControllerGetResetToken({ email: usersEmail })
+      AuthService.authControllerGetResetToken("de", { email: usersEmail })
         .then((resp) => {
           Toastify({
             text: $_("mail-validation-in-progress"),

src/components/auth/Login.svelte

@@ -7,8 +7,8 @@
   import Footer from "../general/Footer.svelte";
   import Toastify from "toastify-js";
   // ------
-  let username = "demo";
-  let password = "demo";
+  let username = config.default_username || "";
+  let password = config.default_password || "";
   let is_blocked_by_autologin = false;
   let last_loginclick_processed = true;
 

src/components/dashboard/MainDashContent.svelte

@@ -16,8 +16,7 @@
       -
       {$_('dashboard-greeting')},
       <span
-        class="text-blue-500">{store.state.jwtinfo.userdetails.firstname}</span>
-      👋</span>
+        class="text-blue-500">{store.state.jwtinfo.userdetails.firstname} {store.state.jwtinfo.userdetails.lastname}</span></span>
   </h1>
   <StatCards />
 </div>

src/components/donations/DonationsEmptyState.svelte

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

src/components/general/About.svelte

@@ -189,34 +189,5 @@
         </li>
       </ul>
     </div>
-    <h2 class="mt-4 text-4xl font-display font-semibold md:text-5xl">
-      {$_('faq')}
-    </h2>
-    <div class="mt-6 border-t-2 border-gray-100 pt-10">
-      <dl class="md:grid md:grid-cols-2 md:gap-8">
-        <div>
-          <div>
-            <dt class="text-lg leading-6 font-medium">Q</dt>
-            <dd class="mt-2">
-              <p class="text-base text-gray-500">A</p>
-            </dd>
-          </div>
-        </div>
-        <div class="mt-12 sm:mt-0">
-          <div id="team-pricing">
-            <dt class="text-lg leading-6 font-medium">Q</dt>
-            <dd class="mt-2">
-              <p class="text-base text-gray-500">A</p>
-            </dd>
-          </div>
-          <div class="mt-12">
-            <dt class="text-lg leading-6 font-medium">Q</dt>
-            <dd class="mt-2">
-              <p class="text-base text-gray-500">A</p>
-            </dd>
-          </div>
-        </div>
-      </dl>
-    </div>
   </div>
 </div>

src/components/general/Footer.svelte

@@ -32,6 +32,8 @@
       target="_blank"
       rel="noopener, noreferrer"
       href="https://git.odit.services/lfk/frontend/src/tag/{releaseinfo}">{releaseinfo}</a>
+      -
+    <a class="underline" href="https://docs.lauf-fuer-kaya.de" target="_blank">{$_('documentation')}</a>
     -
     <a class="underline" href="/privacy">{$_('privacy')}</a>
     -

src/components/orgs/OrgDetail.svelte

@@ -125,7 +125,7 @@
       duration: -1,
     }).showToast();
     fetch(
-      `https://dev.lauf-fuer-kaya.de/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+      `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
       {
         method: "POST",
         headers: {

src/components/orgs/OrgOverview.svelte

@@ -35,12 +35,12 @@
       duration: -1,
     }).showToast();
     let count = 0;
-    for await (const o of orgs) {
+    for (const o of orgs) {
       const runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(
         o.id
       );
       fetch(
-        `https://dev.lauf-fuer-kaya.de/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+        `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
         {
           method: "POST",
           headers: {

src/components/runners/RunnerDetail.svelte

@@ -97,7 +97,7 @@
       duration: -1,
     }).showToast();
     fetch(
-      `https://dev.lauf-fuer-kaya.de/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+      `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
       {
         method: "POST",
         headers: {

src/components/runners/RunnersOverview.svelte

@@ -58,7 +58,7 @@
       duration: -1,
     }).showToast();
     fetch(
-      `https://dev.lauf-fuer-kaya.de/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+      `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
       {
         method: "POST",
         headers: {

src/components/scans/ScansEmptyState.svelte

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

src/components/scans/scans.svg

@@ -1 +1 @@
-<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="598.11" height="535.11"><path d="M3.35 120.07a4.6 4.6 0 00-3.18 5.66l76.72 273.98a4.6 4.6 0 005.65 3.18l282.82-79.19a4.6 4.6 0 003.18-5.66L291.82 44.07a4.6 4.6 0 00-5.65-3.19z" fill="#e6e6e6"/><path d="M86.1 389.95l269.5-75.46-72.99-260.67-269.5 75.46z" fill="#fff"/><path d="M48.74 164.1c-1.8.5-2.54 3.48-1.65 6.65s3.07 5.33 4.87 4.83l122.91-34.42c1.8-.5 2.54-3.49 1.66-6.65s-3.08-5.34-4.87-4.84zM58.64 199.44c-1.8.5-2.54 3.5-1.65 6.66s3.07 5.34 4.87 4.83l122.91-34.42c1.8-.5 2.54-3.49 1.65-6.65s-3.07-5.34-4.86-4.83zM68.42 234.39c-1.8.5-2.54 3.49-1.65 6.66s3.07 5.33 4.87 4.83l122.92-34.42c1.8-.5 2.54-3.5 1.65-6.66s-3.07-5.33-4.87-4.83zM78.32 269.74c-1.8.5-2.54 3.49-1.65 6.66s3.07 5.33 4.87 4.83l122.92-34.42c1.8-.5 2.54-3.49 1.65-6.66s-3.07-5.33-4.87-4.83zM234.04 112.61a5.97 5.97 0 103.21 11.5l22.98-6.44a5.97 5.97 0 00-3.22-11.49zM243.74 147.28a5.97 5.97 0 103.22 11.49l22.98-6.43a5.97 5.97 0 00-3.22-11.5zM253.45 181.95a5.97 5.97 0 103.22 11.49l22.98-6.44a5.97 5.97 0 00-3.22-11.49zM263.16 216.61a5.97 5.97 0 003.21 11.5l22.98-6.44a5.97 5.97 0 00-3.21-11.49z" fill="#e6e6e6"/><path d="M272.43 276.7a7.6 7.6 0 104.1 14.64l29.28-8.2a7.6 7.6 0 00-4.1-14.64z" fill="#6c63ff"/><path fill="#e6e6e6" d="M85.9 307.81l216.66-60.67.54 1.93-216.67 60.67z"/><path fill="#a0616a" d="M520.2 506.07l-17.38 4.2-24.47-65.02 25.65-6.2 16.2 67.02z"/><path d="M472.85 535.11l-.12-.48a22.23 22.23 0 0116.37-26.8l34-8.23 5.33 22.08z" fill="#2f2e41"/><path fill="#a0616a" d="M443.28 517.91H425.4l-8.5-68.96h26.38v68.96z"/><path d="M447.6 535.01h-57.18v-.5a22.2 22.2 0 0122.2-22.2h34.99zM416.88 490.99l-17.36-206.87 71.86-13.25.28-.05 21.03 13.52-7.32 76.14 33.7 118.7-29.1 7.65-33.75-110.08-7.73-33.48-3.96 43.5 2.94 107.28z" fill="#2f2e41"/><path d="M397.3 288.81l-.2-.24 24.84-186.96.03-.24.17-.18c.37-.36 9.07-8.96 18.02-8.96 1.3 0 2.52-.03 3.7-.06 6.85-.18 12.26-.32 18.69 6.1 6.55 6.56 27.92 30.47 27.92 63.23 0 31.7 2.88 130.22 2.91 131.21l.04 1.4-1.16-.76c-.3-.19-29.03-18.49-53.14-1.48-7.53 5.32-14.3 7.18-20.09 7.18-13.47 0-21.62-10.1-21.73-10.24z" fill="#6c63ff"/><circle cx="737.3" cy="227.82" r="35.82" transform="rotate(-28.66 229.78 725.57)" fill="#a0616a"/><path d="M381.53 328.99a14.66 14.66 0 00.85-22.47l20.34-47.97-26.63 4.9-15.23 44.8A14.74 14.74 0 00381.53 329z" fill="#a0616a"/><path d="M361.88 291.67l6.55-13.83a2.7 2.7 0 01-.97-1c-6.12-10.6 30.84-98.67 33.3-104.51-.37-3.18-4.25-36.85-1.41-48.2 3.34-13.35 10.2-19.58 22.93-20.81 14.04-1.32 17.83 17.75 17.86 17.94l.02 49.02-16.12 56.43-36.75 74.97z" fill="#6c63ff"/><path d="M440.94 58.87c-4.3.56-7.54-3.83-9.04-7.9s-2.64-8.78-6.38-10.98c-5.1-3-11.62.61-17.45-.38-6.59-1.11-10.87-8.1-11.2-14.76s2.31-13.1 4.92-19.24l.9 7.64A15.16 15.16 0 01409.33 0l-1.17 11.22c.73-6.29 7.5-11.16 13.7-9.85l-.19 6.68c7.6-.9 15.28-1.81 22.91-1.12s15.31 3.1 21.1 8.13c8.64 7.51 11.8 19.89 10.74 31.3s-5.77 22.13-10.68 32.48c-1.23 2.6-2.94 5.54-5.8 5.88-2.58.3-4.93-1.86-5.73-4.32s-.41-5.14.07-7.69c.72-3.84 1.63-7.77.95-11.63s-3.45-7.66-7.33-8.13-7.86 3.97-6 7.4z" fill="#2f2e41"/><path fill="#3f3d56" d="M597.73 535.1H339.99v-2.11h258.12l-.38 2.1z"/></svg>
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 647.6 632.2"><path d="M411 142H237a15 15 0 00-15 15v388l-2 1-43 13a8 8 0 01-10-6L39 137a8 8 0 016-10l66-20 191-58 66-20a8 8 0 0110 5l33 106z" fill="#f2f2f2"/><path d="M449 140L410 12a17 17 0 00-21-11l-93 28-191 59-93 28a17 17 0 00-11 21l134 438a17 17 0 0016 12 17 17 0 005 0l64-20 2-1v-2l-2 1-65 20a15 15 0 01-18-10L3 137a15 15 0 0110-19l92-28 192-59 92-28a15 15 0 015-1 15 15 0 0114 11l39 127 1 2h2z" fill="#3f3d56"/><path d="M123 128a9 9 0 01-9-7l-13-42a9 9 0 016-11l176-54a9 9 0 0111 6l13 42a9 9 0 01-6 12l-176 53a9 9 0 01-2 1z" fill="#6c63ff"/><circle cx="190.2" cy="25" r="20" fill="#6c63ff"/><circle cx="190.2" cy="25" r="12.7" fill="#fff"/><path d="M603 582H265a9 9 0 01-9-8V169a9 9 0 019-9h338a9 9 0 018 9v405a9 9 0 01-8 8z" fill="#e6e6e6"/><path d="M447 140H237a17 17 0 00-17 17v408l2-1V157a15 15 0 0115-15h211zm184 0H237a17 17 0 00-17 17v458a17 17 0 0017 17h394a17 17 0 0017-17V157a17 17 0 00-17-17zm15 475a15 15 0 01-15 15H237a15 15 0 01-15-15V157a15 15 0 0115-15h394a15 15 0 0115 15z" fill="#3f3d56"/><path d="M526 184H342a9 9 0 01-9-9v-44a9 9 0 019-9h184a9 9 0 019 9v44a9 9 0 01-9 9z" fill="#6c63ff"/><circle cx="433.6" cy="105.2" r="20" fill="#6c63ff"/><circle cx="433.6" cy="105.2" r="12.2" fill="#fff"/></svg>

src/components/teams/TeamDetail.svelte

@@ -111,7 +111,7 @@ import Teams from "./Teams.svelte";
       duration: -1,
     }).showToast();
     fetch(
-      `https://dev.lauf-fuer-kaya.de/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+      `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
       {
         method: "POST",
         headers: {

src/components/teams/TeamsOverview.svelte

@@ -35,13 +35,13 @@
       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
       );
       fetch(
-        `https://dev.lauf-fuer-kaya.de/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
+        `${config.baseurl}/documents/contracts?locale=${locale}&download=true&key=${config.documentserver_key}`,
         {
           method: "POST",
           headers: {

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

@@ -7,6 +7,7 @@
     "add-donation": "Sponsoring erstellen",
     "add-donor": "Sponsor:in erstellen",
     "add-scan": "Scan erstellen",
+    "add-the-first-scanstation": "Erstelle deine erste Scannerstation.",
     "add-user-group": "Neue Gruppe erstellen",
     "add-your-first-contact": "Erstelle den ersten Kontakt",
     "add-your-first-donor": "Erstelle die erste Sponsor:in",
@@ -16,7 +17,8 @@
     "add-your-first-team": "Erstelle das erste Team",
     "add-your-first-track": "Erstelle den ersten Track (Laufstrecke).",
     "add-your-first-user": "Erstelle die erste Benutzer:in",
-    "add-your-fist-scan": "Füge deinene ersten Scan hinzu",
+    "add-your-fist-donation": "Erstelle dein erstes Sponsoring",
+    "add-your-fist-scan": "Füge deinen ersten Scan hinzu",
     "adding-scan": "Scan wird hinzugefügt",
     "address": "Adresse",
     "address-is-required": "Du musst eine Adresse angeben",
@@ -87,7 +89,7 @@
     "csv_import__middlename": "Mittelname",
     "csv_import__team": "Team",
     "danger-zone": "Gefahrenzone",
-    "dashboard-greeting": "Moin",
+    "dashboard-greeting": "Hallo",
     "dashboard-title": "Dashboard",
     "datatable": {
         "search": "🔍 Suche ...",
@@ -130,6 +132,7 @@
     "do-you-want-to-delete-the-organization-delete_org-name": "Möchtest du die Organisation {orgname} löschen?",
     "do-you-want-to-delete-the-team-delete_team-name": "Möchtest du das Team {teamname} löschen?",
     "do-you-want-to-delete-this-donor-with-all-related-donations": "Möchtest du diese Sponsor:in mit all ihren Sponsorings löschen?",
+    "documentation": "Dokumentation",
     "donation-amount": "Sponsoringbetrag",
     "donation-amount-must-be-greater-that-0-00eur": "Der Sponsoringbetrag muss größer als 0.00€ sein.",
     "donations": "Sponsorings",
@@ -321,11 +324,12 @@
     "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.",
     "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",
     "there-are-no-groups-yet": "Es gibt noch keine Gruppen",
     "there-are-no-organizations-added-yet": "Es wurden noch keine Organisationen hinzugefügt.",
     "there-are-no-runners-added-yet": "Es wurden noch keine Läufer:innen hinzugefügt.",
-    "there-are-no-scans-yet": "Es gibt noch keine scans",
+    "there-are-no-scans-yet": "Es gibt noch keine Scans",
     "there-are-no-teams-added-yet": "Es wurden noch keine Teams hinzugefügt.",
     "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",
@@ -370,6 +374,7 @@
     "yes-i-copied-the-token": "Ja, ich habe den Token kopiert",
     "you-are-going-to-loose-all-permissions-and-access-to-the-runner-system": "Du wirst all deine Berechtigungen und den Zugriff aufs Läufersystem verlieren!",
     "you-can-now-use-your-new-password-to-log-in-to-your-account": "Du kannst dich jetzt mit deinem neuen Passwort anmelden! 🎉",
+    "you-dont-have-any-scanstations-yet": "Es gibt noch keine Scannerstationen",
     "you-have-to-provide-an-organization": "Du musst eine Organisation angeben",
     "zip-postal-code": "Postleitzahl"
 }

src/locales/en.json

@@ -7,6 +7,7 @@
     "add-donation": "Add donation",
     "add-donor": "add donor",
     "add-scan": "Add scan",
+    "add-the-first-scanstation": "Add your first scanstation.",
     "add-user-group": "Add User Group",
     "add-your-first-contact": "Add your first contact",
     "add-your-first-donor": "add your first donor",
@@ -16,6 +17,7 @@
     "add-your-first-team": "Add your first team",
     "add-your-first-track": "Add your first track.",
     "add-your-first-user": "Add your first user",
+    "add-your-fist-donation": "Add your fist donation",
     "add-your-fist-scan": "Add your fist scan",
     "adding-scan": "Adding Scan",
     "address": "Address",
@@ -87,7 +89,7 @@
     "csv_import__middlename": "Middlename",
     "csv_import__team": "Team",
     "danger-zone": "Danger zone",
-    "dashboard-greeting": "hello there",
+    "dashboard-greeting": "Hello",
     "dashboard-title": "Dashboard",
     "datatable": {
         "search": "🔍 Search...",
@@ -130,6 +132,7 @@
     "do-you-want-to-delete-the-organization-delete_org-name": "Do you want to delete the organization {orgname}?",
     "do-you-want-to-delete-the-team-delete_team-name": "Do you want to delete the team {teamname}?",
     "do-you-want-to-delete-this-donor-with-all-related-donations": "Do you want to delete this donor with all related donations",
+    "documentation": "Documentation",
     "donation-amount": "Donation amount",
     "donation-amount-must-be-greater-that-0-00eur": "Donation amount must be greater that 0.00€",
     "donations": "Donations",
@@ -321,6 +324,7 @@
     "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",
     "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",
     "there-are-no-groups-yet": "There are no groups yet",
     "there-are-no-organizations-added-yet": "There are no organizations added yet.",
@@ -370,6 +374,7 @@
     "yes-i-copied-the-token": "Yes, I copied the token",
     "you-are-going-to-loose-all-permissions-and-access-to-the-runner-system": "You are going to loose all permissions and access to the runner system!",
     "you-can-now-use-your-new-password-to-log-in-to-your-account": "You can now use your new password to log in to your account! 🎉",
+    "you-dont-have-any-scanstations-yet": "You don't have any scanstations yet",
     "you-have-to-provide-an-organization": "You have to provide an organization",
     "zip-postal-code": "ZIP/ postal code"
 }

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: {
-			center: true,
-			padding: '1.5rem'
+		extend: {
+			colors: {
+				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
-};