Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-06-01 20:54:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix theme error on ssr

Browse Source
This commit is contained in:
Zoe Roux 2024-03-17 23:16:55 +01:00
parent b6d122e449
commit 64031668c1
No known key found for this signature in database
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
front/apps/web/src/pages/_app.tsx
View File

@ -210,6 +210,7 @@ App.getInitialProps = async (ctx: AppContext) => {
if (typeof window !== "undefined") return { pageProps: superjson.serialize(appProps.pageProps) }; if (typeof window !== "undefined") return { pageProps: superjson.serialize(appProps.pageProps) };
try {
const getUrl = Component.getFetchUrls; const getUrl = Component.getFetchUrls;
const getLayoutUrl = const getLayoutUrl =
Component.getLayout && "Layout" in Component.getLayout Component.getLayout && "Layout" in Component.getLayout
@ -240,7 +241,9 @@ App.getInitialProps = async (ctx: AppContext) => {
} }
} }
appProps.pageProps.theme = readCookie(ctx.ctx.req?.headers.cookie, "theme") ?? "auto"; appProps.pageProps.theme = readCookie(ctx.ctx.req?.headers.cookie, "theme") ?? "auto";
} catch (e) {
console.error("SSR error, disabling it.");
}
return { pageProps: superjson.serialize(appProps.pageProps) }; return { pageProps: superjson.serialize(appProps.pageProps) };
}; };

3
front/packages/models/src/account-internal.ts
View File

@ -62,8 +62,7 @@ export const readCookie = <T extends ZodTypeAny>(
} }
if (c.indexOf(name) == 0) { if (c.indexOf(name) == 0) {
const str = c.substring(name.length, c.length); const str = c.substring(name.length, c.length);
const ret = JSON.parse(str); return parser ? parser.parse(JSON.parse(str)) : str;
return parser ? parser.parse(ret) : ret;
} }
} }
return null; return null;