From 3157286fe4c75baacb71923ca5f0ee4bff2f3a0b Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 10 Mar 2025 16:04:35 +0100 Subject: [PATCH] fix: backend bugs --- src/lib/components/git/repositories.svelte | 2 -- .../sites/(components)/siteCard.svelte | 5 +---- .../sites/create-site/aside.svelte | 2 +- .../sites/create-site/deploying/+page.ts | 5 +++-- .../project-[project]/sites/grid.svelte | 5 +---- .../settings/updateBuildSettings.svelte | 19 ++++++++++--------- 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 8bbaa122d..bc7d43b55 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -93,8 +93,6 @@ return $repositories.repositories.slice(0, 4); } - - $: console.log($repositories); {#if hasInstallations} diff --git a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte index a6345891b..6eeb51855 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/siteCard.svelte @@ -49,10 +49,7 @@ function getFilePreview(fileId: string) { // TODO: @Meldiron use sdk.forConsole.storage.getFilePreview const endpoint = getApiEndpoint(); - return ( - endpoint + - `/storage/buckets/screenshots/files/${fileId}/view?project=console&mode=admin` - ); + return endpoint + `/storage/buckets/screenshots/files/${fileId}/view?project=console`; } diff --git a/src/routes/(console)/project-[project]/sites/create-site/aside.svelte b/src/routes/(console)/project-[project]/sites/create-site/aside.svelte index 4a5316147..0a40190f9 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/aside.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/aside.svelte @@ -73,7 +73,7 @@ {$consoleVariables._APP_OPTIONS_FORCE_HTTPS ? 'https://' - : 'http://'}{domain}.{$consoleVariables._APP_DOMAIN_TARGET} + : 'http://'}{domain} {/key} 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 5049d903c..6dc87d795 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,4 +1,4 @@ -import { DeploymentResourceType, RuleType, sdk } from '$lib/stores/sdk'; +import { DeploymentResourceType, RuleTrigger, RuleType, sdk } from '$lib/stores/sdk'; import { error } from '@sveltejs/kit'; import type { PageLoad } from './$types'; import { Query } from '@appwrite.io/console'; @@ -15,7 +15,8 @@ export const load: PageLoad = async ({ url }) => { Query.equal('type', RuleType.DEPLOYMENT), Query.equal('deploymentResourceType', DeploymentResourceType.SITE), Query.equal('deploymentResourceId', siteId), - Query.equal('deploymentId', deploymentId) + Query.equal('deploymentId', deploymentId), + Query.equal('trigger', RuleTrigger.MANUAL) ]) ]); diff --git a/src/routes/(console)/project-[project]/sites/grid.svelte b/src/routes/(console)/project-[project]/sites/grid.svelte index 3c9966635..e531611f1 100644 --- a/src/routes/(console)/project-[project]/sites/grid.svelte +++ b/src/routes/(console)/project-[project]/sites/grid.svelte @@ -35,10 +35,7 @@ function getFilePreview(fileId: string) { // TODO: @Meldiron use sdk.forConsole.storage.getFilePreview const endpoint = getApiEndpoint(); - return ( - endpoint + - `/storage/buckets/screenshots/files/${fileId}/view?project=console&mode=admin` - ); + return endpoint + `/storage/buckets/screenshots/files/${fileId}/view?project=console`; } diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte index 8fd78898b..93bfad25d 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte @@ -96,6 +96,10 @@ $: if (fallback === '') { fallback = null; } + + $: frameworkDataAdapter = frameworkData.adapters?.length + ? frameworkData.adapters[site.adapter] + : frameworks[0].adapters[site.adapter];
@@ -152,8 +156,7 @@ id="installCommand" label="Install command" bind:value={installCommand} - placeholder={frameworkData.adapters[site.adapter] - .defaultInstallCommand} /> + placeholder={frameworkDataAdapter?.defaultInstallCommand} /> @@ -171,8 +174,7 @@ id="buildCommand" label="Build command" bind:value={buildCommand} - placeholder={frameworkData.adapters[site.adapter] - .defaultBuildCommand} /> + placeholder={frameworkDataAdapter?.defaultBuildCommand} /> @@ -189,8 +191,7 @@ id="outputDirectory" label="Output directory" bind:value={outputDirectory} - placeholder={frameworkData.adapters[site.adapter] - .defaultOutputDirectory} /> + placeholder={frameworkDataAdapter?.defaultOutputDirectory} />