diff --git a/app.js b/app.js index cc0d23f..a3fbde7 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,3 @@ - const http = require('http'); const express = require('express'); const app = express(); @@ -55,12 +54,6 @@ io.on("connection", (socket) => { buzzOrder: buzzInfo.length+1 }); io.emit("buzzInfoToClient", buzzInfo); - // function buzzInfoToclient() { - // io.emit("buzzInfoToClient", buzzInfo); - // console.log(buzzInfo); - // } - // setTimeout(buzzInfoToclient, 1000); - // console.log(buzzInfo); }); socket.on("scoresToServer", score => { @@ -68,8 +61,6 @@ io.on("connection", (socket) => { if (teamsScore[currentTeamNumber] >= 2) { teamsScore[currentTeamNumber] = 0; currentTeamNumber = (currentTeamNumber+1)%2; - // io.emit("switchCurrentteam"); - // io.emit("dataToClient", buzzList, teamsList[currentTeamNumber], teamsScore[currentTeamNumber]); } buzzInfo = []; io.emit("gameStateToClient", teamsList[currentTeamNumber], teamsScore[currentTeamNumber]); @@ -77,8 +68,6 @@ io.on("connection", (socket) => { io.emit("userInfoToClient", userInfo);//resets the buzzer info }); - - socket.on("updateUserInfo", (userName, teamName, buzzerId) => { userInfo[userName] = { teamName: teamName, @@ -88,7 +77,6 @@ io.on("connection", (socket) => { }); socket.on("unregisterUsers", () => { - // console.log("whaat?"); userInfo = new Object(); io.emit("userInfoToClient", userInfo); }); diff --git a/browserFunctions.js b/browserFunctions.js index bc861d4..e152ca0 100644 --- a/browserFunctions.js +++ b/browserFunctions.js @@ -21,8 +21,6 @@ function buzzInfoToClient(buzzInfo) { if ($("#firstBuzz").html() == "") { $("#firstBuzz").html(buzzInfo[0].userName); const userId = buzzInfo[0].userName.replaceAll(" ","_"); - // $("#userListPanel").find("#"+userId).css("font-weight", 900); - // $("#userListPanel").find("#"+userId).find("var").html(" (BUZZ)"); let buzzerId = $("#userListPanel").find("#"+userId).find("img").attr("data-buzzerId") let buzzerSound = new Audio(buzzerId+".wav"); buzzerSound.play(); diff --git a/pages/home.html b/pages/home.html index d1109d9..299e9d1 100644 --- a/pages/home.html +++ b/pages/home.html @@ -3,9 +3,7 @@ The cooler buzzer website - - @@ -66,7 +65,6 @@

(all points buttons clear buzzers)

-

@@ -75,8 +73,6 @@

- -
diff --git a/pages/play.html b/pages/play.html index b0c0ef1..aa6bc5c 100644 --- a/pages/play.html +++ b/pages/play.html @@ -3,7 +3,6 @@ The cooler buzzer website - @@ -142,6 +141,5 @@ (please use sparingly)

- diff --git a/styles/styleMain.css b/styles/styleMain.css index 04163c9..a4bc164 100644 --- a/styles/styleMain.css +++ b/styles/styleMain.css @@ -1,5 +1,3 @@ - - body { font-family: 'Twoson'; color: rgb(255, 255, 255); @@ -32,7 +30,6 @@ a, a:visited { min-height: 310px; width: 500px; position: relative; - /* bottom: 150px; */ } #objection img{ @@ -47,6 +44,7 @@ a, a:visited { text-align: center; width: 200px; } + #contestAnswer img { width: 100px; } @@ -71,7 +69,6 @@ a, a:visited { } #PlayersList { - /* font-family: "Lucida Console"; */ position: absolute; left: 60px; border: dashed; @@ -145,7 +142,6 @@ ul { #objection img{ width: 150px; - /* text-align: left; */ } #userListPanel { top: 80px;