Skip to content

Commit cb0ad5c

Browse files
patrickvalerpatrickvaler
committed
chore: improve linting
1 parent 8bf75cc commit cb0ad5c

File tree

9 files changed

+152
-145
lines changed

9 files changed

+152
-145
lines changed

‎.eslintrc.js‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
module.exports = {
2-
parser: 'babel-eslint',
3-
extends: 'airbnb-base',
4-
plugins: [
5-
'import'
6-
],
7-
rules: {
8-
indent: ['error', 4],
9-
'no-console': ['off'],
10-
"no-use-before-define": ["error", { "functions": false, "classes": true }],
11-
"comma-dangle": ["error", "never"]
12-
}
13-
};
2+
parser: 'babel-eslint',
3+
extends: 'airbnb-base',
4+
plugins: ['import'],
5+
rules: {
6+
indent: ['error', 2],
7+
'no-console': ['off'],
8+
'no-use-before-define': ['error', { functions: false, classes: true }],
9+
'comma-dangle': ['error', 'never'],
10+
'arrow-parens': 0
11+
}
12+
};

‎src/api/todo/index.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@ import ctrl from './todo.ctrl';
33

44
const router = express.Router();
55

6-
router.route('/todo')
6+
router
7+
.route('/todo')
78

8-
// GET /api/v1/todo - Get list of todos
9-
.get(ctrl.getAll)
9+
// GET /api/v1/todo - Get list of todos
10+
.get(ctrl.getAll)
1011

11-
// POST /api/v1/todo - Create new todo
12-
.post(ctrl.create);
12+
// POST /api/v1/todo - Create new todo
13+
.post(ctrl.create);
1314

14-
router.route('/todo/:id')
15+
router
16+
.route('/todo/:id')
1517

16-
// DELETE /api/v1/todo/:id - Delete todo
17-
.delete(ctrl.remove)
18+
// DELETE /api/v1/todo/:id - Delete todo
19+
.delete(ctrl.remove)
1820

19-
// PUT /api/v1/todo/:id - Update todo
20-
.put(ctrl.update);
21+
// PUT /api/v1/todo/:id - Update todo
22+
.put(ctrl.update);
2123

2224
export default router;

‎src/api/todo/todo.ctrl.js‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,39 @@
11
import TodoDa from './todo.da';
22

33
export default {
4-
getAll,
5-
update,
6-
create,
7-
remove
4+
getAll,
5+
update,
6+
create,
7+
remove
88
};
99

1010
function getAll(req, res) {
11-
TodoDa.getAll()
12-
.then((todos) => { res.status(200).json(todos); })
13-
.catch(() => { res.sendStatus(422); });
11+
TodoDa.getAll()
12+
.then(todos => res.status(200).json(todos))
13+
.catch(() => res.sendStatus(422));
1414
}
1515

1616
function update(req, res) {
17-
const id = req.params.id;
18-
const name = req.body.name;
19-
const completed = req.body.completed;
17+
const { id } = req.params;
18+
const { name, completed } = req.body.name;
2019

21-
TodoDa.update(id, name, completed)
22-
.then(() => { res.sendStatus(200); })
23-
.catch(() => { res.sendStatus(422); });
20+
TodoDa.update(id, name, completed)
21+
.then(() => res.sendStatus(200))
22+
.catch(() => res.sendStatus(422));
2423
}
2524

2625
function create(req, res) {
27-
const name = req.body.name;
26+
const { name } = req.body;
2827

29-
TodoDa.create(name)
30-
.then((todo) => { res.status(200).json(todo); })
31-
.catch(() => { res.sendStatus(422); });
28+
TodoDa.create(name)
29+
.then(todo => res.status(200).json(todo))
30+
.catch(() => res.sendStatus(422));
3231
}
3332

3433
function remove(req, res) {
35-
const id = req.params.id;
34+
const { id } = req.params;
3635

37-
TodoDa.remove(id)
38-
.then(() => { res.sendStatus(200); })
39-
.catch(() => { res.sendStatus(422); });
36+
TodoDa.remove(id)
37+
.then(() => res.sendStatus(200))
38+
.catch(() => res.sendStatus(422));
4039
}

‎src/api/todo/todo.da.js‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,63 @@ import Q from 'q';
22
import Todo from './todo.model';
33

44
export default {
5-
getAll,
6-
update,
7-
create,
8-
remove
5+
getAll,
6+
update,
7+
create,
8+
remove
99
};
1010

1111
function getAll() {
12-
const deferred = Q.defer();
12+
const deferred = Q.defer();
1313

14-
Todo.find({}, (err, todos) => {
15-
if (err) deferred.reject(err);
16-
deferred.resolve(todos);
17-
});
14+
Todo.find({}, (err, todos) => {
15+
if (err) deferred.reject(err);
16+
deferred.resolve(todos);
17+
});
1818

19-
return deferred.promise;
19+
return deferred.promise;
2020
}
2121

2222
function update(id, name, completed) {
23-
const deferred = Q.defer();
24-
const query = {};
23+
const deferred = Q.defer();
24+
const query = {};
2525

26-
if (name) query.name = name;
27-
if (completed) query.completed = completed;
26+
if (name) query.name = name;
27+
if (completed) query.completed = completed;
2828

29-
if (Object.keys(query).length > 0) {
30-
Todo.update({ _id: id }, { $set: query }, (err, todo) => {
31-
if (err) deferred.reject(err);
29+
if (Object.keys(query).length > 0) {
30+
Todo.update({ _id: id }, { $set: query }, (err, todo) => {
31+
if (err) deferred.reject(err);
3232

33-
deferred.resolve(todo);
34-
});
35-
} else {
36-
// reject promise if name and completed information is missing
37-
deferred.reject({});
38-
}
33+
deferred.resolve(todo);
34+
});
35+
} else {
36+
// reject promise if name and completed information is missing
37+
deferred.reject({});
38+
}
3939

40-
return deferred.promise;
40+
return deferred.promise;
4141
}
4242

4343
function create(name) {
44-
const deferred = Q.defer();
45-
const todo = new Todo({ name });
46-
todo.save((err, savedTodo) => {
47-
if (err) deferred.reject(err);
44+
const deferred = Q.defer();
45+
const todo = new Todo({ name });
46+
todo.save((err, savedTodo) => {
47+
if (err) deferred.reject(err);
4848

49-
deferred.resolve(savedTodo);
50-
});
49+
deferred.resolve(savedTodo);
50+
});
5151

52-
return deferred.promise;
52+
return deferred.promise;
5353
}
5454

5555
function remove(id) {
56-
const deferred = Q.defer();
57-
Todo.remove({ _id: id }, (err, todo) => {
58-
if (err) deferred.reject(err);
56+
const deferred = Q.defer();
57+
Todo.remove({ _id: id }, (err, todo) => {
58+
if (err) deferred.reject(err);
5959

60-
deferred.resolve(todo);
61-
});
60+
deferred.resolve(todo);
61+
});
6262

63-
return deferred.promise;
63+
return deferred.promise;
6464
}

‎src/api/todo/todo.model.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import mongoose from 'mongoose';
22

33
const TodoSchema = new mongoose.Schema({
4-
name: {
5-
type: String,
6-
required: true
7-
},
8-
completed: {
9-
type: Boolean,
10-
default: false
11-
},
12-
created: {
13-
type: Date,
14-
default: Date.now
15-
}
4+
name: {
5+
type: String,
6+
required: true
7+
},
8+
completed: {
9+
type: Boolean,
10+
default: false
11+
},
12+
created: {
13+
type: Date,
14+
default: Date.now
15+
}
1616
});
1717

1818
export default mongoose.model('Todo', TodoSchema);

‎src/config/config.js‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,41 @@
33
* @type {{db: string, apiPort: number}}
44
*/
55
const defaultConfig = {
6-
db: 'mongodb://localhost:27017/es6-express-mongoose-starter',
7-
apiPort: 3000
6+
db: 'mongodb://localhost:27017/es6-express-mongoose-starter',
7+
apiPort: 3000
88
};
99

1010
/**
1111
* Enviroment specific configuration
1212
* @type {{prod: {}, dev: {}, test: {apiPort: number}}}
1313
*/
1414
const envConfig = {
15-
prod: {},
16-
dev: {},
17-
test: {
18-
apiPort: 3100
19-
}
15+
prod: {},
16+
dev: {},
17+
test: {
18+
apiPort: 3100
19+
}
2020
};
2121

2222
/**
2323
* Loads config based on the current environment
2424
* @returns {*}
2525
*/
2626
function loadConfig() {
27-
const env = process.env.NODE_ENV || 'dev';
27+
const env = process.env.NODE_ENV || 'dev';
2828

29-
if (!envConfig[env]) {
30-
throw new Error(`Environment config for environment '${env}' not found. process.env.NODE_ENV must be one of '${Object.keys(envConfig)}'`);
31-
}
29+
if (!envConfig[env]) {
30+
throw new Error(
31+
`Environment config for environment '${env}' not found. process.env.NODE_ENV must be one of '${Object.keys(
32+
envConfig
33+
)}'`
34+
);
35+
}
3236

33-
console.log('[INFO] config loaded for environment: ', env);
37+
console.log('[INFO] config loaded for environment: ', env);
3438

35-
// merge default config with environment specific config
36-
return Object.assign({}, defaultConfig, envConfig[env]);
39+
// merge default config with environment specific config
40+
return Object.assign({}, defaultConfig, envConfig[env]);
3741
}
3842

3943
export default loadConfig();

‎src/config/express.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import bodyParser from 'body-parser';
22

3-
export default (app) => {
4-
app.use(bodyParser.urlencoded({ extended: true }));
5-
app.use(bodyParser.json());
3+
export default app => {
4+
app.use(bodyParser.urlencoded({ extended: true }));
5+
app.use(bodyParser.json());
66
};

‎src/config/routes.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import packageJson from '../../package.json';
33

44
const API_V1 = '/api/v1';
55

6-
export default (app) => {
7-
app.get(API_V1, (req, res) => {
8-
res.json({ version: packageJson.version });
9-
});
6+
export default app => {
7+
app.get(API_V1, (req, res) => {
8+
res.json({ version: packageJson.version });
9+
});
1010

11-
app.use(API_V1, todoApi);
11+
app.use(API_V1, todoApi);
1212
};

0 commit comments

Comments
 (0)