diff --git a/googletrendsgame/server/server.js b/googletrendsgame/server/server.js index 9fb988b..15791c5 100644 --- a/googletrendsgame/server/server.js +++ b/googletrendsgame/server/server.js @@ -73,25 +73,25 @@ var room = function(capacityP, pass, owner) var countInner = 0; var countSwap = 0; - var swapped; - do - { - countOuter++; - swapped = false; - for(var i = 0; i < result.users.length; i++) - { - countInner++; - if(result.users[i].score && result.users[i + 1].score && - result.users[i].score > result.users[i + 1].score) - { - countSwap++; - var temp = result.users[i]; - result.users[i] = result.users[j]; - result.users[j] = temp; - swapped = true; - } - } - } while(swapped); + // var swapped; + // do + // { + // countOuter++; + // swapped = false; + // for(var i = 0; i < result.users.length; i++) + // { + // countInner++; + // if(result.users[i].score && result.users[i + 1].score && + // result.users[i].score > result.users[i + 1].score) + // { + // countSwap++; + // var temp = result.users[i]; + // result.users[i] = result.users[j]; + // result.users[j] = temp; + // swapped = true; + // } + // } + // } while(swapped); result.gameState = this.state; @@ -221,9 +221,9 @@ var room = function(capacityP, pass, owner) this.currentRound++; this.users.forEach(function(u) { - u.sumbission = ''; + u.submission = ''; }); - this.currentRound = this.words.pop(); + this.currentWord = this.words.pop(); this.state = 2; } this.sendRoomUpdate(); @@ -232,7 +232,6 @@ var room = function(capacityP, pass, owner) //updates room variables this.update = function() { - console.log("update methed called"); switch(this.state) { case 1: //waiting for users to join @@ -246,20 +245,23 @@ var room = function(capacityP, pass, owner) case 2: // waiting for responses { var flag = true; + var test = ""; this.users.forEach(function(u) { - if(u.sumbission === '') + test+=u.submission; + if(u.submission === '') { flag = false; } }); + console.log("big stuff " + test); if(flag) { - this.state =3; - - setTimeout(function() { - this.newRound(); - }, 4000); + this.state = 3; + this.newRound(); + // setTimeout(function() { + // + // }, 4000); } break; } @@ -278,7 +280,7 @@ var room = function(capacityP, pass, owner) console.log("You don goof up") } } - console.log(this.state + "uuuuuuuuuuuuuuuuu"); + console.log(this.state + " state"); this.sendRoomUpdate(); } this.addUser(owner); @@ -301,7 +303,7 @@ var player = function(s) this.room = null; //the word the user selected for current round - this.sumbission = ''; + this.submission = ''; this.roundScore = 0; @@ -318,7 +320,7 @@ var player = function(s) var result = new Object(); result.name = this.name; result.score = this.score; - result.word = this.sumbission; + result.word = this.submission; return result; } @@ -332,22 +334,21 @@ var player = function(s) var w = data + " " + this.room.currentWord; this.sumbission = data; - console.log(w); + //console.log(w); - trendingAPI.getPopularity(w).then(function(result) + this.room.update(); + + return new Promise(function(resolve, reject) { - // var obj = new Object(); - // obj.word = w; - // obj.score = result; - // this.log.push(obj); - console.log("api result for " + result); - this.roundScore = result; - this.score += result; + trendingAPI.getPopularity(w).then(function(result) + { + console.log("api result for " + result + w); + resolve(result); + }).catch(function(err){ + console.log(err); + }) + }); - console.print(this.room); - this.room.update(); - - }) } } @@ -428,9 +429,7 @@ io.on('connection', function(socket) */ socket.on('register', function(data) { - console.log("Register event called"); - console.log(data); - console.log(" "); + console.log(data + " registered"); //checks for user name in use //if(serverUtils.userAvailable(data, players)) @@ -459,9 +458,9 @@ io.on('connection', function(socket) */ socket.on('createRoom', function(data) { - console.log("create room event called"); - console.log(data); - console.log(" "); + console.log(data + "create room"); + // console.log(data); + // console.log(" "); rooms[p.name] = new room(data.capacity, data.password, p); //sends updated room list to all users not in a room @@ -490,11 +489,8 @@ io.on('connection', function(socket) */ socket.on('joinRoom', function(data) { - console.log("join room event called"); - console.log(data); - console.log(" "); + console.log(p.name + " joined room " + data.name); - console.log(rooms); if(rooms[data.roomName] != null && rooms[data.roomName].canJoin(data.password)) { @@ -516,10 +512,14 @@ io.on('connection', function(socket) socket.on('submitWord', function(data) { console.log("submitWord called"); - console.log(data); - console.log(" "); - p.selectWord(data); + p.selectWord(data).then(function(score) + { + p.roundScore = score; + p.score += score; + p.submission = data; + p.room.update(); + }) }); //Whenever someone disconnects diff --git a/googletrendsgame/server/test/trendsTest.js b/googletrendsgame/server/test/trendsTest.js new file mode 100644 index 0000000..c5b1831 --- /dev/null +++ b/googletrendsgame/server/test/trendsTest.js @@ -0,0 +1,4 @@ +const trends = require('../trendsAPI'); +trends.getPopularity('large').then(function(data){ + console.log(data); +}); diff --git a/googletrendsgame/server/test/userTester.js b/googletrendsgame/server/test/userTester.js index 7ae6ef6..564fd7f 100644 --- a/googletrendsgame/server/test/userTester.js +++ b/googletrendsgame/server/test/userTester.js @@ -18,6 +18,7 @@ rl.on('line', function(line){ case 'register': case 'submitWord': + case 'updateRoom': socket.emit(event, msg); } }); diff --git a/words/words.txt b/words/words.txt index 29eb4e8..2aa8c2f 100644 --- a/words/words.txt +++ b/words/words.txt @@ -67,7 +67,6 @@ affect afford afraid African -African-American after afternoon again @@ -153,7 +152,6 @@ appropriate approval approve approximately -Arab architect area argue @@ -1440,7 +1438,6 @@ jacket jail Japanese jet -Jew Jewish job join @@ -2696,7 +2693,7 @@ there therefore these they -thick +thicc thin thing think