From 7131ba99b6917dc0fb99f93ab40495b9702024ab Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp.dormann1@gmail.com>
Date: Wed, 27 Jan 2021 18:45:36 +0100
Subject: [PATCH] AddUserModal - enforce email input

ref #44
---
 src/components/AddUserModal.svelte | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/components/AddUserModal.svelte b/src/components/AddUserModal.svelte
index 6298e61a..b1a53dc6 100644
--- a/src/components/AddUserModal.svelte
+++ b/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,16 +238,10 @@
                     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
+                      valid email is required
                     </span>
                   {/if}
                 </div>