From e9eea2cebd0c925052ad400f63e23ba1d0b7834a Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 25 Aug 2023 12:38:58 +0200 Subject: [PATCH] refactor: templates locale; chore: bump css, format --- package-lock.json | 32 +++++++++---------- package.json | 4 +-- .../auth/templates/+page.svelte | 14 ++++---- .../auth/templates/emailInviteTemplate.svelte | 5 +-- .../templates/emailMagicUrlTemplate.svelte | 4 +-- .../templates/emailRecoveryTemplate.svelte | 4 +-- .../auth/templates/emailTemplate.svelte | 5 +-- .../emailVerificationTemplate.svelte | 4 +-- .../auth/templates/localeOptions.svelte | 10 +++--- .../templates/smsInvitationTemplate.svelte | 5 +-- .../auth/templates/smsLoginTemplate.svelte | 5 +-- .../templates/smsVerificationTemplate.svelte | 5 +-- .../project-[project]/auth/templates/store.ts | 5 ++- .../function-[function]/createGit.svelte | 4 ++- .../settings/gitConfigurationModal.svelte | 5 ++- 15 files changed, 51 insertions(+), 60 deletions(-) diff --git a/package-lock.json b/package-lock.json index 38545ac01..751f992b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "@analytics/google-analytics": "^1.0.5", "@analytics/google-tag-manager": "^0.5.3", "@appwrite.io/console": "npm:matej-appwrite-console@7.1.128", - "@appwrite.io/pink": "0.1.0-next.5", - "@appwrite.io/pink-icons": "^0.1.0-next.5", + "@appwrite.io/pink": "0.1.0-next.6", + "@appwrite.io/pink-icons": "^0.1.0-next.6", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", "@sentry/tracing": "^7.44.2", @@ -177,19 +177,19 @@ } }, "node_modules/@appwrite.io/pink": { - "version": "0.1.0-next.5", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.5.tgz", - "integrity": "sha512-Mwblf5mh6Mojlwc5QUVVJ+fuLl0ixEVsTVoTt7AGp9u5Gvu4yRIRXqppfjSuD/kfgjX1zP74sEM8jcwUQLL4QQ==", + "version": "0.1.0-next.6", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.6.tgz", + "integrity": "sha512-DlRgQQHAgeWW9oyjDUGENOoq0I7e3yXDdqUwzGNIQS7r8W+SnNj3JtZjQ4/hylwgECDPyzmsBI6rUfOvtV9gSg==", "dependencies": { - "@appwrite.io/pink-icons": "0.1.0-next.5", + "@appwrite.io/pink-icons": "0.1.0-next.6", "normalize.css": "^8.0.1", "the-new-css-reset": "^1.7.3" } }, "node_modules/@appwrite.io/pink-icons": { - "version": "0.1.0-next.5", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.5.tgz", - "integrity": "sha512-/YGA5MKTzOA3MEgoNOkv1iT5NaKXAv2oZyq8MA6N0iWnEgskKMSX+byzooTfwDqDIJ3J5/Hxrg/j2NttyZyppQ==" + "version": "0.1.0-next.6", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.6.tgz", + "integrity": "sha512-rRrDb5brMhAvBRZ/sqYF1uG+L73KiQ2CG/aBof1vNmc88k/vhn0StAojVlJgeCumoamReepysypdZ/0b9at6Kw==" }, "node_modules/@babel/code-frame": { "version": "7.22.5", @@ -8917,19 +8917,19 @@ } }, "@appwrite.io/pink": { - "version": "0.1.0-next.5", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.5.tgz", - "integrity": "sha512-Mwblf5mh6Mojlwc5QUVVJ+fuLl0ixEVsTVoTt7AGp9u5Gvu4yRIRXqppfjSuD/kfgjX1zP74sEM8jcwUQLL4QQ==", + "version": "0.1.0-next.6", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.6.tgz", + "integrity": "sha512-DlRgQQHAgeWW9oyjDUGENOoq0I7e3yXDdqUwzGNIQS7r8W+SnNj3JtZjQ4/hylwgECDPyzmsBI6rUfOvtV9gSg==", "requires": { - "@appwrite.io/pink-icons": "0.1.0-next.5", + "@appwrite.io/pink-icons": "0.1.0-next.6", "normalize.css": "^8.0.1", "the-new-css-reset": "^1.7.3" } }, "@appwrite.io/pink-icons": { - "version": "0.1.0-next.5", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.5.tgz", - "integrity": "sha512-/YGA5MKTzOA3MEgoNOkv1iT5NaKXAv2oZyq8MA6N0iWnEgskKMSX+byzooTfwDqDIJ3J5/Hxrg/j2NttyZyppQ==" + "version": "0.1.0-next.6", + "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.6.tgz", + "integrity": "sha512-rRrDb5brMhAvBRZ/sqYF1uG+L73KiQ2CG/aBof1vNmc88k/vhn0StAojVlJgeCumoamReepysypdZ/0b9at6Kw==" }, "@babel/code-frame": { "version": "7.22.5", diff --git a/package.json b/package.json index 66a2b727c..ad88f9867 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "@analytics/google-analytics": "^1.0.5", "@analytics/google-tag-manager": "^0.5.3", "@appwrite.io/console": "npm:matej-appwrite-console@7.1.128", - "@appwrite.io/pink": "0.1.0-next.5", - "@appwrite.io/pink-icons": "^0.1.0-next.5", + "@appwrite.io/pink": "0.1.0-next.6", + "@appwrite.io/pink-icons": "^0.1.0-next.6", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", "@sentry/tracing": "^7.44.2", diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/console/project-[project]/auth/templates/+page.svelte index 27f784cae..7db45c236 100644 --- a/src/routes/console/project-[project]/auth/templates/+page.svelte +++ b/src/routes/console/project-[project]/auth/templates/+page.svelte @@ -129,7 +129,7 @@ Send a verification email to users that sign in with their email and password.

- + Magic URL

Send an email to users that sign in with a magic URL.

- +
Reset password

Send a recovery email to users that forget their password.

- +
Invite user

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

- +
@@ -191,7 +191,7 @@

Send a verification SMS to users that sign in with their phone

- + 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 ece738a44..86aab0647 100644 --- a/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte @@ -1,7 +1,6 @@
- + {'{{team}}'} {'{{user}}'} diff --git a/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte index 0170381bb..9d5041acf 100644 --- a/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte @@ -2,14 +2,12 @@ import { loadEmailTemplate } from './+page.svelte'; import EmailTemplate from './emailTemplate.svelte'; import LocaleOptions from './localeOptions.svelte'; - import type { Models } from '@appwrite.io/console'; import { baseEmailTemplate, emailTemplate } from './store'; import { page } from '$app/stores'; import { addNotification } from '$lib/stores/notifications'; import { Id } from '$lib/components'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; - export let localeCodes: Models.LocaleCode[]; const projectId = $page.params.project; let locale = 'en'; @@ -39,7 +37,7 @@
- + {'{{team}}'} {'{{user}}'} diff --git a/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte index 52300e899..674ff61e5 100644 --- a/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte @@ -1,7 +1,6 @@
- + {'{{team}}'} {'{{user}}'} diff --git a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte index 4312bd8f5..e36f04dc8 100644 --- a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte @@ -14,6 +14,7 @@ import { baseEmailTemplate, emailTemplate } from './store'; import { deepEqual } from '$lib/helpers/object'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; + import { Box } from '$lib/components'; export let loading = false; let openResetModal = false; @@ -77,7 +78,7 @@ $: isButtonDisabled = deepEqual($emailTemplate, $baseEmailTemplate); -
+ {#if loading}
-
+ diff --git a/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte index ccc85aa37..55f8c5f98 100644 --- a/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte @@ -1,7 +1,6 @@
- + {'{{team}}'} diff --git a/src/routes/console/project-[project]/auth/templates/localeOptions.svelte b/src/routes/console/project-[project]/auth/templates/localeOptions.svelte index 7e7c5ae6a..e7a44fb0b 100644 --- a/src/routes/console/project-[project]/auth/templates/localeOptions.svelte +++ b/src/routes/console/project-[project]/auth/templates/localeOptions.svelte @@ -1,14 +1,14 @@ -
+
Template language @@ -36,4 +36,4 @@ showLabel={false} interactiveOutput {options} /> -
+
diff --git a/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte index cf8b98577..31419ba85 100644 --- a/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte @@ -1,7 +1,6 @@
- + {'{{team}}'} {'{{user}}'} diff --git a/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte index 1f9fbaf5a..0d85c3be4 100644 --- a/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte @@ -1,7 +1,6 @@
- + {'{{team}}'} {'{{user}}'} diff --git a/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte b/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte index 20e3018c1..3227df470 100644 --- a/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte @@ -1,7 +1,6 @@
- + {'{{team}}'} {'{{user}}'} diff --git a/src/routes/console/project-[project]/auth/templates/store.ts b/src/routes/console/project-[project]/auth/templates/store.ts index 6c8fb77ee..3ddf494d3 100644 --- a/src/routes/console/project-[project]/auth/templates/store.ts +++ b/src/routes/console/project-[project]/auth/templates/store.ts @@ -1,5 +1,8 @@ +import { page } from '$app/stores'; import type { Models } from '@appwrite.io/console'; -import { writable } from 'svelte/store'; +import { derived, writable } from 'svelte/store'; + +export const localeCodes = derived(page, ($page) => $page.data.localeCodes as Models.LocaleCode[]); export const emailTemplate = writable({ type: null, diff --git a/src/routes/console/project-[project]/functions/function-[function]/createGit.svelte b/src/routes/console/project-[project]/functions/function-[function]/createGit.svelte index 207cbd30f..0f0f7a585 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/createGit.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/createGit.svelte @@ -67,7 +67,9 @@ you push to that repository, your function will be deployed.

- +
- +