🚀RELEASE v0.8.7

Reviewed-on: #109

CHANGELOG.md

@@ -2,9 +2,58 @@
 
 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)
+
+> 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)
 

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.template.html

@@ -14,7 +14,7 @@
 </head>
 
 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.8.2-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>
   <script src="/env.js"></script>
   <script defer type="module" src="/_dist_/index.js"></script>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.8.2",
+	"version": "0.8.7",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev:all": "yarn prebuild && snowpack dev",

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
 };

public/imprint_en.md

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

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

@@ -5,10 +5,11 @@
   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 = "demo";
+  let username = config.default_username || "";
-  let password = "demo";
+  let password = config.default_password || "";
   let is_blocked_by_autologin = false;
   let last_loginclick_processed = true;
 
@@ -36,10 +37,19 @@
         text: $_("login_is_checked"),
         duration: 500,
       }).showToast();
-      AuthService.authControllerLogin({
+      let postdata = {};
-        username,
+      if (isEmail(username)) {
-        password,
+        postdata = {
-      })
+          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/dashboard/MainDashContent.svelte

@@ -16,8 +16,7 @@
       -
       {$_('dashboard-greeting')},
       <span
-        class="text-blue-500">{store.state.jwtinfo.userdetails.firstname}</span>
+        class="text-blue-500">{store.state.jwtinfo.userdetails.firstname} {store.state.jwtinfo.userdetails.lastname}</span></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="" />
+    <img class="m-auto" style="height:15rem" src={donations_empty} alt="" />
-    <span class="font-bold">There are no donations yet</span><br />
+    <span class="font-bold">{$_('there-are-no-donations-yet')}</span><br />
-    <span>add your fist donation</span>
+    <span>{$_('add-your-fist-donation')}</span>
   </p>
 </div>

src/components/donations/DonationsOverview.svelte

@@ -74,20 +74,12 @@
                 .toLowerCase()
                 .includes(
                   searchvalue.toLowerCase()
-                ) || donation.donor.middlename
+                ) ||  donation.donor.lastname
-                  .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,11 +88,7 @@
                 .toLowerCase()
                 .includes(
                   searchvalue.toLowerCase()
-                ) || donor.middlename
+                ) ||  donor.lastname
-                  .toLowerCase()
-                  .includes(
-                    searchvalue.toLowerCase()
-                  ) || donor.lastname
                   .toLowerCase()
                   .includes(
                     searchvalue.toLowerCase()

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/general/Imprint.svelte

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

src/components/general/Privacy.svelte

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

src/components/runners/ImportRunnerModal.svelte

@@ -19,6 +19,11 @@
   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 = [];
@@ -44,7 +49,10 @@
     groups = groups.concat(orgs);
     RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
       const teams = val.map((r) => {
-        return { label: `${r.parentGroup.name} > ${r.name}`, value: `TEAM_${r.id}` };
+        return {
+          label: `${r.parentGroup.name} > ${r.name}`,
+          value: `TEAM_${r.id}`,
+        };
       });
       groups = groups.concat(teams);
     });
@@ -120,6 +128,13 @@
           .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") {
@@ -137,6 +152,13 @@
           .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") {
@@ -160,6 +182,13 @@
             .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_")) {
@@ -182,6 +211,13 @@
             .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();
             });
         }
       }
@@ -195,7 +231,7 @@
     use:focusTrap
     use:clickOutside
     on:click_outside={() => {
-      import_modal_open = false;
+      cancelModal();
     }}>
     <div
       class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
@@ -349,6 +385,8 @@
                   </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 inline-flex"
+                    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"
                     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 inline-flex"
+                    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"
                     role="menuitem">
                     {$_('english')}
                   </button>
@@ -249,11 +249,7 @@
                 .toLowerCase()
                 .includes(
                   searchvalue.toLowerCase()
-                ) || runner.middlename
+                ) || runner.lastname
-                  .toLowerCase()
-                  .includes(
-                    searchvalue.toLowerCase()
-                  ) || runner.lastname
                   .toLowerCase()
                   .includes(
                     searchvalue.toLowerCase()

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

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

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/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('USER:CREATE')}
+    {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:CREATE')}
       <button
         on:click={() => {
           modal_open = true;
@@ -27,6 +27,6 @@
   <TeamsOverview bind:current_teams />
 </section>
 
-{#if store.state.jwtinfo.userdetails.permissions.includes('USER:CREATE')}
+{#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:CREATE')}
   <AddTeamModal bind:current_teams bind:modal_open />
 {/if}

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",
@@ -43,6 +45,7 @@
     "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",
@@ -60,6 +63,7 @@
     "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",
@@ -87,7 +91,7 @@
     "csv_import__middlename": "Mittelname",
     "csv_import__team": "Team",
     "danger-zone": "Gefahrenzone",
-    "dashboard-greeting": "Moin",
+    "dashboard-greeting": "Hallo",
     "dashboard-title": "Dashboard",
     "datatable": {
         "search": "🔍 Suche ...",
@@ -122,6 +126,7 @@
     "description-optional": "Beschreibung (optional)",
     "deselect-all": "Alle abwählen",
     "details": "Details",
+    "disabled": "deaktiviert",
     "distance": "Distanz",
     "distance-donation": "Sponsoring",
     "distance-in-km": "Distanz (in KM)",
@@ -130,6 +135,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",
@@ -148,7 +154,10 @@
     "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",
@@ -253,6 +262,7 @@
     "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.",
@@ -265,6 +275,7 @@
     "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...",
@@ -294,6 +305,8 @@
     "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)",
@@ -320,16 +333,19 @@
     "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",
     "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",
     "this-scanstation-is": "Diese Station ist",
+    "token": "Token",
     "total-distance": "gelaufene Strecke",
     "total-donation-amount": "Gesamtbetrag",
     "total-donations": "Spendensumme",
@@ -370,6 +386,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",
@@ -43,6 +45,7 @@
     "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",
@@ -60,6 +63,7 @@
     "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",
@@ -87,7 +91,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...",
@@ -122,6 +126,7 @@
     "description-optional": "Description (optional)",
     "deselect-all": "deselect all",
     "details": "Details",
+    "disabled": "disabled",
     "distance": "Distance",
     "distance-donation": "distance donation",
     "distance-in-km": "Distance in km",
@@ -130,6 +135,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",
@@ -148,7 +154,10 @@
     "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",
@@ -253,6 +262,7 @@
     "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",
@@ -265,6 +275,7 @@
     "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...",
@@ -294,6 +305,8 @@
     "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)",
@@ -320,7 +333,9 @@
     "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",
     "there-are-no-groups-yet": "There are no groups yet",
     "there-are-no-organizations-added-yet": "There are no organizations added yet.",
@@ -330,6 +345,7 @@
     "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",
@@ -370,6 +386,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"
 }