From f018459818f9a4b597b1645084121739dbfbea59 Mon Sep 17 00:00:00 2001
From: PhatPhuckDave <david.majdandzic@hotmail.com>
Date: Mon, 19 Aug 2024 12:45:37 +0200
Subject: [PATCH] Rework "nowStore" to scrollingTimeFrameStore that contains
 both from and to dates

---
 frontend/src/App.svelte                       |  8 ++++-
 .../src/lib/components/PaymentBillComp.svelte |  2 --
 frontend/src/lib/router/routes/Home.svelte    | 11 ++-----
 .../src/lib/store/lastMonthPaymentsStore.ts   |  6 ++--
 frontend/src/lib/store/nowStore.ts            | 24 --------------
 .../src/lib/store/scrollingTimeFrameStore.ts  | 31 +++++++++++++++++++
 .../src/lib/store/thisMonthPaymentsStore.ts   |  5 ++-
 frontend/src/lib/types.ts                     |  4 +++
 8 files changed, 49 insertions(+), 42 deletions(-)
 delete mode 100644 frontend/src/lib/store/nowStore.ts
 create mode 100644 frontend/src/lib/store/scrollingTimeFrameStore.ts

diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 696a953..40ad437 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { Toaster } from "svelte-sonner";
-	import Header from "$lib/components/Header.svelte";
 	import Router from "$lib/router/Router.svelte";
 	import { Close } from "$wails/main/App";
+	import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
 
 	function keyDown(event: KeyboardEvent) {
 		if (event.ctrlKey && event.key == "r") {
@@ -11,6 +11,12 @@
 		if (event.ctrlKey && event.key == "w") {
 			Close();
 		}
+		if (event.key == "ArrowLeft") {
+			scrollingTimeFrameStore.prev();
+		}
+		if (event.key == "ArrowRight") {
+			scrollingTimeFrameStore.next();
+		}
 	}
 </script>
 
diff --git a/frontend/src/lib/components/PaymentBillComp.svelte b/frontend/src/lib/components/PaymentBillComp.svelte
index e19d765..a91ecd2 100644
--- a/frontend/src/lib/components/PaymentBillComp.svelte
+++ b/frontend/src/lib/components/PaymentBillComp.svelte
@@ -6,8 +6,6 @@
 		name: "none",
 		payment: null,
 	};
-
-	console.log(paymentBill);
 </script>
 
 <template>
diff --git a/frontend/src/lib/router/routes/Home.svelte b/frontend/src/lib/router/routes/Home.svelte
index 4996b06..e7341d5 100644
--- a/frontend/src/lib/router/routes/Home.svelte
+++ b/frontend/src/lib/router/routes/Home.svelte
@@ -1,18 +1,13 @@
 <script lang="ts">
 	import Payments from "$lib/components/Payments.svelte";
-	import { nowStore } from "$lib/store/nowStore";
+	import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
 	import { lastMonthPaymentsStore } from "$lib/store/lastMonthPaymentsStore";
 	import { thisMonthPaymentsStore } from "$lib/store/thisMonthPaymentsStore";
-
-	const thisMonth = new Date();
-	thisMonth.setMonth($nowStore.getMonth());
-	const previousMonth = new Date();
-	previousMonth.setMonth($nowStore.getMonth() - 1);
 </script>
 
 <template>
 	<div class="grid grid-cols-2">
-		<Payments date={previousMonth} payments={$lastMonthPaymentsStore} />
-		<Payments date={thisMonth} payments={$thisMonthPaymentsStore} />
+		<Payments date={$scrollingTimeFrameStore.from} payments={$lastMonthPaymentsStore} />
+		<Payments date={$scrollingTimeFrameStore.to} payments={$thisMonthPaymentsStore} />
 	</div>
 </template>
diff --git a/frontend/src/lib/store/lastMonthPaymentsStore.ts b/frontend/src/lib/store/lastMonthPaymentsStore.ts
index 9606269..939952f 100644
--- a/frontend/src/lib/store/lastMonthPaymentsStore.ts
+++ b/frontend/src/lib/store/lastMonthPaymentsStore.ts
@@ -2,13 +2,11 @@ import { get, type Writable, writable } from "svelte/store";
 import { GetPaymentsForMonth } from "$wails/main/App";
 import { main } from "$wails/models";
 import { toast } from "svelte-sonner";
-import { nowStore } from "$lib/store/nowStore";
+import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
 
 async function createStore(): Promise<Writable<main.Payment[]>> {
 	const payments: main.Payment[] = [];
-	const now = new Date();
-	now.setMonth(get(nowStore).getMonth() - 1)
-	const res = await GetPaymentsForMonth(now);
+	const res = await GetPaymentsForMonth(get(scrollingTimeFrameStore).from);
 	if (!res.success) {
 		toast.error("Error getting payments " + res.error);
 	} else {
diff --git a/frontend/src/lib/store/nowStore.ts b/frontend/src/lib/store/nowStore.ts
deleted file mode 100644
index 7cbd1b7..0000000
--- a/frontend/src/lib/store/nowStore.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { type Writable, writable } from "svelte/store";
-
-async function createStore(): Promise<Writable<Date> & { next: Function; prev: Function }> {
-	const { subscribe, update, set } = writable(new Date());
-	return {
-		subscribe,
-		update,
-		set,
-		next: () => {
-			update((now: Date) => {
-				now.setMonth(now.getMonth() + 1);
-				return now;
-			});
-		},
-		prev: () => {
-			update((now: Date) => {
-				now.setMonth(now.getMonth() - 1);
-				return now;
-			});
-		},
-	};
-}
-
-export const nowStore = await createStore();
diff --git a/frontend/src/lib/store/scrollingTimeFrameStore.ts b/frontend/src/lib/store/scrollingTimeFrameStore.ts
new file mode 100644
index 0000000..9ff08f3
--- /dev/null
+++ b/frontend/src/lib/store/scrollingTimeFrameStore.ts
@@ -0,0 +1,31 @@
+import { type ScrollingTimeframe } from "$lib/types";
+import { type Writable, writable } from "svelte/store";
+
+async function createStore(): Promise<Writable<ScrollingTimeframe> & { next: Function; prev: Function }> {
+	const thism = new Date();
+	const lastm = new Date();
+	lastm.setMonth(thism.getMonth() - 1);
+
+	const { subscribe, update, set } = writable({ from: thism, to: lastm });
+	return {
+		subscribe,
+		update,
+		set,
+		next: () => {
+			update((frame: ScrollingTimeframe) => {
+				frame.from.setMonth(frame.from.getMonth() + 1);
+				frame.to.setMonth(frame.from.getMonth() + 1);
+				return frame;
+			});
+		},
+		prev: () => {
+			update((frame: ScrollingTimeframe) => {
+				frame.from.setMonth(frame.from.getMonth() - 1);
+				frame.to.setMonth(frame.from.getMonth() - 1);
+				return frame;
+			});
+		},
+	};
+}
+
+export const scrollingTimeFrameStore = await createStore();
diff --git a/frontend/src/lib/store/thisMonthPaymentsStore.ts b/frontend/src/lib/store/thisMonthPaymentsStore.ts
index c166061..ecf9f2b 100644
--- a/frontend/src/lib/store/thisMonthPaymentsStore.ts
+++ b/frontend/src/lib/store/thisMonthPaymentsStore.ts
@@ -2,12 +2,11 @@ import { get, type Writable, writable } from "svelte/store";
 import { GetPaymentsForMonth } from "$wails/main/App";
 import { main } from "$wails/models";
 import { toast } from "svelte-sonner";
-import { nowStore } from "$lib/store/nowStore";
+import { scrollingTimeFrameStore } from "$lib/store/scrollingTimeFrameStore";
 
 async function createStore(): Promise<Writable<main.Payment[]>> {
 	const payments: main.Payment[] = [];
-	const now = get(nowStore)
-	const res = await GetPaymentsForMonth(now);
+	const res = await GetPaymentsForMonth(get(scrollingTimeFrameStore).to);
 	if (!res.success) {
 		toast.error("Error getting payments " + res.error);
 	} else {
diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts
index 2f12d2f..63f2e6d 100644
--- a/frontend/src/lib/types.ts
+++ b/frontend/src/lib/types.ts
@@ -5,3 +5,7 @@ export type PaymentBill = {
 	name: string;
 	payment: main.Payment|null;
 };
+export type ScrollingTimeframe = {
+	from: Date;
+	to: Date;
+}
\ No newline at end of file