From 25b77441fef8fc1e62cc73e41259bd69bf94a755 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 23 Aug 2023 15:06:06 +0200 Subject: [PATCH 1/8] fix: deployment title, hide gh button on signup in self hosted --- .../deployment-[deployment]/breadcrumbs.svelte | 2 +- .../deployment-[deployment]/header.svelte | 2 +- src/routes/register/+page.svelte | 17 ++++++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte index 6dd1a7ffe..b0db3f896 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte @@ -18,7 +18,7 @@ }, { href: `/console/project-${$project?.$id}/functions/function-${$func?.$id}/deployment-${$deployment?.$id}`, - title: 'Deployment details' + title: 'Deployment' } ]; diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte index 0bf9b1e5b..c35f5fe07 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte @@ -11,7 +11,7 @@ - Deployment details + Deployment {$deployment.$id} diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte index b6db762e6..5d9e2d50f 100644 --- a/src/routes/register/+page.svelte +++ b/src/routes/register/+page.svelte @@ -17,6 +17,7 @@ import { Dependencies } from '$lib/constants'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { ID } from '@appwrite.io/console'; + import { isCloud } from '$lib/system'; let name: string, mail: string, pass: string, disabled: boolean; let terms = false; @@ -95,13 +96,15 @@ - or - - - + {#if isCloud} + or + + + + {/if} From f4bf3c5a8e008d67c68ae099031eb57b53e6bbd1 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 23 Aug 2023 16:18:28 +0200 Subject: [PATCH 2/8] fix: update css, spacing in deployment --- package-lock.json | 32 +++++++++---------- package.json | 4 +-- .../function-[function]/+page.svelte | 4 +-- .../deployment-[deployment]/+page.svelte | 18 ++++------- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e6128950..38545ac01 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.4", - "@appwrite.io/pink-icons": "^0.1.0-next.4", + "@appwrite.io/pink": "0.1.0-next.5", + "@appwrite.io/pink-icons": "^0.1.0-next.5", "@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.4", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.4.tgz", - "integrity": "sha512-vZEKuSiw3tFdimx7yeVOujECFT6wKWvQmFgwlkOw6sYstylUVVQD0XCioZC91vj+48xutqn/sooCVAnb1xbENQ==", + "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==", "dependencies": { - "@appwrite.io/pink-icons": "0.1.0-next.4", + "@appwrite.io/pink-icons": "0.1.0-next.5", "normalize.css": "^8.0.1", "the-new-css-reset": "^1.7.3" } }, "node_modules/@appwrite.io/pink-icons": { - "version": "0.1.0-next.4", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.4.tgz", - "integrity": "sha512-DV7i69OHrV97mQYOFhiRZlgy5HtsuAUmW7Ih9CjBTU+1Je3srFFVg3msKgNIjhB4zH9xmBxUyMBFi0Lea4+irA==" + "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==" }, "node_modules/@babel/code-frame": { "version": "7.22.5", @@ -8917,19 +8917,19 @@ } }, "@appwrite.io/pink": { - "version": "0.1.0-next.4", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink/-/pink-0.1.0-next.4.tgz", - "integrity": "sha512-vZEKuSiw3tFdimx7yeVOujECFT6wKWvQmFgwlkOw6sYstylUVVQD0XCioZC91vj+48xutqn/sooCVAnb1xbENQ==", + "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==", "requires": { - "@appwrite.io/pink-icons": "0.1.0-next.4", + "@appwrite.io/pink-icons": "0.1.0-next.5", "normalize.css": "^8.0.1", "the-new-css-reset": "^1.7.3" } }, "@appwrite.io/pink-icons": { - "version": "0.1.0-next.4", - "resolved": "https://registry.npmjs.org/@appwrite.io/pink-icons/-/pink-icons-0.1.0-next.4.tgz", - "integrity": "sha512-DV7i69OHrV97mQYOFhiRZlgy5HtsuAUmW7Ih9CjBTU+1Je3srFFVg3msKgNIjhB4zH9xmBxUyMBFi0Lea4+irA==" + "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==" }, "@babel/code-frame": { "version": "7.22.5", diff --git a/package.json b/package.json index 1acf53b98..66a2b727c 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.4", - "@appwrite.io/pink-icons": "^0.1.0-next.4", + "@appwrite.io/pink": "0.1.0-next.5", + "@appwrite.io/pink-icons": "^0.1.0-next.5", "@popperjs/core": "^2.11.6", "@sentry/svelte": "^7.44.2", "@sentry/tracing": "^7.44.2", diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte index cc8d626a9..75aa62dcd 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -98,7 +98,7 @@ }.svg`} alt="technology" /> -
+

Deployment ID

@@ -110,7 +110,7 @@ {@const status = activeDeployment.status} {@const fileSize = humanFileSize(activeDeployment.size)}
-
+

Build time: {calculateTime(activeDeployment.buildTime)}

Updated: diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte index b1765f08e..b6927ebdf 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte @@ -53,23 +53,19 @@ }.svg`} alt="technology" />

-
-
-

Deployment ID

-
+
+

Deployment ID

-
- - {$deployment.$id} - -
+ + {$deployment.$id} +
{@const status = $deployment.status} {@const fileSize = humanFileSize($deployment.size)}
-
+

Build time: {#if ['processing', 'building'].includes($deployment.status)} @@ -116,7 +112,7 @@ -

+
From dc4f6eb9375cb479771c6ee89f074015d657e8c3 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 23 Aug 2023 16:35:43 +0200 Subject: [PATCH 3/8] fix: appwritekey error when required --- src/lib/wizards/functions/components/appwriteVariable.svelte | 2 +- src/lib/wizards/functions/steps/templateVariables.svelte | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/wizards/functions/components/appwriteVariable.svelte b/src/lib/wizards/functions/components/appwriteVariable.svelte index dec0c7237..415ee5d41 100644 --- a/src/lib/wizards/functions/components/appwriteVariable.svelte +++ b/src/lib/wizards/functions/components/appwriteVariable.svelte @@ -14,7 +14,7 @@ id={appwriteVariable.name} label={appwriteVariable.name} placeholder={appwriteVariable.placeholder ?? 'Enter value'} - required={appwriteVariable.required} + required={appwriteVariable.required && !$templateConfig.generateKey} bind:value={$templateConfig.appwriteApiKey} disabled={!!$templateConfig.generateKey} /> diff --git a/src/lib/wizards/functions/steps/templateVariables.svelte b/src/lib/wizards/functions/steps/templateVariables.svelte index 8b23e1ae8..e3a280127 100644 --- a/src/lib/wizards/functions/steps/templateVariables.svelte +++ b/src/lib/wizards/functions/steps/templateVariables.svelte @@ -11,7 +11,10 @@ if (!variable.required) { continue; } - + if (variable.name === 'APPWRITE_API_KEY') { + if ($templateConfig.appwriteApiKey || $templateConfig.generateKey) continue; + else throw new Error(`Please set ${variable.name} variable or generate it.`); + } if (!$templateConfig.variables[variable.name]) { throw new Error(`Please set ${variable.name} variable.`); } From c158b3281af513a79612c5732f569ba8357dd8f1 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 23 Aug 2023 16:53:31 +0200 Subject: [PATCH 4/8] chore: comment out sms editing --- .../auth/templates/+page.svelte | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/console/project-[project]/auth/templates/+page.svelte index 87f62f642..cb331d7b3 100644 --- a/src/routes/console/project-[project]/auth/templates/+page.svelte +++ b/src/routes/console/project-[project]/auth/templates/+page.svelte @@ -35,9 +35,10 @@ import EmailMagicUrlTemplate from './emailMagicUrlTemplate.svelte'; import EmailRecoveryTemplate from './emailRecoveryTemplate.svelte'; import EmailInviteTemplate from './emailInviteTemplate.svelte'; - import SmsVerificationTemplate from './smsVerificationTemplate.svelte'; - import SmsLoginTemplate from './smsLoginTemplate.svelte'; - import { baseEmailTemplate, baseSmsTemplate, emailTemplate, smsTemplate } from './store'; + // import SmsVerificationTemplate from './smsVerificationTemplate.svelte'; + // import SmsLoginTemplate from './smsLoginTemplate.svelte'; + // import { baseEmailTemplate, baseSmsTemplate, emailTemplate, smsTemplate } from './store'; + import { baseEmailTemplate, emailTemplate } from './store'; import { Button } from '$lib/elements/forms'; export let data; @@ -49,14 +50,14 @@ $: emailResetPassword = emailOpen === 'recovery'; $: emailInviteUser = emailOpen === 'invitation'; - let smsOpen = 'verification'; - $: smsVerificationOpen = smsOpen === 'verification'; - $: smsLoginOpen = smsOpen === 'login'; - $: smsInvitationOpen = smsOpen === 'invitation'; + // let smsOpen = 'verification'; + // $: smsVerificationOpen = smsOpen === 'verification'; + // $: smsLoginOpen = smsOpen === 'login'; + // $: smsInvitationOpen = smsOpen === 'invitation'; onMount(async () => { openEmail('verification'); - openSms('verification'); + // openSms('verification'); }); async function openEmail(type: string) { @@ -65,11 +66,11 @@ $baseEmailTemplate = { ...$emailTemplate }; } - async function openSms(type: string) { - type === smsOpen ? (smsOpen = null) : (smsOpen = type); - $smsTemplate = await loadSmsTemplate(projectId, type, 'en'); - $baseSmsTemplate = { ...$smsTemplate }; - } + // async function openSms(type: string) { + // type === smsOpen ? (smsOpen = null) : (smsOpen = type); + // $smsTemplate = await loadSmsTemplate(projectId, type, 'en'); + // $baseSmsTemplate = { ...$smsTemplate }; + // } @@ -170,14 +171,13 @@ - +

@@ -218,5 +218,5 @@ -
+ -->
From 81f69a7c0eb5143959026f3fa33756f31db681ca Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 23 Aug 2023 16:54:05 +0200 Subject: [PATCH 5/8] fix: rename output to logs --- .../functions/function-[function]/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte index 75aa62dcd..4eb2e110d 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte @@ -264,7 +264,7 @@ - Output + Logs Date: Wed, 23 Aug 2023 17:18:49 +0200 Subject: [PATCH 6/8] refactor: disable variable editor if there is no change --- src/lib/components/secondaryTabsItem.svelte | 4 +- .../rawVariableEditor.svelte | 84 +++++++++++-------- 2 files changed, 50 insertions(+), 38 deletions(-) diff --git a/src/lib/components/secondaryTabsItem.svelte b/src/lib/components/secondaryTabsItem.svelte index 3a87b01d7..6b8a06524 100644 --- a/src/lib/components/secondaryTabsItem.svelte +++ b/src/lib/components/secondaryTabsItem.svelte @@ -13,7 +13,8 @@ class="secondary-tabs-button" class:u-width-full-line={fullWidth} class:u-text-center={center} - disabled> + disabled + type="button"> {:else} @@ -30,6 +31,7 @@ class="secondary-tabs-button" class:u-width-full-line={fullWidth} class:u-text-center={center} + type="button" {disabled} on:click> diff --git a/src/routes/console/project-[project]/rawVariableEditor.svelte b/src/routes/console/project-[project]/rawVariableEditor.svelte index 540f7ea21..aef7b8844 100644 --- a/src/routes/console/project-[project]/rawVariableEditor.svelte +++ b/src/routes/console/project-[project]/rawVariableEditor.svelte @@ -1,5 +1,6 @@
-
    -
  • - -
  • -
  • - -
  • -
+ + (tab = 'env')} + disabled={tab === 'env'}> + ENV + + (tab = 'json')} + disabled={tab === 'json'}> + JSON + + - {#if tab === 'env'} -