From ff14f024afda77e6f5f9e95a8f34e50cc8509790 Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp.dormann1@gmail.com>
Date: Sun, 17 Jan 2021 17:14:34 +0100
Subject: [PATCH] AddUserModal - username/email validation

ref #12
---
 src/components/AddUserModal.svelte | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/components/AddUserModal.svelte b/src/components/AddUserModal.svelte
index c8b232fe..4f1c6690 100644
--- a/src/components/AddUserModal.svelte
+++ b/src/components/AddUserModal.svelte
@@ -28,7 +28,10 @@
   $: isLastnameValid = lastname_input_value.trim().length !== 0;
   $: isFirstnameValid = firstname_input_value.trim().length !== 0;
   $: createbtnenabled =
-    isFirstnameValid && isLastnameValid && isEmailValid && isPasswordValid;
+    isFirstnameValid &&
+    isLastnameValid &&
+    isPasswordValid &&
+    !(!isEmailValid && username_input_value.trim().length === 0);
   (function () {
     document.onkeydown = function (e) {
       e = e || window.event;
@@ -50,17 +53,17 @@
         text: "User is being added...",
         duration: -1,
       }).showToast();
-      let postdata={
+      let postdata = {
         firstname: firstname_input_value,
         lastname: lastname_input_value,
         middlename: middlename_input_value,
-        password: password_input_value
+        password: password_input_value,
       };
-      if(email_input_value!==""){
-        postdata.email=email_input_value;
+      if (email_input_value !== "") {
+        postdata.email = email_input_value;
       }
-      if(username_input_value!==""){
-        postdata.username=username_input_value;
+      if (username_input_value !== "") {
+        postdata.username = username_input_value;
       }
       UserService.userControllerPost(postdata)
         .then((result) => {
@@ -77,7 +80,7 @@
             backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
           }).showToast();
           current_users.push(result);
-          current_users=current_users;
+          current_users = current_users;
         })
         .catch((err) => {
           //
@@ -238,18 +241,21 @@
                   <input
                     autocomplete="off"
                     placeholder={$_('e-mail-adress')}
-                    class:border-red-500={!isEmailValid}
-                    class:focus:border-red-500={!isEmailValid}
-                    class:focus:ring-red-500={!isEmailValid}
                     bind:value={email_input_value}
                     bind:this={email_input}
                     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-is-required')}
+                      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>
                   {/if}
                 </div>