diff --git a/src/lib/components/git/connectGit.svelte b/src/lib/components/git/connectGit.svelte index 66e613267..0d04da858 100644 --- a/src/lib/components/git/connectGit.svelte +++ b/src/lib/components/git/connectGit.svelte @@ -45,8 +45,8 @@ title="No installation was added to the project yet" description="Add an installation to connect repositories"> - diff --git a/src/lib/helpers/load.ts b/src/lib/helpers/load.ts index 88cd98c38..dc0cc151d 100644 --- a/src/lib/helpers/load.ts +++ b/src/lib/helpers/load.ts @@ -18,10 +18,10 @@ export enum View { Grid = 'grid' } -export function getView(url: URL, route: Page['route'], fallback: View): View { +export function getView(url: URL, route: Page['route'], fallback: View, overwrite?: View): View { return (url.searchParams.get('view') ?? preferences.get(route).view) === View.Grid ? View.Grid - : (View.Table ?? fallback); + : (overwrite ?? View.Table ?? fallback); } export function getColumns(route: Page['route'], fallback: string[]): string[] { diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte index e09f7eba8..e9eb8f5ef 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte @@ -35,21 +35,21 @@ {#if !$isTabletViewport}
-
+ {data.database.name} -
+ {#if total > limit} -
+

Total installations: {total}

-
+ {/if} - {:else} - {#if isSelfHosted && !isVcsEnabled} - - - Installing Git to a self-hosted instance - - When installing Git in a locally hosted Appwrite project, you must first configure - environment variables. - - - - - {/if} -
-
-
- - - - - -
- -
-
+ {:else if isSelfHosted && !isVcsEnabled} + + + Installing Git to a self-hosted instance + + Before installing Git in a locally hosted Appwrite project, ensure your environment variables + are configured. + {/if} + + + + + + + @@ -211,9 +193,3 @@ {#if showGitDisconnect} {/if} - - diff --git a/src/routes/(console)/project-[project]/sites/(components)/deploymentDomains.svelte b/src/routes/(console)/project-[project]/sites/(components)/deploymentDomains.svelte index 1a4be6b7d..378a6ed3a 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/deploymentDomains.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/deploymentDomains.svelte @@ -10,37 +10,43 @@ - - - - - {domains.rules[0].domain} - - - - - - {#if domains.rules.length > 1} - - - +{domains.rules.length - 1} - - - - {#each domains.rules as rule, i} - {#if i !== 0} - - - {rule.domain} - - - {/if} - {/each} - - - + {#if domains.total} + + + + + {domains.rules[0]?.domain} + + + + + + {#if domains.rules.length > 1} + + + +{domains.rules.length - 1} + + + + {#each domains.rules as rule, i} + {#if i !== 0} + + + {rule.domain} + + + {/if} + {/each} + + + + {/if} + {:else} + + No domains available + {/if} 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/+page.ts b/src/routes/(console)/project-[project]/sites/+page.ts index e0c637f43..1525d8c9e 100644 --- a/src/routes/(console)/project-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[project]/sites/+page.ts @@ -10,7 +10,7 @@ export const load = async ({ url, depends, route }) => { const search = getSearch(url); const limit = getLimit(url, route, CARD_LIMIT); const offset = pageToOffset(page, limit); - const view = getView(url, route, View.Grid); + const view = getView(url, route, View.Grid, View.Grid); const siteList = await sdk.forProject.sites.list( [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], 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..ce2f40f81 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 @@ -37,12 +37,12 @@ -