From 022a9a2d9a54b15b7f0f6f8c107bd1fc71a9df43 Mon Sep 17 00:00:00 2001
From: Ulysse Durand <ulysse.durand@ens-lyon.fr>
Date: Wed, 19 Mar 2025 11:58:53 +0100
Subject: [PATCH] fonctionne
---
public/index.html | 1 +
public/room.html | 8 ++++++--
server.js | 8 ++++++--
test | 0
4 files changed, 13 insertions(+), 4 deletions(-)
create mode 100644 test
diff --git a/public/index.html b/public/index.html
index 11b1940..0b0a41d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -65,6 +65,7 @@
function joinRoom(roomNum) {
const name = nameInput.value.trim();
+ if (document.querySelectorAll('.player-count')[roomNum].textContent == "2") return alert('Full room');
if (!name) return alert('Please enter a name');
window.location.href = `/room${roomNum}?name=${encodeURIComponent(name)}`;
}
diff --git a/public/room.html b/public/room.html
index 9d174cd..6a0f7af 100644
--- a/public/room.html
+++ b/public/room.html
@@ -40,12 +40,15 @@
});
socket.on('startGame', ({ board, currentPlayer }) => {
+ const messages = document.getElementById('messages');
+ messages.innerHTML += `<div><strong>Game starting</strong></div>`;
drawBoard(board);
+
});
- socket.on('endGame', () => {
+ socket.on('stopGame', () => {
const messages = document.getElementById('messages');
- messages.innerHTML += `<div></div>`;
+ messages.innerHTML += `<div><strong>Game Finish</strong></div>`;
});
socket.on('updateGame', ({ board, currentPlayer, winner }) => {
@@ -62,6 +65,7 @@
function sendMessage() {
const message = document.getElementById('messageInput').value;
socket.emit('chatMessage', message);
+ console.log("message sent");
document.getElementById('messageInput').value = '';
}
diff --git a/server.js b/server.js
index 7eec9bd..a307c3f 100644
--- a/server.js
+++ b/server.js
@@ -50,7 +50,7 @@ io.on('connection', (socket) => {
let stopGame = (room, roomId) => {
console.log("Not enough players in room " + roomId + ", game stops.");
- io.to(roomId).emit('stopGame')
+ io.to(roomId).emit('stopGame');
};
let startGame = (room, roomId) => {
@@ -71,6 +71,7 @@ io.on('connection', (socket) => {
stopGame(currentRoom, currentRoom.id);
}
console.log("Player " + playerName + " leaved room " + currentRoom.id + ".");
+ socket.leave(currentRoom.id);
currentRoom = null;
io.emit('updateRooms', rooms);
}
@@ -96,6 +97,8 @@ io.on('connection', (socket) => {
});
io.emit('updateRooms', rooms);
+ socket.join(roomId);
+
io.to(roomId).emit('updatePlayers', room.players);
if (room.players.length === 2) {
startGame(room, roomId);
@@ -138,9 +141,9 @@ io.on('connection', (socket) => {
socket.on('chatMessage', (message) => {
if (!currentRoom) {
- console.log("TEST " + currentRoom);
return;
}
+ console.log("Message "+message+" in room "+currentRoom.id+" from "+playerName);
io.to(currentRoom.id).emit('message', {
name: playerName,
message
@@ -148,6 +151,7 @@ io.on('connection', (socket) => {
});
socket.on('disconnect', () => {
+ console.log("Player "+playerName+" disconnected");
leaveRooms();
});
});
diff --git a/test b/test
new file mode 100644
index 0000000..e69de29
--
GitLab