mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 10:04:33 +02:00
adjusted config fetching
This commit is contained in:
parent
ffb3db775f
commit
f6170604a6
|
@ -103,8 +103,8 @@ app.whenReady().then(() => {
|
||||||
console.log(join(app.getAppPath(), '..', '..'))
|
console.log(join(app.getAppPath(), '..', '..'))
|
||||||
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()) {
|
switch (platform().toLowerCase()) {
|
||||||
//case "darwin":
|
//case "darwin":
|
||||||
//serverPath = join(basePath, "freedata-server", "freedata-server.exe");
|
//serverPath = join(basePath, "freedata-server", "freedata-server.exe");
|
||||||
|
|
|
@ -20,12 +20,15 @@ import infoScreen from "./infoScreen.vue";
|
||||||
import main_modem_healthcheck from "./main_modem_healthcheck.vue";
|
import main_modem_healthcheck from "./main_modem_healthcheck.vue";
|
||||||
import Dynamic_components from "./dynamic_components.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(){
|
function getAllSettings(){
|
||||||
getConfig()
|
getRemote()
|
||||||
getAudioDevices()
|
loadAudioDevices()
|
||||||
getSerialDevices()
|
loadSerialDevices()
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -10,13 +10,12 @@ import {
|
||||||
import { displayToast } from "./popupHandler";
|
import { displayToast } from "./popupHandler";
|
||||||
import {
|
import {
|
||||||
getFreedataMessages,
|
getFreedataMessages,
|
||||||
getConfig,
|
|
||||||
getAudioDevices,
|
|
||||||
getSerialDevices,
|
|
||||||
getModemState,
|
getModemState,
|
||||||
} from "./api";
|
} from "./api";
|
||||||
import { processFreedataMessages } from "./messagesHandler.ts";
|
import { processFreedataMessages } from "./messagesHandler.ts";
|
||||||
import { processRadioStatus } from "./radioHandler.ts";
|
import { processRadioStatus } from "./radioHandler.ts";
|
||||||
|
import { loadAudioDevices, loadSerialDevices } from "./deviceFormHelper.ts";
|
||||||
|
|
||||||
|
|
||||||
// ----------------- init pinia stores -------------
|
// ----------------- init pinia stores -------------
|
||||||
import { setActivePinia } from "pinia";
|
import { setActivePinia } from "pinia";
|
||||||
|
@ -96,9 +95,9 @@ export function eventDispatcher(data) {
|
||||||
case "started":
|
case "started":
|
||||||
displayToast("success", "bi-arrow-left-right", "Modem started", 5000);
|
displayToast("success", "bi-arrow-left-right", "Modem started", 5000);
|
||||||
getModemState();
|
getModemState();
|
||||||
getConfig();
|
getRemote();
|
||||||
getAudioDevices();
|
loadAudioDevices();
|
||||||
getSerialDevices();
|
loadSerialDevices();
|
||||||
getFreedataMessages();
|
getFreedataMessages();
|
||||||
processRadioStatus();
|
processRadioStatus();
|
||||||
return;
|
return;
|
||||||
|
@ -110,9 +109,9 @@ export function eventDispatcher(data) {
|
||||||
case "restarted":
|
case "restarted":
|
||||||
displayToast("secondary", "bi-bootstrap-reboot", "Modem restarted", 5000);
|
displayToast("secondary", "bi-bootstrap-reboot", "Modem restarted", 5000);
|
||||||
getModemState();
|
getModemState();
|
||||||
getConfig();
|
getRemote();
|
||||||
getAudioDevices();
|
loadAudioDevices();
|
||||||
getSerialDevices();
|
loadSerialDevices();
|
||||||
getFreedataMessages();
|
getFreedataMessages();
|
||||||
processRadioStatus();
|
processRadioStatus();
|
||||||
return;
|
return;
|
||||||
|
@ -140,11 +139,11 @@ export function eventDispatcher(data) {
|
||||||
getModemState();
|
getModemState();
|
||||||
});
|
});
|
||||||
|
|
||||||
//getConfig();
|
//getRemote();
|
||||||
getModemState();
|
getModemState();
|
||||||
getOverallHealth();
|
getOverallHealth();
|
||||||
getAudioDevices();
|
loadAudioDevices();
|
||||||
getSerialDevices();
|
loadSerialDevices();
|
||||||
getFreedataMessages();
|
getFreedataMessages();
|
||||||
processFreedataMessages();
|
processFreedataMessages();
|
||||||
processRadioStatus();
|
processRadioStatus();
|
||||||
|
|
Loading…
Reference in a new issue