Skip to content

Commit

Permalink
Merge pull request #32 from chingu-voyage6/development
Browse files Browse the repository at this point in the history
Merge Development into Master
  • Loading branch information
denibulkashvili authored Aug 16, 2018
2 parents 7e671af + 04289ad commit f121deb
Show file tree
Hide file tree
Showing 19 changed files with 13,660 additions and 7,207 deletions.
42 changes: 42 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"env": {
"browser": true,
"es6": true,
"node": true
},
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 2017,
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"plugins": [
"react"
],
"rules": {
"no-console": [
"off"
],
"indent": [
"warn",
2
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"warn",
"single"
],
"semi": [
"warn",
"always"
],
"react/jsx-uses-react": "error",
"react/jsx-uses-vars": "error"
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
Expand Down
Loading

0 comments on commit f121deb

Please sign in to comment.