From e205812bcd159e4d8ebe7fc80607fc610b65216c Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 6 Mar 2025 12:17:35 +0100 Subject: [PATCH] feat: refactor add site domain (WIP) --- package.json | 2 +- pnpm-lock.yaml | 18 +- src/lib/elements/forms/inputSelect.svelte | 4 +- src/lib/elements/link.svelte | 4 +- .../(components)/connectRepoModal.svelte | 12 +- .../sites/site-[site]/domains/+page.svelte | 3 +- .../domains/add-domain/+page.svelte | 272 ++++++++++-------- .../site-[site]/domains/add-domain/+page.ts | 9 +- .../domains/add-domain/verify/+page.svelte | 56 ++++ .../sites/site-[site]/domainsOverview.svelte | 10 +- 10 files changed, 246 insertions(+), 144 deletions(-) create mode 100644 src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify/+page.svelte diff --git a/package.json b/package.json index a6be4594a..cf63ab749 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@f57e0157 ", "@appwrite.io/pink-legacy": "^1.0.2", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@eddbab5", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@50282e1", "@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 5dbb44e1b..1c0bbd7f7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@eddbab5 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@eddbab5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@50282e1 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@50282e1(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -215,8 +215,8 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@eddbab56b0e6113533a354772fdaff6fe12066f9': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@eddbab56b0e6113533a354772fdaff6fe12066f9} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50282e19b1651dacb859eb440b5f62c48c8d435f': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50282e19b1651dacb859eb440b5f62c48c8d435f} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.2': resolution: {integrity: sha512-1AYNcfbV+x0Tyj56CoieSq5g7+u+7F5/LDVN/z+Hx1kp9gj7xc1eT39Dy832xxfihImF6ksjp0FXEMVSBR8cew==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@eddbab5': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@eddbab5} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@50282e1': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@50282e1} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4099,7 +4099,7 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@ac51fcb': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@eddbab56b0e6113533a354772fdaff6fe12066f9(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50282e19b1651dacb859eb440b5f62c48c8d435f(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@eddbab5(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@50282e1(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@eddbab56b0e6113533a354772fdaff6fe12066f9(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@50282e19b1651dacb859eb440b5f62c48c8d435f(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/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte index 8c560bedc..a05d95452 100644 --- a/src/lib/elements/forms/inputSelect.svelte +++ b/src/lib/elements/forms/inputSelect.svelte @@ -58,4 +58,6 @@ on:invalid={handleInvalid} on:input on:change - bind:value /> + bind:value> + + diff --git a/src/lib/elements/link.svelte b/src/lib/elements/link.svelte index b5807ae58..6e75e98a5 100644 --- a/src/lib/elements/link.svelte +++ b/src/lib/elements/link.svelte @@ -13,6 +13,7 @@ export let variant: Props['variant'] = 'default'; export let size: Props['size'] = 'm'; export let external = false; + export let icon = false; function track() { if (!event) { @@ -33,6 +34,7 @@ on:click={track} {href} {disabled} + {icon} {variant} {size} target={external ? '_blank' : ''} @@ -40,7 +42,7 @@ {:else} - + {/if} diff --git a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte index fb88fcc60..4800cd537 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte @@ -9,7 +9,7 @@ import { Link } from '$lib/elements'; import { NewRepository, Repositories } from '$lib/components/git'; import ConnectGit from '$lib/components/git/connectGit.svelte'; - import { BuildRuntime, Framework, type Models } from '@appwrite.io/console'; + import { Adapter, BuildRuntime, Framework, type Models } from '@appwrite.io/console'; import { addNotification } from '$lib/stores/notifications'; import { trackEvent } from '$lib/actions/analytics'; import { invalidate } from '$app/navigation'; @@ -66,10 +66,14 @@ site.buildCommand, site.outputDirectory, site.buildRuntime as BuildRuntime, - site.adapter, + site.adapter as Adapter, site.fallbackFile, selectedInstallationId, - selectedRepository + selectedRepository, + 'main', + undefined, + undefined, + undefined ); console.log('test'); invalidate(Dependencies.SITE); @@ -83,8 +87,6 @@ error = e.message; } } - - $: console.log(selectedInstallationId); + description="Give your site a unique identity and make it easier to find by by assigning it a custom domain."> - - - - {:else if domainData.status === 'verifying'} - - - {domainData.domain} - - - - - - - - - {:else if domainData.status === 'verified'} - - - {domainData.domain} - - - - - {/if} - {:else} -
-
- - - - - {#if redirect} + +
+ + + + Connect this domain to your active deployment and configure the linked Git + branch as needed. + + + Automatically forward traffic from this domain to another URL of your choice. + + + + {#if behaviour === 'create'} +
+ + {#if data.branches?.total} + {@const sortedBranches = sortBranches(data.branches.branches)} + {@const options = sortedBranches.map((branch) => ({ + label: branch.name, + value: branch.name + }))} + + {:else} + + + + +

+ The domain will be connected to your active deployment. + Connect your Git repository to link a production branch. +

+
+ +
+
+
+ {/if} +
+
+ + + {:else if behaviour === 'redirect'} +
+ + + + + + Redirect this domain. Domains added to your project will be + listed here. + + + - {/if} - - {#if data.branches?.total} - {@const sortedBranches = sortBranches(data.branches.branches)} - {@const options = sortedBranches.map((branch) => ({ - label: branch.name, - value: branch.name - }))} - - {/if} - - - - - - -
- {/if} - + + {/if} + + - {#if domainData} - - {/if} + + +{#if showConnectRepo} + +{/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.ts index f1a438415..37a948c19 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.ts @@ -5,8 +5,15 @@ import { RuleType } from '$lib/stores/sdk'; export const load = async ({ parent }) => { const { site } = await parent(); + const [domains, installations] = await Promise.all([ + sdk.forProject.proxy.listRules([Query.equal('type', RuleType.DEPLOYMENT)]), + sdk.forProject.vcs.listInstallations() + ]); + return { - domains: await sdk.forProject.proxy.listRules([Query.equal('type', RuleType.DEPLOYMENT)]), + site, + domains, + installations, branches: site?.installationId && site?.providerRepositoryId ? await sdk.forProject.vcs.listRepositoryBranches( diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify/+page.svelte new file mode 100644 index 000000000..32772a258 --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify/+page.svelte @@ -0,0 +1,56 @@ + + + + {#if domainData.status === 'created'} + + + + + + + {:else if domainData.status === 'verifying'} + + + {domainData.domain} + + + + + + + + + {:else if domainData.status === 'verified'} + + + {domainData.domain} + + + + + {/if} + 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 a71794617..f00afae23 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte @@ -4,7 +4,7 @@ import { Badge, Divider, Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; import OpenOnMobileModal from '../(components)/openOnMobileModal.svelte'; import { timeFromNow } from '$lib/helpers/date'; - import { IconExternalLink, IconQrcode } from '@appwrite.io/pink-icons-svelte'; + import { IconQrcode } from '@appwrite.io/pink-icons-svelte'; import { protocol } from '$routes/(console)/store'; import { type Models } from '@appwrite.io/console'; import { Link } from '$lib/elements'; @@ -70,12 +70,16 @@ direction="row" gap="xl"> - + {rule.domain} -