From 07678d775eb7cd40512dd781663ace1695f4ba08 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Tue, 15 Oct 2024 10:29:23 +0200
Subject: [PATCH 01/26] add de localization for login, put data into component

---
 frontend/src/lib/components/UserLogin.svelte  | 47 +++++++++++++++++--
 frontend/src/locales/de.json                  | 12 +++++
 .../routes/userLand/userLogin/+page.svelte    | 38 +--------------
 3 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index 46bdcfa2..93efc36d 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -8,8 +8,9 @@
 	import NavigationButtons from '$lib/components/Navigation/NavigationButtons.svelte';
 
 	import { hash, users, type UserData } from '$lib/stores/userStore';
-	import { Card, Heading } from 'flowbite-svelte';
+	import { Card, Heading, Input, Select } from 'flowbite-svelte';
 	import { onDestroy, onMount } from 'svelte';
+	import 
 
 	// functionality
 
@@ -53,7 +54,40 @@
 	}
 
 	// data and variables
-	export let data: any[];
+	let data = [
+		{
+			component: Input,
+			value: null,
+			props: {
+				label: 'Benutzerkennung',
+				type: 'text',
+				placeholder: 'Benutzerkennung',
+				required: true
+			}
+		},
+		{
+			component: Input,
+			value: null,
+			props: {
+				label: 'Passwort',
+				type: 'password',
+				placeholder: 'Passwort',
+				required: true
+			}
+		},
+		{
+			component: Select,
+			value: null,
+			props: {
+				label: 'Rolle',
+				items: ['Beobachter', 'Wissenschaftler', 'Admin'].map((v) => {
+					return { name: String(v), value: v };
+				}),
+				placeholder: 'Bitte auswählen',
+				required: true
+			}
+		}
+	];
 
 	const buttons = [
 		{
@@ -125,7 +159,12 @@
 				>
 			{/if}
 
-			<form class="m-1 m-3 mx-auto w-full flex-col space-y-6">
+			<form
+				class="m-1 m-3 mx-auto w-full flex-col space-y-6"
+				onsubmit={(event) => {
+					console.log('event: ', event);
+				}}
+			>
 				{#each data as element}
 					<DataInput
 						component={element.component}
@@ -149,7 +188,7 @@
 		<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
 		<a
 			href={`${base}/userLand/userRegistration`}
-			class="text-primary-700 hover:underline dark:text-primary-500"
+			class="text-primary-700 dark:text-primary-500 hover:underline"
 		>
 			Create account
 		</a>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 733000b4..925487e1 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -44,5 +44,17 @@
 		"help": "Förderhilfen",
 		"image": "Bild",
 		"images": "Bilder"
+	},
+	"login": {
+		"alreadyLoggedIn": "Sie sind bereits angemeldet. Melden sie sich zuerst ab um den Account zu wechseln.",
+		"alertMessageTitle": "Fehler",
+		"label": "Benutzerkennung",
+		"passwordLabel": "Passwort",
+		"role": "Rolle",
+		"observerRole": "Beobachter",
+		"scientistRole": "Wissenschaftler",
+		"adminRole": "adminRole",
+		"selectPlaceholder": "Bitte auswählen", 
+		
 	}
 }
diff --git a/frontend/src/routes/userLand/userLogin/+page.svelte b/frontend/src/routes/userLand/userLogin/+page.svelte
index c007e1d8..e14b2ca2 100644
--- a/frontend/src/routes/userLand/userLogin/+page.svelte
+++ b/frontend/src/routes/userLand/userLogin/+page.svelte
@@ -1,41 +1,5 @@
 <script>
 	import UserLogin from '$lib/components/UserLogin.svelte';
-	import { Input, Select } from 'flowbite-svelte';
-
-	const data = [
-		{
-			component: Input,
-			value: null,
-			props: {
-				label: 'Benutzerkennung',
-				type: 'text',
-				placeholder: 'Benutzerkennung',
-				required: true
-			}
-		},
-		{
-			component: Input,
-			value: null,
-			props: {
-				label: 'Passwort',
-				type: 'password',
-				placeholder: 'Passwort',
-				required: true
-			}
-		},
-		{
-			component: Select,
-			value: null,
-			props: {
-				label: 'Rolle',
-				items: ['Beobachter', 'Wissenschaftler', 'Admin'].map((v) => {
-					return { name: String(v), value: v };
-				}),
-				placeholder: 'Bitte auswählen',
-				required: true
-			}
-		}
-	];
 </script>
 
-<UserLogin {data} />
+<UserLogin />

From 66818451e71907f52166ad9849c80e69af15d985 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Tue, 15 Oct 2024 10:52:02 +0200
Subject: [PATCH 02/26] use localization, remove some mock functions for
 backend

---
 frontend/src/lib/components/UserLogin.svelte | 133 +++++--------------
 frontend/src/locales/de.json                 |  13 +-
 frontend/src/locales/en.json                 |  15 ++-
 3 files changed, 56 insertions(+), 105 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index 93efc36d..2bb503ed 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -1,57 +1,14 @@
 <script lang="ts">
-	import { goto } from '$app/navigation';
 	import { base } from '$app/paths';
 
 	import UserLoginUtil from '$lib/components//UserLoginUtil.svelte';
 	import AlertMessage from '$lib/components/AlertMessage.svelte';
 	import DataInput from '$lib/components/DataInput/DataInput.svelte';
-	import NavigationButtons from '$lib/components/Navigation/NavigationButtons.svelte';
 
-	import { hash, users, type UserData } from '$lib/stores/userStore';
-	import { Card, Heading, Input, Select } from 'flowbite-svelte';
+	import { users } from '$lib/stores/userStore';
+	import { Button, Card, Heading, Input, Select } from 'flowbite-svelte';
 	import { onDestroy, onMount } from 'svelte';
-	import 
-
-	// functionality
-
-	/**
-	 * This currently immitates the behavior of a login system by fetching data from
-	 * the userstore that has been precreated. What fetchWithCredentials does currently will later go into the backend
-	 */
-	async function validateCredentials() {
-		// README: this should not be set here but in the child component. However, indication of something missing should
-		// not happen immediatelly in the first round of entry, so this code here defers it until the first hit of the login button.
-
-		const user = await users.fetchWithCredentials(
-			data[0].value,
-			await hash(data[1].value),
-			data[2].value
-		);
-
-		console.log(user);
-
-		if (user) {
-			userID = user.id;
-
-			if (remember) {
-				localStorage.setItem('currentUser', JSON.stringify(userID));
-			} else {
-				localStorage.removeItem('currentUser');
-			}
-
-			await users.setLoggedIn(userID);
-
-			await users.save();
-
-			goto(`${base}/userLand/userLandingpage/`);
-		} else {
-			showAlert = true;
-			data = data.map((element) => {
-				element.value = null;
-				return element;
-			});
-		}
-	}
+	import { _ } from 'svelte-i18n';
 
 	// data and variables
 	let data = [
@@ -59,78 +16,56 @@
 			component: Input,
 			value: null,
 			props: {
-				label: 'Benutzerkennung',
+				label: $_('login.usernameLabel'),
 				type: 'text',
-				placeholder: 'Benutzerkennung',
-				required: true
+				placeholder: $_('login.usernameLabel'),
+				required: true,
+				id: 'username'
 			}
 		},
 		{
 			component: Input,
 			value: null,
 			props: {
-				label: 'Passwort',
+				label: $_('login.passwordLabel'),
 				type: 'password',
-				placeholder: 'Passwort',
-				required: true
+				placeholder: $_('login.passwordLabel'),
+				required: true,
+				id: 'password'
 			}
 		},
 		{
 			component: Select,
 			value: null,
 			props: {
-				label: 'Rolle',
-				items: ['Beobachter', 'Wissenschaftler', 'Admin'].map((v) => {
-					return { name: String(v), value: v };
-				}),
-				placeholder: 'Bitte auswählen',
-				required: true
+				label: $_('login.role'),
+				items: [$_('login.observerRole'), $_('login.scientistRole'), $_('login.adminRole')].map(
+					(v) => {
+						return { name: String(v), value: v };
+					}
+				),
+				placeholder: $_('login.selectPlaceholder'),
+				required: true,
+				id: 'role'
 			}
 		}
 	];
 
-	const buttons = [
-		{
-			label: 'Login',
-			href: null,
-			onclick: validateCredentials
-		}
-	];
-
-	let alertMessage = 'Eingaben sind falsch';
+	let alertMessage = $_('login.alertMessage');
 	let userID: string;
 	let remember: boolean = false;
 	let showAlert: boolean = false;
-	const heading = 'Einloggen';
+	const heading = $_('login.heading');
 
 	// check if credentials are stored
-	onMount(async () => {
-		// make dummyUser if not already there
-		users.load();
-
-		// check if credentials are saved
-		const savedUID = JSON.parse(localStorage.getItem('currentUser'));
-
-		if (savedUID) {
-			userID = savedUID;
+	onMount(async () => {});
 
-			const user: UserData = (await users.fetch(userID)) as UserData;
-
-			data[0].value = user.name;
-			data[1].value = user.password;
-			data[2].value = user.role;
-			remember = true;
-		}
-	});
-
-	onDestroy(async () => {
-		await users.save();
-	});
+	onDestroy(async () => {});
 </script>
 
 {#if showAlert}
 	<AlertMessage
-		title={'Fehler'}
+		title={$_('login.alertMessageTitle')}
 		message={alertMessage}
 		lastpage={`${base}/userLand/userLogin`}
 		onclick={() => {
@@ -141,29 +76,29 @@
 
 {#if users.get()['loggedIn'] && users.get()['loggedIn'] !== null}
 	<AlertMessage
-		title={'Fehler'}
-		message={`Sie sind bereits angemeldet. Melden sie sich zuerst ab um den Account zu wechseln.`}
+		title={$_('login.alertMessageTitle')}
+		message={$_('login.alreadyLoggedInMessage')}
 		lastpage={`${base}`}
 		onclick={() => {
 			showAlert = false;
 		}}
 	/>
 {:else}
-	<div class="container m-1 mx-auto w-full max-w-xl">
-		<Card class="container m-1 mx-auto mb-6 w-full max-w-xl pb-6">
+	<div class="container m-2 mx-auto w-full max-w-xl">
+		<Card class="container m-2 mx-auto mb-6 w-full max-w-xl pb-6">
 			{#if heading}
 				<Heading
 					tag="h3"
-					class="m-1 mb-3 p-1 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
+					class="m-2 mb-3 p-2 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
 					>{heading}</Heading
 				>
 			{/if}
 
 			<form
-				class="m-1 m-3 mx-auto w-full flex-col space-y-6"
 				onsubmit={(event) => {
 					console.log('event: ', event);
 				}}
+				class="m-2 mx-auto w-full flex-col space-y-6"
 			>
 				{#each data as element}
 					<DataInput
@@ -178,11 +113,11 @@
 						}}
 					/>
 				{/each}
-			</form>
 
-			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
+				<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
-			<NavigationButtons {buttons} />
+				<Button type="submit">{$_('login.submitButtonLabel')}</Button>
+			</form>
 		</Card>
 
 		<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 89f0f954..aa417d18 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -46,16 +46,19 @@
 		"images": "Bilder"
 	},
 	"login": {
-		"alreadyLoggedIn": "Sie sind bereits angemeldet. Melden sie sich zuerst ab um den Account zu wechseln.",
+		"heading": "Einloggen",
+		"alreadyLoggedInMessage": "Sie sind bereits angemeldet. Melden sie sich zuerst ab um den Account zu wechseln.",
 		"alertMessageTitle": "Fehler",
-		"label": "Benutzerkennung",
+		"alertMessage": "Eingaben sind falsch",
+		"usernameLabel": "Benutzerkennung",
 		"passwordLabel": "Passwort",
 		"role": "Rolle",
 		"observerRole": "Beobachter",
 		"scientistRole": "Wissenschaftler",
-		"adminRole": "adminRole",
-		"selectPlaceholder": "Bitte auswählen", 
-		
+		"adminRole": "Admin",
+		"submitButtonLabel": "Absenden",
+		"selectPlaceholder": "Bitte auswählen"
+	},
 	"forgotPw": {
 		"heading": "Passwort vergessen?",
 		"placeholder": "Bitte geben sie eine E-mail Adresse an um ihr Passwort zu erneuern",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index da794134..fec7c42e 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -45,7 +45,20 @@
 		"image": "Image",
 		"images": "Images"
 	},
-	"login": {},
+	"login": {
+		"heading": "Sign in",
+		"alreadyLoggedIn": "You are already logged in. Sign out first to use to another account",
+		"alertMessageTitle": "Error",
+		"alertMessage": "Wrong entries",
+		"usernameLabel": "Username",
+		"passwordLabel": "Password",
+		"role": "role",
+		"observerRole": "observer",
+		"scientistRole": "scientist",
+		"adminRole": "admin",
+		"submitButtonLabel": "Submit",
+		"selectPlaceholder": "Please select"
+	},
 	"forgotPw": {
 		"heading": "Forgot your password?",
 		"placeholder": "Please enter your e-mail adress to get a new password",

From 98a5a65f5113979767958d8ae7fa0f9a6045a12b Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Tue, 15 Oct 2024 10:56:09 +0200
Subject: [PATCH 03/26] add button styling

---
 frontend/src/lib/components/UserLogin.svelte | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index 2bb503ed..ea5a34d2 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -116,7 +116,10 @@
 
 				<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
-				<Button type="submit">{$_('login.submitButtonLabel')}</Button>
+				<Button
+					class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+					type="submit">{$_('login.submitButtonLabel')}</Button
+				>
 			</form>
 		</Card>
 

From 9e2a73c567bafba5eccd471e7293ea47d8368fce Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Tue, 15 Oct 2024 11:34:41 +0200
Subject: [PATCH 04/26] add new verify logic skeleton

---
 frontend/src/lib/components/UserLogin.svelte | 138 ++++++++++---------
 frontend/src/locales/de.json                 |   2 +-
 2 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index ea5a34d2..6e348aa2 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -5,16 +5,44 @@
 	import AlertMessage from '$lib/components/AlertMessage.svelte';
 	import DataInput from '$lib/components/DataInput/DataInput.svelte';
 
-	import { users } from '$lib/stores/userStore';
+	import { goto } from '$app/navigation';
+	import { authCookieLogin } from '$lib/client';
+	import {
+		type AuthCookieLoginData,
+		type Body_auth_cookie_login_auth_login_post
+	} from '$lib/client/types.gen';
+	import { preventDefault } from '$lib/util';
 	import { Button, Card, Heading, Input, Select } from 'flowbite-svelte';
-	import { onDestroy, onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 
-	// data and variables
-	let data = [
+	// functionality
+	async function submitData() {
+		const loginData: Body_auth_cookie_login_auth_login_post = {
+			username: formData[0].value,
+			password: formData[1].value
+		};
+
+		const data: AuthCookieLoginData = {
+			body: loginData
+		};
+
+		const authReturn = await authCookieLogin(data);
+
+		if (authReturn.error) {
+			showAlert = true;
+			for (let element of formData) {
+				element.value = '';
+			}
+		} else {
+			goto('/userLand/userLandingpage');
+		}
+	}
+
+	// form data and variables
+	let formData = [
 		{
 			component: Input,
-			value: null,
+			value: '',
 			props: {
 				label: $_('login.usernameLabel'),
 				type: 'text',
@@ -25,7 +53,7 @@
 		},
 		{
 			component: Input,
-			value: null,
+			value: '',
 			props: {
 				label: $_('login.passwordLabel'),
 				type: 'password',
@@ -36,7 +64,7 @@
 		},
 		{
 			component: Select,
-			value: null,
+			value: '',
 			props: {
 				label: $_('login.role'),
 				items: [$_('login.observerRole'), $_('login.scientistRole'), $_('login.adminRole')].map(
@@ -51,22 +79,15 @@
 		}
 	];
 
-	let alertMessage = $_('login.alertMessage');
-	let userID: string;
 	let remember: boolean = false;
 	let showAlert: boolean = false;
-	const heading = $_('login.heading');
-
-	// check if credentials are stored
-	onMount(async () => {});
-
-	onDestroy(async () => {});
+	$: console.log('remember: ', remember, 'showAlert: ', showAlert);
 </script>
 
 {#if showAlert}
 	<AlertMessage
 		title={$_('login.alertMessageTitle')}
-		message={alertMessage}
+		message={$_('login.alertMessage')}
 		lastpage={`${base}/userLand/userLogin`}
 		onclick={() => {
 			showAlert = false;
@@ -74,7 +95,7 @@
 	/>
 {/if}
 
-{#if users.get()['loggedIn'] && users.get()['loggedIn'] !== null}
+<!-- {#if users.get()['loggedIn'] && users.get()['loggedIn'] !== null}
 	<AlertMessage
 		title={$_('login.alertMessageTitle')}
 		message={$_('login.alreadyLoggedInMessage')}
@@ -83,52 +104,45 @@
 			showAlert = false;
 		}}
 	/>
-{:else}
-	<div class="container m-2 mx-auto w-full max-w-xl">
-		<Card class="container m-2 mx-auto mb-6 w-full max-w-xl pb-6">
-			{#if heading}
-				<Heading
-					tag="h3"
-					class="m-2 mb-3 p-2 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
-					>{heading}</Heading
-				>
-			{/if}
+{:else} -->
+<div class="container m-2 mx-auto w-full max-w-xl">
+	<Card class="container m-2 mx-auto mb-6 w-full max-w-xl pb-6">
+		<Heading
+			tag="h3"
+			class="m-2 mb-3 p-2 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
+			>{$_('login.heading')}</Heading
+		>
 
-			<form
-				onsubmit={(event) => {
-					console.log('event: ', event);
-				}}
-				class="m-2 mx-auto w-full flex-col space-y-6"
-			>
-				{#each data as element}
-					<DataInput
-						component={element.component}
-						label={element.props.label}
-						bind:value={element.value}
-						properties={element.props}
-						eventHandlers={{
-							'on:change': element.onchange,
-							'on:blur': element.onblur,
-							'on:click': element.onclick
-						}}
-					/>
-				{/each}
+		<form onsubmit={preventDefault(submitData)} class="m-2 mx-auto w-full flex-col space-y-6">
+			{#each formData as element}
+				<DataInput
+					component={element.component}
+					label={element.props.label}
+					bind:value={element.value}
+					properties={element.props}
+					eventHandlers={{
+						'on:change': element.onchange,
+						'on:blur': element.onblur,
+						'on:click': element.onclick
+					}}
+				/>
+			{/each}
 
-				<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
+			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
-				<Button
-					class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
-					type="submit">{$_('login.submitButtonLabel')}</Button
-				>
-			</form>
-		</Card>
+			<Button
+				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+				type="submit">{$_('login.submitButtonLabel')}</Button
+			>
+		</form>
+	</Card>
 
-		<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
-		<a
-			href={`${base}/userLand/userRegistration`}
-			class="text-primary-700 dark:text-primary-500 hover:underline"
-		>
-			Create account
-		</a>
-	</div>
-{/if}
+	<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
+	<a
+		href={`${base}/userLand/userRegistration`}
+		class="text-primary-700 dark:text-primary-500 hover:underline"
+	>
+		Create account
+	</a>
+</div>
+<!-- {/if} -->
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index aa417d18..eec7f566 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -49,7 +49,7 @@
 		"heading": "Einloggen",
 		"alreadyLoggedInMessage": "Sie sind bereits angemeldet. Melden sie sich zuerst ab um den Account zu wechseln.",
 		"alertMessageTitle": "Fehler",
-		"alertMessage": "Eingaben sind falsch",
+		"alertMessage": "Einloggen nicht erfolgreich. Eingaben sind falsch",
 		"usernameLabel": "Benutzerkennung",
 		"passwordLabel": "Passwort",
 		"role": "Rolle",

From 24c17a26996b2907bf1072399e6bbbcf3897a22d Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Tue, 15 Oct 2024 14:26:23 +0200
Subject: [PATCH 05/26] work on using backend in user registration

---
 frontend/src/lib/components/UserLogin.svelte  |   2 +-
 .../lib/components/UserRegistration.svelte    | 199 +++++++-----------
 frontend/src/locales/de.json                  |  20 +-
 .../userLand/userRegistration/+page.svelte    |  55 +----
 4 files changed, 90 insertions(+), 186 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index 6e348aa2..edf17fa1 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -87,7 +87,7 @@
 {#if showAlert}
 	<AlertMessage
 		title={$_('login.alertMessageTitle')}
-		message={$_('login.alertMessage')}
+		message={$_('login.LOGIN_BAD_CREDENTIALS')}
 		lastpage={`${base}/userLand/userLogin`}
 		onclick={() => {
 			showAlert = false;
diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index c00ab672..5bf5a55e 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -1,134 +1,73 @@
 <script lang="ts">
-	import { goto } from '$app/navigation';
 	import { base } from '$app/paths';
 	import AlertMessage from '$lib/components/AlertMessage.svelte';
 	import DataInput from '$lib/components/DataInput/DataInput.svelte';
-	import NavigationButtons from '$lib/components/Navigation/NavigationButtons.svelte';
-	import { children } from '$lib/stores/childrenStore';
-	import { hash, users } from '$lib/stores/userStore';
-	import { Card, Heading, Input } from 'flowbite-svelte';
-	import { onDestroy, onMount } from 'svelte';
+	import { preventDefault } from '$lib/util';
+	import { Button, Card, Heading, Input } from 'flowbite-svelte';
+	import { _ } from 'svelte-i18n';
 
-	onMount(async () => {
-		// make dummyUser if not already there
-		users.load();
-	});
 
-	onDestroy(async () => {
-		await users.save();
-	});
-
-	function validate(): void {
-		const mailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-		missingValues[0] = inputValues[0] === null || inputValues[0] === ''; // username
-		missingValues[1] = inputValues[1] === null || mailRegex.test(inputValues[1]) === false; // email
-		missingValues[2] =
-			inputValues[2] === null || inputValues[2] === '' || inputValues[2] !== inputValues[3]; // password
-		missingValues[3] = inputValues[3] === null || missingValues[2];
-	}
-
-	async function reroute(): Promise<void> {
-		validate();
-
-		if (
-			missingValues.every((v) => {
-				return v === false;
-			})
-		) {
-			// README: userID is username+password just as a placeholder
-			const h = await hash(inputValues[2]);
-			const userID = inputValues[0] + h;
-			let userAddSuccess: boolean = true;
-
-			let userdata = {
-				name: inputValues[0],
-				id: userID, // README: without the backend, userID is emulated as username + password
-				role: 'Beobachter',
-				password: passwd
-			};
-
-			try {
-				await users.add(userID, userdata);
-			} catch (error) {
-				userAddSuccess = false;
-				showAlert = true;
-				alertMessage = 'Fehler bei Registrierung' + error;
-			}
-
-			try {
-				await children.addUser(userID);
-			} catch (error) {
-				showAlert = true;
-				alertMessage = 'Fehler bei Registrierung: ' + error;
-				userAddSuccess = false;
-			}
-
-			if (userAddSuccess) {
-				try {
-					await users.save();
-				} catch (error) {
-					showAlert = true;
-					alertMessage = 'Fehler bei Registrierung' + error;
-					userAddSuccess = false;
-				}
-			}
-
-			if (userAddSuccess) {
-				try {
-					await children.save();
-				} catch (error) {
-					showAlert = true;
-					alertMessage = 'Fehler bei Registrierung' + error;
-					userAddSuccess = false;
-				}
-			}
-
-			if (userAddSuccess) {
-				try {
-					await users.setLoggedIn(userID); // set newly registered user as logged in
-				} catch (error) {
-					showAlert = true;
-					alertMessage = 'Fehler bei Registrierung' + error;
-					userAddSuccess = false;
-				}
-			}
-
-			if (userAddSuccess) {
-				showAlert = false;
-				goto(`${base}/${'userLand/userLandingpage'}`);
-			}
-		} else {
-			showAlert = true;
-		}
-	}
-
-	export let data;
-
-	const heading = 'Als neuer Benutzer registrieren';
-	let showAlert: boolean = false;
-	let alertMessage: string = 'Bitte füllen Sie die benötigten Felder (hervorgehoben) aus.';
-	let missingValues: boolean[] = [false, false, false, false];
-	let inputValues: (string | null)[] = [null, null, null, null];
-	let passwd = '';
-	let passwdTest = '';
-	const buttons = [
+	const data = [
+		{
+			component: Input,
+			props: {
+				label: $_('registration.usernameLabel'),
+				type: 'text',
+				placeholder: $_('registration.usernameLabel'),
+				required: true,
+				id: 'username'
+			},
+			value: ''
+		},
+		{
+			component: Input,
+			props: {
+				label:  $_('registration.emailLabel'),
+				type: 'email',
+				placeholder: $_('registration.emailLabel'),
+				required: true,
+				id: 'email'
+			},
+			value: ''
+		},
+		{
+			component: Input,
+			props: {
+				label: $_('registration.passwordLabel'),
+				type: 'password',
+				placeholder: $_('registration.passwordLabel'),
+				required: true,
+				id: 'password'
+			},
+			value: ''
+
+		},
 		{
-			label: 'Registrieren',
-			onclick: reroute
+			component: Input,
+			props: {
+				label: $_('registration.passwordConfirmLabel'),
+				type: 'password',
+				placeholder: $_('registration.passwordConfirmLabel'),
+				required: true,
+				id: 'passwordConfirm'
+			},
+			value: ''
 		}
 	];
+
+	let showAlert: boolean = false;
+
 </script>
 
 <!-- Show big alert message when something is missing -->
 {#if showAlert}
 	<AlertMessage
-		title="Fehler"
-		message={alertMessage}
+		title={$_('registration.alertMessageTitle')}
+		message={$_('registration.alertMessage')}
 		infopage="{base}/info"
 		infotitle="Was passiert mit den Daten"
 		onclick={() => {
-			showAlert = false;
-			missingValues = [];
+			showAlert = false;		
 		}}
 	/>
 {/if}
@@ -136,30 +75,34 @@
 <!-- The actual content -->
 <div class="container m-1 mx-auto w-full max-w-xl">
 	<Card class="container m-1 mx-auto w-full max-w-xl">
-		{#if heading}
-			<Heading
-				tag="h3"
-				class="m-1 mb-3 p-1 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
-				>{heading}</Heading
-			>
-		{/if}
+		<Heading
+			tag="h3"
+			class="m-1 mb-3 p-1 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
+			>{$_('registration.heading')}
+		</Heading>
+
+		<form onsubmit={preventDefault((e) => {
+			console.log('event: ', e);
+		})} class="m-2 mx-auto w-full flex-col space-y-6">
 
-		<form class="m-1 mx-auto w-full flex-col space-y-6">
 			{#each data as element, i}
 				<DataInput
-					component={Input}
-					properties={element}
-					bind:value={inputValues[i]}
+					component={element.component}
+					properties={element.props}
+					bind:value={element.value}
 					eventHandlers={{
 						'on:change': element.onChange,
 						'on:blur': element.onBlur,
 						'on:click': element.onClick
 					}}
-					checkValid={element.checkValid}
-					label={element.label}
+					label={element.props.label}
 				/>
 			{/each}
+
+			<Button
+			type="submit"
+			class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+			>{$_('registration.submitButtonLabel')}</Button>
 		</form>
-		<NavigationButtons {buttons} />
 	</Card>
 </div>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index c2568957..c2da69b7 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -1,7 +1,4 @@
 {
-	"login": {
-		"LOGIN_BAD_CREDENTIALS": "Ungültige E-Mail-Adresse oder ungültiges Passwort"
-	},
 	"milestone": {
 		"answer0-text": "Noch gar nicht",
 		"answer0-desc": "Das Kind macht noch keine Anstalten bzw. ist noch nicht in der Lage, das Verhalten auszuführen.",
@@ -40,11 +37,26 @@
 		"image": "Bild",
 		"images": "Bilder"
 	},
+	"registration": {
+		"heading": "Als neuer Benutzer registrieren", 
+		"alertMessage": "Bitte füllen Sie alle Felder aus.", 
+		"alertMessageTitle": "Fehler",
+		"usernameLabel": "Benutzername",
+		"passwordLabel": "Passwort",
+		"emailLabel": "e-Mail",
+		"passwordConfirmLabel": "Passwort wiederholen",
+		"role": "Rolle",
+		"observerRole": "Beobachter",
+		"scientistRole": "Wissenschaftler",
+		"adminRole": "Admin",
+		"submitButtonLabel": "Absenden",
+		"selectPlaceholder": "Bitte auswählen"
+	},
 	"login": {
 		"heading": "Einloggen",
 		"alreadyLoggedInMessage": "Sie sind bereits angemeldet. Melden sie sich zuerst ab um den Account zu wechseln.",
 		"alertMessageTitle": "Fehler",
-		"alertMessage": "Einloggen nicht erfolgreich. Eingaben sind falsch",
+		"LOGIN_BAD_CREDENTIALS": "Ungültige E-Mail-Adresse oder ungültiges Passwort",
 		"usernameLabel": "Benutzerkennung",
 		"passwordLabel": "Passwort",
 		"role": "Rolle",
diff --git a/frontend/src/routes/userLand/userRegistration/+page.svelte b/frontend/src/routes/userLand/userRegistration/+page.svelte
index d78aef9f..52c3eade 100644
--- a/frontend/src/routes/userLand/userRegistration/+page.svelte
+++ b/frontend/src/routes/userLand/userRegistration/+page.svelte
@@ -1,57 +1,6 @@
 <script lang="ts">
 	import UserRegistration from '$lib/components/UserRegistration.svelte';
-	import { hash } from '$lib/stores/userStore';
-	let passwd: string;
-	let passwdTest: string;
-
-	const data = [
-		{
-			label: 'Benutzername',
-			name: 'Benutzername',
-			type: 'text',
-			placeholder: 'Wählen sie einen beliebigen Benutzernamen',
-			required: true,
-			checkValid: () => {
-				return true;
-			}
-		},
-		{
-			label: 'E-Mail',
-			name: 'E-Mail',
-			type: 'email',
-			placeholder: 'E-Mail',
-			required: true,
-			checkValid: () => {
-				return true;
-			}
-		},
-		{
-			label: 'Passwort',
-			name: 'Passwort',
-			type: 'password',
-			placeholder: 'Passwort',
-			required: true,
-			onBlur: async (event: Event) => {
-				passwd = await hash(event.srcElement.value);
-			},
-			checkValid: () => {
-				return passwd !== '' && passwd !== null && passwd !== undefined && passwd === passwdTest;
-			}
-		},
-		{
-			label: 'Passwort wiederholen',
-			name: 'Passwort wiederholen',
-			type: 'password',
-			placeholder: 'Passwort wiederholen',
-			required: true,
-			onBlur: async (event: Event) => {
-				passwdTest = await hash(event.srcElement.value);
-			},
-			checkValid: () => {
-				return passwd !== '' && passwd !== null && passwd !== undefined && passwd === passwdTest;
-			}
-		}
-	];
+	
 </script>
 
-<UserRegistration {data} />
+<UserRegistration />

From 5d9240704d928cb6e1533087992ea26a5d63d296 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Tue, 15 Oct 2024 14:54:30 +0200
Subject: [PATCH 06/26] work on submission of data in userregistration

---
 .../lib/components/UserRegistration.svelte    | 64 ++++++++++++++-----
 frontend/src/locales/de.json                  |  5 +-
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index 5bf5a55e..87b0a12a 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -1,24 +1,57 @@
 <script lang="ts">
 	import { base } from '$app/paths';
+	import { registerRegister } from '$lib/client/services.gen';
+	import { type RegisterRegisterData } from '$lib/client/types.gen';
 	import AlertMessage from '$lib/components/AlertMessage.svelte';
 	import DataInput from '$lib/components/DataInput/DataInput.svelte';
 	import { preventDefault } from '$lib/util';
 	import { Button, Card, Heading, Input } from 'flowbite-svelte';
+	
 	import { _ } from 'svelte-i18n';
 
 
+	const userData: RegisterRegisterData = {
+		body: {
+			email: "",
+			password: ""
+		}
+	};
+
+
+	function verify() {
+		return data[1].value !== "" && data[2].value === data[1].value;
+	}
+
+	async function submitData() {
+
+		const equalPW = verify();
+
+		if (equalPW) {
+			userData.body.email = data[0].value
+			userData.body.password = data[1].value
+			console.log('userData: ', userData);
+			const result = await registerRegister(userData)
+			console.log(result);
+		}
+		else {
+			showAlert = true; 
+			alertMessage = $_('registration.alertMessagePasswords')
+		}
+	}
+
+
 	const data = [
-		{
-			component: Input,
-			props: {
-				label: $_('registration.usernameLabel'),
-				type: 'text',
-				placeholder: $_('registration.usernameLabel'),
-				required: true,
-				id: 'username'
-			},
-			value: ''
-		},
+		// {
+		// 	component: Input,
+		// 	props: {
+		// 		label: $_('registration.usernameLabel'),
+		// 		type: 'text',
+		// 		placeholder: $_('registration.usernameLabel'),
+		// 		required: true,
+		// 		id: 'username'
+		// 	},
+		// 	value: ''
+		// },
 		{
 			component: Input,
 			props: {
@@ -56,14 +89,14 @@
 	];
 
 	let showAlert: boolean = false;
-
+	let alertMessage = $_('registration.alertMessageMissing'); 
 </script>
 
 <!-- Show big alert message when something is missing -->
 {#if showAlert}
 	<AlertMessage
 		title={$_('registration.alertMessageTitle')}
-		message={$_('registration.alertMessage')}
+		message={alertMessage}
 		infopage="{base}/info"
 		infotitle="Was passiert mit den Daten"
 		onclick={() => {
@@ -81,10 +114,7 @@
 			>{$_('registration.heading')}
 		</Heading>
 
-		<form onsubmit={preventDefault((e) => {
-			console.log('event: ', e);
-		})} class="m-2 mx-auto w-full flex-col space-y-6">
-
+		<form onsubmit={preventDefault(submitData)} class="m-2 mx-auto w-full flex-col space-y-6">
 			{#each data as element, i}
 				<DataInput
 					component={element.component}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index c2da69b7..2e1bcbb5 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -39,11 +39,12 @@
 	},
 	"registration": {
 		"heading": "Als neuer Benutzer registrieren", 
-		"alertMessage": "Bitte füllen Sie alle Felder aus.", 
+		"alertMessageMissing": "Bitte füllen Sie alle Felder aus.", 
+		"alertMessagePasswords": "Passwörter stimmen nicht überein",
 		"alertMessageTitle": "Fehler",
 		"usernameLabel": "Benutzername",
 		"passwordLabel": "Passwort",
-		"emailLabel": "e-Mail",
+		"emailLabel": "E-Mail",
 		"passwordConfirmLabel": "Passwort wiederholen",
 		"role": "Rolle",
 		"observerRole": "Beobachter",

From 60deb5bffc00e9d83f843e73633afb4556917837 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Tue, 15 Oct 2024 15:22:06 +0200
Subject: [PATCH 07/26] add user registration verify and success page

---
 .../lib/components/UserRegistration.svelte    | 53 ++++++++++++-------
 frontend/src/locales/de.json                  |  4 +-
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index 87b0a12a..f9feca4f 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -6,7 +6,7 @@
 	import DataInput from '$lib/components/DataInput/DataInput.svelte';
 	import { preventDefault } from '$lib/util';
 	import { Button, Card, Heading, Input } from 'flowbite-svelte';
-	
+	import { CheckCircleOutline } from 'flowbite-svelte-icons';
 	import { _ } from 'svelte-i18n';
 
 
@@ -17,21 +17,24 @@
 		}
 	};
 
-
-	function verify() {
-		return data[1].value !== "" && data[2].value === data[1].value;
-	}
-
 	async function submitData() {
 
-		const equalPW = verify();
+		const equalPW = data[1].value !== "" && data[2].value === data[1].value;
 
 		if (equalPW) {
 			userData.body.email = data[0].value
 			userData.body.password = data[1].value
-			console.log('userData: ', userData);
 			const result = await registerRegister(userData)
-			console.log(result);
+
+			if (result.error) {
+				console.log('error: ', result.error); 
+				showAlert = true;
+				data.map((element)=> {element.value = "";});
+			}
+			else {
+				console.log('successful transmission: ', result.response.status);
+				success=true;
+			}
 		}
 		else {
 			showAlert = true; 
@@ -89,6 +92,7 @@
 	];
 
 	let showAlert: boolean = false;
+	let success: boolean = true;
 	let alertMessage = $_('registration.alertMessageMissing'); 
 </script>
 
@@ -106,14 +110,14 @@
 {/if}
 
 <!-- The actual content -->
-<div class="container m-1 mx-auto w-full max-w-xl">
-	<Card class="container m-1 mx-auto w-full max-w-xl">
-		<Heading
-			tag="h3"
-			class="m-1 mb-3 p-1 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
-			>{$_('registration.heading')}
-		</Heading>
+<Card class="container m-2 p-2 mx-auto w-full max-w-xl">
+	<Heading
+		tag="h3"
+		class="m-1 mb-3 p-1 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
+		>{$_('registration.heading')}
+	</Heading>
 
+	{#if success === false}
 		<form onsubmit={preventDefault(submitData)} class="m-2 mx-auto w-full flex-col space-y-6">
 			{#each data as element, i}
 				<DataInput
@@ -134,5 +138,18 @@
 			class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
 			>{$_('registration.submitButtonLabel')}</Button>
 		</form>
-	</Card>
-</div>
+	{:else}
+		<div class="m-2 p-2 w-full mx-auto text-gray-700 dark:text-gray-400 flex justify-center items-center"> 
+			<CheckCircleOutline size="xl" color='green' class="m-2"/>  
+			<div class="m-2 p-2">
+			{$_('registration.successMessage')}
+			</div>
+		</div>
+		<Button 
+		type="button" 
+		class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+		href = "/">
+		{$_('registration.goHome')}
+		</Button>
+	{/if}
+</Card>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 2e1bcbb5..2f480037 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -51,7 +51,9 @@
 		"scientistRole": "Wissenschaftler",
 		"adminRole": "Admin",
 		"submitButtonLabel": "Absenden",
-		"selectPlaceholder": "Bitte auswählen"
+		"selectPlaceholder": "Bitte auswählen", 
+		"successMessage": "Bitte überprüfen sie ihr E-Mail Postfach", 
+		"goHome": "Zur Hauptseite"
 	},
 	"login": {
 		"heading": "Einloggen",

From 93d2b7e4b7e9c2e4d86f2d52a007ab77ad0d7aa3 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Tue, 15 Oct 2024 15:34:52 +0200
Subject: [PATCH 08/26] remove commented out code

---
 frontend/src/lib/components/UserRegistration.svelte | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index f9feca4f..21feb3de 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -44,17 +44,6 @@
 
 
 	const data = [
-		// {
-		// 	component: Input,
-		// 	props: {
-		// 		label: $_('registration.usernameLabel'),
-		// 		type: 'text',
-		// 		placeholder: $_('registration.usernameLabel'),
-		// 		required: true,
-		// 		id: 'username'
-		// 	},
-		// 	value: ''
-		// },
 		{
 			component: Input,
 			props: {
@@ -92,7 +81,7 @@
 	];
 
 	let showAlert: boolean = false;
-	let success: boolean = true;
+	let success: boolean = false;
 	let alertMessage = $_('registration.alertMessageMissing'); 
 </script>
 

From 2b2a4ca60c9f5c68613d4e63e29e3086d129d19f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:39:54 +0000
Subject: [PATCH 09/26] update openapi.json & openapi-ts client, run pnpm
 format

---
 frontend/src/lib/components/UserLogin.svelte  |  4 +-
 .../lib/components/UserRegistration.svelte    | 68 +++++++++----------
 frontend/src/locales/de.json                  |  8 +--
 .../userLand/userRegistration/+page.svelte    |  1 -
 4 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index edf17fa1..8be01585 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -131,7 +131,7 @@
 			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
 			<Button
-				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 				type="submit">{$_('login.submitButtonLabel')}</Button
 			>
 		</form>
@@ -140,7 +140,7 @@
 	<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
 	<a
 		href={`${base}/userLand/userRegistration`}
-		class="text-primary-700 dark:text-primary-500 hover:underline"
+		class="text-primary-700 hover:underline dark:text-primary-500"
 	>
 		Create account
 	</a>
diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index 21feb3de..3540adee 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -9,45 +9,42 @@
 	import { CheckCircleOutline } from 'flowbite-svelte-icons';
 	import { _ } from 'svelte-i18n';
 
-
 	const userData: RegisterRegisterData = {
 		body: {
-			email: "",
-			password: ""
+			email: '',
+			password: ''
 		}
 	};
 
 	async function submitData() {
-
-		const equalPW = data[1].value !== "" && data[2].value === data[1].value;
+		const equalPW = data[1].value !== '' && data[2].value === data[1].value;
 
 		if (equalPW) {
-			userData.body.email = data[0].value
-			userData.body.password = data[1].value
-			const result = await registerRegister(userData)
+			userData.body.email = data[0].value;
+			userData.body.password = data[1].value;
+			const result = await registerRegister(userData);
 
 			if (result.error) {
-				console.log('error: ', result.error); 
+				console.log('error: ', result.error);
 				showAlert = true;
-				data.map((element)=> {element.value = "";});
-			}
-			else {
+				data.map((element) => {
+					element.value = '';
+				});
+			} else {
 				console.log('successful transmission: ', result.response.status);
-				success=true;
+				success = true;
 			}
-		}
-		else {
-			showAlert = true; 
-			alertMessage = $_('registration.alertMessagePasswords')
+		} else {
+			showAlert = true;
+			alertMessage = $_('registration.alertMessagePasswords');
 		}
 	}
 
-
 	const data = [
 		{
 			component: Input,
 			props: {
-				label:  $_('registration.emailLabel'),
+				label: $_('registration.emailLabel'),
 				type: 'email',
 				placeholder: $_('registration.emailLabel'),
 				required: true,
@@ -65,7 +62,6 @@
 				id: 'password'
 			},
 			value: ''
-
 		},
 		{
 			component: Input,
@@ -82,7 +78,7 @@
 
 	let showAlert: boolean = false;
 	let success: boolean = false;
-	let alertMessage = $_('registration.alertMessageMissing'); 
+	let alertMessage = $_('registration.alertMessageMissing');
 </script>
 
 <!-- Show big alert message when something is missing -->
@@ -93,13 +89,13 @@
 		infopage="{base}/info"
 		infotitle="Was passiert mit den Daten"
 		onclick={() => {
-			showAlert = false;		
+			showAlert = false;
 		}}
 	/>
 {/if}
 
 <!-- The actual content -->
-<Card class="container m-2 p-2 mx-auto w-full max-w-xl">
+<Card class="container m-2 mx-auto w-full max-w-xl p-2">
 	<Heading
 		tag="h3"
 		class="m-1 mb-3 p-1 text-center font-bold tracking-tight text-gray-700 dark:text-gray-400"
@@ -123,22 +119,26 @@
 			{/each}
 
 			<Button
-			type="submit"
-			class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
-			>{$_('registration.submitButtonLabel')}</Button>
+				type="submit"
+				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+				>{$_('registration.submitButtonLabel')}</Button
+			>
 		</form>
 	{:else}
-		<div class="m-2 p-2 w-full mx-auto text-gray-700 dark:text-gray-400 flex justify-center items-center"> 
-			<CheckCircleOutline size="xl" color='green' class="m-2"/>  
+		<div
+			class="m-2 mx-auto flex w-full items-center justify-center p-2 text-gray-700 dark:text-gray-400"
+		>
+			<CheckCircleOutline size="xl" color="green" class="m-2" />
 			<div class="m-2 p-2">
-			{$_('registration.successMessage')}
+				{$_('registration.successMessage')}
 			</div>
 		</div>
-		<Button 
-		type="button" 
-		class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
-		href = "/">
-		{$_('registration.goHome')}
+		<Button
+			type="button"
+			class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+			href="/"
+		>
+			{$_('registration.goHome')}
 		</Button>
 	{/if}
 </Card>
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 2f480037..15cba320 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -38,8 +38,8 @@
 		"images": "Bilder"
 	},
 	"registration": {
-		"heading": "Als neuer Benutzer registrieren", 
-		"alertMessageMissing": "Bitte füllen Sie alle Felder aus.", 
+		"heading": "Als neuer Benutzer registrieren",
+		"alertMessageMissing": "Bitte füllen Sie alle Felder aus.",
 		"alertMessagePasswords": "Passwörter stimmen nicht überein",
 		"alertMessageTitle": "Fehler",
 		"usernameLabel": "Benutzername",
@@ -51,8 +51,8 @@
 		"scientistRole": "Wissenschaftler",
 		"adminRole": "Admin",
 		"submitButtonLabel": "Absenden",
-		"selectPlaceholder": "Bitte auswählen", 
-		"successMessage": "Bitte überprüfen sie ihr E-Mail Postfach", 
+		"selectPlaceholder": "Bitte auswählen",
+		"successMessage": "Bitte überprüfen sie ihr E-Mail Postfach",
 		"goHome": "Zur Hauptseite"
 	},
 	"login": {
diff --git a/frontend/src/routes/userLand/userRegistration/+page.svelte b/frontend/src/routes/userLand/userRegistration/+page.svelte
index 52c3eade..104f34b5 100644
--- a/frontend/src/routes/userLand/userRegistration/+page.svelte
+++ b/frontend/src/routes/userLand/userRegistration/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import UserRegistration from '$lib/components/UserRegistration.svelte';
-	
 </script>
 
 <UserRegistration />

From 32f3aecae42ba3ca82db79cd6883204edb13198b Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 09:19:54 +0200
Subject: [PATCH 10/26] add role, e-mail to login

---
 frontend/src/lib/components/UserLogin.svelte  | 10 ++---
 .../lib/components/UserRegistration.svelte    | 42 +++++++++++++++----
 frontend/src/locales/de.json                  |  7 ++--
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index 8be01585..76533572 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -45,7 +45,7 @@
 			value: '',
 			props: {
 				label: $_('login.usernameLabel'),
-				type: 'text',
+				type: 'email',
 				placeholder: $_('login.usernameLabel'),
 				required: true,
 				id: 'username'
@@ -67,7 +67,7 @@
 			value: '',
 			props: {
 				label: $_('login.role'),
-				items: [$_('login.observerRole'), $_('login.scientistRole'), $_('login.adminRole')].map(
+				items: [$_('login.observerRole'), $_('login.researcherRole'), $_('login.adminRole')].map(
 					(v) => {
 						return { name: String(v), value: v };
 					}
@@ -87,7 +87,7 @@
 {#if showAlert}
 	<AlertMessage
 		title={$_('login.alertMessageTitle')}
-		message={$_('login.LOGIN_BAD_CREDENTIALS')}
+		message={$_('login.badCredentials')}
 		lastpage={`${base}/userLand/userLogin`}
 		onclick={() => {
 			showAlert = false;
@@ -131,7 +131,7 @@
 			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
 			<Button
-				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
 				type="submit">{$_('login.submitButtonLabel')}</Button
 			>
 		</form>
@@ -140,7 +140,7 @@
 	<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
 	<a
 		href={`${base}/userLand/userRegistration`}
-		class="text-primary-700 hover:underline dark:text-primary-500"
+		class="text-primary-700 dark:text-primary-500 hover:underline"
 	>
 		Create account
 	</a>
diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index 3540adee..985db12f 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -5,35 +5,41 @@
 	import AlertMessage from '$lib/components/AlertMessage.svelte';
 	import DataInput from '$lib/components/DataInput/DataInput.svelte';
 	import { preventDefault } from '$lib/util';
-	import { Button, Card, Heading, Input } from 'flowbite-svelte';
+	import { Button, Card, Heading, Input, Select } from 'flowbite-svelte';
 	import { CheckCircleOutline } from 'flowbite-svelte-icons';
 	import { _ } from 'svelte-i18n';
 
 	const userData: RegisterRegisterData = {
 		body: {
 			email: '',
-			password: ''
+			password: '',
+			is_superuser: false,
+			is_researcher: false
 		}
 	};
 
-	async function submitData() {
+	async function submitData(): Promise<void> {
 		const equalPW = data[1].value !== '' && data[2].value === data[1].value;
 
 		if (equalPW) {
 			userData.body.email = data[0].value;
 			userData.body.password = data[1].value;
+			userData.body.is_researcher = data[3].value === $_('registration.researcherRole');
+			userData.body.is_superuser = data[3].value === $_('registration.adminRole');
+
 			const result = await registerRegister(userData);
 
 			if (result.error) {
-				console.log('error: ', result.error);
+				console.log('error: ', result.response.status, result.error.detail);
+				alertMessage = $_('registration.alertMessageError') + ': ' + result.error.detail;
 				showAlert = true;
-				data.map((element) => {
-					element.value = '';
-				});
 			} else {
 				console.log('successful transmission: ', result.response.status);
 				success = true;
 			}
+			data.map((element) => {
+				element.value = '';
+			});
 		} else {
 			showAlert = true;
 			alertMessage = $_('registration.alertMessagePasswords');
@@ -73,6 +79,24 @@
 				id: 'passwordConfirm'
 			},
 			value: ''
+		},
+		{
+			component: Select,
+			props: {
+				label: $_('registration.role'),
+				type: 'text',
+				placeholder: $_('registration.selectPlaceholder'),
+				required: true,
+				id: 'role',
+				items: [
+					$_('registration.observerRole'),
+					$_('registration.researcherRole'),
+					$_('registration.adminRole')
+				].map((v) => {
+					return { name: String(v), value: v };
+				})
+			},
+			value: ''
 		}
 	];
 
@@ -120,7 +144,7 @@
 
 			<Button
 				type="submit"
-				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
 				>{$_('registration.submitButtonLabel')}</Button
 			>
 		</form>
@@ -135,7 +159,7 @@
 		</div>
 		<Button
 			type="button"
-			class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+			class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
 			href="/"
 		>
 			{$_('registration.goHome')}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 15cba320..612e5481 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -40,6 +40,7 @@
 	"registration": {
 		"heading": "Als neuer Benutzer registrieren",
 		"alertMessageMissing": "Bitte füllen Sie alle Felder aus.",
+		"alertMessageError": "Ein Fehler ist aufgetreten",
 		"alertMessagePasswords": "Passwörter stimmen nicht überein",
 		"alertMessageTitle": "Fehler",
 		"usernameLabel": "Benutzername",
@@ -48,7 +49,7 @@
 		"passwordConfirmLabel": "Passwort wiederholen",
 		"role": "Rolle",
 		"observerRole": "Beobachter",
-		"scientistRole": "Wissenschaftler",
+		"researcherRole": "Wissenschaftler",
 		"adminRole": "Admin",
 		"submitButtonLabel": "Absenden",
 		"selectPlaceholder": "Bitte auswählen",
@@ -59,12 +60,12 @@
 		"heading": "Einloggen",
 		"alreadyLoggedInMessage": "Sie sind bereits angemeldet. Melden sie sich zuerst ab um den Account zu wechseln.",
 		"alertMessageTitle": "Fehler",
-		"LOGIN_BAD_CREDENTIALS": "Ungültige E-Mail-Adresse oder ungültiges Passwort",
+		"badCredentials": "Ungültige E-Mail-Adresse oder ungültiges Passwort",
 		"usernameLabel": "Benutzerkennung",
 		"passwordLabel": "Passwort",
 		"role": "Rolle",
 		"observerRole": "Beobachter",
-		"scientistRole": "Wissenschaftler",
+		"researcherRole": "Wissenschaftler",
 		"adminRole": "Admin",
 		"submitButtonLabel": "Absenden",
 		"selectPlaceholder": "Bitte auswählen"

From 2fc5758071ab2f74eb529767248646af7ab32ce4 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 11:52:06 +0200
Subject: [PATCH 11/26] add store for current user

---
 frontend/src/lib/stores/userStore.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/stores/userStore.ts b/frontend/src/lib/stores/userStore.ts
index 26821d87..ae95a900 100644
--- a/frontend/src/lib/stores/userStore.ts
+++ b/frontend/src/lib/stores/userStore.ts
@@ -1,4 +1,6 @@
+import { type UserRead } from '$lib/client/types.gen';
 import { BasicStore } from '$lib/stores/basicStore';
+import { writable } from 'svelte/store';
 
 interface UserData {
 	name: string;
@@ -86,4 +88,6 @@ async function hash(input: string): string {
 	return hash;
 }
 
-export { createDummyUser, hash, users, UserStore, type UserData, type UserList };
+const currentUser = writable(null as unknown as UserRead);
+
+export { createDummyUser, currentUser, hash, users, UserStore, type UserData, type UserList };

From 4c0e3a2d1b412755eadc7f151a89686a453d6b5c Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 11:52:17 +0200
Subject: [PATCH 12/26] work on making login persistent

---
 frontend/src/lib/components/UserLogin.svelte  | 48 +++++++++-----
 .../src/lib/components/UserProfile.svelte     | 62 ++++++++++++++-----
 2 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index 76533572..b4d79082 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -6,17 +6,32 @@
 	import DataInput from '$lib/components/DataInput/DataInput.svelte';
 
 	import { goto } from '$app/navigation';
-	import { authCookieLogin } from '$lib/client';
+	import { authCookieLogin, usersCurrentUser } from '$lib/client/services.gen';
 	import {
 		type AuthCookieLoginData,
-		type Body_auth_cookie_login_auth_login_post
+		type Body_auth_cookie_login_auth_login_post,
+		type UserRead
 	} from '$lib/client/types.gen';
+	import { currentUser } from '$lib/stores/userStore';
 	import { preventDefault } from '$lib/util';
 	import { Button, Card, Heading, Input, Select } from 'flowbite-svelte';
 	import { _ } from 'svelte-i18n';
 
+	async function refresh(): Promise<string> {
+		const returned = await usersCurrentUser();
+		console.log('returned on refresh: ', returned);
+		if (returned.error) {
+			console.log('Error getting current user: ', returned.error.detail);
+			currentUser.set(null as unknown as UserRead);
+			return returned.error.detail;
+		} else {
+			currentUser.set(returned.data as UserRead);
+			return 'success';
+		}
+	}
+
 	// functionality
-	async function submitData() {
+	async function submitData(): Promise<void> {
 		const loginData: Body_auth_cookie_login_auth_login_post = {
 			username: formData[0].value,
 			password: formData[1].value
@@ -26,6 +41,8 @@
 			body: loginData
 		};
 
+		console.log('logindata: ', data);
+
 		const authReturn = await authCookieLogin(data);
 
 		if (authReturn.error) {
@@ -34,7 +51,16 @@
 				element.value = '';
 			}
 		} else {
-			goto('/userLand/userLandingpage');
+			const status: string = await refresh();
+
+			if (status !== 'success') {
+				console.log('error during retrieving active users: ', status);
+				showAlert = true;
+				alertMessage = $_('login.unauthorized') + ': ' + status;
+			} else {
+				console.log('login and user retrieval successful');
+				goto('/userLand/userLandingpage');
+			}
 		}
 	}
 
@@ -81,13 +107,13 @@
 
 	let remember: boolean = false;
 	let showAlert: boolean = false;
-	$: console.log('remember: ', remember, 'showAlert: ', showAlert);
+	let alertMessage: string = $_('login.badCredentials');
 </script>
 
 {#if showAlert}
 	<AlertMessage
 		title={$_('login.alertMessageTitle')}
-		message={$_('login.badCredentials')}
+		message={alertMessage}
 		lastpage={`${base}/userLand/userLogin`}
 		onclick={() => {
 			showAlert = false;
@@ -95,16 +121,6 @@
 	/>
 {/if}
 
-<!-- {#if users.get()['loggedIn'] && users.get()['loggedIn'] !== null}
-	<AlertMessage
-		title={$_('login.alertMessageTitle')}
-		message={$_('login.alreadyLoggedInMessage')}
-		lastpage={`${base}`}
-		onclick={() => {
-			showAlert = false;
-		}}
-	/>
-{:else} -->
 <div class="container m-2 mx-auto w-full max-w-xl">
 	<Card class="container m-2 mx-auto mb-6 w-full max-w-xl pb-6">
 		<Heading
diff --git a/frontend/src/lib/components/UserProfile.svelte b/frontend/src/lib/components/UserProfile.svelte
index 02153b7d..8902385a 100644
--- a/frontend/src/lib/components/UserProfile.svelte
+++ b/frontend/src/lib/components/UserProfile.svelte
@@ -1,39 +1,69 @@
 <script lang="ts">
+	import { goto } from '$app/navigation';
 	import { base } from '$app/paths';
-	import { users } from '$lib/stores/userStore';
+	import { authCookieLogout } from '$lib/client/services.gen';
+	import { type UserRead } from '$lib/client/types.gen';
+	import { currentUser } from '$lib/stores/userStore';
 	import { Button, Heading, Popover } from 'flowbite-svelte';
 	import { onDestroy } from 'svelte';
+	import { _ } from 'svelte-i18n';
+	import { get } from 'svelte/store';
+	import AlertMessage from './AlertMessage.svelte';
 
 	export let triggeredBy = '';
-	let loggedIn: string | null = users.get()['loggedIn'];
-	let userData: UserData | null = loggedIn ? users.fetch(loggedIn) : null;
 
-	const unsubscribe = users.subscribe((currentUserData) => {
-		loggedIn = currentUserData['loggedIn'];
+	let userData: UserRead | null = get(currentUser);
+	let showAlert: boolean = false;
+	let alertMessage: string = $_('login.alertMessageError');
 
-		if (loggedIn && loggedIn !== null) {
-			userData = users.fetch(loggedIn);
-		}
+	const unsubscribe = currentUser.subscribe((data) => {
+		console.log('data: ', data);
+		userData = data;
 	});
 
-	function logout() {
-		users.get()['loggedIn'] = null;
-		userData = null;
+	async function logout(): Promise<void> {
+		const response = await authCookieLogout();
+		if (response.error) {
+			console.log('Error during logout: ', response.response.status, response.error.detail);
+			showAlert = true;
+			alertMessage += ': ' + response.error.detail;
+		} else {
+			console.log('Successful logout of user ', userData.email, response.response.status);
+			userData = null;
+			goto(`/${base}`);
+		}
 	}
 
 	onDestroy(unsubscribe);
+
+	$: console.log('userData: ', userData);
 </script>
 
 <Popover {triggeredBy} class="text-gray-700 dark:text-gray-400">
+	{#if showAlert}
+		<AlertMessage
+			title={$_('login.alertMessageTitle')}
+			message={alertMessage}
+			onclick={() => {
+				showAlert = false;
+			}}
+		/>
+	{/if}
 	{#if userData !== null}
-		<div class="mx-auto flex flex-col items-center justify-center">
-			<p class="m-2 w-full rounded-lg border p-2 text-lg font-semibold">{userData.name}</p>
-			<Button href={`${base}/`} on:click={logout} size="lg">Logout</Button>
+		<div class="mx-auto mb-6 flex flex-col items-center justify-center space-y-6">
+			<p class="m-2 w-full rounded-lg p-2 font-semibold">{userData.email}</p>
+			<Button class="m-2 w-full" on:click={logout} size="lg"
+				>{$_('login.profileButtonLabelLogout')}</Button
+			>
 		</div>
 	{:else}
 		<div class="mx-auto mb-6 flex flex-col items-center justify-center space-y-6">
-			<Heading tag="h3">Willkommen!</Heading>
-			<Button href="{base}/userLand/userLogin">Einloggen oder Registrieren</Button>
+			<Heading tag="h3" class="mx-auto flex w-full justify-center"
+				>{$_('login.profileTitleDefault')}</Heading
+			>
+			<Button class="m-2 w-full" href="{base}/userLand/userLogin" size="lg"
+				>{$_('login.profileButtonLabelDefault')}</Button
+			>
 		</div>
 	{/if}
 </Popover>

From e914f4c2385210c3d58d7cc5f897e58b998568c2 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 11:52:24 +0200
Subject: [PATCH 13/26] add localizations

---
 frontend/src/locales/de.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 612e5481..533c522e 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -61,6 +61,8 @@
 		"alreadyLoggedInMessage": "Sie sind bereits angemeldet. Melden sie sich zuerst ab um den Account zu wechseln.",
 		"alertMessageTitle": "Fehler",
 		"badCredentials": "Ungültige E-Mail-Adresse oder ungültiges Passwort",
+		"badActiveUser": "Der Benutzer konnte nicht gefunden werden",
+		"unauthorized": "Zugang verweigert",
 		"usernameLabel": "Benutzerkennung",
 		"passwordLabel": "Passwort",
 		"role": "Rolle",
@@ -68,7 +70,10 @@
 		"researcherRole": "Wissenschaftler",
 		"adminRole": "Admin",
 		"submitButtonLabel": "Absenden",
-		"selectPlaceholder": "Bitte auswählen"
+		"selectPlaceholder": "Bitte auswählen",
+		"profileButtonLabelDefault": "Einloggen oder Registrieren",
+		"profileButtonLabelLogout": "Logout",
+		"profileTitleDefault": "Willkommen!"
 	},
 	"forgotPw": {
 		"heading": "Passwort vergessen?",

From f221554a17b72737bebd7cca38db6f6da279b0fa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 09:57:15 +0000
Subject: [PATCH 14/26] update openapi.json & openapi-ts client, run pnpm
 format

---
 frontend/src/lib/components/UserLogin.svelte        | 4 ++--
 frontend/src/lib/components/UserRegistration.svelte | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index b4d79082..63f57fbd 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -147,7 +147,7 @@
 			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
 			<Button
-				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 				type="submit">{$_('login.submitButtonLabel')}</Button
 			>
 		</form>
@@ -156,7 +156,7 @@
 	<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
 	<a
 		href={`${base}/userLand/userRegistration`}
-		class="text-primary-700 dark:text-primary-500 hover:underline"
+		class="text-primary-700 hover:underline dark:text-primary-500"
 	>
 		Create account
 	</a>
diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index 985db12f..3af851fb 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -144,7 +144,7 @@
 
 			<Button
 				type="submit"
-				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 				>{$_('registration.submitButtonLabel')}</Button
 			>
 		</form>
@@ -159,7 +159,7 @@
 		</div>
 		<Button
 			type="button"
-			class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+			class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 			href="/"
 		>
 			{$_('registration.goHome')}

From 122d47702a80eba86211571bc86e58485b1c3269 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 13:21:35 +0200
Subject: [PATCH 15/26] change around debug output

---
 frontend/src/lib/components/UserLogin.svelte  | 36 ++++++++-----------
 .../src/lib/components/UserProfile.svelte     |  3 +-
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index 63f57fbd..c27bfa3d 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -7,11 +7,7 @@
 
 	import { goto } from '$app/navigation';
 	import { authCookieLogin, usersCurrentUser } from '$lib/client/services.gen';
-	import {
-		type AuthCookieLoginData,
-		type Body_auth_cookie_login_auth_login_post,
-		type UserRead
-	} from '$lib/client/types.gen';
+	import { type AuthCookieLoginData, type UserRead } from '$lib/client/types.gen';
 	import { currentUser } from '$lib/stores/userStore';
 	import { preventDefault } from '$lib/util';
 	import { Button, Card, Heading, Input, Select } from 'flowbite-svelte';
@@ -19,12 +15,12 @@
 
 	async function refresh(): Promise<string> {
 		const returned = await usersCurrentUser();
-		console.log('returned on refresh: ', returned);
 		if (returned.error) {
 			console.log('Error getting current user: ', returned.error.detail);
 			currentUser.set(null as unknown as UserRead);
 			return returned.error.detail;
 		} else {
+			console.log('Successfully retrieved active user');
 			currentUser.set(returned.data as UserRead);
 			return 'success';
 		}
@@ -32,24 +28,23 @@
 
 	// functionality
 	async function submitData(): Promise<void> {
-		const loginData: Body_auth_cookie_login_auth_login_post = {
-			username: formData[0].value,
-			password: formData[1].value
-		};
-
-		const data: AuthCookieLoginData = {
-			body: loginData
+		const loginData: AuthCookieLoginData = {
+			body: {
+				username: formData[0].value,
+				password: formData[1].value
+			}
 		};
 
-		console.log('logindata: ', data);
+		const authReturn = await authCookieLogin(loginData);
 
-		const authReturn = await authCookieLogin(data);
+		// forget user data again to not have a plain text password lying around in memory somewhere
+		// any longer than needed
+		formData.forEach((element) => {
+			element.value = '';
+		});
 
 		if (authReturn.error) {
 			showAlert = true;
-			for (let element of formData) {
-				element.value = '';
-			}
 		} else {
 			const status: string = await refresh();
 
@@ -147,7 +142,7 @@
 			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
 			<Button
-				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
 				type="submit">{$_('login.submitButtonLabel')}</Button
 			>
 		</form>
@@ -156,9 +151,8 @@
 	<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
 	<a
 		href={`${base}/userLand/userRegistration`}
-		class="text-primary-700 hover:underline dark:text-primary-500"
+		class="text-primary-700 dark:text-primary-500 hover:underline"
 	>
 		Create account
 	</a>
 </div>
-<!-- {/if} -->
diff --git a/frontend/src/lib/components/UserProfile.svelte b/frontend/src/lib/components/UserProfile.svelte
index 8902385a..05bb301c 100644
--- a/frontend/src/lib/components/UserProfile.svelte
+++ b/frontend/src/lib/components/UserProfile.svelte
@@ -17,7 +17,6 @@
 	let alertMessage: string = $_('login.alertMessageError');
 
 	const unsubscribe = currentUser.subscribe((data) => {
-		console.log('data: ', data);
 		userData = data;
 	});
 
@@ -36,7 +35,7 @@
 
 	onDestroy(unsubscribe);
 
-	$: console.log('userData: ', userData);
+	$: console.log('userData in profile: ', userData);
 </script>
 
 <Popover {triggeredBy} class="text-gray-700 dark:text-gray-400">

From 38c296cd6c35e42b16eebd5c815fbe3bf6865292 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:22:23 +0000
Subject: [PATCH 16/26] update openapi.json & openapi-ts client, run pnpm
 format

---
 frontend/src/lib/components/UserLogin.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index c27bfa3d..648a6411 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -142,7 +142,7 @@
 			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
 			<Button
-				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 				type="submit">{$_('login.submitButtonLabel')}</Button
 			>
 		</form>
@@ -151,7 +151,7 @@
 	<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
 	<a
 		href={`${base}/userLand/userRegistration`}
-		class="text-primary-700 dark:text-primary-500 hover:underline"
+		class="text-primary-700 hover:underline dark:text-primary-500"
 	>
 		Create account
 	</a>

From d13f4b446329703aea5baed4450405fbd731db35 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 14:41:23 +0200
Subject: [PATCH 17/26] add verified warning page

---
 .../src/lib/components/UserLandingPage.svelte | 52 +++++++++++--------
 frontend/src/lib/components/UserLogin.svelte  | 20 ++-----
 .../lib/components/UserRegistration.svelte    | 41 +++++----------
 frontend/src/lib/components/UserVerify.svelte | 21 ++++++++
 4 files changed, 69 insertions(+), 65 deletions(-)
 create mode 100644 frontend/src/lib/components/UserVerify.svelte

diff --git a/frontend/src/lib/components/UserLandingPage.svelte b/frontend/src/lib/components/UserLandingPage.svelte
index ea57db8b..b15cc09f 100644
--- a/frontend/src/lib/components/UserLandingPage.svelte
+++ b/frontend/src/lib/components/UserLandingPage.svelte
@@ -1,21 +1,23 @@
 <script lang="ts">
+	import { activeTabChildren, activeTabPersonal, componentTable } from '$lib/stores/componentStore';
+	import { currentUser } from '$lib/stores/userStore';
 	import { TabItem, Tabs } from 'flowbite-svelte';
 	import { GridPlusSolid, ProfileCardSolid } from 'flowbite-svelte-icons';
+	import { get } from 'svelte/store';
+	import UserVerify from './UserVerify.svelte';
 
-	import { activeTabChildren, activeTabPersonal, componentTable } from '$lib/stores/componentStore';
 	import { onDestroy } from 'svelte';
 
-	export let userData: any[];
+	const isVerifed = get(currentUser)?.is_verified;
 	let currentPersonal = 'userDataInput';
 	let currentChildren = 'childrenGallery';
+	export let userData: any[];
 
 	const unsubscribePersonal = activeTabPersonal.subscribe((value) => {
-		console.log('personal tab: ', value);
 		currentPersonal = value;
 	});
 
 	const unsubscribeChildren = activeTabChildren.subscribe((value) => {
-		console.log('children tab: ', value);
 		currentChildren = value;
 	});
 
@@ -23,23 +25,29 @@
 		unsubscribeChildren();
 		unsubscribePersonal();
 	});
+	console.log('user: ', get(currentUser));
+	console.log('  verified: ', isVerifed);
 </script>
 
-<div class="m-2 p-2">
-	<Tabs tabStyle="pill">
-		<TabItem open={true}>
-			<div slot="title" class="flex items-center gap-2 text-lg">
-				<ProfileCardSolid size="lg" />
-				Persönliche Daten
-			</div>
-			<svelte:component this={componentTable[currentPersonal]} data={userData} />
-		</TabItem>
-		<TabItem>
-			<div slot="title" class="flex items-center gap-2 text-lg">
-				<GridPlusSolid size="lg" />
-				Kinder
-			</div>
-			<svelte:component this={componentTable[currentChildren]} />
-		</TabItem>
-	</Tabs>
-</div>
+{#if isVerifed === true}
+	<div class="m-2 p-2">
+		<Tabs tabStyle="pill">
+			<TabItem open={true}>
+				<div slot="title" class="flex items-center gap-2 text-lg">
+					<ProfileCardSolid size="lg" />
+					Persönliche Daten
+				</div>
+				<svelte:component this={componentTable[currentPersonal]} data={userData} />
+			</TabItem>
+			<TabItem>
+				<div slot="title" class="flex items-center gap-2 text-lg">
+					<GridPlusSolid size="lg" />
+					Kinder
+				</div>
+				<svelte:component this={componentTable[currentChildren]} />
+			</TabItem>
+		</Tabs>
+	</div>
+{:else}
+	<UserVerify />
+{/if}
diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index c27bfa3d..28df05cf 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -10,7 +10,7 @@
 	import { type AuthCookieLoginData, type UserRead } from '$lib/client/types.gen';
 	import { currentUser } from '$lib/stores/userStore';
 	import { preventDefault } from '$lib/util';
-	import { Button, Card, Heading, Input, Select } from 'flowbite-svelte';
+	import { Button, Card, Heading, Input } from 'flowbite-svelte';
 	import { _ } from 'svelte-i18n';
 
 	async function refresh(): Promise<string> {
@@ -21,6 +21,9 @@
 			return returned.error.detail;
 		} else {
 			console.log('Successfully retrieved active user');
+			// TODO: remove this in the final version, this sets verified to true
+			// to emulate a successful user registration
+			returned.data.is_verified = true;
 			currentUser.set(returned.data as UserRead);
 			return 'success';
 		}
@@ -82,21 +85,6 @@
 				required: true,
 				id: 'password'
 			}
-		},
-		{
-			component: Select,
-			value: '',
-			props: {
-				label: $_('login.role'),
-				items: [$_('login.observerRole'), $_('login.researcherRole'), $_('login.adminRole')].map(
-					(v) => {
-						return { name: String(v), value: v };
-					}
-				),
-				placeholder: $_('login.selectPlaceholder'),
-				required: true,
-				id: 'role'
-			}
 		}
 	];
 
diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index 3af851fb..af04c244 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -6,26 +6,27 @@
 	import DataInput from '$lib/components/DataInput/DataInput.svelte';
 	import { preventDefault } from '$lib/util';
 	import { Button, Card, Heading, Input, Select } from 'flowbite-svelte';
-	import { CheckCircleOutline } from 'flowbite-svelte-icons';
 	import { _ } from 'svelte-i18n';
-
-	const userData: RegisterRegisterData = {
-		body: {
-			email: '',
-			password: '',
-			is_superuser: false,
-			is_researcher: false
-		}
-	};
+	import UserVerify from './UserVerify.svelte';
 
 	async function submitData(): Promise<void> {
 		const equalPW = data[1].value !== '' && data[2].value === data[1].value;
 
+		const userData: RegisterRegisterData = {
+			body: {
+				email: '',
+				password: '',
+				is_active: false,
+				is_superuser: false,
+				is_researcher: false
+			}
+		};
 		if (equalPW) {
 			userData.body.email = data[0].value;
 			userData.body.password = data[1].value;
 			userData.body.is_researcher = data[3].value === $_('registration.researcherRole');
 			userData.body.is_superuser = data[3].value === $_('registration.adminRole');
+			userData.body.is_active = true;
 
 			const result = await registerRegister(userData);
 
@@ -37,7 +38,7 @@
 				console.log('successful transmission: ', result.response.status);
 				success = true;
 			}
-			data.map((element) => {
+			data.forEach((element) => {
 				element.value = '';
 			});
 		} else {
@@ -144,25 +145,11 @@
 
 			<Button
 				type="submit"
-				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
 				>{$_('registration.submitButtonLabel')}</Button
 			>
 		</form>
 	{:else}
-		<div
-			class="m-2 mx-auto flex w-full items-center justify-center p-2 text-gray-700 dark:text-gray-400"
-		>
-			<CheckCircleOutline size="xl" color="green" class="m-2" />
-			<div class="m-2 p-2">
-				{$_('registration.successMessage')}
-			</div>
-		</div>
-		<Button
-			type="button"
-			class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
-			href="/"
-		>
-			{$_('registration.goHome')}
-		</Button>
+		<UserVerify />
 	{/if}
 </Card>
diff --git a/frontend/src/lib/components/UserVerify.svelte b/frontend/src/lib/components/UserVerify.svelte
new file mode 100644
index 00000000..5532f773
--- /dev/null
+++ b/frontend/src/lib/components/UserVerify.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+	import { Button } from 'flowbite-svelte';
+	import { CheckCircleOutline } from 'flowbite-svelte-icons';
+	import { _ } from 'svelte-i18n';
+</script>
+
+<div
+	class="m-2 mx-auto flex w-full items-center justify-center p-2 text-gray-700 dark:text-gray-400"
+>
+	<CheckCircleOutline size="xl" color="green" class="m-2" />
+	<div class="m-2 p-2">
+		{$_('registration.successMessage')}
+	</div>
+</div>
+<Button
+	type="button"
+	class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+	href="/"
+>
+	{$_('registration.goHome')}
+</Button>

From ebc9bb0c78ac5c6e8132ced291ae5067ca3334e9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:42:18 +0000
Subject: [PATCH 18/26] update openapi.json & openapi-ts client, run pnpm
 format

---
 frontend/src/lib/components/UserRegistration.svelte | 2 +-
 frontend/src/lib/components/UserVerify.svelte       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index af04c244..f526ef21 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -145,7 +145,7 @@
 
 			<Button
 				type="submit"
-				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 				>{$_('registration.submitButtonLabel')}</Button
 			>
 		</form>
diff --git a/frontend/src/lib/components/UserVerify.svelte b/frontend/src/lib/components/UserVerify.svelte
index 5532f773..f2d02943 100644
--- a/frontend/src/lib/components/UserVerify.svelte
+++ b/frontend/src/lib/components/UserVerify.svelte
@@ -14,7 +14,7 @@
 </div>
 <Button
 	type="button"
-	class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+	class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 	href="/"
 >
 	{$_('registration.goHome')}

From 4fce6e664eb36a8a9a43513b807572c13c0b30fd Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 15:07:07 +0200
Subject: [PATCH 19/26] add data deletion

---
 frontend/src/lib/components/UserRegistration.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index af04c244..a44aae18 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -29,7 +29,9 @@
 			userData.body.is_active = true;
 
 			const result = await registerRegister(userData);
-
+			data.forEach((element) => {
+				element.value = '';
+			});
 			if (result.error) {
 				console.log('error: ', result.response.status, result.error.detail);
 				alertMessage = $_('registration.alertMessageError') + ': ' + result.error.detail;

From 9d3e45f8a0a0b21b045d4b4957b6dd99cb74062b Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 16:55:24 +0200
Subject: [PATCH 20/26] some corrections

---
 default.cert                                  | 29 +++++++++++++++++++
 .../src/lib/components/UserLandingPage.svelte |  3 +-
 frontend/src/lib/components/UserLogin.svelte  | 12 ++------
 .../lib/components/UserRegistration.svelte    |  8 ++---
 frontend/src/lib/stores/userStore.ts          |  2 +-
 5 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 default.cert

diff --git a/default.cert b/default.cert
new file mode 100644
index 00000000..cffe3c08
--- /dev/null
+++ b/default.cert
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFCTCCAvGgAwIBAgIUbvD0dvnZOCfstZkE6ByRwYah4VMwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI0MTAxNjA4NDM0OFoXDTI1MTAx
+NjA4NDM0OFowFDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEApiFVMNAFtrai9s/xP+kYxsa7NzmPBlJg07MsFlW7JPek
+FMAy/4HSSZd8gG3fWz73U3cy4J+Oecdy3O0T708ImVBcYskN/Hi/JCBuTRSJZqH4
+SlFFqoqR5E8H1bVDL9l4QQgWqoBzNiAEwBMlPSTAeoL91a02qYIPTNjVx93d+1Ua
+eGq3/4HhYxogD6vjJOol32T2Twe7xMJ2j4IIsaQLvprA05HhYpJOxRkeuJQO7TEv
+o5VcwxURtKm15z8GN6Fj0/MQ/edvj6l59g4ywtNeqIKyQHq/B9QVsfYQIK3HA9j/
+Z5cVEfvMjhMl2x6Bh29npg2DRWiucRJioEwRYsxP5G8DO6f0maP+siY8lZrrioxV
+LVbyz4z6skFSoGR0lY59oe4+V4UR8Djww/WxuzmI8UJFT0/2cV1ux8mY/UAePjUo
+HOzkUn7E669eabRldcBzWpb0ocmeufPdi+LWGHvZxE4v3iUVsxv+GgH7QAYy2LV3
+XW5PwHGEMbOkrb772oe13IEYiXCXKgPheI26u3dw6LUKk9V2w+aGvjfjY7IQMDZy
+kZ6r5XdLeyUMYfu2UEs+8e8WTW+DYade35k9Hd2AWYYjoGeUjEoht1KKVA9cTyMg
+Mf34u40bR5xb9TRLSZc9ZR3OBIIT3gea0gdNQ59XBwRHzcdW1bgOARFcYGcjWOkC
+AwEAAaNTMFEwHQYDVR0OBBYEFJS1zAOTGWa0+TgIne/tFIk2h3dsMB8GA1UdIwQY
+MBaAFJS1zAOTGWa0+TgIne/tFIk2h3dsMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggIBACAc9yR77JcUdFYPqVwwkm/hLPTKzcJCEgUZ/8MuYk8CEDxf
+ZPeckksEaKHOCi4R6pUqGRudQ7+jW7z9+1zU4iS3s6TxoydTuIFIWlVWfvlCRtWi
+CldfpHJH/fw8c7g0pV5neEMKmA1E2tNz8escjSqIDy8Ow8TUbZQvupId+izIg705
+gd5Bjb88WlGsEIEY7myIgU7MvSFwv2hogqUGomjJIv9dArOS3hDcLoFcL5Nb3W7/
+CqLgwOUPsLy+/bS8DvYe3Q6knPUmiPYA+jI0XNYmDqadrv00/5sYKEU27dKsu2RZ
+GSD+M0cgxrDfO+hthlYVefak0edz0T3WYxVc+PFGmm6CjDd0Y2iCabaAID8RJzEf
+GUwZRbrF0sQWWwvwxtMUvxvCY1I8N1gTFYaH6mDPPYPd72Cbu5UBtsOg1SHJ3WuE
+rSUWgkjieQIS87kDMgFKcgrUUogkkivJhXy0dBWDQAZtHbG5qUuqypRlmGgST1zI
+aRQD+tIR8aY6lsG8GAGXrSXA8YOyDHNwkR+7LpC6eNi96GDbOJdy6aF7qmJ3beRw
+vP5MDwsITZp9BM3IofFQVS7MVEuPQ71plM/aqM5Jf0tqZFpzPN3S+udycyzHfPrK
+5OBU6MSaClmyrsTjsh0TjCdOVZrX1nNvfg+2WlfzMn9XfQlpd+iXbjuShFuP
+-----END CERTIFICATE-----
diff --git a/frontend/src/lib/components/UserLandingPage.svelte b/frontend/src/lib/components/UserLandingPage.svelte
index b15cc09f..4dd25e0f 100644
--- a/frontend/src/lib/components/UserLandingPage.svelte
+++ b/frontend/src/lib/components/UserLandingPage.svelte
@@ -8,6 +8,7 @@
 
 	import { onDestroy } from 'svelte';
 
+	console.log('user: ', get(currentUser));
 	const isVerifed = get(currentUser)?.is_verified;
 	let currentPersonal = 'userDataInput';
 	let currentChildren = 'childrenGallery';
@@ -25,8 +26,6 @@
 		unsubscribeChildren();
 		unsubscribePersonal();
 	});
-	console.log('user: ', get(currentUser));
-	console.log('  verified: ', isVerifed);
 </script>
 
 {#if isVerifed === true}
diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index b9e39435..7ee785dc 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -17,13 +17,10 @@
 		const returned = await usersCurrentUser();
 		if (returned.error) {
 			console.log('Error getting current user: ', returned.error.detail);
-			currentUser.set(null as unknown as UserRead);
+			currentUser.set(null);
 			return returned.error.detail;
 		} else {
 			console.log('Successfully retrieved active user');
-			// TODO: remove this in the final version, this sets verified to true
-			// to emulate a successful user registration
-			returned.data.is_verified = true;
 			currentUser.set(returned.data as UserRead);
 			return 'success';
 		}
@@ -42,9 +39,6 @@
 
 		// forget user data again to not have a plain text password lying around in memory somewhere
 		// any longer than needed
-		formData.forEach((element) => {
-			element.value = '';
-		});
 
 		if (authReturn.error) {
 			showAlert = true;
@@ -130,7 +124,7 @@
 			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
 			<Button
-				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
 				type="submit">{$_('login.submitButtonLabel')}</Button
 			>
 		</form>
@@ -139,7 +133,7 @@
 	<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
 	<a
 		href={`${base}/userLand/userRegistration`}
-		class="text-primary-700 hover:underline dark:text-primary-500"
+		class="text-primary-700 dark:text-primary-500 hover:underline"
 	>
 		Create account
 	</a>
diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index ec7008bb..13aa2282 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -29,9 +29,7 @@
 			userData.body.is_active = true;
 
 			const result = await registerRegister(userData);
-			data.forEach((element) => {
-				element.value = '';
-			});
+
 			if (result.error) {
 				console.log('error: ', result.response.status, result.error.detail);
 				alertMessage = $_('registration.alertMessageError') + ': ' + result.error.detail;
@@ -99,7 +97,7 @@
 					return { name: String(v), value: v };
 				})
 			},
-			value: ''
+			value: $_('registration.observerRole')
 		}
 	];
 
@@ -147,7 +145,7 @@
 
 			<Button
 				type="submit"
-				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
+				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
 				>{$_('registration.submitButtonLabel')}</Button
 			>
 		</form>
diff --git a/frontend/src/lib/stores/userStore.ts b/frontend/src/lib/stores/userStore.ts
index ae95a900..aab5efb3 100644
--- a/frontend/src/lib/stores/userStore.ts
+++ b/frontend/src/lib/stores/userStore.ts
@@ -88,6 +88,6 @@ async function hash(input: string): string {
 	return hash;
 }
 
-const currentUser = writable(null as unknown as UserRead);
+const currentUser = writable(null as null | UserRead);
 
 export { createDummyUser, currentUser, hash, users, UserStore, type UserData, type UserList };

From 46b1fa09a3d09d29b1ece10546f755cc4be1e969 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 14:56:14 +0000
Subject: [PATCH 21/26] update openapi.json & openapi-ts client, run pnpm
 format

---
 frontend/src/lib/components/UserLogin.svelte        | 4 ++--
 frontend/src/lib/components/UserRegistration.svelte | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/components/UserLogin.svelte b/frontend/src/lib/components/UserLogin.svelte
index 7ee785dc..08dda067 100644
--- a/frontend/src/lib/components/UserLogin.svelte
+++ b/frontend/src/lib/components/UserLogin.svelte
@@ -124,7 +124,7 @@
 			<UserLoginUtil cls="p-6 mb-3" bind:checked={remember} />
 
 			<Button
-				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 				type="submit">{$_('login.submitButtonLabel')}</Button
 			>
 		</form>
@@ -133,7 +133,7 @@
 	<span class="container mx-auto w-full text-gray-700 dark:text-gray-400">Not registered?</span>
 	<a
 		href={`${base}/userLand/userRegistration`}
-		class="text-primary-700 dark:text-primary-500 hover:underline"
+		class="text-primary-700 hover:underline dark:text-primary-500"
 	>
 		Create account
 	</a>
diff --git a/frontend/src/lib/components/UserRegistration.svelte b/frontend/src/lib/components/UserRegistration.svelte
index 13aa2282..8a3952e6 100644
--- a/frontend/src/lib/components/UserRegistration.svelte
+++ b/frontend/src/lib/components/UserRegistration.svelte
@@ -145,7 +145,7 @@
 
 			<Button
 				type="submit"
-				class="dark:bg-primay-700 bg-primary-700 hover:bg-primary-800 dark:hover:bg-primary-800 w-full text-center text-sm text-white hover:text-white"
+				class="dark:bg-primay-700 w-full bg-primary-700 text-center text-sm text-white hover:bg-primary-800 hover:text-white dark:hover:bg-primary-800"
 				>{$_('registration.submitButtonLabel')}</Button
 			>
 		</form>

From 86769956bdbbae4144f57fa09b3547e70e0b2f32 Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Wed, 16 Oct 2024 22:06:01 +0200
Subject: [PATCH 22/26] add database writing to on_after_register

---
 mondey_backend/src/mondey_backend/users.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mondey_backend/src/mondey_backend/users.py b/mondey_backend/src/mondey_backend/users.py
index 91a394df..8112316e 100644
--- a/mondey_backend/src/mondey_backend/users.py
+++ b/mondey_backend/src/mondey_backend/users.py
@@ -4,6 +4,7 @@
 
 from fastapi import Depends
 from fastapi import Request
+from fastapi import HTTPException
 from fastapi_users import BaseUserManager
 from fastapi_users import FastAPIUsers
 from fastapi_users import IntegerIDMixin
@@ -17,6 +18,7 @@
 from .databases.users import User
 from .databases.users import get_access_token_db
 from .databases.users import get_user_db
+from .databases.users import get_async_session
 from .settings import app_settings
 
 
@@ -26,6 +28,18 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
 
     async def on_after_register(self, user: User, request: Request | None = None):
         print(f"User {user.id} has registered.")
+        
+        # Fetch the user from the database
+        async with get_async_session() as session:
+            db_user = await session.get(User, user.id)
+            if not db_user:
+                raise HTTPException(status_code=404, detail="User not found")
+            
+            # Update the is_verified attribute
+            db_user.is_verified = True
+            session.add(db_user)
+            await session.commit()
+            await session.refresh(db_user)
 
     async def on_after_forgot_password(
         self, user: User, token: str, request: Request | None = None

From f149b6f4d2f12e0e85ae0f1302769f5ca2e4791d Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Thu, 17 Oct 2024 09:13:18 +0200
Subject: [PATCH 23/26] fix error in database rewriting

---
 mondey_backend/src/mondey_backend/users.py | 38 +++++++++++++---------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/mondey_backend/src/mondey_backend/users.py b/mondey_backend/src/mondey_backend/users.py
index 8112316e..44ee0ccc 100644
--- a/mondey_backend/src/mondey_backend/users.py
+++ b/mondey_backend/src/mondey_backend/users.py
@@ -1,10 +1,12 @@
+# TODO: 17th Oct. 2024: remove the artificial verification set again as soon as
+# the email verification server has been implemented. See 'README' block @ line 33ff
+
 from __future__ import annotations
 
 from typing import Annotated
 
 from fastapi import Depends
 from fastapi import Request
-from fastapi import HTTPException
 from fastapi_users import BaseUserManager
 from fastapi_users import FastAPIUsers
 from fastapi_users import IntegerIDMixin
@@ -13,12 +15,13 @@
 from fastapi_users.authentication.strategy.db import AccessTokenDatabase
 from fastapi_users.authentication.strategy.db import DatabaseStrategy
 from fastapi_users.db import SQLAlchemyUserDatabase
+from sqlalchemy.future import select
 
 from .databases.users import AccessToken
 from .databases.users import User
 from .databases.users import get_access_token_db
-from .databases.users import get_user_db
 from .databases.users import get_async_session
+from .databases.users import get_user_db
 from .settings import app_settings
 
 
@@ -27,19 +30,24 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
     verification_token_secret = app_settings.SECRET
 
     async def on_after_register(self, user: User, request: Request | None = None):
-        print(f"User {user.id} has registered.")
-        
-        # Fetch the user from the database
-        async with get_async_session() as session:
-            db_user = await session.get(User, user.id)
-            if not db_user:
-                raise HTTPException(status_code=404, detail="User not found")
-            
-            # Update the is_verified attribute
-            db_user.is_verified = True
-            session.add(db_user)
-            await session.commit()
-            await session.refresh(db_user)
+        # README: Sets the verified flag artificially to allow users to work without an
+        # actual verification process for now. this can go again as soon as we have an email server for verification.
+        async for session in get_async_session():
+            # find user in database
+            result = await session.execute(select(User).filter(User.id == user.id))
+            user_entry = result.scalars().first()
+
+            # set verified artificially and write back
+            if user_entry:
+                user_entry.is_verified = True
+                session.add(user_entry)
+                await session.commit()
+                await session.refresh(user_entry)
+
+                print("user object: ", user_entry.__dict__)
+                print(f"User {user_entry.id} has registered.")
+                print(f"User is verified? {user_entry.is_verified}")
+        # end README
 
     async def on_after_forgot_password(
         self, user: User, token: str, request: Request | None = None

From 4e43ab767a1cdb0617c8cac73ac22b29cc2ce41d Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Thu, 17 Oct 2024 09:15:39 +0200
Subject: [PATCH 24/26] better comment

---
 mondey_backend/src/mondey_backend/users.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mondey_backend/src/mondey_backend/users.py b/mondey_backend/src/mondey_backend/users.py
index 44ee0ccc..57f659eb 100644
--- a/mondey_backend/src/mondey_backend/users.py
+++ b/mondey_backend/src/mondey_backend/users.py
@@ -32,6 +32,7 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
     async def on_after_register(self, user: User, request: Request | None = None):
         # README: Sets the verified flag artificially to allow users to work without an
         # actual verification process for now. this can go again as soon as we have an email server for verification.
+        # why can´t we use a contextmanager here?: TypeError: 'async_generator' object does not support the [asynchronous] context manager protocol
         async for session in get_async_session():
             # find user in database
             result = await session.execute(select(User).filter(User.id == user.id))

From ac61c6989da3d0b22a9fbb4b4e03978d925782dd Mon Sep 17 00:00:00 2001
From: Harald Mack <harald.mack@protonmail.com>
Date: Thu, 17 Oct 2024 09:22:58 +0200
Subject: [PATCH 25/26] update comments

---
 mondey_backend/src/mondey_backend/users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mondey_backend/src/mondey_backend/users.py b/mondey_backend/src/mondey_backend/users.py
index 57f659eb..96ba6d12 100644
--- a/mondey_backend/src/mondey_backend/users.py
+++ b/mondey_backend/src/mondey_backend/users.py
@@ -1,5 +1,5 @@
-# TODO: 17th Oct. 2024: remove the artificial verification set again as soon as
-# the email verification server has been implemented. See 'README' block @ line 33ff
+# TODO: 17th Oct. 2024: remove the artificial verification setting again as soon as
+# the email verification server has been implemented. See 'README' block @ line 33f
 
 from __future__ import annotations
 

From 39cc4b20b2f7f87e7f0a3c5b63f9d9edb6ae2835 Mon Sep 17 00:00:00 2001
From: Liam Keegan <liam@keegan.ch>
Date: Thu, 17 Oct 2024 10:55:29 +0200
Subject: [PATCH 26/26] use async_session_maker and session.get to set user as
 verified

---
 mondey_backend/src/mondey_backend/users.py | 24 ++++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/mondey_backend/src/mondey_backend/users.py b/mondey_backend/src/mondey_backend/users.py
index 96ba6d12..da5a0823 100644
--- a/mondey_backend/src/mondey_backend/users.py
+++ b/mondey_backend/src/mondey_backend/users.py
@@ -15,12 +15,11 @@
 from fastapi_users.authentication.strategy.db import AccessTokenDatabase
 from fastapi_users.authentication.strategy.db import DatabaseStrategy
 from fastapi_users.db import SQLAlchemyUserDatabase
-from sqlalchemy.future import select
 
 from .databases.users import AccessToken
 from .databases.users import User
+from .databases.users import async_session_maker
 from .databases.users import get_access_token_db
-from .databases.users import get_async_session
 from .databases.users import get_user_db
 from .settings import app_settings
 
@@ -32,22 +31,15 @@ class UserManager(IntegerIDMixin, BaseUserManager[User, int]):
     async def on_after_register(self, user: User, request: Request | None = None):
         # README: Sets the verified flag artificially to allow users to work without an
         # actual verification process for now. this can go again as soon as we have an email server for verification.
-        # why can´t we use a contextmanager here?: TypeError: 'async_generator' object does not support the [asynchronous] context manager protocol
-        async for session in get_async_session():
-            # find user in database
-            result = await session.execute(select(User).filter(User.id == user.id))
-            user_entry = result.scalars().first()
-
-            # set verified artificially and write back
-            if user_entry:
-                user_entry.is_verified = True
-                session.add(user_entry)
+        async with async_session_maker() as session:
+            user_db = await session.get(User, user.id)
+            if user_db:
+                user_db.is_verified = True
                 await session.commit()
-                await session.refresh(user_entry)
+                await session.refresh(user_db)
 
-                print("user object: ", user_entry.__dict__)
-                print(f"User {user_entry.id} has registered.")
-                print(f"User is verified? {user_entry.is_verified}")
+                print(f"User {user_db.id} has registered.")
+                print(f"User is verified? {user_db.is_verified}")
         # end README
 
     async def on_after_forgot_password(