test lcoation-log

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}

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();
 }
 

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>

public/style.css

@@ -331,3 +331,7 @@ button:active{
       z-index: -10;
     }
 .embed{width: 100%}
+
+#location-log{
+  display: none;
+}