Beta version completed still minor bugs check readme.md for bugs and future development

Author: Yahkob

.meteor/packages

@@ -11,3 +11,4 @@ profile-online
 bootstrap
 accounts-password
 accounts-ui-bootstrap-dropdown
+bootboxjs

bubblepopper.css

@@ -25,8 +25,8 @@
     background-image: none;
 }
 
-.game-in-progress {
-  margin-top: 40px;
+.score {
+  margin-bottom: 45px;
   padding: 0px;
   border: none;
 }

client/client.js

@@ -9,20 +9,45 @@ Template.home.helpers({
   },
   player1Score: function(){
     var game = Games.findOne({current: true});
-    console.log(game);
-    if(!game)
+    if(!game){
       return;
+    }
     var player = game.players[0];
-    console.log(player);
     var bubbles = Bubbles.find({userId: player, gameId: game._id}).fetch();
     return bubbles.length;
   },
   player2Score: function(){
     var game = Games.findOne({current: true});
-    if(!game)
+    if(!game){
       return;
+    }
     var player = game.players[1];
-    return Bubbles.find({userId: player, gameId: game._id}).fetch().length;
+    var bubbles = Bubbles.find({userId: player, gameId: game._id}).fetch();
+    return bubbles.length;
+  },
+  endGame: function(){
+    var game = Games.findOne({current: true});
+    if(!game){
+      return;
+    }
+    var player1 = Bubbles.find({userId: game.players[0], gameId: game._id}).fetch().length;
+    var player2 = Bubbles.find({userId: game.players[1], gameId: game._id}).fetch().length;
+    var totalPressed = player1 + player2;
+    var winner;
+    if(player1 > player2){
+      winner = "Player 1 Wins!!!";
+    }
+    else if(player2 > player1){
+      winner = "Player 2 Wins!!!";
+    }
+    else{
+      winner = "Tie Game!!!!";
+    }
+    if(totalPressed !== 64){
+      return;
+    }
+    bootbox.alert(winner);
+    Meteor.call('finishGame', game._id)
   }
 });
 
@@ -33,19 +58,18 @@ Template.home.events({
   "click #finishGame": function(){
     var game = Games.findOne({current: true});
     Meteor.call('finishGame', game._id);
-    }
+  }
 });
 
 Template.grid.helpers({
   buttons: function (){
-    console.log('Inside the grid -> button helper');
     var user = Meteor.user();
     if(!user){
-        return;
+      return;
     }
     var game = Games.findOne({players: {$in: [user._id]}, current: true});
     if(!game){
-        return;
+      return;
     }
     return Bubbles.find({gameId: game._id});
   }
@@ -57,5 +81,5 @@ Template.grid.events({
     var _id = clickedElement.attr('button_id');
     Meteor.call('hideButton', _id, Meteor.userId());
   }
-})
+});
 

client/todo.txt

@@ -0,0 +1,5 @@
+Users can't play themselves
+Bubbles need an order
+Add ordering to the Bubble query
+Users need to have a better idea of what a "Game" is <- Developer detail :)
+Client security

main.html

@@ -19,22 +19,21 @@
   <h1> Welcome to bubblePopper</h1>
   <p> Current Game Status:
   {{#if game.active}}
-      <div class='game-in-progress'>Game in progress. <a href="#" id="finishGame">Finish Game</a></div>
-      <center>{{>grid}}</center>
-    {{else}}
-      {{#if game.finished}}
-        Game done or another player left.<a href="#" id="newGame">Start a new game</a>
-    {{else}}
-      Waiting for a new player to login. Find a <a href="#" id="newGame">new game</a>
-    {{/if}}
+  {{endGame}}
+  Game in progress. <a href="#" id="finishGame">Finish Game</a>
+  <div class="score"><center><strong>Player 1</strong>  {{player1Score}}
+  <strong>Player 2</strong>  {{player2Score}}</center>
+  </div>
+  <center>{{>grid}}</center>
+  {{else}}
+  {{#if game.finished}}
+  Game done or another player left.<a href="#" id="newGame">Start a new game</a>
+  {{else}}
+  Waiting for a new player to login. Find a <a href="#" id="newGame">new game</a>
+  {{/if}}
   {{/if}}
-</p>
-<p><strong> Current Game ID: </strong>{{game._id}}</p>
+  </p>
+  <p><strong> Current Game ID: </strong>{{game._id}}</p>
   <p><strong> Current Game Player Count: </strong>{{game.players.length}}</p
-
   <p><strong> Current Game Active: </strong>{{game.active}}</p>
-  <div class="score"><label>Player 1</label>{{player1Score}}</div>
-  <div class="score"><label>Player 2</label>{{player2Score}}</div>
-
-
 </template>

packages/.gitignore

@@ -3,3 +3,4 @@
 /accounts-entry
 /iron-router
 /accounts-ui-bootstrap-dropdown
+/bootboxjs

server/server.js

@@ -2,7 +2,7 @@ Meteor.methods({
   newGame: function() {
     allocateGame(this.userId);
   },
-  finishGame: function(_id) {
+  finishGame: function(_id){
     Games.update({_id: _id}, {$set: {active: false, finished: true}});
   },
   hideButton: function(bubble_id, userId){
@@ -30,7 +30,8 @@ allocateGame = function(userId) {
       Bubbles.insert({gameId: gameId});
     });
 
-  } else {
+  }
+  else {
     console.log("connecting with an existing waiting player");
     Games.update({_id: gameWaiting._id}, {$set: {active: true}, $push: {players: userId}});
   }
@@ -40,17 +41,17 @@ leaveGames = function(userId) {
   console.log("leaving all unfinished games");
   Games.remove({$and: [{players: userId, players: {$size: 1}}]});
   var games = Games.find({$and: [{players: userId, active: true}]});
-  games.forEach(function(game) {
+  games.forEach(function(game){
     Games.update({_id: game._id}, {$set: {active: false, finished: true}});
   })
 };
 
 Meteor.publish('games', function(userId) {
-  if(userId)
+  if(userId){
     return Games.find({players: this.userId});
+  }
 });
 
 Meteor.publish('Bubbles', function(){
-  //Bubbles was bubbles
   return Bubbles.find();
 });

smart.json

@@ -1,6 +1,7 @@
 {
   "packages": {
     "profile-online": {},
-    "accounts-ui-bootstrap-dropdown": {}
+    "accounts-ui-bootstrap-dropdown": {},
+    "bootboxjs": {}
   }
 }

smart.lock

@@ -3,7 +3,8 @@
   "dependencies": {
     "basePackages": {
       "profile-online": {},
-      "accounts-ui-bootstrap-dropdown": {}
+      "accounts-ui-bootstrap-dropdown": {},
+      "bootboxjs": {}
     },
     "packages": {
       "profile-online": {
@@ -15,6 +16,11 @@
         "git": "https://github.com/erobit/meteor-accounts-ui-bootstrap-dropdown.git",
         "tag": "v0.6.5.1",
         "commit": "c8b29d2e7f8611d6dec9d6d23c1c2b94e000b0fb"
+      },
+      "bootboxjs": {
+        "git": "https://github.com/TimHeckel/meteor-bootboxjs.git",
+        "tag": "v3.2.2",
+        "commit": "580adfebfa12b4d2186a80cec1109dab74ad6228"
       }
     }
   }