From 1a6e1d81d2e355de52e5e6f1e6ed620d3650f5d2 Mon Sep 17 00:00:00 2001 From: Matt Huntington Date: Tue, 5 Sep 2017 14:33:17 -0400 Subject: [PATCH] no longer need users connected event --- public/js/admin.js | 4 +--- server.js | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/public/js/admin.js b/public/js/admin.js index 44875eb..d6c9d29 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -3,15 +3,13 @@ while(enteredPwd !== 'lemme in'){ enteredPwd = prompt("Enter admin password"); } const socket = io.connect('/'); -socket.on('users connected', function (data) { - document.querySelector('#num-users').innerHTML = data; -}); socket.on('prompt completed', function (data) { document.querySelector('#current-complete').innerHTML = data; }); socket.on('username list', function (usernames) { + document.querySelector('#num-users').innerHTML = usernames.length; const roster = document.querySelector('ul'); roster.innerHTML = ""; for(user of usernames){ diff --git a/server.js b/server.js index f5b9d02..4e7c62f 100644 --- a/server.js +++ b/server.js @@ -11,7 +11,6 @@ let currentPrompt = "Nothing Yet"; socketserver.on('connection', (socket)=>{ socketserver.emit('prompt sent', currentPrompt); socketserver.emit('username list', usernames); - socketserver.emit('users connected', usernames.length); socket.on('prompt sent', (prompt)=>{ currentComplete = 0; @@ -29,14 +28,12 @@ socketserver.on('connection', (socket)=>{ socket.on('user joined', (username)=>{ usernames.push(username); socketserver.emit('username list', usernames); - socketserver.emit('users connected', usernames.length); }); socket.on('user dropped', (username)=>{ usernames = usernames.filter((currentElement)=>{ return currentElement !== username; }); socketserver.emit('username list', usernames); - socketserver.emit('users connected', usernames.length); }); });