From b440da38830f03ab3df2a7ed3cc6b9a04812dbbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?=
 <david.majdandzic@hotmail.com>
Date: Wed, 12 Jun 2024 10:19:51 +0200
Subject: [PATCH] Refactor getters to stores

---
 src/lib/components/Food/FoodComp.svelte |  2 --
 src/lib/router/routes/Daily.svelte      | 15 ++-------------
 src/lib/router/routes/Monthly.svelte    | 15 ++-------------
 src/lib/router/routes/Weekly.svelte     | 15 ++-------------
 src/lib/router/routes/Yearly.svelte     | 15 ++-------------
 src/lib/store/dailyFoodStore.ts         | 20 ++++++++++++++++++++
 src/lib/store/monthlyFoodStore.ts       | 20 ++++++++++++++++++++
 src/lib/store/weeklyFoodStore.ts        | 20 ++++++++++++++++++++
 src/lib/store/yearlyFoodStore.ts        | 20 ++++++++++++++++++++
 9 files changed, 88 insertions(+), 54 deletions(-)
 create mode 100644 src/lib/store/dailyFoodStore.ts
 create mode 100644 src/lib/store/monthlyFoodStore.ts
 create mode 100644 src/lib/store/weeklyFoodStore.ts
 create mode 100644 src/lib/store/yearlyFoodStore.ts

diff --git a/src/lib/components/Food/FoodComp.svelte b/src/lib/components/Food/FoodComp.svelte
index a64458f..93d84b1 100644
--- a/src/lib/components/Food/FoodComp.svelte
+++ b/src/lib/components/Food/FoodComp.svelte
@@ -2,8 +2,6 @@
 	import type { Food } from '$lib/database/food'
 
 	export let item: Food
-
-	console.log(item)
 </script>
 
 <template>
diff --git a/src/lib/router/routes/Daily.svelte b/src/lib/router/routes/Daily.svelte
index 95e11df..619c466 100644
--- a/src/lib/router/routes/Daily.svelte
+++ b/src/lib/router/routes/Daily.svelte
@@ -1,19 +1,8 @@
 <script lang="ts">
-	import { type AggregatedFood, FoodService } from '$lib/database/food'
-	import { onMount } from 'svelte'
 	import AggregatedFoodTable from '$components/AggregatedFood/AggregatedFoodTable.svelte'
-
-	let foods: AggregatedFood[] = []
-	onMount(async () => {
-		const [dbfoods, err] = await FoodService.GetDaily()
-		if (err) {
-			console.error(err)
-			return
-		}
-		foods = dbfoods
-	})
+	import { dailyFoodStore } from '$lib/store/dailyFoodStore'
 </script>
 
 <template>
-	<AggregatedFoodTable items="{foods}" />
+	<AggregatedFoodTable items="{$dailyFoodStore}" />
 </template>
diff --git a/src/lib/router/routes/Monthly.svelte b/src/lib/router/routes/Monthly.svelte
index bb65830..9ee4ff5 100644
--- a/src/lib/router/routes/Monthly.svelte
+++ b/src/lib/router/routes/Monthly.svelte
@@ -1,19 +1,8 @@
 <script lang="ts">
-	import { type AggregatedFood, FoodService } from '$lib/database/food'
-	import { onMount } from 'svelte'
 	import AggregatedFoodTable from '$components/AggregatedFood/AggregatedFoodTable.svelte'
-
-	let foods: AggregatedFood[] = []
-	onMount(async () => {
-		const [dbfoods, err] = await FoodService.GetMonthly()
-		if (err) {
-			console.error(err)
-			return
-		}
-		foods = dbfoods
-	})
+	import { monthlyFoodStore } from '$lib/store/monthlyFoodStore'
 </script>
 
 <template>
-	<AggregatedFoodTable items="{foods}" />
+	<AggregatedFoodTable items="{$monthlyFoodStore}" />
 </template>
diff --git a/src/lib/router/routes/Weekly.svelte b/src/lib/router/routes/Weekly.svelte
index 8ce322a..21e9893 100644
--- a/src/lib/router/routes/Weekly.svelte
+++ b/src/lib/router/routes/Weekly.svelte
@@ -1,19 +1,8 @@
 <script lang="ts">
-	import { type AggregatedFood, FoodService } from '$lib/database/food'
-	import { onMount } from 'svelte'
 	import AggregatedFoodTable from '$components/AggregatedFood/AggregatedFoodTable.svelte'
-
-	let foods: AggregatedFood[] = []
-	onMount(async () => {
-		const [dbfoods, err] = await FoodService.GetWeekly()
-		if (err) {
-			console.error(err)
-			return
-		}
-		foods = dbfoods
-	})
+	import { weeklyFoodStore } from '$lib/store/weeklyFoodStore'
 </script>
 
 <template>
-	<AggregatedFoodTable items="{foods}" />
+	<AggregatedFoodTable items="{$weeklyFoodStore}" />
 </template>
diff --git a/src/lib/router/routes/Yearly.svelte b/src/lib/router/routes/Yearly.svelte
index 1c7e4ac..56ea7a1 100644
--- a/src/lib/router/routes/Yearly.svelte
+++ b/src/lib/router/routes/Yearly.svelte
@@ -1,19 +1,8 @@
 <script lang="ts">
-	import { type AggregatedFood, FoodService } from '$lib/database/food'
-	import { onMount } from 'svelte'
 	import AggregatedFoodTable from '$components/AggregatedFood/AggregatedFoodTable.svelte'
-
-	let foods: AggregatedFood[] = []
-	onMount(async () => {
-		const [dbfoods, err] = await FoodService.GetYearly()
-		if (err) {
-			console.error(err)
-			return
-		}
-		foods = dbfoods
-	})
+	import { yearlyFoodStore } from '$lib/store/yearlyFoodStore'
 </script>
 
 <template>
-	<AggregatedFoodTable items="{foods}" />
+	<AggregatedFoodTable items="{$yearlyFoodStore}" />
 </template>
diff --git a/src/lib/store/dailyFoodStore.ts b/src/lib/store/dailyFoodStore.ts
new file mode 100644
index 0000000..7615490
--- /dev/null
+++ b/src/lib/store/dailyFoodStore.ts
@@ -0,0 +1,20 @@
+import { type Writable, writable } from 'svelte/store'
+import { type AggregatedFood, FoodService } from '$lib/database/food'
+
+
+async function createStore(): Promise<Writable<AggregatedFood[]>> {
+	let [foods, err] = await FoodService.GetDaily()
+	if (err) {
+		foods = []
+		console.error(err)
+	}
+
+	const { subscribe, update, set } = writable(foods)
+	return {
+		subscribe,
+		update,
+		set
+	}
+}
+
+export const dailyFoodStore = await createStore()
diff --git a/src/lib/store/monthlyFoodStore.ts b/src/lib/store/monthlyFoodStore.ts
new file mode 100644
index 0000000..eeb26a3
--- /dev/null
+++ b/src/lib/store/monthlyFoodStore.ts
@@ -0,0 +1,20 @@
+import { type Writable, writable } from 'svelte/store'
+import { type AggregatedFood, FoodService } from '$lib/database/food'
+
+
+async function createStore(): Promise<Writable<AggregatedFood[]>> {
+	let [foods, err] = await FoodService.GetMonthly()
+	if (err) {
+		foods = []
+		console.error(err)
+	}
+
+	const { subscribe, update, set } = writable(foods)
+	return {
+		subscribe,
+		update,
+		set
+	}
+}
+
+export const monthlyFoodStore = await createStore()
diff --git a/src/lib/store/weeklyFoodStore.ts b/src/lib/store/weeklyFoodStore.ts
new file mode 100644
index 0000000..be4d910
--- /dev/null
+++ b/src/lib/store/weeklyFoodStore.ts
@@ -0,0 +1,20 @@
+import { type Writable, writable } from 'svelte/store'
+import { type AggregatedFood, FoodService } from '$lib/database/food'
+
+
+async function createStore(): Promise<Writable<AggregatedFood[]>> {
+	let [foods, err] = await FoodService.GetWeekly()
+	if (err) {
+		foods = []
+		console.error(err)
+	}
+
+	const { subscribe, update, set } = writable(foods)
+	return {
+		subscribe,
+		update,
+		set
+	}
+}
+
+export const weeklyFoodStore = await createStore()
diff --git a/src/lib/store/yearlyFoodStore.ts b/src/lib/store/yearlyFoodStore.ts
new file mode 100644
index 0000000..f61e640
--- /dev/null
+++ b/src/lib/store/yearlyFoodStore.ts
@@ -0,0 +1,20 @@
+import { type Writable, writable } from 'svelte/store'
+import { type AggregatedFood, FoodService } from '$lib/database/food'
+
+
+async function createStore(): Promise<Writable<AggregatedFood[]>> {
+	let [foods, err] = await FoodService.GetYearly()
+	if (err) {
+		foods = []
+		console.error(err)
+	}
+
+	const { subscribe, update, set } = writable(foods)
+	return {
+		subscribe,
+		update,
+		set
+	}
+}
+
+export const yearlyFoodStore = await createStore()