From 7ab98b6cba285eebb72e193970376a6877835b2b Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 3 Jan 2025 12:40:30 +0530 Subject: [PATCH 01/21] add: confirm checkbox on deletion. --- .../settings/deleteModal.svelte | 28 ++++++++++++++----- .../site-[site]/settings/deleteModal.svelte | 28 ++++++++++++++----- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index 589f01e39..a178284d1 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -2,15 +2,18 @@ import { goto } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Modal } from '$lib/components'; - import { Button } from '$lib/elements/forms'; + import { Button, InputCheckbox } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; + import { FormList } from '$lib/elements/forms/index.js'; export let showDelete = false; const functionId = $page.params.function; + let confirmedDeletion = false; + const handleSubmit = async () => { try { await sdk.forProject.functions.delete(functionId); @@ -38,12 +41,23 @@ icon="exclamation" state="warning" headerDivider={false}> -

- Are you sure you want to delete this function and all associated deployments from your - project? -

+ +

+ Are you sure you want to delete this function and all associated deployments from your + project? +

+ +
+ +
+ - + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte index 76dd3046b..021c067a1 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -2,15 +2,18 @@ import { goto } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/stores'; - import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Modal } from '$lib/components'; - import { Button } from '$lib/elements/forms'; + import { Button, InputCheckbox } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; + import { FormList } from '$lib/elements/forms/index.js'; export let showDelete = false; const siteId = $page.params.site; + let confirmedDeletion = false; + const handleSubmit = async () => { try { await sdk.forProject.sites.delete(siteId); @@ -37,12 +40,23 @@ onSubmit={handleSubmit} icon="exclamation" state="warning"> -

- Are you sure you want to delete this site and all associated deployments from your - project? -

+ +

+ Are you sure you want to delete this site and all associated deployments from your + project? +

+ +
+ +
+ - + From dda9b01e0be71b09b43e950034a9234e21175008 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 3 Jan 2025 12:47:43 +0530 Subject: [PATCH 02/21] update: copy. --- .../function-[function]/settings/deleteModal.svelte | 6 ++++-- .../sites/site-[site]/settings/dangerZone.svelte | 2 +- .../sites/site-[site]/settings/deleteModal.svelte | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index a178284d1..622b8c896 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -8,6 +8,7 @@ import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { FormList } from '$lib/elements/forms/index.js'; + import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store'; export let showDelete = false; const functionId = $page.params.function; @@ -42,9 +43,10 @@ state="warning" headerDivider={false}> +

Are you sure you want to delete {$func.name}?

- Are you sure you want to delete this function and all associated deployments from your - project? + The function and all associated deployments will be permanently deleted. This action is + irreversible.

diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte index 47ab695ae..32daf0b8c 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte @@ -30,4 +30,4 @@ - + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte index 021c067a1..60ac0fceb 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -9,6 +9,7 @@ import { sdk } from '$lib/stores/sdk'; import { FormList } from '$lib/elements/forms/index.js'; + export let siteName = ''; export let showDelete = false; const siteId = $page.params.site; @@ -41,9 +42,10 @@ icon="exclamation" state="warning"> +

Are you sure you want to delete {siteName}?

- Are you sure you want to delete this site and all associated deployments from your - project? + The site and all associated deployments will be permanently deleted. This action is + irreversible.

From fc70857e4c8ff1f0b5a819a8253e5930e5d18748 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 3 Jan 2025 12:47:54 +0530 Subject: [PATCH 03/21] ran: formatter. --- .../project-[project]/sites/(components)/logs.svelte | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index 86d9a930e..ca5c6bf94 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -93,10 +93,7 @@ async function cancelDeployment() { try { - await sdk.forProject.sites.updateDeploymentBuild( - deployment.resourceId, - deployment.$id - ); + await sdk.forProject.sites.updateDeploymentBuild(deployment.resourceId, deployment.$id); await invalidate(Dependencies.DEPLOYMENTS); addNotification({ type: 'success', From 488527df85df882cc7ea3725f4b338cc58fe5663 Mon Sep 17 00:00:00 2001 From: Darshan Date: Fri, 3 Jan 2025 12:51:25 +0530 Subject: [PATCH 04/21] clean import. --- .../functions/function-[function]/settings/deleteModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index 622b8c896..859dbbcab 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -8,7 +8,7 @@ import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; import { FormList } from '$lib/elements/forms/index.js'; - import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store'; + import { func } from '../store'; export let showDelete = false; const functionId = $page.params.function; From 8f93ca82b2ca1aa2824c09baeddf967abd59a551 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 8 Jan 2025 10:27:12 +0530 Subject: [PATCH 05/21] fix: misc. --- .../settings/deleteModal.svelte | 14 ++++++-------- .../sites/site-[site]/settings/deleteModal.svelte | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index 859dbbcab..2ec204ef2 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -49,14 +49,12 @@ irreversible.

-
- -
+ diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte index 60ac0fceb..f9e369977 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -48,14 +48,12 @@ irreversible.

-
- -
+ From e496fb45820f06087005deeedd9aebc86b7305ec Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 19 Feb 2025 09:53:40 +0530 Subject: [PATCH 06/21] update: component for friction as per latest changes. --- .../site-[site]/settings/deleteModal.svelte | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte index e2b1f871e..73875009d 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -3,13 +3,17 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import { FormList, InputCheckbox } from '$lib/elements/forms'; import Confirm from '$lib/components/confirm.svelte'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; export let showDelete = false; const siteId = $page.params.site; + let error: string; + let confirmedDeletion = false; + const handleSubmit = async () => { try { await sdk.forProject.sites.delete(siteId); @@ -27,6 +31,20 @@ }; - - Are you sure you want to delete this site and all associated deployments from your project? + + + Are you sure you want to delete this site and all associated deployments from your project? + + + From 984e92ba6c0d3950b01f372457a2d6881ca94f91 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 19 Feb 2025 10:34:21 +0530 Subject: [PATCH 07/21] update: functions too. --- .../settings/dangerZone.svelte | 2 +- .../settings/deleteModal.svelte | 32 ++++++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte index 37d1e094e..20af9413e 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte @@ -27,4 +27,4 @@ - + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte index aa9a9fdf8..116ecb061 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte @@ -6,13 +6,18 @@ import Confirm from '$lib/components/confirm.svelte'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; + import { type Models } from '@appwrite.io/console'; + import { FormList, InputCheckbox } from '$lib/elements/forms'; export let showDelete = false; - const functionId = $page.params.function; + export let projectFunction: Models.Function; + let error: string; + let confirmedDeletion = false; + const handleSubmit = async () => { try { - await sdk.forProject.functions.delete(functionId); + await sdk.forProject.functions.delete(projectFunction.$id); showDelete = false; addNotification({ type: 'success', @@ -27,6 +32,25 @@ }; - - Are you sure you want to delete this function and all associated deployments from your project? + + +

Are you sure you want to delete {projectFunction.name}?

+ +

+ The function and all associated deployments will be permanently deleted. This action is + irreversible. +

+ + + From 67c6630eb35088d8792e88481f442a1b13dba268 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 19 Feb 2025 10:34:30 +0530 Subject: [PATCH 08/21] update: simplify logic. --- .../sites/site-[site]/settings/dangerZone.svelte | 3 +-- .../sites/site-[site]/settings/deleteModal.svelte | 12 +++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte index e6d822d89..bfe14638e 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/dangerZone.svelte @@ -1,6 +1,5 @@ -
+ Connect later Deploy now and connect your version control later via CLI or Git integration in your settings. -
+ From c75ee73216b3a643380a5cb298c171617d8605c2 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Feb 2025 14:23:22 +0100 Subject: [PATCH 14/21] fix: finish screen --- package.json | 2 +- pnpm-lock.yaml | 24 +++++++++---------- .../sites/create-site/finish/+page.svelte | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index a1b0702f8..797063620 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@50ea3ca7", "@appwrite.io/pink-legacy": "^1.0.1", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0ad1063", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@747d516", "@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 f75329d75..1e6846c22 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.1 version: 1.0.1 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0ad1063 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0ad1063(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@747d516 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@747d516(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -215,14 +215,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08ec153} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@0ad10637d6677476315ab8b4cd0c6f168d246b98': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@0ad10637d6677476315ab8b4cd0c6f168d246b98} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50ea3ca7': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50ea3ca7} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50ea3ca70a483ffd9040f8ce9cb40a8d5f1ee30e': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50ea3ca70a483ffd9040f8ce9cb40a8d5f1ee30e} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@747d51690a3dd4d4ceb079f47822987815ad95d2': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@747d51690a3dd4d4ceb079f47822987815ad95d2} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.1': resolution: {integrity: sha512-e5IZx2drqSxgl2WXvmr0eLfg/WiOCzuqQE8oksD+9GoFBkcL9HWvXul5GjFni3RBAN9XFRL3nUExGk4T0H8sFw==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0ad1063': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@0ad1063} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@747d516': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@747d516} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4099,11 +4099,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@08ec153': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@0ad10637d6677476315ab8b4cd0c6f168d246b98(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50ea3ca7(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50ea3ca70a483ffd9040f8ce9cb40a8d5f1ee30e(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@747d51690a3dd4d4ceb079f47822987815ad95d2(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4116,9 +4116,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@0ad1063(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@747d516(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@0ad10637d6677476315ab8b4cd0c6f168d246b98(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@747d51690a3dd4d4ceb079f47822987815ad95d2(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte index 7e47b6785..04cadbd8d 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte @@ -58,7 +58,7 @@
- + {#if !data.site.providerRepositoryId} From 14f54b4a41714b8367f6184158d11ae3c0cf919c Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Feb 2025 15:19:26 +0100 Subject: [PATCH 15/21] fix: site card links --- .../sites/(components)/siteCard.svelte | 52 ++++--------------- .../sites/create-site/finish/+page.svelte | 10 ++-- .../sites/create-site/finish/+page.ts | 16 +++--- .../sites/site-[site]/+layout.ts | 11 +--- .../sites/site-[site]/+page.ts | 10 +++- .../deployment-[deployment]/+page.ts | 11 ++-- .../site-[site]/deployments/table.svelte | 1 - 7 files changed, 41 insertions(+), 70 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte index bc31fd8d1..182906f4b 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte @@ -1,6 +1,5 @@ - - - - Deployment logs - - + {#if !hideTitle} + + + + Deployment logs + + + + + {#if ['processing', 'building'].includes(status)} + + +

+ + + + {:else} + + {formatTimeDetailed(deployment.buildTime)} + + {/if} + - - {#if ['processing', 'building'].includes(status)} - - -

- - - - {:else} - - {formatTimeDetailed(deployment.buildTime)} - - {/if} - - + {/if} {#key buildLogs} {/key} diff --git a/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte b/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte index 9883291d9..50edf6aed 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/openOnMobileModal.svelte @@ -23,7 +23,7 @@ Open the preview of your site on any mobile or tablet device. - + QR 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 873847513..d964e853f 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte @@ -204,23 +204,26 @@ size="s" /> - + {#if !variable?.secret} { + on:click={(e) => { + toggle(e); currentVariable = variable; showUpdate = true; }}> - Edit + Update {/if} {#if !variable?.secret} { + on:click={(e) => { + toggle(e); + currentVariable = variable; showSecretModal = true; @@ -231,7 +234,8 @@ { + on:click={(e) => { + toggle(e); currentVariable = variable; showDelete = true; }}> diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte index 2ccb8c0f9..10d7fcdbe 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte @@ -15,7 +15,7 @@ import Details from '../../details.svelte'; import ProductionBranch from '../../productionBranch.svelte'; import Aside from '../../aside.svelte'; - import { BuildRuntime, Framework, ID, Query, ResourceType, Type } from '@appwrite.io/console'; + import { BuildRuntime, Framework, ID, ResourceType, Type } from '@appwrite.io/console'; import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import Configuration from '../../configuration.svelte'; diff --git a/src/routes/(console)/project-[project]/sites/create-site/updateVariableModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/updateVariableModal.svelte index 061729272..e6dda3e49 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/updateVariableModal.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/updateVariableModal.svelte @@ -1,5 +1,5 @@ - - - + + + {#if data.deployment?.status === 'ready'} + + {/if} + + + + + + + + + + + + + +{#if showActivate} + +{/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/quickFilters.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/quickFilters.svelte index 0252024c3..b7cfd3337 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/quickFilters.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/quickFilters.svelte @@ -12,7 +12,8 @@ } from '$lib/components/filters/store'; import { SelectSearchCheckbox } from '$lib/elements'; import type { Column } from '$lib/helpers/types'; - import { ActionMenu, Popover, Tag } from '@appwrite.io/pink-svelte'; + import { IconChevronDown, IconChevronUp } from '@appwrite.io/pink-icons-svelte'; + import { ActionMenu, Icon, Popover, Tag } from '@appwrite.io/pink-svelte'; import { type Writable } from 'svelte/store'; export let columns: Writable; @@ -184,13 +185,13 @@ {#each [typeFilter] as filter} - + {#key filter.tag} {filter?.tag ?? filter.title} {/key} - + @@ -233,14 +234,14 @@ - + {#key filter.tag} {filter?.tag ?? filter.title} {/key} - + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts index a7915b8c5..f383a7772 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/store.ts @@ -16,16 +16,7 @@ export const columns = writable([ elements: ['ready', 'processing', 'building', 'waiting', 'cancelled', 'failed'], filter: false }, - { - id: 'domains', - title: 'Domains', - type: 'string', - show: true, - width: 150, - array: true, - format: 'string', - filter: false - }, + { id: 'buildTime', title: 'Build time', 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 e28d490fb..066062e47 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 @@ -1,5 +1,5 @@ - Settings diff --git a/src/routes/(console)/project-[project]/sites/usage/+page.svelte b/src/routes/(console)/project-[project]/sites/usage/+page.svelte index caeffd8f1..fbbc96e0d 100644 --- a/src/routes/(console)/project-[project]/sites/usage/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/usage/+page.svelte @@ -1,5 +1,9 @@ Coming soon diff --git a/src/routes/(console)/project-[project]/sites/usage/+page.ts b/src/routes/(console)/project-[project]/sites/usage/+page.ts new file mode 100644 index 000000000..1be4eb88b --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/usage/+page.ts @@ -0,0 +1,13 @@ +import { sdk } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants'; +import { Query } from '@appwrite.io/console'; + +export const load = async ({ params, depends, parent }) => { + depends(Dependencies.SITES); + + const usage = await sdk.forProject.sites.listUsage(); + + return { + usage + }; +}; From 815db15614118fd4fa84955a6b6a9cd67ad79ade Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 25 Feb 2025 17:59:44 +0100 Subject: [PATCH 17/21] fix: small design fixes --- .../sites/(components)/connectRepoModal.svelte | 9 +++++++-- .../sites/site-[site]/settings/updateRepository.svelte | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte index b855373c9..fb88fcc60 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte @@ -93,7 +93,9 @@ hideFooter={!repositoryBehaviour} onSubmit={connectRepo} bind:error> - Connect to a new repository or an existing one. + + Connect your site to an existing repository or create a new one. + {#if hasInstallations} @@ -127,7 +129,10 @@ {#if repositoryBehaviour === 'existing'} - Missing a repository? check your permissions + + Missing a repository? check your permissions + {:else if repositoryBehaviour === 'new'} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte index 2278de74d..c6d7dd9a0 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte @@ -116,7 +116,7 @@

- Repository + Git repository Automatically deploy changes for every commit pushed to your Git repository. {#if repository === false} @@ -204,12 +204,13 @@ {:else if site.installationId || installations?.total} From 046a5dfc90bf3c20af831268c7d9a726b9f27d01 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Wed, 26 Feb 2025 10:41:49 +0100 Subject: [PATCH 18/21] Fix: menu icons jumping between icons and open mode --- src/lib/components/sidebar.svelte | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte index 94e079d13..4cf8245cf 100644 --- a/src/lib/components/sidebar.svelte +++ b/src/lib/components/sidebar.svelte @@ -419,15 +419,6 @@ border-bottom: var(--border-width-s, 1px) solid var(--color-border-neutral, #ededf0); background: var(--color-bgcolor-neutral-primary, #fff); - - .icon { - display: flex; - padding: var(--space-3, 6px); - justify-content: center; - align-items: center; - - color: var(--color-fgcolor-neutral-weak); - } } .products-label-container { @@ -440,7 +431,7 @@ } .icons .products-label-container { - margin-block-start: var(--base-32, 32px); + margin-block-start: var(--base-20, 20px); margin-block-end: var(--base-8, 8px); } From 86503d37616bff086a495677451a31e9adb461f8 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Wed, 26 Feb 2025 11:44:48 +0100 Subject: [PATCH 19/21] Fix: vertical scrolling between 1024px and 1200px viewport --- src/lib/layout/container.svelte | 4 ++-- src/lib/layout/cover.svelte | 4 ++-- src/lib/layout/shell.svelte | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/layout/container.svelte b/src/lib/layout/container.svelte index 641ce3b2b..5d229c030 100644 --- a/src/lib/layout/container.svelte +++ b/src/lib/layout/container.svelte @@ -27,8 +27,8 @@ margin-inline: 1rem; } @media (min-width: 1024px) { - margin-inline: 2.5rem; - max-width: 944px; + margin-inline: auto; + max-width: min(944px, calc(944px - 5rem)); } @media (min-width: 1280px) { margin-inline: auto; diff --git a/src/lib/layout/cover.svelte b/src/lib/layout/cover.svelte index 1fc815a12..f920c6281 100644 --- a/src/lib/layout/cover.svelte +++ b/src/lib/layout/cover.svelte @@ -40,8 +40,8 @@ margin-inline: 1rem; } @media (min-width: 1024px) { - margin-inline: 2.5rem; - max-width: 944px; + margin-inline: auto; + max-width: min(944px, calc(944px - 5rem)); } @media (min-width: 1280px) { margin-inline: auto; diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index f6f4a201f..d27ab9804 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -6,7 +6,7 @@ import { log } from '$lib/stores/logs'; import { wizard } from '$lib/stores/wizard'; import { activeHeaderAlert } from '$routes/(console)/store'; - import { type ComponentType, onDestroy, setContext } from 'svelte'; + import { type ComponentType, setContext } from 'svelte'; import { writable } from 'svelte/store'; import { showSubNavigation } from '$lib/stores/layout'; import { organization, organizationList } from '$lib/stores/organization'; @@ -135,7 +135,6 @@
Date: Wed, 26 Feb 2025 13:09:27 +0100 Subject: [PATCH 20/21] Use fallback org --- src/routes/(console)/+layout.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts index 84eb809a5..d4d311286 100644 --- a/src/routes/(console)/+layout.ts +++ b/src/routes/(console)/+layout.ts @@ -34,8 +34,14 @@ export const load: LayoutLoad = async ({ params, fetch, depends, parent }) => { }, new Map()); } + const organizations = await sdk.forConsole.teams.list(); + let projects = []; - const currentOrgId = params.organization ? params.organization : prefs.organization; + let currentOrgId = params.organization ? params.organization : prefs.organization; + + if (!currentOrgId && organizations.teams.length > 0) { + currentOrgId = organizations.teams[0].$id; + } if (currentOrgId) { const orgProjects = await sdk.forConsole.projects.list([ Query.equal('teamId', currentOrgId), @@ -53,6 +59,6 @@ export const load: LayoutLoad = async ({ params, fetch, depends, parent }) => { scopes: [], projects: projects, currentProjectId: params.project ?? '', - organizations: await sdk.forConsole.teams.list() + organizations: organizations }; }; From 5f74feedbc2f0b3d8da09d6770dfe7931daebb82 Mon Sep 17 00:00:00 2001 From: ernstmul Date: Wed, 26 Feb 2025 13:44:41 +0100 Subject: [PATCH 21/21] Fix dismiss get started page --- src/routes/(console)/project-[project]/overview/header.svelte | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/routes/(console)/project-[project]/overview/header.svelte b/src/routes/(console)/project-[project]/overview/header.svelte index d3251dceb..89110e70c 100644 --- a/src/routes/(console)/project-[project]/overview/header.svelte +++ b/src/routes/(console)/project-[project]/overview/header.svelte @@ -48,10 +48,8 @@ on:click={async () => { trackEvent('onboarding_hub_platform_dismiss'); await setHasOnboardingDismissed($project.$id); + await invalidate(Dependencies.ORGANIZATION); goto(`${base}/project-${$project.$id}/overview`); - requestAnimationFrame(() => { - invalidate(Dependencies.ORGANIZATION); - }); }}>Dismiss this page {/if}