diff --git a/frontend/package.json b/frontend/package.json index e41ba33..be4a5bc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,6 +12,9 @@ "format": "prettier --write ." }, "devDependencies": { + "@event-calendar/core": "^3.7.1", + "@event-calendar/day-grid": "^3.7.1", + "@event-calendar/time-grid": "^3.7.1", "@iconify-json/mdi": "^1.1.67", "@sveltejs/adapter-auto": "^3.2.2", "@sveltejs/adapter-node": "^5.2.0", diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 4fa546f..ec7917f 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -18,6 +18,15 @@ importers: specifier: ^0.9.8 version: 0.9.8(svelte@4.2.19) devDependencies: + '@event-calendar/core': + specifier: ^3.7.1 + version: 3.7.1 + '@event-calendar/day-grid': + specifier: ^3.7.1 + version: 3.7.1 + '@event-calendar/time-grid': + specifier: ^3.7.1 + version: 3.7.1 '@iconify-json/mdi': specifier: ^1.1.67 version: 1.1.67 @@ -374,6 +383,15 @@ packages: cpu: [x64] os: [win32] + '@event-calendar/core@3.7.1': + resolution: {integrity: sha512-S5D4arG7b47uhXmcT/rC7FT3UO9+KB+QhDuhfOzDgKCpAFlEBU1wt1UoHmPTbGy3J+yVMR+rmcresYUvM44+pA==} + + '@event-calendar/day-grid@3.7.1': + resolution: {integrity: sha512-kwmadkhUxtQDv+0azMkePrmilFp5dljWLHsluHl1uepfJa1yXlrvFy3GMFnYuPo2Gva0MV+HnU/GMqVG8vIcWw==} + + '@event-calendar/time-grid@3.7.1': + resolution: {integrity: sha512-kPC4+XhFcSoNSnYG0TSQeGylpvrbFF1g+cTcFFIW6qH3wPIeBBCo0fRuD4Tr5/q4ewZQ5lNrCkZXOpZxHJxOfw==} + '@formatjs/ecma402-abstract@2.2.1': resolution: {integrity: sha512-O4ywpkdJybrjFc9zyL8qK5aklleIAi5O4nYhBVJaOFtCkNrnU+lKFeJOFC48zpsZQmR8Aok2V79hGpHnzbmFpg==} @@ -2167,6 +2185,20 @@ snapshots: '@esbuild/win32-x64@0.21.5': optional: true + '@event-calendar/core@3.7.1': + dependencies: + svelte: 4.2.19 + + '@event-calendar/day-grid@3.7.1': + dependencies: + '@event-calendar/core': 3.7.1 + svelte: 4.2.19 + + '@event-calendar/time-grid@3.7.1': + dependencies: + '@event-calendar/core': 3.7.1 + svelte: 4.2.19 + '@formatjs/ecma402-abstract@2.2.1': dependencies: '@formatjs/fast-memoize': 2.2.2 diff --git a/frontend/src/hooks.server.ts b/frontend/src/hooks.server.ts index cbd152f..98830a8 100644 --- a/frontend/src/hooks.server.ts +++ b/frontend/src/hooks.server.ts @@ -5,17 +5,12 @@ const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL']; export const authHook: Handle = async ({ event, resolve }) => { try { let sessionid = event.cookies.get('sessionid'); - console.log('sessionid:', sessionid); if (!sessionid) { - console.log('No sessionid cookie'); event.locals.user = null; return await resolve(event); } - // print all cookies in the request - console.log('Cookies:', event.request.headers.get('cookie')); - const serverEndpoint = PUBLIC_SERVER_URL || 'http://localhost:8000'; const cookie = event.request.headers.get('cookie') || ''; @@ -37,8 +32,6 @@ export const authHook: Handle = async ({ event, resolve }) => { event.locals.user = user; const setCookieHeader = userFetch.headers.get('Set-Cookie'); - console.log('setCookieHeader:', setCookieHeader); - if (setCookieHeader) { // Regular expression to match sessionid cookie and its expiry const sessionIdRegex = /sessionid=([^;]+).*?expires=([^;]+)/; @@ -49,9 +42,6 @@ export const authHook: Handle = async ({ event, resolve }) => { const expiryString = match[2]; const expiryDate = new Date(expiryString); - console.log('Session ID:', sessionId); - console.log('Expiry Date:', expiryDate); - // Set the sessionid cookie event.cookies.set('sessionid', sessionId, { path: '/', diff --git a/frontend/src/lib/components/AdventureCard.svelte b/frontend/src/lib/components/AdventureCard.svelte index ef0f1f1..da80e43 100644 --- a/frontend/src/lib/components/AdventureCard.svelte +++ b/frontend/src/lib/components/AdventureCard.svelte @@ -19,9 +19,10 @@ import CardCarousel from './CardCarousel.svelte'; import { t } from 'svelte-i18n'; - export let type: string; + export let type: string | null = null; export let user: User | null; export let collection: Collection | null = null; + export let readOnly: boolean = false; let isCollectionModalOpen: boolean = false; let isWarningModalOpen: boolean = false; @@ -164,61 +165,67 @@ {/each} {/if} -