DHBW/Projektmanagement-Game
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #39 from H4CK3R-01/fix_chat

Browse Source 
fixed duplicate messages
This commit is contained in:
Florian Kaiser 2021-06-18 13:19:24 +02:00 committed by GitHub
commit 9d0f804c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
public/js/chat.js
View File

@ -1,43 +1,6 @@
let socket; let socket;
let connected = false; let connected = false;
function start_chat() {
socket.on('login', function () {
connected = true;
document.getElementById('login').style.display = 'none';
document.getElementById('game').style.display = 'flex';
document.getElementById('chat').style.display = 'flex';
start_chat();
start_game();
resize();
addLogMessage("Welcome " + username + "!");
});
socket.on('error', function (data) {
if (data === 'Game started already or room has two many members') {
document.getElementById('login').style.display = 'flex';
document.getElementById('game').style.display = 'none';
document.getElementById('chat').style.display = 'none';
document.getElementById('error').innerText = data;
}
console.log(data);
});
socket.on('new message', function (data) {
addChatMessage(data);
});
socket.on('user joined', function (data) {
addLogMessage(data + ' joined');
});
socket.on('user left', function (data) {
addLogMessage(data + ' left');
});
}
function sendMessage() { function sendMessage() {
let message = document.getElementById('message_input').value; let message = document.getElementById('message_input').value;

37
public/js/index.js
View File

@ -14,8 +14,41 @@ document.getElementById('ok').addEventListener('click', function () {
closeOnBeforeunload: false closeOnBeforeunload: false
}); });
start_chat();
// Login // Login
socket.emit('add user', {'username': username, 'room_name': room_name}); socket.emit('add user', {'username': username, 'room_name': room_name});
socket.on('login', function () {
connected = true;
document.getElementById('login').style.display = 'none';
document.getElementById('game').style.display = 'flex';
document.getElementById('chat').style.display = 'flex';
start_game();
resize();
addLogMessage("Welcome " + username + "!");
});
socket.on('error', function (data) {
if (data === 'Game started already or room has two many members') {
document.getElementById('login').style.display = 'flex';
document.getElementById('game').style.display = 'none';
document.getElementById('chat').style.display = 'none';
document.getElementById('error').innerText = data;
}
console.log(data);
});
socket.on('new message', function (data) {
addChatMessage(data);
});
socket.on('user joined', function (data) {
addLogMessage(data + ' joined');
});
socket.on('user left', function (data) {
addLogMessage(data + ' left');
});
}); });