Skip to content

Commit d77c29f

Browse files
committed
Configure eslint and lint all files
1 parent d2aa605 commit d77c29f

File tree

9 files changed

+574
-216
lines changed

9 files changed

+574
-216
lines changed

.eslintrc.js

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,17 @@
11
module.exports = {
2-
"plugins": ['prettier'],
3-
"env": {
4-
"es6": true,
5-
"node": true
6-
},
7-
"extends": "eslint:recommended",
8-
"parserOptions": {
9-
"sourceType": "module"
10-
},
11-
"rules": {
12-
"indent": [
13-
"error",
14-
2
15-
],
16-
"linebreak-style": [
17-
"error",
18-
"unix"
19-
],
20-
"quotes": [
21-
"error",
22-
"single"
23-
],
24-
"semi": [
25-
"error",
26-
"never"
27-
]
28-
}
29-
};
2+
plugins: ['prettier'],
3+
env: {
4+
es6: true,
5+
node: true
6+
},
7+
parserOptions: {
8+
sourceType: 'module',
9+
ecmaVersion: 2017
10+
},
11+
rules: {
12+
indent: ['error', 2],
13+
'linebreak-style': ['error', 'unix'],
14+
quotes: ['error', 'single'],
15+
semi: ['error', 'never']
16+
}
17+
}

api/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
var express = require('express');
2-
var router = express.Router();
1+
var express = require('express')
2+
var router = express.Router()
33

44
/* GET home page. */
5-
router.get('/', function (req, res, next) {
5+
router.get('/', function(req, res, next) {
66
res.send({
7-
title: 'Express'
8-
});
9-
});
7+
message: `Welcome to REST API with ORM and SQL Database`
8+
})
9+
})
1010

11-
module.exports = router;
11+
module.exports = router

app.js

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,44 @@
1-
const createError = require('http-errors');
2-
const express = require('express');
3-
const path = require('path');
4-
const cookieParser = require('cookie-parser');
5-
const logger = require('morgan');
6-
7-
const indexRouter = require('./api/index');
8-
const usersRouter = require('./api/users');
9-
10-
const app = express();
11-
12-
app.use(logger('dev'));
13-
app.use(express.json());
14-
app.use(express.urlencoded({
15-
extended: false
16-
}));
17-
app.use(cookieParser());
18-
19-
app.use('/', indexRouter);
20-
app.use('/users', usersRouter);
1+
const createError = require('http-errors')
2+
const express = require('express')
3+
const path = require('path')
4+
const cookieParser = require('cookie-parser')
5+
const logger = require('morgan')
6+
const cors = require('cors')
7+
8+
const indexRouter = require('./api/index')
9+
const usersRouter = require('./api/users')
10+
11+
const app = express()
12+
13+
app.use(cors())
14+
app.use(logger('dev'))
15+
app.use(express.json())
16+
app.use(
17+
express.urlencoded({
18+
extended: false
19+
})
20+
)
21+
app.use(cookieParser())
22+
23+
app.use('/', indexRouter)
24+
app.use('/users', usersRouter)
2125

2226
// catch 404 and forward to error handler
23-
app.use(function (req, res, next) {
24-
next(createError(404));
25-
});
27+
app.use(function(req, res, next) {
28+
next(createError(404))
29+
})
2630

2731
// error handler
28-
app.use(function (err, req, res, next) {
32+
app.use(function(err, req, res, next) {
2933
// set locals, only providing error in development
30-
res.locals.message = err.message;
31-
res.locals.error = req.app.get('env') === 'development' ? err : {};
34+
res.locals.message = err.message
35+
res.locals.error = req.app.get('env') === 'development' ? err : {}
3236

3337
// render the error page
34-
res.status(err.status || 500);
38+
res.status(err.status || 500)
3539
res.send({
3640
err
37-
});
38-
});
41+
})
42+
})
3943

40-
module.exports = app;
44+
module.exports = app

index.js

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,64 +10,64 @@ require('dotenv-extended').load({
1010
errorOnExtra: false,
1111
assignToProcessEnv: true,
1212
overrideProcessEnv: false
13-
});
13+
})
1414

1515
/**
1616
* Module dependencies.
1717
*/
1818

19-
const app = require('./app');
20-
const debug = require('debug')('code-express-orm-mariadb:server');
21-
const http = require('http');
22-
const models = require('./models');
19+
const app = require('./app')
20+
const debug = require('debug')('code-express-orm-mariadb:server')
21+
const http = require('http')
22+
const models = require('./models')
2323

2424
/**
2525
* Get port from environment and store in Express.
2626
*/
2727

28-
const port = normalizePort(process.env.PORT || '3000');
29-
app.set('port', port);
28+
const port = normalizePort(process.env.PORT || '3000')
29+
app.set('port', port)
3030

3131
/**
3232
* Create HTTP server.
3333
*/
3434

35-
const server = http.createServer(app);
35+
const server = http.createServer(app)
3636

3737
/**
3838
* Listen on provided port, on all network interfaces.
3939
*/
4040

41-
models.sequelize.sync().then(function () {
41+
models.sequelize.sync().then(function() {
4242
/**
4343
* Listen on provided port, on all network interfaces.
4444
*/
45-
server.listen(port, function () {
46-
console.log('Express server listening on port ' + server.address().port);
47-
debug('Express server listening on port ' + server.address().port);
48-
});
49-
server.on('error', onError);
50-
server.on('listening', onListening);
51-
});
45+
server.listen(port, function() {
46+
console.log('Express server listening on port ' + server.address().port)
47+
debug('Express server listening on port ' + server.address().port)
48+
})
49+
server.on('error', onError)
50+
server.on('listening', onListening)
51+
})
5252

5353
/**
5454
* Normalize a port into a number, string, or false.
5555
*/
5656

5757
function normalizePort(val) {
58-
const port = parseInt(val, 10);
58+
const port = parseInt(val, 10)
5959

6060
if (isNaN(port)) {
6161
// named pipe
62-
return val;
62+
return val
6363
}
6464

6565
if (port >= 0) {
6666
// port number
67-
return port;
67+
return port
6868
}
6969

70-
return false;
70+
return false
7171
}
7272

7373
/**
@@ -76,25 +76,23 @@ function normalizePort(val) {
7676

7777
function onError(error) {
7878
if (error.syscall !== 'listen') {
79-
throw error;
79+
throw error
8080
}
8181

82-
const bind = typeof port === 'string' ?
83-
'Pipe ' + port :
84-
'Port ' + port;
82+
const bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port
8583

8684
// handle specific listen errors with friendly messages
8785
switch (error.code) {
88-
case 'EACCES':
89-
console.error(bind + ' requires elevated privileges');
90-
process.exit(1);
91-
break;
92-
case 'EADDRINUSE':
93-
console.error(bind + ' is already in use');
94-
process.exit(1);
95-
break;
96-
default:
97-
throw error;
86+
case 'EACCES':
87+
console.error(bind + ' requires elevated privileges')
88+
process.exit(1)
89+
break
90+
case 'EADDRINUSE':
91+
console.error(bind + ' is already in use')
92+
process.exit(1)
93+
break
94+
default:
95+
throw error
9896
}
9997
}
10098

@@ -103,9 +101,7 @@ function onError(error) {
103101
*/
104102

105103
function onListening() {
106-
const addr = server.address();
107-
const bind = typeof addr === 'string' ?
108-
'pipe ' + addr :
109-
'port ' + addr.port;
110-
debug('Listening on ' + bind);
111-
}
104+
const addr = server.address()
105+
const bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port
106+
debug('Listening on ' + bind)
107+
}

migrations/1-create-user.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
'use strict';
1+
'use strict'
2+
23
module.exports = {
34
up: (queryInterface, Sequelize) => {
45
return queryInterface.createTable('Users', {
@@ -26,9 +27,9 @@ module.exports = {
2627
type: Sequelize.DATE,
2728
allowNull: false
2829
}
29-
});
30+
})
3031
},
31-
down: (queryInterface) => {
32-
return queryInterface.dropTable('Users');
32+
down: queryInterface => {
33+
return queryInterface.dropTable('Users')
3334
}
34-
};
35+
}

package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,32 @@
77
"migrate": "sequelize db:migrate && sequelize db:seed:all",
88
"migrate:undo": "sequelize db:seed:undo:all && sequelize db:migrate:undo:all",
99
"start": "node index",
10-
"dev": "node-dev index"
10+
"dev": "node-dev index",
11+
"test": "node test",
12+
"lint": "eslint *.js",
13+
"precommit": "pretty-quick --staged"
1114
},
1215
"dependencies": {
16+
"body-parser": "^1.18.3",
1317
"cookie-parser": "~1.4.3",
18+
"cors": "^2.8.4",
1419
"debug": "~2.6.9",
1520
"dotenv-extended": "^2.2.0",
1621
"express": "~4.16.0",
1722
"http-errors": "~1.6.2",
1823
"jade": "~1.11.0",
1924
"morgan": "~1.9.0",
2025
"mysql2": "^1.6.1",
26+
"prettier": "^1.14.2",
27+
"pretty-quick": "^1.6.0",
2128
"sequelize": "^4.38.0"
2229
},
2330
"devDependencies": {
2431
"eslint": "^5.3.0",
2532
"eslint-config-prettier": "^2.9.0",
2633
"eslint-plugin-prettier": "^2.6.2",
2734
"node-dev": "^3.1.3",
35+
"prettier-eslint": "^8.8.2",
2836
"sequelize-cli": "^4.0.0"
2937
}
3038
}

0 commit comments

Comments
 (0)