Fixing bugs by moving routes without having the
config variable populated.
This commit is contained in:
parent
38184e451f
commit
1813c9236e
4 changed files with 16 additions and 6 deletions
14
app.js
14
app.js
|
@ -4,7 +4,6 @@ var path = require('path');
|
||||||
var passport = require('passport');
|
var passport = require('passport');
|
||||||
var Strategy = require('passport-local').Strategy;
|
var Strategy = require('passport-local').Strategy;
|
||||||
var async = require('async');
|
var async = require('async');
|
||||||
var multer = require('multer');
|
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var markdown = require( "markdown" ).markdown;
|
var markdown = require( "markdown" ).markdown;
|
||||||
var moment = require("moment");
|
var moment = require("moment");
|
||||||
|
@ -22,13 +21,15 @@ Category = require('./category.js');
|
||||||
Static = require('./static.js');
|
Static = require('./static.js');
|
||||||
var database = require('./db.js');
|
var database = require('./db.js');
|
||||||
var genPhotos = require('./genPhotos.js');
|
var genPhotos = require('./genPhotos.js');
|
||||||
require('./routes-post.js')(app);
|
|
||||||
require('./routes-photo.js')(app);
|
|
||||||
require('./routes-preview.js')(app);
|
|
||||||
|
|
||||||
// Get config variables
|
// Get config variables
|
||||||
var config = require('./config.js').config;
|
var config = require('./config.js').config;
|
||||||
|
|
||||||
|
// Pull in all our routes.
|
||||||
|
require('./routes-post.js')(app);
|
||||||
|
require('./routes-photo.js')(app);
|
||||||
|
require('./routes-preview.js')(app);
|
||||||
|
|
||||||
// view engine setup
|
// view engine setup
|
||||||
app.set('views', path.join(__dirname, 'views'));
|
app.set('views', path.join(__dirname, 'views'));
|
||||||
app.set('view engine', 'jade');
|
app.set('view engine', 'jade');
|
||||||
|
@ -46,8 +47,9 @@ app.use(require('express-session')({
|
||||||
saveUninitialized: true })
|
saveUninitialized: true })
|
||||||
);
|
);
|
||||||
app.use(express.static(path.join(__dirname, 'public')));
|
app.use(express.static(path.join(__dirname, 'public')));
|
||||||
|
if (app.get('env') === 'development') {
|
||||||
var upload = multer({ dest: config.uploadDir });
|
app.locals.pretty = true;
|
||||||
|
}
|
||||||
|
|
||||||
// Setup authentication via twitter.
|
// Setup authentication via twitter.
|
||||||
passport.use(new Strategy(
|
passport.use(new Strategy(
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
// Routes for photo administration.
|
// Routes for photo administration.
|
||||||
|
var config = require('./config.js').config;
|
||||||
|
var multer = require('multer');
|
||||||
|
var upload = multer({ dest: config.uploadDir });
|
||||||
|
|
||||||
module.exports = function(app) {
|
module.exports = function(app) {
|
||||||
// Photo management Routing
|
// Photo management Routing
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
var config = require('./config.js').config;
|
||||||
|
|
||||||
// Post management routing
|
// Post management routing
|
||||||
|
|
||||||
module.exports = function(app) {
|
module.exports = function(app) {
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
var config = require('./config.js').config;
|
||||||
|
|
||||||
|
|
||||||
module.exports = function (app) {
|
module.exports = function (app) {
|
||||||
|
|
||||||
// Routes for previewing sent versions of the built items.
|
// Routes for previewing sent versions of the built items.
|
||||||
|
|
Loading…
Reference in a new issue