From 93b5cfb33148a33eed26cefabe1b3a409b60349a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=20Jurmanovi=C4=87?= <fjurma12@outlook.com>
Date: Thu, 29 May 2025 01:27:46 +0200
Subject: [PATCH] utc dates

---
 package-lock.json                                |  7 +++++++
 package.json                                     |  1 +
 src/components/Statistics.svelte                 | 11 +++++++----
 src/routes/dashboard/server/[id]/+page.server.ts |  3 ++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e68a32..75ddf7b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
 			"version": "0.0.1",
 			"dependencies": {
 				"@date-fns/tz": "^1.2.0",
+				"@date-fns/utc": "^2.1.0",
 				"chart.js": "^4.4.9",
 				"chartjs-adapter-date-fns": "^3.0.0",
 				"date-fns": "^4.1.0",
@@ -78,6 +79,12 @@
 			"integrity": "sha512-LBrd7MiJZ9McsOgxqWX7AaxrDjcFVjWH/tIKJd7pnR7McaslGYOP1QmmiBXdJH/H/yLCT+rcQ7FaPBUxRGUtrg==",
 			"license": "MIT"
 		},
+		"node_modules/@date-fns/utc": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@date-fns/utc/-/utc-2.1.0.tgz",
+			"integrity": "sha512-176grgAgU2U303rD2/vcOmNg0kGPbhzckuH1TEP2al7n0AQipZIy9P15usd2TKQCG1g+E1jX/ZVQSzs4sUDwgA==",
+			"license": "MIT"
+		},
 		"node_modules/@esbuild/aix-ppc64": {
 			"version": "0.24.2",
 			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
diff --git a/package.json b/package.json
index 39cde32..99baec2 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
 	},
 	"dependencies": {
 		"@date-fns/tz": "^1.2.0",
+		"@date-fns/utc": "^2.1.0",
 		"chart.js": "^4.4.9",
 		"chartjs-adapter-date-fns": "^3.0.0",
 		"date-fns": "^4.1.0",
diff --git a/src/components/Statistics.svelte b/src/components/Statistics.svelte
index 8975c9e..96bd215 100644
--- a/src/components/Statistics.svelte
+++ b/src/components/Statistics.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import Chart from 'chart.js/auto';
 	import { onMount, onDestroy } from 'svelte';
-	import { compareAsc } from 'date-fns';
+	import { compareAsc, isSameDay } from 'date-fns';
 	import { formatInTimeZone } from 'date-fns-tz';
 	import 'chartjs-adapter-date-fns';
 	import type { StateHistory } from '$models/config';
@@ -230,16 +230,18 @@
 				if (!acc[date]) {
 					acc[date] = {
 						count: 0,
-						sessions: [session]
+						sessions: []
 					};
 				}
 
 				// Check if this session is part of a sequence
 				if (index > 0) {
 					const prevSession = stateHistory[index - 1];
-					const prevDate = formatDate(prevSession.dateCreated, 'yyyy-MM-dd');
 
-					if (date === prevDate && prevSession.session === session.session) {
+					if (
+						isSameDay(session.dateCreated, prevSession.dateCreated) &&
+						prevSession.session === session.session
+					) {
 						return acc;
 					}
 				}
@@ -261,6 +263,7 @@
 		const sortedEntries = Object.entries(dailyActivity).sort(
 			([a], [b]) => new Date(a).getTime() - new Date(b).getTime()
 		);
+		console.log(sortedEntries);
 
 		return {
 			labels: sortedEntries.map(([date]) => formatDate(date, 'MMM dd')),
diff --git a/src/routes/dashboard/server/[id]/+page.server.ts b/src/routes/dashboard/server/[id]/+page.server.ts
index 3c5ecfc..f465d31 100644
--- a/src/routes/dashboard/server/[id]/+page.server.ts
+++ b/src/routes/dashboard/server/[id]/+page.server.ts
@@ -7,12 +7,13 @@ import type { RequestEvent } from '@sveltejs/kit';
 import { configFile, type Config, type Session } from '$models/config';
 import { set } from 'lodash-es';
 import { subDays, formatISO } from 'date-fns';
+import { UTCDate } from '@date-fns/utc';
 
 export const load = async (event: RequestEvent) => {
 	const isAuth = await checkAuth(event);
 	if (!isAuth) return redirect(308, '/login');
 	if (!event.params.id) return redirect(308, '/dashboard');
-	const today = new Date();
+	const today = new UTCDate();
 	const endDate = formatISO(today);
 	const startDate = formatISO(subDays(today, 30));