From 579ed70057d03d3bcdb6041f20b380efa50cec68 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 24 Feb 2025 12:10:44 +0100 Subject: [PATCH] fix: deployment --- package.json | 2 +- pnpm-lock.yaml | 18 +-- .../(components)/connectRepoModal.svelte | 18 +-- .../sites/site-[site]/+page.svelte | 11 +- .../site-[site]/deployments/+page.svelte | 4 + .../deployments/createCliModal.svelte | 103 ++++++++++++++++++ .../sites/site-[site]/domainsOverview.svelte | 14 ++- 7 files changed, 140 insertions(+), 30 deletions(-) create mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/deployments/createCliModal.svelte diff --git a/package.json b/package.json index cdfc64a0f..ddabeec1a 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@f0102c9f", "@appwrite.io/pink-legacy": "^1.0.1", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@f7e429f", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@f99d781", "@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 b3a3f0086..1ccb298e3 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@f7e429f - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@f7e429f(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@f99d781 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@f99d781(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@f7e429f7c7be7210ce06603cbcaef09e7f9c2fdf': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@f7e429f7c7be7210ce06603cbcaef09e7f9c2fdf} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@f99d781924ba95e7ed83708ca8e4c26f80293c3c': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@f99d781924ba95e7ed83708ca8e4c26f80293c3c} 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@f7e429f': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@f7e429f} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@f99d781': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@f99d781} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4103,7 +4103,7 @@ snapshots: dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@f7e429f7c7be7210ce06603cbcaef09e7f9c2fdf(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@f99d781924ba95e7ed83708ca8e4c26f80293c3c(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@f7e429f(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@f99d781(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@f7e429f7c7be7210ce06603cbcaef09e7f9c2fdf(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@f99d781924ba95e7ed83708ca8e4c26f80293c3c(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/(components)/connectRepoModal.svelte b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte index fce286b89..b855373c9 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte @@ -29,6 +29,7 @@ let selectedRepository = ''; let installations = { installations: [], total: 0 }; let hasInstallations = !!installations?.total; + let error = ''; onMount(async () => { installations = await sdk.forProject.vcs.listInstallations(); @@ -54,18 +55,17 @@ repository.set(repo); selectedRepository = repo.id; } - console.log(Object.keys(Framework)); const s = await sdk.forProject.sites.update( site.$id, site.name, - Framework[site.framework], + site.framework as Framework, site.enabled, site.timeout, site.installCommand, site.buildCommand, site.outputDirectory, - BuildRuntime[site.buildRuntime], + site.buildRuntime as BuildRuntime, site.adapter, site.fallbackFile, selectedInstallationId, @@ -79,20 +79,20 @@ type: 'success', message: 'Repository connected successfully' }); - } catch (error) { - addNotification({ - type: 'error', - message: error.message - }); + } catch (e) { + error = e.message; } } + + $: console.log(selectedInstallationId); + onSubmit={connectRepo} + bind:error> Connect to a new repository or an existing one. {#if hasInstallations} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte index abda0ca03..15b8d609e 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/+page.svelte @@ -43,8 +43,9 @@ - + {:else if data.deployment?.status === 'building'} @@ -61,11 +62,11 @@ {:else} - You haven't deployed any sites yet. Get started by deploying your first - site. + Deploy your site to get started. Once deployed, you'll see your latest build + details here. diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte index 0b696c04f..e780be57f 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/+page.svelte @@ -21,6 +21,7 @@ import { sdk } from '$lib/stores/sdk'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; + import CreateCliModal from './createCliModal.svelte'; export let data; @@ -208,3 +209,6 @@ {#if showConnectManual} {/if} +{#if showConnectCLI} + +{/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createCliModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createCliModal.svelte new file mode 100644 index 000000000..87f082007 --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createCliModal.svelte @@ -0,0 +1,103 @@ + + + + + Deploy your site using the Appwrite CLI by running the following command inside your + function's folder. + + + + + + {#each ['Unix', 'CMD', 'PowerShell'] as cat} + (category = cat)} + active={category === cat}> + {cat} + + {/each} + + + {#each ['Unix', 'CMD', 'PowerShell'] as cat} + {#if category === cat} + + {/if} + {/each} + + + + If you did not create your site using the CLI, initialize your function by following our documentation. + + + + + + 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 e88da8ba8..5c6fdb575 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte @@ -50,12 +50,14 @@ unique domain. - +
+ +
{#if proxyRuleList?.rules?.length}