From c9b1f162d41ffa0a91d25fd384ef8694984ba9a9 Mon Sep 17 00:00:00 2001
From: Gard <github.blunderer148@passmail.net>
Date: Thu, 5 Jun 2025 18:24:55 +0200
Subject: [PATCH 1/2] Using correct format

---
 .../components/downloads/ClaimedCredits.svelte    | 11 ++---------
 .../src/routes/portal/claim-beer/+page.server.ts  | 15 +--------------
 .../www/src/routes/portal/claim-beer/+page.svelte | 13 ++-----------
 internal/emails/emails/shiftemail.tsx             |  8 ++++++--
 4 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/apps/www/src/lib/components/downloads/ClaimedCredits.svelte b/apps/www/src/lib/components/downloads/ClaimedCredits.svelte
index 8bce3460..6d89776a 100644
--- a/apps/www/src/lib/components/downloads/ClaimedCredits.svelte
+++ b/apps/www/src/lib/components/downloads/ClaimedCredits.svelte
@@ -3,18 +3,11 @@
 	import { Download } from '@lucide/svelte';
 	import Input from '../ui/Input.svelte';
 	import Button from '../ui/Button.svelte';
+	import { ISOStandard } from '$lib/date';
 
 	let startDate = $state('');
 	let loading = $state(false);
-	let endDate = $state('');
-
-	$effect(() => {
-		if (!endDate) {
-			const today = new Date();
-			const formattedDate = today.toISOString().slice(0, 16);
-			endDate = formattedDate;
-		}
-	});
+	let endDate = $derived(ISOStandard(new Date()));
 </script>
 
 <div class="flex max-w-xs flex-col gap-4">
diff --git a/apps/www/src/routes/portal/claim-beer/+page.server.ts b/apps/www/src/routes/portal/claim-beer/+page.server.ts
index f62431da..bec89920 100644
--- a/apps/www/src/routes/portal/claim-beer/+page.server.ts
+++ b/apps/www/src/routes/portal/claim-beer/+page.server.ts
@@ -4,6 +4,7 @@ import { fail } from '@sveltejs/kit';
 import { getProducts } from '$lib/api/sanity/products';
 import { claimedCredits, users } from '$lib/db/schemas';
 import { gte, eq, desc, lte, and } from 'drizzle-orm';
+import { formatDate } from '$lib/date';
 
 export const load: PageServerLoad = async ({ locals }) => {
 	const userId = await locals.user?.id;
@@ -177,20 +178,6 @@ export const actions: Actions = {
 				return `"${stringField}"`;
 			};
 
-			const formatDate = (date: Date): string => {
-				return date
-					.toLocaleString('en-US', {
-						year: 'numeric',
-						month: '2-digit',
-						day: '2-digit',
-						hour: '2-digit',
-						minute: '2-digit',
-						second: '2-digit',
-						hour12: false
-					})
-					.replace(/,/g, '');
-			};
-
 			const headers = ['Product', 'Name', 'Cost', 'Created At'];
 			const csvRows = [headers.join(',')];
 
diff --git a/apps/www/src/routes/portal/claim-beer/+page.svelte b/apps/www/src/routes/portal/claim-beer/+page.svelte
index 09270ba2..a765f825 100644
--- a/apps/www/src/routes/portal/claim-beer/+page.svelte
+++ b/apps/www/src/routes/portal/claim-beer/+page.svelte
@@ -10,6 +10,7 @@
 	import { FilterState } from '$lib/states/filter-state.svelte';
 	import { urlFor } from '$lib/api/sanity/image';
 	import Button from '$lib/components/ui/Button.svelte';
+	import { normalDate } from '$lib/date';
 
 	let loading = $state(false);
 	let selectedProduct = $state<null | Product>(null);
@@ -88,16 +89,6 @@
 		}
 		claimedProduct = null;
 	}
-
-	function formatDate(date: Date) {
-		return new Date(date).toLocaleString('no-NO', {
-			day: '2-digit',
-			month: '2-digit',
-			year: 'numeric',
-			hour: '2-digit',
-			minute: '2-digit'
-		});
-	}
 </script>
 
 <svelte:head>
@@ -254,7 +245,7 @@
 
 	{#if data.lastClaimed}
 		<p class="mt-8 text-center text-lg text-gray-600">
-			Historikk: {data.lastClaimed.productName} - {formatDate(data.lastClaimed.claimedAt)}
+			Historikk: {data.lastClaimed.productName} - {normalDate(data.lastClaimed.claimedAt)}
 		</p>
 	{/if}
 {/if}
diff --git a/internal/emails/emails/shiftemail.tsx b/internal/emails/emails/shiftemail.tsx
index 1b39fa88..e3f208b2 100644
--- a/internal/emails/emails/shiftemail.tsx
+++ b/internal/emails/emails/shiftemail.tsx
@@ -7,6 +7,8 @@ import {
   Tailwind,
 } from "@react-email/components";
 
+import { normalDate } from "$lib/date";
+
 export interface ShiftEmailProps {
   shift: {
     startAt: string;
@@ -36,11 +38,13 @@ const ShiftEmail = ({ shift, user }: ShiftEmailProps) => {
             </Text>
 
             <Text className="mt-2">
-              <strong>Fra:</strong> {new Date(shift.startAt).toLocaleString()}
+              <strong>Fra:</strong>{" "}
+              {normalDate(new Date(shift.startAt).toLocaleString())}
             </Text>
 
             <Text className="mt-1">
-              <strong>Til:</strong> {new Date(shift.endAt).toLocaleString()}
+              <strong>Til:</strong>{" "}
+              {normalDate(new Date(shift.endAt).toLocaleString())}
             </Text>
 
             {shift.description && (

From 837aee999874b39060acec8cca040e707c9eae64 Mon Sep 17 00:00:00 2001
From: Gard <github.blunderer148@passmail.net>
Date: Thu, 5 Jun 2025 18:39:38 +0200
Subject: [PATCH 2/2] formatting mails

---
 internal/emails/emails/shiftemail.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/internal/emails/emails/shiftemail.tsx b/internal/emails/emails/shiftemail.tsx
index e3f208b2..7b55157b 100644
--- a/internal/emails/emails/shiftemail.tsx
+++ b/internal/emails/emails/shiftemail.tsx
@@ -7,8 +7,6 @@ import {
   Tailwind,
 } from "@react-email/components";
 
-import { normalDate } from "$lib/date";
-
 export interface ShiftEmailProps {
   shift: {
     startAt: string;
@@ -39,12 +37,12 @@ const ShiftEmail = ({ shift, user }: ShiftEmailProps) => {
 
             <Text className="mt-2">
               <strong>Fra:</strong>{" "}
-              {normalDate(new Date(shift.startAt).toLocaleString())}
+              {new Date(shift.startAt).toLocaleString("nb-NO")}
             </Text>
 
             <Text className="mt-1">
               <strong>Til:</strong>{" "}
-              {normalDate(new Date(shift.endAt).toLocaleString())}
+              {new Date(shift.endAt).toLocaleString("nb-NO")}
             </Text>
 
             {shift.description && (