Skip to content
This repository was archived by the owner on Mar 7, 2019. It is now read-only.

Commit 6a56450

Browse files
committed
Refactoring, Updated dependencies
1 parent c197f40 commit 6a56450

File tree

3 files changed

+36
-30
lines changed

3 files changed

+36
-30
lines changed

server.js renamed to index.js

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
'use strict';
22

33
// Imports
4-
let express = require('express');
5-
let exphbs = require('express-handlebars');
6-
let mongoose = require('mongoose');
7-
let bodyParser = require('body-parser');
8-
let cookieParser = require('cookie-parser');
9-
let jwt = require('jsonwebtoken');
10-
let morgan = require('morgan');
4+
const express = require('express');
5+
const exphbs = require('express-handlebars');
6+
const bodyParser = require('body-parser');
7+
const cookieParser = require('cookie-parser');
8+
const jwt = require('jsonwebtoken');
9+
const morgan = require('morgan');
10+
11+
// Database
12+
const db = require('./server/database');
1113

1214
// Collections
1315
let User = require('./models/users');
@@ -39,16 +41,6 @@ let hbs = exphbs.create({
3941

4042
app.engine('.hbs', hbs.engine);
4143
app.set('view engine', '.hbs');
42-
//app.enable('view cache');
43-
44-
// Mongoose
45-
// Config
46-
mongoose.connect('mongodb://localhost/zwitter');
47-
let db = mongoose.connection;
48-
db.on('error', console.error.bind(console, 'connection error:'));
49-
db.once('open', function () {
50-
console.log('LOGGED | MongoDB Connected - ' + new Date());
51-
});
5244

5345
// Router
5446
let routerPublic = express.Router();
@@ -203,10 +195,10 @@ app.use(routerPublic);
203195
app.use(routerLoggedin);
204196

205197
// Boot Server
206-
let server = app.listen(3000, () => {
207-
let host = server.address().address;
198+
let index = app.listen(3000, () => {
199+
let host = index.address().address;
208200

209-
let port = server.address().port;
201+
let port = index.address().port;
210202

211203
console.log('Server running on http://%s:%s', host, port);
212-
});
204+
});

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
"main": "index.js",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1",
8-
"start": "nodemon server.js"
8+
"start": "nodemon index.js"
99
},
1010
"author": "",
1111
"license": "ISC",
1212
"repository": {
1313
"type": "git",
14-
"url": "git://github.com/atulmy/nodejs-zwitter.git"
14+
"url": "git://github.com/atulmy/node-express-handlebars-zwitter"
1515
},
1616
"dependencies": {
17-
"body-parser": "^1.15.2",
17+
"body-parser": "^1.18.2",
1818
"cookie-parser": "^1.4.3",
19-
"express": "^4.14.0",
19+
"express": "^4.16.3",
2020
"express-handlebars": "^3.0.0",
21-
"jsonwebtoken": "^8.1.1",
22-
"moment": "^2.14.1",
23-
"mongoose": "^5.0.4",
24-
"morgan": "^1.7.0",
25-
"nodemon": "^1.10.0"
21+
"jsonwebtoken": "^8.2.1",
22+
"moment": "^2.22.1",
23+
"mongoose": "^5.0.17",
24+
"morgan": "^1.9.0",
25+
"nodemon": "^1.17.4"
2626
}
2727
}

server/database.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
let mongoose = require('mongoose');
4+
5+
// Mongoose
6+
// Config
7+
mongoose.connect('mongodb://localhost/zwitter');
8+
let db = mongoose.connection;
9+
db.on('error', console.error.bind(console, 'connection error:'));
10+
db.once('open', function () {
11+
console.log('LOGGED | MongoDB Connected - ' + new Date());
12+
});
13+
14+
module.exports = db;

0 commit comments

Comments
 (0)