diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/connectRepoModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/(modals)/connectRepoModal.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/settings/connectRepoModal.svelte rename to src/routes/(console)/project-[project]/functions/function-[function]/(modals)/connectRepoModal.svelte diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte index 603219642..d29e991b3 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte @@ -1,14 +1,198 @@ - - Domains - + + + + + + + + Custom domain + + (showAppwriteDomainModal = true)}> + Appwrite domain + + + + + + + {#if data.domains.total} + + + Domain + Redirect to + Production branch + + + {#each data.domains.rules as domain} + + + + + {domain.domain} + + + + + + {domain?.redirectUrl || 'No redirect'} + {domain?.redirectStatusCode ? `(${domain.redirectStatusCode})` : ''} + + + {domain.deploymentVcsProviderBranch || '-'} + + + + + + + + + {#if domain.status !== 'verified'} + { + e.preventDefault(); + selectedDomain = domain; + showRetry = true; + toggle(e); + }}> + Retry + + {/if} + { + e.preventDefault(); + selectedDomain = domain; + showDelete = true; + toggle(e); + trackEvent(Click.DomainDeleteClick, { + source: 'functions_domain_overview' + }); + }}> + Delete + + + + + + + + {/each} + + + + {:else if data?.search} + + + + + + {:else} + + + + + + + + + + {/if} + +{#if showDelete} + +{/if} + +{#if showRetry} + +{/if} + +{#if showAppwriteDomainModal} + +{/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts index 734917a54..8f39e94d8 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts @@ -22,7 +22,11 @@ export const load: PageLoad = async ({ depends, params, url, route }) => { queries.set(parsedQueries); return { - rules: await sdk.forProject.proxy.listRules( + offset, + limit, + query, + search, + domains: await sdk.forProject.proxy.listRules( [ Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION), diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte new file mode 100644 index 000000000..18f0b5eec --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.svelte @@ -0,0 +1,296 @@ + + + +
+ +
+ + +
+ + + + 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 showConnectRepo} + +{/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts new file mode 100644 index 000000000..1105f8445 --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/+page.ts @@ -0,0 +1,28 @@ +import { Query } from '@appwrite.io/console'; +import { sdk } from '$lib/stores/sdk'; +import { RuleTrigger, 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), + Query.equal('trigger', RuleTrigger.MANUAL) + ]), + sdk.forProject.vcs.listInstallations() + ]); + + return { + site, + domains, + installations, + branches: + site?.installationId && site?.providerRepositoryId + ? await sdk.forProject.vcs.listRepositoryBranches( + site.installationId, + site.providerRepositoryId + ) + : undefined + }; +}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.svelte new file mode 100644 index 000000000..88289f579 --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.svelte @@ -0,0 +1,182 @@ + + + + {#if isVerified} + + + {data.domain.domain} + + + + {:else} +
+ +
+ + (selectedTab = 'cname')} + active={selectedTab === 'cname'}> + CNAME + + (selectedTab = 'nameserver')} + active={selectedTab === 'nameserver'}> + Nameservers + + + +
+ {#if selectedTab === 'cname'} + + + {data.domain?.domain} + {#if isVerified} + + {:else} + + {/if} + + + Add the following record on your DNS provider. Note that DNS changes may + take time to propagate fully. + + + + + + Type + Name + Value + + + CNAME + {data.domain?.domain} + + + {globalThis?.location?.origin} + + + + + + + A list of all domain providers and their DNS setting is available here. + + + + + + + + {:else} + + + {data.domain?.domain} + + + + Add the following nameservers on your DNS provider. Note that DNS + changes may take time to propagate fully. + + + + + + Type + Value + + {#each nameservers as nameserver} + + NS + + + {nameserver} + + + {/each} + + + + + + + + {/if} +
+
+ {/if} +
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.ts new file mode 100644 index 000000000..eab359a42 --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/add-domain/verify/+page.ts @@ -0,0 +1,16 @@ +import { sdk } from '$lib/stores/sdk'; +import { isCloud } from '$lib/system'; + +export const load = async ({ params }) => { + if (isCloud) { + // if (params?.id) { + // return { + // domain: await sdk.forConsole.domains.get(params.id) + // }; + // } + } else { + return { + domain: undefined + }; + } +}; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/createAppwriteDomainModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/createAppwriteDomainModal.svelte new file mode 100644 index 000000000..34338c0ea --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/createAppwriteDomainModal.svelte @@ -0,0 +1,104 @@ + + + + + Get an auto-generated domain to quickly access your project. You can customize its prefix. + + + + + + + + .{$consoleVariables._APP_DOMAIN_TARGET} + + + + + + + + + + + + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/deleteDomainModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/deleteDomainModal.svelte new file mode 100644 index 000000000..cbfc54944 --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/deleteDomainModal.svelte @@ -0,0 +1,54 @@ + + + + {#if selectedDomain} + + Are you sure you want to delete this domain? You will no longer be able to execute your + function by visiting: + + + {selectedDomain.domain} + + {/if} + + + + + + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/recordsCard.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/recordsCard.svelte new file mode 100644 index 000000000..23beba2cd --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/recordsCard.svelte @@ -0,0 +1,52 @@ + + +
+ + + + + {domain?.domain} + + + + Add the following nameservers on your DNS provider. Note that DNS changes may + take time to propagate fully. + + + + + + Type + Name + Value + + + CNAME + {domain?.domain} + + {globalThis?.location?.origin} + + + + + + + A list of all domain providers and their DNS setting is available here. + + + + + +
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte new file mode 100644 index 000000000..0afc74175 --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/retryDomainModal.svelte @@ -0,0 +1,46 @@ + + + + {#if selectedDomain} + + {/if} + + + + + + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte index f639f3af7..10fd6810f 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRepository.svelte @@ -26,7 +26,7 @@ import { IconGithub } from '@appwrite.io/pink-icons-svelte'; import { ConnectGit } from '$lib/components/git'; import { isValueOfStringEnum } from '$lib/helpers/types'; - import ConnectRepoModal from './connectRepoModal.svelte'; + import ConnectRepoModal from '../(modals)/connectRepoModal.svelte'; export let func: Models.Function; export let installations: Models.InstallationList;