From cb58fdfd8ed6c20551d99cefe37e10e9e46f13bf Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 9 Jan 2021 17:39:17 +0100 Subject: [PATCH 1/3] working on AddUserModal ref #12 --- src/components/AddUserModal.svelte | 76 +++++------------------------- 1 file changed, 13 insertions(+), 63 deletions(-) diff --git a/src/components/AddUserModal.svelte b/src/components/AddUserModal.svelte index 05a2b8f8..4d8d98bb 100644 --- a/src/components/AddUserModal.svelte +++ b/src/components/AddUserModal.svelte @@ -16,10 +16,10 @@ $: tracklength = 0; $: processed_last_submit = true; $: smart_track_min_duration_placeholder = parseInt(tracklength || 0) * 0.369; - $: isTracknameValid = trackname_input_value.trim().length === 0; + $: isFirstnameValid = trackname_input_value.trim().length === 0; $: isTracklengthValid = tracklength <= 0; $: trackMintimevalid = track_min_duration >= 0; - $: createbtnenabled = !isTracknameValid && !isTracklengthValid; + $: createbtnenabled = !isFirstnameValid && !isTracklengthValid; (function () { document.onkeydown = function (e) { e = e || window.event; @@ -105,94 +105,44 @@ 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"> + 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" />

- {$_('create-a-new-track')} + Create a new User

- {$_('please-provide-the-required-information-to-add-a-new-track')} + Please provide the required information to add a new user.

+ class="block text-sm font-medium text-gray-700">First Name - {#if isTracknameValid} + {#if isFirstnameValid} - Track name must not be empty - - {/if} -
-
- -
- - m -
- {#if isTracklengthValid} - - Track length must be greater than 0 - - {/if} -
-
- -
- - s -
- {#if !trackMintimevalid} - - minimum lap time must be a positive number or 0 + First Name is required {/if}
From e5ec98bf6f599fe7fcf53065666cff880e0d5dfd Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 9 Jan 2021 18:26:14 +0100 Subject: [PATCH 2/3] basic AddUserModal ui ref #12 --- src/components/AddUserModal.svelte | 132 ++++++++++++++++++++++++----- 1 file changed, 111 insertions(+), 21 deletions(-) diff --git a/src/components/AddUserModal.svelte b/src/components/AddUserModal.svelte index 4d8d98bb..dc2f3447 100644 --- a/src/components/AddUserModal.svelte +++ b/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; - $: isFirstnameValid = trackname_input_value.trim().length === 0; - $: isTracklengthValid = tracklength <= 0; - $: trackMintimevalid = track_min_duration >= 0; - $: createbtnenabled = !isFirstnameValid && !isTracklengthValid; + $: isPasswordValid = password_input_value.trim().length === 0; + $: isEmailValid = isEmail(email_input_value); + $: isLastnameValid = lastname_input_value.trim().length === 0; + $: isFirstnameValid = firstname_input_value.trim().length === 0; + $: 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({ - distance: parseInt(tracklength), - name: trackname_input_value, - minimumLapTime: track_min_duration, + UserService.userControllerPost({ + firstname: firstname_input_value, + lastname: lastname_input_value, + middlename: middlename_input_value, + email:email_input_value,password:password_input_value }) .then((result) => { - trackname_input_value = ""; - track_min_duration = 0; - tracklength = 0; + firstname_input_value = ""; + lastname_input_value = ""; + middlename_input_value = ""; modal_open = false; // Toastify({ - text: $_("track-added"), + text: "User added", duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); @@ -125,7 +136,7 @@
{#if isFirstnameValid} {/if}
+
+ + +
+
+ + + {#if isLastnameValid} + + Last Name is required + + {/if} +
+
+ + + {#if isPasswordValid} + + Password is required + + {/if} +
+
+ + + {#if !isEmailValid} + + valid email is required + + {/if} +
From 6529907a139edd8450e699a8ea9befae622137f7 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Sat, 9 Jan 2021 18:27:22 +0100 Subject: [PATCH 3/3] display full user names in overview table ref #12 --- src/components/UsersOverview.svelte | 72 ++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/src/components/UsersOverview.svelte b/src/components/UsersOverview.svelte index 9fde14cf..33b0d867 100644 --- a/src/components/UsersOverview.svelte +++ b/src/components/UsersOverview.svelte @@ -78,8 +78,11 @@ {/if}
-
+
{u.firstname} + {u.middlename || ''} + {u.lastname}
{u.email || u.username} @@ -104,7 +107,8 @@ {#each u.groups as g} - {g.name} {/each} @@ -113,65 +117,87 @@ Edit - Delete + Delete {/each} -
- - Showing 21-30 of 100 - - +
+ Showing 21-30 of 100 +