Merge branch 'develop' of github.com:DJ2LS/FreeDATA into develop

This commit is contained in:
Mashintime 2024-01-10 22:21:48 -05:00
commit db64b34e09
4 changed files with 39 additions and 34 deletions

View file

@ -14,7 +14,6 @@ function startStopBeacon() {
setModemBeacon(true); setModemBeacon(true);
} }
} }
</script> </script>
<template> <template>
<div class="fill h-100" style="width: calc(100% - 24px)"> <div class="fill h-100" style="width: calc(100% - 24px)">
@ -23,16 +22,15 @@ function startStopBeacon() {
@click="startStopBeacon" @click="startStopBeacon"
title="Enable/disable periodic beacons" title="Enable/disable periodic beacons"
>Beacon&nbsp; >Beacon&nbsp;
<span class="" role="status" <span
class=""
role="status"
v-bind:class="{ v-bind:class="{
'spinner-grow spinner-grow-sm': state.beacon_state === true, 'spinner-grow spinner-grow-sm': state.beacon_state === true,
'disabled': state.beacon_state === false, disabled: state.beacon_state === false,
}" }"
> >
</span> </span>
</a </a>
>
</div> </div>
</template> </template>

View file

@ -6,16 +6,25 @@ import pinia from "../../store/index";
setActivePinia(pinia); setActivePinia(pinia);
import { settingsStore } from "../../store/settingsStore.js"; import { settingsStore } from "../../store/settingsStore.js";
</script> </script>
<template> <template>
<div class="w-100"> <div class="w-100">
<div class="input-group input-group-sm" style="width: calc(100% - 24px);"> <div class="input-group input-group-sm" style="width: calc(100% - 24px)">
<input
<input type="text" class="form-control" disabled style="min-width: 3em;background-color:transparent;" v-model=settingsStore.remote.STATION.mycall> type="text"
class="form-control"
disabled
style="min-width: 3em; background-color: transparent"
v-model="settingsStore.remote.STATION.mycall"
/>
<span class="input-group-text">-</span> <span class="input-group-text">-</span>
<input type="text" class="form-control" disabled style="min-width: 2em;max-width: 2.5em;background-color:transparent;" v-model=settingsStore.remote.STATION.myssid> <input
type="text"
class="form-control"
disabled
style="min-width: 2em; max-width: 2.5em; background-color: transparent"
v-model="settingsStore.remote.STATION.myssid"
/>
</div> </div>
</div> </div>
</template> </template>

View file

@ -6,8 +6,6 @@ import pinia from "../../store/index";
setActivePinia(pinia); setActivePinia(pinia);
import { settingsStore } from "../../store/settingsStore.js"; import { settingsStore } from "../../store/settingsStore.js";
</script> </script>
<template> <template>
<div <div