diff --git a/src/app.d.ts b/src/app.d.ts index b1bfd97..e132525 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -10,10 +10,10 @@ declare global { errorId: string; } interface Locals { - user: User | null; + user?: User; } interface PageData { - user: User | null; + user?: User; } // interface Platform {} } diff --git a/src/hooks.server.ts b/src/hooks.server.ts index 8814496..9bb6600 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -9,7 +9,7 @@ export const handle: Handle = async ({ event, resolve }) => { const session = event.cookies.get('session'); if (!session) { - event.locals.user = null; + event.locals.user = undefined; return resolve(event); } @@ -20,7 +20,7 @@ export const handle: Handle = async ({ event, resolve }) => { }); if (!res.ok) { - event.locals.user = null; + event.locals.user = undefined; event.cookies.delete('session', { path: '/' }); return resolve(event); } @@ -41,7 +41,7 @@ export const handleFetch: HandleFetch = async ({ request, fetch, event: { cookie request = new Request(request, { headers: { - ...request.headers, + ...Object.fromEntries(request.headers), Authorization: `Bearer ${session}` }, }); diff --git a/src/lib/components/copy-code-button.svelte b/src/lib/components/copy-code-button.svelte index b62b7ad..c67405d 100644 --- a/src/lib/components/copy-code-button.svelte +++ b/src/lib/components/copy-code-button.svelte @@ -1,5 +1,6 @@
-

+

{puzzle.name} ({puzzle.scoreMax} points) -

+
{@html puzzle.content} @@ -110,7 +110,7 @@
diff --git a/tailwind.config.js b/tailwind.config.js index 9bb9b1e..0f14be3 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -4,7 +4,7 @@ import { fontFamily } from "tailwindcss/defaultTheme"; const config = { darkMode: ["class"], content: ["./src/**/*.{html,js,svelte,ts}"], - safelist: ["dark"], + safelist: ["dark"], theme: { container: { center: true, @@ -67,6 +67,10 @@ const config = { hoverOnlyWhenSupported: true } }, + plugins: [ + require('@tailwindcss/typography'), + require('@tailwindcss/forms'), + ], }; export default config;