|
@@ -9,6 +9,7 @@ var routes = require('./routes/index');
|
|
|
var users = require('./routes/users');
|
|
|
//HOME PAGE
|
|
|
var home = require('./routes/home');
|
|
|
+var index = require('./routes/index');
|
|
|
//version 1.0
|
|
|
var v1 = require('./routes/v1');
|
|
|
|
|
@@ -16,7 +17,7 @@ var app = express();
|
|
|
|
|
|
// view engine setup
|
|
|
app.set('views', path.join(__dirname, 'views'));
|
|
|
-app.set('view engine', 'jade');
|
|
|
+app.set('view engine', 'pug');
|
|
|
|
|
|
// uncomment after placing your favicon in /public
|
|
|
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
|
|
@@ -28,14 +29,14 @@ app.use(express.static(path.join(__dirname, 'public')));
|
|
|
|
|
|
|
|
|
app.use('/', home);
|
|
|
-
|
|
|
-app.use('/v1',v1);
|
|
|
+app.use('/user', index);
|
|
|
+app.use('/v1', v1);
|
|
|
|
|
|
// catch 404 and forward to error handler
|
|
|
app.use(function(req, res, next) {
|
|
|
- var err = new Error('Not Found');
|
|
|
- err.status = 404;
|
|
|
- next(err);
|
|
|
+ var err = new Error('Not Found');
|
|
|
+ err.status = 404;
|
|
|
+ next(err);
|
|
|
});
|
|
|
|
|
|
// error handlers
|
|
@@ -43,24 +44,24 @@ app.use(function(req, res, next) {
|
|
|
// development error handler
|
|
|
// will print stacktrace
|
|
|
if (app.get('env') === 'development') {
|
|
|
- app.use(function(err, req, res, next) {
|
|
|
- res.status(err.status || 500);
|
|
|
- res.render('error', {
|
|
|
- message: err.message,
|
|
|
- error: err
|
|
|
+ app.use(function(err, req, res, next) {
|
|
|
+ res.status(err.status || 500);
|
|
|
+ res.render('error', {
|
|
|
+ message: err.message,
|
|
|
+ error: err
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
}
|
|
|
|
|
|
// production error handler
|
|
|
// no stacktraces leaked to user
|
|
|
app.use(function(err, req, res, next) {
|
|
|
- res.status(err.status || 500);
|
|
|
- res.render('error', {
|
|
|
- message: err.message,
|
|
|
- error: {}
|
|
|
- });
|
|
|
+ res.status(err.status || 500);
|
|
|
+ res.render('error', {
|
|
|
+ message: err.message,
|
|
|
+ error: {}
|
|
|
+ });
|
|
|
});
|
|
|
|
|
|
|
|
|
-module.exports = app;
|
|
|
+module.exports = app;
|