Merge pull request #23 from jenjaina/show_users

Display list of current users; use browserify

.gitignore

@@ -0,0 +1 @@
+node_modules/*

app.js

@@ -1,19 +1,20 @@
 // app.js
-     
+
 var express = require('express'),
     app = express(),
     server = require('http').createServer(app),
-    io = require('socket.io').listen(server);
+    io = require('socket.io').listen(server),
+    _ = require('underscore');
 
 var port = process.env.PORT;
-     
+
 app.use(express.static(__dirname + '/site')); // + '/public'));
 
 io.sockets.on('connection', function(socket) {
     socket.on('createCard', function (data) {
         socket.broadcast.emit('onCardCreated', data);
     });
-    
+
     socket.on('deleteCards', function () {
         socket.broadcast.emit('onCardsDeleted');
     });
@@ -28,16 +29,20 @@ io.sockets.on('connection', function(socket) {
 
     socket.on('onCardsChanged', function (data) {
         socket.broadcast.emit('onCardsChanged', data);
-    })
+    });
 
     socket.on('setLeader', function () {
         socket.broadcast.emit('onLeaderSet');
     });
 
     socket.on('resetLeader', function () {
         socket.broadcast.emit('onLeaderReset');
-    })
+    });
+
+    socket.on('addUser', function (data) {
+        socket.broadcast.emit('onUserAdded', data);
+    });
 });
-     
+
 // A.3
 server.listen(port);

package.json

@@ -1,21 +1,25 @@
 {
-    "name": "planning-poker",
-    "description": "JRS Planning Poker",
-    "version": "0.0.1",
-	"main": "app.js",
-    "private": true,
-    "dependencies": {
-        "express": "3.x",
-        "socket.io": "0.9.x"
-    },
-    "scripts": {
-        "start": "app.js"
-    },
-    "engines": {
-        "node": "0.8.x"
-    },
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/jenjaina/planning-poker.git"
-	}
-}
+  "name": "planning-poker",
+  "description": "JRS Planning Poker",
+  "version": "0.0.1",
+  "main": "app.js",
+  "private": true,
+  "dependencies": {
+    "express": "3.x",
+    "socket.io": "0.9.x",
+    "underscore": "^1.8.3"
+  },
+  "devDependencies": {
+    "browserify": "~11.0.1"
+  },
+  "scripts": {
+    "start": "app.js"
+  },
+  "engines": {
+    "node": "0.8.x"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jenjaina/planning-poker.git"
+  }
+}