❄️🌿 Checkpoint

./server.js:530995/89
./views/room.handlebars:530995/664
./public/style.css:530995/706
./room.js:530995/22
This commit is contained in:
Glitch (hello-express) 2020-04-09 16:49:47 +00:00
parent a636377b56
commit 84d7efd9fe
4 changed files with 22 additions and 7 deletions

View File

@ -68,12 +68,18 @@ footer {
font-size: 4em; font-size: 4em;
color: white; color: white;
text-shadow: 2px 2px 2px black; text-shadow: 2px 2px 2px black;
outline: none;
} }
#buzzer:active { #buzzer:active {
box-shadow: inset 4px 4px 4px rgba(0,0,0,.5); box-shadow: inset 4px 4px 4px rgba(0,0,0,.5);
} }
#buzzer:disabled {
filter: grayscale(50%);
opacity: .5;
}
h2 img { h2 img {
max-height: 40px; max-height: 40px;
} }
@ -125,12 +131,17 @@ figure.participant figcaption {
height:100px; height:100px;
background: #bbbbf2; background: #bbbbf2;
border: 3px solid black; border: 3px solid black;
font-size: 1.3em;
font-weight: bold;
display: flex;
flex-direction: column;
justify-content: space-evenly;
} }
#messageBox img { #messageBox img {
max-height: 90%; max-height: 50%;
} }
.hide { #messageBox.hide {
display: none; display: none;
} }

View File

@ -57,7 +57,7 @@ function buzz(roomId, participant) {
p.ws.send(JSON.stringify({ p.ws.send(JSON.stringify({
type: "buzz", type: "buzz",
participant: participant.participantName, participant: participant.participantName,
msg: `<img src="${participant.character}"> ${participant.participantName} buzzed!` msg: `<img src="${participant.character}"><div>${participant.participantName} buzzed!</div>`
})); }));
} }
}); });

View File

@ -83,7 +83,6 @@ wss.on('connection', (ws, req) => {
if (message.type === "join") { if (message.type === "join") {
participant = message.data; participant = message.data;
rooms.addParticipantWS(roomId, participant.participantId, ws) rooms.addParticipantWS(roomId, participant.participantId, ws)
ws.send('Joined as ' + participant.participantName);
} }
if (message.type === "buzz") { if (message.type === "buzz") {
console.log(`${participant.participantName} buzzed!`) console.log(`${participant.participantName} buzzed!`)
@ -91,7 +90,4 @@ wss.on('connection', (ws, req) => {
} }
}); });
} }
ws.send('Connected');
}); });

View File

@ -53,11 +53,19 @@
})); }));
}); });
document.getElementById('buzzer').addEventListener('mousedown', function() {
socket.send(JSON.stringify({
type: "buzz"
}));
});
function showMessage(msg) { function showMessage(msg) {
document.getElementById('buzzer').disabled = true;
let mb = document.getElementById('messageBox'); let mb = document.getElementById('messageBox');
mb.innerHTML = msg; mb.innerHTML = msg;
mb.classList.remove('hide'); mb.classList.remove('hide');
setTimeout(() => { setTimeout(() => {
document.getElementById('buzzer').disabled = false;
mb.classList.add('hide'); mb.classList.add('hide');
}, 5000) }, 5000)
} }