Skip to content

Commit d1b0857

Browse files
authored
Merge pull request #10 from DoktorShift/websockets_extension
own websockets - own connection tracking fixed 2
2 parents 7b0c2a0 + a5b04d8 commit d1b0857

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

static/js/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ window.app = Vue.createApp({
420420
this.activeWebsocket = ws
421421

422422
ws.onopen = () => {
423-
this.websocketMessage = 'Watching for payments...'
423+
this.websocketMessage = 'Connected'
424424
}
425425

426426
ws.onmessage = (event) => {

templates/devicetimer/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,10 +1098,10 @@
10981098
<!-- WebSocket Status -->
10991099
<div class="q-mt-sm" v-if="websocketMessage">
11001100
<q-chip
1101-
:color="websocketMessage.includes('Payment') ? 'positive' : 'grey-6'"
1101+
:color="websocketMessage === 'Connected' || websocketMessage.includes('Payment') ? 'positive' : 'grey-6'"
11021102
text-color="white"
11031103
size="sm"
1104-
:icon="websocketMessage.includes('Payment') ? 'check_circle' : 'visibility'"
1104+
:icon="websocketMessage === 'Connected' ? 'wifi' : websocketMessage.includes('Payment') ? 'check_circle' : 'wifi_off'"
11051105
>
11061106
{% raw %}{{ wsMessage }}{% endraw %}
11071107
</q-chip>

0 commit comments

Comments
 (0)