diff --git a/app/controllers/index.js b/app/controllers/index.js index 1e34bd9..f71d55c 100644 --- a/app/controllers/index.js +++ b/app/controllers/index.js @@ -1,5 +1,5 @@ 'use strict'; exports.render = function(req, res) { - res.render('index'); + res.render('index'); }; diff --git a/config/config.js b/config/config.js index b4b4230..2f0e7c9 100644 --- a/config/config.js +++ b/config/config.js @@ -5,5 +5,5 @@ var _ = require('lodash'); // Load app configuration module.exports = _.extend( - require(__dirname + '/../config/env/all.js'), - require(__dirname + '/../config/env/' + process.env.NODE_ENV + '.js') || {}); + require(__dirname + '/../config/env/all.js'), + require(__dirname + '/../config/env/' + process.env.NODE_ENV + '.js') || {}); diff --git a/config/env/all.js b/config/env/all.js index 22d15f7..7f53a56 100755 --- a/config/env/all.js +++ b/config/env/all.js @@ -4,7 +4,7 @@ var path = require('path'), rootPath = path.normalize(__dirname + '/../..'); module.exports = { - root: rootPath, - port: process.env.PORT || 3000, - db: process.env.MONGOHQ_URL + root: rootPath, + port: process.env.PORT || 3000, + db: process.env.MONGOHQ_URL } diff --git a/config/env/development.js b/config/env/development.js index b0a4665..0ef298c 100755 --- a/config/env/development.js +++ b/config/env/development.js @@ -1,8 +1,8 @@ 'use strict'; module.exports = { - db: "mongodb://localhost/mystery-dev", - app: { - name: "Mystery - Development" - } + db: "mongodb://localhost/mystery-dev", + app: { + name: "Mystery - Development" + } } \ No newline at end of file diff --git a/config/env/production.js b/config/env/production.js index 9bc30bc..5d2c3b4 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -1,8 +1,8 @@ 'use strict'; module.exports = { - db: "mongodb://localhost/mystery", - app: { - name: "Mystery - Production" - } + db: "mongodb://localhost/mystery", + app: { + name: "Mystery - Production" + } } \ No newline at end of file diff --git a/config/env/test.js b/config/env/test.js index 7b30a47..dabf602 100755 --- a/config/env/test.js +++ b/config/env/test.js @@ -1,9 +1,9 @@ 'use strict'; module.exports = { - db: "mongodb://localhost/mystery-test", - port: 3001, - app: { - name: "Mystery - Test" - } + db: "mongodb://localhost/mystery-test", + port: 3001, + app: { + name: "Mystery - Test" + } } \ No newline at end of file diff --git a/config/express.js b/config/express.js index 08343fe..1abe190 100644 --- a/config/express.js +++ b/config/express.js @@ -4,66 +4,66 @@ * Module dependencies. */ var express = require('express'), - config = require('./config'); + config = require('./config'); module.exports = function(app, passport, db) { - app.set('showStackError', true); + app.set('showStackError', true); - //Prettify HTML - app.locals.pretty = true; + //Prettify HTML + app.locals.pretty = true; - //Should be placed before express.static - app.use(express.compress({ - filter: function(req, res) { - return (/json|text|javascript|css/).test(res.getHeader('Content-Type')); - }, - level: 9 - })); + //Should be placed before express.static + app.use(express.compress({ + filter: function(req, res) { + return (/json|text|javascript|css/).test(res.getHeader('Content-Type')); + }, + level: 9 + })); - //Set views path, template engine and default layout - app.set('views', config.root + '/app/views'); - app.set('view engine', 'jade'); + //Set views path, template engine and default layout + app.set('views', config.root + '/app/views'); + app.set('view engine', 'jade'); - //Enable jsonp - app.enable("jsonp callback"); + //Enable jsonp + app.enable("jsonp callback"); - app.configure(function() { - //cookieParser should be above session - app.use(express.cookieParser()); + app.configure(function() { + //cookieParser should be above session + app.use(express.cookieParser()); - // request body parsing middleware should be above methodOverride - app.use(express.urlencoded()); - app.use(express.json()); - app.use(express.methodOverride()); + // request body parsing middleware should be above methodOverride + app.use(express.urlencoded()); + app.use(express.json()); + app.use(express.methodOverride()); - //routes should be at the last - app.use(app.router); - - //Setting the fav icon and static folder - app.use(express.favicon()); - app.use(express.static(config.root + '/public')); + //routes should be at the last + app.use(app.router); - //Assume "not found" in the error msgs is a 404. this is somewhat silly, but valid, you can do whatever you like, set properties, use instanceof etc. - app.use(function(err, req, res, next) { - //Treat as 404 - if (~err.message.indexOf('not found')) return next(); + //Setting the fav icon and static folder + app.use(express.favicon()); + app.use(express.static(config.root + '/public')); - //Log it - console.error(err.stack); + //Assume "not found" in the error msgs is a 404. this is somewhat silly, but valid, you can do whatever you like, set properties, use instanceof etc. + app.use(function(err, req, res, next) { + //Treat as 404 + if (~err.message.indexOf('not found')) return next(); - //Error page - res.status(500).render('500', { - error: err.stack - }); - }); - - //Assume 404 since no middleware responded - app.use(function(req, res, next) { - res.status(404).render('404', { - url: req.originalUrl, - error: 'Not found' - }); - }); + //Log it + console.error(err.stack); + //Error page + res.status(500).render('500', { + error: err.stack + }); }); + + //Assume 404 since no middleware responded + app.use(function(req, res, next) { + res.status(404).render('404', { + url: req.originalUrl, + error: 'Not found' + }); + }); + + }); }; \ No newline at end of file diff --git a/config/routes.js b/config/routes.js index 9fbf748..af9c691 100644 --- a/config/routes.js +++ b/config/routes.js @@ -2,8 +2,8 @@ module.exports = function(app) { - //Home route - var index = require('../app/controllers/index'); - app.get('/', index.render); + //Home route + var index = require('../app/controllers/index'); + app.get('/', index.render); }; diff --git a/server.js b/server.js index 68bb10f..de2a349 100644 --- a/server.js +++ b/server.js @@ -4,7 +4,7 @@ * Module dependencies. */ var express = require('express'), - fs = require('fs'); + fs = require('fs'); /** * Main application entry file. @@ -14,9 +14,9 @@ var express = require('express'), //Set the node enviornment variable if not set before process.env.NODE_ENV = process.env.NODE_ENV || 'development'; -//Initializing system variables +//Initializing system variables var config = require('./config/config'), - mongoose = require('mongoose'); + mongoose = require('mongoose'); //Bootstrap db connection var db = mongoose.connect(config.db); @@ -24,17 +24,17 @@ var db = mongoose.connect(config.db); //Bootstrap models var models_path = __dirname + '/app/models'; var walk = function(path) { - fs.readdirSync(path).forEach(function(file) { - var newPath = path + '/' + file; - var stat = fs.statSync(newPath); - if (stat.isFile()) { - if (/(.*)\.(js$|coffee$)/.test(file)) { - require(newPath); - } - } else if (stat.isDirectory()) { - walk(newPath); - } - }); + fs.readdirSync(path).forEach(function(file) { + var newPath = path + '/' + file; + var stat = fs.statSync(newPath); + if (stat.isFile()) { + if (/(.*)\.(js$|coffee$)/.test(file)) { + require(newPath); + } + } else if (stat.isDirectory()) { + walk(newPath); + } + }); }; walk(models_path);