Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into dependabot/npm_and_yarn/freedata_gui/deve…
Browse files Browse the repository at this point in the history
…lop/eslint-9.10.0
DJ2LS authored Nov 6, 2024
2 parents f6e685b + 546732b commit ea13b4e
Showing 23 changed files with 2,692 additions and 858 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pip_package.yml
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ jobs:
python setup.py sdist bdist_wheel
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@v1.10.1
uses: pypa/gh-action-pypi-publish@v1.11.0
if: startsWith(github.ref, 'refs/tags/v')
with:
user: __token__
12 changes: 6 additions & 6 deletions freedata_gui/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "FreeDATA",
"version": "0.16.8-alpha",
"version": "0.16.9-alpha",
"description": "FreeDATA Client application for connecting to FreeDATA server",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"build": "npm i && vue-cli-service build",
"lint": "vue-cli-service lint"
},
"repository": {
@@ -28,22 +28,22 @@
"@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
"bootstrap-vue-next": "^0.24.2",
"bootstrap-vue-next": "^0.25.12",
"chart.js": "^4.4.3",
"chartjs-plugin-annotation": "^3.0.1",
"core-js": "^3.8.3",
"d3": "^7.9.0",
"dompurify": "^3.1.6",
"gridstack": "^10.3.0",
"gridstack": "^11.0.1",
"js-image-compressor": "^2.0.0",
"marked": "^14.1.2",
"pinia": "^2.1.7",
"qth-locator": "^2.1.0",
"topojson-client": "^3.1.0",
"uuid": "^10.0.0",
"uuid": "^11.0.2",
"vue": "^3.2.13",
"vue-chartjs": "^5.3.1",
"vuemoji-picker": "^0.2.1"
"vuemoji-picker": "^0.3.1"
},
"devDependencies": {
"@babel/core": "^7.25.2",
26 changes: 22 additions & 4 deletions freedata_gui/src/App.vue
Original file line number Diff line number Diff line change
@@ -12,21 +12,39 @@
</template>

<script setup>
import { defineAsyncComponent, onMounted } from 'vue';
import "./styles.css"; // Import global styles
import "bootstrap/dist/css/bootstrap.css";
import "bootstrap-icons/font/bootstrap-icons.css";
import {defineAsyncComponent, onMounted} from 'vue';
import { Tooltip, Popover } from 'bootstrap'
// Lazy load FreeDATAMain
const FreeDATAMain = defineAsyncComponent(() =>
import('./components/main_screen.vue')
import('./components/main_screen.vue')
);
// Import the loading screen
const LoadingScreen = defineAsyncComponent(() =>
import('./components/main_loading_screen.vue')
import('./components/main_loading_screen.vue')
);
// Set attributes on the <html> element
onMounted(() => {
// Set attributes on the <html> element
document.documentElement.setAttribute('lang', 'en');
document.documentElement.setAttribute('data-bs-theme', 'light');
// Initialize Tooltips and Popovers
new Tooltip(document.body, {
selector: "[data-bs-toggle='tooltip']",
})
new Popover(document.body, {
selector: "[data-bs-toggle='popover']",
})
});
</script>
7 changes: 4 additions & 3 deletions freedata_gui/src/components/main_modals.vue
Original file line number Diff line number Diff line change
@@ -201,9 +201,9 @@ const beaconHistogramData = computed(() => ({
let mycall = settingsStore.remote.STATION.mycall;
let myssid = settingsStore.remote.STATION.myssid;
let fullCall = `${mycall}-${myssid}`;
console.log("Updating station info:", fullCall);
setStationInfoByCallsign(fullCall, station.stationInfo.value);
console.log("Updating station info:", fullCall, station.stationInfo);
setStationInfoByCallsign(fullCall, station.stationInfo);
}
// Fix for modal interaction
@@ -219,6 +219,7 @@ const beaconHistogramData = computed(() => ({
let mycall = settingsStore.remote.STATION.mycall;
let myssid = settingsStore.remote.STATION.myssid;
let fullCall = `${mycall}-${myssid}`;
console.log("fetching my station info:", fullCall)
getStationInfoByCallsign(fullCall);
}
100 changes: 63 additions & 37 deletions freedata_gui/src/components/main_startup_check.vue
Original file line number Diff line number Diff line change
@@ -10,18 +10,18 @@
<div class="modal-dialog modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5">Modem check</h1>
<h1 class="modal-title fs-5">System check</h1>
<button
type="button"
class="ms-5 btn btn-secondary"
aria-label="Reload GUI"
@click="reloadGUI"
>
GUI problems? Reload it!
Reload GUI
</button>
<button
type="button"
class="btn-close"
class="btn-close me-2"
data-bs-dismiss="modal"
aria-label="Close"
></button>
@@ -51,7 +51,7 @@


<div class="alert alert-info" role="alert">
For remote operation, please go to <strong>settings/modem</strong> and set the server ip to <strong>0.0.0.0</strong>
For remote operation, please go to <strong>settings<i class="bi bi-gear-wide-connected ms-1"></i>/modem</strong> and set the server ip to <strong>0.0.0.0</strong>

</div>

@@ -87,39 +87,13 @@
</h2>
<div id="modemStatusCollapse" class="accordion-collapse collapse" data-bs-parent="#startupCheckAccordion">
<div class="accordion-body">
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">Manual modem restart</label>
<label class="input-group-text">
<button
type="button"
id="startModem"
class="btn btn-sm btn-outline-success"
data-bs-toggle="tooltip"
data-bs-trigger="hover"
data-bs-html="false"
title="Start the Modem. Please set your audio and radio settings first!"
@click="startModem"
:class="{ disabled: state.is_modem_running }"
>
<i class="bi bi-play-fill"></i>
</button>
</label>
<label class="input-group-text">
<button
type="button"
id="stopModem"
class="btn btn-sm btn-outline-danger"
data-bs-toggle="tooltip"
data-bs-trigger="hover"
data-bs-html="false"
title="Stop the Modem."
@click="stopModem"
:class="{ disabled: !state.is_modem_running }"
>
<i class="bi bi-stop-fill"></i>
</button>
</label>
</div>

<div class="alert alert-info" role="alert">
For further settings please go to <strong>settings<i class="bi bi-gear-wide-connected ms-1"></i>/modem</strong>

</div>


<!-- Audio Input Device -->
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">Audio Input device</label>
@@ -156,6 +130,47 @@
</option>
</select>
</div>


<div class="alert alert-warning mt-3" role="alert">
In case of unusual problems, you can stop and reload the internal modem manually.

</div>
<div class="input-group input-group-sm">
<label class="input-group-text w-50">Manual modem restart</label>
<label class="input-group-text">
<button
type="button"
id="startModem"
class="btn btn-sm btn-outline-success"
data-bs-toggle="tooltip"
data-bs-trigger="hover"
data-bs-html="false"
title="Start the Modem. Please set your audio and radio settings first!"
@click="startModem"
:class="{ disabled: state.is_modem_running }"
>
<i class="bi bi-play-fill"></i>
</button>
</label>
<label class="input-group-text">
<button
type="button"
id="stopModem"
class="btn btn-sm btn-outline-danger"
data-bs-toggle="tooltip"
data-bs-trigger="hover"
data-bs-html="false"
title="Stop the Modem."
@click="stopModem"
:class="{ disabled: !state.is_modem_running }"
>
<i class="bi bi-stop-fill"></i>
</button>
</label>
</div>


</div>
</div>
</div>
@@ -180,6 +195,11 @@
</h2>
<div id="radioControlCollapse" class="accordion-collapse collapse" data-bs-parent="#startupCheckAccordion">
<div class="accordion-body">

<div class="alert alert-info" role="alert">
This is just a quick setting! For further options, please go to <strong>settings<i class="bi bi-gear-wide-connected ms-1"></i>/rig control</strong>
</div>

<div class="input-group input-group-sm mb-1">
<span class="input-group-text" style="width: 180px">Rig control method</span>
<select
@@ -250,6 +270,12 @@
</h2>
<div id="systemStatusCollapse" class="accordion-collapse collapse" data-bs-parent="#startupCheckAccordion">
<div class="accordion-body">

<div class="alert alert-info" role="alert">
Please share this information when opening an issue

</div>

<h3>API Information</h3>
<p><strong>API Version:</strong> {{ state.api_version }}</p>
<p><strong>Modem Version:</strong> {{ state.modem_version }}</p>
74 changes: 56 additions & 18 deletions freedata_gui/src/components/settings_chat.vue
Original file line number Diff line number Diff line change
@@ -20,46 +20,84 @@ export default {
</script>

<template>
<!-- Top Info Area for Messages Settings -->
<div class="alert alert-info" role="alert">
<strong><i class="bi bi-gear-wide-connected me-1"></i>Messages</strong> related settings, like enabling <strong>message auto repeat</strong> and configuring <strong>ADIF log</strong> connection.
</div>

<!-- Enable Message Auto Repeat -->
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50">Enable message auto repeat</label>
<div class="form-check form-switch form-check-inline ms-2">
<input
class="form-check-input"
type="checkbox"
@change="onChange"
v-model="settings.remote.MESSAGES.enable_auto_repeat"
id="enableMessagesAutoRepeatSwitch"
/>
<label class="form-check-label" for="enableMessagesAutoRepeatSwitch">
Re-send message on beacon
</label>
</div>
<label class="input-group-text w-50 text-wrap">
Enable message auto repeat
<button
type="button"
class="btn btn-link p-0 ms-2"
data-bs-toggle="tooltip"
title="Re-send message on beacon"
>
<i class="bi bi-question-circle"></i>
</button>
</label>
<label class="input-group-text w-50">
<div class="form-check form-switch form-check-inline ms-2">
<input
class="form-check-input"
type="checkbox"
id="enableMessagesAutoRepeatSwitch"
@change="onChange"
v-model="settings.remote.MESSAGES.enable_auto_repeat"
/>
<label class="form-check-label" for="enableMessagesAutoRepeatSwitch">Enable</label>
</div>
</label>
</div>

<!-- ADIF Log Host -->
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50" for="adifLogHost">ADIF Log Host</label>
<label class="input-group-text w-50 text-wrap">
ADIF Log Host
<button
type="button"
class="btn btn-link p-0 ms-2"
data-bs-toggle="tooltip"
title="ADIF server host, e.g., 127.0.0.1"
>
<i class="bi bi-question-circle"></i>
</button>
</label>
<input
type="text"
class="form-control"
placeholder="adif server host, e.g. 127.0.0.1"
placeholder="Enter ADIF server host"
id="adifLogHost"
@change="onChange"
v-model="settings.remote.MESSAGES.adif_log_host"
/>
</div>

<!-- ADIF Log Port -->
<div class="input-group input-group-sm mb-1">
<label class="input-group-text w-50" for="adifLogPort">ADIF Log Port</label>
<label class="input-group-text w-50 text-wrap">
ADIF Log Port
<button
type="button"
class="btn btn-link p-0 ms-2"
data-bs-toggle="tooltip"
title="ADIF server port, e.g., 2237"
>
<i class="bi bi-question-circle"></i>
</button>
</label>
<input
type="number"
class="form-control"
placeholder="adif server port, e.g. 2237"
placeholder="Enter ADIF server port"
id="adifLogPort"
max="65534"
min="1025"
@change="onChange"
v-model.number="settings.remote.MESSAGES.adif_log_port"
/>
</div>

</template>

Loading

0 comments on commit ea13b4e

Please sign in to comment.