From c1d11b50f3e6738da152901c5d701f41da621120 Mon Sep 17 00:00:00 2001
From: huangjoseph45 <huangjoseph45@gmail.com>
Date: Wed, 19 Nov 2025 21:13:05 -0500
Subject: [PATCH] vpn status + fix to possible crash in datatable

---
 src/components/DataTable.tsx  | 12 +++--
 src/components/Navbar.tsx     | 22 +++++----
 src/components/PingStatus.tsx | 37 +++++++++++++++
 src/css/Navbar.css            | 87 +++++++++++++++++++++++------------
 4 files changed, 114 insertions(+), 44 deletions(-)
 create mode 100644 src/components/PingStatus.tsx

diff --git a/src/components/DataTable.tsx b/src/components/DataTable.tsx
index 8ee822e..ff1c0ab 100644
--- a/src/components/DataTable.tsx
+++ b/src/components/DataTable.tsx
@@ -58,15 +58,17 @@ export default function DataTable({
         bg={selectedRow === file.id ? theme.primaryColor : ""}
       >
         <Table.Td style={{ paddingLeft: "25px", size: "xs" }}>
-          {getFileNameWithoutExtension(file.mcap_files[0].file_name)}
+          {file.mcap_files
+            ? getFileNameWithoutExtension(file.mcap_files[0].file_name)
+            : null}
         </Table.Td>
         <Table.Td>{file.date}</Table.Td>
-        <Table.Td style={{ size: "xs"}}>
-          <Input.Wrapper >
+        <Table.Td style={{ size: "xs" }}>
+          <Input.Wrapper>
             <Textarea
               variant="unstyled"
               value={file.location}
-              style={{ whiteSpace: "normal", wordWrap: "break-word"}}
+              style={{ whiteSpace: "normal", wordWrap: "break-word" }}
               readOnly
               autosize
               placeholder="No Location Available"
@@ -81,7 +83,7 @@ export default function DataTable({
             <Textarea
               variant="unstyled"
               value={file.notes}
-              style={{ whiteSpace: "normal", wordWrap: "break-word"}}
+              style={{ whiteSpace: "normal", wordWrap: "break-word" }}
               readOnly
               autosize
               placeholder="No Note Available"
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 9b8c47c..2a1f891 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -3,6 +3,7 @@ import "@/css/Navbar.css";
 import { NavLink } from "react-router-dom";
 import FileUpload from "@/components/FileUpload";
 import Feedback from "@/components/Feedback";
+import PingStatus from "@/components/PingStatus";
 import { Button } from "@mantine/core";
 import { IconHelp } from "@tabler/icons-react";
 
@@ -29,23 +30,26 @@ export default function Navbar() {
         alt="Logo"
         className="navbar-icon"
       />
-      <Button 
+      <Button
         variant="filled"
         component="a"
         target="_blank"
-        href="https://wiki.hytechracing.org/books/software/page/query-frontend-demo-and-documentation">
-          <IconHelp size="25"/>
+        href="https://wiki.hytechracing.org/books/software/page/query-frontend-demo-and-documentation"
+      >
+        <IconHelp size="25" />
       </Button>
       {links}
 
       {/* Once POST API is out -- Currently WIP */}
-      <FileUpload uploadUrl={`${import.meta.env.VITE_API_URL}/api/v2/mcaps/bulk_upload`}/>
-      <div style={{right: 0}}>
-      <Feedback/>
-      </div> 
+      <FileUpload
+        uploadUrl={`${import.meta.env.VITE_API_URL}/api/v2/mcaps/bulk_upload`}
+      />
+      <div style={{ right: 0 }}>
+        <Feedback />
+      </div>
       {/* Optionally render active link or other content here */}
       <h3 className="hytechName">{hytechName}</h3>
-      
+      <PingStatus />
     </nav>
   );
-}
\ No newline at end of file
+}
diff --git a/src/components/PingStatus.tsx b/src/components/PingStatus.tsx
new file mode 100644
index 0000000..04a34dc
--- /dev/null
+++ b/src/components/PingStatus.tsx
@@ -0,0 +1,37 @@
+import "@/css/Navbar.css";
+import { useEffect, useState } from "react";
+
+const PingStatus: React.FC = () => {
+  const [vpnActive, setVpnActive] = useState(false);
+  const [isHovering, setIsHovering] = useState(false);
+
+  const handleGetStatus = async () => {
+    try {
+      const res = await fetch(`${import.meta.env.VITE_API_URL}/ping`, {});
+
+      setVpnActive(res.ok); // res is always truthy if fetch didn't throw
+    } catch {
+      setVpnActive(false);
+    }
+  };
+
+  useEffect(() => {
+    handleGetStatus();
+  }, []);
+
+  return (
+    <div
+      className={`vpnStatus ${vpnActive ? "vpnStatusGood" : "vpnStatusBad"}`}
+      onMouseEnter={() => setIsHovering(true)}
+      onMouseLeave={() => setIsHovering(false)}
+    >
+      {isHovering ? (
+        <div className="vpnStatusHover">
+          VPN is {vpnActive ? "active" : "inactive"}
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default PingStatus;
diff --git a/src/css/Navbar.css b/src/css/Navbar.css
index 63a5ac6..709e613 100644
--- a/src/css/Navbar.css
+++ b/src/css/Navbar.css
@@ -1,47 +1,74 @@
-@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap");
 
 nav {
-    padding: 15px 0;
-    background: #B3A36A;
-    display: flex;
-    height: 50px;
-    align-items: center;
+  padding: 15px 0;
+  background: #b3a36a;
+  display: flex;
+  height: 50px;
+  align-items: center;
 }
 
 .nav-link {
-    padding: 3px 15px;
-    text-decoration: none;
-    color: #FFFFFF;
-    background-color: transparent;
-    border-radius: 8px;
-    font-weight: bold;
-    cursor: pointer;
-    transition: all 0.2s ease-in-out;
-    display: inline-block;
-    margin-left: 20px;
-    font-family: 'Roboto', sans-serif;
+  padding: 3px 15px;
+  text-decoration: none;
+  color: #ffffff;
+  background-color: transparent;
+  border-radius: 8px;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.2s ease-in-out;
+  display: inline-block;
+  margin-left: 20px;
+  font-family: "Roboto", sans-serif;
 }
 
 #navbar a.active {
-    background-color: #978750;
-    font-weight: bold;
+  background-color: #978750;
+  font-weight: bold;
 }
 
 .nav-link:hover {
-    color: white;
-    background-color: #D1BF80;
+  color: white;
+  background-color: #d1bf80;
 }
 
 .navbar-icon {
-    height: 30px;
-    margin-right: 20px;
-    margin-left: 20px;
+  height: 30px;
+  margin-right: 20px;
+  margin-left: 20px;
 }
 
 .hytechName {
-    margin-left: auto;
-    margin-right: 10px;
-    border-radius: 5px;
-    color: white;
-    font-weight: 900;
-}
\ No newline at end of file
+  margin-left: auto;
+  margin-right: 10px;
+  border-radius: 5px;
+  color: white;
+  font-weight: 900;
+}
+
+.vpnStatus {
+  border-radius: 100%;
+  width: 1rem;
+  height: 1rem;
+  margin: 1rem;
+  cursor: pointer;
+}
+
+.vpnStatusGood {
+  background-color: green;
+}
+
+.vpnStatusBad {
+  background-color: red;
+}
+
+.vpnStatusHover {
+  white-space: nowrap;
+  z-index: 10;
+  background-color: white;
+  width: fit-content;
+  border-radius: 5px;
+  transform: translate(-85%, 75%);
+  padding: 0.25rem;
+  border: 1px solid gray;
+}