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"> - - + + Connect to GitHub 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 data?.allCollections?.total} - + {#each sortedCollections as collection} {@const href = `${base}/project-${project}/databases/database-${databaseId}/collection-${collection.$id}`} {@const isSelected = collectionId === collection.$id} import { goto } from '$app/navigation'; import { page } from '$app/stores'; - import { - Alert, - Arrow, - AvatarGroup, - CardGrid, - PaginationInline, - SvgIcon - } from '$lib/components'; + import { Alert, CardGrid, PaginationInline } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; @@ -17,18 +10,21 @@ import dayjs from 'dayjs'; import { isSelfHosted } from '$lib/system'; import { consoleVariables } from '$routes/(console)/store'; - import { ActionMenu, Icon, Popover, Table } from '@appwrite.io/pink-svelte'; import { - IconAppwrite, - IconAzure, - IconBitBucket, + ActionMenu, + Card, + Empty, + Icon, + Layout, + Popover, + Table + } from '@appwrite.io/pink-svelte'; + import { IconExternalLink, IconGithub, - IconGitlab, IconPlus, IconXCircle } from '@appwrite.io/pink-icons-svelte'; - import Avatar from '$lib/components/avatar.svelte'; export let total: number; export let limit: number; @@ -156,51 +152,37 @@ {#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. - - - Learn more - - - - {/if} - - - - - - - - - - (showGitIstall = true)} - secondary> - Add installation - - - + {: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} + + + + + + Add installation + + + + @@ -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 @@ (show = false)}>Cancel + Save 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 @@ - 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/importSiteVariablesModal.svelte b/src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte index 83386ae25..bedd73d0c 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/importSiteVariablesModal.svelte @@ -61,7 +61,7 @@ Drag and drop files here or click to upload - + @@ -69,8 +69,9 @@ - Up to 100 variables allowed + + Up to 100 variables allowed + {#if variables?.length > 0} diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte index d5aca19fe..92ca325e5 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte @@ -14,8 +14,9 @@ import { BuildRuntime, Framework, ID } from '@appwrite.io/console'; import type { Models } from '@appwrite.io/console'; import Configuration from '../configuration.svelte'; - import Domain from '../domain.svelte'; import InputFile from '$lib/elements/forms/inputFile.svelte'; + import { buildVerboseDomain } from '../store'; + import { project } from '$routes/(console)/project-[project]/store'; export let data; let showExitModal = false; @@ -23,10 +24,9 @@ let formComponent: Form; let isSubmitting = writable(false); - let name = ''; + let name = 'My website'; let id = ID.unique(); let domain = id; - let domainIsValid = true; let framework: Models.Framework = data.frameworks.frameworks[0]; let adapter = framework?.adapters[0]; let installCommand = adapter?.installCommand; @@ -37,6 +37,8 @@ async function create() { try { + domain = await buildVerboseDomain(name, $project.name, id); + const fr = Object.values(Framework).find((f) => f === framework.key); const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime @@ -126,7 +128,7 @@ bind:variables frameworks={data.frameworks.frameworks} /> - + diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/aside.svelte b/src/routes/(console)/project-[project]/sites/create-site/manual/aside.svelte index e3c12292b..00b68cacf 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/aside.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/manual/aside.svelte @@ -1,10 +1,14 @@ @@ -27,10 +31,16 @@ ]} bind:value={framework} /> - + - - Starter kit + + Starter kit 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 @@ -
Total installations: {total}