Updated deps. Changed absolute links

Author: timatooth

package.json

@@ -1,19 +1,21 @@
 {
-    "name": "node-multidraw",
-    "description": "A multi-user drawing app",
-    "repository": "https://github.com/timatooth/node-multidraw",
-    "readme": "See README file",
-    "version": "0.5.0",
-    "dependencies": {
-	"express": "3.16.x",
-	"jade": "1.6.x",
-	"socket.io": "1.0.6",
-        "redis": "0.12.x",
-	"lzwcompress": "0.1.x",
-	"node-minify": "0.10.x"
-    },
-    "engines": {
-	"node": "0.10.x",
-	"npm": "1.2.x"
-    }
+  "name": "node-multidraw",
+  "description": "A multi-user drawing app",
+  "repository": "https://github.com/timatooth/node-multidraw",
+  "readme": "See README file",
+  "version": "0.5.0",
+  "dependencies": {
+    "express": "4.1.x",
+    "jade": "1.8.x",
+    "socket.io": "1.2.x",
+    "redis": "0.12.x",
+    "lzwcompress": "0.1.x",
+    "node-minify": "1.0.x",
+    "compression": "1.2.x",
+    "morgan": "~1.5.0"
+  },
+  "engines": {
+    "node": "0.10.x",
+    "npm": "1.3.x"
+  }
 }

server.js

@@ -2,6 +2,8 @@ var port = process.env.PORT || 5000;
 console.log("Listening on port " + port);
 var http = require('http')
 var express = require('express'), app = express();
+var morgan = require('morgan'); //http logger module
+var compression = require('compression')
 var server = http.createServer(app).listen(port);
 var jade = require('jade');
 var io = require('socket.io').listen(server);
@@ -18,8 +20,7 @@ var netUsage = 0;
 //compress all JS into one file on startup
 new compressor.minify({
     type: 'uglifyjs',
-    fileIn: ['public/socket.io-1.0.6.min.js',
-	     'public/alertify.min.js',
+    fileIn: ['public/alertify.min.js',
 	     'public/jquery.hammer.min.js',
 	     'public/lzwCompress.js',
 	     'public/draw.js'
@@ -47,19 +48,26 @@ new compressor.minify({
     }
 });
 
-app.use(express.compress());
+app.use(compression())
 app.use(express.static(__dirname + '/public', {maxAge: 60*60*24*1000}));
-app.use(express.logger());
+app.use(morgan('dev'));
 
 app.set('views', __dirname + '/views');
 app.set('view engine', 'jade');
 app.set('view options', {layout: false });
 app.enable('trust proxy');
 
+/* Main 'lobby' canvas */
 app.get('/', function(req, res){
     res.render('main.jade');
 });
 
+/* User canvas */
+app.get("/c/:canvasname", function (req, res, next) {
+    res.render('main.jade');
+});
+
+
 redisClient.on("error", function(err){
     console.log("Redis Error: " + err);
 });

views/main.jade

@@ -10,7 +10,7 @@ html
     meta(property="og:image:width" content="1600")
     meta(property="og:image:height" content="1000")
     meta(property="og:description" content="Draw with everyone else online in realtime!")
-    link(rel="stylesheet" href="style.min.css")
+    link(rel="stylesheet" href="/style.min.css")
   body
     div#colourPanel
       div#colourPanelTab C
@@ -44,4 +44,5 @@ html
         p Source code on <a href="https://github.com/timatooth/node-multidraw">GitHub</a>
     input(type="text" id="chatBox" placeholder="Chat" maxlength="135")
     script(src="//code.jquery.com/jquery-2.1.1.min.js")
-    script(src="draw.min.js")
+    script(src="/socket.io/socket.io.js")
+    script(src="/draw.min.js")