Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
DJ2LS 2024-05-02 11:56:47 +02:00
commit 7bbf9db71d
2 changed files with 173 additions and 103 deletions

View file

@ -103,7 +103,7 @@ function toggleTextVisibility() {
</a>
</div>
<button
<button
class="btn btn-outline-secondary border-0 left-bottom-btn position-fixed bottom-0 mb-3 rounded-3 ms-1"
data-bs-html="false"
data-bs-toggle="modal"
@ -114,5 +114,4 @@ function toggleTextVisibility() {
<i class="bi bi-person-circle h3"></i>
<span class="ms-2" v-if="isTextVisible">Station</span>
</button>
</template>

View file

@ -1,7 +1,7 @@
<script setup lang="ts">
// @ts-nocheck
// reason for no check is, that we have some mixing of typescript and chart js which seems to be not to be fixed that easy
import { ref, onMounted } from 'vue';
import { ref, onMounted } from "vue";
import { setActivePinia } from "pinia";
import pinia from "../store/index";
@ -118,77 +118,67 @@ const transmissionSpeedChartDataMessageInfo = computed(() => ({
],
}));
const stationInfoData = ref({
name: '',
city: '',
age: '',
radio: '',
antenna: '',
email: '',
website: '',
name: "",
city: "",
age: "",
radio: "",
antenna: "",
email: "",
website: "",
socialMedia: {
facebook: '',
'twitter-x': '', // Use twitter-x to correspond to the Twitter X icon
mastodon: '',
instagram: '',
linkedin: '',
youtube: '',
tiktok: ''
facebook: "",
"twitter-x": "", // Use twitter-x to correspond to the Twitter X icon
mastodon: "",
instagram: "",
linkedin: "",
youtube: "",
tiktok: "",
},
comments: ''
comments: "",
});
// Function to handle updates and save changes
function updateStationInfo() {
console.log('Updating station info:', stationInfoData.value);
console.log("Updating station info:", stationInfoData.value);
let mycall = settingsStore.remote.STATION.mycall;
let myssid = settingsStore.remote.STATION.myssid;
let fullCall = `${mycall}-${myssid}`;
setStationInfo(fullCall, stationInfoData.value)
setStationInfo(fullCall, stationInfoData.value);
}
// Fixme: this is a dirty hack. Can we make this more VueJS like?
onMounted(() => {
const modalElement = document.getElementById('stationInfoModal');
modalElement.addEventListener('show.bs.modal', fetchStationInfo);
const modalElement = document.getElementById("stationInfoModal");
modalElement.addEventListener("show.bs.modal", fetchStationInfo);
});
async function fetchStationInfo(){
let mycall = settingsStore.remote.STATION.mycall;
let myssid = settingsStore.remote.STATION.myssid;
let fullCall = `${mycall}-${myssid}`;
let result = await getStationInfo(fullCall);
let info = result.info;
stationInfoData.value = {
name: info.name || '',
city: info.city || '',
age: info.age || '',
radio: info.radio || '',
antenna: info.antenna || '',
email: info.email || '',
website: info.website || '',
socialMedia: {
facebook: info.socialMedia.facebook || '',
'twitter-x': info.socialMedia['twitter-x'] || '',
mastodon: info.socialMedia.mastodon || '',
instagram: info.socialMedia.instagram || '',
linkedin: info.socialMedia.linkedin || '',
youtube: info.socialMedia.youtube || '',
tiktok: info.socialMedia.tiktok || ''
},
comments: info.comments || ''
};
async function fetchStationInfo() {
let mycall = settingsStore.remote.STATION.mycall;
let myssid = settingsStore.remote.STATION.myssid;
let fullCall = `${mycall}-${myssid}`;
let result = await getStationInfo(fullCall);
let info = result.info;
stationInfoData.value = {
name: info.name || "",
city: info.city || "",
age: info.age || "",
radio: info.radio || "",
antenna: info.antenna || "",
email: info.email || "",
website: info.website || "",
socialMedia: {
facebook: info.socialMedia.facebook || "",
"twitter-x": info.socialMedia["twitter-x"] || "",
mastodon: info.socialMedia.mastodon || "",
instagram: info.socialMedia.instagram || "",
linkedin: info.socialMedia.linkedin || "",
youtube: info.socialMedia.youtube || "",
tiktok: info.socialMedia.tiktok || "",
},
comments: info.comments || "",
};
}
</script>
<template>
@ -1313,8 +1303,6 @@ let info = result.info;
</div>
</div>
<!-- AUDIO MODAL -->
<div
class="modal fade"
@ -1389,93 +1377,176 @@ let info = result.info;
</div>
<!-- STATION INFO MODAL -->
<div class="modal fade" id="stationInfoModal" tabindex="-1" aria-labelledby="stationInfoModal" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5 ">
<div
class="modal fade"
id="stationInfoModal"
tabindex="-1"
aria-labelledby="stationInfoModal"
aria-hidden="true"
>
<div class="modal-dialog modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5">
{{ settingsStore.remote.STATION.mycall }}
-
{{settingsStore.remote.STATION.myssid }}
</h1>
-
{{ settingsStore.remote.STATION.myssid }}
</h1>
<span class="badge text-bg-secondary ms-3">{{settingsStore.remote.STATION.mygrid }}</span>
<span class="badge text-bg-secondary ms-3">{{
settingsStore.remote.STATION.mygrid
}}</span>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<button
type="button"
class="btn-close"
data-bs-dismiss="modal"
aria-label="Close"
></button>
</div>
<div class="modal-body">
<div class="alert alert-primary" role="alert">
<strong> Please note:</strong> This is a preview to show you the
direction, FreeDATA is going somewhen. For now you can save only
your personal data, so we can optimize and improve the database. In
future this data can be requested by a remote station.
</div>
<div class="alert alert-primary" role="alert">
<strong> Please note:</strong> This is a preview to show you the direction, FreeDATA is going somewhen. For now you can save only your personal data, so we can optimize and improve the database. In future this data can be requested by a remote station.
</div>
<!-- Name -->
<!-- Name -->
<div class="input-group mb-1">
<span class="input-group-text"><i class="bi bi-person-fill"></i></span>
<input type="text" class="form-control" placeholder="Name" v-model="stationInfoData.name" >
<span class="input-group-text"
><i class="bi bi-person-fill"></i
></span>
<input
type="text"
class="form-control"
placeholder="Name"
v-model="stationInfoData.name"
/>
</div>
<!-- City -->
<div class="input-group mb-1">
<span class="input-group-text"><i class="bi bi-geo-alt-fill"></i></span>
<input type="text" class="form-control" placeholder="City" v-model="stationInfoData.city" >
<span class="input-group-text"
><i class="bi bi-geo-alt-fill"></i
></span>
<input
type="text"
class="form-control"
placeholder="City"
v-model="stationInfoData.city"
/>
</div>
<!-- Age -->
<!-- Age -->
<div class="input-group mb-3">
<span class="input-group-text"><i class="bi bi-person-fill"></i></span>
<input type="text" class="form-control" placeholder="Age" v-model="stationInfoData.age" >
<span class="input-group-text"
><i class="bi bi-person-fill"></i
></span>
<input
type="text"
class="form-control"
placeholder="Age"
v-model="stationInfoData.age"
/>
</div>
<!-- Radio -->
<div class="input-group mb-1">
<span class="input-group-text"><i class="bi bi-broadcast-pin"></i></span>
<input type="text" class="form-control" placeholder="Radio" v-model="stationInfoData.radio" >
<span class="input-group-text"
><i class="bi bi-broadcast-pin"></i
></span>
<input
type="text"
class="form-control"
placeholder="Radio"
v-model="stationInfoData.radio"
/>
</div>
<!-- Antenna -->
<div class="input-group mb-3">
<span class="input-group-text"><i class="bi bi-cone-striped"></i></span>
<input type="text" class="form-control" placeholder="Antenna" v-model="stationInfoData.antenna" >
<span class="input-group-text"
><i class="bi bi-cone-striped"></i
></span>
<input
type="text"
class="form-control"
placeholder="Antenna"
v-model="stationInfoData.antenna"
/>
</div>
<!-- Website -->
<div class="input-group mb-1">
<span class="input-group-text"><i class="bi bi-globe"></i></span>
<input type="url" class="form-control" placeholder="Website" v-model="stationInfoData.website" >
<input
type="url"
class="form-control"
placeholder="Website"
v-model="stationInfoData.website"
/>
</div>
<!-- Email -->
<div class="input-group mb-3">
<span class="input-group-text"><i class="bi bi-envelope-fill"></i></span>
<input type="email" class="form-control" placeholder="Email" v-model="stationInfoData.email" >
<span class="input-group-text"
><i class="bi bi-envelope-fill"></i
></span>
<input
type="email"
class="form-control"
placeholder="Email"
v-model="stationInfoData.email"
/>
</div>
<!-- Social Media Inputs -->
<div class="mb-3">
<div v-for="(url, platform) in stationInfoData.socialMedia">
<div class="input-group mb-1" :key="platform">
<span class="input-group-text"><i :class="`bi bi-${platform}`"></i></span>
<input type="url" class="form-control" :placeholder="`${platform.charAt(0).toUpperCase() + platform.slice(1)} URL`" v-model="stationInfoData.socialMedia[platform]" >
<span class="input-group-text"
><i :class="`bi bi-${platform}`"></i
></span>
<input
type="url"
class="form-control"
:placeholder="`${platform.charAt(0).toUpperCase() + platform.slice(1)} URL`"
v-model="stationInfoData.socialMedia[platform]"
/>
</div>
</div>
</div>
<!-- Comments -->
<div class="mb-3">
<label class="input-group-text" for="comments"><i class="bi bi-textarea-resize"></i> Comments</label>
<textarea class="form-control" rows="3" v-model="stationInfoData.comments" ></textarea>
<label class="input-group-text" for="comments"
><i class="bi bi-textarea-resize"></i> Comments</label
>
<textarea
class="form-control"
rows="3"
v-model="stationInfoData.comments"
></textarea>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary" @click="updateStationInfo">Save changes</button>
</div>
<div class="modal-footer">
<button
type="button"
class="btn btn-secondary"
data-bs-dismiss="modal"
>
Close
</button>
<button
type="button"
class="btn btn-primary"
@click="updateStationInfo"
>
Save changes
</button>
</div>
</div>
</div>
</div>
</div>
</template>