From 125ec1e85f0e6c8753e8930c55c320448cb723f7 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 15 Feb 2023 13:09:28 -0600 Subject: [PATCH] fix(web): using serverApi on the client request lead to uncaught error (#1767) --- web/src/routes/+layout.server.ts | 2 +- web/src/routes/{+page.ts => +page.server.ts} | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename web/src/routes/{+page.ts => +page.server.ts} (81%) diff --git a/web/src/routes/+layout.server.ts b/web/src/routes/+layout.server.ts index 9145337f0b..331627e26e 100644 --- a/web/src/routes/+layout.server.ts +++ b/web/src/routes/+layout.server.ts @@ -21,7 +21,7 @@ export const load: LayoutServerLoad = async ({ request }) => { user: userInfo }; } catch (e) { - console.error('[ERROR] layout.server.ts [LayoutServerLoad]: ', e); + console.error('[ERROR] layout.server.ts [LayoutServerLoad]: '); return { user: undefined }; diff --git a/web/src/routes/+page.ts b/web/src/routes/+page.server.ts similarity index 81% rename from web/src/routes/+page.ts rename to web/src/routes/+page.server.ts index 5d95f568b6..df6b3ceb5f 100644 --- a/web/src/routes/+page.ts +++ b/web/src/routes/+page.server.ts @@ -1,15 +1,16 @@ export const prerender = false; import { serverApi } from '@api'; import { redirect } from '@sveltejs/kit'; -import type { PageLoad } from './$types'; +import type { PageServerLoad } from './$types'; -export const load: PageLoad = async ({ parent }) => { +export const load: PageServerLoad = async ({ parent }) => { const { user } = await parent(); if (user) { throw redirect(302, '/photos'); } const { data } = await serverApi.userApi.getUserCount(true); + if (data.userCount > 0) { // Redirect to login page if an admin is already registered. throw redirect(302, '/auth/login');