Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-05-24 01:12:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex 2023-02-15 13:09:28 -06:00 committed by GitHub
parent d31b35873f
commit 125ec1e85f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/routes/+layout.server.ts
View File

@ -21,7 +21,7 @@ export const load: LayoutServerLoad = async ({ request }) => {
user: userInfo user: userInfo
}; };
} catch (e) { } catch (e) {
console.error('[ERROR] layout.server.ts [LayoutServerLoad]: ', e); console.error('[ERROR] layout.server.ts [LayoutServerLoad]: ');
return { return {
user: undefined user: undefined
}; };

5
web/src/routes/+page.ts → web/src/routes/+page.server.ts
View File

@ -1,15 +1,16 @@
export const prerender = false; export const prerender = false;
import { serverApi } from '@api'; import { serverApi } from '@api';
import { redirect } from '@sveltejs/kit'; 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(); const { user } = await parent();
if (user) { if (user) {
throw redirect(302, '/photos'); throw redirect(302, '/photos');
} }
const { data } = await serverApi.userApi.getUserCount(true); const { data } = await serverApi.userApi.getUserCount(true);
if (data.userCount > 0) { if (data.userCount > 0) {
// Redirect to login page if an admin is already registered. // Redirect to login page if an admin is already registered.
throw redirect(302, '/auth/login'); throw redirect(302, '/auth/login');