diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
index c6a919eba..71fc61bf2 100644
--- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
+++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte
@@ -94,7 +94,7 @@
{/if}
{#key buildLogs}
-
+
{/key}
{#if ['processing', 'building'].includes(status)}
diff --git a/src/routes/(console)/project-[project]/sites/(components)/selectRootModal.svelte b/src/routes/(console)/project-[project]/sites/(components)/selectRootModal.svelte
index 2d8cdea15..cf63bbc25 100644
--- a/src/routes/(console)/project-[project]/sites/(components)/selectRootModal.svelte
+++ b/src/routes/(console)/project-[project]/sites/(components)/selectRootModal.svelte
@@ -99,10 +99,15 @@
}
}
+ function handleSubmit() {
+ rootDir = currentPath;
+ show = false;
+ }
+
// $: console.log(rootDir);
-
+
Select the directory where your site code is located using the menu below.
@@ -110,5 +115,6 @@
+
diff --git a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte
index 23ea6c5cd..984786eea 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/configuration.svelte
@@ -182,6 +182,7 @@
{:else}
{/if}
diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte
index 86254dc6d..794d503bb 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte
@@ -42,7 +42,8 @@
framework={data.frameworks.frameworks.find((f) => f.key === data.site.framework)}
repositoryName={data?.repository?.name}
branch={data.repository?.id ? data.site.providerBranch : ''}
- rootDir={data.repository?.id ? data.site.providerRootDirectory : ''} />
+ rootDir={data.repository?.id ? data.site.providerRootDirectory : ''}
+ domain={data.proxyRuleList.rules[0]?.domain} />
diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts
index d537c10f5..c5569ebf0 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts
+++ b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.ts
@@ -1,20 +1,26 @@
-import { sdk } from '$lib/stores/sdk';
+import { RuleType, sdk } from '$lib/stores/sdk';
import { error } from '@sveltejs/kit';
import type { PageLoad } from './$types';
+import { Query } from '@appwrite.io/console';
export const load: PageLoad = async ({ url }) => {
if (!url.searchParams.has('site')) error(404, 'Site is not optional');
if (!url.searchParams.has('deployment')) error(404, 'Deployment is not optional');
const siteId = url.searchParams.get('site');
const deploymentId = url.searchParams.get('deployment');
- const [site, deployment] = await Promise.all([
+ const [site, deployment, proxyRuleList] = await Promise.all([
sdk.forProject.sites.get(siteId),
- sdk.forProject.sites.getDeployment(siteId, deploymentId)
+ sdk.forProject.sites.getDeployment(siteId, deploymentId),
+ sdk.forProject.proxy.listRules([
+ Query.equal('type', [RuleType.DEPLOYMENT]),
+ Query.equal('automation', `site=${siteId}`)
+ ])
]);
return {
site,
deployment,
+ proxyRuleList,
repository: site?.installationId
? await sdk.forProject.vcs.getRepository(site.installationId, site.providerRepositoryId)
: undefined
diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
index dac1e48b7..6bb5ff475 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte
@@ -209,7 +209,7 @@
-
+
diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
index 5e8c84ef3..562ac8d49 100644
--- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte
@@ -336,7 +336,7 @@
-