From d3fddf34d9e3c6062e1e1723bcf922b4591c5a65 Mon Sep 17 00:00:00 2001
From: Vargha Csongor <Culisa1023@gmail.com>
Date: Thu, 1 May 2025 16:21:17 +0200
Subject: [PATCH] fix logout and modal size

---
 apps/app/src/lib/profile/Modal.svelte                  |  2 +-
 apps/app/src/lib/profile/create/Modal.svelte           |  6 ++----
 .../src/routes/login/google/callback/+page.server.ts   | 10 +++++++++-
 .../src/routes/logout/{+server.ts => +page.server.ts}  |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)
 rename apps/app/src/routes/logout/{+server.ts => +page.server.ts} (89%)

diff --git a/apps/app/src/lib/profile/Modal.svelte b/apps/app/src/lib/profile/Modal.svelte
index cca6db7..3eb13a2 100644
--- a/apps/app/src/lib/profile/Modal.svelte
+++ b/apps/app/src/lib/profile/Modal.svelte
@@ -84,7 +84,7 @@
 </script>
 
 <div class="modal modal-open" transition:fade>
-	<div class="modal-box max-h-screen w-full max-w-5xl overflow-y-auto">
+	<div class="modal-box max-h-screen w-full max-h-80 max-w-5xl overflow-y-auto">
 		<div class="bg-base-100 sticky top-0 z-7">
 			<ModalButtons {editorMode} onClose={close} onSave={save} onToggleEdit={toggleEdit} />
 			<div class="divider"></div>
diff --git a/apps/app/src/lib/profile/create/Modal.svelte b/apps/app/src/lib/profile/create/Modal.svelte
index 2804304..ac67886 100644
--- a/apps/app/src/lib/profile/create/Modal.svelte
+++ b/apps/app/src/lib/profile/create/Modal.svelte
@@ -203,10 +203,8 @@
 	});
 </script>
 
-<div class="modal modal-open" transition:fade>
-	<div
-		class="modal-box flex max-h-screen w-full max-w-5xl flex-col items-center justify-center overflow-y-auto"
-	>
+<div class="modal modal-open max-h-screen" transition:fade>
+	<div class="modal-box flex w-full max-w-5xl flex-col items-center justify-center overflow-y-auto">
 		<div class="flex w-full max-w-5xl items-center justify-between p-2">
 			<h3 class="text-left text-lg font-bold">{create_relationship_and_person()}</h3>
 			<div>
diff --git a/apps/app/src/routes/login/google/callback/+page.server.ts b/apps/app/src/routes/login/google/callback/+page.server.ts
index e6fbee0..623da3b 100644
--- a/apps/app/src/routes/login/google/callback/+page.server.ts
+++ b/apps/app/src/routes/login/google/callback/+page.server.ts
@@ -74,7 +74,7 @@ export const load: PageServerLoad = async (event: RequestEvent) => {
 	});
 
 	if (response.response.status === 200) {
-		if (response.data?.Id) {
+		if (response.data?.Id !== undefined) {
 			if (!event.platform || !event.platform.env || !event.platform.env.GH_SESSIONS) {
 				return error(500, {
 					message: 'Server configuration error. GH_SESSIONS KeyValue store missing'
@@ -93,6 +93,14 @@ export const load: PageServerLoad = async (event: RequestEvent) => {
 				});
 			}
 
+			event.cookies.delete('already_loaded', {
+				path: '/login/google/callback',
+				sameSite: 'lax',
+				httpOnly: true,
+				maxAge: 0,
+				secure: import.meta.env.PROD
+			});
+
 			setSessionTokenCookie(event, sessionToken, session.expiresAt);
 
 			return redirect(302, '/');
diff --git a/apps/app/src/routes/logout/+server.ts b/apps/app/src/routes/logout/+page.server.ts
similarity index 89%
rename from apps/app/src/routes/logout/+server.ts
rename to apps/app/src/routes/logout/+page.server.ts
index e7bf2e5..b3d5f03 100644
--- a/apps/app/src/routes/logout/+server.ts
+++ b/apps/app/src/routes/logout/+page.server.ts
@@ -3,7 +3,7 @@ import { invalidateSession, deleteSessionTokenCookie } from '$lib/server/session
 
 import type { RequestEvent } from './$types';
 
-export async function GET(event: RequestEvent): Promise<Response> {
+export async function load(event: RequestEvent): Promise<Response> {
 	if (event.locals.session === null) {
 		return redirect(302, '/login');
 	}