Merge branch 'feature/13-runner-management' of https://git.odit.services/lfk/frontend into feature/13-runner-management

ref #13

src/components/RunnerDetail.svelte

@@ -6,9 +6,9 @@
   import Toastify from "toastify-js";
   import PromiseError from "./PromiseError.svelte";
   import isEmail from "validator/es/lib/isEmail";
-  const runner_promise = RunnerService.runnerControllerGetOne(params.runnerid);
   let data_loaded = false;
   export let params;
+  const runner_promise = RunnerService.runnerControllerGetOne(params.runnerid);
   $: delete_triggered = false;
   $: original_data = {};
   $: editable = {};

src/components/RunnerFileUpload.svelte

@@ -1,75 +0,0 @@
-<script>
-  import "filepond/dist/filepond.css";
-  import FilePond from "svelte-filepond";
-  import { _ } from "svelte-i18n";
-  let pond;
-  // pond.getFiles() will return the active files
-  // the name to use for the internal file input
-  let name = "filepond";
-  function handleInit() {
-    // console.log("FilePond has initialised");
-  }
-  function handleAddFile(err, fileItem) {
-    // console.log("A file has been added", fileItem);
-  }
-  const labelInvalidField = $_("filepond__field-contains-invalid-files");
-  const labelFileWaitingForSize = $_("filepond__waiting-for-size");
-  const labelFileSizeNotAvailable = $_("filepond__size-not-available");
-  const labelFileLoading = $_("filepond__loading");
-  const labelFileLoadError = $_("filepond__error-during-load");
-  const labelFileProcessing = $_("filepond__uploading");
-  const labelFileProcessingComplete = $_("filepond__upload-complete");
-  const labelFileProcessingAborted = $_("filepond__upload-cancelled");
-  const labelFileProcessingError = $_("filepond__error-during-upload");
-  const labelFileProcessingRevertError = $_("filepond__error-during-revert");
-  const labelFileRemoveError = $_("filepond__error-during-remove");
-  const labelTapToCancel = $_("filepond__tap-to-cancel");
-  const labelTapToRetry = $_("filepond__tap-to-retry");
-  const labelTapToUndo = $_("filepond__tap-to-undo");
-  const labelButtonRemoveItem = $_("filepond__remove");
-  const labelButtonAbortItemLoad = $_("filepond__abort");
-  const labelButtonRetryItemLoad = $_("filepond__retry");
-  const labelButtonAbortItemProcessing = $_("filepond__cancel");
-  const labelButtonUndoItemProcessing = $_("filepond__undo");
-  const labelButtonRetryItemProcessing = $_("filepond__retry");
-  const labelButtonProcessItem = $_("filepond__upload");
-  const labelIdle =
-    $_("drag-and-drop-your-files-or") +
-    ` <span class="filepond--label-action"> ` +
-    $_("browse") +
-    ` </span>`;
-</script>
-
-<div class="col-span-6">
-  <FilePond
-    class="col-span-6"
-    bind:this={pond}
-    {name}
-    {labelFileWaitingForSize}
-    {labelFileSizeNotAvailable}
-    {labelFileLoading}
-    {labelFileLoadError}
-    {labelFileProcessing}
-    {labelFileProcessingComplete}
-    {labelFileProcessingAborted}
-    {labelFileProcessingError}
-    {labelFileProcessingRevertError}
-    {labelFileRemoveError}
-    {labelTapToCancel}
-    {labelTapToRetry}
-    {labelTapToUndo}
-    {labelButtonRemoveItem}
-    {labelButtonAbortItemLoad}
-    {labelButtonRetryItemLoad}
-    {labelButtonAbortItemProcessing}
-    {labelButtonUndoItemProcessing}
-    {labelButtonRetryItemProcessing}
-    {labelButtonProcessItem}
-    {labelIdle}
-    {labelInvalidField}
-    server="/api"
-    allowMultiple={false}
-    credits={false}
-    oninit={handleInit}
-    onaddfile={handleAddFile} />
-</div>

src/components/Runners.svelte

@@ -2,11 +2,11 @@
   import { _ } from "svelte-i18n";
   import store from "../store";
   import AddRunnerModal from "./AddRunnerModal.svelte";
-  // import ImportRunnerModal from "./ImportRunnerModal.svelte";
+  import ImportRunnerModal from "./ImportRunnerModal.svelte";
   import RunnersOverview from "./RunnersOverview.svelte";
-  export let modal_open = false;
-  // export let import_modal_open = false;
   let current_runners = [];
+  export let modal_open = false;
+  export let import_modal_open = false;
 </script>
 
 <section class="container p-5">
@@ -21,14 +21,14 @@
         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">
         Läufer hinzufügen
       </button>
-      <!-- <button
+      <button
         on:click={() => {
           import_modal_open = true;
         }}
         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">
         Läufer importieren
-      </button> -->
+      </button>
     {/if}
   </span>
   <p class="mb-8 text-lg text-gray-500">läuft bei ihnen</p>
@@ -37,5 +37,13 @@
 
 {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:CREATE')}
   <AddRunnerModal bind:current_runners bind:modal_open />
-  <!-- <ImportRunnerModal bind:import_modal_open /> -->
+  <ImportRunnerModal
+    on:cancelDelete={(event) => {
+      import_modal_open = false;
+    }}
+    passed_team={{}}
+    passed_orgs={[]}
+    passed_org={{}}
+    opened_from="RunnerOverview"
+    bind:import_modal_open />
 {/if}

src/components/RunnersOverview.svelte

@@ -37,25 +37,25 @@
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                Name
+                {$_('name')}
               </th>
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                Contact Information
+                {$_('contact-information')}
               </th>
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                Group
+                {$_('group')}
               </th>
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                Distance in km
+                {$_('distance-in-km')}
               </th>
               <th scope="col" class="relative px-6 py-3">
-                <span class="sr-only">Action</span>
+                <span class="sr-only">{$_('action')}</span>
               </th>
             </tr>
           </thead>
@@ -69,8 +69,7 @@
                   <td class="px-6 py-4 whitespace-nowrap">
                     <div class="flex items-center">
                       <div class="ml-4">
-                        <div
+                        <div class="text-sm font-medium text-gray-900">
-                          class="text-sm font-medium text-gray-900">
                           {runner.firstname}
                           {runner.middlename || ''}
                           {runner.lastname}
@@ -111,8 +110,7 @@
                             });
                         }}
                         tabindex="0"
-                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">Confirm
+                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
-                        Delete</button>
                     </td>
                   {:else}
                     <td
@@ -126,7 +124,7 @@
                             active_deletes[runner.id] = true;
                           }}
                           tabindex="0"
-                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">Delete</button>
+                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
                       {/if}
                     </td>
                   {/if}

src/locales/en.json

@@ -16,6 +16,7 @@
     "confirm-delete": "Confirm Delete",
     "confirm-deletion": "Confirm Deletion",
     "contact": "Contact",
+    "contact-information": "Contact Information",
     "count_organizations": "# Organizations",
     "count_teams": "# Teams",
     "create": "Create",
@@ -45,12 +46,14 @@
         "no_matching_records_found": "No matching records found",
         "an_error_happened_while_fetching_the_data": "An error happened while fetching the data"
     },
+    "delete": "Delete",
     "delete-organization": "Delete Organization",
     "delete-runner": "Delete Runner",
     "delete-team": "Delete Team",
     "delete-user": "Delete User",
     "dependency_name": "Name",
     "distance": "Distance",
+    "distance-in-km": "Distance in km",
     "dont-have-your-email-connected": "Don't have your email connected?",
     "dont-panic-were-resetting-it": "Don't panic, we're resetting it ✌",
     "drag-and-drop-your-files-or": "Drag & Drop your files or",
@@ -84,6 +87,7 @@
     "general-stats": "General Stats",
     "general_promise_error": "😢 Error",
     "goback": "Go Home",
+    "group": "Group",
     "groups": "Groups",
     "hallo": "hello",
     "icon-image-credits": "We also want to thank these projects for illustrations and icons:",
@@ -104,6 +108,7 @@
     "manage-admin-users": "manage admin users",
     "middle-name": "Middle name",
     "minimum-lap-time-in-s": "minimum lap time in s",
+    "name": "Name",
     "no-license-text-could-be-found": "No license text could be found 😢",
     "no-tracks-added-yet": "there are no tracks added yet.",
     "organization": "Organization",