Chore: format
This commit is contained in:
parent
f3868abd08
commit
50de5ad59c
GPG key ID:
989DE36109AFA354
3 changed files with 287 additions and 247 deletions
|
|
@ -5,12 +5,11 @@
|
|||
line-height: 1.2;
|
||||
}
|
||||
|
||||
|
||||
@keyframes blinker {
|
||||
50% {
|
||||
opacity: 0.3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.timer.my-turn {
|
||||
color: #0f0;
|
||||
|
|
|
|||
37
index.html
37
index.html
|
|
@ -1,14 +1,14 @@
|
|||
<!doctype html>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
|
||||
<script src="https://unpkg.com/mqtt/dist/mqtt.min.js"></script>
|
||||
<script src="index.js"></script>
|
||||
<link rel="stylesheet" href="https://unpkg.com/@picocss/pico@latest/css/pico.min.css">
|
||||
<link rel="stylesheet" href="index.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/@picocss/pico@latest/css/pico.min.css" />
|
||||
<link rel="stylesheet" href="index.css" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -24,7 +24,9 @@
|
|||
|
||||
<div x-data="Timer">
|
||||
<div x-show="!time">
|
||||
<div class="timer loading" href="#" aria-busy="true">please wait</div>
|
||||
<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':'')"
|
||||
|
|
@ -33,10 +35,13 @@
|
|||
</div>
|
||||
|
||||
<button @click="$store.remoteState.giveTurnToNextPlayer()"
|
||||
x-bind:disabled="$store.remoteState.currentPlayer !== $store.localState.id">I'm done!</button>
|
||||
x-bind:disabled="$store.remoteState.currentPlayer !== $store.localState.id">
|
||||
I'm done!
|
||||
</button>
|
||||
|
||||
<label for="nextPlayer_select">Player after me: <b
|
||||
x-text="$store.remoteState.players[$store.localState.nextPlayer]"></b> </label>
|
||||
<label for="nextPlayer_select">Player after me:
|
||||
<b x-text="$store.remoteState.players[$store.localState.nextPlayer]"></b>
|
||||
</label>
|
||||
<select x-model="$store.localState.nextPlayer" id="nextPlayer_select">
|
||||
<template
|
||||
x-for="playerId in Object.keys($store.remoteState.players).filter(id => id != $store.localState.id)"
|
||||
|
|
@ -47,14 +52,19 @@
|
|||
|
||||
<fieldset>
|
||||
<label for="sound_enabled">
|
||||
<input x-model="$store.audio.isEnabled" @click="$store.audio.testPermission()" type="checkbox" id="sound_enabled" name="sound_enabled" role="switch">
|
||||
<input x-model="$store.audio.isEnabled" @click="$store.audio.testPermission()" type="checkbox"
|
||||
id="sound_enabled" name="sound_enabled" role="switch" />
|
||||
Enable sound
|
||||
</label>
|
||||
</fieldset>
|
||||
|
||||
<div class="grid">
|
||||
<button class="secondary outline" @click="$store.localState.leave()">Leave</button>
|
||||
<button class="secondary outline" @click="$store.remoteState.clear()">Clear</button>
|
||||
<button class="secondary outline" @click="$store.localState.leave()">
|
||||
Leave
|
||||
</button>
|
||||
<button class="secondary outline" @click="$store.remoteState.clear()">
|
||||
Clear
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<p>Other players:</p>
|
||||
|
|
@ -63,11 +73,10 @@
|
|||
<li x-text="$store.remoteState.players[playerId]"></li>
|
||||
</template>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<div x-show="!$store.localState.joined">
|
||||
<form x-data="JoinForm()" @submit.prevent="submitForm">
|
||||
<input type="text" x-model="formData.name" placeholder="Name">
|
||||
<input type="text" x-model="formData.name" placeholder="Name" />
|
||||
<button type="submit">Join</button>
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
|||
186
index.js
186
index.js
|
|
@ -1,17 +1,20 @@
|
|||
function JoinForm() {
|
||||
return {
|
||||
formData: {
|
||||
name: ""
|
||||
name: "",
|
||||
},
|
||||
submitForm() {
|
||||
Alpine.store("localState").join(this.formData.name)
|
||||
}
|
||||
}
|
||||
Alpine.store("localState").join(this.formData.name);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function uuidv4() {
|
||||
return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
|
||||
(c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
|
||||
return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) =>
|
||||
(
|
||||
c ^
|
||||
(crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))
|
||||
).toString(16)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -20,22 +23,22 @@ function Timer() {
|
|||
time: 0,
|
||||
init() {
|
||||
setInterval(() => {
|
||||
const lastPlayerSwitch = Alpine.store("remoteState").lastPlayerSwitch
|
||||
console.log(lastPlayerSwitch)
|
||||
if(!lastPlayerSwitch) {
|
||||
this.time = null
|
||||
}
|
||||
else {
|
||||
this.time = parseInt((90000 - ((new Date()).getTime() - lastPlayerSwitch)) / 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);
|
||||
},
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
document.addEventListener('alpine:init', () => {
|
||||
console.log("Alpine.js is ready to go!")
|
||||
|
||||
document.addEventListener("alpine:init", () => {
|
||||
console.log("Alpine.js is ready to go!");
|
||||
|
||||
Alpine.store("localState", {
|
||||
joined: false,
|
||||
|
|
@ -48,7 +51,7 @@ document.addEventListener('alpine:init', () => {
|
|||
if (this.joined) {
|
||||
Alpine.store("remoteState").connect();
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
this.restore();
|
||||
},
|
||||
|
|
@ -58,16 +61,16 @@ document.addEventListener('alpine:init', () => {
|
|||
this.name = name;
|
||||
this.id = uuidv4();
|
||||
localStorage.clear();
|
||||
localStorage.setItem("joined", this.joined)
|
||||
localStorage.setItem("joined", this.joined);
|
||||
localStorage.setItem("name", this.name);
|
||||
localStorage.setItem("id", this.id)
|
||||
localStorage.setItem("id", this.id);
|
||||
},
|
||||
|
||||
leave() {
|
||||
this.joined = false;
|
||||
this.name = "";
|
||||
localStorage.clear();
|
||||
localStorage.setItem("id", this.id)
|
||||
localStorage.setItem("id", this.id);
|
||||
Alpine.store("remoteState").disconnect();
|
||||
},
|
||||
|
||||
|
|
@ -79,7 +82,7 @@ document.addEventListener('alpine:init', () => {
|
|||
this.id = localStorage.getItem("id");
|
||||
}
|
||||
},
|
||||
})
|
||||
});
|
||||
|
||||
Alpine.store("remoteState", {
|
||||
players: [],
|
||||
|
|
@ -91,40 +94,58 @@ document.addEventListener('alpine:init', () => {
|
|||
|
||||
init() {
|
||||
Alpine.effect(() => {
|
||||
if (this.connected && Object.keys(this.players).indexOf(Alpine.store("localState").id) === -1) {
|
||||
this._client.publish('im.dorian.whos-turn-is-it.players', JSON.stringify({
|
||||
if (
|
||||
this.connected &&
|
||||
Object.keys(this.players).indexOf(Alpine.store("localState").id) ===
|
||||
-1
|
||||
) {
|
||||
this._client.publish(
|
||||
"im.dorian.whos-turn-is-it.players",
|
||||
JSON.stringify({
|
||||
[Alpine.store("localState").id]: Alpine.store("localState").name,
|
||||
...this.players
|
||||
}), { qos: 1, retain: true })
|
||||
...this.players,
|
||||
}),
|
||||
{ qos: 1, retain: true }
|
||||
);
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
Alpine.effect(() => {
|
||||
if (this.currentPlayer == Alpine.store("localState").id) {
|
||||
this.isMyTurn = true;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
this.isMyTurn = false;
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
Alpine.effect(() => {
|
||||
if (Alpine.store("localState").nextPlayer == null || Alpine.store("localState").nextPlayer == Alpine.store("localState").id || !Object.keys(this.players).includes(Alpine.store("localState").nextPlayer)) {
|
||||
if (
|
||||
Alpine.store("localState").nextPlayer == null ||
|
||||
Alpine.store("localState").nextPlayer ==
|
||||
Alpine.store("localState").id ||
|
||||
!Object.keys(this.players).includes(
|
||||
Alpine.store("localState").nextPlayer
|
||||
)
|
||||
) {
|
||||
const players = Object.keys(this.players).sort();
|
||||
const nextPlayer = players[(players.indexOf(Alpine.store("localState").id) + 1) % players.length]
|
||||
const nextPlayer =
|
||||
players[
|
||||
(players.indexOf(Alpine.store("localState").id) + 1) %
|
||||
players.length
|
||||
];
|
||||
Alpine.store("localState").nextPlayer = nextPlayer;
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
Alpine.effect(() => {
|
||||
if (this.isMyTurn) {
|
||||
Alpine.store("audio").playDing()
|
||||
Alpine.store("audio").playDing();
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
connect() {
|
||||
const url = 'wss://broker.emqx.io:8084/mqtt'
|
||||
const url = "wss://broker.emqx.io:8084/mqtt";
|
||||
|
||||
const options = {
|
||||
// Clean session
|
||||
|
|
@ -132,20 +153,19 @@ document.addEventListener('alpine:init', () => {
|
|||
connectTimeout: 4000,
|
||||
// Authentication
|
||||
clientId: Alpine.store("localState").id,
|
||||
}
|
||||
};
|
||||
|
||||
this._client = mqtt.connect(url, options)
|
||||
this._client = mqtt.connect(url, options);
|
||||
const client = this._client;
|
||||
this._client.on('connect', function () {
|
||||
this._client.on("connect", function () {
|
||||
// Subscribe to a topic
|
||||
client.subscribe('im.dorian.whos-turn-is-it.players')
|
||||
client.subscribe('im.dorian.whos-turn-is-it.currentPlayer')
|
||||
})
|
||||
client.subscribe("im.dorian.whos-turn-is-it.players");
|
||||
client.subscribe("im.dorian.whos-turn-is-it.currentPlayer");
|
||||
});
|
||||
|
||||
|
||||
this._client.on('message', function (topic, message) {
|
||||
this._client.on("message", function (topic, message) {
|
||||
// message is Buffer
|
||||
console.log(topic, message.toString())
|
||||
console.log(topic, message.toString());
|
||||
|
||||
if (topic === "im.dorian.whos-turn-is-it.players") {
|
||||
const data = JSON.parse(message.toString());
|
||||
|
|
@ -153,37 +173,47 @@ document.addEventListener('alpine:init', () => {
|
|||
Alpine.store("remoteState").connected = true;
|
||||
}
|
||||
Alpine.store("remoteState").players = data;
|
||||
}
|
||||
else if (topic === "im.dorian.whos-turn-is-it.currentPlayer") {
|
||||
} else if (topic === "im.dorian.whos-turn-is-it.currentPlayer") {
|
||||
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', JSON.stringify({
|
||||
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 })
|
||||
since: new Date().getTime(),
|
||||
}),
|
||||
{ qos: 1, retain: true }
|
||||
);
|
||||
},
|
||||
|
||||
|
||||
disconnect() {
|
||||
this._client.end(true);
|
||||
},
|
||||
|
||||
clear() {
|
||||
this._client.publish('im.dorian.whos-turn-is-it.players', JSON.stringify({
|
||||
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', JSON.stringify({
|
||||
}),
|
||||
{ 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 })
|
||||
}
|
||||
})
|
||||
since: new Date().getTime(),
|
||||
}),
|
||||
{ qos: 1, retain: true }
|
||||
);
|
||||
},
|
||||
});
|
||||
|
||||
Alpine.store("audio", {
|
||||
hasBeenTested: false,
|
||||
|
|
@ -192,31 +222,35 @@ document.addEventListener('alpine:init', () => {
|
|||
audioPlayer: null,
|
||||
|
||||
init() {
|
||||
this.audioPlayer = new Audio('silence.mp3');
|
||||
this.audioPlayer = new Audio("silence.mp3");
|
||||
|
||||
Alpine.effect(() => {
|
||||
localStorage.setItem("audio_enabled", this.isEnabled)
|
||||
})
|
||||
localStorage.setItem("audio_enabled", this.isEnabled);
|
||||
});
|
||||
},
|
||||
|
||||
testPermission() {
|
||||
if (this.isEnabled) return;
|
||||
this.audioPlayer.src = 'silence.mp3';
|
||||
this.audioPlayer.play().then(() => {
|
||||
this.isAvailable = true
|
||||
this.isEnabled = localStorage.getItem("audio_enabled") === false ? false : true
|
||||
this.hasBeenTested = true
|
||||
}).catch((error) => {
|
||||
console.warn("Audio permission not granted!")
|
||||
this.isAvailable = false
|
||||
this.isEnabled = false
|
||||
this.hasBeenTested = true
|
||||
this.audioPlayer.src = "silence.mp3";
|
||||
this.audioPlayer
|
||||
.play()
|
||||
.then(() => {
|
||||
this.isAvailable = true;
|
||||
this.isEnabled =
|
||||
localStorage.getItem("audio_enabled") === false ? false : true;
|
||||
this.hasBeenTested = true;
|
||||
})
|
||||
.catch((error) => {
|
||||
console.warn("Audio permission not granted!");
|
||||
this.isAvailable = false;
|
||||
this.isEnabled = false;
|
||||
this.hasBeenTested = true;
|
||||
});
|
||||
},
|
||||
|
||||
playDing() {
|
||||
if (!this.isEnabled) return;
|
||||
this.playSound('ding.mp3')
|
||||
this.playSound("ding.mp3");
|
||||
},
|
||||
|
||||
playSound(soundFile) {
|
||||
|
|
@ -228,7 +262,5 @@ document.addEventListener('alpine:init', () => {
|
|||
}
|
||||
this.audioPlayer.play();
|
||||
},
|
||||
|
||||
|
||||
})
|
||||
})
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue