Skip to content
Merged
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
6 changes: 3 additions & 3 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ var path = require('path');
var cookieParser = require('cookie-parser');
var logger = require('morgan');

var indexRouter = require('./routes/index');
var usersRouter = require('./routes/users');
var indexRouter = require('./app_server/routes/index');
var usersRouter = require('./app_server/routes/users');

var app = express();

// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('views', path.join(__dirname, 'app_server', 'views'));
app.set('view engine', 'hbs');

app.use(logger('dev'));
Expand Down
5 changes: 5 additions & 0 deletions app_server/controllers/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const index = (req, res) => {
res.render('index', {title: 'Travlr Getaways'});
};

module.exports = {index};
5 changes: 2 additions & 3 deletions routes/index.js → app_server/routes/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
var express = require('express');
var router = express.Router();
const controller = require('../controllers/main');

/* GET home page. */
router.get('/', function(req, res, next) {
res.render('index', { title: 'Express' });
});
router.get('/', controller.index);

module.exports = router;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading