@@ -128,7 +132,7 @@
source: 'sites_create_finish'
});
}}
- href={`${base}/project-${page.params.project}/sites/site-${data.site.$id}/domains`}>
+ href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}/domains`}>
+ href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}>
Go to dashboard
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts
index 3fff8af30..12ae51786 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts
@@ -8,16 +8,20 @@ export const load = async ({ url, depends }) => {
depends(Dependencies.SITE);
if (!url.searchParams.has('site')) error(404, 'Deployment is not optional');
const siteId = url.searchParams.get('site');
- const site = await sdk.forProject.sites.get(siteId);
- const proxyRuleList = await sdk.forProject.proxy.listRules([
- Query.equal('type', RuleType.DEPLOYMENT),
- Query.equal('deploymentResourceType', DeploymentResourceType.SITE),
- Query.equal('deploymentResourceId', siteId),
- Query.equal('deploymentId', site.deploymentId)
- ]);
+ const site = await sdk.forProject(page.params.region, page.params.project).sites.get(siteId);
+ const proxyRuleList = await sdk
+ .forProject(page.params.region, page.params.project)
+ .proxy.listRules([
+ Query.equal('type', RuleType.DEPLOYMENT),
+ Query.equal('deploymentResourceType', DeploymentResourceType.SITE),
+ Query.equal('deploymentResourceId', siteId),
+ Query.equal('deploymentId', site.deploymentId)
+ ]);
return {
site,
- deployment: await sdk.forProject.sites.getDeployment(siteId, site.deploymentId),
+ deployment: await sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.getDeployment(siteId, site.deploymentId),
proxyRuleList
};
};
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 49c4262a7..cee455f1f 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,7 +15,7 @@
import type { Models } from '@appwrite.io/console';
import Configuration from '../configuration.svelte';
import { buildVerboseDomain } from '../store';
- import { project } from '$routes/(console)/project-[project]/store';
+ import { project } 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';
@@ -48,51 +48,56 @@
const buildRuntime = Object.values(BuildRuntime).find(
(f) => f === framework.buildRuntime
);
- let site = await sdk.forProject.sites.create(
- id || ID.unique(),
- name,
- fr,
- buildRuntime,
- undefined,
- undefined,
- undefined,
- installCommand || undefined,
- buildCommand || undefined,
- outputDirectory || undefined,
- undefined,
- undefined,
- undefined,
- undefined,
- undefined,
- undefined,
- undefined
- );
+ let site = await sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.create(
+ id || ID.unique(),
+ name,
+ fr,
+ buildRuntime,
+ undefined,
+ undefined,
+ undefined,
+ installCommand || undefined,
+ buildCommand || undefined,
+ outputDirectory || undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined,
+ undefined
+ );
// Add domain
- await sdk.forProject.proxy.createSiteRule(
- `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`,
- site.$id
- );
+ await sdk
+ .forProject(page.params.region, page.params.project)
+ .proxy.createSiteRule(`${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, site.$id);
//Add variables
const promises = variables.map((variable) =>
- sdk.forProject.sites.createVariable(
- site.$id,
- variable.key,
- variable.value,
- variable?.secret ?? false
- )
+ sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.createVariable(
+ site.$id,
+ variable.key,
+ variable.value,
+ variable?.secret ?? false
+ )
);
await Promise.all(promises);
- const deployment = await sdk.forProject.sites.createDeployment(
- site.$id,
- files[0],
- true,
- installCommand || undefined,
- buildCommand || undefined,
- outputDirectory || undefined
- );
+ const deployment = await sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.createDeployment(
+ site.$id,
+ files[0],
+ true,
+ installCommand || undefined,
+ buildCommand || undefined,
+ outputDirectory || undefined
+ );
trackEvent(Submit.SiteCreate, {
source: 'manual',
@@ -100,7 +105,7 @@
});
await goto(
- `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}`
+ `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}`
);
} catch (e) {
addNotification({
@@ -131,7 +136,7 @@
{:else}
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 d7d20d2da..1def9713b 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
@@ -58,12 +58,14 @@
async function detectFramework() {
try {
- const response = await sdk.forProject.vcs.createRepositoryDetection(
- $installation.$id,
- data.repository.id,
- VCSDetectionType.Framework,
- rootDir
- );
+ const response = await sdk
+ .forProject(page.params.region, page.params.project)
+ .vcs.createRepositoryDetection(
+ $installation.$id,
+ data.repository.id,
+ VCSDetectionType.Framework,
+ rootDir
+ );
framework = data.frameworks.frameworks.find((f) => f.key === response.framework);
adapter = framework?.adapters[0];
installCommand = adapter?.installCommand;
@@ -92,49 +94,49 @@
const buildRuntime = Object.values(BuildRuntime).find(
(f) => f === framework.buildRuntime
);
- let site = await sdk.forProject.sites.create(
- id || ID.unique(),
- name,
- fr,
- buildRuntime,
- undefined,
- undefined,
- undefined,
- installCommand,
- buildCommand,
- outputDirectory,
- undefined,
- data.installation.$id,
- undefined,
- data.repository.id,
- branch,
- silentMode,
- rootDir
- );
+ let site = await sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.create(
+ id || ID.unique(),
+ name,
+ fr,
+ buildRuntime,
+ undefined,
+ undefined,
+ undefined,
+ installCommand,
+ buildCommand,
+ outputDirectory,
+ undefined,
+ data.installation.$id,
+ undefined,
+ data.repository.id,
+ branch,
+ silentMode,
+ rootDir
+ );
// Add domain
- await sdk.forProject.proxy.createSiteRule(
- `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`,
- site.$id
- );
+ await sdk
+ .forProject(page.params.region, page.params.project)
+ .proxy.createSiteRule(`${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, site.$id);
//Add variables
const promises = variables.map((variable) =>
- sdk.forProject.sites.createVariable(
- site.$id,
- variable.key,
- variable.value,
- variable?.secret ?? false
- )
+ sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.createVariable(
+ site.$id,
+ variable.key,
+ variable.value,
+ variable?.secret ?? false
+ )
);
await Promise.all(promises);
- const deployment = await sdk.forProject.sites.createVcsDeployment(
- site.$id,
- VCSDeploymentType.Branch,
- branch,
- true
- );
+ const deployment = await sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.createVcsDeployment(site.$id, VCSDeploymentType.Branch, branch, true);
trackEvent(Submit.SiteCreate, {
source: 'repository',
@@ -142,7 +144,7 @@
});
await goto(
- `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}`
+ `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}`
);
} catch (e) {
addNotification({
@@ -161,7 +163,7 @@
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 e988e000b..67eef7286 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
@@ -5,7 +5,9 @@ import { buildVerboseDomain } from '../../store';
export const load = async ({ parent, params, url }) => {
const { installations, frameworks, project, organization, consoleVariables } = await parent();
const [repository] = await Promise.all([
- sdk.forProject.vcs.getRepository(url.searchParams.get('installation'), params.repository)
+ sdk
+ .forProject(page.params.region, page.params.project)
+ .vcs.getRepository(url.searchParams.get('installation'), params.repository)
]);
const domain = await buildVerboseDomain(
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte
index fcf9802fb..1756560dd 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte
@@ -74,7 +74,7 @@
{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts
index 487ac79a9..243b8c79e 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts
@@ -8,7 +8,9 @@ export const load = async ({ url, route }) => {
frameworks: url.searchParams.getAll('framework')
};
- const siteTemplatesList = await sdk.forProject.sites.listTemplates(undefined, undefined, 100);
+ const siteTemplatesList = await sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.listTemplates(undefined, undefined, 100);
const [frameworksSet, useCasesSet] = siteTemplatesList.templates.reduce(
([fr, uc], next) => {
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 504558b94..51f11db5d 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
@@ -74,11 +74,9 @@
async function createRepository() {
try {
isCreatingRepository = true;
- const repo = await sdk.forProject.vcs.createRepository(
- $installation.$id,
- repositoryName,
- repositoryPrivate
- );
+ const repo = await sdk
+ .forProject(page.params.region, page.params.project)
+ .vcs.createRepository($installation.$id, repositoryName, repositoryPrivate);
repository.set(repo);
selectedRepository = repo.id;
showSiteConfig = true;
@@ -111,51 +109,61 @@
const buildRuntime = Object.values(BuildRuntime).find(
(f) => f === framework.buildRuntime
);
- let site = await sdk.forProject.sites.create(
- id || ID.unique(),
- name,
- fr,
- buildRuntime,
- undefined,
- undefined,
- undefined,
- framework.installCommand,
- framework.buildCommand,
- framework.outputDirectory,
- framework.adapter as unknown as Adapter,
- connectBehaviour === 'later' ? undefined : selectedInstallationId || undefined,
- framework?.fallbackFile || undefined,
- selectedRepository || undefined,
- branch || undefined,
- selectedRepository ? silentMode : undefined,
- rootDir || undefined
- );
+ let site = await sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.create(
+ id || ID.unique(),
+ name,
+ fr,
+ buildRuntime,
+ undefined,
+ undefined,
+ undefined,
+ framework.installCommand,
+ framework.buildCommand,
+ framework.outputDirectory,
+ framework.adapter as unknown as Adapter,
+ connectBehaviour === 'later'
+ ? undefined
+ : selectedInstallationId || undefined,
+ framework?.fallbackFile || undefined,
+ selectedRepository || undefined,
+ branch || undefined,
+ selectedRepository ? silentMode : undefined,
+ rootDir || undefined
+ );
// Add domain
- await sdk.forProject.proxy.createSiteRule(
- `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`,
- site.$id
- );
+ await sdk
+ .forProject(page.params.region, page.params.project)
+ .proxy.createSiteRule(
+ `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`,
+ site.$id
+ );
//Add variables
const promises = variables.map((variable) =>
- sdk.forProject.sites.createVariable(
- site.$id,
- variable.name,
- variable.value,
- variable?.secret ?? false
- )
+ sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.createVariable(
+ site.$id,
+ variable.name,
+ variable.value,
+ variable?.secret ?? false
+ )
);
await Promise.all(promises);
- const deployment = await sdk.forProject.sites.createTemplateDeployment(
- site.$id,
- data.template.providerRepositoryId || undefined,
- data.template.providerOwner || undefined,
- framework.providerRootDirectory || undefined,
- data.template.providerVersion || undefined,
- true
- );
+ const deployment = await sdk
+ .forProject(page.params.region, page.params.project)
+ .sites.createTemplateDeployment(
+ site.$id,
+ data.template.providerRepositoryId || undefined,
+ data.template.providerOwner || undefined,
+ framework.providerRootDirectory || undefined,
+ data.template.providerVersion || undefined,
+ true
+ );
trackEvent(Submit.SiteCreate, {
source: 'template',
@@ -164,7 +172,7 @@
});
await goto(
- `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}`
+ `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}`
);
} catch (e) {
console.log(e);
@@ -194,7 +202,7 @@
@@ -57,7 +57,7 @@
source: 'sites_domain_overview'
});
}}
- href={`${base}/project-${page.params.project}/sites/site-${page.params.site}/domains/add-domain`}>
+ href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains/add-domain`}>
Add domain
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte
index 43aeb8c1f..d006b3134 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte
@@ -7,7 +7,7 @@
import { site } from './store';
$: projectId = page.params.project;
- $: path = `${base}/project-${projectId}/sites/site-${page.params.site}`;
+ $: path = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}`;
$: tabs = [
{
href: path,
@@ -44,7 +44,8 @@