diff --git a/src/routes/(console)/(redirects)/members/+page.ts b/src/routes/(console)/(redirects)/members/+page.ts index 41c097628..d0dd5f0e5 100644 --- a/src/routes/(console)/(redirects)/members/+page.ts +++ b/src/routes/(console)/(redirects)/members/+page.ts @@ -1,5 +1,5 @@ import { redirect } from '@sveltejs/kit'; -import { base } from '$app/paths'; +import { resolve } from '$app/paths'; import type { PageLoad } from './$types'; import { resolvedProfile } from '$lib/profiles/index.svelte'; @@ -9,7 +9,12 @@ export const load: PageLoad = async ({ parent }) => { const teamId = account.prefs[resolvedProfile.organizationPrefKey] ?? organizations.teams[0]?.$id; if (teamId) { - redirect(303, `${base}/organization-${teamId}/members`); + redirect( + 303, + resolve('/(console)/organization-[organization]/members', { + organization: teamId + }) + ); } - redirect(303, base); + redirect(303, resolve('/')); }; diff --git a/src/routes/(console)/(redirects)/template/[region]-[template]/+page.ts b/src/routes/(console)/(redirects)/template/[region]-[template]/+page.ts new file mode 100644 index 000000000..b82fcb5ba --- /dev/null +++ b/src/routes/(console)/(redirects)/template/[region]-[template]/+page.ts @@ -0,0 +1,25 @@ +import { redirect } from '@sveltejs/kit'; +import { resolve } from '$app/paths'; +import type { PageLoad } from './$types'; +import { resolvedProfile } from '$lib/profiles/index.svelte'; + +export const load: PageLoad = async ({ parent, params }) => { + const { organizations, account } = await parent(); + + const teamId = + account.prefs[resolvedProfile.organizationPrefKey] ?? organizations.teams[0]?.$id; + if (teamId) { + redirect( + 303, + resolve( + '/(console)/organization-[organization]/(studio)/template-[region]-[template]', + { + organization: teamId, + template: params.template, + region: params.region + } + ) + ); + } + redirect(303, resolve('/')); +}; diff --git a/src/routes/(console)/organization-[organization]/(studio)/template-[region]-[template]/+page.svelte b/src/routes/(console)/organization-[organization]/(studio)/template-[region]-[template]/+page.svelte new file mode 100644 index 000000000..662b8e6e2 --- /dev/null +++ b/src/routes/(console)/organization-[organization]/(studio)/template-[region]-[template]/+page.svelte @@ -0,0 +1,53 @@ + + + + Template - {resolvedProfile.platform} + + +
+ + diff --git a/src/routes/(console)/project-[region]-[project]/(studio)/studio/+page.svelte b/src/routes/(console)/project-[region]-[project]/(studio)/studio/+page.svelte index 3c8cbe8b4..b53b8e44e 100644 --- a/src/routes/(console)/project-[region]-[project]/(studio)/studio/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/(studio)/studio/+page.svelte @@ -6,10 +6,11 @@ hideStudio, navigateToRoute } from '$lib/studio/studio-widget'; - import { page } from '$app/state'; import { getPageTitle } from '../../store'; import { resolvedProfile } from '$lib/profiles/index.svelte'; + import type { PageProps } from './$types'; + let { params, data }: PageProps = $props(); let anchor: HTMLElement = $state(); function positionStudio() { @@ -24,8 +25,8 @@ navigateToRoute({ id: 'project', props: { - projectId: page.params.project, - region: page.params.region + projectId: params.project, + region: params.region } }); }); @@ -40,7 +41,7 @@ - {getPageTitle(page.data?.project?.name, 'Studio', resolvedProfile.platform)} + {getPageTitle(data.project.name, 'Studio', resolvedProfile.platform)}