Merge branch 'master' of https://github.com/nature/pa11y-dashboard

Conflicts:
	public/css/main.css

.gitignore

@@ -6,3 +6,6 @@ config/production.json
 # Generated npm files
 node_modules
 npm-debug.log
+
+# Generated CSS files
+public/css

app.js

@@ -5,6 +5,7 @@ var EventEmitter = require('events').EventEmitter;
 var express = require('express');
 var hbs = require('express-hbs');
 var http = require('http');
+var lessMiddleware = require('less-middleware');
 
 module.exports = initApp;
 
@@ -17,11 +18,19 @@ function initApp (config, callback) {
 	app.server = http.createServer(app.express);
 	app.webservice = createClient(config.webservice);
 
-	// Express config
+	// Public files
-	app.express.disable('x-powered-by');
+	app.express.use(lessMiddleware({
+		src: __dirname + '/public/less',
+		dest: __dirname + '/public/css',
+		prefix: '/css',
+		yuicompress: true
+	}));
 	app.express.use(express.static(__dirname + '/public', {
 		maxAge: (process.env.NODE_ENV === 'production' ? 604800 : 0)
 	}));
+
+	// General express config
+	app.express.disable('x-powered-by');
 	app.express.use(express.compress());
 	app.express.use(express.bodyParser());
 
@@ -65,6 +74,9 @@ function initApp (config, callback) {
 	});
 	app.express.use(function (err, req, res, next) {
 		/* jshint unused: false */
+		if (err.code === 'ECONNREFUSED') {
+			err = new Error('Could not connect to pa11y-webservice');
+		}
 		app.emit('route-error', err);
 		if (process.env.NODE_ENV !== 'production') {
 			res.locals.error = err;

index.js

@@ -11,9 +11,11 @@ require('./app')(config, function (err, app) {
 	console.log(chalk.grey('uri:  %s'), app.address);
 
 	app.on('route-error', function (err) {
-		if (err.code === 'ECONNREFUSED') {
+		var stack = (err.stack ? err.stack.split('\n') : [err.message]);
-			console.log(chalk.red('Error: could not connect to pa11y-webservice'));
+		var msg = chalk.red(stack.shift());
-		}
+		console.error('');
+		console.error(msg);
+		console.error(chalk.grey(stack.join('\n')));
 	});
 
 });

package.json

@@ -24,6 +24,7 @@
 		"chalk": "~0.2",
 		"express": "~3.4",
 		"express-hbs": "~0.2",
+		"less-middleware": "~0.1",
 		"moment": "~2.2",
 		"pa11y-webservice-client-node": "git+ssh://git@github.com:nature/pa11y-webservice-client-node.git#1.0.0-beta.3",
 		"underscore": "~1.5"