Skip to content

Commit a139349

Browse files
committed
es6
1 parent 99bc627 commit a139349

File tree

10 files changed

+123
-90
lines changed

10 files changed

+123
-90
lines changed

app.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
var express = require('express');
2-
var path = require('path');
3-
var logger = require('morgan');
4-
var cookieParser = require('cookie-parser');
5-
var bodyParser = require('body-parser');
6-
var mongoose = require('mongoose');
7-
var news = require('./routes/news');
8-
var user = require('./routes/user');
9-
var test = require('./routes/test');
10-
var passport = require('passport');
11-
var cfg = require("./config/settings.js");
12-
var app = express();
1+
const express = require('express');
2+
const path = require('path');
3+
const logger = require('morgan');
4+
const cookieParser = require('cookie-parser');
5+
const bodyParser = require('body-parser');
6+
const mongoose = require('mongoose');
7+
const news = require('./routes/news');
8+
const user = require('./routes/user');
9+
const test = require('./routes/test');
10+
const passport = require('passport');
11+
const cfg = require("./config/settings.js");
12+
const app = express();
1313

1414
mongoose.connect(cfg.database, {
1515
useMongoClient: true
1616
});
1717

18-
var db = mongoose.connection;
18+
const db = mongoose.connection;
1919
//throw error if db connection issue
2020
db.on('error', console.error.bind(console, 'MongoDB connection error:'));
2121

bin/www

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
* Module dependencies.
55
*/
66

7-
var app = require('../app');
8-
var debug = require('debug')('nodejs-backend:server');
9-
var http = require('http');
7+
const app = require('../app');
8+
const debug = require('debug')('nodejs-backend:server');
9+
const http = require('http');
1010

1111
/**
1212
* Get port from environment and store in Express.
1313
*/
1414

15-
var port = normalizePort(process.env.PORT || '3000');
15+
const port = normalizePort(process.env.PORT || '3000');
1616
app.set('port', port);
1717

1818
/**
1919
* Create HTTP server.
2020
*/
2121

22-
var server = http.createServer(app);
22+
const server = http.createServer(app);
2323

2424
/**
2525
* Listen on provided port, on all network interfaces.
@@ -34,7 +34,7 @@ server.on('listening', onListening);
3434
*/
3535

3636
function normalizePort(val) {
37-
var port = parseInt(val, 10);
37+
const port = parseInt(val, 10);
3838

3939
if (isNaN(port)) {
4040
// named pipe
@@ -58,7 +58,7 @@ function onError(error) {
5858
throw error;
5959
}
6060

61-
var bind = typeof port === 'string'
61+
const bind = typeof port === 'string'
6262
? 'Pipe ' + port
6363
: 'Port ' + port;
6464

@@ -82,8 +82,8 @@ function onError(error) {
8282
*/
8383

8484
function onListening() {
85-
var addr = server.address();
86-
var bind = typeof addr === 'string'
85+
const addr = server.address();
86+
const bind = typeof addr === 'string'
8787
? 'pipe ' + addr
8888
: 'port ' + addr.port;
8989
debug('Listening on ' + bind);

config/auth.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var passport = require('passport');
2-
var cfg = require("./settings.js");
1+
const passport = require('passport');
2+
const cfg = require("./settings.js");
33

44
function isAuth(req, res, next) {
55
// noinspection JSUnresolvedFunction

config/passport.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
var passport = require('passport');
2-
var moduleUser = require('../models/user');
3-
var JwtStrategy = require("passport-jwt").Strategy;
4-
var JwtExtract = require("passport-jwt").ExtractJwt;
5-
var cfg = require("./settings.js");
1+
const passport = require('passport');
2+
const moduleUser = require('../models/user');
3+
const JwtStrategy = require("passport-jwt").Strategy;
4+
const JwtExtract = require("passport-jwt").ExtractJwt;
5+
const cfg = require("./settings.js");
66

77
// noinspection JSUnresolvedFunction
88
/**

lib/rater.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class Rater {
2+
constructor(){
3+
4+
}
5+
}

models/user.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ var userSchema = new Schema({
1515
active: {type: Boolean, default: false}
1616
}, {timestamps: true});
1717

18-
userSchema.plugin(uniqueValidator);
19-
2018
userSchema.pre('save', function (next) {
2119
// because this will not be accessible from inside if nested callback
2220
var user = this;
@@ -39,6 +37,8 @@ userSchema.methods.comparePassword = function (password, cb) {
3937
})
4038
};
4139

40+
userSchema.plugin(uniqueValidator);
41+
4242
module.exports = {
4343
User: mongoose.model('User', userSchema)
4444
};

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"passport": "^0.4.0",
2121
"passport-jwt": "^3.0.1",
2222
"passport-local": "^1.0.0",
23-
"serve-favicon": "^2.4.5"
23+
"serve-favicon": "^2.4.5",
24+
"akin": "latest"
2425
},
2526
"devDependencies": {
2627
"nodemon": "^1.14.11"

routes/news.js

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
var moduleNews = require('../models/news');
2-
var express = require('express');
3-
var router = express.Router();
4-
var promise = require('bluebird');
5-
var auth = require('../config/auth');
6-
var mongoose = require('mongoose');
1+
const moduleNews = require('../models/news');
2+
const express = require('express');
3+
const router = express.Router();
4+
const promise = require('bluebird');
5+
const auth = require('../config/auth');
6+
const mongoose = require('mongoose');
7+
const akin = require('akin');
8+
79

810
mongoose.Promise = promise;
911

10-
var MAX_LIMIT = 12;
12+
const MAX_LIMIT = 12;
1113

12-
var createSlug = function (title) {
14+
const createSlug = function (title) {
1315
return title.replace(/[^\w\s]/gi, '').trim().toLowerCase().replace(/\W+/g, '-');
1416
};
1517

16-
var createSubtitle = function (article) {
18+
const createSubtitle = function (article) {
1719
return article.substring(0, 200).replace(/\r?\n|\r/g, '').trim();
1820
};
1921

2022
// noinspection JSUnresolvedFunction
2123
router.route('/')
2224
//this route will get the data from the data base and respond to the request with required fields
2325
.get(function (req, res) {
24-
var page = Math.max(1, parseInt(req.query.page)); //used by skip for skipping the already loaded news
25-
var source = req.query.source;
26+
const page = Math.max(1, parseInt(req.query.page)); //used by skip for skipping the already loaded news
27+
const source = req.query.source;
2628
if (source) {
2729
moduleNews.News
2830
.find({published: true, deleted: false, source: source})
@@ -57,7 +59,7 @@ router.route('/')
5759
// });
5860
// } else
5961
if (req.body.title && req.body.source) {
60-
var params = {};
62+
const params = {};
6163
params.title = req.body.title;
6264
params.source = req.body.source;
6365
if (req.body.cover) params.cover = req.body.cover;
@@ -70,7 +72,7 @@ router.route('/')
7072
params.published = true;
7173
params.deleted = false;
7274

73-
var news = new moduleNews.News(params);
75+
const news = new moduleNews.News(params);
7476
news.save(function (err) {
7577
if (err)
7678
res.status(400).json({
@@ -100,7 +102,7 @@ router.route('/trending')
100102

101103
router.route('/:id')
102104
.get(function (req, res) {
103-
var id = req.params.id;
105+
const id = req.params.id;
104106
if (id) {
105107
moduleNews.News
106108
//this will find the specific news using the ID associated with it and return all fields
@@ -109,6 +111,7 @@ router.route('/:id')
109111
.then(function (result) {
110112
//checks if result obtained and then return status 200 or return status 400
111113
if (result) {
114+
akin.activity.log(1, id, 'news', 'view');
112115
res.status(200).json(result);
113116
}
114117
else {
@@ -131,10 +134,10 @@ router.route('/:id')
131134
res.sendStatus(201);
132135
})
133136
.delete(auth.isAuth, function (req, res) {
134-
var id = req.param.id;
137+
const id = req.param.id;
135138
if (id) {
136139
moduleNews.News
137-
.fineOneAndUpdate({_id: id}, {hidden: true})
140+
.findOneAndUpdate({_id: id}, {hidden: true})
138141
.exec()
139142
.then(function (result) {
140143
if (result) {
@@ -157,8 +160,8 @@ router.route('/:id')
157160
router.route('/:id/save')
158161
.get(function (req, res) {
159162
// noinspection JSUnresolvedVariable
160-
var savecheck = req.query.savecheck;
161-
var id = req.params.id;
163+
const savecheck = req.query.savecheck;
164+
const id = req.params.id;
162165
if (savecheck === 'true') {
163166
if (id) {
164167
moduleNews.News

routes/test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
var moduleNews = require('../models/news');
2-
var express = require('express');
3-
var promise = require('bluebird');
4-
var router = express.Router();
5-
var mongoose = require('mongoose');
1+
const moduleNews = require('../models/news');
2+
const express = require('express');
3+
const promise = require('bluebird');
4+
const router = express.Router();
5+
const mongoose = require('mongoose');
66

77
mongoose.Promise = promise;
88

@@ -17,7 +17,7 @@ test with a b c
1717
*/
1818
/*
1919
//still need to check similarity
20-
var noDuplicates = function (var inpArr)
20+
const noDuplicates = function (const inpArr)
2121
{
2222
//sort strings
2323
//inpArr.sort();

0 commit comments

Comments
 (0)