Merge 7af5200 into d3f873a

app/views/includes/head.jade

@@ -31,8 +31,7 @@ head
         crossorigin="anonymous")
   link(rel='stylesheet', href='https://fonts.googleapis.com/icon?family=Material+Icons')
   link(rel='stylesheet' href='https://fonts.googleapis.com/css?family=Kalam:400,700')
-  link(rel="stylesheet", href="https://fonts.googleapis.com/css?family=Quicksand:300,400,700")  
-  link(rel='stylesheet', href='/lib/bootstrap/css/bootstrap.css')
+  link(rel="stylesheet", href="https://fonts.googleapis.com/css?family=Quicksand:300,400,700") 
   link(rel="stylesheet", href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css")
   link(rel='stylesheet', href='/css/common.css')
   link(rel='stylesheet', href='/css/animate.css')

config/passport.js

@@ -113,7 +113,7 @@ module.exports = function (passport) {
             username: profile.username,
             provider: 'facebook',
             facebook: profile._json, // eslint-disable-line
-            imageUrl: profile._json.picture || profile.json.picture.data.url || profile.photos[0].value // eslint-disable-line
+            imageUrl: profile._json.picture || profile.photos[0].value // eslint-disable-line
           });
           user.save((err) => {
             if (err) console.log(err);

config/socket/socket.js

@@ -19,6 +19,7 @@ module.exports = function (io) {
   const gamesNeedingPlayers = [];
   let userMessage = '';
   let gameID = 0;
+  let onlineUsers = [];
 
   io.sockets.on('connection', (socket) => {
     console.log(`${socket.id} Connected`);
@@ -29,6 +30,35 @@ module.exports = function (io) {
     } else {
       userMessage = 'Join Game';
     };
+
+    // store online users
+    socket.on('connectedUser', (data) => {
+      if (onlineUsers.find(user => user.username === data.user)) {
+        const index = onlineUsers.findIndex(value => value.username === data.user);
+        if (index < 0) {
+          onlineUsers.splice(0,1);
+        }
+        onlineUsers.splice(index, 1);
+      }
+      const user = {
+        userId: socket.id,
+        username: data.user
+      };
+      return onlineUsers.push(user);
+    });
+
+    socket.on('showOnlineUsers', () => {
+      io.sockets.emit('people', onlineUsers)
+    });
+
+    // send invite to player
+    socket.on('invitePlayer', (data) => {
+      if (onlineUsers.find(user => user.username === data.user)) {
+        const socketId = onlineUsers.find(user => user.username === data.user).userId;
+        io.sockets.connected[socketId].emit('invitation', {html:`You have been Invited to play a game.<br/> Click on this <a href=${data.gameLink}>link to join</a>`});
+      }
+    });
+
     socket.emit('id', { id: socket.id, message: userMessage });
 
     socket.on('pickCards', (data) => {
@@ -89,7 +119,6 @@ module.exports = function (io) {
     });
 
     socket.on('disconnect', () => {
-      console.log('Rooms on Disconnect ', io.sockets.manager.rooms);
       exitGame(socket);
     });
   });

package.json

@@ -72,8 +72,8 @@
     "passport-twitter": "^1.0.4",
     "phantomjs": "^2.1.7",
     "sinon": "~1.7.3",
-    "socket.io": "~0.9.16",
-    "socket.io-client": "~0.9.16",
+    "socket.io": "^2.1.0",
+    "socket.io-client": "^2.1.0",
     "underscore": "~1.5.2",
     "view-helpers": "~0.1.3"
   },