Skip to content

Commit 510e8c6

Browse files
cdconn00cdconn00
authored
Merge pull request #126 from cdconn00/ft-vig-prettier_lint
Sets Up ESLint and Prettier
2 parents 507cac5 + 7a6aaa3 commit 510e8c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+6924
-2993
lines changed

‎.eslintrc‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"extends": ["google", "prettier"],
3+
"rules": {
4+
"linebreak-style": "off",
5+
"eol-last": "off",
6+
"max-len": "off",
7+
"one-var": "off",
8+
"no-use-before-define": ["warn", { "functions": true, "classes": true }],
9+
"no-warning-comments": "off",
10+
"brace-style": "off",
11+
"no-nested-ternary": "off",
12+
"no-mixed-requires": "off",
13+
"no-negated-condition": "off",
14+
"no-tabs": "off",
15+
"camelcase": "off",
16+
"new-cap": "off",
17+
"no-mixed-spaces-and-tabs": "off",
18+
"quote-props": "off",
19+
"space-before-function-paren": "off",
20+
"guard-for-in": "off",
21+
"max-nested-callbacks": "off",
22+
"no-unmodified-loop-condition": "off",
23+
"comma-dangle": "off",
24+
"require-jsdoc": "off",
25+
"arrow-parens": "off",
26+
"prettier/prettier": "error",
27+
"object-curly-spacing": "off",
28+
"array-bracket-spacing": "off",
29+
"no-invalid-this": 0,
30+
"no-var": "off",
31+
"no-unused-vars": "off",
32+
"prefer-const": "warn"
33+
},
34+
"globals": {
35+
"io": true,
36+
"app": true,
37+
"document": true,
38+
"window": true,
39+
"expect": true,
40+
"describe": true,
41+
"it": true
42+
},
43+
"parserOptions": {
44+
"sourceType": "module",
45+
"ecmaVersion": 2020
46+
},
47+
"plugins": ["prettier"]
48+
}

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
.vs/
33
node_modules/
44
config.json
5-
.env
5+
.vscode/
6+
.env

‎.prettierignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
node_modules/
2+
build/
3+
dist/
4+
.yarn/
5+
.vscode/
6+
./views/partials/header.ejs

‎.prettierrc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "es5",
4+
"useTabs": true,
5+
"arrowParens": "always",
6+
"endOfLine": "lf"
7+
}

‎app.js‎

Lines changed: 69 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,104 @@
1-
var express = require('express'),
2-
session = require('express-session'),
3-
app = express(),
4-
bodyParser = require('body-parser'),
5-
methodOverride = require('method-override'),
6-
sql = require('mssql'),
7-
email = require('./email/email'),
8-
bcrypt = require('bcrypt'),
9-
initPassport = require('./passport-config'),
10-
passport = require('passport'),
11-
flash = require('express-flash'),
12-
indexRoutes = require("./routes/index"),
13-
eventRoutes = require("./routes/portal/events"),
14-
portalRoutes = require("./routes/portal/index"),
15-
emailRoutes = require("./routes/portal/emails"),
16-
sponsorRoutes = require("./routes/portal/sponsors"),
17-
projectRoutes = require("./routes/portal/projects"),
18-
middleware = require('./middleware')
19-
dotenv = require('dotenv').config();
1+
require('dotenv').config();
2+
const express = require('express');
3+
const session = require('express-session');
4+
const app = express();
5+
const bodyParser = require('body-parser');
6+
const methodOverride = require('method-override');
7+
const sql = require('mssql');
8+
const email = require('./email/email');
9+
const bcrypt = require('bcrypt');
10+
const initPassport = require('./passport-config');
11+
const passport = require('passport');
12+
const flash = require('express-flash');
13+
const indexRoutes = require('./routes/index');
14+
const eventRoutes = require('./routes/portal/events');
15+
const portalRoutes = require('./routes/portal/index');
16+
const emailRoutes = require('./routes/portal/emails');
17+
const sponsorRoutes = require('./routes/portal/sponsors');
18+
const projectRoutes = require('./routes/portal/projects');
19+
const middleware = require('./middleware');
2020

2121
initPassport(passport);
2222

23-
app.use(bodyParser.urlencoded({extended: true}));
23+
app.use(bodyParser.urlencoded({ extended: true }));
2424
app.use(flash());
25-
app.set("view engine", "ejs");
26-
app.use(express.static(__dirname + "/public"));
27-
app.use(methodOverride("_method"));
28-
app.use(session({
29-
secret: process.env.SESSION_SECRET,
30-
resave: false,
31-
saveUninitialized: false
32-
}));
25+
app.set('view engine', 'ejs');
26+
app.use(express.static(__dirname + '/public'));
27+
app.use(methodOverride('_method'));
28+
app.use(
29+
session({
30+
secret: process.env.SESSION_SECRET,
31+
resave: false,
32+
saveUninitialized: false,
33+
})
34+
);
3335

3436
app.use(passport.initialize());
3537
app.use(passport.session());
3638

37-
var config = {
39+
const config = {
3840
server: process.env.DB_SERVER,
3941
port: 1433,
40-
user: "sa",
42+
user: 'sa',
4143
password: process.env.DB_PASSWORD,
42-
database: process.env.DB_PROD || "awd-site-dev",
44+
database: process.env.DB_PROD || 'awd-site-dev',
4345
stream: false,
4446
options: {
4547
enableArithAbort: true,
4648
encrypt: false,
47-
useUTC: true
49+
useUTC: true,
4850
},
4951
pool: {
5052
max: 20,
5153
min: 0,
52-
idleTimeoutMillis: 30000
53-
}
54+
idleTimeoutMillis: 30000,
55+
},
5456
};
5557

56-
sql.connect(config).then(pool => {
57-
if (pool.connected){
58-
console.log("Connecting to database: [OK]");
59-
}
58+
sql
59+
.connect(config)
60+
.then((pool) => {
61+
if (pool.connected) {
62+
console.log('Connecting to database: [OK]');
63+
}
6064

61-
return pool;
62-
}).catch(function(err) {
63-
console.log("Connecting to database: [FAILED]");
64-
console.log(err);
65-
});
65+
return pool;
66+
})
67+
.catch(function (err) {
68+
console.log('Connecting to database: [FAILED]');
69+
console.log(err);
70+
});
71+
72+
app.use(function (err, req, res, next) {
73+
if (err && err == 'Error: Deserialization error.') {
74+
req.logout();
6675

67-
app.use(function(err, req, res, next) {
68-
if (err && err == "Error: Deserialization error.") {
69-
req.logout();
70-
71-
if (req.originalUrl == "/portal/login") {
72-
next();
73-
} else {
74-
req.flash("error", "Error: Please contact the System Administrator");
75-
res.redirect("/portal/login");
76-
}
77-
} else {
78-
next();
79-
}
76+
if (req.originalUrl == '/portal/login') {
77+
next();
78+
} else {
79+
req.flash('error', 'Error: Please contact the System Administrator');
80+
res.redirect('/portal/login');
81+
}
82+
} else {
83+
next();
84+
}
8085
});
8186

82-
app.use(function(req, res, next){
87+
app.use(function (req, res, next) {
8388
// store current user
8489
res.locals.user = req.user;
8590
next();
8691
});
8792

8893
app.use(indexRoutes);
89-
app.use("/portal", portalRoutes);
90-
app.use("/portal/events", eventRoutes);
91-
app.use("/portal/emails", emailRoutes);
92-
app.use("/portal/sponsors", sponsorRoutes);
93-
app.use("/portal/projects", projectRoutes);
94+
app.use('/portal', portalRoutes);
95+
app.use('/portal/events', eventRoutes);
96+
app.use('/portal/emails', emailRoutes);
97+
app.use('/portal/sponsors', sponsorRoutes);
98+
app.use('/portal/projects', projectRoutes);
9499

95-
app.get("/*", function(req, res){
96-
res.render("404");
100+
app.get('/*', function (req, res) {
101+
res.render('404');
97102
});
98103

99104
email.listenForScheduledEmails();

0 commit comments

Comments
 (0)