moved updater to info screen

This commit is contained in:
DJ2LS 2023-11-01 22:37:30 +01:00
parent ae03bb6012
commit e5766e1324
3 changed files with 28 additions and 12 deletions

View file

@ -5,8 +5,7 @@ import { setActivePinia } from "pinia";
import pinia from "../store/index";
setActivePinia(pinia);
import { useStateStore } from "../store/stateStore.js";
const state = useStateStore(pinia);
import infoScreen_updater from "./infoScreen_updater.vue";
const version = import.meta.env.PACKAGE_VERSION;
@ -91,12 +90,8 @@ onMounted(shuffleCards);
</script>
<template>
<h3 class="m-2">
<span class="badge bg-secondary">FreeDATA: {{ version }}</span>
<span class="ms-2 badge bg-secondary"
>Modem: {{ state.modem_version }}</span
>
</h3>
<infoScreen_updater/>
<div class="container-fluid">
<div class="row mt-2">

View file

@ -5,10 +5,15 @@ setActivePinia(pinia);
import { useSettingsStore } from "../store/settingsStore.js";
const settings = useSettingsStore(pinia);
import { useStateStore } from "../store/stateStore.js";
const state = useStateStore(pinia);
</script>
<template>
<div class="card mb-0">
<div class="card m-2">
<div class="card-header p-1 d-flex">
<div class="container">
<div class="row">
@ -49,13 +54,31 @@ const settings = useSettingsStore(pinia);
</div>
</div>
<div class="card-body p-2 mb-1">
<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>
<button
class="btn btn-secondary btn-sm ms-1 me-1"
id="updater_channel"
type="button"
disabled
>
{{ settings.update_channel }}
Update channel | {{ settings.update_channel }}
</button>
<button
class="btn btn-secondary btn-sm ms-1"

View file

@ -6,7 +6,6 @@ setActivePinia(pinia);
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";
import main_updater from "./main_updater.vue";
import settings_view from "./settings.vue";
import main_active_rig_control from "./main_active_rig_control.vue";
import main_footer_navbar from "./main_footer_navbar.vue";
@ -172,7 +171,6 @@ function stopAllTransmissions() {
<div class="col">
</div>
<div class="col">
<main_updater />
</div>
</div>
</div>