From f6170604a6815206b460f6d9014f691c13c4d115 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@proton.me>
Date: Sat, 2 Mar 2024 18:24:14 +0100
Subject: [PATCH] adjusted config fetching

---
 gui/electron/main/index.ts  |  4 ++--
 gui/src/components/main.vue | 11 +++++++----
 gui/src/js/eventHandler.js  | 23 +++++++++++------------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/gui/electron/main/index.ts b/gui/electron/main/index.ts
index c3eef6cc..7a843c32 100644
--- a/gui/electron/main/index.ts
+++ b/gui/electron/main/index.ts
@@ -103,8 +103,8 @@ app.whenReady().then(() => {
   console.log(join(app.getAppPath(), '..', '..'))
   console.log(join(app.getAppPath(), '..', '..', '..'))
 
-  var basePath = join(app.getAppPath(), '..', '..', '..') || join(process.env.PWD, '..') || join(process.env.INIT_CWD, '..') || join(process.env.DIST, '..', '..', '..');
-
+  //var basePath = join(app.getAppPath(), '..', '..', '..') || join(process.env.PWD, '..') || join(process.env.INIT_CWD, '..') || join(process.env.DIST, '..', '..', '..');
+  var basePath = join(app.getAppPath(), '..', '..', '..')
   switch (platform().toLowerCase()) {
     //case "darwin":
         //serverPath = join(basePath, "freedata-server", "freedata-server.exe");
diff --git a/gui/src/components/main.vue b/gui/src/components/main.vue
index 2c874371..156eeb58 100644
--- a/gui/src/components/main.vue
+++ b/gui/src/components/main.vue
@@ -20,12 +20,15 @@ import infoScreen from "./infoScreen.vue";
 import main_modem_healthcheck from "./main_modem_healthcheck.vue";
 import Dynamic_components from "./dynamic_components.vue";
 
-import { getFreedataMessages, getConfig, getSerialDevices, getAudioDevices } from "../js/api";
+import { getFreedataMessages } from "../js/api";
+import { getRemote } from "../store/settingsStore.js";
+import { loadAudioDevices, loadSerialDevices } from "../js/deviceFormHelper";
+
 
 function getAllSettings(){
-    getConfig()
-    getAudioDevices()
-    getSerialDevices()
+    getRemote()
+    loadAudioDevices()
+    loadSerialDevices()
 }
 
 </script>
diff --git a/gui/src/js/eventHandler.js b/gui/src/js/eventHandler.js
index f1e5921d..5c8077ab 100644
--- a/gui/src/js/eventHandler.js
+++ b/gui/src/js/eventHandler.js
@@ -10,13 +10,12 @@ import {
 import { displayToast } from "./popupHandler";
 import {
   getFreedataMessages,
-  getConfig,
-  getAudioDevices,
-  getSerialDevices,
   getModemState,
 } from "./api";
 import { processFreedataMessages } from "./messagesHandler.ts";
 import { processRadioStatus } from "./radioHandler.ts";
+import { loadAudioDevices, loadSerialDevices } from "./deviceFormHelper.ts";
+
 
 // ----------------- init pinia stores -------------
 import { setActivePinia } from "pinia";
@@ -96,9 +95,9 @@ export function eventDispatcher(data) {
     case "started":
       displayToast("success", "bi-arrow-left-right", "Modem started", 5000);
       getModemState();
-      getConfig();
-      getAudioDevices();
-      getSerialDevices();
+      getRemote();
+      loadAudioDevices();
+      loadSerialDevices();
       getFreedataMessages();
       processRadioStatus();
       return;
@@ -110,9 +109,9 @@ export function eventDispatcher(data) {
     case "restarted":
       displayToast("secondary", "bi-bootstrap-reboot", "Modem restarted", 5000);
       getModemState();
-      getConfig();
-      getAudioDevices();
-      getSerialDevices();
+      getRemote();
+      loadAudioDevices();
+      loadSerialDevices();
       getFreedataMessages();
       processRadioStatus();
       return;
@@ -140,11 +139,11 @@ export function eventDispatcher(data) {
         getModemState();
       });
 
-      //getConfig();
+      //getRemote();
       getModemState();
       getOverallHealth();
-      getAudioDevices();
-      getSerialDevices();
+      loadAudioDevices();
+      loadSerialDevices();
       getFreedataMessages();
       processFreedataMessages();
       processRadioStatus();