update: console variables on sites.

This commit is contained in:
Darshan
2025-05-29 15:32:19 +05:30
parent f4f793cc63
commit c758a58402
10 changed files with 48 additions and 38 deletions
@@ -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<Models.Framework>;
export let repositoryName: string;
@@ -71,7 +71,7 @@
<Typography.Text variant="m-500" color="--fgcolor-neutral-primary">
{#key domain}
<Trim alternativeTrim>
{$consoleVariables._APP_OPTIONS_FORCE_HTTPS
{$regionalConsoleVariables._APP_OPTIONS_FORCE_HTTPS
? 'https://'
: 'http://'}{domain}
</Trim>
@@ -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 @@
<InputText id="domain" placeholder="my-domain" bind:value={newDomain}>
<svelte:fragment slot="end">
<Typography.Text variant="m-400" color="--fgcolor-neutral-tertiary">
.{$consoleVariables._APP_DOMAIN_SITES}
.{$regionalConsoleVariables._APP_DOMAIN_SITES}
</Typography.Text>
</svelte:fragment>
</InputText>
@@ -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) =>
@@ -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) =>
@@ -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,
@@ -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
);
@@ -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,
@@ -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 @@
<Layout.Stack gap="xl">
<div>
<Tabs.Root variant="secondary" let:root>
{#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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'cname')}
@@ -127,7 +127,7 @@
Nameservers
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'a')}
@@ -135,7 +135,7 @@
A
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'aaaa')}
@@ -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 @@
<InputText id="domain" placeholder="my-domain" bind:value={domain}>
<svelte:fragment slot="end">
<Typography.Text variant="m-400" color="--fgcolor-neutral-tertiary">
.{$consoleVariables._APP_DOMAIN_SITES}
.{$regionalConsoleVariables._APP_DOMAIN_SITES}
</Typography.Text>
</svelte:fragment>
</InputText>
@@ -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 @@
<Modal title="Retry verification" bind:show onSubmit={retryDomain} bind:error>
<div>
<Tabs.Root variant="secondary" let:root>
{#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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'cname')}
@@ -85,7 +85,7 @@
Nameservers
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'a')}
@@ -93,7 +93,7 @@
A
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'aaaa')}