Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update repo to work with express 3.0 #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 33 additions & 24 deletions app-simple.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
var express = require('express');
var ArticleProvider = require('./articleprovider-mongodb').ArticleProvider;
var express = require('express'),
ArticleProvider = require('./articleprovider-mongodb').ArticleProvider,
bodyParser = require('body-parser'),
methodOverride = require('method-override');

var app = module.exports = express();
app = module.exports = express(),
env = process.env.NODE_ENV || 'development';

app.configure(function(){
app.set('views', __dirname + '/views');
app.set('view engine', 'jade');
app.set('view options', { layout: false });
app.use(express.bodyParser());
app.use(express.methodOverride());
app.use(require('stylus').middleware({ src: __dirname + '/xtyle' }));
app.use(app.router);
app.use(express.static(__dirname + '/xtyle'));
});

app.configure('development', function(){
app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
});
app.set('views', __dirname + '/views');
app.set('view engine', 'jade');
app.set('view options', { layout: false });
app.use(bodyParser());
app.use(methodOverride());
app.use(require('stylus').middleware({ src: __dirname + '/xtyle' }));
app.use(express.static(__dirname + '/xtyle'));
app.use(clientErrorHandler);
app.use(errorHandler);

app.configure('production', function(){
app.use(express.errorHandler());
});

function clientErrorHandler(err, req, res, next) {
if (req.xhr) {
res.status(500).send({ error: 'Something blew up!' });
} else {
next(err);
}
}

function errorHandler(err, req, res, next) {
res.status(500);
res.render('error', { error: err });
}

//var articleProvider= new ArticleProvider();
var articleProvider = new ArticleProvider('localhost', 27017);
Expand All @@ -32,11 +41,11 @@ app.get('/', function(req, res){
title : 'Recent posts',
articles : docs
});
})
});
});

/*app.get('/blog/new', function(req, res) {
res.render('blog_new.jade',
res.render('blog_new.jade',
{
title: 'New Post'
});
Expand All @@ -48,10 +57,10 @@ app.post('/', function(req, res){
title: req.param('title'),
body: req.param('body')
}, function( error, docs) {
res.redirect('/')
res.redirect('/');
});
}else{
res.redirect('/')
res.redirect('/');
}
});

Expand Down Expand Up @@ -82,4 +91,4 @@ app.post('/blog/addComment', function(req, res) {
app.listen(4040);

//console.log("Express server listening on port %d in %s mode", 4040, app.settings.env);
console.log("Server running at: http://0.0.0.0:%d", 4040);
console.log("Server running at: http://0.0.0.0:%d", 4040);
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@
, "redis" : ">=0.8.1"
, "jade" : ">=0.28.0"
, "mongodb" : ">=1.2.12"
, "body-parser": ">=1.9.0"
, "method-override": ">=2.2.0"
}
}
}
2 changes: 1 addition & 1 deletion views/layout.jade
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!!!
doctype
html.responsive
head
title= title
Expand Down