Merge pull request 'Merge Minor into main' (#113) from dev into main

Reviewed-on: #113
Reviewed-by: Philipp Dormann <philipp@philippdormann.de>

CHANGELOG.md

@@ -2,49 +2,8 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [0.10.0](https://git.odit.services/lfk/frontend/compare/0.9.1...0.10.0)
-
-- Added translations [`79c447b`](https://git.odit.services/lfk/frontend/commit/79c447b4c65e55ebb5af71fb0b09174c36e2cecf)
-- Sorted translations 🌍 [`5bd3a46`](https://git.odit.services/lfk/frontend/commit/5bd3a463f00abaf2c98ab554f88e5542d01f364a)
-- Reset can now only be triggered if pw is strong enoug [`75d8f73`](https://git.odit.services/lfk/frontend/commit/75d8f7331b6ae78f3979bb62148188a16f83cb8d)
-- Module now exports functions that check if a password is strong enough and equal to a potential confirmation field [`b2509e9`](https://git.odit.services/lfk/frontend/commit/b2509e9e53ab6b51dfd55e26712e8928160cd64b)
-- Added more cirteria to the password strength component [`5fa9939`](https://git.odit.services/lfk/frontend/commit/5fa9939696a35d60d762feb0cebef61d31869218)
-- Now using pw strength component [`6aaf838`](https://git.odit.services/lfk/frontend/commit/6aaf8384512185a3a319ce6b3e2505e910468e64)
-- Added a password strength verification [`ad3bd31`](https://git.odit.services/lfk/frontend/commit/ad3bd312e9a5785f81029ea2b7e302ea1addd988)
-- Implemented a custom password strength component [`4956bb0`](https://git.odit.services/lfk/frontend/commit/4956bb0e9c3c1d22d60e849aea5664e35330f897)
-- User creation can now only be triggered if pw is strong enoug [`540304f`](https://git.odit.services/lfk/frontend/commit/540304f947f60a7072c592ca8088996ce7e95cb4)
-- Now using pw strength component for user creation [`7862f44`](https://git.odit.services/lfk/frontend/commit/7862f446532903f1a2eac7b21d5c80c3245785e5)
-- Added missing exports [`962dd0c`](https://git.odit.services/lfk/frontend/commit/962dd0c1bbc0df7f20bcec5b4247188c8935c87e)
-- new license file version [CI SKIP] [`aedb8a7`](https://git.odit.services/lfk/frontend/commit/aedb8a765ba053545adbba9eb014b3bb0e5aac8c)
-- Bumped lfk-client version 🔝 [`cf58bd1`](https://git.odit.services/lfk/frontend/commit/cf58bd15c3541c417ab2be83d96135e931a2b6f6)
-- new license file version [CI SKIP] [`34f4f68`](https://git.odit.services/lfk/frontend/commit/34f4f68524918fd3d1963966a1e259d5b60efaca)
-- Merge pull request 'Implemented password strength test feature/106-password_strength' (#115) from feature/106-password_strength into dev [`09b8144`](https://git.odit.services/lfk/frontend/commit/09b81440804cf98303fcb723a9717d6d0f432da8)
-- Formatting🛠 [`4167819`](https://git.odit.services/lfk/frontend/commit/4167819e7a864d3b1dd95ba48ab1525a454f7f30)
-- Now using pw strength component for reset [`5d5f7c7`](https://git.odit.services/lfk/frontend/commit/5d5f7c7f5c6a69146f41996f4facfeff95791be0)
-
-#### [0.9.1](https://git.odit.services/lfk/frontend/compare/0.9.0...0.9.1)
-
-> 26 March 2021
-
-- 🚀RELEASE v0.9.1 [`2ca63fd`](https://git.odit.services/lfk/frontend/commit/2ca63fd1f675f0da2b18ba43095074dd4823991d)
-- Merge pull request 'Org selfservice Link feature/112-org_registration_links' (#114) from feature/112-org_registration_links into dev [`a5d25e7`](https://git.odit.services/lfk/frontend/commit/a5d25e7d92c7c37e90dbb4ba74b787873f920c6b)
-- Added checkbox to enable registration [`f9fe793`](https://git.odit.services/lfk/frontend/commit/f9fe79357317653b46c09eb95b0db13845cddcf9)
-- Sorted translations [`c074c12`](https://git.odit.services/lfk/frontend/commit/c074c12be75f285612f7a732c106404d9fb4538a)
-- You can now copy the selfservice links to your clipboard [`fcd55f8`](https://git.odit.services/lfk/frontend/commit/fcd55f89d72e6ceb9bb2bdd194cc3420145d6d0d)
-- Formatting [`f185d55`](https://git.odit.services/lfk/frontend/commit/f185d559c0d6476f2f2b9ea74aaad3297411801d)
-- Copy now 100% worX [`a3921b4`](https://git.odit.services/lfk/frontend/commit/a3921b45c70b410293db593a75d2fdd34c131733)
-- Fixed changes in wrong file [`73d95bc`](https://git.odit.services/lfk/frontend/commit/73d95bc0042f8f586ba2f2345342e25da1d280c2)
-- Added check if key exists [`c2d29ff`](https://git.odit.services/lfk/frontend/commit/c2d29ff233f6b3e9dd2555b7e0b845592da2ba35)
-- Added check if key exists [`2316baa`](https://git.odit.services/lfk/frontend/commit/2316baa8984832382be9f3b4549ca62cf9ccb5a3)
-- Added translations [`ddbc293`](https://git.odit.services/lfk/frontend/commit/ddbc293e9ca0525910bf3d995de970ee2c35c56a)
-- new license file version [CI SKIP] [`ded9b58`](https://git.odit.services/lfk/frontend/commit/ded9b589fe087915176c5b54f3c55e412541bc8f)
-- Merge pull request 'first merge to main 🚀' (#71) from dev into main [`9aa8e7e`](https://git.odit.services/lfk/frontend/commit/9aa8e7edffa7e51b00a5ab7a8f16828b7a469181)
-
 #### [0.9.0](https://git.odit.services/lfk/frontend/compare/0.8.7...0.9.0)
 
-> 26 March 2021
-
-- 🚀RELEASE v0.9.0 [`67c3732`](https://git.odit.services/lfk/frontend/commit/67c3732fad5a7c64ae11dcbebaaa095e1a2b387c)
 - Merge pull request 'Runner cards feature/94-runnercard_mgnt' (#111) from feature/94-runnercard_mgnt into dev [`2932f45`](https://git.odit.services/lfk/frontend/commit/2932f4591e62187a4903511051d110e9679c0993)
 - Sorted translations 🌍 [`1665a1a`](https://git.odit.services/lfk/frontend/commit/1665a1a093862a13be78ec65dcdf64eb7d855593)
 - Added translations [`6b5945a`](https://git.odit.services/lfk/frontend/commit/6b5945add86a77630c500872545bb91724b2047f)

index.template.html

@@ -14,7 +14,7 @@
 </head>
 
 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.10.0-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.9.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>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.10.0",
+	"version": "0.9.0",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev:all": "yarn prebuild && snowpack dev",
@@ -13,8 +13,7 @@
 	},
 	"license": "CC-BY-NC-SA-4.0",
 	"dependencies": {
-		"@odit/lfk-client-js": "0.8.0",
+		"@odit/lfk-client-js": "0.7.0",
-		"check-password-strength": "^2.0.2",
 		"csvtojson": "^2.0.10",
 		"gridjs": "3.3.0",
 		"localforage": "1.9.0",

src/components/auth/PasswordStrength.svelte

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

src/components/auth/ResetPassword.svelte

@@ -1,43 +1,38 @@
 <script>
-  import { AuthService } from "@odit/lfk-client-js";
+  import {  AuthService } from "@odit/lfk-client-js";
   import { _ } from "svelte-i18n";
   import Toastify from "toastify-js";
   import "toastify-js/src/toastify.css";
-  import PasswordStrength, {
-    password_strong_enough,
-  } from "../auth/PasswordStrength.svelte";
   let state = "reset_in_progress";
   let password = "";
   export let params;
   function set_new_password() {
-    if (password.trim() !== "") {
+      if(password.trim() !== ""){
-      Toastify({
+        Toastify({
-        text: $_("password-reset-in-progress"),
+          text: $_('password-reset-in-progress'),
-        duration: 3500,
+          duration: 3500,
-      }).showToast();
+        }).showToast();
-      AuthService.authControllerResetPassword(atob(params.resetkey), {
+        AuthService.authControllerResetPassword(atob(params.resetkey),{ password })
-        password,
-      })
         .then((resp) => {
           Toastify({
-            text: $_("password-reset-successful"),
+            text: $_('password-reset-successful'),
             duration: 3500,
           }).showToast();
-          state = "reset_success";
+          state="reset_success";
         })
         .catch((err) => {
-          state = "reset_error";
+          state="reset_error";
         });
-    } else {
+      } else {
       Toastify({
-        text: $_("please-provide-a-password"),
+        text: $_('please-provide-a-password'),
         duration: 3500,
       }).showToast();
     }
   }
 </script>
 
-{#if state === 'reset_success'}
+{#if state==="reset_success"}
   <div class="min-h-screen flex items-center justify-center bg-gray-100">
     <div class="max-w-md w-full py-12 px-6">
       <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
@@ -61,31 +56,31 @@
       </div>
     </div>
   </div>
-{:else if state === 'reset_error'}
+{:else if state==="reset_error"}
-  <div class="min-h-screen flex items-center justify-center bg-gray-100">
+<div class="min-h-screen flex items-center justify-center bg-gray-100">
-    <div class="max-w-md w-full py-12 px-6">
+  <div class="max-w-md w-full py-12 px-6">
-      <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
+    <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
-      <p class="mt-6 text-lg text-center font-bold text-gray-900">
+    <p class="mt-6 text-lg text-center font-bold text-gray-900">
-        {$_('application_name')}
+      {$_('application_name')}
-      </p>
+    </p>
-      <p class="mt-2 mb-2 text-sm text-center text-gray-900 font-bold">
+    <p class="mt-2 mb-2 text-sm text-center text-gray-900 font-bold">
-        {$_('password-reset-failed')}
+      {$_('password-reset-failed')}
-      </p>
+    </p>
-      <p class="mt-2 mb-2 text-sm text-center text-gray-900">
+    <p class="mt-2 mb-2 text-sm text-center text-gray-900">
-        {$_('please-request-a-new-reset-mail')}
+      {$_('please-request-a-new-reset-mail')}
-      </p>
+    </p>
+    <div class="mt-6">
       <div class="mt-6">
-        <div class="mt-6">
+        <a
-          <a
+          href="/forgot_password/"
-            href="/forgot_password/"
+          class="text-center relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm">
-            class="text-center relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm">
+          {$_('request-a-new-reset-mail')}
-            {$_('request-a-new-reset-mail')}
+        </a>
-          </a>
-        </div>
       </div>
     </div>
   </div>
-{:else if state === 'reset_in_progress'}
+</div>
+{:else if state==="reset_in_progress"}
   <div class="min-h-screen flex items-center justify-center bg-gray-100">
     <div class="max-w-md w-full py-12 px-6">
       <img style="height:10rem;" class="mx-auto" src="/lfk-logo.png" alt="" />
@@ -107,14 +102,11 @@
               placeholder={$_('new-password')}
               bind:value={password} />
           </div>
-          <PasswordStrength bind:password_change={password} />
         </div>
 
         <div class="mt-5">
           <button
             on:click={set_new_password}
-            disabled={!password_strong_enough(password)}
-            class:opacity-50={!password_strong_enough(password)}
             type="submit"
             class="relative block w-full py-2 px-3 border border-transparent rounded-md text-white font-semibold bg-gray-800 hover:bg-gray-700 focus:bg-gray-900 focus:outline-none focus:shadow-outline sm:text-sm">
             <span class="absolute left-0 inset-y pl-3">

src/components/orgs/OrgDetail.svelte

@@ -12,7 +12,6 @@
   import Select from "svelte-select";
   import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
-  import { tick } from "svelte";
   $: delete_triggered = false;
   $: address_valid_or_none =
     (isAddress1Valid && iszipcodevalid && iscityvalid) ||
@@ -21,9 +20,6 @@
   let original = "";
   let original_object = {};
   let contacts = [];
-  let valueCopy = null;
-  let areaDom;
-  let copied = false;
   export let params;
   $: editable = {};
   $: contact = {};
@@ -35,7 +31,6 @@
   $: sponsoring_contracts_show = true;
   $: cards_show = true;
   $: generate_orgs = [original_object];
-  $: registrationLink = `${config.baseurl}/selfservice/register/${editable.registrationKey}`;
   const getContactLabel = (option) =>
     option.firstname + " " + (option.middlename || "") + " " + option.lastname;
   const promise = RunnerOrganizationService.runnerOrganizationControllerGetOne(
@@ -103,7 +98,6 @@
         postdata
       )
         .then((resp) => {
-          editable.registrationKey = resp.registrationKey;
           original_object = Object.assign({}, editable);
           original = JSON.stringify(original_object);
           Toastify({
@@ -116,46 +110,9 @@
     } else {
     }
   }
-  async function copy() {
-    if(!editable.registrationKey){
-      Toastify({
-        text: $_('you-have-to-save-your-changes-to-generate-a-link'),
-        duration: 500,
-        backgroundColor:
-          "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
-      }).showToast();
-      return;
-    }
-    valueCopy = registrationLink;
-    await tick();
-    areaDom.focus();
-    areaDom.select();
-    try {
-      const successful = document.execCommand("copy");
-      if (!successful) {
-        throw new Error();
-      }
-      Toastify({
-        text: $_("copied-link-to-clipboard"),
-        duration: 500,
-        backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
-      }).showToast();
-      copied = true;
-    } catch (err) {
-      Toastify({
-        text: $_("error-whyile-copying-to-clipboard"),
-        duration: 500,
-        backgroundColor:
-          "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
-      }).showToast();
-    }
-    // we can notifi by event or storage about copy status
-    valueCopy = null;
-  }
   export let import_modal_open = false;
 </script>
 
-{#if valueCopy != null}<textarea bind:this={areaDom}>{valueCopy}</textarea>{/if}
 <ImportRunnerModal
   on:cancelDelete={(event) => {
     import_modal_open = false;
@@ -175,7 +132,9 @@
         <GenerateSponsoringContracts
           bind:sponsoring_contracts_show
           bind:generate_orgs />
-        <GenerateRunnerCards bind:cards_show bind:generate_orgs />
+        <GenerateRunnerCards
+          bind:cards_show
+          bind:generate_orgs />
         {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:IMPORT')}
           <button
             on:click={() => {
@@ -318,151 +277,99 @@
         on:select={(selectedValue) => (editable.contact = selectedValue.detail.value)}
         on:clear={() => (editable.contact = null)} />
     </div>
-    <div>
+    <!--  -->
-      <div class="flex items-start mt-2">
+    <div class="flex items-start mt-2">
-        <div class="flex items-center h-5">
+      <div class="flex items-center h-5">
-          <input
+        <input
-            bind:checked={editable.registrationEnabled}
+          bind:checked={editable.address_checked}
-            id="comments"
+          id="comments"
-            name="comments"
+          name="comments"
-            type="checkbox"
+          type="checkbox"
-            class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
+          class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
-        </div>
-        <div class="ml-3 text-sm">
-          <label
-            for="comments"
-            class="font-medium text-gray-700">{$_('selfservice-registration')}</label>
-        </div>
       </div>
-      <div>
+      <div class="ml-3 text-sm">
-        {#if editable.registrationEnabled}
+        <label
-          <div class="text-sm w-full">
+          for="comments"
-            <div on:click={copy} class="inline-flex w-full">
+          class="font-medium text-gray-700">{$_('address')}</label>
-              <p
-                name="token"
-                class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 p-2">
-                {#if editable.registrationKey}
-                {registrationLink}
-                {:else}
-                {$_('you-have-to-save-your-changes-to-generate-a-link')}
-                {/if}
-              </p>
-              <div
-                class="bg-gray-200 border-gray-300 border-t border-b border-r text-black rounded-r-md sm:text-sm p-2 mt-1 cursor-pointer">
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  viewBox="0 0 24 24"
-                  width="24"
-                  height="24"><path fill="none" d="M0 0h24v24H0z" />
-                  <path
-                    fill="currentColor"
-                    d="M7 4V2h10v2h3l1 1v16a1 1 0 01-1 1H4a1 1 0 01-1-1V5l1-1h3zm0 2H5v14h14V6h-2v2H7V6zm2-2v2h6V4H9z" /></svg>
-              </div>
-            </div>
-            {#if editable.registrationKey}
-            <p class="text-gray-500 text-xs">
-              {$_('click-to-copy-the-link-into-your-clipboard')}
-            </p>
-            {/if}
-          </div>
-        {/if}
-        <!--  -->
-        <div>
-          <div class="flex items-start mt-2">
-            <div class="flex items-center h-5">
-              <input
-                bind:checked={editable.address_checked}
-                id="comments"
-                name="comments"
-                type="checkbox"
-                class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" />
-            </div>
-            <div class="ml-3 text-sm">
-              <label
-                for="comments"
-                class="font-medium text-gray-700">{$_('address')}</label>
-            </div>
-          </div>
-        </div>
-        {#if editable.address_checked === true}
-          <div class="col-span-6">
-            <label
-              for="address1"
-              class="block text-sm font-medium text-gray-700">{$_('address')}</label>
-            <input
-              autocomplete="off"
-              placeholder="Address"
-              class:border-red-500={!isAddress1Valid}
-              class:focus:border-red-500={!isAddress1Valid}
-              class:focus:ring-red-500={!isAddress1Valid}
-              bind:value={editable.address.address1}
-              type="text"
-              name="address1"
-              class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
-            {#if !isAddress1Valid}
-              <span
-                class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                {$_('address-is-required')}
-              </span>
-            {/if}
-          </div>
-          <div class="col-span-6">
-            <label
-              for="address2"
-              class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
-            <input
-              autocomplete="off"
-              placeholder={$_('apartment-suite-etc')}
-              bind:value={editable.address.address2}
-              type="text"
-              name="address2"
-              class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
-          </div>
-          <div class="col-span-6">
-            <label
-              for="zipcode"
-              class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')}</label>
-            <input
-              autocomplete="off"
-              placeholder={$_('zip-postal-code')}
-              class:border-red-500={!iszipcodevalid}
-              class:focus:border-red-500={!iszipcodevalid}
-              class:focus:ring-red-500={!iszipcodevalid}
-              bind:value={editable.address.postalcode}
-              type="text"
-              name="zipcode"
-              class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
-            {#if !iszipcodevalid}
-              <span
-                class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                {$_('valid-zipcode-postal-code-is-required')}
-              </span>
-            {/if}
-          </div>
-          <div class="col-span-6">
-            <label
-              for="city"
-              class="block text-sm font-medium text-gray-700">{$_('city')}</label>
-            <input
-              autocomplete="off"
-              placeholder={$_('city')}
-              class:border-red-500={!iscityvalid}
-              class:focus:border-red-500={!iscityvalid}
-              class:focus:ring-red-500={!iscityvalid}
-              bind:value={editable.address.city}
-              type="text"
-              name="city"
-              class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
-            {#if !iscityvalid}
-              <span
-                class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                {$_('valid-city-is-required')}
-              </span>
-            {/if}
-          </div>
-        {/if}
       </div>
     </div>
+    {#if editable.address_checked === true}
+      <div class="col-span-6">
+        <label
+          for="address1"
+          class="block text-sm font-medium text-gray-700">{$_('address')}</label>
+        <input
+          autocomplete="off"
+          placeholder="Address"
+          class:border-red-500={!isAddress1Valid}
+          class:focus:border-red-500={!isAddress1Valid}
+          class:focus:ring-red-500={!isAddress1Valid}
+          bind:value={editable.address.address1}
+          type="text"
+          name="address1"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !isAddress1Valid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('address-is-required')}
+          </span>
+        {/if}
+      </div>
+      <div class="col-span-6">
+        <label
+          for="address2"
+          class="block text-sm font-medium text-gray-700">{$_('apartment-suite-etc')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('apartment-suite-etc')}
+          bind:value={editable.address.address2}
+          type="text"
+          name="address2"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+      </div>
+      <div class="col-span-6">
+        <label
+          for="zipcode"
+          class="block text-sm font-medium text-gray-700">{$_('zip-postal-code')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('zip-postal-code')}
+          class:border-red-500={!iszipcodevalid}
+          class:focus:border-red-500={!iszipcodevalid}
+          class:focus:ring-red-500={!iszipcodevalid}
+          bind:value={editable.address.postalcode}
+          type="text"
+          name="zipcode"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !iszipcodevalid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('valid-zipcode-postal-code-is-required')}
+          </span>
+        {/if}
+      </div>
+      <div class="col-span-6">
+        <label
+          for="city"
+          class="block text-sm font-medium text-gray-700">{$_('city')}</label>
+        <input
+          autocomplete="off"
+          placeholder={$_('city')}
+          class:border-red-500={!iscityvalid}
+          class:focus:border-red-500={!iscityvalid}
+          class:focus:ring-red-500={!iscityvalid}
+          bind:value={editable.address.city}
+          type="text"
+          name="city"
+          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
+        {#if !iscityvalid}
+          <span
+            class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+            {$_('valid-city-is-required')}
+          </span>
+        {/if}
+      </div>
+    {/if}
   </section>
 {:else}
   {#await promise}

src/components/pdf_generation/GenerateSponsoringContracts.svelte

@@ -1,9 +1,6 @@
 <script>
     import { getLocaleFromNavigator, _ } from "svelte-i18n";
-    import {
+    import { RunnerOrganizationService, RunnerTeamService } from "@odit/lfk-client-js";
-        RunnerOrganizationService,
-        RunnerTeamService,
-    } from "@odit/lfk-client-js";
     import Toastify from "toastify-js";
     export let sponsoring_contracts_show = false;
     export let generate_runners = [];

src/components/scanstations/CopyScanStationTokenModal.svelte

@@ -23,14 +23,14 @@
         throw new Error();
       }
       Toastify({
-        text: $_("copied-token-to-clipboard"),
+        text: $_('copied-token-to-clipboard'),
         duration: 500,
         backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
       }).showToast();
       copied = true;
     } catch (err) {
       Toastify({
-        text: $_("error-whyile-copying-to-clipboard"),
+        text: $_('error-whyile-copying-to-clipboard'),
         duration: 500,
         backgroundColor:
           "linear-gradient(90deg, hsla(281, 37%, 45%, 1) 0%, hsla(1, 62%, 48%, 1) 100%)",
@@ -75,9 +75,7 @@
                   d="M4 5v11h16V5H4zM2 4a1 1 0 011-1h18a1 1 0 011 1v14H2V4zM1 19h22v2H1v-2z" /></svg>
             </div>
             <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">
+              <h3 class="text-lg leading-6 font-medium text-gray-900">{$_('token')}</h3>
-                {$_('token')}
-              </h3>
               <div class="mt-2 mb-6">
                 <p class="text-sm text-gray-500">
                   {$_('the-scanstations-api-token-will-only-get-displayed-once-you-wont-be-able-to-change-or-view-it-again')}
@@ -108,9 +106,7 @@
                         d="M7 4V2h10v2h3l1 1v16a1 1 0 01-1 1H4a1 1 0 01-1-1V5l1-1h3zm0 2H5v14h14V6h-2v2H7V6zm2-2v2h6V4H9z" /></svg>
                   </div>
                 </div>
-                <p class="text-gray-500 text-xs">
+                <p class="text-gray-500 text-xs">{$_('click-to-copy-token-to-clipboard')}</p>
-                  {$_('click-to-copy-token-to-clipboard')}
-                </p>
               </div>
             </div>
           </div>

src/components/settings/Settings.svelte

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

src/components/users/AddUserModal.svelte

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

src/locales/de.json

@@ -53,7 +53,6 @@
     "change-your-password-here": "Hier kannst du dein Passwort ändern",
     "changing-your-password": "Passwort wird geändert",
     "city": "Stadt",
-    "click-to-copy-the-link-into-your-clipboard": "Klicke auf den Link, um ihn in deine Zwischenablage zu kopieren",
     "click-to-copy-token-to-clipboard": "Klicke auf den Token, um ihn in deine Zwischenablage zu kopieren",
     "close": "Schließen",
     "code": "Code",
@@ -73,7 +72,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-link-to-clipboard": "Link wurde in die Zwischenablage kopiert",
     "copied-token-to-clipboard": "Token wurde in die Zwischenablage kopiert",
     "count_organizations": "Organisationen (Anzahl)",
     "count_teams": "Teams (Anzahl)",
@@ -245,10 +243,6 @@
     "middle-name": "Mittelname",
     "minimum-lap-time-in-s": "Minimale Rundenzeit (in Sekunden)",
     "minimum-lap-time-must-be-a-positive-number-or-0": "Die minimale Rundenzeit muss eine positive Zahl oder 0 sein",
-    "must-be-at-least-10-characters-long": "Passwort muss mindestens 10 Zeichen lang sein!",
-    "must-contain-a-lowercase-letter": "Passwort muss einen Großbuchstaben enthalten!",
-    "must-contain-a-number": "Passwort muss eine Zahl enthalten!",
-    "must-contain-a-uppercase-letter": "Passwort muss einen Kleinbuchstaben enthalten!",
     "name": "Name",
     "name-is-required": "Der Gruppenname muss angegeben werden",
     "new-password": "Neues Passwort",
@@ -280,7 +274,7 @@
     "password-reset-in-progress": "Passwort wird zurückgesetzt...",
     "password-reset-mail-sent": "Passwort-Reset Mail wurde an \"{usersEmail}\" geschickt.",
     "password-reset-successful": "Passwort erfolgreich zurückgesetzt!",
-    "passwords-dont-match": "Die Passwörter stimmen nicht überein!",
+    "passwords-dont-match": "Die Passwörter stimmen nicht überein.",
     "pdf-generation-failed": "PDF Generierung fehlgeschlagen!",
     "pdf-successfully-generated": "PDF wurde erfolgreich generiert!",
     "pdfs-successfully-generated": "Alle PDFs wurden generiert!",
@@ -342,7 +336,6 @@
     "search-for-runner-by-name-or-id": "Suche eine Läufer:in (via Name oder Id)",
     "select-all": "Alle auswählen",
     "select-language": "Sprache auswählen",
-    "selfservice-registration": "Selfservice Registrierung",
     "send-a-mail-to-lfk-odit-services": "Sende eine Mail an lfk@odit.services",
     "set-the-user-active-inactive": "Den Benutzer auf (in)aktiv setzen",
     "settings": "Einstellungen",
@@ -419,7 +412,6 @@
     "you-can-provide-a-runner-but-you-dont-have-to": "Du kannst eine Läufer:in angeben, musst aber nicht.",
     "you-dont-have-any-scanstations-yet": "Es gibt noch keine Scannerstationen",
     "you-have-to-provide-an-organization": "Du musst eine Organisation angeben",
-    "you-have-to-save-your-changes-to-generate-a-link": "Du musst deine Änderungen speichern, um einen Link zu generieren.",
     "you-must-create-at-least-one-card-or-cancel": "Du musst mindestens eine Blankokarte erstellen (oder abbrechen).",
     "zip-postal-code": "Postleitzahl"
 }

src/locales/en.json

@@ -53,7 +53,6 @@
     "change-your-password-here": "Change your password here",
     "changing-your-password": "Changing your password",
     "city": "City",
-    "click-to-copy-the-link-into-your-clipboard": "Click to copy the link into your clipboard",
     "click-to-copy-token-to-clipboard": "Click to copy the token to your clipboard",
     "close": "Close",
     "code": "Code",
@@ -73,7 +72,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-link-to-clipboard": "Copied link to clipboard",
     "copied-token-to-clipboard": "Copied token to clipboard",
     "count_organizations": "# Organizations",
     "count_teams": "# Teams",
@@ -245,10 +243,6 @@
     "middle-name": "Middle name",
     "minimum-lap-time-in-s": "minimum lap time in s",
     "minimum-lap-time-must-be-a-positive-number-or-0": "minimum lap time must be a positive number or 0",
-    "must-be-at-least-10-characters-long": "Must be at least 10 characters long!",
-    "must-contain-a-lowercase-letter": "Must contain a lowercase letter!",
-    "must-contain-a-number": "Must contain a number!",
-    "must-contain-a-uppercase-letter": "Must contain a uppercase letter!",
     "name": "Name",
     "name-is-required": "Name is required",
     "new-password": "New password",
@@ -280,7 +274,7 @@
     "password-reset-in-progress": "Password Reset in Progress...",
     "password-reset-mail-sent": "Password reset mail was sent to \"{usersEmail}\".",
     "password-reset-successful": "Password Reset successful!",
-    "passwords-dont-match": "Passwords don't match!",
+    "passwords-dont-match": "Passwords don't match",
     "pdf-generation-failed": "PDF generation failed!",
     "pdf-successfully-generated": "PDF successfully generated!",
     "pdfs-successfully-generated": "PDFs successfully generated!",
@@ -342,7 +336,6 @@
     "search-for-runner-by-name-or-id": "Search for runner (by name or id)",
     "select-all": "select all",
     "select-language": "Select language",
-    "selfservice-registration": "Selfservice registration",
     "send-a-mail-to-lfk-odit-services": "send a mail to lfk@odit.services",
     "set-the-user-active-inactive": "set the user active/ inactive",
     "settings": "Settings",
@@ -420,7 +413,6 @@
     "you-can-provide-a-runner-but-you-dont-have-to": "You can provide a runner, but you don't have to.",
     "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",
-    "you-have-to-save-your-changes-to-generate-a-link": "You have to save your changes to generate a link.",
     "you-must-create-at-least-one-card-or-cancel": "You must create at least one card (or cancel).",
     "zip-postal-code": "ZIP/ postal code"
 }