mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # gui/src/js/eventHandler.js
This commit is contained in:
commit
27fc465a3a
|
@ -5,7 +5,6 @@ setActivePinia(pinia);
|
||||||
|
|
||||||
import { useStateStore } from "../../store/stateStore.js";
|
import { useStateStore } from "../../store/stateStore.js";
|
||||||
const state = useStateStore(pinia);
|
const state = useStateStore(pinia);
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div class="card w-100 h-100">
|
<div class="card w-100 h-100">
|
||||||
|
@ -29,7 +28,6 @@ const state = useStateStore(pinia);
|
||||||
>Tune</a
|
>Tune</a
|
||||||
>
|
>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -5,7 +5,6 @@ setActivePinia(pinia);
|
||||||
|
|
||||||
import { useStateStore } from "../store/stateStore.js";
|
import { useStateStore } from "../store/stateStore.js";
|
||||||
const state = useStateStore(pinia);
|
const state = useStateStore(pinia);
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div class="card mb-1">
|
<div class="card mb-1">
|
||||||
|
@ -28,7 +27,6 @@ const state = useStateStore(pinia);
|
||||||
>
|
>
|
||||||
Tune
|
Tune
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-1 text-end">
|
<div class="col-1 text-end">
|
||||||
<button
|
<button
|
||||||
|
|
|
@ -25,7 +25,7 @@ function connect(endpoint, dispatcher) {
|
||||||
// handle data
|
// handle data
|
||||||
socket.addEventListener("message", function (event) {
|
socket.addEventListener("message", function (event) {
|
||||||
dispatcher(event.data);
|
dispatcher(event.data);
|
||||||
return
|
return;
|
||||||
});
|
});
|
||||||
|
|
||||||
// handle errors
|
// handle errors
|
||||||
|
|
Loading…
Reference in a new issue