Browse Source

fix(web): using serverApi on the client request lead to uncaught error (#1767)

Alex 2 years ago
parent
commit
125ec1e85f
2 changed files with 4 additions and 3 deletions
  1. 1 1
      web/src/routes/+layout.server.ts
  2. 3 2
      web/src/routes/+page.server.ts

+ 1 - 1
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
 		};

+ 3 - 2
web/src/routes/+page.ts → 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');