diff --git a/src/lib/components/filePicker.svelte b/src/lib/components/filePicker.svelte index d9dc6b9e3..d885b1384 100644 --- a/src/lib/components/filePicker.svelte +++ b/src/lib/components/filePicker.svelte @@ -20,11 +20,11 @@ import FormList from '$lib/elements/forms/formList.svelte'; import { writable } from 'svelte/store'; import { onMount } from 'svelte'; - import Heading from './heading.svelte'; import { clickOnEnter } from '$lib/helpers/a11y'; import Empty from './empty.svelte'; import { base } from '$app/paths'; import { page } from '$app/stores'; + import { Typography } from '@appwrite.io/pink-svelte'; export let show: boolean; export let mimeTypeQuery: string = 'image/'; @@ -479,12 +479,9 @@ --color-border="var(--color-neutral-15)">
Need a hand? Learn more in our - - No buckets found - + No buckets found - type NumSize = 1 | 2 | 3 | 4 | 5 | 6 | 7; - type Size = NumSize | `${NumSize}`; - - export let tag: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'; - export let size: Size; - export let trimmed = true; - export let trimmedSecondLine = false; - export let id: string = null; - let classes = ''; - export { classes as class }; - export let style = ''; - - - - - diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index bbc8dc792..7f71cd1ba 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -46,7 +46,6 @@ export { default as Tabs } from './tabs.svelte'; export { default as Tab } from './tab.svelte'; export { default as EventModal } from './eventModal.svelte'; export { default as Status } from './status.svelte'; -export { default as Heading } from './heading.svelte'; export { default as Output } from './output.svelte'; export { default as Support } from './support.svelte'; export { default as ViewSelector } from './viewSelector.svelte'; diff --git a/src/lib/components/searchQuery.svelte b/src/lib/components/searchQuery.svelte index 7add96a1a..82cbfa861 100644 --- a/src/lib/components/searchQuery.svelte +++ b/src/lib/components/searchQuery.svelte @@ -63,7 +63,6 @@ {placeholder} {disabled} {required} - type="search" bind:value={search} --color-bgcolor-neutral-default="var(--color-bgcolor-neutral-primary)"> diff --git a/src/lib/elements/forms/inputSearch.svelte b/src/lib/elements/forms/inputSearch.svelte index 45c683b33..636bec750 100644 --- a/src/lib/elements/forms/inputSearch.svelte +++ b/src/lib/elements/forms/inputSearch.svelte @@ -48,7 +48,6 @@ {required} {autofocus} {label} - type="search" bind:value on:input={valueChange}> diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte index a989113f1..7294e8550 100644 --- a/src/lib/layout/containerHeader.svelte +++ b/src/lib/layout/containerHeader.svelte @@ -1,5 +1,5 @@ - {title} + {title} import { hoursToDays, timeFromNow, toLocaleDateTime } from '$lib/helpers/date'; import { log } from '$lib/stores/logs'; - import { Alert, Card, Code, Copy, Heading, Id, SvgIcon, Tab, Tabs } from '../components'; + import { Alert, Card, Code, Copy, Id, SvgIcon, Tab, Tabs } from '../components'; import { calculateTime } from '$lib/helpers/timeConversion'; import { TableBody, @@ -18,7 +18,7 @@ import { organization } from '$lib/stores/organization'; import { Button } from '$lib/elements/forms'; import { BillingPlan } from '$lib/constants'; - import { Tooltip } from '@appwrite.io/pink-svelte'; + import { Tooltip, Typography } from '@appwrite.io/pink-svelte'; let selectedRequest = 'parameters'; let selectedResponse = 'logs'; @@ -201,7 +201,7 @@ - Request + Request - Response + Request import { base } from '$app/paths'; - import { Avatar, AvatarInitials, Card, Heading } from '$lib/components'; + import { Avatar, AvatarInitials, Card } from '$lib/components'; import AppwriteLogoDark from '$lib/images/appwrite-logo-dark.svg'; import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg'; import LoginDark from '$lib/images/login/login-dark-mode.png'; @@ -93,26 +93,7 @@ alt="promo" /> - - - {generateTitle()} - - - - - {generateTitle()} - - + {generateTitle()} {generateDesc()} @@ -122,26 +103,7 @@ - - - {generateTitle()} - - - - - {generateTitle()} - - + {generateTitle()} {generateDesc()} diff --git a/src/lib/layout/usageMultiple.svelte b/src/lib/layout/usageMultiple.svelte index c2756141b..cf42b1bbb 100644 --- a/src/lib/layout/usageMultiple.svelte +++ b/src/lib/layout/usageMultiple.svelte @@ -2,7 +2,7 @@ import { Container } from '$lib/layout'; import { BarChart, Legend, type LegendData } from '$lib/charts'; import { accumulateFromEndingTotal } from '$lib/layout/usage.svelte'; - import { Card, Heading, SecondaryTabs, SecondaryTabsItem } from '$lib/components'; + import { Card, SecondaryTabs, SecondaryTabsItem } from '$lib/components'; import { page } from '$app/stores'; import { type Models } from '@appwrite.io/console'; import { formatNumberWithCommas } from '$lib/helpers/numbers'; @@ -20,7 +20,7 @@ {#if showHeader} - {title} + {title} {#if path} diff --git a/src/lib/layout/wizardSecondaryContainer.svelte b/src/lib/layout/wizardSecondaryContainer.svelte index f6b8f6908..167fbba6c 100644 --- a/src/lib/layout/wizardSecondaryContainer.svelte +++ b/src/lib/layout/wizardSecondaryContainer.svelte @@ -1,9 +1,9 @@ - - {$page.error.status || 'Invalid Argument'} - {$page.error.message} + + {$page.error.status || 'Invalid Argument'} + {$page.error.message} + + Back to the console diff --git a/src/routes/(console)/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte index 5ea70ddb9..b5286b08d 100644 --- a/src/routes/(console)/account/organizations/+page.svelte +++ b/src/routes/(console)/account/organizations/+page.svelte @@ -5,7 +5,6 @@ Empty, AvatarGroup, CardContainer, - Heading, PaginationWithLimit } from '$lib/components'; import { Button } from '$lib/elements/forms'; @@ -21,7 +20,7 @@ import { toLocaleDate } from '$lib/helpers/date'; import { BillingPlan } from '$lib/constants'; import { goto } from '$app/navigation'; - import { Icon, Tooltip } from '@appwrite.io/pink-svelte'; + import { Icon, Tooltip, Typography } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; export let data: PageData; @@ -47,7 +46,7 @@ - Organizations + Organizations diff --git a/src/routes/(console)/account/payments/+page.svelte b/src/routes/(console)/account/payments/+page.svelte index 1e00b42eb..8eb25c9e2 100644 --- a/src/routes/(console)/account/payments/+page.svelte +++ b/src/routes/(console)/account/payments/+page.svelte @@ -1,11 +1,11 @@ - Settings + Settings diff --git a/src/routes/(console)/organization-[organization]/settings/+page.svelte b/src/routes/(console)/organization-[organization]/settings/+page.svelte index 0788e3092..caf4aa612 100644 --- a/src/routes/(console)/organization-[organization]/settings/+page.svelte +++ b/src/routes/(console)/organization-[organization]/settings/+page.svelte @@ -1,5 +1,5 @@ - {$page.error.status || 'Invalid Argument'} + {$page.error.status || 'Invalid Argument'} {$page.error.message} diff --git a/src/routes/(console)/project-[project]/auth/security/updateMembershipPrivacy.svelte b/src/routes/(console)/project-[project]/auth/security/updateMembershipPrivacy.svelte index 4dc18daa8..afc2db962 100644 --- a/src/routes/(console)/project-[project]/auth/security/updateMembershipPrivacy.svelte +++ b/src/routes/(console)/project-[project]/auth/security/updateMembershipPrivacy.svelte @@ -1,7 +1,7 @@ @@ -58,7 +50,7 @@ Create document @@ -99,8 +91,24 @@ allowCreate={$canWriteDocuments} single href="https://appwrite.io/docs/products/databases/documents" - target="document" - on:click={openWizard} /> + target="document"> + + Documentation + + Create document + + + {/if} {:else} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/create/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/create/+page.svelte new file mode 100644 index 000000000..370fb3487 --- /dev/null +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/create/+page.svelte @@ -0,0 +1,136 @@ + + + + + + + + + + + + + Choose which permission scopes to grant your application. It is best + practice to allow only the permissions you need to meet your project goals. + + {#if data.collection.documentSecurity} + + Document security is enabled + Users will be able to access this document if they have been granted + either document or collection permissions. + + + {:else} + + Document security is disabled + If you want to assign document permissions, navigate to Collection settings + and enable document security. Otherwise, only collection permissions will + be used. + + {/if} + + + + + + + (showExitModal = true)}>Cancel + formComponent.triggerSubmit()} + disabled={$isSubmitting}> + Create + + + diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte deleted file mode 100644 index 4d49f3502..000000000 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte +++ /dev/null @@ -1,83 +0,0 @@ - - - diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte index b9ce1a6ec..3edff9117 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte @@ -1,5 +1,5 @@ - - - Data - - Provide document data based on attributes you created earlier. - - - - diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte deleted file mode 100644 index 7c86c1b16..000000000 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte +++ /dev/null @@ -1,34 +0,0 @@ - - - - Permissions - - Choose who can access your collection and documents. For more information, visit our - Permissions guide - . - - {#if $collection.documentSecurity} - - Document security is enabled - Users will be able to access this document if they have been granted - either document or collection permissions. - - - {:else} - - Document security is disabled - If you want to assign document permissions, navigate to Collection settings and enable document - security. Otherwise, only collection permissions will be used. - - {/if} - diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts deleted file mode 100644 index 04cd8ed9f..000000000 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { writable } from 'svelte/store'; -import type { Attributes } from '../store'; - -type CreateDocument = { - id?: string; - document: object; - permissions: string[]; - attributes: Attributes[]; -}; - -const initialCreateDocument: CreateDocument = { - id: null, - document: {}, - permissions: [], - attributes: [] -}; - -function createDocumentWritable() { - const store = writable({ ...initialCreateDocument }); - - const reset = () => { - store.set({ ...initialCreateDocument }); - }; - - return { - ...store, - reset - }; -} - -export const createDocument = createDocumentWritable(); diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte index 6278dce3f..6cecdb91a 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte @@ -2,7 +2,7 @@ import { invalidate } from '$app/navigation'; import { page } from '$app/stores'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; - import { BoxAvatar, Card, CardGrid, Heading } from '$lib/components'; + import { BoxAvatar, Card, CardGrid } from '$lib/components'; import { Dependencies } from '$lib/constants'; import { Button, Form, Helper, InputText } from '$lib/elements/forms'; import { toLocaleDateTime } from '$lib/helpers/date'; diff --git a/src/routes/(console)/project-[project]/functions/create-function/+page.svelte b/src/routes/(console)/project-[project]/functions/create-function/+page.svelte index e5f71a715..58d7478bc 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/+page.svelte @@ -27,7 +27,7 @@ - Settings + Settings {#if $func.version === 'v2' && showAlert} import { base } from '$app/paths'; - import { CardGrid, Heading, SvgIcon } from '$lib/components'; + import { CardGrid, SvgIcon } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { toLocaleDateTime } from '$lib/helpers/date'; import { project } from '$routes/(console)/project-[project]/store'; + import { Typography } from '@appwrite.io/pink-svelte'; import { func } from '../store'; @@ -13,7 +14,7 @@ - {$func.name} + {$func.name} {$func.runtime} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte index 00b32d134..b8b0233d3 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte @@ -10,7 +10,6 @@ Collapsible, CollapsibleItem, EyebrowHeading, - Heading, SvgIcon } from '$lib/components'; import { Dependencies } from '$lib/constants'; diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte index 1484d8874..e191289b1 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte @@ -1,7 +1,6 @@ - - - Delete topic - + + Delete topic The topic will be permanently deleted, including all data associated with this topic. This action is irreversible. diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte index be120ba35..6c855a568 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte @@ -1,13 +1,11 @@ - - Details - + Details diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte index ad1e1998b..e9d2587cf 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte @@ -1,5 +1,5 @@ - - - - - {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/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 @@ -
{generateDesc()}
{$page.error.message}
{$func.runtime}
The topic will be permanently deleted, including all data associated with this topic. This action is irreversible. diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte index be120ba35..6c855a568 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte @@ -1,13 +1,11 @@ - - Details - + Details diff --git a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte index ad1e1998b..e9d2587cf 100644 --- a/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte +++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte @@ -1,5 +1,5 @@ - - - - - {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/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 @@ -