From 8fc17a4ba2cc21e95f293756d8a735671ab7a5a8 Mon Sep 17 00:00:00 2001
From: Mawoka <mawoka@e.email>
Date: Tue, 26 Apr 2022 18:37:32 +0200
Subject: [PATCH] :bug: Fixed #43

---
 frontend/src/routes/create.svelte | 72 +++++++++++++------------
 frontend/src/routes/edit.svelte   | 87 ++++++++++++++++---------------
 2 files changed, 84 insertions(+), 75 deletions(-)

diff --git a/frontend/src/routes/create.svelte b/frontend/src/routes/create.svelte
index afda1b0..2bc5c7d 100644
--- a/frontend/src/routes/create.svelte
+++ b/frontend/src/routes/create.svelte
@@ -1,4 +1,4 @@
-<script context="module" lang="ts">
+<script context='module' lang='ts'>
 	import { signedIn } from '$lib/stores';
 
 	export async function load({ session, url }) {
@@ -27,7 +27,7 @@
 	}
 </script>
 
-<script lang="ts">
+<script lang='ts'>
 	import { onMount } from 'svelte';
 	import Editor from '$lib/editor.svelte';
 	import { getLocalization } from '$lib/i18n';
@@ -60,6 +60,7 @@
 	};
 
 	let data: Data;
+	let confirm_to_leave = true;
 	onMount(() => {
 		const from_localstorage = localStorage.getItem('create_game');
 		if (from_localstorage === null) {
@@ -91,6 +92,9 @@
 		}
 	};
 	const confirmUnload = () => {
+		if (!confirm_to_leave) {
+			return;
+		}
 		event.preventDefault();
 		event.returnValue = '';
 		localStorage.setItem('create_game', JSON.stringify(data));
@@ -98,77 +102,77 @@
 </script>
 
 <svelte:window on:beforeunload={confirmUnload} />
-
 <svelte:head>
 	<title>ClassQuiz - Create</title>
 </svelte:head>
 
 {#if data !== undefined}
-	<form on:submit|preventDefault={submit} class="grid grid-cols-1 gap-2">
+	<form on:submit|preventDefault={submit} class='grid grid-cols-1 gap-2'>
 		<Editor bind:data />
 	</form>
 {/if}
 
 <div
-	class="fixed z-10 inset-0 overflow-y-auto"
-	aria-labelledby="modal-title"
-	role="dialog"
-	aria-modal="true"
+	class='fixed z-10 inset-0 overflow-y-auto'
+	aria-labelledby='modal-title'
+	role='dialog'
+	aria-modal='true'
 	class:hidden={!responseData.open}
 >
 	<div
-		class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0"
+		class='flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0'
 	>
 		<div
-			class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"
-			aria-hidden="true"
+			class='fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity'
+			aria-hidden='true'
 		/>
 
-		<span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true"
-			>&#8203;</span
+		<span class='hidden sm:inline-block sm:align-middle sm:h-screen' aria-hidden='true'
+		>&#8203;</span
 		>
 		<div
-			class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+			class='inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full'
 		>
-			<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
-				<div class="sm:flex sm:items-start">
+			<div class='bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4'>
+				<div class='sm:flex sm:items-start'>
 					<div
-						class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10"
+						class='mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10'
 					>
 						<!-- Heroicon name: outline/exclamation -->
 						<svg
-							class="w-6 h-6 text-green-600"
-							fill="none"
-							stroke="currentColor"
-							viewBox="0 0 24 24"
-							xmlns="http://www.w3.org/2000/svg"
+							class='w-6 h-6 text-green-600'
+							fill='none'
+							stroke='currentColor'
+							viewBox='0 0 24 24'
+							xmlns='http://www.w3.org/2000/svg'
 						>
 							<path
-								stroke-linecap="round"
-								stroke-linejoin="round"
-								stroke-width="2"
-								d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
+								stroke-linecap='round'
+								stroke-linejoin='round'
+								stroke-width='2'
+								d='M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z'
 							/>
 						</svg>
 					</div>
-					<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-						<h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-title">
+					<div class='mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left'>
+						<h3 class='text-lg leading-6 font-medium text-gray-900' id='modal-title'>
 							{$t('create_page.success.title')}
 						</h3>
-						<div class="mt-2">
-							<p class="text-sm text-gray-500">{$t('create_page.success.body')}</p>
+						<div class='mt-2'>
+							<p class='text-sm text-gray-500'>{$t('create_page.success.body')}</p>
 						</div>
 					</div>
 				</div>
 			</div>
-			<div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+			<div class='bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse'>
 				<button
-					type="button"
+					type='button'
 					on:click={() => {
+						confirm_to_leave = false;
 						window.location.href = '/overview';
 					}}
-					class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm"
-					>{$t('words.close')}
+					class='mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm'
+				>{$t('words.close')}
 				</button>
 			</div>
 		</div>
diff --git a/frontend/src/routes/edit.svelte b/frontend/src/routes/edit.svelte
index cdbe71c..88e3875 100644
--- a/frontend/src/routes/edit.svelte
+++ b/frontend/src/routes/edit.svelte
@@ -1,5 +1,6 @@
-<script lang="ts" context="module">
+<script lang='ts' context='module'>
 	import { signedIn } from '$lib/stores';
+
 	export async function load({ url, session }) {
 		if (!session.authenticated) {
 			return {
@@ -25,7 +26,7 @@
 	}
 </script>
 
-<script lang="ts">
+<script lang='ts'>
 	import Editor from '$lib/editor.svelte';
 	import { getLocalization } from '$lib/i18n';
 	import { navbarVisible } from '$lib/stores';
@@ -38,6 +39,7 @@
 		open: false,
 		data: ''
 	};
+	let confirm_to_leave = true;
 
 	interface Data {
 		public: boolean;
@@ -88,6 +90,9 @@
 		}
 	};
 	const confirmUnload = () => {
+		if (!confirm_to_leave){
+			return;
+		}
 		event.preventDefault();
 		event.returnValue = '';
 		localStorage.setItem('edit_game', JSON.stringify(data));
@@ -95,95 +100,95 @@
 </script>
 
 <svelte:window on:beforeunload={confirmUnload} />
-
 <svelte:head>
 	<title>ClassQuiz - Edit</title>
 </svelte:head>
 {#await get_quiz()}
-	<svg class="h-8 w-8 animate-spin mx-auto my-20" viewBox="3 3 18 18">
+	<svg class='h-8 w-8 animate-spin mx-auto my-20' viewBox='3 3 18 18'>
 		<path
-			class="fill-black"
-			d="M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z"
+			class='fill-black'
+			d='M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z'
 		/>
 		<path
-			class="fill-blue-100"
-			d="M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z"
+			class='fill-blue-100'
+			d='M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z'
 		/>
 	</svg>
 {:then _}
 	{#if data !== undefined}
-		<form on:submit|preventDefault={submit} class="grid grid-cols-1 gap-2">
+		<form on:submit|preventDefault={submit} class='grid grid-cols-1 gap-2'>
 			<Editor bind:data submit_button_text={$t('words.save')} />
 		</form>
 	{/if}
 {:catch err}
-	<div class="text-center">
-		<h1 class="text-5xl font-bold">{err.message}</h1>
+	<div class='text-center'>
+		<h1 class='text-5xl font-bold'>{err.message}</h1>
 	</div>
 {/await}
 
 <div
-	class="fixed z-10 inset-0 overflow-y-auto"
-	aria-labelledby="modal-title"
-	role="dialog"
-	aria-modal="true"
+	class='fixed z-10 inset-0 overflow-y-auto'
+	aria-labelledby='modal-title'
+	role='dialog'
+	aria-modal='true'
 	class:hidden={!responseData.open}
 >
 	<div
-		class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0"
+		class='flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0'
 	>
 		<div
-			class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"
-			aria-hidden="true"
+			class='fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity'
+			aria-hidden='true'
 		/>
 
-		<span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true"
-			>&#8203;</span
+		<span class='hidden sm:inline-block sm:align-middle sm:h-screen' aria-hidden='true'
+		>&#8203;</span
 		>
 		<div
-			class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+			class='inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full'
 		>
-			<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
-				<div class="sm:flex sm:items-start">
+			<div class='bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4'>
+				<div class='sm:flex sm:items-start'>
 					<div
-						class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10"
+						class='mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10'
 					>
 						<!-- Heroicon name: outline/exclamation -->
 						<svg
-							class="w-6 h-6 text-green-600"
-							fill="none"
-							stroke="currentColor"
-							viewBox="0 0 24 24"
-							xmlns="http://www.w3.org/2000/svg"
+							class='w-6 h-6 text-green-600'
+							fill='none'
+							stroke='currentColor'
+							viewBox='0 0 24 24'
+							xmlns='http://www.w3.org/2000/svg'
 						>
 							<path
-								stroke-linecap="round"
-								stroke-linejoin="round"
-								stroke-width="2"
-								d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
+								stroke-linecap='round'
+								stroke-linejoin='round'
+								stroke-width='2'
+								d='M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z'
 							/>
 						</svg>
 					</div>
-					<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-						<h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-title">
+					<div class='mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left'>
+						<h3 class='text-lg leading-6 font-medium text-gray-900' id='modal-title'>
 							{$t('edit_page.success_update_title')}
 						</h3>
-						<div class="mt-2">
-							<p class="text-sm text-gray-500">
+						<div class='mt-2'>
+							<p class='text-sm text-gray-500'>
 								{$t('edit_page.success_update_body')}
 							</p>
 						</div>
 					</div>
 				</div>
 			</div>
-			<div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+			<div class='bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse'>
 				<button
-					type="button"
+					type='button'
 					on:click={() => {
+						confirm_to_leave = false;
 						window.location.href = '/overview';
 					}}
-					class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm"
-					>{$t('words.close')}
+					class='mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm'
+				>{$t('words.close')}
 				</button>
 			</div>
 		</div>