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

Basic changes are made #320

Closed
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
14 changes: 8 additions & 6 deletions templates/js/app.js.ejs
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
'use strict';

<% if (view) { -%>
var createError = require('http-errors');
const createError = require('http-errors');
<% } -%>
var express = require('express');
var path = require('path');
const express = require('express');
const path = require('path');
<% Object.keys(modules).sort().forEach(function (variable) { -%>
var <%- variable %> = require('<%- modules[variable] %>');
const <%- variable %> = require('<%- modules[variable] %>');
<% }); -%>

<% Object.keys(localModules).sort().forEach(function (variable) { -%>
var <%- variable %> = require('<%- localModules[variable] %>');
const <%- variable %> = require('<%- localModules[variable] %>');
<% }); -%>

var app = express();
const app = express();

<% if (view) { -%>
// view engine setup
Expand Down
12 changes: 9 additions & 3 deletions templates/js/routes/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
var express = require('express');
var router = express.Router();
'use strict';

const express = require('express');
const router = express.Router();

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

module.exports = router;
12 changes: 9 additions & 3 deletions templates/js/routes/users.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
var express = require('express');
var router = express.Router();
'use strict';

const express = require('express');
const router = express.Router();

/* GET users listing. */
router.get('/', function(req, res, next) {
res.send('respond with a resource');
try {
return res.send('respond with a resource');
} catch (error) {
next(error);
}
});

module.exports = router;
18 changes: 9 additions & 9 deletions templates/js/www.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
* Module dependencies.
*/

var app = require('../app');
var debug = require('debug')('<%- name %>:server');
var http = require('http');
const app = require('../app');
const debug = require('debug')('<%- name %>:server');
const http = require('http');

/**
* Get port from environment and store in Express.
*/

var port = normalizePort(process.env.PORT || '3000');
const port = normalizePort(process.env.PORT || '3000');
app.set('port', port);

/**
* Create HTTP server.
*/

var server = http.createServer(app);
const server = http.createServer(app);

/**
* Listen on provided port, on all network interfaces.
Expand All @@ -34,7 +34,7 @@ server.on('listening', onListening);
*/

function normalizePort(val) {
var port = parseInt(val, 10);
const port = parseInt(val, 10);

if (isNaN(port)) {
// named pipe
Expand All @@ -58,7 +58,7 @@ function onError(error) {
throw error;
}

var bind = typeof port === 'string'
const bind = typeof port === 'string'
? 'Pipe ' + port
: 'Port ' + port;

Expand All @@ -82,8 +82,8 @@ function onError(error) {
*/

function onListening() {
var addr = server.address();
var bind = typeof addr === 'string'
const addr = server.address();
const bind = typeof addr === 'string'
? 'pipe ' + addr
: 'port ' + addr.port;
debug('Listening on ' + bind);
Expand Down
Loading