From: PhiTux <redacted>
Date: Sat, 28 Dec 2024 18:30:35 +0000 (+0100)
Subject: loading logs works
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=d4b5041d4b077fcf3e627178b8e62f1d2ddc3903;p=DailyTxT.git

loading logs works
---

diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index 512b8f7..e98b042 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -6,6 +6,7 @@
 	import axios from 'axios';
 	import { dev } from '$app/environment';
 	import { goto } from '$app/navigation';
+	import { onMount } from 'svelte';
 
 	let API_URL = dev ? 'http://localhost:8000' : window.location.pathname.replace(/\/+$/, '');
 
@@ -39,9 +40,16 @@
 		}
 	);
 
+	onMount(() => {
+		getLog();
+	});
+
+	let lastSelectedDate = $state($selectedDate);
+
 	$effect(() => {
-		if ($selectedDate) {
-			console.log('selectedDate changed');
+		if ($selectedDate !== lastSelectedDate) {
+			getLog();
+			lastSelectedDate = $selectedDate;
 		}
 	});
 
@@ -63,6 +71,32 @@
 		});
 	}
 
+	function getLog() {
+		if (savedLog !== currentLog) {
+			if (!saveLog()) {
+				return;
+			}
+		}
+
+		axios
+			.get(API_URL + '/logs/getLog', {
+				params: {
+					date: $selectedDate.toISOString()
+				}
+			})
+			.then((response) => {
+				currentLog = response.data.text;
+				savedLog = currentLog;
+				logDateWritten = response.data.date_written;
+			})
+			.catch((error) => {
+				console.error(error.response);
+				// toast
+				const toast = new bootstrap.Toast(document.getElementById('toastErrorLoadingLog'));
+				toast.show();
+			});
+	}
+
 	function saveLog() {
 		// axios to backend
 		let date_written = new Date().toLocaleString('de-DE', {
@@ -74,11 +108,9 @@
 			minute: '2-digit'
 		});
 
-		console.log(new Date($selectedDate).toISOString());
-
 		axios
 			.post(API_URL + '/logs/saveLog', {
-				date: new Date($selectedDate).toISOString(),
+				date: $selectedDate.toISOString(),
 				text: currentLog,
 				date_written: date_written
 			})
@@ -86,11 +118,13 @@
 				if (response.data.success) {
 					savedLog = currentLog;
 					logDateWritten = date_written;
+					return true;
 				} else {
 					// toast
 					const toast = new bootstrap.Toast(document.getElementById('toastErrorSavingLog'));
 					toast.show();
 					console.error('Log not saved');
+					return false;
 				}
 			})
 			.catch((error) => {
@@ -98,6 +132,7 @@
 				const toast = new bootstrap.Toast(document.getElementById('toastErrorSavingLog'));
 				toast.show();
 				console.error(error.response);
+				return false;
 			});
 	}
 </script>
@@ -132,7 +167,8 @@
 					{$selectedDate.toLocaleDateString('locale')}
 				</div>
 				<div class="flex-fill textAreaWrittenAt">
-					Geschrieben am:<br />
+					<div class={logDateWritten ? '' : 'opacity-50'}>Geschrieben am:</div>
+					<!-- <br /> -->
 					{logDateWritten}
 				</div>
 				<div class="textAreaHistory">history</div>
@@ -161,6 +197,18 @@
 				<div class="toast-body">Fehler beim Speichern des Textes!</div>
 			</div>
 		</div>
+
+		<div
+			id="toastErrorLoadingLog"
+			class="toast align-items-center text-bg-danger"
+			role="alert"
+			aria-live="assertive"
+			aria-atomic="true"
+		>
+			<div class="d-flex">
+				<div class="toast-body">Fehler beim Laden des Textes!</div>
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/frontend/src/routes/Datepicker.svelte b/frontend/src/routes/Datepicker.svelte
index 9274d05..ac29e7a 100644
--- a/frontend/src/routes/Datepicker.svelte
+++ b/frontend/src/routes/Datepicker.svelte
@@ -3,15 +3,11 @@
 	import { onMount } from 'svelte';
 	import { fly } from 'svelte/transition';
 
-	//let { currentlySelectedDate = new Date(), dateSelected } = $props();
-
 	let days = $state([]);
 	let markedDays = {
 		'2024-12-25': { type: 'background', color: '#28a745' }, // green instead of red
 		'2024-12-31': { type: 'dot', color: '#28a745' } // green instead of blue
 	};
-	//let currentMonth = $state(currentlySelectedDate.getMonth());
-	//let currentYear = $state(currentlySelectedDate.getFullYear());
 
 	let animationDirection = $state(1); // swipe the dates left or right
 
@@ -67,7 +63,6 @@
 
 	const onDateClick = (date) => {
 		$selectedDate = date;
-		//dateSelected(date);
 	};
 
 	onMount(() => {