Revamp the entire data storage solution and fix conops connection pro…

…blem
cornellrocketryteam · Jan 31, 2025 · ff64834 · ff64834
1 parent a43165d
commit ff64834
Show file tree

Hide file tree

Showing 24 changed files with 322 additions and 496 deletions.
diff --git a/ground-server/src/app/conops/page1/page.tsx b/ground-server/src/app/conops/page1/page.tsx
@@ -1,5 +1,5 @@
 import { auth } from "@/app/auth";
-import { LiveValueBox } from "@/components/live-value-box";
+import { LiveValueBox } from "@/components/conops/live-value-box";
 import { Button } from "@/components/ui/button";
 import {
   AlertDialog,

diff --git a/ground-server/src/app/conops/page2/page.tsx b/ground-server/src/app/conops/page2/page.tsx
@@ -1,5 +1,5 @@
 import { auth } from "@/app/auth";
-import ActuationBox from "@/components/actuation-box";
+import ActuationBox from "@/components/conops/actuation-box";
 import {
   AlertDialog,
   AlertDialogTrigger,
@@ -13,7 +13,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
-import PreviousButton from "@/components/previous-button"; 
+import PreviousButton from "@/components/conops/previous-button"; 
 
 export default async function Page2() {
   const session = await auth();

diff --git a/ground-server/src/app/conops/page3/page.tsx b/ground-server/src/app/conops/page3/page.tsx
@@ -1,6 +1,6 @@
 import { auth } from "@/app/auth";
-import ActuationBox from "@/components/actuation-box";
-import { LiveValueBox } from "@/components/live-value-box";
+import ActuationBox from "@/components/conops/actuation-box";
+import { LiveValueBox } from "@/components/conops/live-value-box";
 import {
   AlertDialog,
   AlertDialogTrigger,
@@ -14,7 +14,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
-import PreviousButton from "@/components/previous-button"; 
+import PreviousButton from "@/components/conops/previous-button"; 
 
 export default async function Page3() {
   const session = await auth();

diff --git a/ground-server/src/app/conops/page4/page.tsx b/ground-server/src/app/conops/page4/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from "@/app/auth";
-import { LiveValueWithHistoricalGraph } from "@/components/live-value-with-historical-graph";
-import { CameraBox } from "@/components/camera-box";
-import ActuationBox from "@/components/actuation-box";
+import { LiveValueWithHistoricalGraph } from "@/components/conops/live-value-with-historical-graph";
+import { CameraBox } from "@/components/conops/camera-box";
+import ActuationBox from "@/components/conops/actuation-box";
 import {
   AlertDialog,
   AlertDialogTrigger,
@@ -15,7 +15,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
-import PreviousButton from "@/components/previous-button"; 
+import PreviousButton from "@/components/conops/previous-button"; 
 
 export default async function Page4() {
   const session = await auth();
@@ -34,22 +34,22 @@ export default async function Page4() {
         <LiveValueWithHistoricalGraph
           label="RTD Temperature"
           dbField="rtdTemp"
-          chartMode="15m"
+          duration={15}
         />
         <LiveValueWithHistoricalGraph
           label="Load Cell 1 (LC1)"
           dbField="lc1"
-          chartMode="60m"
+          duration={60}
         />
         <LiveValueWithHistoricalGraph
           label="Pressure Transducer 4 (PT4)"
           dbField="pt4"
-          chartMode="15m"
+          duration={15}
         />
         <LiveValueWithHistoricalGraph
           label="Pressure Transducer 1 (PT1)"
           dbField="pt1"
-          chartMode="60m"
+          duration={60}
         />
       </div>
 

diff --git a/ground-server/src/app/conops/page5/page.tsx b/ground-server/src/app/conops/page5/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from "@/app/auth";
-import ActuationBox from "@/components/actuation-box";
-import { LiveValueWithHistoricalGraph } from "@/components/live-value-with-historical-graph";
-import { CameraBox } from "@/components/camera-box";
+import ActuationBox from "@/components/conops/actuation-box";
+import { LiveValueWithHistoricalGraph } from "@/components/conops/live-value-with-historical-graph";
+import { CameraBox } from "@/components/conops/camera-box";
 import {
   AlertDialog,
   AlertDialogTrigger,
@@ -15,7 +15,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
-import PreviousButton from "@/components/previous-button"; 
+import PreviousButton from "@/components/conops/previous-button"; 
 
 export default async function Page5() {
   const session = await auth();
@@ -34,7 +34,7 @@ export default async function Page5() {
         <LiveValueWithHistoricalGraph
           label="Pressure Transducer 2 (PT2)"
           dbField="pt2"
-          chartMode="15m"
+          duration={15}
         />
         <CameraBox text="Camera pointing at QD" />
       </div>

diff --git a/ground-server/src/app/conops/page6/page.tsx b/ground-server/src/app/conops/page6/page.tsx
@@ -1,6 +1,6 @@
 import { auth } from "@/app/auth";
-import ActuationBox from "@/components/actuation-box";
-import { LiveValueWithHistoricalGraph } from "@/components/live-value-with-historical-graph";
+import ActuationBox from "@/components/conops/actuation-box";
+import { LiveValueWithHistoricalGraph } from "@/components/conops/live-value-with-historical-graph";
 import {
   AlertDialog,
   AlertDialogTrigger,
@@ -14,7 +14,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import Link from "next/link";
 import { Button } from "@/components/ui/button";
-import PreviousButton from "@/components/previous-button"; // Import the reusable component
+import PreviousButton from "@/components/conops/previous-button"; // Import the reusable component
 
 export default async function Page6() {
   const session = await auth();
@@ -33,7 +33,7 @@ export default async function Page6() {
         <LiveValueWithHistoricalGraph
           label="Igniter Current"
           dbField="igniterCurrent"
-          chartMode="15m"
+          duration={15}
         />
         <div className="flex justify-center">
           <ActuationBox

diff --git a/ground-server/src/app/conops/page7/page.tsx b/ground-server/src/app/conops/page7/page.tsx
@@ -1,7 +1,7 @@
 import { auth } from "@/app/auth";
-import ActuationBox from "@/components/actuation-box";
-import { CameraBox } from "@/components/camera-box";
-import PreviousButton from "@/components/previous-button"; 
+import ActuationBox from "@/components/conops/actuation-box";
+import { CameraBox } from "@/components/conops/camera-box";
+import PreviousButton from "@/components/conops/previous-button"; 
 
 export default async function Page7() {
   const session = await auth();

diff --git a/ground-server/src/app/controls/page.tsx b/ground-server/src/app/controls/page.tsx
@@ -1,5 +1,5 @@
 import { auth } from "@/app/auth";
-import ActuationBox from "@/components/actuation-box";
+import ActuationBox from "@/components/conops/actuation-box";
 
 export default async function Controls() {
   const session = await auth();

diff --git a/ground-server/src/app/layout.tsx b/ground-server/src/app/layout.tsx
@@ -8,7 +8,7 @@ import { ThemeProvider } from "@/components/theme-provider";
 import Navbar from "@/components/navbar";
 
 import { Toaster } from "@/components/ui/toaster"
-import { WebSocketProvider } from "@/contexts/websocket-context";
+import { DataProvider } from "@/contexts/data-context";
 
 const geistSans = localFont({
   src: "./fonts/GeistVF.woff",
@@ -44,11 +44,11 @@ export default function RootLayout({
           disableTransitionOnChange
         >
           <SessionProvider>
-            <WebSocketProvider>
+            <DataProvider>
               <Navbar />
               <main>{children}</main>
               <Toaster /> {/* Place Toaster here within the first return statement */}
-            </WebSocketProvider>
+            </DataProvider>
           </SessionProvider>
         </ThemeProvider>
       </body>