diff --git a/src/lib/elements/forms/form.svelte b/src/lib/elements/forms/form.svelte
index aae39a36e..4abbd5d98 100644
--- a/src/lib/elements/forms/form.svelte
+++ b/src/lib/elements/forms/form.svelte
@@ -1,3 +1,3 @@
-
diff --git a/src/lib/elements/forms/inputEmail.svelte b/src/lib/elements/forms/inputEmail.svelte
index c5bbd4f73..f8370ebcc 100644
--- a/src/lib/elements/forms/inputEmail.svelte
+++ b/src/lib/elements/forms/inputEmail.svelte
@@ -1,6 +1,6 @@
+ {#if showHelper}
+ {errorMessage}
+ {/if}
diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte
index c7cf5a401..27082a32e 100644
--- a/src/routes/console/[project]/users/user/[user]/index.svelte
+++ b/src/routes/console/[project]/users/user/[user]/index.svelte
@@ -5,11 +5,11 @@
import { Pill } from '$lib/elements';
import {
Button,
+ Form,
InputText,
InputEmail,
InputPassword,
- InputPhone,
- Helper
+ InputPhone
} from '$lib/elements/forms';
import { Container } from '$lib/layout';
import { sdkForProject } from '$lib/stores/sdk';
@@ -25,10 +25,8 @@
arePrefsDisabled = false;
}
}
+
let showDelete = false;
- let showError: false | 'name' | 'email' | 'phone' | 'password' = false;
- let errorMessage = 'Something went wrong';
- let errorType: 'error' | 'warning' | 'success' = 'error';
let userName: string = null,
userEmail: string = null,
userPhone: string = null,
@@ -50,12 +48,6 @@
const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 48, 48).toString();
- function addError(location: typeof showError, message: string, type: typeof errorType) {
- showError = location;
- errorMessage = message;
- errorType = type;
- }
-
async function updateVerificationEmail() {
try {
await sdkForProject.users.updateEmailVerification($user.$id, !$user.emailVerification);
@@ -109,52 +101,60 @@
try {
await sdkForProject.users.updateName($user.$id, userName);
$user.name = userName;
- showError = false;
addNotification({
message: 'Name has been updated',
type: 'success'
});
} catch (error) {
- addError('name', error.message, 'error');
+ addNotification({
+ message: error.message,
+ type: 'error'
+ });
}
}
async function updateEmail() {
try {
await sdkForProject.users.updateEmail($user.$id, userEmail);
$user.email = userEmail;
- showError = false;
addNotification({
message: 'Email has been updated',
type: 'success'
});
} catch (error) {
- addError('email', error.message, 'error');
+ addNotification({
+ message: error.message,
+ type: 'error'
+ });
}
}
async function updatePhone() {
try {
await sdkForProject.users.updatePhone($user.$id, userPhone);
$user.phone = userPhone;
- showError = false;
addNotification({
message: 'Phone has been updated',
type: 'success'
});
} catch (error) {
- addError('phone', error.message, 'error');
+ addNotification({
+ message: error.message,
+ type: 'error'
+ });
}
}
async function updatePassword() {
try {
await sdkForProject.users.updatePassword($user.$id, newPassword);
newPassword = null;
- showError = false;
addNotification({
message: 'Password has been updated',
type: 'success'
});
} catch (error) {
- addError('password', error.message, 'error');
+ addNotification({
+ message: error.message,
+ type: 'error'
+ });
}
}
@@ -283,9 +283,6 @@
placeholder="Enter name"
autocomplete={false}
bind:value={userName} />
- {#if showError === 'name'}
- {errorMessage}
- {/if}
@@ -297,30 +294,28 @@
}}>Update
-
- Update Email
-
-
-
- {#if showError === 'email'}
- {errorMessage}
- {/if}
-
-
-
-
-
-
+
+
Update Phone
@@ -331,9 +326,6 @@
placeholder="Enter phone number"
autocomplete={false}
bind:value={userPhone} />
- {#if showError === 'phone'}
- {errorMessage}
- {/if}
@@ -363,9 +355,6 @@
meter={false}
showPasswordButton={true}
bind:value={newPassword} />
- {#if showError === 'password'}
- {errorMessage}
- {/if}