From fadf1f41762e4b068d09757c653e23e0a89d638b Mon Sep 17 00:00:00 2001 From: glazk0 <43091603+glazk0@users.noreply.github.com> Date: Thu, 4 Apr 2024 17:10:43 +0200 Subject: [PATCH 1/5] Added createdAt to logs --- src/routes/(app)/admin/logs/+page.svelte | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/routes/(app)/admin/logs/+page.svelte b/src/routes/(app)/admin/logs/+page.svelte index 67ad36a..e4022bd 100644 --- a/src/routes/(app)/admin/logs/+page.svelte +++ b/src/routes/(app)/admin/logs/+page.svelte @@ -18,6 +18,7 @@ logged: boolean; type: string; pseudo?: string; + createdAt: Date; }; const stateStore = createStateStore(); @@ -31,7 +32,10 @@ (acc, log) => { const key = log.pseudo || 'Unknown'; if (!acc[key]) acc[key] = []; - acc[key].unshift(log); + acc[key].unshift({ + ...log, + createdAt: new Date() + }); return acc; }, {} as Record @@ -104,6 +108,11 @@ Pseudo: {log.pseudo}

{/if} +

+ Date: + + {log.createdAt.toLocaleString()} + {/each} From 15418137924ef42db1fe2ec9fe6ee716afe3983e Mon Sep 17 00:00:00 2001 From: glazk0 <43091603+glazk0@users.noreply.github.com> Date: Sat, 6 Apr 2024 01:00:28 +0200 Subject: [PATCH 2/5] refactor: User types --- src/app.d.ts | 4 ++-- src/hooks.server.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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}` }, }); From af5e5c2c2c4ccd0efe87288438b1ae27fb6c7509 Mon Sep 17 00:00:00 2001 From: glazk0 <43091603+glazk0@users.noreply.github.com> Date: Sat, 6 Apr 2024 01:01:35 +0200 Subject: [PATCH 3/5] refactor: icons --- .../components/layout/mobile-nav/mobile-nav-link.svelte | 2 +- src/lib/components/layout/mobile-nav/mobile-nav.svelte | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/components/layout/mobile-nav/mobile-nav-link.svelte b/src/lib/components/layout/mobile-nav/mobile-nav-link.svelte index ab95c86..33eba94 100644 --- a/src/lib/components/layout/mobile-nav/mobile-nav-link.svelte +++ b/src/lib/components/layout/mobile-nav/mobile-nav-link.svelte @@ -1,5 +1,5 @@

-

+

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

+
{@html puzzle.content} 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;