Merge branch 'dev' of https://git.odit.services/lfk/frontend into dev

Reviewed-on: #58
close #15

package.json

@@ -12,17 +12,18 @@
 		"licenses:export": "license-exporter --json -o public"
 	},
 	"dependencies": {
-		"@odit/lfk-client-js": "0.3.0",
+		"@odit/lfk-client-js": "0.4.2",
 		"csvtojson": "^2.0.10",
 		"filepond": "4.25.1",
 		"gridjs": "3.2.2",
 		"localforage": "1.9.0",
 		"lodash.isequal": "^4.5.0",
+		"marked": "^1.2.9",
 		"svelte-filepond": "0.0.1",
 		"svelte-focus-trap": "1.0.1",
 		"svelte-i18n": "3.3.0",
 		"tailwindcss": "2.0.2",
-		"tinro": "0.5.9",
+		"tinro": "0.5.12",
 		"toastify-js": "1.9.3",
 		"validator": "13.5.2",
 		"xlsx": "^0.16.9"
@@ -31,15 +32,15 @@
 		"@odit/license-exporter": "0.0.9",
 		"@snowpack/plugin-svelte": "3.5.2",
 		"auto-changelog": "^2.2.1",
-		"autoprefixer": "10.2.3",
+		"autoprefixer": "10.2.4",
 		"cross-env": "^7.0.3",
-		"postcss": "8.2.4",
+		"postcss": "8.2.5",
 		"postcss-load-config": "3.0.0",
-		"release-it": "^14.2.2",
+		"release-it": "^14.3.0",
 		"snowpack": "3.0.11",
-		"svelte": "3.32.0",
-		"svelte-preprocess": "4.6.3",
-		"workbox-cli": "6.0.2"
+		"svelte": "3.32.1",
+		"svelte-preprocess": "4.6.6",
+		"workbox-cli": "6.1.0"
 	},
 	"release-it": {
 		"git": {

public/imprint_en.md

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

public/privacy_en.md

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

src/App.svelte

@@ -50,6 +50,8 @@
   import TeamDetail from "./components/TeamDetail.svelte";
   import UserPermissions from "./components/UserPermissions.svelte";
   import RunnerDetail from "./components/RunnerDetail.svelte";
+  import Imprint from "./components/Imprint.svelte";
+  import Privacy from "./components/Privacy.svelte";
   store.init();
   registerSW();
 </script>
@@ -63,6 +65,14 @@
     <Route path="/about">
       <About />
     </Route>
+  {:else if $router.path === '/imprint'}
+    <Route path="/imprint">
+      <Imprint />
+    </Route>
+  {:else if $router.path === '/privacy'}
+    <Route path="/privacy">
+      <Privacy />
+    </Route>
   {:else if $store.isLoggedIn}
     <Dashboard>
       <Transition>

src/components/AddUserModal.svelte

@@ -28,10 +28,7 @@
   $: isLastnameValid = lastname_input_value.trim().length !== 0;
   $: isFirstnameValid = firstname_input_value.trim().length !== 0;
   $: createbtnenabled =
-    isFirstnameValid &&
-    isLastnameValid &&
-    isPasswordValid &&
-    !(!isEmailValid && username_input_value.trim().length === 0);
+    isFirstnameValid && isLastnameValid && isPasswordValid && isEmailValid;
   (function () {
     document.onkeydown = function (e) {
       e = e || window.event;
@@ -241,17 +238,9 @@
                     type="email"
                     name="email"
                     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 !isEmailValid}
+                  {#if !isEmailValid}
                     <span
-                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                      valid email or username is required
-                    </span>
-                  {/if} -->
-                  {#if !isEmailValid && username_input_value.trim().length === 0}
-                    <span
-                      class="mt-8 flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                      valid email or username is required
-                    </span>
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">{$_('valid-email-is-required')}</span>
                   {/if}
                 </div>
               </div>

src/components/Dashboard.svelte

@@ -122,100 +122,6 @@
           <span>{$_('tracks')}</span>
         </a>
       {/if}
-      <a
-        class:bg-gray-100={false}
-        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
-        href="#">
-        <svg
-          class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 20 20"
-          fill="currentColor">
-          <path d="M9 2a1 1 0 000 2h2a1 1 0 100-2H9z" />
-          <path
-            fill-rule="evenodd"
-            d="M4 5a2 2 0 012-2 3 3 0 003 3h2a3 3 0 003-3 2 2 0 012 2v11a2 2 0 01-2 2H6a2 2 0 01-2-2V5zm9.707 5.707a1 1 0 00-1.414-1.414L9 12.586l-1.293-1.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
-            clip-rule="evenodd" />
-        </svg>
-        <span>Checklists</span>
-      </a>
-      <div>
-        <div
-          tabindex="0"
-          class:bg-gray-100={false}
-          class="flex items-center justify-between px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
-          role="button"
-          on:click={() => {
-            dropdown1 = !dropdown1;
-          }}>
-          <div class="flex items-center">
-            <svg
-              class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
-              xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 0 20 20"
-              fill="currentColor">
-              <path
-                fill-rule="evenodd"
-                d="M12.316 3.051a1 1 0 01.633 1.265l-4 12a1 1 0 11-1.898-.632l4-12a1 1 0 011.265-.633zM5.707 6.293a1 1 0 010 1.414L3.414 10l2.293 2.293a1 1 0 11-1.414 1.414l-3-3a1 1 0 010-1.414l3-3a1 1 0 011.414 0zm8.586 0a1 1 0 011.414 0l3 3a1 1 0 010 1.414l-3 3a1 1 0 11-1.414-1.414L16.586 10l-2.293-2.293a1 1 0 010-1.414z"
-                clip-rule="evenodd" />
-            </svg>
-            <span>Integrations</span>
-          </div>
-          {#if dropdown1}
-            <svg
-              class="flex-shrink-0 w-4 h-4 ml-2 transition transform"
-              xmlns="http://www.w3.org/2000/svg"
-              style="transform:rotate(90deg)"
-              viewBox="0 0 20 20"
-              fill="currentColor">
-              <path
-                fill-rule="evenodd"
-                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
-                clip-rule="evenodd" />
-            </svg>
-          {:else}
-            <svg
-              class="flex-shrink-0 w-4 h-4 ml-2 transition transform"
-              xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 0 20 20"
-              fill="currentColor">
-              <path
-                fill-rule="evenodd"
-                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
-                clip-rule="evenodd" />
-            </svg>
-          {/if}
-        </div>
-        {#if dropdown1}
-          <div class="mb-4">
-            <a
-              class="flex items-center py-2 pl-12 pr-4 transition cursor-pointer hover:bg-gray-100 hover:text-gray-900"
-              href="#">Shopify</a>
-            <a
-              class="flex items-center py-2 pl-12 pr-4 transition cursor-pointer hover:bg-gray-100 hover:text-gray-900"
-              href="#">Slack</a>
-            <a
-              class="flex items-center py-2 pl-12 pr-4 transition cursor-pointer hover:bg-gray-100 hover:text-gray-900"
-              href="#">Zapier</a>
-          </div>
-        {/if}
-      </div>
-      <a
-        class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"
-        href="#">
-        <svg
-          class="flex-shrink-0 w-5 h-5 mr-2 text-gray-400 transition group-hover:text-gray-600"
-          xmlns="http://www.w3.org/2000/svg"
-          viewBox="0 0 20 20"
-          fill="currentColor">
-          <path
-            fill-rule="evenodd"
-            d="M5 5a3 3 0 015-2.236A3 3 0 0114.83 6H16a2 2 0 110 4h-5V9a1 1 0 10-2 0v1H4a2 2 0 110-4h1.17C5.06 5.687 5 5.35 5 5zm4 1V5a1 1 0 10-1 1h1zm3 0a1 1 0 10-1-1v1h1z"
-            clip-rule="evenodd" />
-          <path d="M9 11H3v5a2 2 0 002 2h4v-7zM11 18h4a2 2 0 002-2v-5h-6v7z" />
-        </svg>
-        <span>{$_('changelog')}</span>
-      </a>
       <a
         class:bg-gray-100={$router.path === '/settings/'}
         class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-100 hover:text-gray-900"

src/components/Footer.svelte

@@ -1,12 +1,13 @@
 <script>
+  import { onMount } from "svelte";
   import { _ } from "svelte-i18n";
   $: releaseinfo = "";
-  setTimeout(() => {
+  onMount(() => {
     releaseinfo = document
       .getElementById("buildinfo")
       .textContent.replace("RELEASE_INFO-", "")
       .replace("-RELEASE_INFO", "");
-  }, 1500);
+  });
   const year = new Date().getFullYear();
 </script>
 
@@ -31,5 +32,9 @@
       target="_blank"
       rel="noopener, noreferrer"
       href="https://git.odit.services/lfk/frontend/src/tag/{releaseinfo}">{releaseinfo}</a>
+    -
+    <a class="underline" href="/privacy">{$_('privacy')}</a>
+    -
+    <a class="underline" href="/imprint">{$_('imprint')}</a>
   </p>
 </footer>

src/components/ImportRunnerModal.svelte

@@ -5,12 +5,17 @@
   import { clickOutside } from "./outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import Toastify from "toastify-js";
-  import { ImportService } from "@odit/lfk-client-js";
+  import {
+    ImportService,
+    RunnerTeamService,
+    RunnerOrganizationService,
+  } from "@odit/lfk-client-js";
   import { createEventDispatcher } from "svelte";
   export let opened_from;
   export let passed_org;
   export let passed_orgs;
   export let passed_team;
+  export let current_runners;
   export let import_modal_open;
   $: searchvalue = "";
   const dispatch = createEventDispatcher();
@@ -29,7 +34,16 @@
       }
     };
   })();
+  let orgs = [];
+  RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
+    orgs = val;
+  });
+  let teams = [];
+  RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
+    teams = val;
+  });
   let selected_org;
+  $: selected_org_or_team = "";
   let files;
   let recent_processed = true;
   $: json_output = [];
@@ -118,6 +132,52 @@
             recent_processed = true;
           });
       }
+      if (opened_from === "RunnerOverview") {
+        if (selected_org_or_team.includes("ORG_")) {
+          selected_org_or_team = selected_org_or_team.split("_")[1];
+          ImportService.importControllerPostOrgsJson(
+            selected_org_or_team,
+            mapped
+          )
+            .then((resp) => {
+              current_runners = current_runners.concat(resp);
+              toast.hideToast();
+              recent_processed = true;
+              Toastify({
+                text: "Import finished",
+                duration: 500,
+                backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+              }).showToast();
+              cancelModal();
+            })
+            .catch((err) => {
+              toast.hideToast();
+              recent_processed = true;
+            });
+        }
+        if (selected_org_or_team.includes("TEAM_")) {
+          selected_org_or_team = selected_org_or_team.split("_")[1];
+          ImportService.importControllerPostTeamsJson(
+            selected_org_or_team,
+            mapped
+          )
+            .then((resp) => {
+              current_runners = current_runners.concat(resp);
+              toast.hideToast();
+              recent_processed = true;
+              Toastify({
+                text: "Import finished",
+                duration: 500,
+                backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+              }).showToast();
+              cancelModal();
+            })
+            .catch((err) => {
+              toast.hideToast();
+              recent_processed = true;
+            });
+        }
+      }
     }
   }
 </script>
@@ -192,6 +252,24 @@
                 </select>
                 <p>{$_('bitte-bestaetige-diese-laeufer-fuer-den-import')}</p>
               {/if}
+              {#if opened_from === 'RunnerOverview'}
+                <p>Group</p>
+                <select
+                  name="team"
+                  bind:value={selected_org_or_team}
+                  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">
+                  {#each teams as team}
+                    <option value="TEAM_{team.id}">
+                      {team.parentGroup.name}
+                      &gt;
+                      {team.name}
+                    </option>
+                  {/each}
+                  {#each orgs as org}
+                    <option value="ORG_{org.id}">{org.name}</option>
+                  {/each}
+                </select>
+              {/if}
               {#if opened_from === 'OrgDetail'}
                 <p>
                   {$_('runnerimport_verify_runners_org', {
@@ -225,7 +303,7 @@
                           class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
                           {$_('csv_import__lastname')}
                         </th>
-                        {#if opened_from !== 'TeamDetail'}
+                        {#if (opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview') || (opened_from === 'RunnerOverview' && selected_org_or_team.includes('ORG_'))}
                           <th
                             scope="col"
                             class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
@@ -250,7 +328,7 @@
                             <td class="px-6 py-4 whitespace-nowrap">
                               {runner[`${$_('csv_import__lastname')}`]}
                             </td>
-                            {#if opened_from !== 'TeamDetail'}
+                            {#if (opened_from !== 'TeamDetail' && opened_from !== 'RunnerOverview') || (opened_from === 'RunnerOverview' && selected_org_or_team.includes('ORG_'))}
                               <td class="px-6 py-4 whitespace-nowrap">
                                 {runner[`${$_('csv_import__team')}`] || runner[`${$_('csv_import__class')}`] || '---'}
                               </td>

src/components/Imprint.svelte

@@ -0,0 +1,45 @@
+<script>
+  import { _, getLocaleFromNavigator } from "svelte-i18n";
+  import * as css from "./simple.css";
+  import marked from "marked";
+  import Footer from "./Footer.svelte";
+  let html = "";
+  async function load() {
+    let md = await fetch("/imprint_" + getLocaleFromNavigator() + ".md");
+    if (!md.ok) {
+      md = await fetch("/imprint_en.md");
+    }
+    html = marked(await md.text());
+  }
+  const promise = load();
+</script>
+
+<div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
+  <div class="text-center mb-8">
+    <h1
+      class="mt-9 font-display text-4xl leading-none font-semibold text-white sm:text-5xl lg:text-6xl">
+      {$_('imprint')}
+    </h1>
+  </div>
+</div>
+
+<div class="pt-0 pb-16 overflow-hidden lg:pt-12 lg:py-24">
+  <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
+    {#await promise}
+      <p class="text-center w-full">{$_('imprint-loading')}</p>
+    {:then}
+      <div class="simplecontent">
+        {@html html}
+      </div>
+    {:catch error}
+      <div
+        class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+        <span class="inline-block align-middle mr-8">
+          <b class="capitalize">{$_('general_promise_error')}</b>
+          {error}
+        </span>
+      </div>
+    {/await}
+  </div>
+</div>
+<Footer />

src/components/LoginAlt.svelte

@@ -1,97 +0,0 @@
-<script>
-  import store from "../store.js";
-  store.init();
-  const login = () => {
-    store.login();
-  };
-</script>
-
-<div
-  class="min-h-screen flex items-center justify-center bg-gray-50 py-12 px-4 sm:px-6 lg:px-8">
-  <div class="max-w-md w-full space-y-8">
-    <div>
-      <img
-        class="mx-auto h-12 w-auto"
-        src="/lfk-logo.png"
-        alt="" />
-      <h2 class="mt-6 text-center text-3xl font-extrabold text-gray-900">
-        Sign in to your account
-      </h2>
-      <p class="mt-2 text-center text-sm text-gray-600">
-        Or
-        <a href="#" class="font-medium text-indigo-600 hover:text-indigo-500">
-          start your 14-day free trial
-        </a>
-      </p>
-    </div>
-    <div>
-      <input type="hidden" name="remember" value="true" />
-      <div class="rounded-md shadow-sm -space-y-px">
-        <div>
-          <label for="email-address" class="sr-only">Email address</label>
-          <input
-            id="email-address"
-            name="email"
-            type="email"
-            autocomplete="email"
-            required
-            class="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-t-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
-            placeholder="Email address" />
-        </div>
-        <div>
-          <label for="password" class="sr-only">Password</label>
-          <input
-            id="password"
-            name="password"
-            type="password"
-            autocomplete="current-password"
-            required
-            class="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
-            placeholder="Password" />
-        </div>
-      </div>
-
-      <div class="flex items-center justify-between">
-        <div class="flex items-center">
-          <input
-            id="remember_me"
-            name="remember_me"
-            type="checkbox"
-            class="h-4 w-4 text-indigo-600 focus:ring-indigo-500 border-gray-300 rounded" />
-          <label for="remember_me" class="ml-2 block text-sm text-gray-900">
-            Remember me
-          </label>
-        </div>
-
-        <div class="text-sm">
-          <a href="#" class="font-medium text-indigo-600 hover:text-indigo-500">
-            Forgot your password?
-          </a>
-        </div>
-      </div>
-
-      <div>
-        <button
-        on:click="{login}"
-          type="submit"
-          class="group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
-          <span class="absolute left-0 inset-y-0 flex items-center pl-3">
-            <!-- Heroicon name: lock-closed -->
-            <svg
-              class="h-5 w-5 text-indigo-500 group-hover:text-indigo-400"
-              xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 0 20 20"
-              fill="currentColor"
-              aria-hidden="true">
-              <path
-                fill-rule="evenodd"
-                d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
-                clip-rule="evenodd" />
-            </svg>
-          </span>
-          Sign in
-        </button>
-      </div>
-    </div>
-  </div>
-</div>

src/components/MainDashContent.svelte

@@ -2,7 +2,6 @@
   import { _ } from "svelte-i18n";
   import StatCards from "./StatCards.svelte";
   import store from "../store";
-  import ComponentDump from "./ComponentDump.svelte";
   let navOpen = false;
 </script>
 
@@ -21,5 +20,4 @@
       👋</span>
   </h1>
   <StatCards />
-  <ComponentDump />
 </div>

src/components/OrgDetail.svelte

@@ -72,6 +72,7 @@
   on:cancelDelete={(event) => {
     import_modal_open = false;
   }}
+  current_runners={[]}
   passed_team={{}}
   passed_orgs={[]}
   passed_org={orgdata}

src/components/Orgs.svelte

@@ -47,5 +47,6 @@
     passed_org={{}}
     passed_orgs={current_organizations}
     opened_from="OrgOverview"
+    current_runners={[]}
     bind:import_modal_open />
 {/if}

src/components/Privacy.svelte

@@ -0,0 +1,45 @@
+<script>
+  import { _, getLocaleFromNavigator } from "svelte-i18n";
+  import * as css from "./simple.css";
+  import marked from "marked";
+  import Footer from "./Footer.svelte";
+  let html = "";
+  async function load() {
+    let md = await fetch("/privacy_" + getLocaleFromNavigator() + ".md");
+    if (!md.ok) {
+      md = await fetch("/privacy_en.md");
+    }
+    html = marked(await md.text());
+  }
+  const promise = load();
+</script>
+
+<div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
+  <div class="text-center mb-8">
+    <h1
+      class="mt-9 font-display text-4xl leading-none font-semibold text-white sm:text-5xl lg:text-6xl">
+      {$_('privacy')}
+    </h1>
+  </div>
+</div>
+
+<div class="pt-0 pb-16 overflow-hidden lg:pt-12 lg:py-24">
+  <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
+    {#await promise}
+      <p class="text-center w-full">{$_('privacy-loading')}</p>
+    {:then}
+      <div class="simplecontent">
+        {@html html}
+      </div>
+    {:catch error}
+      <div
+        class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
+        <span class="inline-block align-middle mr-8">
+          <b class="capitalize">{$_('general_promise_error')}</b>
+          {error}
+        </span>
+      </div>
+    {/await}
+  </div>
+</div>
+<Footer />

src/components/Runners.svelte

@@ -4,7 +4,7 @@
   import AddRunnerModal from "./AddRunnerModal.svelte";
   import ImportRunnerModal from "./ImportRunnerModal.svelte";
   import RunnersOverview from "./RunnersOverview.svelte";
-  let current_runners = [];
+  $: current_runners = [];
   export let modal_open = false;
   export let import_modal_open = false;
 </script>
@@ -43,6 +43,7 @@
     passed_team={{}}
     passed_orgs={[]}
     passed_org={{}}
+    bind:current_runners
     opened_from="RunnerOverview"
     bind:import_modal_open />
 {/if}

src/components/TeamDetail.svelte

@@ -74,6 +74,7 @@
 </script>
 
 <ImportRunnerModal
+  current_runners={[]}
   on:cancelDelete={(event) => {
     import_modal_open = false;
   }}

src/components/UserDetail.svelte

@@ -2,6 +2,7 @@
   import { _ } from "svelte-i18n";
   import lodashIsEqual from "lodash.isequal";
   import store from "../store";
+  import isEmail from "validator/es/lib/isEmail";
   import { UserService, UserGroupService } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import PromiseError from "./PromiseError.svelte";
@@ -72,7 +73,8 @@
   $: groups_changed =
     JSON.stringify(usergroups_array) ===
     JSON.stringify(usergroups_array_original);
-  $: save_enabled = changes_performed || !groups_changed;
+  $: save_enabled =
+    (changes_performed || !groups_changed) && isEmail(editable_userdata.email);
   function submit() {
     if (data_loaded === true && save_enabled) {
       editable_userdata.groups = usergroups_array;
@@ -263,6 +265,10 @@
         name="email"
         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 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
     </div>
+    {#if !isEmail(editable_userdata.email)}
+      <span
+        class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">{$_('valid-email-is-required')}</span>
+    {/if}
     <div class="text-sm w-full">
       <label
         for="username"

src/locales/en.json

@@ -96,6 +96,8 @@
     "icon-image-credits": "We also want to thank these projects for illustrations and icons:",
     "import-runners": "Import runners",
     "import__target-organization": "Target Organization",
+    "imprint": "Imprint 🧾",
+    "imprint-loading": "Imprint loading...",
     "installed-version": "Installed version",
     "invalid-mail-reset": "the provided email is invalid",
     "last-name": "Last name",
@@ -126,6 +128,8 @@
     "please-provide-the-required-csv-xlsx-file": "Please provide the required csv/ xlsx file",
     "please-provide-the-required-information-to-add-a-new-runner": "Please provide the required information to add a new runner.",
     "please-provide-the-required-information-to-add-a-new-track": "Please provide the required information to add a new track.",
+    "privacy": "Privacy 🔒",
+    "privacy-loading": "Privacy loading...",
     "profile-picture": "Profile Picture",
     "read-license": "Read License",
     "register": "Register",