From f28c9ad38d2102b589903f138ea03f03ca5507e9 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 11 Jan 2024 09:06:40 -0800 Subject: refactor(routes): move shortcuts to hooks --- src/hooks.server.ts | 24 +++++++++++++++++++++++- src/routes/birthdays/+server.ts | 12 ------------ src/routes/wrapped/+server.ts | 11 ----------- 3 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 src/routes/birthdays/+server.ts delete mode 100644 src/routes/wrapped/+server.ts (limited to 'src') diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 48fc1f1b..d0f09b6e 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -1,4 +1,19 @@ -import type { Handle } from '@sveltejs/kit'; +import root from '$lib/Utility/root'; +import type { Handle, RequestEvent } from '@sveltejs/kit'; + +const redirectWithParameters = ( + event: RequestEvent>, string | null>, + path: string +) => { + return Response.redirect( + root( + `${path}${ + event.url.searchParams.toString().length > 0 ? `?${event.url.searchParams.toString()}` : '' + }` + ), + 307 + ); +}; export const handle: Handle = async ({ event, resolve }) => { const { cookies } = event; @@ -15,5 +30,12 @@ export const handle: Handle = async ({ event, resolve }) => { }; } + switch (event.url.pathname) { + case '/birthdays': + return redirectWithParameters(event, '/tools/birthdays'); + case '/wrapped': + return redirectWithParameters(event, '/tools/wrapped'); + } + return await resolve(event); }; diff --git a/src/routes/birthdays/+server.ts b/src/routes/birthdays/+server.ts deleted file mode 100644 index e20d6c8a..00000000 --- a/src/routes/birthdays/+server.ts +++ /dev/null @@ -1,12 +0,0 @@ -import root from '$lib/Utility/root.js'; - -export const GET = ({ url }) => { - return Response.redirect( - root( - `/tools/birthdays${ - url.searchParams.toString().length > 0 ? `?${url.searchParams.toString()}` : '' - }` - ), - 307 - ); -}; diff --git a/src/routes/wrapped/+server.ts b/src/routes/wrapped/+server.ts deleted file mode 100644 index e9c8c8d2..00000000 --- a/src/routes/wrapped/+server.ts +++ /dev/null @@ -1,11 +0,0 @@ -import root from '$lib/Utility/root.js'; - -export const GET = ({ url }) => - Response.redirect( - root( - `/tools/wrapped${ - url.searchParams.toString().length > 0 ? `&${url.searchParams.toString()}` : '' - }` - ), - 307 - ); -- cgit v1.2.3