Login button sends you directly to login page (#501)

* Login button sends you directly to login page.

* use _parent for target

src/lib/components/LoginModal.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { browser } from "$app/environment";
 	import { base } from "$app/paths";
 	import { page } from "$app/stores";
 	import { PUBLIC_APP_DATA_SHARING, PUBLIC_APP_NAME, PUBLIC_VERSION } from "$env/static/public";
@@ -8,8 +7,6 @@
 	import type { LayoutData } from "../../routes/$types";
 	import Logo from "./icons/Logo.svelte";
 	export let settings: LayoutData["settings"];
-
-	const isIframe = browser && window.self !== window.parent;
 </script>
 
 <Modal>
@@ -45,7 +42,7 @@
 		{/if}
 		<form
 			action="{base}/{$page.data.requiresLogin ? 'login' : 'settings'}"
-			target={isIframe ? "_blank" : ""}
+			target="_parent"
 			method="POST"
 			class="flex w-full flex-col items-center gap-2"
 		>

src/lib/components/NavMenu.svelte

@@ -21,8 +21,6 @@
 
 	export let canLogin: boolean;
 	export let user: LayoutData["user"];
-
-	export let loginModalVisible;
 </script>
 
 <div class="sticky top-0 flex flex-none items-center justify-between px-3 py-3.5 max-sm:pt-0">
@@ -66,13 +64,14 @@
 		</form>
 	{/if}
 	{#if canLogin}
-		<button
-			on:click={() => (loginModalVisible = true)}
-			type="button"
-			class="flex h-9 flex-none items-center gap-1.5 rounded-lg pl-3 pr-2 text-gray-500 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-gray-700"
-		>
-			Login
-		</button>
+		<form action="{base}/login" method="POST" target="_parent">
+			<button
+				type="submit"
+				class="flex h-9 flex-none items-center gap-1.5 rounded-lg pl-3 pr-2 text-gray-500 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-gray-700"
+			>
+				Login
+			</button>
+		</form>
 	{/if}
 	<button
 		on:click={switchTheme}

src/routes/+layout.svelte

@@ -99,8 +99,6 @@
 		(data.requiresLogin
 			? !data.user
 			: !data.settings.ethicsModalAcceptedAt && !!PUBLIC_APP_DISCLAIMER);
-
-	let loginModalVisible = false;
 </script>
 
 <svelte:head>
@@ -163,7 +161,6 @@
 			conversations={data.conversations}
 			user={data.user}
 			canLogin={data.user === undefined && data.requiresLogin}
-			bind:loginModalVisible
 			on:shareConversation={(ev) => shareConversation(ev.detail.id, ev.detail.title)}
 			on:deleteConversation={(ev) => deleteConversation(ev.detail)}
 			on:clickSettings={() => (isSettingsOpen = true)}
@@ -175,7 +172,6 @@
 			conversations={data.conversations}
 			user={data.user}
 			canLogin={data.user === undefined && data.requiresLogin}
-			bind:loginModalVisible
 			on:shareConversation={(ev) => shareConversation(ev.detail.id, ev.detail.title)}
 			on:deleteConversation={(ev) => deleteConversation(ev.detail)}
 			on:clickSettings={() => (isSettingsOpen = true)}
@@ -192,7 +188,7 @@
 			models={data.models}
 		/>
 	{/if}
-	{#if (requiresLogin && data.messagesBeforeLogin === 0) || loginModalVisible}
+	{#if requiresLogin && data.messagesBeforeLogin === 0}
 		<LoginModal settings={data.settings} />
 	{/if}
 	<slot />