mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Show version info in check modal
This commit is contained in:
parent
7092a5d447
commit
30a25b76fb
|
@ -6,7 +6,7 @@ import main_rig_control from "./main_rig_control.vue";
|
||||||
import main_audio from "./main_audio.vue";
|
import main_audio from "./main_audio.vue";
|
||||||
import infoScreen_updater from "./infoScreen_updater.vue";
|
import infoScreen_updater from "./infoScreen_updater.vue";
|
||||||
|
|
||||||
import { saveModemConfig } from "../js/api";
|
import { getModemVersion, saveModemConfig } from "../js/api";
|
||||||
|
|
||||||
import { setActivePinia } from "pinia";
|
import { setActivePinia } from "pinia";
|
||||||
import pinia from "../store/index";
|
import pinia from "../store/index";
|
||||||
|
@ -24,9 +24,12 @@ const state = useStateStore(pinia);
|
||||||
import { startModem, stopModem } from "../js/api";
|
import { startModem, stopModem } from "../js/api";
|
||||||
import { getModemConfig } from "../js/api";
|
import { getModemConfig } from "../js/api";
|
||||||
|
|
||||||
|
const version = import.meta.env.PACKAGE_VERSION;
|
||||||
|
|
||||||
// start modemCheck modal once on startup
|
// start modemCheck modal once on startup
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
getModemConfig();
|
getModemConfig();
|
||||||
|
getModemVersion();
|
||||||
new Modal("#modemCheck", {}).show();
|
new Modal("#modemCheck", {}).show();
|
||||||
if (state.is_modem_running == false){
|
if (state.is_modem_running == false){
|
||||||
|
|
||||||
|
@ -65,28 +68,7 @@ function getModemState(){
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="accordion" id="startupCheckAccordion">
|
<div class="accordion" id="startupCheckAccordion">
|
||||||
<!-- Version Section -->
|
|
||||||
<div class="accordion-item">
|
|
||||||
<h2 class="accordion-header">
|
|
||||||
<button
|
|
||||||
class="accordion-button collapsed"
|
|
||||||
type="button"
|
|
||||||
data-bs-target="#versionCheckCollapse"
|
|
||||||
data-bs-toggle="collapse"
|
|
||||||
>
|
|
||||||
Version
|
|
||||||
<span class="badge ms-2 bg-warning">Update needed</span>
|
|
||||||
</button>
|
|
||||||
</h2>
|
|
||||||
<div
|
|
||||||
id="versionCheckCollapse"
|
|
||||||
class="accordion-collapse collapse"
|
|
||||||
>
|
|
||||||
<div class="accordion-body">
|
|
||||||
<infoScreen_updater />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- Network Section -->
|
<!-- Network Section -->
|
||||||
<div class="accordion-item">
|
<div class="accordion-item">
|
||||||
<h2 class="accordion-header">
|
<h2 class="accordion-header">
|
||||||
|
@ -216,6 +198,43 @@ function getModemState(){
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- Version Section -->
|
||||||
|
<div class="accordion-item">
|
||||||
|
<h2 class="accordion-header">
|
||||||
|
<button
|
||||||
|
class="accordion-button collapsed"
|
||||||
|
type="button"
|
||||||
|
data-bs-target="#versionCheckCollapse"
|
||||||
|
data-bs-toggle="collapse"
|
||||||
|
>
|
||||||
|
Version
|
||||||
|
<span class="badge ms-2 bg-warning">Update needed</span>
|
||||||
|
</button>
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
id="versionCheckCollapse"
|
||||||
|
class="accordion-collapse collapse"
|
||||||
|
>
|
||||||
|
<div class="accordion-body">
|
||||||
|
<button
|
||||||
|
class="btn btn-secondary btn-sm ms-1 me-1"
|
||||||
|
type="button"
|
||||||
|
disabled
|
||||||
|
>
|
||||||
|
GUI version | {{ version }}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
class="btn btn-secondary btn-sm ms-1 me-1"
|
||||||
|
type="button"
|
||||||
|
disabled
|
||||||
|
>
|
||||||
|
Modem version | {{ state.modem_version }}
|
||||||
|
</button>
|
||||||
|
<infoScreen_updater />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
|
|
|
@ -22,7 +22,7 @@ import { saveSettingsToFile } from "../js/settingsHandler";
|
||||||
Modem Connection {{ state.modem_connection }}
|
Modem Connection {{ state.modem_connection }}
|
||||||
</span>
|
</span>
|
||||||
<span class="badge bg-secondary me-4">
|
<span class="badge bg-secondary me-4">
|
||||||
Modem {{ state.modem_running_state }}
|
Modem {{ state.is_modem_running }}
|
||||||
</span>
|
</span>
|
||||||
<span class="badge bg-secondary me-4">
|
<span class="badge bg-secondary me-4">
|
||||||
RIG Control {{ state.rigctld_started }}
|
RIG Control {{ state.rigctld_started }}
|
||||||
|
|
|
@ -19,3 +19,8 @@ export function startModem() {
|
||||||
export function stopModem() {
|
export function stopModem() {
|
||||||
postToServer("localhost", 5000, "modem/stop", null);
|
postToServer("localhost", 5000, "modem/stop", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getModemVersion() {
|
||||||
|
getFromServer("localhost", 5000, "version", null);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ import {
|
||||||
processModemAudioDevices,
|
processModemAudioDevices,
|
||||||
processModemSerialDevices,
|
processModemSerialDevices,
|
||||||
getModemConfigAsJSON,
|
getModemConfigAsJSON,
|
||||||
|
processModemVersion,
|
||||||
} from "../js/settingsHandler.ts";
|
} from "../js/settingsHandler.ts";
|
||||||
|
|
||||||
export async function getFromServer(host, port, endpoint) {
|
export async function getFromServer(host, port, endpoint) {
|
||||||
|
@ -59,7 +60,9 @@ function restDataDispatcher(endpoint, data) {
|
||||||
case "devices/serial":
|
case "devices/serial":
|
||||||
processModemSerialDevices(data);
|
processModemSerialDevices(data);
|
||||||
break;
|
break;
|
||||||
|
case "version":
|
||||||
|
processModemVersion(data);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
console.log("Wrong endpoint:" + endpoint);
|
console.log("Wrong endpoint:" + endpoint);
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,9 @@ const settings = useSettingsStore(pinia);
|
||||||
import { useAudioStore } from "../store/audioStore.js";
|
import { useAudioStore } from "../store/audioStore.js";
|
||||||
const audioStore = useAudioStore(pinia);
|
const audioStore = useAudioStore(pinia);
|
||||||
|
|
||||||
|
import { useStateStore } from "../store/stateStore";
|
||||||
|
const stateStore = useStateStore(pinia);
|
||||||
|
|
||||||
import { postToServer, getFromServer } from "./rest.js";
|
import { postToServer, getFromServer } from "./rest.js";
|
||||||
|
|
||||||
// ---------------------------------
|
// ---------------------------------
|
||||||
|
@ -152,6 +155,10 @@ export function processModemAudioDevices(data) {
|
||||||
export function processModemSerialDevices(data) {
|
export function processModemSerialDevices(data) {
|
||||||
settings.serial_devices = data;
|
settings.serial_devices = data;
|
||||||
}
|
}
|
||||||
|
export function processModemVersion(data) {
|
||||||
|
//data = JSON.parse(data);
|
||||||
|
stateStore.modem_version=data["version"];
|
||||||
|
}
|
||||||
|
|
||||||
export function getModemConfigAsJSON() {
|
export function getModemConfigAsJSON() {
|
||||||
// create json output from settings
|
// create json output from settings
|
||||||
|
|
|
@ -10,6 +10,7 @@ import server_commands
|
||||||
import service_manager
|
import service_manager
|
||||||
import state_manager
|
import state_manager
|
||||||
import explorer
|
import explorer
|
||||||
|
from static import Modem as modeminfo
|
||||||
|
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
@ -148,6 +149,10 @@ def post_modem_stop():
|
||||||
app.modem_service.put("stop")
|
app.modem_service.put("stop")
|
||||||
return api_response(request.json)
|
return api_response(request.json)
|
||||||
|
|
||||||
|
@app.route('/version', methods=['GET'])
|
||||||
|
def get_modem_version():
|
||||||
|
return api_response({"version": modeminfo.version})
|
||||||
|
|
||||||
|
|
||||||
# @app.route('/modem/arq_connect', methods=['POST'])
|
# @app.route('/modem/arq_connect', methods=['POST'])
|
||||||
# @app.route('/modem/arq_disconnect', methods=['POST'])
|
# @app.route('/modem/arq_disconnect', methods=['POST'])
|
||||||
|
|
Loading…
Reference in a new issue