rocks update

server/json_databases/DCUUIA.json

@@ -1 +1 @@
-{"timestamp": "2024-05-22T07:28:53.869186", "dcu": {"eva1": {"batt": false, "oxy": false, "comm": false, "fan": false, "pump": false, "co2": false}, "eva2": {"batt": false, "oxy": false, "comm": false, "fan": false, "pump": false, "co2": false}}, "uia": {"eva1_power": false, "eva1_oxy": false, "eva1_water_supply": false, "eva1_water_waste": false, "eva2_power": false, "eva2_oxy": false, "eva2_water_supply": false, "eva2_water_waste": false, "oxy_vent": false, "depress": false}}
+{"timestamp": "2024-05-22T08:08:08.215779", "dcu": {"eva1": {"batt": false, "oxy": false, "comm": false, "fan": false, "pump": false, "co2": false}, "eva2": {"batt": false, "oxy": false, "comm": false, "fan": false, "pump": false, "co2": false}}, "uia": {"eva1_power": false, "eva1_oxy": false, "eva1_water_supply": false, "eva1_water_waste": false, "eva2_power": false, "eva2_oxy": false, "eva2_water_supply": false, "eva2_water_waste": false, "oxy_vent": false, "depress": false}}

server/json_databases/geojson/user_pins.json

@@ -1 +1,47 @@
-{"type": "FeatureCollection", "features": []}
+{
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "Name": "Eva1 @ 5126"
+            },
+            "geometry": {
+                "coordinates": [
+                    -95.08173200489527,
+                    29.56480501479513
+                ],
+                "type": "Point"
+            },
+            "id": 5126
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "Name": "Eva1 @ 5312"
+            },
+            "geometry": {
+                "coordinates": [
+                    -95.08173200489527,
+                    29.56480501479513
+                ],
+                "type": "Point"
+            },
+            "id": 5312
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "Name": "Eva1 @ 5335"
+            },
+            "geometry": {
+                "coordinates": [
+                    -95.08173200489527,
+                    29.56480501479513
+                ],
+                "type": "Point"
+            },
+            "id": 5335
+        }
+    ]
+}

server/json_databases/saved_rocks.json

@@ -1,5 +1,37 @@
 {
     "saved rocks": [
+        {
+            "name": "pigeonite_basalt",
+            "id": 5,
+            "data": {
+                "SiO2": 39.41,
+                "TiO2": 0.39,
+                "Al2O3": 1.94,
+                "FeO": 29.3,
+                "MnO": 0.71,
+                "MgO": 19.27,
+                "CaO": 3.8,
+                "K2O": 0.12,
+                "P2O3": 0.3,
+                "other": 4.76
+            }
+        },
+        {
+            "name": "ilmenite_basalt",
+            "id": 7,
+            "data": {
+                "SiO2": 43.98,
+                "TiO2": 1.04,
+                "Al2O3": 5.75,
+                "FeO": 20.4,
+                "MnO": 0.51,
+                "MgO": 6.02,
+                "CaO": 8.89,
+                "K2O": 0.71,
+                "P2O3": 1.09,
+                "other": 11.61
+            }
+        },
         {
             "name": "ilmenite_basalt",
             "id": 7,

server/server.py

@@ -155,7 +155,7 @@ async def get_warnings():
         raise HTTPException(status_code=404, detail="DATA.json not found")
 
 @app.get("/spec_scans")
-async def get_warnings():
+async def get_spec_scans():
     if os.path.exists(DATA_FILE):
         with open(DATA_FILE, 'r') as f:
             data = json.load(f)

src/pages-style/rocks.css

@@ -1,64 +1,133 @@
-.rocks-container {
-    display: flex;
-    height: 90vh;
-    /*width: 100vw;*/
-    background-color: #cce6ff;
-  }
-
-  .left-section {
-    width: 60%;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .top-div, .bottom-div {
-    height: 50%;
-    padding: 20px;
-    background-color: #f0f8ff; /* Light blue background */
-    border-radius: 10px;
-    margin: 10px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  }
-
-  .right-section {
-    width: 40%;
-    padding: 20px;
-    background-color: rgb(72, 72, 244); /* Blue background */
-    border-radius: 10px;
-    margin: 10px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: black;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-  }
-  /* rocks.css */
-.rocks-container {
+#rocks-container {
+  background-color: #cce6ff;
   display: flex;
   flex-direction: row;
-  height: 100vh;
+  height: 90vh;
+  width: 100vw;
   padding: 20px;
+  box-sizing: border-box;
 }
 
-.left-section, .right-section {
+#left-section, #right-section {
   flex: 1;
-  padding: 20px;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
   margin: 10px;
-  border-radius: 8px;
+  background-color: rgb(72, 72, 244);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+  border-radius: 20px;
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+#left-section {
+  width: 45%;
 }
 
-.left-section {
-  background-color: #f9f9f9;
+#right-section {
+  width: 45%;
+  position: relative;
 }
 
-.right-section {
-  background-color: #ffffff;
+#left-section > div, #right-section > div {
+  width: 100%;
+  height: 50%;
+  background-color: lightblue;
+  color: black;
   display: flex;
-  flex-direction: column;
   justify-content: center;
+  align-items: center;
+  border-radius: 5px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  padding: 20px;
+  box-sizing: border-box;
+}
+
+#right-section pre, #left-section .bottom-div pre {
+  width: 100%;
+  height: 100%;
+  background-color: #f0f8ff;
+  border-radius: 4px;
+  padding: 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  box-sizing: border-box;
+  overflow: auto;
 }
 
-.top-div, .bottom-div {
+#left-section .top-div, #left-section .bottom-div {
   margin-bottom: 20px;
 }
+
+#left-section .top-div:last-child, #left-section .bottom-div:last-child {
+  margin-bottom: 0;
+}
+
+.data-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.ev1-data {
+  width: 30%;
+}
+
+.significant-info {
+  width: 70%;
+  scale: 80%;
+}
+
+.significant-info {
+  background-color: #f0f8ff;
+  border-radius: 4px;
+  padding: 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+.significant-info h3 {
+  margin: 0;
+  padding-bottom: 10px;
+}
+
+.significant-info ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+.significant-info ul li {
+  margin: 5px 0;
+}
+
+.button-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  width: 100%;
+  margin-top: 30px;
+}
+
+#save-button, #drop-pin-button {
+  text-align: center;
+  width: 48%;
+  height: 30%;
+  background-color: rgb(73, 209, 254);
+  color: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 5px;
+  cursor: pointer;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  transition: background-color 0.3s;
+}
+
+#save-button:hover, #drop-pin-button:hover {
+  background-color: darkblue;
+}
+
+#right-section p {
+  margin-top: 10px;
+  color: white;
+}