Merge branch 'feature/12-user-management' into dev

src/components/AddUserModal.svelte

@@ -3,23 +3,33 @@
   import { clickOutside } from "./outsideclick";
   import { focusTrap } from "svelte-focus-trap";
   import { tracks as tracksstore } from "../store.js";
-  import { TrackService } from "@odit/lfk-client-js";
+  import { TrackService, UserService } from "@odit/lfk-client-js";
+  import isEmail from "validator/es/lib/isEmail";
   import Toastify from "toastify-js";
   import "toastify-js/src/toastify.css";
+  import About from "./About.svelte";
   export let modal_open;
-  let trackname_input;
+  let firstname_input;
+  let lastname_input;
+  let middlename_input;
+  let password_input;
+  let email_input;
   function focus(el) {
     el.focus();
   }
-  $: trackname_input_value = "";
+  $: middlename_input_value = "";
+  $: password_input_value = "";
+  $: email_input_value = "";
+  $: lastname_input_value = "";
+  $: firstname_input_value = "";
   $: track_min_duration = 0;
   $: tracklength = 0;
   $: processed_last_submit = true;
-  $: smart_track_min_duration_placeholder = parseInt(tracklength || 0) * 0.369;
+  $: isPasswordValid = password_input_value.trim().length === 0;
-  $: isTracknameValid = trackname_input_value.trim().length === 0;
+  $: isEmailValid = isEmail(email_input_value);
-  $: isTracklengthValid = tracklength <= 0;
+  $: isLastnameValid = lastname_input_value.trim().length === 0;
-  $: trackMintimevalid = track_min_duration >= 0;
+  $: isFirstnameValid = firstname_input_value.trim().length === 0;
-  $: createbtnenabled = !isTracknameValid && !isTracklengthValid;
+  $: createbtnenabled = !isFirstnameValid && !isLastnameValid;
   (function () {
     document.onkeydown = function (e) {
       e = e || window.event;
@@ -38,22 +48,23 @@
     if (processed_last_submit === true) {
       processed_last_submit = false;
       const toast = Toastify({
-        text: $_("track-is-being-added"),
+        text: "User is being added...",
         duration: -1,
       }).showToast();
-      TrackService.trackControllerPost({
+      UserService.userControllerPost({
-        distance: parseInt(tracklength),
+        firstname: firstname_input_value,
-        name: trackname_input_value,
+        lastname: lastname_input_value,
-        minimumLapTime: track_min_duration,
+        middlename: middlename_input_value,
+        email:email_input_value,password:password_input_value
       })
         .then((result) => {
-          trackname_input_value = "";
+          firstname_input_value = "";
-          track_min_duration = 0;
+          lastname_input_value = "";
-          tracklength = 0;
+          middlename_input_value = "";
           modal_open = false;
           //
           Toastify({
-            text: $_("track-added"),
+            text: "User added",
             duration: 500,
             backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
           }).showToast();
@@ -105,94 +116,123 @@
               class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
               <svg
                 class="h-6 w-6 text-blue-600"
-                fill="none"
+                fill="currentColor"
                 width="24"
                 height="24"
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 640 512"><path
                   fill="currentColor"
-                  d="M635.7 167.2L556.1 31.7c-8.8-15-28.3-20.1-43.5-11.5l-69 39.1L503.3 161c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L416 75l-55.2 31.3 27.9 47.4c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L333.2 122 278 153.3 337.8 255c2.2 3.7.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9l-59.7-101.7-55.2 31.3 27.9 47.4c2.2 3.8.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9l-27.9-47.5-55.2 31.3 59.7 101.7c2.2 3.7.9 8.5-2.9 10.7l-13.8 7.8c-3.8 2.2-8.7.9-10.9-2.9L84.9 262.9l-69 39.1C.7 310.7-4.6 329.8 4.2 344.8l79.6 135.6c8.8 15 28.3 20.1 43.5 11.5L624.1 210c15.2-8.6 20.4-27.8 11.6-42.8z" /></svg>
+                  d="M610.5 341.3c2.6-14.1 2.6-28.5 0-42.6l25.8-14.9c3-1.7 4.3-5.2 3.3-8.5-6.7-21.6-18.2-41.2-33.2-57.4-2.3-2.5-6-3.1-9-1.4l-25.8 14.9c-10.9-9.3-23.4-16.5-36.9-21.3v-29.8c0-3.4-2.4-6.4-5.7-7.1-22.3-5-45-4.8-66.2 0-3.3.7-5.7 3.7-5.7 7.1v29.8c-13.5 4.8-26 12-36.9 21.3l-25.8-14.9c-2.9-1.7-6.7-1.1-9 1.4-15 16.2-26.5 35.8-33.2 57.4-1 3.3.4 6.8 3.3 8.5l25.8 14.9c-2.6 14.1-2.6 28.5 0 42.6l-25.8 14.9c-3 1.7-4.3 5.2-3.3 8.5 6.7 21.6 18.2 41.1 33.2 57.4 2.3 2.5 6 3.1 9 1.4l25.8-14.9c10.9 9.3 23.4 16.5 36.9 21.3v29.8c0 3.4 2.4 6.4 5.7 7.1 22.3 5 45 4.8 66.2 0 3.3-.7 5.7-3.7 5.7-7.1v-29.8c13.5-4.8 26-12 36.9-21.3l25.8 14.9c2.9 1.7 6.7 1.1 9-1.4 15-16.2 26.5-35.8 33.2-57.4 1-3.3-.4-6.8-3.3-8.5l-25.8-14.9zM496 368.5c-26.8 0-48.5-21.8-48.5-48.5s21.8-48.5 48.5-48.5 48.5 21.8 48.5 48.5-21.7 48.5-48.5 48.5zM96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm224 32c1.9 0 3.7-.5 5.6-.6 8.3-21.7 20.5-42.1 36.3-59.2 7.4-8 17.9-12.6 28.9-12.6 6.9 0 13.7 1.8 19.6 5.3l7.9 4.6c.8-.5 1.6-.9 2.4-1.4 7-14.6 11.2-30.8 11.2-48 0-61.9-50.1-112-112-112S208 82.1 208 144c0 61.9 50.1 112 112 112zm105.2 194.5c-2.3-1.2-4.6-2.6-6.8-3.9-8.2 4.8-15.3 9.8-27.5 9.8-10.9 0-21.4-4.6-28.9-12.6-18.3-19.8-32.3-43.9-40.2-69.6-10.7-34.5 24.9-49.7 25.8-50.3-.1-2.6-.1-5.2 0-7.8l-7.9-4.6c-3.8-2.2-7-5-9.8-8.1-3.3.2-6.5.6-9.8.6-24.6 0-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h255.4c-3.7-6-6.2-12.8-6.2-20.3v-9.2zM173.1 274.6C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z" /></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">
-                {$_('create-a-new-track')}
+                Create a new User
               </h3>
               <div class="mt-2 mb-6">
                 <p class="text-sm text-gray-500">
-                  {$_('please-provide-the-required-information-to-add-a-new-track')}
+                  Please provide the required information to add a new user.
                 </p>
               </div>
               <div class="grid grid-cols-6 gap-6">
                 <div class="col-span-6">
                   <label
-                    for="trackname"
+                    for="firstname"
-                    class="block text-sm font-medium text-gray-700">{$_('track-name')}</label>
+                    class="block text-sm font-medium text-gray-700">First Name</label>
                   <input
                     use:focus
                     autocomplete="off"
-                    placeholder={$_('track-name')}
+                    placeholder="First Name"
-                    class:border-red-500={isTracknameValid}
+                    class:border-red-500={isFirstnameValid}
-                    class:focus:border-red-500={isTracknameValid}
+                    class:focus:border-red-500={isFirstnameValid}
-                    class:focus:ring-red-500={isTracknameValid}
+                    class:focus:ring-red-500={isFirstnameValid}
-                    bind:value={trackname_input_value}
+                    bind:value={firstname_input_value}
-                    bind:this={trackname_input}
+                    bind:this={firstname_input}
+                    type="text"
+                    name="firstname"
+                    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 isFirstnameValid}
+                    <span
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      First Name is required
+                    </span>
+                  {/if}
+                </div>
+                <div class="col-span-6">
+                  <label
+                    for="trackname"
+                    class="block text-sm font-medium text-gray-700">Middle Name</label>
+                  <input
+                    autocomplete="off"
+                    placeholder="Middle Name"
+                    bind:value={middlename_input_value}
+                    bind:this={middlename_input}
                     type="text"
                     name="trackname"
                     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 isTracknameValid}
+                </div>
+                <div class="col-span-6">
+                  <label
+                    for="lastname"
+                    class="block text-sm font-medium text-gray-700">Last Name</label>
+                  <input
+                    autocomplete="off"
+                    placeholder="Last Name"
+                    class:border-red-500={isLastnameValid}
+                    class:focus:border-red-500={isLastnameValid}
+                    class:focus:ring-red-500={isLastnameValid}
+                    bind:value={lastname_input_value}
+                    bind:this={lastname_input}
+                    type="text"
+                    name="lastname"
+                    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 isLastnameValid}
                     <span
                       class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                      Track name must not be empty
+                      Last Name is required
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
-                    for="track_length_m"
+                    for="password"
-                    class="block text-sm font-medium text-gray-700">{$_('track-length-in-m')}</label>
+                    class="block text-sm font-medium text-gray-700">Password</label>
-                  <div class="mt-1 flex rounded-md shadow-sm">
                   <input
                     autocomplete="off"
-                      class:border-red-500={isTracklengthValid}
+                    placeholder="Password"
-                      class:focus:border-red-500={isTracklengthValid}
+                    class:border-red-500={isPasswordValid}
-                      class:focus:ring-red-500={isTracklengthValid}
+                    class:focus:border-red-500={isPasswordValid}
-                      bind:value={tracklength}
+                    class:focus:ring-red-500={isPasswordValid}
-                      type="number"
+                    bind:value={password_input_value}
-                      name="track_length_m"
+                    bind:this={password_input}
-                      class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 p-2"
+                    type="password"
-                      placeholder="1000" />
+                    name="password"
-                    <span
+                    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" />
-                      class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 text-sm">m</span>
+                  {#if isPasswordValid}
-                  </div>
-                  {#if isTracklengthValid}
                     <span
                       class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                      Track length must be greater than 0
+                      Password is required
                     </span>
                   {/if}
                 </div>
                 <div class="col-span-6">
                   <label
-                    for="track_min_duration"
+                    for="email"
-                    class="block text-sm font-medium text-gray-700">{$_('minimum-lap-time-in-s')}</label>
+                    class="block text-sm font-medium text-gray-700">E-Mail</label>
-                  <div class="mt-1 flex rounded-md shadow-sm">
                   <input
                     autocomplete="off"
-                      class:border-red-500={!trackMintimevalid}
+                    placeholder="E-Mail"
-                      class:focus:border-red-500={!trackMintimevalid}
+                    class:border-red-500={!isEmailValid}
-                      class:focus:ring-red-500={!trackMintimevalid}
+                    class:focus:border-red-500={!isEmailValid}
-                      bind:value={track_min_duration}
+                    class:focus:ring-red-500={!isEmailValid}
-                      type="number"
+                    bind:value={email_input_value}
-                      name="track_min_duration"
+                    bind:this={email_input}
-                      class="focus:ring-indigo-500 focus:border-indigo-500 flex-1 block w-full rounded-none rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 p-2"
+                    type="email"
-                      placeholder={smart_track_min_duration_placeholder} />
+                    name="email"
-                    <span
+                    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" />
-                      class="inline-flex items-center px-3 rounded-r-md border border-gray-300 bg-gray-50 text-gray-500 text-sm">s</span>
+                  {#if !isEmailValid}
-                  </div>
-                  {#if !trackMintimevalid}
                     <span
                       class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
-                      minimum lap time must be a positive number or 0
+                      valid email is required
                     </span>
                   {/if}
                 </div>

src/components/UsersOverview.svelte

@@ -78,8 +78,11 @@
                     </div>
                   {/if}
                   <div class="ml-4">
-                    <div class="text-sm font-medium text-gray-900 dark:text-gray-100">
+                    <div
+                      class="text-sm font-medium text-gray-900 dark:text-gray-100">
                       {u.firstname}
+                      {u.middlename || ''}
+                      {u.lastname}
                     </div>
                     <div class="text-sm text-gray-500">
                       {u.email || u.username}
@@ -104,7 +107,8 @@
               </td>
               <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
                 {#each u.groups as g}
-                  <a href="../groups/{g.id}"
+                  <a
+                    href="../groups/{g.id}"
                     class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{g.name}</a>
                 {/each}
               </td>
@@ -113,65 +117,87 @@
                 <a
                   href="./{u.id}"
                   class="text-indigo-600 hover:text-indigo-900">Edit</a>
-                <span tabindex="0" href="#" class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">Delete</span>
+                <span
+                  tabindex="0"
+                  href="#"
+                  class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">Delete</span>
               </td>
             </tr>
           {/each}
         </tbody>
       </table>
-      <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-900">
+      <div
-        <span class="flex items-center col-span-3">
+        class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-900">
-          Showing 21-30 of 100
+        <span class="flex items-center col-span-3"> Showing 21-30 of 100 </span>
-        </span>
+        <span class="col-span-2" />
-        <span class="col-span-2"></span>
         <!-- Pagination -->
         <span class="flex col-span-4 mt-2 sm:mt-auto sm:justify-end">
           <nav aria-label="Table navigation">
             <ul class="inline-flex items-center">
               <li>
-                <button class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple" aria-label="Previous">
+                <button
-                  <svg aria-hidden="true" class="w-4 h-4 fill-current" viewBox="0 0 20 20">
+                  class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple"
-                    <path d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" fill-rule="evenodd"></path>
+                  aria-label="Previous">
+                  <svg
+                    aria-hidden="true"
+                    class="w-4 h-4 fill-current"
+                    viewBox="0 0 20 20">
+                    <path
+                      d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
+                      clip-rule="evenodd"
+                      fill-rule="evenodd" />
                   </svg>
                 </button>
               </li>
               <li>
-                <button class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
+                <button
+                  class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
                   1
                 </button>
               </li>
               <li>
-                <button class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
+                <button
+                  class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
                   2
                 </button>
               </li>
               <li>
-                <button class="px-3 py-1 text-white transition-colors duration-150 bg-purple-600 border border-r-0 border-purple-600 rounded-md focus:outline-none focus:shadow-outline-purple">
+                <button
+                  class="px-3 py-1 text-white transition-colors duration-150 bg-purple-600 border border-r-0 border-purple-600 rounded-md focus:outline-none focus:shadow-outline-purple">
                   3
                 </button>
               </li>
               <li>
-                <button class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
+                <button
+                  class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
                   4
                 </button>
               </li>
+              <li><span class="px-3 py-1">...</span></li>
               <li>
-                <span class="px-3 py-1">...</span>
+                <button
-              </li>
+                  class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
-              <li>
-                <button class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
                   8
                 </button>
               </li>
               <li>
-                <button class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
+                <button
+                  class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple">
                   9
                 </button>
               </li>
               <li>
-                <button class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple" aria-label="Next">
+                <button
-                  <svg class="w-4 h-4 fill-current" aria-hidden="true" viewBox="0 0 20 20">
+                  class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple"
-                    <path 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" fill-rule="evenodd"></path>
+                  aria-label="Next">
+                  <svg
+                    class="w-4 h-4 fill-current"
+                    aria-hidden="true"
+                    viewBox="0 0 20 20">
+                    <path
+                      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"
+                      fill-rule="evenodd" />
                   </svg>
                 </button>
               </li>