From 1d5ba18349836fbfa8aa367b26382c86db6ad418 Mon Sep 17 00:00:00 2001
From: Ariadna Pellejero <pellejeroariadna@gmail.com>
Date: Wed, 25 Jun 2025 18:59:46 +0200
Subject: [PATCH] new version of the control-station

---
 .../Data1Page/Data1Page.module.scss           | 47 ++++++++++++-------
 .../pages/VehiclePage/Data1Page/Data1Page.tsx | 33 ++++++-------
 packet-sender/adj                             |  1 -
 3 files changed, 44 insertions(+), 37 deletions(-)
 delete mode 160000 packet-sender/adj

diff --git a/control-station/src/pages/VehiclePage/Data1Page/Data1Page.module.scss b/control-station/src/pages/VehiclePage/Data1Page/Data1Page.module.scss
index 3546f1f24..23735164d 100644
--- a/control-station/src/pages/VehiclePage/Data1Page/Data1Page.module.scss
+++ b/control-station/src/pages/VehiclePage/Data1Page/Data1Page.module.scss
@@ -1,31 +1,44 @@
+.test{
+    background-color: white;
+    height: 6px;
+    width: 6px;
+}
 .data1_page {
-    display: flex;
-    flex-flow: row wrap;
+    // display: flex;
+    // flex-flow: row wrap;
+    // gap: 1rem;
+    display: grid;
+    grid-template-columns: 25vw 50vw 25vw;
     gap: 1rem;
+    padding: 1rem;
+    height: 100%;
+    box-sizing: border-box;
 }
 
 .column {
     display: flex;
     flex-flow: column;
     gap: 1rem;
+    height: fit-content;
 
-    &:nth-child(1) {
-        width: 27vw;
-    }
+    // &:nth-child(1) {
+    //     width: 27vw;
+    // }
 
-    &:nth-child(2) {
-        width: 12vw;
-    }
+    // &:nth-child(2) {
+    //     width: 12vw;
+    // }
 
-    &:nth-child(3) {
-        width: 12vw;
-    }
+    // &:nth-child(3) {
+    //     width: 12vw;
+    // }
 
-    &:nth-child(4) {
-        width: 16vw;
-    }
+    // &:nth-child(4) {
+    //     width: 16vw;
+    // }
 
-    &:nth-child(5) {
-        width: 26vw;
-    }
+    // &:nth-child(5) {
+    //     width: 26vw;
+    // }
 }
+
diff --git a/control-station/src/pages/VehiclePage/Data1Page/Data1Page.tsx b/control-station/src/pages/VehiclePage/Data1Page/Data1Page.tsx
index 7327cc032..a04b2e6c6 100644
--- a/control-station/src/pages/VehiclePage/Data1Page/Data1Page.tsx
+++ b/control-station/src/pages/VehiclePage/Data1Page/Data1Page.tsx
@@ -7,35 +7,30 @@ import { BCU } from '../Boards/BCU/BCU';
 import { BMSL } from '../Boards/BMSL/BMSL';
 import { useEmergencyOrders } from 'hooks/useEmergencyOrders';
 import Connections from '../Windows/Connections';
-import { Connection, useConnections } from 'common';
+import { Connection, Logger, MessagesContainer, Orders, useConnections } from '../../../../../common-front';
 import { PCU } from '../Boards/PCU/PCU';
+import { LCU } from '../Boards/LCU/LCU';
+import FixedOrders, { getHardcodedOrders } from '../Data2Page/FixedOrders';
+import { BrakeVisualizer } from 'components/BrakeVisualizer/BrakeVisualizer';
+import { LevitationUnit } from 'components/LevitationUnit/LevitationUnit';
 
 export const Data1Page = () => {
     useEmergencyOrders();
 
     return (
         <div className={styles.data1_page}>
-            {/* <div className={styles.column}>
-                <OBCCUBatteries />
+            <div className={styles.test}> </div>
+            <div></div>
+            <div></div>
+            <div className={`${styles.column} ${styles.lcu}`}>
+                <LCU />
             </div>
-
-            <div className={styles.column}>
-                <OBCCUGeneralInfo />
-                <BMSL />
+            <div >
+                <MessagesContainer />
             </div>
-
-            <div className={styles.column}>
-                <VCUPositionInfo />
+            <div>
+                <Logger />
             </div>
-
-            <div className={styles.column}>
-                <VCUBrakesInfo />
-            </div>
-
-            <div className={styles.column}>
-                <PCU />
-                <Connections />
-            </div> */}
         </div>
     );
 };
diff --git a/packet-sender/adj b/packet-sender/adj
deleted file mode 160000
index d4f57b566..000000000
--- a/packet-sender/adj
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d4f57b566f0227c153f772a41a1e333492524bd4