Merge remote-tracking branch 'origin/develop' into develop

freedata_gui/src/components/main.vue

@@ -15,13 +15,8 @@ import Dynamic_components from "./dynamic_components.vue";
 import { getFreedataMessages } from "../js/api";
 import { getRemote } from "../store/settingsStore.js";
 import { loadAllData } from "../js/eventHandler";
-
-
-
 </script>
 
-
-
 <template>
   <!-------------------------------- INFO TOASTS ---------------->
   <div aria-live="polite" aria-atomic="true" class="position-relative z-3">
@@ -31,24 +26,22 @@ import { loadAllData } from "../js/eventHandler";
     ></div>
   </div>
 
-
-
-
   <div class="container-fluid">
     <div class="row">
-
+      <!-- Collapsible Left Navbar -->
-<!-- Collapsible Left Navbar -->
+      <div class="col-auto p-0 bg-body-secondary border-end">
-<div class="col-auto p-0 bg-body-secondary border-end">
         <div class="flex-shrink-0 p-3">
-          <div class="collapse collapse-horizontal show" id="collapseLeftNavbar">
+          <div
+            class="collapse collapse-horizontal show"
+            id="collapseLeftNavbar"
+          >
             <main_left_navbar />
           </div>
         </div>
       </div>
 
-
       <div class="col min-vh-100 m-0 p-0">
-<!--
+        <!--
         <main_top_navbar />
 -->
         <div class="tab-content" id="nav-tabContent-settings">
@@ -57,9 +50,7 @@ import { loadAllData } from "../js/eventHandler";
             id="list-home"
             role="tabpanel"
             aria-labelledby="list-home-list"
-          >
+          ></div>
-
-          </div>
 
           <div
             class="tab-pane fade d-none"
@@ -70,7 +61,6 @@ import { loadAllData } from "../js/eventHandler";
             <mesh />
           </div>
 
-
           <div
             class="tab-pane fade show active"
             id="list-grid"
@@ -89,13 +79,10 @@ import { loadAllData } from "../js/eventHandler";
             <chat />
           </div>
 
-
           <settings_view />
           <main_footer_navbar />
-
         </div>
 
-
         <!---------------------------------------------------------------------- FOOTER AREA ------------------------------------------------------------>
 
         <div class="container">

freedata_gui/src/components/main_footer_navbar.vue

@@ -8,9 +8,7 @@ const state = useStateStore(pinia);
 </script>
 
 <template>
-        <nav
+  <nav class="navbar navbar-expand-xl bg-body-tertiary border-top p-2">
-          class="navbar navbar-expand-xl bg-body-tertiary border-top p-2"
-        >
     <div class="col">
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group btn-group-sm me-1" role="group">
@@ -173,10 +171,7 @@ const state = useStateStore(pinia);
             type="button"
             title="Bytes transfered"
           >
-                  <i
+            <i class="bi bi-file-earmark-binary" style="font-size: 1rem"></i>
-                    class="bi bi-file-earmark-binary"
-                    style="font-size: 1rem"
-                  ></i>
           </button>
 
           <button
@@ -201,10 +196,7 @@ const state = useStateStore(pinia);
             data-bs-html="true"
             data-bs-title="Current or last connected with station"
           >
-                  <i
+            <i class="bi bi-file-earmark-binary" style="font-size: 1rem"></i>
-                    class="bi bi-file-earmark-binary"
-                    style="font-size: 1rem"
-                  ></i>
           </button>
 
           <button
@@ -223,10 +215,7 @@ const state = useStateStore(pinia);
     </div>
     <div class="col-lg-4">
       <div style="margin-right: 2px">
-              <div
+        <div class="progress w-100" style="height: 20px; min-width: 200px">
-                class="progress w-100"
-                style="height: 20px; min-width: 200px"
-              >
           <div
             class="progress-bar progress-bar-striped bg-primary force-gpu"
             id="transmission_progress"
@@ -269,5 +258,4 @@ const state = useStateStore(pinia);
       </div>
     </div>
   </nav>
-
 </template>

freedata_gui/src/components/main_left_navbar.vue

@@ -1,28 +1,25 @@
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref } from "vue";
 import main_modem_healthcheck from "./main_modem_healthcheck.vue";
 import { getOverallHealth } from "../js/eventHandler.js";
 
-
 const isTextVisible = ref(false); // Initially, the text is invisible
 function toggleTextVisibility() {
   isTextVisible.value = !isTextVisible.value; // Toggle the visibility
 }
-
-
 </script>
 <template>
-
-
   <!-- Button -->
 
   <div class="btn-group" role="group" aria-label="Basic example">
-
+    <button
-<button class="btn btn-outline-secondary border-0 ms-2 mb-3" type="button" @click="toggleTextVisibility()">
+      class="btn btn-outline-secondary border-0 ms-2 mb-3"
-    <span class=" fw-semibold"><i class="bi bi-text-paragraph"></i></span>
+      type="button"
+      @click="toggleTextVisibility()"
+    >
+      <span class="fw-semibold"><i class="bi bi-text-paragraph"></i></span>
     </button>
-</div>
+  </div>
-
 
   <a
     class="btn border btn-outline-secondary list-group-item rounded-3"
@@ -39,7 +36,6 @@ function toggleTextVisibility() {
     "
     ><i class="h3 bi bi-activity"></i>
     <span class="ms-2" v-if="isTextVisible">Healtcheck</span>
-
   </a>
 
   <div
@@ -48,9 +44,7 @@ function toggleTextVisibility() {
     role="tablist"
     style="margin-top: 100px"
     @click="loadAllData"
->
+  >
-
-
     <a
       class="list-group-item list-group-item-dark list-group-item-action border-0 rounded-3 mb-2 active"
       id="list-grid-list"
@@ -103,6 +97,5 @@ function toggleTextVisibility() {
       <i class="bi bi-gear-wide-connected h3"></i>
       <span class="ms-2" v-if="isTextVisible">Settings</span>
     </a>
-</div>
+  </div>
-
 </template>

freedata_gui/src/components/main_main_screen.vue

@@ -1,2 +1 @@
-<template>
+<template></template>
-</template>

freedata_gui/src/components/mesh.vue

@@ -1,5 +1,4 @@
 <template>
-
   <div class="container">
     <nav>
       <div class="nav nav-tabs" id="nav-tab-mesh" role="tablist-mesh">
@@ -117,11 +116,7 @@
             aria-label="Input group"
             aria-describedby="btnGroupAddon"
           />
-                    <button
+          <button id="transmit_mesh_ping" type="button" class="btn btn-primary">
-                      id="transmit_mesh_ping"
-                      type="button"
-                      class="btn btn-primary"
-                    >
             mesh ping
           </button>
         </div>