From ab7095413349e8e2488c4e2608aa55c9321d2d8b Mon Sep 17 00:00:00 2001
From: louisa <louisateichmann@outlook.com>
Date: Mon, 19 Jun 2023 16:57:36 +0200
Subject: [PATCH] test lcoation-log

---
 .vscode/settings.json                         |  3 +++
 .../LoraNFC/sketch_may24a/sketch_may24a.ino   |  4 ----
 public/index.html                             | 19 ++++++++++++-------
 public/style.css                              |  6 +++++-
 4 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..6f3a291
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
\ No newline at end of file
diff --git a/arduino/LoraNFC/sketch_may24a/sketch_may24a.ino b/arduino/LoraNFC/sketch_may24a/sketch_may24a.ino
index 5b4dcf4..8f2b830 100644
--- a/arduino/LoraNFC/sketch_may24a/sketch_may24a.ino
+++ b/arduino/LoraNFC/sketch_may24a/sketch_may24a.ino
@@ -45,11 +45,7 @@ void sendLoRaData(String data)
   Serial.println(data);
   
   LoRa.beginPacket();
-<<<<<<< HEAD
 LoRa.print("node3 " + data);
-=======
-  LoRa.print(data);
->>>>>>> 26fbc8fed3644b1eef44268b84d09fc87be556a3
   LoRa.endPacket();
 }
 
diff --git a/public/index.html b/public/index.html
index f09e7e8..27c4e27 100644
--- a/public/index.html
+++ b/public/index.html
@@ -22,12 +22,14 @@
             if (node === 'node3' && value === '15') {
               // Change the background color to red
               document.body.style.backgroundColor = 'red';
-            } else if (node === 'node4' && value === '21') {
-              // Change the background color to blue
-              document.body.style.backgroundColor = 'blue';
-            } else {
-              // Restore the default background color
-              document.body.style.backgroundColor = rgb(26, 26, 26);
+              document.getElementById('location-log').display = block;
+              
+              } else if (node === 'node4' && value === '21') {
+                // Change the background color to blue
+                document.body.style.backgroundColor = 'blue';
+              } else {
+                // Restore the default background color
+                document.body.style.backgroundColor = rgb(26, 26, 26);
             }
           });
           function sendMessage() {
@@ -71,7 +73,10 @@
                      </div> -->
                   </div>
                         
+                  <div class="section" id="location-log">
 
+                    <p>user 15 entered zone 4</p>  
+                  </div>
                         <div class="section" id="nav-console">
                             
                             <p>DISTANCE: <span id="distance">0</span> km</p>
@@ -103,7 +108,7 @@
                             <div class="section" id="back2" onclick="backAgain2()">
                                 ↪ log 
                         </div>
-
+                    
                         
                         <div class="section" id="log1">          
                         <p onclick="log1Open()">LOG 1  03:02:00  02-04-22  PORT: 9.1.13.<br></p>
diff --git a/public/style.css b/public/style.css
index e101405..df720a6 100644
--- a/public/style.css
+++ b/public/style.css
@@ -330,4 +330,8 @@ button:active{
       transform: translateX(-50%) translateY(-50%);
       z-index: -10;
     }
-.embed{width: 100%}
\ No newline at end of file
+.embed{width: 100%}
+
+#location-log{
+  display: none;
+}
\ No newline at end of file