diff --git a/src/lib/components/domains/cnameTable.svelte b/src/lib/components/domains/cnameTable.svelte index 40c89e3fe..c4b031320 100644 --- a/src/lib/components/domains/cnameTable.svelte +++ b/src/lib/components/domains/cnameTable.svelte @@ -1,5 +1,6 @@ @@ -46,10 +49,13 @@ CNAME - {domain} + {subdomain} - - {globalThis?.location?.origin} + + {$consoleVariables._APP_DOMAIN_TARGET} diff --git a/src/lib/components/domains/nameserverTable.svelte b/src/lib/components/domains/nameserverTable.svelte new file mode 100644 index 000000000..2dcd252c0 --- /dev/null +++ b/src/lib/components/domains/nameserverTable.svelte @@ -0,0 +1,45 @@ + + + + + + {domain} + + {#if verified} + + {:else if verified === false} + + {/if} + + + Add the following nameservers on your DNS provider. Note that DNS changes may take time to + propagate fully. + + + + + + Type + Value + + {#each nameserverList as nameserver} + + NS + + + {nameserver} + + + {/each} + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte index e2b7646b4..4d8ea8675 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte @@ -64,8 +64,13 @@ } else if (behaviour === 'ACTIVE') { rule = await sdk.forProject.proxy.createSiteRule(domainName, $page.params.site); } - await goto(`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`); - await invalidate(Dependencies.SITES_DOMAINS); + if (rule?.status === 'verified') { + await goto(routeBase); + await invalidate(Dependencies.SITES_DOMAINS); + } else { + await goto(`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`); + await invalidate(Dependencies.SITES_DOMAINS); + } } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts index f1fa2a5fd..db8caef3a 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts @@ -2,8 +2,6 @@ import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants.js'; import { isCloud } from '$lib/system'; import type { Domain, DomainsList } from '$lib/sdk/domains.js'; -import { redirect } from '@sveltejs/kit'; -import { base } from '$app/paths'; export const load = async ({ parent, depends, params }) => { const { site } = await parent(); @@ -16,12 +14,6 @@ export const load = async ({ parent, depends, params }) => { sdk.forConsole.domains.get(params.domain), sdk.forConsole.domains.list() ]); - if (domain?.nameservers.toLocaleLowerCase() === 'appwrite') { - redirect( - 303, - `${base}/console/project-${params.project}/sites/site-${params.site}/domains` - ); - } } return { diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte index 3567e2753..fa411a854 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte @@ -1,24 +1,11 @@ @@ -48,37 +35,7 @@ {#if selectedTab === 'cname' && isSubDomain} {:else} - - - {domain} - - - - Add the following nameservers on your DNS provider. Note that DNS changes may - take time to propagate fully. - - - - - - Type - Value - - {#each nameserverList as nameserver} - - NS - - - {nameserver} - - - {/each} - + {/if}