Feat: keep time and sync and loading indicator
This commit is contained in:
parent
196cbc26e2
commit
f3868abd08
3 changed files with 33 additions and 7 deletions
|
@ -21,3 +21,10 @@
|
|||
color: #f00;
|
||||
animation: blinker 0.5s ease infinite;
|
||||
}
|
||||
|
||||
.timer.loading {
|
||||
font-size: 2em;
|
||||
margin: auto;
|
||||
margin-bottom: 2.5em;
|
||||
margin-top: 2.5em;
|
||||
}
|
|
@ -23,9 +23,14 @@
|
|||
</hgroup>
|
||||
|
||||
<div x-data="Timer">
|
||||
<div x-show="!time">
|
||||
<div class="timer loading" href="#" aria-busy="true">please wait</div>
|
||||
</div>
|
||||
<div x-show="time">
|
||||
<p :class="'timer' + ($store.remoteState.isMyTurn ? ' my-turn':'') + (time < 0 ? ' over':'')"
|
||||
x-text="time + 's'"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button @click="$store.remoteState.giveTurnToNextPlayer()"
|
||||
x-bind:disabled="$store.remoteState.currentPlayer !== $store.localState.id">I'm done!</button>
|
||||
|
|
28
index.js
28
index.js
|
@ -20,8 +20,15 @@ function Timer() {
|
|||
time: 0,
|
||||
init() {
|
||||
setInterval(() => {
|
||||
this.time = parseInt((90000 - ((new Date()).getTime() - Alpine.store("remoteState").lastPlayerSwitch)) / 1000);
|
||||
}, 1000);
|
||||
const lastPlayerSwitch = Alpine.store("remoteState").lastPlayerSwitch
|
||||
console.log(lastPlayerSwitch)
|
||||
if(!lastPlayerSwitch) {
|
||||
this.time = null
|
||||
}
|
||||
else {
|
||||
this.time = parseInt((90000 - ((new Date()).getTime() - lastPlayerSwitch)) / 1000);
|
||||
}
|
||||
}, 100);
|
||||
},
|
||||
}
|
||||
}
|
||||
|
@ -77,7 +84,7 @@ document.addEventListener('alpine:init', () => {
|
|||
Alpine.store("remoteState", {
|
||||
players: [],
|
||||
currentPlayer: null,
|
||||
lastPlayerSwitch: 0,
|
||||
lastPlayerSwitch: null,
|
||||
connected: false,
|
||||
isMyTurn: false,
|
||||
_client: null,
|
||||
|
@ -93,7 +100,6 @@ document.addEventListener('alpine:init', () => {
|
|||
})
|
||||
|
||||
Alpine.effect(() => {
|
||||
this.lastPlayerSwitch = new Date().getTime();
|
||||
if (this.currentPlayer == Alpine.store("localState").id) {
|
||||
this.isMyTurn = true;
|
||||
}
|
||||
|
@ -149,13 +155,18 @@ document.addEventListener('alpine:init', () => {
|
|||
Alpine.store("remoteState").players = data;
|
||||
}
|
||||
else if (topic === "im.dorian.whos-turn-is-it.currentPlayer") {
|
||||
Alpine.store("remoteState").currentPlayer = message.toString();
|
||||
const data = JSON.parse(message.toString());
|
||||
Alpine.store("remoteState").currentPlayer = data.id;
|
||||
Alpine.store("remoteState").lastPlayerSwitch = data.since;
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
giveTurnToNextPlayer() {
|
||||
this._client.publish('im.dorian.whos-turn-is-it.currentPlayer', Alpine.store("localState").nextPlayer, { qos: 1, retain: true })
|
||||
this._client.publish('im.dorian.whos-turn-is-it.currentPlayer', JSON.stringify({
|
||||
id: Alpine.store("localState").nextPlayer,
|
||||
since: new Date().getTime()
|
||||
}), { qos: 1, retain: true })
|
||||
},
|
||||
|
||||
|
||||
|
@ -167,7 +178,10 @@ document.addEventListener('alpine:init', () => {
|
|||
this._client.publish('im.dorian.whos-turn-is-it.players', JSON.stringify({
|
||||
[Alpine.store("localState").id]: Alpine.store("localState").name,
|
||||
}), { qos: 1, retain: true })
|
||||
this._client.publish('im.dorian.whos-turn-is-it.currentPlayer', Alpine.store("localState").id, { qos: 1, retain: true })
|
||||
this._client.publish('im.dorian.whos-turn-is-it.currentPlayer', JSON.stringify({
|
||||
id: Alpine.store("localState").id,
|
||||
since: new Date().getTime()
|
||||
}), { qos: 1, retain: true })
|
||||
}
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in a new issue