diff --git a/public/admin.html b/public/admin.html index 22fd02e..9bff968 100644 --- a/public/admin.html +++ b/public/admin.html @@ -15,6 +15,10 @@
Complete Count
0
+
Completed List
+
+ +
diff --git a/public/js/admin.js b/public/js/admin.js index 40a3875..ec54154 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -4,8 +4,15 @@ while(enteredPwd !== 'lemme in'){ } const socket = io.connect('/'); -socket.on('prompt completed', function (data) { - document.querySelector('#current-complete').innerHTML = data; +socket.on('prompt completed', function (usernames) { + document.querySelector('#current-complete').innerHTML = usernames.length; + const roster = document.querySelector('#completed-list ul'); + roster.innerHTML = ""; + for(user of usernames){ + const newLi = document.createElement('li'); + newLi.innerHTML = user; + roster.appendChild(newLi); + } }); socket.on('prompt sent', function (prompt) { @@ -16,7 +23,7 @@ socket.on('prompt sent', function (prompt) { socket.on('username list', function (usernames) { document.querySelector('#num-users').innerHTML = usernames.length; - const roster = document.querySelector('ul'); + const roster = document.querySelector('#roster ul'); roster.innerHTML = ""; for(user of usernames){ const newLi = document.createElement('li'); diff --git a/public/js/index.js b/public/js/index.js index d48a131..da1c179 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -20,12 +20,12 @@ socket.on('prompt sent', function (prompt) { button.addEventListener('click', (event)=>{ button.setAttribute("disabled",true); - socket.emit('prompt completed'); + socket.emit('prompt completed', username); }); window.addEventListener("beforeunload", (e)=>{ socket.emit('user dropped', username); if(button.getAttribute("disabled")){ - socket.emit('remove completed'); + socket.emit('remove completed', username); } }); diff --git a/server.js b/server.js index 4e7c62f..e4af72a 100644 --- a/server.js +++ b/server.js @@ -6,23 +6,26 @@ const socketserver = require('socket.io')(http); app.use(express.static('public')); let usernames = []; -let currentComplete = 0; +let currentComplete = []; let currentPrompt = "Nothing Yet"; socketserver.on('connection', (socket)=>{ socketserver.emit('prompt sent', currentPrompt); socketserver.emit('username list', usernames); - + socketserver.emit('prompt completed', currentComplete); + socket.on('prompt sent', (prompt)=>{ - currentComplete = 0; + currentComplete = []; currentPrompt = prompt; socketserver.emit('prompt sent', currentPrompt); }); - socket.on('prompt completed', ()=>{ - currentComplete++; + socket.on('prompt completed', (username)=>{ + currentComplete.push(username); socketserver.emit('prompt completed', currentComplete); }); - socket.on('remove completed', ()=>{ - currentComplete--; + socket.on('remove completed', (username)=>{ + currentComplete = currentComplete.filter((currentElement)=>{ + return currentElement !== username; + }); socketserver.emit('prompt completed', currentComplete); }); socket.on('user joined', (username)=>{