From a8b376e369d876812f91bb2d0911863ba954b578 Mon Sep 17 00:00:00 2001
From: Ota Prokopec <otaprokopec@gmail.com>
Date: Wed, 15 Mar 2023 16:56:17 +0100
Subject: [PATCH] register-login-location-new directory

---
 src/App.svelte                                |  2 -
 src/__routes.svelte                           | 14 +++----
 src/lib/components/Buttons/Button.svelte      | 17 +++++---
 src/lib/components/Map/LocationRequest.svelte | 42 ++++++-------------
 .../forgottonPassword}/forgot-pswd.svelte     |  4 +-
 .../{ => authorization}/login/log_in.svelte   | 16 +++----
 .../register/createAccount.svelte             |  0
 .../register/emailVerification.svelte         |  0
 .../register/register.svelte                  | 27 ++++++------
 .../register/registerFailed.svelte            |  0
 .../utils}/authorizationErrors.ts             |  2 +
 src/routes/{ => map}/map.svelte               |  0
 12 files changed, 57 insertions(+), 67 deletions(-)
 rename src/routes/{login => authorization/forgottonPassword}/forgot-pswd.svelte (95%)
 rename src/routes/{ => authorization}/login/log_in.svelte (93%)
 rename src/routes/{ => authorization}/register/createAccount.svelte (100%)
 rename src/routes/{ => authorization}/register/emailVerification.svelte (100%)
 rename src/routes/{ => authorization}/register/register.svelte (91%)
 rename src/routes/{ => authorization}/register/registerFailed.svelte (100%)
 rename src/{lib/utils/appwrite => routes/authorization/utils}/authorizationErrors.ts (70%)
 rename src/routes/{ => map}/map.svelte (100%)

diff --git a/src/App.svelte b/src/App.svelte
index e88bdc4..ed3e553 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -13,8 +13,6 @@
 	$: isReady = $localeLoading === false && $authLoading === false && isMounted
 
 	$: if (isReady && !$user?.emailVerification) {
-		console.log('change')
-
 		if (!location.pathname.startsWith('/login') && !location.pathname.startsWith('/register')) {
 			navigate('/login')
 		}
diff --git a/src/__routes.svelte b/src/__routes.svelte
index 9b063a5..0f05871 100644
--- a/src/__routes.svelte
+++ b/src/__routes.svelte
@@ -32,7 +32,7 @@
 		},
 		{
 			path: '/map',
-			component: () => import('$routes/map.svelte'),
+			component: () => import('$root/src/routes/map/map.svelte'),
 		},
 		{
 			path: '/explore',
@@ -55,24 +55,24 @@
 		},
 		{
 			path: '/login',
-			component: () => import('$routes/login/log_in.svelte'),
+			component: () => import('$routes/authorization/login/log_in.svelte'),
 		},
 		{
 			path: '/register',
-			component: () => import('$root/src/routes/register/register.svelte'),
+			component: () => import('$root/src/routes/authorization/register/register.svelte'),
 		},
 		{
 			path: '/register/failed',
-			component: () => import('$routes/register/registerFailed.svelte'),
+			component: () => import('$routes/authorization/register/registerFailed.svelte'),
 		},
 
 		{
 			path: '/register/emailverification/:erantId',
-			component: () => import('$routes/register/emailVerification.svelte'),
+			component: () => import('$routes/authorization/register/emailVerification.svelte'),
 		},
 		{
 			path: '/create/account/:erantId/',
-			component: () => import('$routes/register/createAccount.svelte'),
+			component: () => import('$routes/authorization/register/createAccount.svelte'),
 		},
 		{
 			path: '/:gameurl',
@@ -92,7 +92,7 @@
 		},
 		{
 			path: '/forgot-pswd',
-			component: () => import('$routes/login/forgot-pswd.svelte'),
+			component: () => import('$routes/authorization/forgottonPassword/forgot-pswd.svelte'),
 		},
 	]}
 />
diff --git a/src/lib/components/Buttons/Button.svelte b/src/lib/components/Buttons/Button.svelte
index 25aff56..413989d 100644
--- a/src/lib/components/Buttons/Button.svelte
+++ b/src/lib/components/Buttons/Button.svelte
@@ -1,18 +1,18 @@
-<script>
+<script lang="ts">
 	import { navigate } from 'svelte-routing'
-	export let href = ''
-
 	import { createEventDispatcher } from 'svelte'
 	const dispatch = createEventDispatcher()
 
-	export let primary = false
-	export let style = ''
+	export let href: string = ''
+	export let disabled: boolean = false
+	export let primary: boolean = false
+	export let style: string = ''
 
 	let className = ''
 	export { className as class }
 </script>
 
-<button {style} on:click={() => navigate(href)} on:click={() => dispatch('submit', true)} on:click class={className} class:primary>
+<button {disabled} class:disabled {style} on:click={() => navigate(href)} on:click={() => dispatch('submit', true)} on:click class={className} class:primary>
 	<slot />
 </button>
 
@@ -49,5 +49,10 @@
 		&:hover {
 			background-color: rgb(232, 232, 232, 0.8);
 		}
+		&.disabled {
+			background: rgb(107 114 128);
+			color: white;
+			cursor: default;
+		}
 	}
 </style>
diff --git a/src/lib/components/Map/LocationRequest.svelte b/src/lib/components/Map/LocationRequest.svelte
index a594188..2c51103 100644
--- a/src/lib/components/Map/LocationRequest.svelte
+++ b/src/lib/components/Map/LocationRequest.svelte
@@ -1,40 +1,24 @@
 <script lang="ts">
 	import { Alert, Button } from 'flowbite-svelte'
-	import { createEventDispatcher, onMount } from 'svelte'
-	const dispatch = createEventDispatcher()
-	let granted = false;
-
-	
-	onMount(() => {
-	  	if ('permissions' in navigator) {
-			navigator.permissions.query({ name: 'geolocation' }).then((permissionStatus) => {
-		  	if  (permissionStatus.state === 'granted') {
-				granted = true;
-				dispatch('locationGranted'); // This is the event that is emitted when the location is granted and later used in the map.svelte file.
-			}
-			else if (permissionStatus.state !== 'granted') {
-				navigator.geolocation.getCurrentPosition(
-			  		(position) => {
-						(position);
-			  		},
-			  		(error) => {
-						console.log(error);
-			  		}
-				);
-		  	}
-		});
-	  }
-	});
+	export let granted: false | true | null = null
 
+	navigator.geolocation.getCurrentPosition(
+		() => {
+			granted = true
+		},
+		() => {
+			granted = false
+		},
+	)
 </script>
 
-{#if !granted}
-	<Alert class="absolute w-full max-w-[400px] h-24" color="green">
-		<span class="text-lg font-medium">This is an info alert</span>
+{#if granted === false}
+	<Alert class="absolute w-[95%] max-w-[400px] z-50 mt-4" color="green">
+		<span class="text-lg font-medium">This is a info alert</span>
 		<div slot="extra">
 			<div class="mt-2 mb-4 text-sm">To advance through your experience you need to enable the location access, without it the app won't work.</div>
 			<div class="flex gap-2">
-				<Button on:click={() => dispatch('ok')} size="xs">ok</Button>
+				<Button color="green" on:click={() => (granted = true)} size="xs">ok</Button>
 			</div>
 		</div>
 	</Alert>
diff --git a/src/routes/login/forgot-pswd.svelte b/src/routes/authorization/forgottonPassword/forgot-pswd.svelte
similarity index 95%
rename from src/routes/login/forgot-pswd.svelte
rename to src/routes/authorization/forgottonPassword/forgot-pswd.svelte
index f07c4b1..60da19c 100644
--- a/src/routes/login/forgot-pswd.svelte
+++ b/src/routes/authorization/forgottonPassword/forgot-pswd.svelte
@@ -3,7 +3,7 @@
 	import Button from '$lib/components/Buttons/Button.svelte'
 	import Loading from '$lib/components/Common/Loading.svelte'
 	import { navigate } from 'svelte-routing'
-	import TopImage from '../../lib/svg/Top-Image.svelte'
+	import TopImage from '$lib/svg/Top-Image.svelte'
 	import { Alert, Helper } from 'flowbite-svelte'
 
 	let email = ''
@@ -46,4 +46,4 @@
 			</button>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/routes/login/log_in.svelte b/src/routes/authorization/login/log_in.svelte
similarity index 93%
rename from src/routes/login/log_in.svelte
rename to src/routes/authorization/login/log_in.svelte
index 4effe8a..ac1dc1a 100644
--- a/src/routes/login/log_in.svelte
+++ b/src/routes/authorization/login/log_in.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 	import { account, user } from '$lib/appwrite'
-	import Button from '$lib/components/Buttons/Button.svelte'
 	import Loading from '$lib/components/Common/Loading.svelte'
 	import { navigate } from 'svelte-routing'
-	import HiddenInput from '../../lib/components/Inputs/Hidden_Input.svelte'
-	import GoogleLogo from '../../lib/svg/GoogleLogo.svelte'
-	import TopImage from '../../lib/svg/Top-Image.svelte'
-	import { Alert, Helper } from 'flowbite-svelte'
+	import HiddenInput from '$lib/components/Inputs/Hidden_Input.svelte'
+	import GoogleLogo from '$lib/svg/GoogleLogo.svelte'
+	import TopImage from '$lib/svg/Top-Image.svelte'
+	import { Helper } from 'flowbite-svelte'
+	import { getErrorMessage } from '../utils/authorizationErrors'
 
 	export let purpose = 'login' //possible values login, register
 
@@ -24,7 +24,9 @@
 			//if (navigation.canGoBack) navigation.back()
 			navigate('/')
 		} catch (err) {
-			error = JSON.parse(JSON.stringify(err)).response.message
+			error = getErrorMessage(err.code)
+			console.log(err.code)
+
 			state = 'basic'
 		}
 	}
@@ -48,7 +50,7 @@
 	<!--2 forms from components-->
 	<div class="form">
 		{#if error}
-			<Helper color="red">{error}</Helper>
+			<Helper class="ml-4" color="red">{error}</Helper>
 		{/if}
 		<div class="inform">
 			<input bind:value={email} type="text" placeholder="E-mail" autocomplete="email" required />
diff --git a/src/routes/register/createAccount.svelte b/src/routes/authorization/register/createAccount.svelte
similarity index 100%
rename from src/routes/register/createAccount.svelte
rename to src/routes/authorization/register/createAccount.svelte
diff --git a/src/routes/register/emailVerification.svelte b/src/routes/authorization/register/emailVerification.svelte
similarity index 100%
rename from src/routes/register/emailVerification.svelte
rename to src/routes/authorization/register/emailVerification.svelte
diff --git a/src/routes/register/register.svelte b/src/routes/authorization/register/register.svelte
similarity index 91%
rename from src/routes/register/register.svelte
rename to src/routes/authorization/register/register.svelte
index 6925a4f..5cb9a37 100644
--- a/src/routes/register/register.svelte
+++ b/src/routes/authorization/register/register.svelte
@@ -1,21 +1,20 @@
 <script lang="ts">
-	import { account, user } from '$lib/appwrite'
+	import { account } from '$lib/appwrite'
 	import Loading from '$lib/components/Common/Loading.svelte'
-	import Button from '$lib/components/erant/Button.svelte'
-	import { navigate } from '$lib/router'
-	import { getErrorMessage } from '$lib/utils/appwrite/authorizationErrors'
+	import HiddenInput from '$lib/components/Inputs/Hidden_Input.svelte'
+	import GoogleLogo from '$lib/svg/GoogleLogo.svelte'
+	import TopImage from '$lib/svg/Top-Image.svelte'
+	import { getErrorMessage } from '../utils/authorizationErrors'
 	import { getUserByErantId } from '$lib/utils/database/users'
 	import { ID } from 'appwrite'
-	import { Helper, Checkbox } from 'flowbite-svelte'
-	import HiddenInput from '../../lib/components/Inputs/Hidden_Input.svelte'
-	import GoogleLogo from '../../lib/svg/GoogleLogo.svelte'
-	import TopImage from '../../lib/svg/Top-Image.svelte'
+	import { Helper } from 'flowbite-svelte'
+	import Button from '$lib/components/Buttons/Button.svelte'
 
-	let email = ''
-	let password = ''
-	let repeatPassword = ''
-	let name = ''
-	let erantId = ''
+	let email = 'dfsafads'
+	let password = 'aaaaaaaaa'
+	let repeatPassword = 'aaaaaaaaa'
+	let name = 'fdsafsda'
+	let erantId = 'dfsafdsa'
 
 	let state: 'email-sent' | 'register' | 'loading' = 'register'
 	let error: string | null = null
@@ -74,7 +73,7 @@
 						<a href="erant.cz/cookie-policy" class="text-blue-600 dark:text-blue-500 hover:underline">Cookie Policy</a>, which this site uses.</label
 					>
 				</div>
-				<Button class="w-full text-2xl" disabled={!buttonCodition} on:click={() => register()}>
+				<Button class="w-full text-2xl" primary disabled={!buttonCodition} on:click={() => register()}>
 					{#if state === 'loading'}
 						<Loading class="text-white" />
 					{:else}
diff --git a/src/routes/register/registerFailed.svelte b/src/routes/authorization/register/registerFailed.svelte
similarity index 100%
rename from src/routes/register/registerFailed.svelte
rename to src/routes/authorization/register/registerFailed.svelte
diff --git a/src/lib/utils/appwrite/authorizationErrors.ts b/src/routes/authorization/utils/authorizationErrors.ts
similarity index 70%
rename from src/lib/utils/appwrite/authorizationErrors.ts
rename to src/routes/authorization/utils/authorizationErrors.ts
index bb17f70..575a202 100644
--- a/src/lib/utils/appwrite/authorizationErrors.ts
+++ b/src/routes/authorization/utils/authorizationErrors.ts
@@ -1,6 +1,8 @@
 export const errors = {
 	1001: 'Nickname is already taken',
 	409: 'A user with the same email already is in Erant',
+	401: 'Invalid credentials.',
+	400: 'Password must be at least 8 characters.',
 }
 
 export const getErrorMessage = (code: number) => {
diff --git a/src/routes/map.svelte b/src/routes/map/map.svelte
similarity index 100%
rename from src/routes/map.svelte
rename to src/routes/map/map.svelte