Skip to content

Commit 1bb2c64

Browse files
playing with eslint CLI, removed more garbage assets
1 parent 50706bf commit 1bb2c64

11 files changed

Lines changed: 267 additions & 250 deletions

File tree

.eslintrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99
"parserOptions": {
1010
"sourceType": "module",
1111
"allowImportExportEverywhere": true
12+
},
13+
"rules":{
14+
"no-console": 0
1215
}
1316
}

src/app.js

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
const express = require('express');
22
const path = require('path');
3-
const favicon = require('serve-favicon');
43
const logger = require('morgan');
54
const cookieParser = require('cookie-parser');
65
const bodyParser = require('body-parser');
76
const mongoose = require('mongoose');
87
const seeder = require('mongoose-seed');
98
const data = require('./data/data.json');
10-
const User = require('./models/user');
11-
const Course = require('./models/course');
12-
const Review = require('./models/review');
139
const session = require('express-session');
1410
const MongoStore = require('connect-mongo')(session);
1511

@@ -19,32 +15,33 @@ const dbConfig = config.get('DBHost');
1915
const course = require('./routes/course');
2016
const user = require('./routes/user');
2117
const app = express();
22-
//process.setMaxListeners(11);
18+
// process.setMaxListeners(11);
2319

24-
//const env = process.env.NODE_ENV || 'dev';
20+
// const env = process.env.NODE_ENV || 'dev';
2521

26-
//mongoDb Connection
22+
// mongoDb Connection
2723
mongoose.connect(dbConfig);
2824

2925
const db = mongoose.connection;
26+
3027
db.on('error', console.error.bind(console, 'connection error:'));
3128

32-
db.on('connected', function() {
33-
seeder.connect(dbConfig, function(){
34-
console.log("seeder connected to Database "+dbConfig);
29+
db.on('connected', function () {
30+
seeder.connect(dbConfig, function () {
31+
console.log('seeder connected to Database ' + dbConfig);
3532
// Load Mongoose models
3633
seeder.loadModels([
37-
__dirname+'/models/user',
38-
__dirname+'/models/course',
39-
__dirname+'/models/review'
34+
path.join(__dirname, '/models/user'),
35+
path.join(__dirname, '/models/course'),
36+
path.join(__dirname, '/models/review')
4037
]);
4138
// Clear specified collections
42-
seeder.clearModels(['User', 'Course', 'Review'], function() {
39+
seeder.clearModels(['User', 'Course', 'Review'], function () {
4340
// Callback to populate DB once collections have been cleared
44-
seeder.populateModels(data, function() {
45-
console.log("Finished seeding Database!");
46-
47-
app.emit("appStarted"); //Emits an event to tell our tests it is ok to now test.
41+
seeder.populateModels(data, function () {
42+
console.log('Finished seeding Database!');
43+
44+
app.emit('appStarted'); // Emits an event to tell our tests it is ok to now test.
4845
});
4946
});
5047
});
@@ -55,46 +52,45 @@ app.set('views', path.join(__dirname, 'views'));
5552
app.set('view engine', 'pug');
5653

5754
// uncomment after placing your favicon in /public
58-
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
55+
// app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
5956

6057
app.use(session({
61-
secret: "The Session secret, which should not be public. Put into a secrets.js",
58+
secret: 'The Session secret, which should not be public. Put into a secrets.js',
6259
resave: true,
6360
saveUninitialized: false,
64-
store: new MongoStore({
65-
mongooseConnection: db //db must first be defined.
66-
})
61+
store: new MongoStore({mongooseConnection: db})
6762
}));
6863

6964

70-
71-
if(config.util.getEnv('NODE_ENV') !== 'test') {
65+
if (config.util.getEnv('NODE_ENV') !== 'test') {
7266
app.use(logger('dev'));
7367
}
7468
app.use(bodyParser.json());
75-
app.use(bodyParser.urlencoded({ extended: false }));
69+
app.use(bodyParser.urlencoded({extended: false}));
7670
app.use(cookieParser());
7771
app.use(express.static(path.join(__dirname, 'public')));
7872

7973
app.use('/api/courses', course);
8074
app.use('/api/users', user);
8175

8276
// catch 404 and forward to error handler
83-
app.use(function(req, res, next) {
77+
app.use(function (req, res, next) {
8478
const err = new Error('Not Found');
79+
8580
err.status = 404;
8681
next(err);
8782
});
8883

8984
// error handler
90-
app.use(function(err, req, res, next) {
85+
app.use(function (err, req, res, next) {
9186
// set locals, only providing error in development
9287
res.locals.message = err.message;
9388
res.locals.error = req.app.get('env') === 'development' ? err : {};
9489

9590
const status = err.status || 500;
9691
// render the error page
92+
9793
res.status(status).json({success: false, status: status, message: err.message});
9894
});
9995

100-
module.exports = app; //This for testing...
96+
module.exports = app; // This for testing...

src/finishSeed.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const server = require("./app");
1+
const server = require('./app');
22

33
let dataBaseFinishSeed = false;
44

55
server.on('appStarted', () => {
6-
dataBaseFinishSeed = true;
6+
dataBaseFinishSeed = true;
77
});
88

9-
export {dataBaseFinishSeed}
9+
export { dataBaseFinishSeed };

src/middleware/index.js

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
const auth = require('basic-auth');
22
const User = require('../models/user');
3+
34
import Utils from '../utils';
45

5-
export function authorizeUser(req, res, next) {
6-
let user = auth(req);
7-
if(!user || !user.name || !user.pass){
8-
return Utils.throwError(401, "Access Denied: Please supply login credentials!", next);
9-
}
10-
User.authenticate(user.name, user.pass, (error, user) => {
11-
if(error || !user){
12-
return Utils.throwError(401, "Access Denied: Wrong email or password", next);
13-
}
14-
req.session.userId = user._id;
15-
return next();
16-
});
17-
}
6+
export function authorizeUser (req, res, next) {
7+
let user = auth(req);
8+
9+
if (!user || !user.name || !user.pass) {
10+
return Utils.throwError(401, 'Access Denied: Please supply login credentials!', next);
11+
}
12+
User.authenticate(user.name, user.pass, (error, user) => {
13+
if (error || !user) {
14+
return Utils.throwError(401, 'Access Denied: Wrong email or password', next);
15+
}
16+
req.session.userId = user._id;
17+
18+
return next();
19+
});
20+
}

src/models/course.js

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,43 @@ const User = require('./user');
44
const Review = require('./review');
55

66
const CourseSchema = new mongoose.Schema({
7-
user: {
8-
type: Schema.Types.ObjectId,
9-
ref: 'User'
10-
},
11-
title:{
12-
type: String,
13-
required: true,
14-
trim: true
15-
},
16-
description: {
17-
type: String,
18-
required: true
19-
},
20-
estimatedTime: {
21-
type: String
22-
},
23-
materialsNeeded: {
24-
type: String
25-
},
26-
steps: [
27-
{
28-
stepNumber:{
29-
type: Number
30-
},
31-
title: {
32-
type: String,
33-
required: true
34-
},
35-
description: {
36-
type: String,
37-
required: true
38-
}
39-
}
40-
],
41-
reviews: [
42-
{
43-
type: Schema.Types.ObjectId,
44-
ref: 'Review'
45-
}
46-
]
7+
user: {
8+
type: Schema.Types.ObjectId,
9+
ref: 'User'
10+
},
11+
title: {
12+
type: String,
13+
required: true,
14+
trim: true
15+
},
16+
description: {
17+
type: String,
18+
required: true
19+
},
20+
estimatedTime: { type: String },
21+
materialsNeeded: { type: String },
22+
steps: [
23+
{
24+
stepNumber: { type: Number },
25+
title: {
26+
type: String,
27+
required: true
28+
},
29+
description: {
30+
type: String,
31+
required: true
32+
}
33+
}
34+
],
35+
reviews: [
36+
{
37+
type: Schema.Types.ObjectId,
38+
ref: 'Review'
39+
}
40+
]
4741
});
4842

4943
const Course = mongoose.model('Course', CourseSchema);
44+
5045
module.exports = Course;
5146

src/models/review.js

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@ const Schema = mongoose.Schema;
33
const User = require('./user');
44

55
const ReviewSchema = new Schema({
6-
user: {
7-
type: Schema.Types.ObjectId,
8-
ref: 'User'
9-
},
10-
postedOn: {
11-
type: Date,
12-
default: Date.now
13-
},
14-
rating: {
15-
type: Number,
16-
required: true,
17-
min: 1,
18-
max: 5
19-
},
20-
review: {
21-
type: String
22-
}
6+
user: {
7+
type: Schema.Types.ObjectId,
8+
ref: 'User'
9+
},
10+
postedOn: {
11+
type: Date,
12+
default: Date.now
13+
},
14+
rating: {
15+
type: Number,
16+
required: true,
17+
min: 1,
18+
max: 5
19+
},
20+
review: { type: String }
2321
});
2422

2523
const Review = mongoose.model('Review', ReviewSchema);
24+
2625
module.exports = Review;
2726

0 commit comments

Comments
 (0)