diff --git a/package.json b/package.json index ac4be61d3..d10ffec34 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build": "node build.js", "preview": "vite preview", "sync": "svelte-kit sync", - "check": "svelte-check --tsconfig ./tsconfig.json --fail-on-warnings --threshold warning --workspace", + "check": "svelte-check --tsconfig ./tsconfig.json --fail-on-warnings --threshold warning", "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch", "lint": "prettier --check . && eslint .", "format": "prettier --write .", diff --git a/src/lib/components/dualTimeView.svelte b/src/lib/components/dualTimeView.svelte new file mode 100644 index 000000000..326d132f3 --- /dev/null +++ b/src/lib/components/dualTimeView.svelte @@ -0,0 +1,70 @@ + + + + + + + {timeToString} + + + + + + + + + + + + + + + + + + + diff --git a/src/lib/components/filePicker.svelte b/src/lib/components/filePicker.svelte index 091835530..734d8bf6f 100644 --- a/src/lib/components/filePicker.svelte +++ b/src/lib/components/filePicker.svelte @@ -5,12 +5,12 @@ import { ID, Query, Permission, Role } from '@appwrite.io/console'; import type { Models } from '@appwrite.io/console'; import { calculateSize } from '$lib/helpers/sizeConvertion'; - import { toLocaleDate } from '$lib/helpers/date'; import InputSearch from '$lib/elements/forms/inputSearch.svelte'; import { writable } from 'svelte/store'; import { onMount } from 'svelte'; import { base } from '$app/paths'; import { page } from '$app/stores'; + import DualTimeView from './dualTimeView.svelte'; import { Layout, Typography, @@ -318,7 +318,7 @@ {calculateSize(file.sizeOriginal)} - {toLocaleDate(file.$createdAt)} + {/each} diff --git a/src/lib/components/git/deploymentCreatedBy.svelte b/src/lib/components/git/deploymentCreatedBy.svelte index 607d9501e..49f4a6574 100644 --- a/src/lib/components/git/deploymentCreatedBy.svelte +++ b/src/lib/components/git/deploymentCreatedBy.svelte @@ -1,9 +1,10 @@ @@ -19,11 +20,6 @@ by {deployment.providerCommitAuthor} {:else} - - - {capitalize(timeFromNow(deployment.$updatedAt))} - - {toLocaleDateTime(deployment.$updatedAt)} - + {/if}

diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte index 9bd18b068..d59b70905 100644 --- a/src/lib/components/modal.svelte +++ b/src/lib/components/modal.svelte @@ -3,7 +3,6 @@ import { disableCommands } from '$lib/commandCenter'; import { beforeNavigate } from '$app/navigation'; import { Alert, Layout, Modal } from '@appwrite.io/pink-svelte'; - import { Click, trackEvent } from '$lib/actions/analytics'; export let show = false; export let error: string = null; @@ -13,7 +12,6 @@ }; export let title = ''; export let hideFooter = false; - export let submitOnEnter = true; let alert: HTMLElement; let formComponent: Form; @@ -22,16 +20,6 @@ show = false; }); - function handleKeydown(event: KeyboardEvent) { - if (show && event.key === 'Enter' && submitOnEnter) { - event.preventDefault(); - if (show) { - formComponent.triggerSubmit(); - trackEvent(Click.SubmitFormClick, { from: 'enter' }); - } - } - } - $: $disableCommands(show); $: if (error) { @@ -39,8 +27,6 @@ } - -
diff --git a/src/lib/helpers/date.ts b/src/lib/helpers/date.ts index f7d7f3a4b..012d49cb3 100644 --- a/src/lib/helpers/date.ts +++ b/src/lib/helpers/date.ts @@ -31,7 +31,10 @@ export const toLocaleDate = (datetime: string) => { return date.toLocaleDateString('en', options); }; -export const toLocaleDateTime = (datetime: string | number) => { +export const toLocaleDateTime = ( + datetime: string | number, + timeZone: string | undefined = undefined +) => { const date = new Date(datetime); if (isNaN(date.getTime())) { @@ -39,6 +42,7 @@ export const toLocaleDateTime = (datetime: string | number) => { } const options: Intl.DateTimeFormatOptions = { + timeZone, year: 'numeric', month: 'short', day: 'numeric', @@ -181,3 +185,11 @@ export function getTomorrow(date: Date) { return tomorrow; } + +export function getUTCOffset(): string { + const offsetMinutes = -new Date().getTimezoneOffset(); + const hours = Math.floor(offsetMinutes / 60); + const minutes = Math.abs(offsetMinutes % 60); + + return `${hours >= 0 ? '+' : ''}${hours}${minutes ? `:${minutes.toString().padStart(2, '0')}` : ''}`; +} diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index 3077d1f74..5065443e6 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -58,7 +58,6 @@ - - - {#if !hidePeriodSelect} -
- goto(`${path}/${e.detail}`)} - id="period" - options={[ + + {#if !hidePeriodSelect} +
+ goto(`${path}/${e.detail}`)} + id="period" + options={[ + { + label: '24 hours', + value: '24h' + }, + { + label: '30 days', + value: '30d' + }, + { + label: '90 days', + value: '90d' + } + ]} + value={$page.params.period ?? '30d'} /> +
+ {/if} + + {#if count} + + {formatNumberWithCommas(total)} + {countMetadata.title} + +
+ + ]} />
{/if} - - {#if count} - - {formatNumberWithCommas(total)} - {countMetadata.title} - -
- -
- {/if} -
-
- + + diff --git a/src/routes/(console)/account/identities.svelte b/src/routes/(console)/account/identities.svelte index f1fde7592..1acae8228 100644 --- a/src/routes/(console)/account/identities.svelte +++ b/src/routes/(console)/account/identities.svelte @@ -11,6 +11,7 @@ import { oAuthProviders } from '$lib/stores/oauth-providers'; import { Card, Empty, Icon, Layout, Table } from '@appwrite.io/pink-svelte'; import { IconTrash } from '@appwrite.io/pink-icons-svelte'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; async function deleteIdentity(id: string) { try { @@ -78,7 +79,7 @@ {identity.providerEmail} - {toLocaleDateTime(identity.$createdAt)} + {toLocaleDateTime(identity.providerAccessTokenExpiry)} diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte index 47bc47465..2982bc43d 100644 --- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte +++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte @@ -3,7 +3,7 @@ import { Click, Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { CardGrid } from '$lib/components'; import { BillingPlan, Dependencies } from '$lib/constants'; - import { Button, Form, FormList, InputNumber, InputSwitch } from '$lib/elements/forms'; + import { Button, Form, InputNumber, InputSwitch } from '$lib/elements/forms'; import { showUsageRatesModal, upgradeURL } from '$lib/stores/billing'; import { addNotification } from '$lib/stores/notifications'; import { organization, currentPlan } from '$lib/stores/organization'; diff --git a/src/routes/(console)/organization-[organization]/domains/+page.svelte b/src/routes/(console)/organization-[organization]/domains/+page.svelte index 0dd7a7f62..720684c3a 100644 --- a/src/routes/(console)/organization-[organization]/domains/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/+page.svelte @@ -109,7 +109,7 @@ - + {/if} {/if} - +{/if} diff --git a/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte b/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte index 4760dce96..5b823733b 100644 --- a/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/add-domain/+page.svelte @@ -12,7 +12,7 @@ import { Dependencies } from '$lib/constants'; import type { Domain } from '$lib/sdk/domains'; - const backPage = `${base}/project-${$page.params.organization}/domains`; + const backPage = `${base}/organization-${$page.params.organization}/domains`; let domainName = ''; let domain: Domain; @@ -31,7 +31,7 @@ } - + {#if domain} {:else} @@ -54,11 +54,4 @@ {/if} - - - - {#if domain} - - {/if} - diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte index cb623b7db..81d43d5d3 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte @@ -18,7 +18,7 @@ import { IconDownload, IconPlus, IconUpload } from '@appwrite.io/pink-icons-svelte'; import { ViewSelector } from '$lib/components'; import { View } from '$lib/helpers/load'; - import { columns } from './store'; + import { columns, presets } from './store'; import CreateRecordModal from './createRecordModal.svelte'; import Table from './table.svelte'; import AddPresetModal from './addPresetModal.svelte'; @@ -30,8 +30,6 @@ let showPresetModal = false; let showImportModal = false; let selectedPreset = ''; - - const presets = ['Zoho', 'Mailgun', 'Outlook', 'Proton Mail', 'iCloud', 'Google Workspace']; @@ -54,7 +52,7 @@ - + diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/addPresetModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/addPresetModal.svelte index 131864716..814bb9944 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/addPresetModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/addPresetModal.svelte @@ -7,23 +7,57 @@ import { capitalize } from '$lib/helpers/string'; import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; + import type { DnsRecordsList } from '$lib/sdk/domains'; + import { presets } from './store'; + import { invalidate } from '$app/navigation'; + import { Dependencies } from '$lib/constants'; export let show = false; - export let selectedPreset; + export let selectedPreset: (typeof presets)[number]; + let records: DnsRecordsList; let error = ''; - async function fetchPreset() { switch (selectedPreset.toLowerCase()) { //TODO: finish switch statement case 'zoho': - return await sdk.forConsole.domains.getPresetZoho($page.params.domain); + records = await sdk.forConsole.domains.getPresetZoho($page.params.domain); + return records; + case 'google workspace': + records = await sdk.forConsole.domains.getPresetGoogleWorkspace( + $page.params.domain + ); + return records; + case 'outlook': + records = await sdk.forConsole.domains.getPresetOutlook($page.params.domain); + return records; + case 'proton mail': + records = await sdk.forConsole.domains.getPresetProtonMail($page.params.domain); + return records; + case 'mailgun': + records = await sdk.forConsole.domains.getPresetMailgun($page.params.domain); + return records; + case 'icloud': + records = await sdk.forConsole.domains.getPresetICloud($page.params.domain); + return records; } } async function handleSubmit() { try { //TODO: create DNS records - + if (records.total) { + const promises = records.dnsRecords.map((record) => + sdk.forConsole.domains.createRecordMX( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.priority + ) + ); + await Promise.all(promises); + } + invalidate(Dependencies.DOMAIN); show = false; addNotification({ type: 'success', @@ -69,8 +103,7 @@ {/each} {:then presetData} - {JSON.stringify(presetData)} - {#each presetData as record} + {#each presetData.dnsRecords as record} {record.type} {record.name} diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/createRecordModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/createRecordModal.svelte index 8df2d14cf..91dbb91ec 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/createRecordModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/createRecordModal.svelte @@ -59,7 +59,7 @@ name, value, ttl, - comment + comment || undefined ); break; @@ -69,7 +69,7 @@ name, value, ttl, - comment + comment || undefined ); break; @@ -80,7 +80,7 @@ value, ttl, priority, - comment + comment || undefined ); break; @@ -90,7 +90,7 @@ name, value, ttl, - comment + comment || undefined ); break; @@ -100,7 +100,7 @@ name, value, ttl, - comment + comment || undefined ); break; @@ -111,7 +111,7 @@ name, value, ttl, - comment + comment || undefined ); break; @@ -121,7 +121,7 @@ name, value, ttl, - comment + comment || undefined ); break; @@ -131,7 +131,7 @@ name, value, ttl, - comment + comment || undefined ); break; diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte index fe61b49f8..b553e5a7b 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/importRecordModal.svelte @@ -5,19 +5,247 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; + import { removeFile } from '$lib/helpers/files'; + import { sdk } from '$lib/stores/sdk'; + import type { DnsRecord } from '$lib/sdk/domains'; + import { page } from '$app/stores'; export let show = false; let files: FileList; let error = ''; + type ParsedRecords = { + A: Partial[]; + AAAA: Partial[]; + CNAME: Partial[]; + MX: Partial[]; + TXT: Partial[]; + NS: Partial[]; + SRV: Partial[]; + CAA: Partial[]; + PTR: Partial[]; + HTTPS: Partial[]; + ALIAS: Partial[]; + [key: string]: Partial[]; + }; + + function parseZoneFile(content: string): ParsedRecords { + const records: ParsedRecords = { + A: [], + AAAA: [], + CNAME: [], + MX: [], + TXT: [], + NS: [], + SRV: [], + CAA: [], + PTR: [], + HTTPS: [], + ALIAS: [] + }; + + // Split the content into lines and process each line + const lines = content.split('\n'); + + for (let line of lines) { + // Remove comments, but save them for record comment field + let comment = ''; + const commentIndex = line.indexOf(';'); + if (commentIndex !== -1) { + comment = line.substring(commentIndex + 1).trim(); + line = line.substring(0, commentIndex).trim(); + } + + // Skip empty lines or pure comment lines + if (!line.trim()) continue; + + // Split line into parts (whitespace separated) + const parts = line.trim().split(/\s+/); + + // Need at least a name, TTL/class/type, and value + if (parts.length < 3) continue; + + let recordType = ''; + let name = ''; + let value = ''; + let ttl = 3600; + let priority: number | undefined; + let weight: number | undefined; + let port: number | undefined; + + // Try to determine the record type from the parts + for (let i = 0; i < parts.length; i++) { + const part = parts[i].toUpperCase(); + if (['A', 'AAAA', 'CNAME', 'MX', 'TXT', 'NS', 'SRV', 'CAA'].includes(part)) { + recordType = part; + name = parts[0] === '@' ? '' : parts[0]; // @ represents the domain itself + + // Handle TTL if it appears to be a number + const possibleTtl = parseInt(parts[i - 1]); + if (!isNaN(possibleTtl) && i > 0) { + ttl = possibleTtl; + } + + if (recordType === 'MX' && i + 2 < parts.length) { + priority = parseInt(parts[i + 1]); + value = parts[i + 2]; + } else if (recordType === 'SRV' && i + 4 < parts.length) { + priority = parseInt(parts[i + 1]); + weight = parseInt(parts[i + 2]); + port = parseInt(parts[i + 3]); + value = parts[i + 4]; + } else if (i + 1 < parts.length) { + value = parts.slice(i + 1).join(' '); + } + + break; + } + } + + if (recordType && value) { + if (recordType === 'TXT' && value.startsWith('"') && value.endsWith('"')) { + value = value.slice(1, -1); + } + + const record: Partial = { + name, + value, + ttl, + comment: comment || undefined + }; + + if (priority !== undefined) { + record.priority = priority; + } + + if (!records[recordType]) { + records[recordType] = []; + } + + records[recordType].push(record); + } + } + + return records; + } + async function handleSubmit() { try { - //TODO: create DNS records + if (!files?.length) return; + + const file = files[0]; + const content = await file.text(); + const parsedRecords = parseZoneFile(content); + + let recordCount = 0; + + for (const [type, records] of Object.entries(parsedRecords)) { + recordCount += records.length; + + for (const record of records) { + switch (type) { + case 'A': + await sdk.forConsole.domains.createRecordA( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.comment + ); + break; + case 'AAAA': + await sdk.forConsole.domains.createRecordAAAA( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.comment + ); + break; + case 'CNAME': + await sdk.forConsole.domains.createRecordCNAME( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.comment + ); + break; + case 'MX': + await sdk.forConsole.domains.createRecordMX( + $page.params.domain, + record.name, + record.value, + record.priority || 10, + record.ttl, + record.comment + ); + break; + case 'TXT': + await sdk.forConsole.domains.createRecordTXT( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.comment + ); + break; + case 'NS': + await sdk.forConsole.domains.createRecordNS( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.comment + ); + break; + case 'SRV': + await sdk.forConsole.domains.createRecordSRV( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.priority, + record.weight, + record.port, + record.comment + ); + break; + case 'CAA': + await sdk.forConsole.domains.createRecordCAA( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.comment + ); + break; + case 'PTR': + await sdk.forConsole.domains.createRecordHTTPS( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.comment + ); + break; + case 'ALIAS': + await sdk.forConsole.domains.createRecordAlias( + $page.params.domain, + record.name, + record.value, + record.ttl, + record.comment + ); + break; + } + } + } show = false; addNotification({ type: 'success', - message: `Presets have been added` + message: `${recordCount} DNS records have been imported successfully` }); trackEvent(Submit.RecordCreate); } catch (e) { @@ -25,6 +253,14 @@ trackError(e, Submit.RecordCreate); } } + + $: filesList = files?.length + ? Array.from(files).map((file) => { + let f = file as Partial & { removable: boolean }; + f.removable = true; + return f; + }) + : []; @@ -34,24 +270,41 @@ >. - - - - - - Drag and drop file here or click to upload - - - - + + + + Upload a .txt file with your DNS records + + + + + + + Drag and drop file here or click to upload + + + + + + Only .txt files allowed + - Only .txt files allowed - + Max file size 10MB + - Max file size 10MB - + - + {#if files?.length} + (files = removeFile(e.detail, files))} /> + {/if} + diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts index 55bdefcc9..18afb8527 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts @@ -66,3 +66,5 @@ export const recordTypes = [ helper: 'ALIAS records are similar to CNAMEs but can be used for the root domain, allowing you to point your domain to another domain or server.' } ]; + +export const presets = ['Zoho', 'Mailgun', 'Outlook', 'Proton Mail', 'iCloud', 'Google Workspace']; diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte index 43452d37d..ee9fba69a 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte @@ -12,11 +12,10 @@ } from '@appwrite.io/pink-svelte'; import { IconDotsHorizontal, IconPencil, IconTrash } from '@appwrite.io/pink-icons-svelte'; import { columns } from './store'; - import { timeFromNow } from '$lib/helpers/date'; import DeleteRecordModal from './deleteRecordModal.svelte'; - import { capitalize } from '$lib/helpers/string'; import EditRecordModal from './updateRecordModal.svelte'; import type { DnsRecord } from '$lib/sdk/domains'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; export let data; @@ -63,9 +62,7 @@ {record?.comment ?? '-'} {:else if column.id === '$createdAt'} - - {capitalize(timeFromNow(record.$createdAt))} - + {/if} {/each} diff --git a/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte b/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte index 92050dc99..695401312 100644 --- a/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte +++ b/src/routes/(console)/organization-[organization]/domains/recordsCard.svelte @@ -1,20 +1,20 @@
- - - - {domain.domain} - - {#if verified === false} - - {/if} - - - - Add the following nameservers on your DNS provider. Note that DNS changes may - take time to propagate fully. - - - - - - Type - Value - - - {#each nameservers as nameserver} - - NS - {nameserver} - - - - - - - - - {/each} - +
+ + Nameservers + + +
+ - - - A list of all domain providers and their DNS setting is available here. - + {domain.domain} + + {#if verified === false} + + {:else} + + {/if} + + Add the following nameservers on your DNS provider. Note that DNS changes may take + time to propagate fully. + + + + + Type + Value + + + {#each nameservers as nameserver} + + NS + {nameserver} + + + + {nameserver} + + + + {/each} + + + A list of all domain providers and their DNS setting is available here. + - - +
diff --git a/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte b/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte index 0afc74175..80f9ce0d7 100644 --- a/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/retryDomainModal.svelte @@ -4,28 +4,41 @@ import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { invalidate } from '$app/navigation'; - import type { Models } from '@appwrite.io/console'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { Dependencies } from '$lib/constants'; - import RecordsCard from './recordsCard.svelte'; + import { Input, InteractiveText, Layout, Table, Typography } from '@appwrite.io/pink-svelte'; + import { Link } from '$lib/elements'; + import { consoleVariables } from '$routes/(console)/store'; + import type { Domain } from '$lib/sdk/domains'; export let show = false; - export let selectedDomain: Models.ProxyRule; + export let selectedDomain: Domain; + let nameservers = $consoleVariables?._APP_DOMAINS_NAMESERVERS.split(',') ?? [ + 'ns1.appwrite.io', + 'ns2.appwrite.io' + ]; let error = null; async function retryDomain() { try { - await sdk.forProject.proxy.updateRuleVerification(selectedDomain.$id); - await invalidate(Dependencies.SITES_DOMAINS); + const domain = await sdk.forConsole.domains.updateNameservers(selectedDomain.$id); show = false; - addNotification({ - type: 'success', - message: `${selectedDomain.domain} has been deleted` - }); - trackEvent(Submit.DomainDelete); + if (domain.nameservers === 'Appwrite') { + addNotification({ + type: 'error', + message: `${selectedDomain.domain} has been verified` + }); + } else { + addNotification({ + type: 'error', + message: `Domain verification failed. Please check your domain settings or try again later` + }); + } + await invalidate(Dependencies.DOMAINS); + trackEvent(Submit.DomainUpdateVerification); } catch (e) { error = e; - trackError(e, Submit.DomainDelete); + trackError(e, Submit.DomainUpdateVerification); } } @@ -35,10 +48,41 @@ - {#if selectedDomain} - - {/if} + + + {selectedDomain.domain} + \ + + + Add the following nameservers on your DNS provider. Note that DNS changes may take time + to propagate fully. + + + + + Type + Value + + + {#each nameservers as nameserver} + + NS + + + {nameserver} + + + {/each} + + + A list of all domain providers and their DNS setting is available here. + diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte index a15cc64c7..e74b0c2ac 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte @@ -3,13 +3,13 @@ import { EmptyCardCloud } from '$lib/components/billing'; import { BillingPlan } from '$lib/constants'; import { Button } from '$lib/elements/forms'; - import { toLocaleDate } from '$lib/helpers/date'; import { formatCurrency } from '$lib/helpers/numbers'; import { plansInfo, tierToPlan } from '$lib/stores/billing'; import { newMemberModal, organization } from '$lib/stores/organization'; import type { Models } from '@appwrite.io/console'; import { IconInfo, IconPlus } from '@appwrite.io/pink-icons-svelte'; import { Icon, Layout, Table, Tooltip, Typography } from '@appwrite.io/pink-svelte'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; export let members: Models.MembershipList; @@ -78,9 +78,7 @@ - {member.joined - ? toLocaleDate(member.joined) - : toLocaleDate(member.$createdAt)} + {/each} diff --git a/src/routes/(console)/project-[project]/auth/teams/+page.svelte b/src/routes/(console)/project-[project]/auth/teams/+page.svelte index 865f64e07..86f837c58 100644 --- a/src/routes/(console)/project-[project]/auth/teams/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/teams/+page.svelte @@ -14,7 +14,6 @@ } from '$lib/components'; import Create from '../createTeam.svelte'; import { goto } from '$app/navigation'; - import { toLocaleDateTime } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { base } from '$app/paths'; import type { Models } from '@appwrite.io/console'; @@ -23,6 +22,7 @@ import { canWriteTeams } from '$lib/stores/roles'; import { Icon, Layout, Table } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; export let data: PageData; @@ -66,7 +66,7 @@ {team.total} members - {toLocaleDateTime(team.$createdAt)} + {/each} diff --git a/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte index 031057404..eb51299de 100644 --- a/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte @@ -1,7 +1,7 @@ - + + + diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte index 7f6ef65bb..25bbea229 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/table.svelte @@ -27,6 +27,7 @@ import { LabelCard } from '$lib/components/index.js'; import { Dependencies } from '$lib/constants'; import { Tooltip } from '@appwrite.io/pink-svelte'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; export let data: PageData; @@ -155,12 +156,9 @@ - - - {cleanBackupName(backup)} - - {timeFromNow(backup.$createdAt)} - + + {cleanBackupName(backup)} + {#if backup.status === 'completed'} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index 6a9fc19ce..cd58bb70e 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -18,6 +18,8 @@ import type { ColumnType } from '$lib/helpers/types'; import { toLocaleDateTime } from '$lib/helpers/date'; import { Tooltip, Table, Button, Link } from '@appwrite.io/pink-svelte'; + import { Tooltip, Table, Selector, Button, Link } from '@appwrite.io/pink-svelte'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; export let data: PageData; @@ -233,10 +235,10 @@ {/each} - {toLocaleDateTime(document.$createdAt)} + - {toLocaleDateTime(document.$updatedAt)} + {/each} @@ -265,7 +267,11 @@
- +

Are you sure you want to delete {selectedRows.length} diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte index 60177715e..5c9e47860 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte @@ -2,6 +2,7 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { Usage } from '$lib/layout'; + import Container from '$lib/layout/container.svelte'; import type { PageData } from './$types'; export let data: PageData; @@ -9,12 +10,14 @@ $: count = data.documents; - + + + diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte index 6871e9060..6d108bee5 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte @@ -1,7 +1,8 @@ - + + + - + + + diff --git a/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte index ec0ef9200..624ae96c1 100644 --- a/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte @@ -1,7 +1,8 @@ - + + + - + + + 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 8068d9edd..2f3e0a391 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/+page.svelte @@ -66,7 +66,7 @@ } - + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte index 3a833d50a..0fe896442 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte @@ -1,6 +1,6 @@ - - {#if count} - - {/if} + + + {#if count} + + {/if} - {#if mbSecondsCount} - - {/if} - + {#if mbSecondsCount} + + {/if} + + diff --git a/src/routes/(console)/project-[project]/functions/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/functions/usage/[[period]]/+page.svelte index b58fa9d8c..d0fc86342 100644 --- a/src/routes/(console)/project-[project]/functions/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/usage/[[period]]/+page.svelte @@ -1,19 +1,21 @@ - + + + diff --git a/src/routes/(console)/project-[project]/overview/platforms/+page.svelte b/src/routes/(console)/project-[project]/overview/platforms/+page.svelte index 2bc8a8e5c..2db9a5272 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/+page.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/+page.svelte @@ -62,7 +62,6 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { Button } from '$lib/elements/forms'; - import { toLocaleDate } from '$lib/helpers/date'; import type { PageData } from './$types'; import { canWritePlatforms } from '$lib/stores/roles'; import { setOverviewAction } from '../context'; @@ -84,6 +83,7 @@ IconReact } from '@appwrite.io/pink-icons-svelte'; import type { ComponentType } from 'svelte'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; export let data: PageData; @@ -141,7 +141,11 @@ - {platform.$updatedAt ? toLocaleDate(platform.$updatedAt) : 'never'} + {#if platform.$updatedAt} + + {:else} + never + {/if} {/each} diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/JavascriptFrameworkIcon.svelte b/src/routes/(console)/project-[project]/overview/platforms/components/JavascriptFrameworkIcon.svelte new file mode 100644 index 000000000..c38f0f810 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/platforms/components/JavascriptFrameworkIcon.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/index.ts b/src/routes/(console)/project-[project]/overview/platforms/components/index.ts new file mode 100644 index 000000000..1cdbbfe20 --- /dev/null +++ b/src/routes/(console)/project-[project]/overview/platforms/components/index.ts @@ -0,0 +1,9 @@ +export { default as AngularFrameworkIcon } from './AngularFrameworkIcon.svelte'; +export { default as ConnectionLine } from './ConnectionLine.svelte'; +export { default as JavascriptFrameworkIcon } from './JavascriptFrameworkIcon.svelte'; +export { default as NextjsFrameworkIcon } from './NextjsFrameworkIcon.svelte'; +export { default as NoFrameworkIcon } from './NoFrameworkIcon.svelte'; +export { default as NuxtFrameworkIcon } from './NuxtFrameworkIcon.svelte'; +export { default as ReactFrameworkIcon } from './ReactFrameworkIcon.svelte'; +export { default as SvelteFrameworkIcon } from './SvelteFrameworkIcon.svelte'; +export { default as VueFrameworkIcon } from './AngularFrameworkIcon.svelte'; diff --git a/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte index a00301f73..3934d7ee1 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte @@ -22,7 +22,8 @@ IconNuxt, IconInfo, IconExternalLink, - IconAngular + IconAngular, + IconJs } from '@appwrite.io/pink-icons-svelte'; import { page } from '$app/stores'; import { type ComponentType, onMount } from 'svelte'; @@ -33,13 +34,16 @@ import ConnectionLine from './components/ConnectionLine.svelte'; import OnboardingPlatformCard from './components/OnboardingPlatformCard.svelte'; import { PlatformType } from '@appwrite.io/console'; - import ReactFrameworkIcon from './components/ReactFrameworkIcon.svelte'; - import SvelteFrameworkIcon from '$routes/(console)/project-[project]/overview/platforms/components/SvelteFrameworkIcon.svelte'; - import NuxtFrameworkIcon from '$routes/(console)/project-[project]/overview/platforms/components/NuxtFrameworkIcon.svelte'; - import NextjsFrameworkIcon from '$routes/(console)/project-[project]/overview/platforms/components/NextjsFrameworkIcon.svelte'; - import VueFrameworkIcon from '$routes/(console)/project-[project]/overview/platforms/components/VueFrameworkIcon.svelte'; - import NoFrameworkIcon from './components/NoFrameworkIcon.svelte'; - import AngularFrameworkIcon from '$routes/(console)/project-[project]/overview/platforms/components/AngularFrameworkIcon.svelte'; + import { + ReactFrameworkIcon, + SvelteFrameworkIcon, + NuxtFrameworkIcon, + NextjsFrameworkIcon, + VueFrameworkIcon, + NoFrameworkIcon, + AngularFrameworkIcon, + JavascriptFrameworkIcon + } from './components/index'; export let key; @@ -51,8 +55,8 @@ const projectId = $page.params.project; - const updateConfigCode = `APPWRITE_PROJECT_ID = "${projectId}" -APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" + const updateConfigCode = (prefix = '') => `${prefix}APPWRITE_PROJECT_ID = "${projectId}" +${prefix}APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" `; type FrameworkType = { key: string; @@ -60,6 +64,8 @@ APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" icon: ComponentType; smallIcon: ComponentType; portNumber: number; + runCommand: string; + updateConfigCode: string; }; export let platform: PlatformType = PlatformType.Flutterandroid; export let selectedFrameworkKey: string | undefined = key ? key : undefined; @@ -70,42 +76,63 @@ APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" label: 'Svelte', icon: SvelteFrameworkIcon, smallIcon: IconSvelte, - portNumber: 5173 + portNumber: 5173, + runCommand: 'npm run dev', + updateConfigCode: updateConfigCode('PUBLIC_') }, { key: 'react', label: 'React', icon: ReactFrameworkIcon, smallIcon: IconReact, - portNumber: 5173 + portNumber: 5173, + runCommand: 'npm run dev', + updateConfigCode: updateConfigCode('VITE_') }, { key: 'nuxt', label: 'Nuxt', icon: NuxtFrameworkIcon, smallIcon: IconNuxt, - portNumber: 3000 + portNumber: 3000, + runCommand: 'npm run dev', + updateConfigCode: updateConfigCode('NUXT_') }, { key: 'nextjs', label: 'Next.js', icon: NextjsFrameworkIcon, smallIcon: NextjsFrameworkIcon, - portNumber: 3000 + portNumber: 3000, + runCommand: 'npm run dev', + updateConfigCode: updateConfigCode('NEXT_PUBLIC_') }, { key: 'vue', label: 'Vue', icon: VueFrameworkIcon, smallIcon: IconVue, - portNumber: 5173 + portNumber: 5173, + runCommand: 'npm run dev', + updateConfigCode: updateConfigCode('VITE_') }, { key: 'angular', label: 'Angular', icon: AngularFrameworkIcon, smallIcon: IconAngular, - portNumber: 4200 + portNumber: 4200, + runCommand: 'npm run start', + updateConfigCode: `appwriteEndpoint: '${sdk.forProject.client.config.endpoint}',\nappwriteProjectId:'${projectId}'` + }, + { + key: 'js', + label: 'Javascript', + icon: JavascriptFrameworkIcon, + smallIcon: IconJs, + portNumber: 5173, + runCommand: 'npm run dev', + updateConfigCode: updateConfigCode('VITE_') } ]; @@ -165,7 +192,7 @@ APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}" }); - +

@@ -249,7 +276,10 @@ APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject.client.config.endpoint}"
- +
3. Run the app, then click the 4. Run the app, then click the button to verify the setup. + +
+ +
- - - +

Edit {isGlobal ? 'global' : 'environment'} variables below or download as a file. diff --git a/src/routes/(console)/project-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[project]/settings/migrations/+page.svelte index 6649eea40..7f8d383a2 100644 --- a/src/routes/(console)/project-[project]/settings/migrations/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/migrations/+page.svelte @@ -4,7 +4,7 @@ import { Arrow, Avatar, AvatarGroup, CardGrid } from '$lib/components'; import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; - import { isSameDay, toLocaleDate } from '$lib/helpers/date'; + import { isSameDay } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { sdk } from '$lib/stores/sdk'; import { GRACE_PERIOD_OVERRIDE, isSelfHosted } from '$lib/system'; @@ -28,6 +28,7 @@ } from '@appwrite.io/pink-icons-svelte'; import { Icon, Layout, Link, Status, Table } from '@appwrite.io/pink-svelte'; import { capitalize } from '$lib/helpers/string'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; import { Click, trackEvent } from '$lib/actions/analytics'; export let data; @@ -163,9 +164,11 @@ {@const status = getStatus(entry.status)} - {isSameDay(new Date(), new Date(entry.$createdAt)) - ? 'Today' - : toLocaleDate(entry.$createdAt)} + {#if isSameDay(new Date(), new Date(entry.$createdAt))} + Today + {:else} + + {/if} {entry.source} diff --git a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte index ea2ef3f03..aa1df9886 100644 --- a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte @@ -6,7 +6,6 @@ import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; import GitDisconnectModal from './GitDisconnectModal.svelte'; - import dayjs from 'dayjs'; import { isSelfHosted } from '$lib/system'; import { consoleVariables } from '$routes/(console)/store'; import { @@ -25,6 +24,7 @@ IconPlus, IconXCircle } from '@appwrite.io/pink-icons-svelte'; + import DualTimeView from '$lib/components/dualTimeView.svelte'; import { Click, trackEvent } from '$lib/actions/analytics'; import type { ComponentType } from 'svelte'; import { Link } from '$lib/elements'; @@ -117,7 +117,7 @@ - {dayjs().to(installation.$updatedAt)} + diff --git a/src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte b/src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte index 229759855..0ce433727 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/deploymentActionMenu.svelte @@ -6,6 +6,7 @@ import { sdk } from '$lib/stores/sdk'; import { DeploymentDownloadType, type Models } from '@appwrite.io/console'; import { + IconChevronRight, IconDotsHorizontal, IconDownload, IconLightningBolt, @@ -77,7 +78,9 @@ {#if deployment?.status === 'ready' || deployment?.status === 'failed'} - + Download diff --git a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte index 9f0e41c5d..b9811818b 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/finish/+page.svelte @@ -34,7 +34,7 @@ -

+
diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte index b436a14bc..ae3677b2f 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/templates/+page.svelte @@ -1,14 +1,15 @@ - - - +

Add, edit, or delete environment variables using a raw editor.

diff --git a/src/routes/(console)/project-[project]/sites/createSiteModal.svelte b/src/routes/(console)/project-[project]/sites/createSiteModal.svelte index 91f82f9f4..3501f0c02 100644 --- a/src/routes/(console)/project-[project]/sites/createSiteModal.svelte +++ b/src/routes/(console)/project-[project]/sites/createSiteModal.svelte @@ -20,7 +20,7 @@ variant="secondary" padding="xs" radius="s" - href={`${base}/project-${$page.params.project}/sites/create-site/templates`}> + href={`${base}/project-${$page.params.project}/sites/create-site/templates?framework=React&framework=Vue.js&framework=Next.js&framework=SvelteKit&framework=Nuxt`}> repositories - + + + + {capitalize(site.framework)} + + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts index c40d649c9..16c38bd17 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/+page.ts @@ -20,8 +20,7 @@ export const load = async ({ params, depends, parent }) => { Query.equal('type', RuleType.DEPLOYMENT), Query.equal('deploymentResourceType', DeploymentResourceType.SITE), Query.equal('deploymentResourceId', site.$id), - Query.equal('deploymentId', site.deploymentId), - Query.equal('trigger', 'manual') + Query.equal('deploymentId', site.deploymentId) ]) ]); diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte index c3522f682..28b425ca9 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/+page.svelte @@ -43,29 +43,16 @@ - - - - - - Custom domain - - (showPreviewDomainModal = true)}> - Preview domain - - - - + {#if data.domains.total} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte index b7e65b1de..bdc498a7a 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte @@ -5,14 +5,25 @@ import { Wizard } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { Fieldset, Layout, Tooltip, Icon, Alert, Input } from '@appwrite.io/pink-svelte'; + import { + Fieldset, + Layout, + Tooltip, + Icon, + Alert, + Input, + Divider, + Typography, + Badge, + Card + } from '@appwrite.io/pink-svelte'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { sortBranches } from '$lib/stores/vcs'; import { organization } from '$lib/stores/organization'; import { consoleVariables } from '$routes/(console)/store'; import InputDomain from '$lib/elements/forms/inputDomain.svelte'; - import { IconInfo } from '@appwrite.io/pink-icons-svelte'; + import { IconGlobeAlt, IconInfo } from '@appwrite.io/pink-icons-svelte'; import { LabelCard } from '$lib/components'; import { writable } from 'svelte/store'; import ConnectRepoModal from '../../../(components)/connectRepoModal.svelte'; @@ -28,7 +39,8 @@ let isSubmitting = writable(false); let showConnectRepo = false; - let behaviour: 'REDIRECT' | 'CREATE' = 'CREATE'; + let behaviour: 'REDIRECT' | 'BRANCH' | 'ACTIVE' = 'ACTIVE'; + let step: 'add' | 'verify' = 'add'; let domain = ''; let redirect: string = null; let statusCode: number = null; @@ -146,11 +158,36 @@ } - + - -
- - -
- - - - Connect this domain to your active deployment and configure the linked Git - branch as needed. - - - Automatically forward traffic from this domain to another URL of your choice. - - - - {#if behaviour === 'CREATE'} -
- - {#if data.site?.providerRepositoryId} - {@const sortedBranches = sortBranches(data.branches.branches)} - {@const options = sortedBranches.map((branch) => ({ - label: branch.name, - value: branch.name - }))} - - - {#if !data.branches?.total} - - No branches found in the selected repository. Create a - branch to see it here. - - {/if} - - {:else} - - - -

- The domain will be connected to your active deployment. - Connect your Git repository to link a production branch. -

-
- -
-
-
- {/if} -
-
- - - {:else if behaviour === 'REDIRECT'} -
- - - - - - Redirect this domain. Domains added to your project will be - listed here. - - - - + placeholder="appwrite.example.com" /> + + {#if behaviour === 'BRANCH'} + {#if data.site?.providerRepositoryId} + {@const sortedBranches = sortBranches(data.branches.branches)} + {@const options = sortedBranches.map((branch) => ({ + label: branch.name, + value: branch.name + }))} + + + {#if !data.branches?.total} + + No branches found in the selected repository. Create a + branch to see it here. + + {/if} + + {/if} + {:else if behaviour === 'REDIRECT'} + + + + + Redirect this domain. Domains added to your project will be + listed here. + + + + + {/if} + + + +
- {/if} -
+
+ {:else if step === 'verify'} + + + + + + + {domain} + + + + + + {/if} + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte index 3ec3358b1..ceed79b06 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domainsOverview.svelte @@ -17,11 +17,7 @@ let showDomainQR = false; let selectedDomainURL: string; - // $: hasCustomDomain = proxyRuleList?.total - // ? proxyRuleList.rules.some((rule) => - // rule.domain.includes($consoleVariables._APP_DOMAIN_TARGET) - // ) - // : false; + $: rules = proxyRuleList?.rules?.filter((rule) => rule.trigger === 'manual') ?? []; @@ -40,7 +36,7 @@ - {#if proxyRuleList?.rules?.length <= 1} + {#if rules.length <= 1} @@ -65,11 +61,11 @@
- {#if proxyRuleList?.rules?.length} + {#if rules?.length} {/if} {/if} - {#each proxyRuleList?.rules?.slice(0, 3) as rule, i} + {#each rules?.slice(0, 3) as rule, i} - {#if i < 2 && i < proxyRuleList.rules.length - 1} + {#if i < 2 && i < rules.length - 1} {/if} {/each} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte index 44b0599ce..4ea14e5e3 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte @@ -1,11 +1,10 @@ - + + - + }} + total={totalBuilds} + count={countBuilds} /> --> + diff --git a/src/routes/(console)/project-[project]/sites/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/sites/usage/[[period]]/+page.svelte index 203a915da..56befa827 100644 --- a/src/routes/(console)/project-[project]/sites/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/usage/[[period]]/+page.svelte @@ -1,7 +1,7 @@ - + + + diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte index f6bb5c944..06f1d715f 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte @@ -10,7 +10,6 @@ import { fileSearcher } from '$lib/commandCenter/searchers'; import { canWriteBuckets } from '$lib/stores/roles'; import { project } from '../../store'; - import { showCreateFile } from './+page.svelte'; import { bucket } from './store'; import { IconKey, IconLockClosed, IconPlus, IconPuzzle } from '@appwrite.io/pink-icons-svelte'; diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte index 6a1e7d68e..e1e2d234e 100644 --- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -1,9 +1,3 @@ - - - + + + diff --git a/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte index 08e6f956c..e02e78fbc 100644 --- a/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte +++ b/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte @@ -1,20 +1,21 @@ - + + +