updateevents

earthpulse · Oct 9, 2024 · b6b481a · b6b481a
1 parent 4d85be6
commit b6b481a
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 34 deletions.
diff --git a/ui/src/routes/Events.svelte b/ui/src/routes/Events.svelte
@@ -53,15 +53,24 @@
 
 	function hasDayEvent(day) {
 		const dateString = `${currentYear}-${String(currentMonth + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
-		return events.some((event) => event.date === dateString || event.dateTo === dateString);
+		const currentDateString = new Date().toISOString().split("T")[0];
+		return events.some(
+			(event) =>
+				(event.date === dateString || event.dateTo === dateString) &&
+				event.date >= currentDateString,
+		);
 	}
 	function hasEvent(day) {
 		const dateString = `${currentYear}-${String(currentMonth + 1).padStart(2, "0")}-${String(day).padStart(2, "0")}`;
-		return events.some((event) => 
-		event.dateTo >= dateString &&
-		event.date <= dateString &&
-		event.dateTo > event.date );
-		}
+		const currentDateString = new Date().toISOString().split("T")[0];
+		return events.some(
+			(event) =>
+				event.dateTo >= dateString &&
+				event.date <= dateString &&
+				event.dateTo > event.date &&
+				event.date >= currentDateString,
+		);
+	}
 
 	function prevMonth() {
 		currentDate = new Date(currentYear, currentMonth - 1, 1);
@@ -113,17 +122,22 @@
 						{#each week as day}
 							{#if day && hasDayEvent(day)}
 								<td
-									class='
-									{
-									hasEvent(day-1) && hasEvent(day+1) ? "" :
-									hasEvent(day-1) ? "rounded-r-xl": 
-									hasEvent(day+1) ? "rounded-l-xl" : "rounded-full"} 
-									text-center p-1 font-bold text-black bg-[rgb(74,191,167)]'
+									class="
+									{hasEvent(day - 1) && hasEvent(day + 1)
+										? ''
+										: hasEvent(day - 1)
+											? 'rounded-r-xl'
+											: hasEvent(day + 1)
+												? 'rounded-l-xl'
+												: 'rounded-full'} 
+									text-center p-1 font-bold text-black bg-[rgb(74,191,167)]"
 								>
 									{day}
 								</td>
 							{:else if day && hasEvent(day)}
-								<td class="text-center p-1 font-bold text-black bg-[rgb(74,191,167)]">
+								<td
+									class="text-center p-1 font-bold text-black bg-[rgb(74,191,167)]"
+								>
 									{day}
 								</td>
 							{:else if day === new Date().getDate() && currentMonth === new Date().getMonth() && currentYear === new Date().getFullYear()}
@@ -149,27 +163,27 @@
 			<li class="mb-4">
 				<h3 class="text-md font-bold">{event.title}</h3>
 				{#if !event.dateTo}
-				<p class="text-xs text-gray-500">
-					{new Date(event.date).toLocaleDateString("en-US", {
-						year: "numeric",
-						month: "long",
-						day: "numeric",
-					})}
-				</p>
+					<p class="text-xs text-gray-500">
+						{new Date(event.date).toLocaleDateString("en-US", {
+							year: "numeric",
+							month: "long",
+							day: "numeric",
+						})}
+					</p>
 				{:else}
-				<p class="text-xs text-gray-500">
-					{new Date(event.date).toLocaleDateString("en-US", {
-						year: "numeric",
-						month: "long",
-						day: "numeric",
-					})}
-					to
-					{new Date(event.dateTo).toLocaleDateString("en-US", {
-                        year: "numeric",
-                        month: "long",
-                        day: "numeric",
-                    })}
-				</p>
+					<p class="text-xs text-gray-500">
+						{new Date(event.date).toLocaleDateString("en-US", {
+							year: "numeric",
+							month: "long",
+							day: "numeric",
+						})}
+						to
+						{new Date(event.dateTo).toLocaleDateString("en-US", {
+							year: "numeric",
+							month: "long",
+							day: "numeric",
+						})}
+					</p>
 				{/if}
 				<p class="text-gray-600 text-xs">{event.description}</p>
 				<a

diff --git a/ui/src/routes/events.json b/ui/src/routes/events.json
@@ -1 +1,16 @@
-[]
+[
+	{
+		"title": "Event Title",
+		"description": "Event Description",
+		"date": "2024-10-04",
+		"dateTo": "2024-10-10",
+		"link": "Event Link"
+	},
+	{
+		"title": "Event Title",
+		"description": "Event Description",
+		"date": "2024-10-20",
+		"dateTo": "2024-10-22",
+		"link": "Event Link"
+	}
+]