From 19cf3e31c52892a356908f38fadc8983ca875953 Mon Sep 17 00:00:00 2001
From: Matt Fiddaman <github@m.fiddaman.uk>
Date: Tue, 1 Apr 2025 20:46:26 -0400
Subject: [PATCH] cleanup, improve date formatting, move date filtering to
 client side, make statuses more 'airport-y'

---
 package.json                         |  1 +
 src/App.js                           | 45 +++++++++++++---------------
 src/components/schedule/Schedule.jsx | 19 +++++-------
 yarn.lock                            | 10 +++++++
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 78ad617..676c664 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "@testing-library/react": "^16.2.0",
     "@testing-library/user-event": "^13.5.0",
     "date-fns": "^4.1.0",
+    "date-fns-tz": "^3.2.0",
     "prettier": "^3.5.3",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
diff --git a/src/App.js b/src/App.js
index 3dbdb77..2176f2d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,44 +1,32 @@
 import { useState, useEffect, useMemo } from 'react';
+import { format, formatDistanceToNow, startOfDay } from 'date-fns';
+import { formatInTimeZone } from 'date-fns-tz';
+
 import './App.css';
 import '@fontsource/roboto-mono';
+
 import Schedule from './components/schedule/Schedule';
 import Radar from './components/Radar';
-import { format, formatDistanceToNow } from 'date-fns';
 import Metar from './components/metar/Metar';
 
 const statuses = {
   OPEN: 'ON TIME',
+  COMPLETED: 'LANDED',
+  'IN PROGRESS': 'ENROUTE',
 };
-const days = [
-  'Sunday',
-  'Monday',
-  'Tuesday',
-  'Wednesday',
-  'Thursday',
-  'Friday',
-  'Saturday',
-];
-const pad = n => String(n).padStart(2, '0');
-
-function formatUtcDate(date) {
-  return (
-    `${days[date.getUTCDay()]} ${pad(date.getUTCDate())}/${pad(date.getUTCMonth() + 1)}/${date.getUTCFullYear()} ` +
-    `${pad(date.getUTCHours())}:${pad(date.getUTCMinutes())}:${pad(date.getUTCSeconds())}Z`
-  );
-}
 
 const normaliseData = data => {
   return data.map(d => {
     const date = format(d.start, 'dd/MM');
-    const start = format(d.start, 'HH:mm');
-    const end = format(d.end, 'HH:mm');
-    const status = statuses[d.status] ?? d.status;
+    const startTime = format(d.start, 'HH:mm');
+    const endTime = format(d.end, 'HH:mm');
+    const status = statuses[d.status.toUpperCase()] ?? d.status;
 
     return {
       ...d,
       date,
-      start,
-      end,
+      startTime,
+      endTime,
       status,
     };
   });
@@ -58,10 +46,17 @@ function App() {
   }, []);
 
   const fetchData = async () => {
+    const today = startOfDay(new Date());
+
     try {
       const res = await fetch('https://mattfidd.rocks/veroDashboard.json');
       const json = await res.json();
-      setData(normaliseData(json.slice(1)));
+
+      const normalisedData = normaliseData(json.slice(1)).filter(
+        d => new Date(d.end) >= today,
+      );
+
+      setData(normalisedData);
       setDataUpdated(json[0].updatedAt);
     } catch (err) {
       console.error('Error fetching data:', err);
@@ -79,7 +74,7 @@ function App() {
   }, []);
 
   const formattedTime = useMemo(() => {
-    return formatUtcDate(time);
+    return formatInTimeZone(time, 'UTC', 'EEEE dd/MM HH:mm:ss') + 'Z';
   }, [time]);
 
   return (
diff --git a/src/components/schedule/Schedule.jsx b/src/components/schedule/Schedule.jsx
index 0885ca4..be78175 100644
--- a/src/components/schedule/Schedule.jsx
+++ b/src/components/schedule/Schedule.jsx
@@ -4,6 +4,11 @@ import ScheduleRow from './ScheduleRow';
 import ScheduleCell from './ScheduleCell';
 
 const widths = [85, 85, 85, 85, 400, 150];
+const colours = {
+  LANDED: '#6FB165',
+  ENROUTE: '#3197E5',
+  CANCELLED: '#E54331',
+};
 
 const Schedule = ({ data }) => {
   return (
@@ -56,8 +61,8 @@ const Schedule = ({ data }) => {
               <ScheduleRow bg={i % 2 === 1} key={row.id}>
                 <ScheduleCell width={widths[0]}>{row.name}</ScheduleCell>
                 <ScheduleCell width={widths[1]}>{row.date}</ScheduleCell>
-                <ScheduleCell width={widths[2]}>{row.start}</ScheduleCell>
-                <ScheduleCell width={widths[3]}>{row.end}</ScheduleCell>
+                <ScheduleCell width={widths[2]}>{row.startTime}</ScheduleCell>
+                <ScheduleCell width={widths[3]}>{row.endTime}</ScheduleCell>
                 <ScheduleCell width={widths[4]}>
                   {row.description?.length
                     ? row.description
@@ -69,15 +74,7 @@ const Schedule = ({ data }) => {
                 <ScheduleCell width={widths[5]}>{row.location}</ScheduleCell>
                 <ScheduleCell
                   end="true"
-                  color={
-                    row.status.toUpperCase() === 'COMPLETED'
-                      ? '#6FB165'
-                      : row.status.toUpperCase() === 'IN PROGRESS'
-                        ? '#3197E5'
-                        : row.status.toUpperCase() === 'CANCELLED'
-                          ? '#E54331'
-                          : undefined
-                  }
+                  color={colours[row.status.toUpperCase()]}
                 >
                   {row.status}
                 </ScheduleCell>
diff --git a/yarn.lock b/yarn.lock
index b53de99..8c19177 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5008,6 +5008,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"date-fns-tz@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "date-fns-tz@npm:3.2.0"
+  peerDependencies:
+    date-fns: ^3.0.0 || ^4.0.0
+  checksum: 10c0/3f43300a4335d59f3515dc5196c66b4b56ef2af129eb82e4445ce0983e8ef31a5d038bc0406d669946bbbcf52ed953527527aa28b4a810995d6631a54655abcc
+  languageName: node
+  linkType: hard
+
 "date-fns@npm:^4.1.0":
   version: 4.1.0
   resolution: "date-fns@npm:4.1.0"
@@ -12920,6 +12929,7 @@ __metadata:
     "@testing-library/react": "npm:^16.2.0"
     "@testing-library/user-event": "npm:^13.5.0"
     date-fns: "npm:^4.1.0"
+    date-fns-tz: "npm:^3.2.0"
     prettier: "npm:^3.5.3"
     react: "npm:^19.1.0"
     react-dom: "npm:^19.1.0"