From 89db5a086ea9c22d42f37b786e6f5d449eb6decb Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 10:06:50 +0100 Subject: [PATCH 01/21] chore: bump version --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 150f9e3b1..f4a2396c1 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f", "@appwrite.io/pink-legacy": "^1.0.0", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713f", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 89eba9793..3aacc9238 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713f - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713f(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.0': resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713f': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713f} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4103,7 +4103,7 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713f(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f8e69d09316b297f98a772b4871245ed1(svelte@4.2.19) '@floating-ui/dom': 1.6.13 From 1cca982caa0e0015b3ee6c9cd8e53d0c4154d726 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 10:54:11 +0100 Subject: [PATCH 02/21] dr: fix repo creation flow --- package.json | 2 +- pnpm-lock.yaml | 18 +-- src/lib/components/empty.svelte | 31 ++--- .../sites/create-site/configuration.svelte | 124 ++++++++++-------- .../template-[template]/configuration.svelte | 2 +- 5 files changed, 91 insertions(+), 86 deletions(-) diff --git a/package.json b/package.json index f4a2396c1..645b0e81b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f", "@appwrite.io/pink-legacy": "^1.0.0", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3aacc9238..376af7931 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -221,8 +221,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f8e69d09316b297f98a772b4871245ed1': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f8e69d09316b297f98a772b4871245ed1} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@c33a3b5fe545833402ee41ee5efe7e2543f7f516': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@c33a3b5fe545833402ee41ee5efe7e2543f7f516} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.0': resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4090,7 +4090,7 @@ snapshots: dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f8e69d09316b297f98a772b4871245ed1(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@c33a3b5fe545833402ee41ee5efe7e2543f7f516(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4103,9 +4103,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@5eac713(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f8e69d09316b297f98a772b4871245ed1(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@c33a3b5fe545833402ee41ee5efe7e2543f7f516(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.2(svelte@4.2.19) diff --git a/src/lib/components/empty.svelte b/src/lib/components/empty.svelte index e967f16bb..79a0e7717 100644 --- a/src/lib/components/empty.svelte +++ b/src/lib/components/empty.svelte @@ -1,10 +1,10 @@ -
+
- + Set up how your project is built and where the output files are stored. - - - - - - - - - - - + + + + + + + + + + + + + @@ -112,10 +126,31 @@ Environment variables - - - Set up environment variables to securely manage keys and settings for your - project. + + Set up environment variables to securely manage keys and settings for your + project. + + + + + + + {#if variables?.length} + + {/if} + {#if variables?.length} @@ -190,25 +225,6 @@ >Create variables to get started {/if} - - - - - - - diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte index 6504ab6fe..7e04da3de 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/configuration.svelte @@ -48,7 +48,7 @@ } -
+
{#if requiredVariables?.length} From 9a1a4af06f788f7d3538a52783dd8ae08817c4f0 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 11:07:08 +0100 Subject: [PATCH 03/21] fix: variable editors --- .../sites/create-site/createVariable.svelte | 32 ++++++------ .../importSiteVariablesModal.svelte | 51 +++++++++++++++---- 2 files changed, 57 insertions(+), 26 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/create-site/createVariable.svelte b/src/routes/(console)/project-[project]/sites/create-site/createVariable.svelte index 57c47910f..3c451d14f 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/createVariable.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/createVariable.svelte @@ -46,21 +46,23 @@ href={`${base}/project-${$page.params.project}/settings`}>project settings. - - - + + + + + import { Modal } from '$lib/components'; import Alert from '$lib/components/alert.svelte'; - import { Button, InputChoice, InputFile } from '$lib/elements/forms'; + import { Button } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; + import { IconInfo } from '@appwrite.io/pink-icons-svelte'; + import { Icon, Layout, Selector, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte'; import { parse } from 'envfile'; export let show = false; @@ -46,16 +48,43 @@ Import new environment variables from .env file. - - {#if variables?.length > 0} - - This action can create and update variables but can not delete them. - - {/if} - - - If selected, you and your team won't be able to read the values after creation. - + + + + + + + Drag and drop files here or click to upload + + + + + + + Only .env files allowed + + + + Up to 100 variables allowed + + + {#if variables?.length > 0} + + This action can create and update variables but can not delete them. + + {/if} + + + From d93727e2112bdb94d99326e761c83511cecbc34f Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 11:19:31 +0100 Subject: [PATCH 04/21] fix: bulk variable editor --- src/lib/elements/forms/button.svelte | 19 ++++++- .../create-site/variableEditorModal.svelte | 50 ++++++++++--------- 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte index a745d9204..7687d9adb 100644 --- a/src/lib/elements/forms/button.svelte +++ b/src/lib/elements/forms/button.svelte @@ -27,6 +27,7 @@ export { classes as class }; export let submissionLoader = false; export let forceShowLoader = false; + export let compact = false; const isSubmitting = hasContext('form') ? getContext('form').isSubmitting @@ -45,6 +46,20 @@ }); } + function getVariant(): 'primary' | 'secondary' | 'text' | 'compact' { + switch (true) { + case secondary: + return 'secondary'; + case text: + return 'text'; + case compact: + return 'compact'; + default: + return 'primary'; + } + } + + $: variant = getVariant(); $: resolvedClasses = [ fullWidth && 'is-full-width', fullWidthMobile && 'is-full-width-mobile', @@ -64,7 +79,7 @@ {size} {icon} disabled={internalDisabled} - variant={secondary ? 'secondary' : text ? 'text' : 'primary'} + {variant} target={external ? '_blank' : ''} rel={external ? 'noopener noreferrer' : ''} class={resolvedClasses} @@ -81,7 +96,7 @@ {icon} {badge} disabled={internalDisabled} - variant={secondary ? 'secondary' : text ? 'text' : 'primary'} + {variant} class={resolvedClasses} aria-label={ariaLabel} type={submit ? 'submit' : 'button'} diff --git a/src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte index 09764f8af..3a9103569 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/variableEditorModal.svelte @@ -130,31 +130,33 @@ - {#if tab === 'env'} - - {:else if tab === 'json'} - - {/if} - - - - - - + + + + + From 22a7f718198e7eadc8c2720684e3300db0daef7c Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 12 Feb 2025 17:02:24 +0530 Subject: [PATCH 05/21] fix: casings. --- .../overview/platforms/createAndroid.svelte | 2 +- .../overview/platforms/createFlutter.svelte | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte index 928d56810..f5674c0dd 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte @@ -103,7 +103,7 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" diff --git a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte index adbd189a9..9250ea202 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte @@ -65,35 +65,35 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e > > = { [PlatformType.Flutterandroid]: { - name: 'My Android App', + name: 'My Android app', hostname: 'com.company.appname', tooltip: 'Your package name is generally the applicationId in your app-level build.gradle file.' }, [PlatformType.Flutterios]: { - name: 'My iOS App', + name: 'My iOS app', hostname: 'com.company.appname', tooltip: "You can find your Bundle Identifier in the General tab for your app's primary target in Xcode." }, [PlatformType.Flutterlinux]: { - name: 'My Linux App', + name: 'My Linux app', hostname: 'appname', tooltip: 'Your application name' }, [PlatformType.Fluttermacos]: { - name: 'My mac OS App', + name: 'My mac OS app', hostname: 'com.company.appname', tooltip: "You can find your Bundle Identifier in the General tab for your app's primary target in Xcode." }, [PlatformType.Flutterwindows]: { - name: 'My Windows App', + name: 'My Windows app', hostname: 'appname', tooltip: 'Your application name' }, [PlatformType.Flutterweb]: { - name: 'My Web App', + name: 'My Web app', hostname: 'localhost', tooltip: 'The hostname that your website will use to interact with the Appwrite APIs in production or development environments. No protocol or port number required.' @@ -101,12 +101,12 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e }; const hostname: Partial> = { - [PlatformType.Flutterandroid]: 'Package Name', + [PlatformType.Flutterandroid]: 'Package name', [PlatformType.Flutterios]: 'Bundle ID', - [PlatformType.Flutterlinux]: 'Package Name', + [PlatformType.Flutterlinux]: 'Package name', [PlatformType.Fluttermacos]: 'Bundle ID', [PlatformType.Flutterweb]: 'Hostname', - [PlatformType.Flutterwindows]: 'Package Name' + [PlatformType.Flutterwindows]: 'Package name' }; async function createFlutterPlatform() { From 4a5c9aa1c523a49f02af2edbc5b26c9955f2c18c Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 12 Feb 2025 17:02:42 +0530 Subject: [PATCH 06/21] fix: disable platform chooser after creation. --- .../project-[project]/overview/platforms/createApple.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte index 011435d21..170ab4fef 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte @@ -116,7 +116,9 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject.client.config.endpoint}" bind:group={platform} variant="primary" {value} - title={key} /> + title={key} + disabled={isPlatformCreated} + /> {/each} @@ -129,7 +131,7 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject.client.config.endpoint}" From 4d14f5e5264370007c6cf50affc801392e027ed6 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 12 Feb 2025 17:03:39 +0530 Subject: [PATCH 07/21] fix: rn. --- .../overview/platforms/createReactNative.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte index 325b6b3c5..159a8dec0 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte @@ -75,7 +75,7 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}"; }; const hostname: Partial> = { - [PlatformType.Reactnativeandroid]: 'Package Name', + [PlatformType.Reactnativeandroid]: 'Package name', [PlatformType.Reactnativeios]: 'Bundle ID' }; @@ -143,7 +143,9 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}"; bind:group={platform} variant="primary" {value} - title={key} /> + title={key} + disabled={isPlatformCreated} + /> {/each} From 00b6238e160ebcc0f532de5eb0fb54eb2153011e Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 12 Feb 2025 17:45:33 +0530 Subject: [PATCH 08/21] remove: spinner and footer button. --- .../overview/platforms/createAndroid.svelte | 55 ++++++++++-------- .../overview/platforms/createApple.svelte | 58 ++++++++++--------- .../overview/platforms/createFlutter.svelte | 55 ++++++++++-------- .../platforms/createReactNative.svelte | 58 ++++++++++--------- 4 files changed, 126 insertions(+), 100 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte index f5674c0dd..f7204f9d3 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte @@ -10,7 +10,6 @@ Typography, Fieldset, InlineCode, - Spinner } from '@appwrite.io/pink-svelte'; import { Button, Form, InputText } from '$lib/elements/forms'; import { IconAndroid, IconAppwrite } from '@appwrite.io/pink-icons-svelte'; @@ -202,35 +201,43 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" icon={IconAppwrite} /> - - {#if !connectionSuccessful} - - Waiting for connection... - {:else} - -
- Congratulations! - + {#if isPlatformCreated} + + {#if !connectionSuccessful} You connected your app successfully. -
- {/if} - + >Waiting for connection... + {:else} + +
+ Congratulations! + + You connected your app successfully. +
+ {/if} + + {/if} - + {#if isPlatformCreated} + + {/if} diff --git a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte index 170ab4fef..cb3db0bd0 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte @@ -10,7 +10,6 @@ Typography, Fieldset, InlineCode, - Spinner } from '@appwrite.io/pink-svelte'; import { Button, Form, InputText } from '$lib/elements/forms'; import { IconApple, IconAppwrite } from '@appwrite.io/pink-icons-svelte'; @@ -117,8 +116,7 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject.client.config.endpoint}" variant="primary" {value} title={key} - disabled={isPlatformCreated} - /> + disabled={isPlatformCreated} /> {/each} @@ -228,35 +226,43 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject.client.config.endpoint}" icon={IconAppwrite} /> - - {#if !connectionSuccessful} - - Waiting for connection... - {:else} - -
- Congratulations! - + {#if isPlatformCreated} + + {#if !connectionSuccessful} You connected your app successfully. -
- {/if} - + >Waiting for connection... + {:else} + +
+ Congratulations! + + You connected your app successfully. +
+ {/if} + + {/if} - + {#if isPlatformCreated} + + {/if} diff --git a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte index 9250ea202..afb9a9893 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte @@ -10,7 +10,6 @@ Typography, Fieldset, InlineCode, - Spinner } from '@appwrite.io/pink-svelte'; import { Button, Form, InputText } from '$lib/elements/forms'; import { IconFlutter, IconAppwrite } from '@appwrite.io/pink-icons-svelte'; @@ -284,35 +283,43 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.e icon={IconAppwrite} /> - - {#if !connectionSuccessful} - - Waiting for connection... - {:else} - -
- Congratulations! - + {#if isPlatformCreated} + + {#if !connectionSuccessful} You connected your app successfully. -
- {/if} - + >Waiting for connection... + {:else} + +
+ Congratulations! + + You connected your app successfully. +
+ {/if} + + {/if} - + {#if isPlatformCreated} + + {/if} diff --git a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte index 159a8dec0..a7fee3fa1 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createReactNative.svelte @@ -10,7 +10,6 @@ Typography, Fieldset, InlineCode, - Spinner } from '@appwrite.io/pink-svelte'; import { Button, Form, InputText } from '$lib/elements/forms'; import { IconReact, IconAppwrite } from '@appwrite.io/pink-icons-svelte'; @@ -144,8 +143,7 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}"; variant="primary" {value} title={key} - disabled={isPlatformCreated} - /> + disabled={isPlatformCreated} /> {/each} @@ -253,35 +251,43 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}"; icon={IconAppwrite} /> - - {#if !connectionSuccessful} - - Waiting for connection... - {:else} - -
- Congratulations! - + {#if isPlatformCreated} + + {#if !connectionSuccessful} You connected your app successfully. -
- {/if} - + >Waiting for connection... + {:else} + +
+ Congratulations! + + You connected your app successfully. +
+ {/if} + + {/if} - + {#if isPlatformCreated} + + {/if} From c016ec4e9333e7782fee8b6dc8d0f3969191b976 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 14:53:10 +0100 Subject: [PATCH 09/21] fix: deployment overview --- src/lib/actions/analytics.ts | 2 +- ....svelte => activateDeploymentModal.svelte} | 16 ++--- .../sites/create-site/configuration.svelte | 35 +++++++---- .../site-[site]/deployments/table.svelte | 13 +++- .../site-[site]/deploymentsOverview.svelte | 60 +++++++++++++------ 5 files changed, 86 insertions(+), 40 deletions(-) rename src/routes/(console)/project-[project]/sites/{promoteModal.svelte => activateDeploymentModal.svelte} (66%) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index d78860b15..f02f4c490 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -340,5 +340,5 @@ export enum Submit { SiteConnectRepo = 'submit_site_connect_repo', SiteRedeploy = 'submit_site_redeploy', SiteDisconnectRepo = 'submit_site_disconnect_repo', - SitePromoteDeployment = 'submit_site_promote_deployment' + SiteActivateDeployment = 'submit_site_activate_deployment' } diff --git a/src/routes/(console)/project-[project]/sites/promoteModal.svelte b/src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte similarity index 66% rename from src/routes/(console)/project-[project]/sites/promoteModal.svelte rename to src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte index 2e549fc47..4f391bda2 100644 --- a/src/routes/(console)/project-[project]/sites/promoteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/activateDeploymentModal.svelte @@ -12,32 +12,32 @@ export let siteId: string; let error: string; - async function promote() { + async function activate() { try { - await sdk.forProject.sites.updateDeploymentBuild(siteId, selectedDeploymentId); + await sdk.forProject.sites.updateDeployment(siteId, selectedDeploymentId); addNotification({ type: 'success', - message: `Deployment has been promoted` + message: `Deployment has been activated` }); - trackEvent(Submit.SitePromoteDeployment); + trackEvent(Submit.SiteActivateDeployment); invalidate(Dependencies.SITE); invalidate(Dependencies.DEPLOYMENTS); show = false; } catch (e) { error = e.message; - trackError(e, Submit.SitePromoteDeployment); + trackError(e, Submit.SiteActivateDeployment); } } - +

- Are you sure you want to promote this deployment? This might affect your production code. + Are you sure you want to activate this deployment? This might affect your production code.

- + diff --git a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte index 2080e8409..ac68052dd 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte @@ -10,7 +10,9 @@ Badge, HiddenText, ActionMenu, - Accordion + Accordion, + Tooltip, + Button as PinkButton } from '@appwrite.io/pink-svelte'; import { IconDotsHorizontal, @@ -166,7 +168,16 @@
{#if variable.secret} - + + + + This value is secret, you cannot see its + value. + + {:else}
- + + + - + { showEditorModal = true; }}> @@ -197,7 +211,7 @@ {#if !variable?.secret} { currentVariable = variable; showSecretModal = true; @@ -206,7 +220,8 @@ {/if} { showImportModal = true; }}> diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte index ea9cbea4a..515923ad6 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/table.svelte @@ -21,11 +21,12 @@ IconXCircle } from '@appwrite.io/pink-icons-svelte'; import { columns } from './store'; + import ActivateDeploymentModal from '../../activateDeploymentModal.svelte'; export let data: PageData; let showDelete = false; - // let showActivate = false; + let showActivate = false; let showRedeploy = false; let showCancel = false; @@ -139,7 +140,7 @@ on:click={(e) => { e.preventDefault(); selectedDeployment = deployment; - // showActivate = true; + showActivate = true; toggle(e); }}> Activate @@ -182,10 +183,16 @@ {#if selectedDeployment} - + {/if} +{#if selectedDeployment && showActivate} + +{/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte index 7a80fb3a7..308cdb9e5 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -16,20 +16,25 @@ import DeploymentCreatedBy from '../(components)/deploymentCreatedBy.svelte'; import DeploymentSource from '../(components)/deploymentSource.svelte'; import Id from '$lib/components/id.svelte'; - import { IconDotsHorizontal, IconGlobeAlt, IconRefresh } from '@appwrite.io/pink-icons-svelte'; + import { + IconDotsHorizontal, + IconGlobeAlt, + IconRefresh, + IconXCircle + } from '@appwrite.io/pink-icons-svelte'; import RedeployModal from '../redeployModal.svelte'; - import PromoteModal from '../promoteModal.svelte'; import { Card } from '$lib/components'; + import ActivateDeploymentModal from '../activateDeploymentModal.svelte'; + import CancelDeploymentModal from './deployments/cancelDeploymentModal.svelte'; export let site: Models.Site; export let activeDeployment: Models.Deployment; export let deploymentList: Models.DeploymentList = undefined; - let showPromote = false; + let showActivate = false; let showRedeploy = false; + let showCancel = false; let selectedDeployment: Models.Deployment = null; - - $: console.log(deploymentList); {#if deploymentList.total} @@ -106,16 +111,31 @@ }}> Redeploy - { - e.preventDefault(); - selectedDeployment = deployment; - showPromote = true; - toggle(e); - }}> - Promote - + {#if deployment?.status === 'ready' && deployment?.$id !== site.deploymentId} + { + e.preventDefault(); + selectedDeployment = deployment; + showActivate = true; + toggle(e); + }}> + Activate + + {/if} + {#if deployment?.status === 'processing' || deployment?.status === 'building' || deployment.status === 'waiting'} + { + e.preventDefault(); + selectedDeployment = deployment; + showCancel = true; + toggle(e); + }}> + Cancel + + {/if} @@ -135,9 +155,13 @@ {/if} -{#if selectedDeployment && showPromote} - + bind:show={showActivate} /> +{/if} + +{#if selectedDeployment && showCancel} + {/if} From 5110f2d3d0d6c116621caef7af2223243504cbd7 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 14:53:48 +0100 Subject: [PATCH 10/21] fix: icon for activate --- .../sites/site-[site]/deploymentsOverview.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte index 308cdb9e5..cb323a647 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -18,7 +18,7 @@ import Id from '$lib/components/id.svelte'; import { IconDotsHorizontal, - IconGlobeAlt, + IconLightningBolt, IconRefresh, IconXCircle } from '@appwrite.io/pink-icons-svelte'; @@ -113,7 +113,7 @@ {#if deployment?.status === 'ready' && deployment?.$id !== site.deploymentId} { e.preventDefault(); selectedDeployment = deployment; From 98ab462a48787b8f1194a246f66aff1b762bfab9 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 14:56:46 +0100 Subject: [PATCH 11/21] fix: domain overview alignment --- .../sites/site-[site]/domainsOverview.svelte | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte index ddaed6ba5..b1c0a499e 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte @@ -42,10 +42,12 @@ - - {rule.domain} - - + + + {rule.domain} + + + Added {timeFromNow(rule.$createdAt)} From 45f623117cdd4a543d6af0680f21c405931c22d6 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 15:04:20 +0100 Subject: [PATCH 12/21] fix: source alignment --- .../sites/(components)/deploymentSource.svelte | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/(components)/deploymentSource.svelte b/src/routes/(console)/project-[project]/sites/(components)/deploymentSource.svelte index caca20106..2cd0bca2c 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/deploymentSource.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/deploymentSource.svelte @@ -16,13 +16,17 @@ {#if deployment.type === 'vcs'} - { - e.preventDefault(); - toggle(e); - }}> - GitHub - + + { + e.preventDefault(); + toggle(e); + }}> + + GitHub + + + Date: Wed, 12 Feb 2025 15:31:19 +0100 Subject: [PATCH 13/21] chore: bump pink --- package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 645b0e81b..c66b1189d 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f", "@appwrite.io/pink-legacy": "^1.0.0", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 376af7931..87a036adb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -221,8 +221,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@c33a3b5fe545833402ee41ee5efe7e2543f7f516': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@c33a3b5fe545833402ee41ee5efe7e2543f7f516} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9b5d0b2a3c13a182686e4c1f7970a3a0e957f866': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9b5d0b2a3c13a182686e4c1f7970a3a0e957f866} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.0': resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4090,7 +4090,7 @@ snapshots: dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@c33a3b5fe545833402ee41ee5efe7e2543f7f516(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9b5d0b2a3c13a182686e4c1f7970a3a0e957f866(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4103,9 +4103,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@c33a3b5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@c33a3b5fe545833402ee41ee5efe7e2543f7f516(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9b5d0b2a3c13a182686e4c1f7970a3a0e957f866(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.2(svelte@4.2.19) From c1c98e1dfd3ad969566a0c7c36a482d9d77571b8 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 16:18:01 +0100 Subject: [PATCH 14/21] fix: variables modals --- package.json | 2 +- pnpm-lock.yaml | 18 ++++----- src/lib/layout/wizardExitModal.svelte | 26 ++++++------- .../sites/create-site/configuration.svelte | 37 ++++++++++--------- .../sites/create-site/createVariable.svelte | 1 + .../create-site/deleteVariableModal.svelte | 32 ++++++++++++++++ .../importSiteVariablesModal.svelte | 1 + .../sites/create-site/productionBranch.svelte | 1 + .../create-site/secretVariableModal.svelte | 37 +++++++++++++------ 9 files changed, 103 insertions(+), 52 deletions(-) create mode 100644 src/routes/(console)/project-[project]/sites/create-site/deleteVariableModal.svelte diff --git a/package.json b/package.json index c66b1189d..0a793ac7b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@5eac713f", "@appwrite.io/pink-legacy": "^1.0.0", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@d4b6134", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 87a036adb..d6e7eb368 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@d4b6134 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@d4b6134(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -221,8 +221,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9b5d0b2a3c13a182686e4c1f7970a3a0e957f866': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9b5d0b2a3c13a182686e4c1f7970a3a0e957f866} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@d4b6134d62edbf723bc701c58e6b5d8364c64240': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@d4b6134d62edbf723bc701c58e6b5d8364c64240} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.0': resolution: {integrity: sha512-EZk/wX8oDhIsCXf2A0oQjdNOaHvh5MnWbLQI4pAiGrdy5qQGPoU19AK6iVX6z3QoOq7geoEu0zVwAowBy5hZbQ==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@d4b6134': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@d4b6134} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4090,7 +4090,7 @@ snapshots: dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9b5d0b2a3c13a182686e4c1f7970a3a0e957f866(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@d4b6134d62edbf723bc701c58e6b5d8364c64240(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4103,9 +4103,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@9b5d0b2(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@d4b6134(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@9b5d0b2a3c13a182686e4c1f7970a3a0e957f866(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@d4b6134d62edbf723bc701c58e6b5d8364c64240(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.2(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.2(svelte@4.2.19) diff --git a/src/lib/layout/wizardExitModal.svelte b/src/lib/layout/wizardExitModal.svelte index caffdb47b..80f8ec227 100644 --- a/src/lib/layout/wizardExitModal.svelte +++ b/src/lib/layout/wizardExitModal.svelte @@ -1,28 +1,28 @@ - -

- -

+ + - - {#if href} - - {:else} - - {/if} + + + {#if href} + + {:else} + + {/if} + - + diff --git a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte index ac68052dd..b2095ce17 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte @@ -30,6 +30,7 @@ import SecretVariableModal from './secretVariableModal.svelte'; import ImportSiteVariablesModal from './importSiteVariablesModal.svelte'; import CreateVariable from './createVariable.svelte'; + import DeleteVariableModal from './deleteVariableModal.svelte'; export let frameworks: Models.Framework[]; export let selectedFramework: Models.Framework; @@ -42,18 +43,12 @@ let showEditorModal = false; let showImportModal = false; let showSecretModal = false; + let showDelete = false; let showCreate = false; let currentVariable: Partial; let frameworkId = selectedFramework.key; - function markAsSecret() { - let variable = variables.find((v) => v.key === currentVariable.key); - if (variable) { - variable.secret = true; - } - } - $: frameworkData = frameworks.find((framework) => framework.key === selectedFramework.key); @@ -202,13 +197,16 @@ - { - showEditorModal = true; - }}> - Edit - + {#if !variable?.secret} + { + currentVariable = variable; + showCreate = true; + }}> + Edit + + {/if} {#if !variable?.secret} { - showImportModal = true; + currentVariable = variable; + showDelete = true; }}> Delete @@ -251,7 +250,7 @@ {/if} {#if showSecretModal} - + {/if} {#if showImportModal} @@ -259,5 +258,9 @@ {/if} {#if showCreate} - + +{/if} + +{#if showDelete} + {/if} diff --git a/src/routes/(console)/project-[project]/sites/create-site/createVariable.svelte b/src/routes/(console)/project-[project]/sites/create-site/createVariable.svelte index 3c451d14f..0664e9454 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/createVariable.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/createVariable.svelte @@ -64,6 +64,7 @@ minlength={0} /> + import { Button } from '$lib/elements/forms'; + import type { Models } from '@appwrite.io/console'; + import { Dialog, Layout } from '@appwrite.io/pink-svelte'; + + export let show = false; + + export let currentVariable: Partial = null; + export let variables: Partial[] = []; + + function deleteVariable() { + console.log(variables, currentVariable); + variables = variables.filter((v) => v.key !== currentVariable.key); + variables = [...variables]; + currentVariable = null; + show = false; + } + + $: if (!show) { + currentVariable = null; + } + + + +

Are you sure you want to delete this variable? This action is irreversible.

+ + + + + + + diff --git a/src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte index 2d9e4885a..83386ae25 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte @@ -80,6 +80,7 @@ {/if} - import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; - import { Layout } from '@appwrite.io/pink-svelte'; + import type { Models } from '@appwrite.io/console'; + import { Dialog, Layout } from '@appwrite.io/pink-svelte'; export let show = false; + + export let currentVariable: Partial; + export let variables: Partial[]; + + function markAsSecret() { + let variable = variables.find((v) => v.key === currentVariable.key); + if (variable) { + variable.secret = true; + } + variables = [...variables]; + currentVariable = null; + show = false; + } + + $: if (!show) { + currentVariable = null; + } - +

Secret variables are hidden from both the UI and API. Once a variable is marked as @@ -15,13 +32,9 @@

Are you sure you want to make this variable secret?

 - - + + + + - + From aedc300e2e2d133cec749b4509857fc5fafad175 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 12 Feb 2025 16:28:18 +0100 Subject: [PATCH 15/21] fix: aside --- .../sites/create-site/aside.svelte | 46 +++++++++++-------- .../repository-[repository]/+page.svelte | 2 +- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/create-site/aside.svelte b/src/routes/(console)/project-[project]/sites/create-site/aside.svelte index 7d310c96b..e1b266114 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/aside.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/aside.svelte @@ -1,6 +1,6 @@ - + - {#if framework?.name} - {@const frameworkIcon = getFrameworkIcon(framework.key)} - - Framework - - {#if frameworkIcon} - - {/if} - - {framework.name} - - - - {/if} {#if repositoryName && showAfter} Git repository - - + + {repositoryName} @@ -46,14 +32,18 @@ {#if branch && showAfter} Branch - - + + {branch} {/if} + {#if rootDir && showAfter} Root directory @@ -62,9 +52,25 @@ {/if} + {#if framework?.name} + {@const frameworkIcon = getFrameworkIcon(framework.key)} + + Framework + + {#if frameworkIcon} + + {/if} + + {framework.name} + + + + {/if} + {#if domain && showAfter} Domain + -