Skip to content

Commit f8a1d31

Browse files
authored
Merge pull request #6 from oslabs-beta/staging
Electron Tests, ESLint edits, main.js edits
2 parents 09c6ce3 + 451c7a8 commit f8a1d31

File tree

5 files changed

+2551
-1166
lines changed

5 files changed

+2551
-1166
lines changed

.eslintrc.js

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,45 +81,48 @@ module.exports = {
8181
],
8282
rules: {
8383
"arrow-body-style": 0,
84-
"react/jsx-filename-extension": 0,
84+
"class-methods-use-this": 0,
8585
"comma-dangle": 0,
86-
"no-use-before-define": 0,
87-
"no-console": 0,
88-
"func-names": 0,
89-
"no-undef": 0,
90-
"no-unused-vars": 0,
91-
strict: 0,
9286
"dot-notation": 0,
87+
"func-names": 0,
9388
"import/extensions": 0,
9489
"import/no-extraneous-dependencies": 0,
90+
"import/no-unresolved": 0,
9591
"max-len": 0,
92+
"no-console": 0,
93+
"no-param-reassign": 0,
94+
"no-plusplus": 0,
95+
"no-restricted-syntax": 0,
96+
"no-shadow": 0,
97+
"no-undef": 0,
98+
"no-unused-vars": 0,
99+
"no-use-before-define": 0,
96100
"no-useless-constructor": 0,
97101
"no-underscore-dangle": 0,
102+
"no-unused-expressions": 0,
103+
"no-return-assign": 0,
98104
quotes: 0,
99-
"react/prefer-stateless-function": 0,
100-
"react/prop-types": 0,
105+
"prefer-const": 1,
106+
"prefer-destructuring": 0,
107+
"prefer-template": 1,
101108
"react/destructuring-assignment": 0,
102-
"react/no-array-index-key": 0,
103-
"react/no-did-update-set-state": 0,
104-
"no-restricted-syntax": 0,
105109
"react/forbid-prop-types": 0,
106-
"react/no-access-state-in-setstate": 0,
110+
"react/jsx-filename-extension": 0,
107111
"react/jsx-no-duplicate-props": 0,
108-
"no-plusplus": 0,
109-
"no-param-reassign": 0,
110-
"no-unused-expressions": 0,
111-
"import/no-unresolved": 0,
112+
"react/no-access-state-in-setstate": 0,
113+
"react/no-array-index-key": 0,
114+
"react/no-did-update-set-state": 0,
112115
"react/no-unused-state": 0,
113-
"no-shadow": 0,
114-
"no-return-assign": 0,
115-
"class-methods-use-this": 0,
116-
"brace-style": [2, "stroustrup"],
116+
"react/prefer-stateless-function": 0,
117117
"react/sort-comp": [
118118
2,
119119
{
120120
order: ["lifecycle", "everything-else", "rendering"],
121121
},
122122
],
123+
"react/prop-types": 0,
124+
"spaced-comment": 0,
125+
strict: 0,
123126
},
124127
// setting: {
125128
// "import/parsers": {

0 commit comments

Comments
 (0)