From 532dfe02e9dd06ac2d84b166e6c95558902ccc60 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 12 May 2023 17:16:43 +0200 Subject: [PATCH] fix: design review --- .../auth/templates/+page.svelte | 28 +++++++++++-------- .../auth/templates/emailInviteTemplate.svelte | 21 ++++++++++++-- .../templates/emailMagicUrlTemplate.svelte | 21 ++++++++++++-- .../templates/emailRecoveryTemplate.svelte | 21 ++++++++++++-- .../auth/templates/emailTemplate.svelte | 6 ++-- .../emailVerificationTemplate.svelte | 6 +++- .../templates/smsInvitationTemplate.svelte | 21 ++++++++++++-- .../auth/templates/smsLoginTemplate.svelte | 21 ++++++++++++-- .../auth/templates/smsTemplate.svelte | 2 +- .../templates/smsVerificationTemplate.svelte | 17 +++++++++-- 10 files changed, 135 insertions(+), 29 deletions(-) diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/console/project-[project]/auth/templates/+page.svelte index 9445b0a39..fccfcfb3b 100644 --- a/src/routes/console/project-[project]/auth/templates/+page.svelte +++ b/src/routes/console/project-[project]/auth/templates/+page.svelte @@ -63,11 +63,11 @@ async function openEmail(type: string) { type === emailOpen ? (emailOpen = null) : (emailOpen = type); $emailTemplate = await loadEmailTemplate(projectId, type, 'en-us'); - $baseEmailTemplate = { ...$emailTemplate }; } + async function openSms(type: string) { - smsOpen = type; + type === smsOpen ? (smsOpen = null) : (smsOpen = type); $smsTemplate = await loadSmsTemplate(projectId, type, 'en-us'); $baseSmsTemplate = { ...$smsTemplate }; } @@ -97,8 +97,8 @@ -
- Email Templates +
+ Email templates
Beta
@@ -108,7 +108,7 @@ Use templates to send and process account management emails. - Learn more about Email templates. + Learn more about email templates.

@@ -145,7 +145,7 @@ e.preventDefault(); openEmail('recovery'); }}> - Reset Password + Reset password

Send a recovery email to users that forget their password.

@@ -155,7 +155,7 @@ e.preventDefault(); openEmail('invitation'); }}> - Invite User + Invite user

Send an invitation email to become a member of your project.

@@ -163,15 +163,15 @@ -
- SMS Templates +
+ SMS templates
Beta
@@ -181,8 +181,8 @@ Use templates to send and process account management mobile messages. - Learn more about SMS templates - . + Learn more about SMS templates.

@@ -206,6 +206,9 @@ openSms('login'); }}> Login +

+ Send a one-time passcode to users' mobile phones to allow them to sign in. +

Invitation +

Send an invitation SMS to become a member of your project.

diff --git a/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte index e3b935ced..ca89e5f88 100644 --- a/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte @@ -9,15 +9,32 @@ import { loadEmailTemplate } from './+page.svelte'; import { page } from '$app/stores'; import { emailTemplate } from './strote'; + import { addNotification } from '$lib/stores/notifications'; export let localeCodes: Models.LocaleCode[]; const projectId = $page.params.project; let locale = 'en-us'; + let loading = false; + let timeout: NodeJS.Timeout; async function onLocaleChange() { - let template = await loadEmailTemplate(projectId, 'invitation', locale); - emailTemplate.set(template); + timeout = setTimeout(() => { + loading = true; + }, 1); + try { + const template = await loadEmailTemplate(projectId, 'invitation', locale); + clearTimeout(timeout); + emailTemplate.set(template); + } catch (error) { + clearTimeout(timeout); + addNotification({ + type: 'error', + message: error.message + }); + } finally { + loading = false; + } } diff --git a/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte index 90792c24f..43b33becb 100644 --- a/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte @@ -5,15 +5,32 @@ import type { Models } from '@appwrite.io/console'; import { emailTemplate } from './strote'; import { page } from '$app/stores'; + import { addNotification } from '$lib/stores/notifications'; export let localeCodes: Models.LocaleCode[]; const projectId = $page.params.project; let locale = 'en-us'; + let loading = false; + let timeout: NodeJS.Timeout; async function onLocaleChange() { - let template = await loadEmailTemplate(projectId, 'magicSession', locale); - emailTemplate.set(template); + timeout = setTimeout(() => { + loading = true; + }, 1); + try { + const template = await loadEmailTemplate(projectId, 'magicSession', locale); + clearTimeout(timeout); + emailTemplate.set(template); + } catch (error) { + clearTimeout(timeout); + addNotification({ + type: 'error', + message: error.message + }); + } finally { + loading = false; + } } diff --git a/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte index 9445363b5..0b40cf030 100644 --- a/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte @@ -5,15 +5,32 @@ import { emailTemplate } from './strote'; import { loadEmailTemplate } from './+page.svelte'; import { page } from '$app/stores'; + import { addNotification } from '$lib/stores/notifications'; export let localeCodes: Models.LocaleCode[]; const projectId = $page.params.project; let locale = 'en-us'; + let loading = false; + let timeout: NodeJS.Timeout; async function onLocaleChange() { - let template = await loadEmailTemplate(projectId, 'recovery', locale); - emailTemplate.set(template); + timeout = setTimeout(() => { + loading = true; + }, 1); + try { + const template = await loadEmailTemplate(projectId, 'recovery', locale); + clearTimeout(timeout); + emailTemplate.set(template); + } catch (error) { + clearTimeout(timeout); + addNotification({ + type: 'error', + message: error.message + }); + } finally { + loading = false; + } } diff --git a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte index 8a7d2170d..3dda1d5ee 100644 --- a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte @@ -64,15 +64,15 @@ - + {#if $$slots.default}
  • diff --git a/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte index c111f4462..cec1f5068 100644 --- a/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte @@ -6,6 +6,7 @@ import { emailTemplate } from './strote'; import { page } from '$app/stores'; import { Id } from '$lib/components'; + import { addNotification } from '$lib/stores/notifications'; export let localeCodes: Models.LocaleCode[]; const projectId = $page.params.project; @@ -24,7 +25,10 @@ emailTemplate.set(template); } catch (error) { clearTimeout(timeout); - console.log(error); + addNotification({ + type: 'error', + message: error.message + }); } finally { loading = false; } diff --git a/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte index aeef58e82..1f9b4aaba 100644 --- a/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte @@ -5,15 +5,32 @@ import { smsTemplate } from './strote'; import { page } from '$app/stores'; import { loadSmsTemplate } from './+page.svelte'; + import { addNotification } from '$lib/stores/notifications'; export let localeCodes: Models.LocaleCode[]; const projectId = $page.params.project; let locale = 'en-us'; + let loading = false; + let timeout: NodeJS.Timeout; async function onLocaleChange() { - let template = await loadSmsTemplate(projectId, 'invitation', locale); - smsTemplate.set(template); + timeout = setTimeout(() => { + loading = true; + }, 1); + try { + const template = await loadSmsTemplate(projectId, 'invitation', locale); + clearTimeout(timeout); + smsTemplate.set(template); + } catch (error) { + clearTimeout(timeout); + addNotification({ + type: 'error', + message: error.message + }); + } finally { + loading = false; + } } diff --git a/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte index f7544a857..b0d336f74 100644 --- a/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte @@ -5,15 +5,32 @@ import { page } from '$app/stores'; import { loadSmsTemplate } from './+page.svelte'; import { smsTemplate } from './strote'; + import { addNotification } from '$lib/stores/notifications'; export let localeCodes: Models.LocaleCode[]; const projectId = $page.params.project; let locale = 'en-us'; + let loading = false; + let timeout: NodeJS.Timeout; async function onLocaleChange() { - let template = await loadSmsTemplate(projectId, 'login', locale); - smsTemplate.set(template); + timeout = setTimeout(() => { + loading = true; + }, 1); + try { + const template = await loadSmsTemplate(projectId, 'login', locale); + clearTimeout(timeout); + smsTemplate.set(template); + } catch (error) { + clearTimeout(timeout); + addNotification({ + type: 'error', + message: error.message + }); + } finally { + loading = false; + } } diff --git a/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte index 39bc9395f..b99c839a7 100644 --- a/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte @@ -52,7 +52,7 @@

    -
    +
    diff --git a/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte index e9b59c849..191e4c1fa 100644 --- a/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte @@ -10,10 +10,23 @@ const projectId = $page.params.project; let locale = 'en-us'; + let loading = false; + let timeout: NodeJS.Timeout; async function onLocaleChange() { - let template = await loadSmsTemplate(projectId, 'verification', locale); - smsTemplate.set(template); + timeout = setTimeout(() => { + loading = true; + }, 1); + try { + const template = await loadSmsTemplate(projectId, 'verification', locale); + clearTimeout(timeout); + smsTemplate.set(template); + } catch (error) { + clearTimeout(timeout); + console.log(error); + } finally { + loading = false; + } }