diff --git a/templates/js/app.js.ejs b/templates/js/app.js.ejs index 2ef75aec..192cccd1 100644 --- a/templates/js/app.js.ejs +++ b/templates/js/app.js.ejs @@ -1,51 +1,83 @@ -<% if (view) { -%> -var createError = require('http-errors'); -<% } -%> -var express = require('express'); -var path = require('path'); -<% Object.keys(modules).sort().forEach(function (variable) { -%> -var <%- variable %> = require('<%- modules[variable] %>'); -<% }); -%> - -<% Object.keys(localModules).sort().forEach(function (variable) { -%> -var <%- variable %> = require('<%- localModules[variable] %>'); -<% }); -%> - -var app = express(); - -<% if (view) { -%> -// view engine setup -<% if (view.render) { -%> -app.engine('<%- view.engine %>', <%- view.render %>); -<% } -%> -app.set('views', path.join(__dirname, 'views')); -app.set('view engine', '<%- view.engine %>'); - -<% } -%> -<% uses.forEach(function (use) { -%> -app.use(<%- use %>); -<% }); -%> - -<% mounts.forEach(function (mount) { -%> -app.use(<%= mount.path %>, <%- mount.code %>); -<% }); -%> - -<% if (view) { -%> -// catch 404 and forward to error handler -app.use(function(req, res, next) { - next(createError(404)); -}); - -// error handler -app.use(function(err, req, res, next) { - // set locals, only providing error in development - res.locals.message = err.message; - res.locals.error = req.app.get('env') === 'development' ? err : {}; - - // render the error page - res.status(err.status || 500); - res.render('error'); -}); - -<% } -%> -module.exports = app; +< % +if (view) { + - % > + const createError = require('http-errors'); < + % +} - % > +const express = require('express'); +const path = require('path'); < +% +Object.keys(modules).sort().forEach(variable => { + - % > + const < % -variable % > = require('<%- modules[variable] %>'); < + % +}); - % > + +< +% +Object.keys(localModules).sort().forEach(variable => { + - % > + const < % -variable % > = require('<%- localModules[variable] %>'); < + % +}); - % > + +const app = express(); + +< +% +if (view) { + - % > + // view engine setup + < + % + if (view.render) { + - % > + app.engine('<%- view.engine %>', < % -view.render % > ); < + % + } - % > + app.set('views', path.join(__dirname, 'views')); + app.set('view engine', '<%- view.engine %>'); + + < + % +} - % > +< +% +uses.forEach(use => { + - % > + app.use( < % -use % > ); < + % +}); - % > + +< +% +mounts.forEach(mount => { + - % > + app.use( < %= mount.path % > , < % -mount.code % > ); < + % +}); - % > + +< +% +if (view) { + - % > + // catch 404 and forward to error handler + app.use((req, res, next) => { + next(createError(404)); + }); + + // error handler + app.use((err, req, res, next) => { + // set locals, only providing error in development + res.locals.message = err.message; + res.locals.error = req.app.get('env') === 'development' ? err : {}; + + // render the error page + res.status(err.status || 500); + res.render('error'); + }); + + < + % +} - % > +module.exports = app; \ No newline at end of file diff --git a/templates/js/routes/index.js b/templates/js/routes/index.js index ecca96a5..23abd95c 100644 --- a/templates/js/routes/index.js +++ b/templates/js/routes/index.js @@ -1,9 +1,11 @@ -var express = require('express'); -var router = express.Router(); +const express = require('express'); +const router = express.Router(); /* GET home page. */ -router.get('/', function(req, res, next) { - res.render('index', { title: 'Express' }); +router.get('/', (req, res, next) => { + res.render('index', { + title: 'Express' + }); }); -module.exports = router; +module.exports = router; \ No newline at end of file diff --git a/templates/js/routes/users.js b/templates/js/routes/users.js index 623e4302..76b380cf 100644 --- a/templates/js/routes/users.js +++ b/templates/js/routes/users.js @@ -1,9 +1,9 @@ -var express = require('express'); -var router = express.Router(); +const express = require('express'); +const router = express.Router(); /* GET users listing. */ -router.get('/', function(req, res, next) { +router.get('/', (req, res, next) => { res.send('respond with a resource'); }); -module.exports = router; +module.exports = router; \ No newline at end of file