diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/aside.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/aside.svelte index 3e3d32978..96294b630 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/aside.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/aside.svelte @@ -2,9 +2,9 @@ import { Card, SvgIcon, Trim } from '$lib/components'; import { Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; import { IconGithub, IconGitBranch } from '@appwrite.io/pink-icons-svelte'; - import { consoleVariables } from '$routes/(console)/store'; import type { Models } from '@appwrite.io/console'; import { getFrameworkIcon } from '$lib/stores/sites'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let framework: Partial; export let repositoryName: string; @@ -71,7 +71,7 @@ {#key domain} - {$consoleVariables._APP_OPTIONS_FORCE_HTTPS + {$regionalConsoleVariables._APP_OPTIONS_FORCE_HTTPS ? 'https://' : 'http://'}{domain} diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/domain.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/domain.svelte index 397fdeeb1..0a6bcf5ed 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/domain.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/domain.svelte @@ -3,10 +3,10 @@ import Button from '$lib/elements/forms/button.svelte'; import { debounce } from '$lib/helpers/debounce'; import { sdk } from '$lib/stores/sdk'; - import { consoleVariables } from '$routes/(console)/store'; import { ConsoleResourceType } from '@appwrite.io/console'; import { Fieldset, Layout, Status, Typography } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let domain: string; export let domainIsValid = true; @@ -35,7 +35,7 @@ } try { await sdk.forConsole.console.getResource( - `${value}.${$consoleVariables._APP_DOMAIN_SITES}`, + `${value}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, ConsoleResourceType.Rules ); domainStatus = 'complete'; @@ -60,7 +60,7 @@ - .{$consoleVariables._APP_DOMAIN_SITES} + .{$regionalConsoleVariables._APP_DOMAIN_SITES} diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte index 42e806fed..f95c1b830 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte @@ -15,9 +15,11 @@ import type { Models } from '@appwrite.io/console'; import Configuration from '../configuration.svelte'; import { buildVerboseDomain } from '../store'; - import { project } from '$routes/(console)/project-[region]-[project]/store'; + import { + project, + regionalConsoleVariables + } from '$routes/(console)/project-[region]-[project]/store'; import { organization } from '$lib/stores/organization'; - import { consoleVariables } from '$routes/(console)/store'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; import { removeFile } from '$lib/helpers/files'; @@ -73,7 +75,10 @@ // Add domain await sdk .forProject(page.params.region, page.params.project) - .proxy.createSiteRule(`${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, site.$id); + .proxy.createSiteRule( + `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + site.$id + ); //Add variables const promises = variables.map((variable) => diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte index 1def9713b..a061a490f 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte @@ -25,8 +25,8 @@ import type { Models } from '@appwrite.io/console'; import { onMount } from 'svelte'; import Configuration from '../../configuration.svelte'; - import { consoleVariables } from '$routes/(console)/store'; import Domain from '../../domain.svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let data; let showExitModal = false; @@ -119,7 +119,10 @@ // Add domain await sdk .forProject(page.params.region, page.params.project) - .proxy.createSiteRule(`${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, site.$id); + .proxy.createSiteRule( + `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, + site.$id + ); //Add variables const promises = variables.map((variable) => diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts index 4287ee29f..f5607d122 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts @@ -3,7 +3,8 @@ import { ID } from '@appwrite.io/console'; import { buildVerboseDomain } from '../../store'; export const load = async ({ parent, params, url }) => { - const { installations, frameworks, project, organization, consoleVariables } = await parent(); + const { installations, frameworks, project, organization, regionalConsoleVariables } = + await parent(); const [repository] = await Promise.all([ sdk .forProject(params.region, params.project) @@ -11,7 +12,7 @@ export const load = async ({ parent, params, url }) => { ]); const domain = await buildVerboseDomain( - consoleVariables._APP_DOMAIN_SITES, + regionalConsoleVariables._APP_DOMAIN_SITES, repository.name, organization.name, project.name, diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte index 294fdce16..4ad7bd998 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte @@ -32,11 +32,11 @@ Repositories, RepositoryBehaviour } from '$lib/components/git'; - import { app, iconPath } from '$lib/stores/app'; - import { consoleVariables } from '$routes/(console)/store'; - import { connectGitHub } from '$lib/stores/git'; import Domain from '../../domain.svelte'; + import { app, iconPath } from '$lib/stores/app'; + import { connectGitHub } from '$lib/stores/git'; import { getFrameworkIcon } from '$lib/stores/sites'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let data; @@ -137,7 +137,7 @@ await sdk .forProject(page.params.region, page.params.project) .proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, + `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, site.$id ); diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts index 2f22a6337..d8fd8c41a 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts @@ -1,14 +1,15 @@ import { sdk } from '$lib/stores/sdk'; -import { buildVerboseDomain } from '../../store.js'; import { ID } from '@appwrite.io/console'; +import { buildVerboseDomain } from '../../store.js'; export const load = async ({ parent, params }) => { - const { installations, frameworks, project, organization, consoleVariables } = await parent(); + const { installations, frameworks, project, organization, regionalConsoleVariables } = + await parent(); const template = await sdk .forProject(params.region, params.project) .sites.getTemplate(params.template); const domain = await buildVerboseDomain( - consoleVariables._APP_DOMAIN_SITES, + regionalConsoleVariables._APP_DOMAIN_SITES, template.name, organization.name, project.name, diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index d19eb28f2..447af69f2 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -20,9 +20,9 @@ import Wizard from '$lib/layout/wizard.svelte'; import { base } from '$app/paths'; import { writable } from 'svelte/store'; - import { consoleVariables } from '$routes/(console)/store'; - import NameserverTable from '$lib/components/domains/nameserverTable.svelte'; import RecordTable from '$lib/components/domains/recordTable.svelte'; + import NameserverTable from '$lib/components/domains/nameserverTable.svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; let { data } = $props(); @@ -31,11 +31,11 @@ let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); $effect(() => { - if ($consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { selectedTab = 'cname'; - } else if ($consoleVariables._APP_DOMAIN_TARGET_A) { + } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) { selectedTab = 'a'; - } else if ($consoleVariables._APP_DOMAIN_TARGET_AAAA) { + } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { selectedTab = 'aaaa'; } }); @@ -111,7 +111,7 @@
- {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && $consoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} + {#if isSubDomain && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && $regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} (selectedTab = 'cname')} @@ -127,7 +127,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -135,7 +135,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte index 3cfc0d6ad..33db2ccee 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte @@ -6,11 +6,11 @@ import { invalidate } from '$app/navigation'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { Dependencies } from '$lib/constants'; - import { consoleVariables } from '$routes/(console)/store'; import { page } from '$app/state'; import { Layout, Status, Typography } from '@appwrite.io/pink-svelte'; import { ConsoleResourceType, ID } from '@appwrite.io/console'; import { debounce } from '$lib/helpers/debounce'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; export let show = false; @@ -24,7 +24,7 @@ await sdk .forProject(page.params.region, page.params.project) .proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, + `${domain}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, page.params.site ); @@ -59,7 +59,7 @@ } try { await sdk.forConsole.console.getResource( - `${value}.${$consoleVariables._APP_DOMAIN_SITES}`, + `${value}.${$regionalConsoleVariables._APP_DOMAIN_SITES}`, ConsoleResourceType.Rules ); domainStatus = 'complete'; @@ -91,7 +91,7 @@ - .{$consoleVariables._APP_DOMAIN_SITES} + .{$regionalConsoleVariables._APP_DOMAIN_SITES} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte index e07402b8e..fbe3125fc 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte @@ -8,11 +8,11 @@ import { Dependencies } from '$lib/constants'; import type { Models } from '@appwrite.io/console'; import { Divider, Tabs } from '@appwrite.io/pink-svelte'; - import { consoleVariables } from '$routes/(console)/store'; import { isCloud } from '$lib/system'; import { page } from '$app/state'; import NameserverTable from '$lib/components/domains/nameserverTable.svelte'; import RecordTable from '$lib/components/domains/recordTable.svelte'; + import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store'; let { show = $bindable(false), @@ -28,11 +28,11 @@ let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); $effect(() => { - if ($consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { selectedTab = 'cname'; - } else if ($consoleVariables._APP_DOMAIN_TARGET_A) { + } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) { selectedTab = 'a'; - } else if ($consoleVariables._APP_DOMAIN_TARGET_AAAA) { + } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { selectedTab = 'aaaa'; } }); @@ -69,7 +69,7 @@
- {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && $consoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} + {#if isSubDomain && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && $regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} (selectedTab = 'cname')} @@ -85,7 +85,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -93,7 +93,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')}