Skip to content

Commit

Permalink
Merge branch 'master' of github.com:technologiestiftung/tsb-trees-fro…
Browse files Browse the repository at this point in the history
…ntend
  • Loading branch information
fdnklg committed May 11, 2020
2 parents 5397e6c + 9a8ea13 commit 1882e89
Show file tree
Hide file tree
Showing 30 changed files with 1,082 additions and 2,122 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["@babel/preset-env", "@babel/preset-react"]
"presets": ["@babel/env", "@babel/preset-react"]
}
14 changes: 12 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
module.exports = {
parser: 'babel-eslint',
sourceType: 'modules',
extends: ['eslint:recommended', 'plugin:react/recommended'],
parserOptions: {
ecmaVersion: 6,
sourceType: 'module',
ecmaFeatures: {
modules: true,
},
allowImportExportEverywhere: true,
},
extends: ['eslint:recommended', 'plugin:react/recommended', 'react-app'],
rules: {
'react/prop-types': 'off',
},
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,4 @@ $RECYCLE.BIN/
*.code-workspace
# Local History for Visual Studio Code
.history/
dist/
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
node_modules
*.ejs
*.svg
src/assets/fonts
.DS_Store
*.png
*.ico
28 changes: 0 additions & 28 deletions dist/04eca528748fde8a01a33edb6a84882c.svg

This file was deleted.

63 changes: 0 additions & 63 deletions dist/08f121dba323aafe5c11e5b52fbf079e.svg

This file was deleted.

18 changes: 0 additions & 18 deletions dist/0c4317886a4a90249c3b260c49bd066f.svg

This file was deleted.

Loading

0 comments on commit 1882e89

Please sign in to comment.