From 51360b8458dc014d06b114d67bfef0b86d06a646 Mon Sep 17 00:00:00 2001 From: Pedro Date: Sat, 18 Nov 2023 16:53:54 +0100 Subject: [PATCH] WIP GUI settings handling --- gui/src/components/chat_navbar.vue | 2 - gui/src/components/chat_new_message.vue | 5 - gui/src/components/infoScreen_updater.vue | 3 - gui/src/components/main.vue | 6 +- .../components/main_active_audio_level.vue | 2 - gui/src/components/main_active_broadcasts.vue | 4 +- .../components/main_active_heard_stations.vue | 3 +- .../components/main_active_rig_control.vue | 2 - gui/src/components/main_active_stats.vue | 7 +- gui/src/components/main_modals.vue | 6 +- gui/src/components/main_my_station.vue | 4 +- gui/src/components/main_rig_control.vue | 4 +- gui/src/components/main_startup_check.vue | 5 +- gui/src/components/main_top_navbar.vue | 4 +- gui/src/components/settings_chat.vue | 3 +- gui/src/components/settings_exp.vue | 3 +- gui/src/components/settings_gui.vue | 4 +- gui/src/components/settings_hamlib.vue | 4 +- gui/src/components/settings_modem.vue | 9 +- gui/src/components/settings_rigcontrol.vue | 3 +- gui/src/components/settings_station.vue | 4 +- gui/src/components/settings_web.vue | 4 +- gui/src/js/api.js | 73 ++++-- gui/src/js/chatHandler.ts | 4 +- gui/src/js/deprecated_daemon.ts | 3 +- gui/src/js/eventHandler.js | 3 +- gui/src/js/event_sock.js | 5 +- gui/src/js/rest.js | 69 ----- gui/src/js/settingsHandler.ts | 3 +- gui/src/js/sock.js | 3 +- gui/src/js/waterfallHandler.js | 3 +- gui/src/main.ts | 6 +- gui/src/store/audioStore.js | 3 +- gui/src/store/old_settingsStore.js | 234 +++++++++++++++++ gui/src/store/settingsStore.js | 247 ++---------------- 35 files changed, 337 insertions(+), 410 deletions(-) delete mode 100644 gui/src/js/rest.js create mode 100644 gui/src/store/old_settingsStore.js diff --git a/gui/src/components/chat_navbar.vue b/gui/src/components/chat_navbar.vue index 2e06d129..dace9520 100644 --- a/gui/src/components/chat_navbar.vue +++ b/gui/src/components/chat_navbar.vue @@ -11,8 +11,6 @@ const state = useStateStore(pinia); import { useChatStore } from "../store/chatStore.js"; const chat = useChatStore(pinia); -import { getRxBuffer } from "../js/sock.js"; - import { startChatWithNewStation } from "../js/chatHandler"; import { diff --git a/gui/src/components/chat_new_message.vue b/gui/src/components/chat_new_message.vue index fe997c63..e56190c9 100644 --- a/gui/src/components/chat_new_message.vue +++ b/gui/src/components/chat_new_message.vue @@ -1,15 +1,10 @@ diff --git a/gui/src/components/main.vue b/gui/src/components/main.vue index 9c829e4b..4fa632cf 100644 --- a/gui/src/components/main.vue +++ b/gui/src/components/main.vue @@ -3,6 +3,8 @@ import { setActivePinia } from "pinia"; import pinia from "../store/index"; setActivePinia(pinia); +import { getRemote } from "../store/settingsStore"; + import main_modals from "./main_modals.vue"; import main_top_navbar from "./main_top_navbar.vue"; import main_rig_control from "./main_rig_control.vue"; @@ -18,9 +20,8 @@ import main_active_audio_level from "./main_active_audio_level.vue"; import chat from "./chat.vue"; import infoScreen from "./infoScreen.vue"; -import { stopTransmission } from "../js/sock.js"; -import { getModemConfig } from "../js/api"; import main_modem_healthcheck from "./main_modem_healthcheck.vue"; +getRemote(); function stopAllTransmissions() { console.log("stopping transmissions"); @@ -116,7 +117,6 @@ function stopAllTransmissions() { role="tab" aria-controls="list-settings" title="Settings" - @click="getModemConfig" > diff --git a/gui/src/components/main_active_audio_level.vue b/gui/src/components/main_active_audio_level.vue index ff7d3cb0..93b559d6 100644 --- a/gui/src/components/main_active_audio_level.vue +++ b/gui/src/components/main_active_audio_level.vue @@ -6,8 +6,6 @@ setActivePinia(pinia); import { useStateStore } from "../store/stateStore.js"; const state = useStateStore(pinia); -import { record_audio } from "../js/sock.js"; - function startStopRecordAudio() { record_audio(); } diff --git a/gui/src/components/main_active_broadcasts.vue b/gui/src/components/main_active_broadcasts.vue index acd2aeff..046af1c4 100644 --- a/gui/src/components/main_active_broadcasts.vue +++ b/gui/src/components/main_active_broadcasts.vue @@ -1,12 +1,10 @@