mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge branch 'develop' into dependabot/npm_and_yarn/gui/develop/electron-28.0.0
This commit is contained in:
commit
acf47f8f96
3 changed files with 230 additions and 67 deletions
|
@ -46,7 +46,7 @@
|
||||||
"chartjs-plugin-annotation": "3.0.1",
|
"chartjs-plugin-annotation": "3.0.1",
|
||||||
"electron-log": "5.0.0",
|
"electron-log": "5.0.0",
|
||||||
"electron-updater": "6.1.6",
|
"electron-updater": "6.1.6",
|
||||||
"emoji-picker-element": "1.18.3",
|
"emoji-picker-element": "1.20.1",
|
||||||
"emoji-picker-element-data": "1.4.0",
|
"emoji-picker-element-data": "1.4.0",
|
||||||
"file-saver": "2.0.5",
|
"file-saver": "2.0.5",
|
||||||
"gridstack": "10.0.0",
|
"gridstack": "10.0.0",
|
||||||
|
|
|
@ -151,8 +151,16 @@ function quickfill() {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<button type="button" @click="showModal">Add Widget pos [0,0]</button>
|
<button
|
||||||
<button type="button" @click="quickfill">Quickfill</button>
|
class="btn btn-secondary fixed-middle-right rounded-0 rounded-start-4 p-1 pt-4 pb-4"
|
||||||
|
type="button"
|
||||||
|
data-bs-toggle="offcanvas"
|
||||||
|
data-bs-target="#offcanvasGridItems"
|
||||||
|
aria-controls="offcanvasGridItems"
|
||||||
|
>
|
||||||
|
<i class="bi bi-grip-vertical h1"></i>
|
||||||
|
</button>
|
||||||
|
|
||||||
<div class="grid-container vh-100">
|
<div class="grid-container vh-100">
|
||||||
<div class="grid-stack">
|
<div class="grid-stack">
|
||||||
<div
|
<div
|
||||||
|
@ -177,24 +185,51 @@ function quickfill() {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal fade" id="tileModal" tabindex="-1">
|
|
||||||
<div class="modal-dialog">
|
<div
|
||||||
<div class="modal-content">
|
class="offcanvas offcanvas-end"
|
||||||
<div class="modal-header">
|
data-bs-scroll="true"
|
||||||
<h5 class="modal-title">Add grid tile</h5>
|
data-bs-backdrop="true"
|
||||||
|
tabindex="-1"
|
||||||
|
id="offcanvasGridItems"
|
||||||
|
aria-labelledby="offcanvasGridItemsLabel"
|
||||||
|
>
|
||||||
|
<div class="offcanvas-header">
|
||||||
|
<h5 class="offcanvas-title" id="offcanvasGridItemsLabel">
|
||||||
|
<button class="btn btn-secondary" type="button" @click="quickfill">
|
||||||
|
Quickfill grid
|
||||||
|
</button>
|
||||||
|
</h5>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="btn-close"
|
class="btn-close"
|
||||||
data-bs-dismiss="modal"
|
data-bs-dismiss="offcanvas"
|
||||||
aria-label="Close"
|
aria-label="Close"
|
||||||
></button>
|
></button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="offcanvas-body">
|
||||||
<div
|
<div class="accordion" id="accordionExample">
|
||||||
class="btn-group"
|
<!-- Heard Stations -->
|
||||||
role="group"
|
<div class="accordion-item">
|
||||||
aria-label="Basic outlined example"
|
<h2 class="accordion-header" id="headingHeardStations">
|
||||||
|
<button
|
||||||
|
class="accordion-button"
|
||||||
|
type="button"
|
||||||
|
data-bs-toggle="collapse"
|
||||||
|
data-bs-target="#collapseHeardStations"
|
||||||
|
aria-expanded="true"
|
||||||
|
aria-controls="collapseHeardStations"
|
||||||
>
|
>
|
||||||
|
<strong>Heard Stations</strong>
|
||||||
|
</button>
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
id="collapseHeardStations"
|
||||||
|
class="accordion-collapse collapse show"
|
||||||
|
aria-labelledby="headingHeardStations"
|
||||||
|
data-bs-parent="#accordionExample"
|
||||||
|
>
|
||||||
|
<div class="accordion-body">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@click="addNewWidget2(gridWidgets[0])"
|
@click="addNewWidget2(gridWidgets[0])"
|
||||||
|
@ -203,30 +238,57 @@ function quickfill() {
|
||||||
>
|
>
|
||||||
Heard station list
|
Heard station list
|
||||||
</button>
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Activities -->
|
||||||
|
<div class="accordion-item">
|
||||||
|
<h2 class="accordion-header" id="headingActivities">
|
||||||
<button
|
<button
|
||||||
|
class="accordion-button collapsed"
|
||||||
type="button"
|
type="button"
|
||||||
@click="addNewWidget2(gridWidgets[1])"
|
data-bs-toggle="collapse"
|
||||||
class="btn btn-outline-secondary"
|
data-bs-target="#collapseActivities"
|
||||||
data-bs-dismiss="modal"
|
aria-expanded="false"
|
||||||
|
aria-controls="collapseActivities"
|
||||||
>
|
>
|
||||||
Stats (waterfall, etc)
|
<strong>Activities</strong>
|
||||||
</button>
|
</button>
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
id="collapseActivities"
|
||||||
|
class="accordion-collapse collapse"
|
||||||
|
aria-labelledby="headingActivities"
|
||||||
|
data-bs-parent="#accordionExample"
|
||||||
|
>
|
||||||
|
<div class="accordion-body">
|
||||||
|
<!-- Content for Activities -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Radio Control -->
|
||||||
|
<div class="accordion-item">
|
||||||
|
<h2 class="accordion-header" id="headingRadioControl">
|
||||||
<button
|
<button
|
||||||
|
class="accordion-button collapsed"
|
||||||
type="button"
|
type="button"
|
||||||
@click="addNewWidget2(gridWidgets[2])"
|
data-bs-toggle="collapse"
|
||||||
class="btn btn-outline-secondary"
|
data-bs-target="#collapseRadioControl"
|
||||||
data-bs-dismiss="modal"
|
aria-expanded="false"
|
||||||
|
aria-controls="collapseRadioControl"
|
||||||
>
|
>
|
||||||
Audio
|
<strong>Radio Control</strong>
|
||||||
</button>
|
</button>
|
||||||
<button
|
</h2>
|
||||||
type="button"
|
<div
|
||||||
@click="addNewWidget2(gridWidgets[4])"
|
id="collapseRadioControl"
|
||||||
class="btn btn-outline-secondary"
|
class="accordion-collapse collapse"
|
||||||
data-bs-dismiss="modal"
|
aria-labelledby="headingRadioControl"
|
||||||
|
data-bs-parent="#accordionExample"
|
||||||
>
|
>
|
||||||
Broadcasts
|
<div class="accordion-body">
|
||||||
</button>
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@click="addNewWidget2(gridWidgets[3])"
|
@click="addNewWidget2(gridWidgets[3])"
|
||||||
|
@ -237,21 +299,120 @@ function quickfill() {
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
</div>
|
||||||
|
|
||||||
|
<!-- Audio Control -->
|
||||||
|
<div class="accordion-item">
|
||||||
|
<h2 class="accordion-header" id="headingAudioControl">
|
||||||
|
<button
|
||||||
|
class="accordion-button collapsed"
|
||||||
|
type="button"
|
||||||
|
data-bs-toggle="collapse"
|
||||||
|
data-bs-target="#collapseAudioControl"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-controls="collapseAudioControl"
|
||||||
|
>
|
||||||
|
<strong>Audio Control</strong>
|
||||||
|
</button>
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
id="collapseAudioControl"
|
||||||
|
class="accordion-collapse collapse"
|
||||||
|
aria-labelledby="headingAudioControl"
|
||||||
|
data-bs-parent="#accordionExample"
|
||||||
|
>
|
||||||
|
<div class="accordion-body">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-secondary"
|
@click="addNewWidget2(gridWidgets[2])"
|
||||||
|
class="btn btn-outline-secondary"
|
||||||
data-bs-dismiss="modal"
|
data-bs-dismiss="modal"
|
||||||
>
|
>
|
||||||
Close
|
Audio
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-primary">Save changes</button>
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Statistics -->
|
||||||
|
<div class="accordion-item">
|
||||||
|
<h2 class="accordion-header" id="headingStatistics">
|
||||||
|
<button
|
||||||
|
class="accordion-button collapsed"
|
||||||
|
type="button"
|
||||||
|
data-bs-toggle="collapse"
|
||||||
|
data-bs-target="#collapseStatistics"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-controls="collapseStatistics"
|
||||||
|
>
|
||||||
|
<strong>Statistics</strong>
|
||||||
|
</button>
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
id="collapseStatistics"
|
||||||
|
class="accordion-collapse collapse"
|
||||||
|
aria-labelledby="headingStatistics"
|
||||||
|
data-bs-parent="#accordionExample"
|
||||||
|
>
|
||||||
|
<div class="accordion-body">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
@click="addNewWidget2(gridWidgets[1])"
|
||||||
|
class="btn btn-outline-secondary"
|
||||||
|
data-bs-dismiss="modal"
|
||||||
|
>
|
||||||
|
Stats (waterfall, etc)
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Broadcasts -->
|
||||||
|
<div class="accordion-item">
|
||||||
|
<h2 class="accordion-header" id="headingBroadcasts">
|
||||||
|
<button
|
||||||
|
class="accordion-button collapsed"
|
||||||
|
type="button"
|
||||||
|
data-bs-toggle="collapse"
|
||||||
|
data-bs-target="#collapseBroadcasts"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-controls="collapseBroadcasts"
|
||||||
|
>
|
||||||
|
<strong>Broadcasts</strong>
|
||||||
|
</button>
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
id="collapseBroadcasts"
|
||||||
|
class="accordion-collapse collapse"
|
||||||
|
aria-labelledby="headingBroadcasts"
|
||||||
|
data-bs-parent="#accordionExample"
|
||||||
|
>
|
||||||
|
<div class="accordion-body">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
@click="addNewWidget2(gridWidgets[4])"
|
||||||
|
class="btn btn-outline-secondary"
|
||||||
|
data-bs-dismiss="modal"
|
||||||
|
>
|
||||||
|
Broadcasts
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
.fixed-middle-right {
|
||||||
|
position: fixed; /* Fixed/sticky position */
|
||||||
|
top: 50%; /* Position at the middle of the viewport */
|
||||||
|
right: 0px; /* Place the button 20px from the right */
|
||||||
|
transform: translateY(-50%); /* Adjust for exact vertical centering */
|
||||||
|
z-index: 999; /* Ensure it's on top of other elements */
|
||||||
|
}
|
||||||
|
|
||||||
.grid-stack-item {
|
.grid-stack-item {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
|
|
|
@ -145,7 +145,9 @@ function stopAllTransmissions() {
|
||||||
<div class="col-sm min-vh-100 m-0 p-0">
|
<div class="col-sm min-vh-100 m-0 p-0">
|
||||||
<!-- content -->
|
<!-- content -->
|
||||||
|
|
||||||
|
<!-- TODO: Remove the top navbar entirely if not needed
|
||||||
<main_top_navbar />
|
<main_top_navbar />
|
||||||
|
-->
|
||||||
|
|
||||||
<div class="tab-content" id="nav-tabContent-settings">
|
<div class="tab-content" id="nav-tabContent-settings">
|
||||||
<div
|
<div
|
||||||
|
|
Loading…
Reference in a new issue