{#if $page.data?.header} diff --git a/src/routes/(console)/account/payments/addressModal.svelte b/src/routes/(console)/account/payments/addressModal.svelte index 55405deb1..5e9a827bc 100644 --- a/src/routes/(console)/account/payments/addressModal.svelte +++ b/src/routes/(console)/account/payments/addressModal.svelte @@ -1,6 +1,5 @@ @@ -363,7 +371,7 @@ {collaborators} bind:couponData bind:billingBudget - organizationId={selectedOrgId}> + organizationId={isNewOrg ? selectedOrgId : null}> {#if campaign?.template === 'review' && (campaign?.cta || campaign?.claimed || campaign?.unclaimed)}

{campaign?.cta}

@@ -396,6 +404,8 @@ {/if} {#if selectedOrgId === newOrgId} Create organization + {:else if isUpgrade()} + Upgrade {:else} Apply {/if} diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index 8e2e6f725..c571ad0cc 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -19,8 +19,7 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { sdk } from '$lib/stores/sdk'; import { loading } from '$routes/store'; - import type { Models } from '@appwrite.io/console'; - import { ID, Region } from '@appwrite.io/console'; + import { ID, Region, type Models } from '@appwrite.io/console'; import { openImportWizard } from '../project-[region]-[project]/settings/migrations/(import)'; import { readOnly } from '$lib/stores/billing'; import { onMount, type ComponentType } from 'svelte'; @@ -163,23 +162,28 @@ {project.name} - {#each platforms as platform, i} - {#if i < 3} - {@const icon = getIconForPlatform(platform.icon)} - - - - {/if} + + {#each platforms.slice(0, 2) as platform} + {@const icon = getIconForPlatform(platform.icon)} + + + {/each} - {#if platforms?.length > 3} - + + {#if platforms.length > 3} + {/if} + {#if isCloud && $regionsStore?.regions} {@const region = findRegion(project)} - - {region?.name} - + {region.name} {/if} diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte index efe13f1a3..b96c875c8 100644 --- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte +++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte @@ -302,8 +302,7 @@ - - {#if selectedPlan !== BillingPlan.FREE && data.organization.billingPlan === BillingPlan.FREE} + {#if isUpgrade}
= { + A: '76.75.21.21', + AAAA: '2001:0db8:85a3:0000:0000:8a2e:0370:7334', + CNAME: 'stage.example.com', + MX: 'mail.example.com', + TXT: 'v=spf1 include:_spf.example.com ~all', + NS: 'ns1.example.com', + SRV: '10 5 8080 example.com', + CAA: '0 issue "letsencrypt.org"', + HTTPS: 'https://example.com', + ALIAS: 'www.example.com' + }; + $: placeholder = placeholders[type] ?? 'Enter value'; + async function handleSubmit() { const record = { name, @@ -77,7 +92,7 @@ - + @@ -96,7 +111,7 @@ - {#if type === 'MX'} + {#if showPriority(type)} $page.data.domain as Models.Domain); export const columns = writable([ - { id: 'name', title: 'Name', type: 'string', width: { min: 150 } }, + { id: 'name', title: 'Name', type: 'string', width: { min: 200 } }, { id: 'type', title: 'Type', type: 'string', width: 125 }, { id: 'value', title: 'Value', type: 'string', width: 250 }, { id: 'ttl', title: 'TTL', type: 'integer', width: 100 }, 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 4b8c1e958..006738f20 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte @@ -1,3 +1,12 @@ + + @@ -47,9 +65,16 @@ {#each $columns as column} {#if column.id === 'name'} - - {record.name} - + {@const formatted = formatRecordName(record.name)} + + {formatted.value} + + {formatted.whole} + + {:else if column.id === 'type'} {record.type} @@ -70,7 +95,7 @@ {:else if column.id === 'priority'} - {record?.priority ?? '-'} + {showPriority(record) ? (record?.priority ?? '0') : '-'} {:else if column.id === 'comment'} diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/updateRecordModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/updateRecordModal.svelte index 9155339ca..c8d4d1f49 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/updateRecordModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/updateRecordModal.svelte @@ -13,12 +13,14 @@ import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { symmetricDifference } from '$lib/helpers/array'; import { deepClone } from '$lib/helpers/object'; - import { sdk } from '$lib/stores/sdk'; import { page } from '$app/state'; import { recordTypes } from './store'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import type { Models } from '@appwrite.io/console'; + import type { RecordType } from '$lib/stores/domains'; + import { updateRecord } from '$lib/helpers/domains'; + import { showPriority } from './table.svelte'; export let show = false; export let selectedRecord: Models.DnsRecord; @@ -26,114 +28,23 @@ let record = deepClone(selectedRecord); let error = ''; + const placeholders: Record = { + A: '76.75.21.21', + AAAA: '2001:0db8:85a3:0000:0000:8a2e:0370:7334', + CNAME: 'stage.example.com', + MX: 'mail.example.com', + TXT: 'v=spf1 include:_spf.example.com ~all', + NS: 'ns1.example.com', + SRV: '10 5 8080 example.com', + CAA: '0 issue "letsencrypt.org"', + HTTPS: 'https://example.com', + ALIAS: 'www.example.com' + }; + $: placeholder = placeholders[record.type] ?? 'Enter value'; + async function handleSubmit() { try { - switch (record.type) { - case 'A': - await sdk.forConsole.domains.updateRecordA( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.comment - ); - - break; - case 'AAAA': - await sdk.forConsole.domains.updateRecordAAAA( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.comment - ); - - break; - case 'CNAME': - await sdk.forConsole.domains.updateRecordCNAME( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.comment - ); - - break; - case 'MX': - await sdk.forConsole.domains.updateRecordMX( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.priority, - record.comment - ); - - break; - case 'TXT': - await sdk.forConsole.domains.updateRecordTXT( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.comment - ); - - break; - case 'NS': - await sdk.forConsole.domains.updateRecordNS( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.comment - ); - - break; - - case 'CAA': - await sdk.forConsole.domains.updateRecordCAA( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.comment - ); - - break; - case 'HTTPS': - await sdk.forConsole.domains.updateRecordHTTPS( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.comment - ); - - break; - case 'ALIAS': - await sdk.forConsole.domains.updateRecordAlias( - page.params.domain, - record.$id, - record.name, - record.value, - record.ttl, - record.comment - ); - - break; - - default: - break; - } + await updateRecord(record, page.params.domain); show = false; invalidate(Dependencies.DOMAINS); addNotification({ @@ -173,7 +84,7 @@ - + @@ -191,19 +102,21 @@ - - - - - Sets the priority for this DNS record. Lower numbers indicate higher - priority (e.g., 10 is higher than 20). - - - + {#if showPriority(record)} + + + + + Sets the priority for this DNS record. Lower numbers indicate higher + priority (e.g., 10 is higher than 20). + + + + {/if} + nullable={!attribute.required} /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte index dbdb5ec41..6b9c32b08 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -25,6 +25,7 @@ FloatingActionBar, Typography } from '@appwrite.io/pink-svelte'; + import { toLocaleDateTime } from '$lib/helpers/date'; import DualTimeView from '$lib/components/dualTimeView.svelte'; export let data: PageData; @@ -244,17 +245,23 @@ {/if} {:else} {@const formatted = formatColumn(document[id])} - - - {formatted.value} - - - {formatted.whole} - - + {@const isDatetimeAttribute = attr.type === 'datetime'} + {#if isDatetimeAttribute} + + Timestamp + {toLocaleDateTime(formatted.whole, true, 'UTC')} + + {:else} + + {formatted.value} + + {formatted.whole} + + + {/if} {/if} {/each} diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte index 2c931b0a9..3af8bb2e4 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte @@ -18,7 +18,7 @@ import { ConnectRepoModal } from '$lib/components/git/index.js'; import { isValueOfStringEnum } from '$lib/helpers/types.js'; import { isCloud } from '$lib/system'; - import { project, regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { getApexDomain } from '$lib/helpers/tlds'; const routeBase = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/domains`; @@ -72,7 +72,7 @@ } else if (behaviour === 'REDIRECT') { rule = await sdk .forProject(page.params.region, page.params.project) - .proxy.createRedirectRule(domainName, $regionalProtocol + redirect, statusCode); + .proxy.createRedirectRule(domainName, redirect, statusCode); } else if (behaviour === 'ACTIVE') { rule = await sdk .forProject(page.params.region, page.params.project) diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte index 3c37a0a7e..ac89f191a 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createAndroid.svelte @@ -57,10 +57,8 @@ const val APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page. trackEvent(Submit.PlatformCreate, { type: 'android' }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte index 9c603e342..20a0f1c25 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createApple.svelte @@ -4,6 +4,7 @@ import { createPlatform } from './wizard/store'; import { Dependencies } from '$lib/constants'; import { + Card as Pink2Card, Code, Layout, Icon, @@ -26,7 +27,6 @@ import { PlatformType } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; import { app } from '$lib/stores/app'; - import { LabelCard } from '$lib/components'; let showExitModal = false; let isPlatformCreated = false; @@ -68,10 +68,8 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj trackEvent(Submit.PlatformCreate, { type: platform }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -108,20 +106,18 @@ APPWRITE_PUBLIC_ENDPOINT: "${sdk.forProject(page.params.region, page.params.proj
- + {#each Object.entries(platforms) as [key, value]} -
- - -
+ {/each} - + {#if !isPlatformCreated} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte index 311f4ebe5..59460df7e 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createFlutter.svelte @@ -4,6 +4,7 @@ import { createPlatform } from './wizard/store'; import { Dependencies } from '$lib/constants'; import { + Card as Pink2Card, Code, Layout, Icon, @@ -25,7 +26,6 @@ import OnboardingPlatformCard from './components/OnboardingPlatformCard.svelte'; import { PlatformType } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; - import { LabelCard } from '$lib/components'; let showExitModal = false; let isPlatformCreated = false; @@ -125,10 +125,8 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg type: platform }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -165,19 +163,18 @@ static const String APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.reg - + {#each Object.entries(platforms) as [key, value]} -
- - -
+ {/each} - + {#if !isPlatformCreated} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte index a37b3a5e6..d8b01e0eb 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createReactNative.svelte @@ -4,6 +4,7 @@ import { createPlatform } from './wizard/store'; import { Dependencies } from '$lib/constants'; import { + Card as Pink2Card, Code, Layout, Icon, @@ -25,10 +26,9 @@ import OnboardingPlatformCard from './components/OnboardingPlatformCard.svelte'; import { PlatformType } from '@appwrite.io/console'; import { isCloud } from '$lib/system'; - import { LabelCard } from '$lib/components'; let showExitModal = false; - export let isPlatformCreated = false; + let isPlatformCreated = false; let isCreatingPlatform = false; let connectionSuccessful = false; const projectId = page.params.project; @@ -94,10 +94,9 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para trackEvent(Submit.PlatformCreate, { type: platform }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -136,16 +135,14 @@ const APPWRITE_PUBLIC_ENDPOINT = "${sdk.forProject(page.params.region, page.para {#each Object.entries(platforms) as [key, value]} -
- - -
+ {/each} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte index 1748c3977..bb675c7a9 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/createWeb.svelte @@ -11,10 +11,9 @@ Fieldset, InlineCode, Card, - Button, Tooltip } from '@appwrite.io/pink-svelte'; - import { Form, InputText } from '$lib/elements/forms'; + import { Button, Form, InputText } from '$lib/elements/forms'; import { IconVue, IconAppwrite, @@ -166,10 +165,8 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p type: platform }); - await Promise.all([ - invalidate(Dependencies.PROJECT), - invalidate(Dependencies.PLATFORMS) - ]); + invalidate(Dependencies.PROJECT); + invalidate(Dependencies.PLATFORMS); } catch (error) { trackError(error, Submit.PlatformCreate); addNotification({ @@ -223,10 +220,10 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p
{#if isChangingFramework} - (isChangingFramework = false)}> - Save + Save {/if} @@ -249,8 +246,7 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p Create platform {/if} {:else} @@ -264,12 +260,12 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p {selectedFramework.label} - { isChangingFramework = true; - }}>Change + }}>Change {/if} @@ -338,15 +334,15 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p color="--fgcolor-neutral-primary"> Demo app runs on http://localhost:{selectedFramework.portNumber} - Open {/if} @@ -394,10 +390,12 @@ ${prefix}APPWRITE_ENDPOINT = "${sdk.forProject(page.params.region, page.params.p {#if isPlatformCreated} - Go to dashboard + disabled={isCreatingPlatform}>Go to dashboard {/if} diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/+page.svelte index a933b669f..be8278543 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.svelte @@ -11,14 +11,12 @@ import { isServiceLimited } from '$lib/stores/billing'; import { organization } from '$lib/stores/organization'; import { canWriteSites } from '$lib/stores/roles.js'; - import { Card, Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; + import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { Button } from '$lib/elements/forms'; import { app } from '$lib/stores/app'; import CreateSiteModal from './createSiteModal.svelte'; import EmptyLight from './(images)/empty-sites-light.svg'; import EmptyDark from './(images)/empty-sites-dark.svg'; - import EmptyLightMobile from './(images)/empty-sites-light-mobile.svg'; - import EmptyDarkMobile from './(images)/empty-sites-dark-mobile.svg'; import Grid from './grid.svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; import { columns } from './store'; @@ -28,15 +26,10 @@ import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; - import { APPWRITE_OFFICIALS_ORG, isCloud } from '$lib/system'; - import { addNotification } from '$lib/stores/notifications'; - import { isOnWaitlistSites, joinWaitlistSites } from '$lib/helpers/waitlist'; - import { isSmallViewport } from '$lib/stores/viewport'; export let data; let show = false; - let isOnWaitlist = isOnWaitlistSites(); $: $registerCommands([ { @@ -46,7 +39,6 @@ }, keys: ['c'], disabled: - !showSites || isServiceLimited('sites', $organization?.billingPlan, data.siteList?.total) || !$canWriteSites, icon: IconPlus, @@ -63,123 +55,46 @@ } }); }); - - /** - * Controls visibility of Sites feature: - * - Shown if running on self-hosted - * - Shown on cloud only if the organization is Appwrite's. - * - Hidden on cloud for any non-Appwrite organization. - */ - $: showSites = !isCloud || $organization.$id === APPWRITE_OFFICIALS_ORG; - - $: isDark = $app.themeInUse === 'dark'; - - $: imgSrc = isDark - ? $isSmallViewport - ? EmptyDarkMobile - : EmptyDark - : $isSmallViewport - ? EmptyLightMobile - : EmptyLight; - - $: imgClass = $isSmallViewport ? 'mobile' : 'desktop'; - - function addToWaitlist() { - joinWaitlistSites(); - addNotification({ - type: 'success', - title: 'Waitlist joined', - message: "We'll let you know as soon as Appwrite Sites is ready for you." - }); - - isOnWaitlist = true; - } - {#if showSites} - - - - - - - {#if $canWriteSites} - - {/if} - + + + - {#if data.siteList.total} - {#if data.view === View.Grid} - - {:else} - + + + {#if $canWriteSites} + {/if} - - {:else if data.search} - + + + {#if data.siteList.total} + {#if data.view === View.Grid} + {:else} - (show = true)}> - +
{/if} + + {:else if data.search} + {:else} - - - - - - {#if isOnWaitlist} - - You've successfully joined the Sites waitlist - - - - We can't wait for you to try out Sites on Cloud. You will get access - soon. - - {:else} - - - Appwrite Sites is in high demand - - -
- - To ensure a smooth experience for everyone, we’re rolling out - access gradually. Join the waitlist and be one of the first to - deploy with Sites. - -
- -
- -
- - {/if} - - - + (show = true)}> + {/if} diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/+page.ts index afaf7b02d..62eeb026a 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.ts @@ -2,15 +2,8 @@ import { Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; -import { APPWRITE_OFFICIALS_ORG, isCloud } from '$lib/system'; - -export const load = async ({ url, depends, route, params, parent }) => { - // don't load anything on cloud unless org is appwrite atm! - const { organization } = await parent(); - if (isCloud && organization?.$id !== APPWRITE_OFFICIALS_ORG) { - return; - } +export const load = async ({ url, depends, route, params }) => { depends(Dependencies.SITES); const page = getPage(url); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts index 5ac8edfa3..491697969 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts @@ -2,17 +2,9 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; -import { error, redirect } from '@sveltejs/kit'; -import { APPWRITE_OFFICIALS_ORG, isCloud } from '$lib/system'; -import { base } from '$app/paths'; - -export const load = async ({ depends, params, parent }) => { - // don't load anything on cloud unless org is appwrite atm! - const { organization } = await parent(); - if (isCloud && organization?.$id !== APPWRITE_OFFICIALS_ORG) { - redirect(307, `${base}/project-${params.region}-${params.project}/sites`); - } +import { error } from '@sveltejs/kit'; +export const load = async ({ depends, params }) => { depends(Dependencies.SITE); try { const [site] = await Promise.all([ diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts index 88ec63f09..ebe497444 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts @@ -27,12 +27,17 @@ export const load = async ({ params, depends, url, route }) => { .proxy.listRules( [ Query.or([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('type', RuleType.REDIRECT) + Query.and([ + Query.equal('type', RuleType.REDIRECT), + Query.equal('trigger', RuleTrigger.MANUAL) + ]), + Query.and([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('trigger', RuleTrigger.MANUAL), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', params.site) + ]) ]), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', params.site), - Query.equal('trigger', RuleTrigger.MANUAL), Query.limit(limit), Query.offset(offset), Query.orderDesc(''), diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte index 0bb99fee4..ea8388747 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte @@ -22,7 +22,7 @@ import { writable } from 'svelte/store'; import { onMount } from 'svelte'; import { ConnectRepoModal } from '$lib/components/git/index.js'; - import { project, regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { isCloud } from '$lib/system'; import { getApexDomain } from '$lib/helpers/tlds'; @@ -76,7 +76,7 @@ } else if (behaviour === 'REDIRECT') { rule = await sdk .forProject(page.params.region, page.params.project) - .proxy.createRedirectRule(domainName, $regionalProtocol + redirect, statusCode); + .proxy.createRedirectRule(domainName, redirect, statusCode); } else if (behaviour === 'ACTIVE') { rule = await sdk .forProject(page.params.region, page.params.project)