Skip to content

Commit 245c29c

Browse files
committed
Merging from conditionals project
1 parent 459d691 commit 245c29c

27 files changed

+1305
-52
lines changed

.babelrc

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"presets": ["react", "es2015"],
3+
"plugins": [
4+
"transform-class-properties"
5+
]
6+
}

.editorconfig

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
indent_style = space
2+
indent_size = 2
3+
charset = utf-8
4+
insert_final_newline = true

.eslintrc

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"parser": "babel-eslint",
3+
"rules": {
4+
"react/jsx-uses-react": 2,
5+
"react/jsx-uses-vars": 2,
6+
"react/react-in-jsx-scope": 2,
7+
"react/jsx-tag-spacing": 0,
8+
"curly": [2],
9+
"linebreak-style": [2, "unix"],
10+
"semi": [2, "always"],
11+
"comma-dangle": [0],
12+
"no-unused-vars": [2, {
13+
"vars": "all",
14+
"args": "none",
15+
"ignoreRestSiblings": true
16+
}],
17+
"no-console": [0],
18+
"object-curly-spacing": [2, "always"],
19+
"keyword-spacing": ["error"],
20+
"jest/no-disabled-tests": "warn",
21+
"jest/no-focused-tests": "error",
22+
"jest/no-identical-title": "error",
23+
"jest/valid-expect": "error"
24+
},
25+
"env": {
26+
"es6": true,
27+
"browser": true,
28+
"node": true,
29+
"jest/globals": true
30+
},
31+
"extends": "eslint:recommended",
32+
"parserOptions": {
33+
"ecmaVersion": 6,
34+
"sourceType": "module",
35+
"ecmaFeatures": {
36+
"jsx": true
37+
}
38+
},
39+
"plugins": [
40+
"react",
41+
"jest"
42+
]
43+
}

.gitignore

+34-52
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,41 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
7-
8-
# Runtime data
9-
pids
10-
*.pid
11-
*.seed
12-
*.pid.lock
13-
14-
# Directory for instrumented libs generated by jscoverage/JSCover
15-
lib-cov
16-
17-
# Coverage directory used by tools like istanbul
181
coverage
2+
npm-debug.log
3+
node_modules
4+
build
5+
dist
6+
lib
7+
yarn.lock
198

20-
# nyc test coverage
21-
.nyc_output
22-
23-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
24-
.grunt
25-
26-
# Bower dependency directory (https://bower.io/)
27-
bower_components
28-
29-
# node-waf configuration
30-
.lock-wscript
9+
package-lock.json
3110

32-
# Compiled binary addons (http://nodejs.org/api/addons.html)
33-
build/Release
3411

35-
# Dependency directories
12+
# Numerous always-ignore extensions
13+
*.diff
14+
*.err
15+
*.orig
16+
*.log
17+
*.rej
18+
*.swo
19+
*.swp
20+
*.vi
21+
*~
22+
*.sass-cache
23+
24+
# OS or Editor folders
25+
.DS_Store
26+
.cache
27+
.project
28+
.settings
29+
.tmproj
30+
nbproject
31+
Thumbs.db
32+
33+
# NPM packages folder.
3634
node_modules/
37-
jspm_packages/
38-
39-
# Typescript v1 declaration files
40-
typings/
41-
42-
# Optional npm cache directory
43-
.npm
44-
45-
# Optional eslint cache
46-
.eslintcache
47-
48-
# Optional REPL history
49-
.node_repl_history
50-
51-
# Output of 'npm pack'
52-
*.tgz
53-
54-
# Yarn Integrity file
55-
.yarn-integrity
5635

57-
# dotenv environment variables file
58-
.env
36+
# Brunch output folder.
37+
public/
38+
.idea/
39+
json-schema-playing.iml
5940

41+
*.iml

0 commit comments

Comments
 (0)