From 19eddc198d4cd415c71167aa3da6d857593f0898 Mon Sep 17 00:00:00 2001
From: Denis Donici <skryonline@gmail.com>
Date: Fri, 7 Mar 2025 21:41:57 +0200
Subject: [PATCH] Add C/F units

---
 bun.lock                           |  3 +++
 package.json                       |  1 +
 src/lib/components/ComboBox.svelte | 17 ++++++---------
 src/lib/components/Navbar.svelte   | 34 ++++++++++++++++++++++++++++++
 src/lib/helpers/stores.ts          |  6 ++++++
 src/lib/helpers/utils.ts           |  3 +++
 src/lib/types.ts                   |  7 +++++-
 src/routes/+page.server.ts         |  8 +++----
 src/routes/+page.svelte            | 34 ++++++++++++++++++++++++------
 9 files changed, 92 insertions(+), 21 deletions(-)
 create mode 100644 src/lib/components/Navbar.svelte
 create mode 100644 src/lib/helpers/stores.ts

diff --git a/bun.lock b/bun.lock
index 5774b07..4959d24 100644
--- a/bun.lock
+++ b/bun.lock
@@ -29,6 +29,7 @@
         "prettier-plugin-tailwindcss": "^0.6.11",
         "svelte": "^5.22.5",
         "svelte-check": "^4.1.5",
+        "svelte-persisted-store": "^0.12.0",
         "tailwindcss": "^4.0.11",
         "typescript": "^5.8.2",
         "typescript-eslint": "^8.26.0",
@@ -561,6 +562,8 @@
 
     "svelte-eslint-parser": ["svelte-eslint-parser@1.0.1", "", { "dependencies": { "eslint-scope": "^8.2.0", "eslint-visitor-keys": "^4.0.0", "espree": "^10.0.0", "postcss": "^8.4.49", "postcss-scss": "^4.0.9", "postcss-selector-parser": "^7.0.0" }, "peerDependencies": { "svelte": "^3.37.0 || ^4.0.0 || ^5.0.0" }, "optionalPeers": ["svelte"] }, "sha512-JjdEMXOJqy+dxeaElxbN+meTOtVpHfLnq9VGpiTAOLgM0uHO+ogmUsA3IFgx0x3Wl15pqTZWycCikcD7cAQN/g=="],
 
+    "svelte-persisted-store": ["svelte-persisted-store@0.12.0", "", { "peerDependencies": { "svelte": "^3.48.0 || ^4 || ^5" } }, "sha512-BdBQr2SGSJ+rDWH8/aEV5GthBJDapVP0GP3fuUCA7TjYG5ctcB+O9Mj9ZC0+Jo1oJMfZUd1y9H68NFRR5MyIJA=="],
+
     "tailwindcss": ["tailwindcss@4.0.11", "", {}, "sha512-GZ6+tNwieqvpFLZfx2tkZpfOMAK7iumbOJOLmd6v8AcYuHbjUb+cmDRu6l+rFkIqarh5FfLbCSRJhegcVdoPng=="],
 
     "tapable": ["tapable@2.2.1", "", {}, "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="],
diff --git a/package.json b/package.json
index aaf2d03..ce42dc9 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "prettier-plugin-tailwindcss": "^0.6.11",
     "svelte": "^5.22.5",
     "svelte-check": "^4.1.5",
+    "svelte-persisted-store": "^0.12.0",
     "tailwindcss": "^4.0.11",
     "typescript": "^5.8.2",
     "typescript-eslint": "^8.26.0",
diff --git a/src/lib/components/ComboBox.svelte b/src/lib/components/ComboBox.svelte
index 7c83e18..e2bfdb0 100644
--- a/src/lib/components/ComboBox.svelte
+++ b/src/lib/components/ComboBox.svelte
@@ -14,19 +14,18 @@
 	};
 
 	let { options, onSelect, onClear, disabledItems, selectedOptionId }: ComboBoxProps = $props();
-	$effect(() => console.log(selectedOptionId));
 
 	let focused = $state(false);
 	let selectSet = $state(false);
 	let inputElement: HTMLInputElement;
 	let dropdownElement: HTMLUListElement | null = $state(null);
 	let emoji: string = $state('');
-	
+
 	const ifOptionSelected = (id: number | null) => {
 		let textValue = '';
-		if (id) { 
-			const value = options.find((option) => option.id === id)
-			if(value) {
+		if (id) {
+			const value = options.find((option) => option.id === id);
+			if (value) {
 				emoji = 'emoji' in value ? (value.emoji ?? '') : '';
 				textValue = 'name' in value ? value.name : '';
 				selectSet = true;
@@ -34,9 +33,7 @@
 		}
 		return textValue;
 	};
-	
-	
-	
+
 	let filterInput = $state(ifOptionSelected(selectedOptionId));
 	let searcher = $state(new FuzzySearch(options, ['name'], { caseSensitive: false, sort: true }));
 
@@ -85,8 +82,8 @@
 	});
 </script>
 
-<div class="dropdown my-2 py-2 w-full">
-	<label class="input !outline-none focus:ring-0 input-lg w-full">
+<div class="dropdown my-2 w-full py-2">
+	<label class="input input-lg w-full !outline-none focus:ring-0">
 		<input
 			type="text"
 			class="w-full focus:ring-0 focus:outline-none"
diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte
new file mode 100644
index 0000000..987ed29
--- /dev/null
+++ b/src/lib/components/Navbar.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+	import { units, unitsSymbol } from '$lib/helpers/stores';
+	import { UnitsEnum } from '$lib/types';
+</script>
+
+<div class="navbar bg-gray-50 shadow-sm">
+	<div class="flex-1">
+		<a href="/" class="btn btn-ghost text-xl">daisyUI</a>
+	</div>
+	<div class="flex-none">
+		<div class="dropdown dropdown-bottom dropdown-end">
+			<div tabindex="0" role="button" class="btn btn-ghost btn-square m-1">{$unitsSymbol}</div>
+			<ul tabindex="0" class="dropdown-content menu bg-base-100 rounded-box z-1 w-32 p-2 shadow-sm">
+				<li onclick={() => ($units = UnitsEnum.METRIC)}>
+					<a>°C metric</a>
+				</li>
+				<li onclick={() => ($units = UnitsEnum.IMPERIAL)}>
+					<a>°F imperial</a>
+				</li>
+			</ul>
+		</div>
+
+		<!-- 	<li> -->
+		<!-- 		<details> -->
+		<!-- 			<summary>Parent</summary> -->
+		<!-- 			<ul class="bg-base-100 w-36 rounded-t-none p-2"> -->
+		<!-- 				<li><a class="inline-block w-full"><span>°C metric</span></a></li> -->
+		<!-- 				<li><a class="inline-block w-full"><span>°F imperial</span></a></li> -->
+		<!-- 			</ul> -->
+		<!-- 		</details> -->
+		<!-- 	</li> -->
+		<!-- </ul> -->
+	</div>
+</div>
diff --git a/src/lib/helpers/stores.ts b/src/lib/helpers/stores.ts
new file mode 100644
index 0000000..077cb62
--- /dev/null
+++ b/src/lib/helpers/stores.ts
@@ -0,0 +1,6 @@
+import { UnitsEnum } from '$lib/types';
+import { persisted } from 'svelte-persisted-store';
+import { derived } from 'svelte/store';
+
+export const units = persisted('units', UnitsEnum.METRIC)
+export const unitsSymbol = derived(units, ($units) => $units == UnitsEnum.IMPERIAL ? '°F' : '°C')
diff --git a/src/lib/helpers/utils.ts b/src/lib/helpers/utils.ts
index e69de29..151babb 100644
--- a/src/lib/helpers/utils.ts
+++ b/src/lib/helpers/utils.ts
@@ -0,0 +1,3 @@
+export const celsiusToFahrenheit = (celsius: number): number => {
+  return Math.round((celsius * 9 / 5) + 32);
+}
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 4ec8595..5072cdd 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -21,7 +21,7 @@ export type CityTemperature = {
   date: string;
 }
 
-export type HotColdCity ={
+export type HotColdCity = {
   city_id: number;
   city_name: string;
   country_id: number;
@@ -66,3 +66,8 @@ export type MeteoData = {
   min: number;
   date: string;
 }
+
+export enum UnitsEnum {
+  METRIC = 'METRIC',
+  IMPERIAL = 'IMPERIAL'
+}
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index c53d35d..f54ac89 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -16,7 +16,7 @@ export const load: PageServerLoad = async ({ url }) => {
     const countries = allCountries.all() as CountryBasic[];
     const cities = allCities.all() as CityBasic[];
     const country_id = url.searchParams.get('country');
-    console.log('country_id >>> ', country_id);
+    // console.log('country_id >>> ', country_id);
 
     let temperatureData: HotColdCity[] | null = null;
     if (country_id) {
@@ -26,7 +26,7 @@ export const load: PageServerLoad = async ({ url }) => {
       }) as HotColdCity[];
     }
 
-    console.log('Loading >>>>', temperatureData);
+    // console.log('Loading >>>>', temperatureData);
 
     return {
       countries,
@@ -51,14 +51,14 @@ export const actions: Actions = {
       const formData = await request.formData();
       const country_id = formData.get('country_id') as string;
 
-      console.log('FORM ACTION >>>', country_id)
+      // console.log('FORM ACTION >>>', country_id)
       const response = getHottestAndColdestCityInCountry.all({
         $country_id: Number(country_id),
         $date: new Date().toISOString().split('T')[0]
       }) as HotColdCity[];
 
       if (response.length == 2) {
-        console.log('RESPONSE >>>>', response);
+        // console.log('RESPONSE >>>>', response);
 
         return {
           ok: true,
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 76df528..5164970 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,10 +1,19 @@
 <script lang="ts">
 	import { applyAction, enhance } from '$app/forms';
-	import { pushState } from '$app/navigation';
+	import { pushState, replaceState } from '$app/navigation';
 	import ComboBox from '$lib/components/ComboBox.svelte';
 	import Footer from '$lib/components/Footer.svelte';
+	import Navbar from '$lib/components/Navbar.svelte';
 	import TwoCities from '$lib/components/TwoCities.svelte';
-	import type { CityBasic, CountryBasic, ComboOption, HotColdCity } from '$lib/types';
+	import { units, unitsSymbol } from '$lib/helpers/stores';
+	import { celsiusToFahrenheit } from '$lib/helpers/utils';
+	import {
+		type CityBasic,
+		type CountryBasic,
+		type ComboOption,
+		type HotColdCity,
+		UnitsEnum
+	} from '$lib/types';
 	import type { PageProps } from './$types';
 
 	let { data, form }: PageProps = $props();
@@ -24,10 +33,14 @@
 		submitButton.click();
 	};
 
+	const handleClearCountry = () => {
+		replaceState('/', {});
+		selectedCountryId = null;
+	};
+
 	$effect(() => {
 		if (form && form.ok) {
 			temperatureData = form.data;
-			console.log(form.data);
 		}
 	});
 </script>
@@ -37,6 +50,7 @@
 </svelte:head>
 
 <main class="flex h-full min-h-screen flex-col overflow-x-hidden bg-white">
+	<Navbar />
 	<div class="container mx-auto my-3 max-w-4xl flex-grow p-4">
 		<h1 class="my-5 text-center text-4xl font-light">HotColdCities</h1>
 		<h2 class="mx-auto max-w-xl text-center text-xl leading-tight md:text-2xl">
@@ -51,7 +65,7 @@
 						options={data.countries as readonly CountryBasic[]}
 						onSelect={onCountrySelect}
 						selectedOptionId={selectedCountryId}
-						onClear={() => (selectedCountryId = null)}
+						onClear={handleClearCountry}
 					/>
 				</div>
 				<form
@@ -73,8 +87,16 @@
 						{#each temperatureData as temperature}
 							<dl class="flex flex-col gap-2">
 								<dt class="text-center text-3xl font-medium">{temperature.city_name}</dt>
-								<dd>Max: {temperature.max_temp}°C</dd>
-								<dd>Min: {temperature.min_temp}°C</dd>
+								<dd>
+									Max: {$units == UnitsEnum.IMPERIAL
+										? celsiusToFahrenheit(temperature.max_temp)
+										: temperature.min_temp}{$unitsSymbol}
+								</dd>
+								<dd>
+									Min: {$units == UnitsEnum.IMPERIAL
+										? celsiusToFahrenheit(temperature.min_temp)
+										: temperature.min_temp}{$unitsSymbol}
+								</dd>
 							</dl>
 						{/each}
 					</div>