Skip to content

Commit e06b90e

Browse files
JustinlkirkJustinlkirk
authored
Merge pull request #149 from open-source-labs/master
Adding our merge from oslab-beta/master to open-source-labs/dev
2 parents d5bf125 + 2af93a7 commit e06b90e

File tree

341 files changed

+42782
-19625
lines changed

Some content is hidden

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

341 files changed

+42782
-19625
lines changed

‎.DS_Store

-6 KB
Binary file not shown.

‎.d.js

Whitespace-only changes.

‎.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare module '*.png'

‎.eslintrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.eslintrc.json

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"globals": {
3+
"NodeJS": true,
4+
"JSX": true,
5+
"Electron": true
6+
},
7+
"plugins": ["react", "prettier"],
8+
"parser": "babel-eslint",
9+
"parserOptions": {
10+
"ecmaVersion": 2018,
11+
"sourceType": "module",
12+
"ecmaFeatures": {
13+
"jsx": true
14+
}
15+
},
16+
"env": {
17+
"es6": true,
18+
"browser": true,
19+
"node": true,
20+
"jest": true
21+
},
22+
"extends": ["airbnb", "eslint:recommended", "plugin:react/recommended", "prettier"],
23+
"rules": {
24+
"react/display-name": "off",
25+
"prettier/prettier": "error",
26+
"no-unused-vars": [
27+
"warn",
28+
{
29+
"args": "none"
30+
}
31+
],
32+
"react/prop-types": "off",
33+
"no-console": "warn",
34+
"react/jsx-filename-extension": "off",
35+
"no-alert": "off",
36+
"no-plusplus": "off",
37+
"no-new": "off",
38+
"react/button-has-type": "off",
39+
"react/jsx-one-expression-per-line": "off",
40+
"no-restricted-globals": "off",
41+
"react/no-array-index-key": "warn",
42+
"no-restricted-syntax": "off",
43+
"guard-for-in": "off",
44+
"no-param-reassign": "off",
45+
"import/extensions": [
46+
"error",
47+
"ignorePackages",
48+
{
49+
"js": "never",
50+
"jsx": "never",
51+
"ts": "never",
52+
"tsx": "never",
53+
"mjs": "never"
54+
}
55+
]
56+
},
57+
"settings": {
58+
"import/extensions": [".js", ".mjs", ".jsx", ".ts", ".tsx"],
59+
// "import/parsers": {
60+
// "@typescript-eslint/parser": [".ts", ".tsx"]
61+
// },
62+
"import/resolver": {
63+
"node": {
64+
"extensions": [".js", ".jsx", ".ts", ".tsx"]
65+
}
66+
}
67+
}
68+
}

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.gitignore

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,48 @@
1+
# JS Project-Specific #
2+
#######################
13
node_modules
2-
.eslintrc.js
3-
package-lock.json
4-
settings.json
5-
.DS_Store
4+
dist
5+
build
6+
release-builds
7+
coverage
8+
__tests__/**/__snapshots__
9+
# .env
10+
users.json
11+
12+
# Compiled source #
13+
###################
14+
*.com
15+
*.class
16+
*.dll
17+
*.exe
18+
*.o
19+
*.so
20+
21+
# Packages #
22+
############
23+
# it's better to unpack these files and commit the raw source
24+
# git has its own built in compression methods
25+
*.7z
26+
*.dmg
27+
*.gz
28+
*.iso
29+
*.jar
30+
*.rar
31+
*.tar
32+
*.zip
33+
34+
# Logs and databases #
35+
######################
36+
*.log
37+
*.sql
38+
*.sqlite
39+
40+
# OS generated files #
41+
######################
42+
.DS_Store
43+
.DS_Store?
44+
._*
45+
.Spotlight-V100
46+
.Trashes
47+
ehthumbs.db
48+
Thumbs.db

‎.prettierrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"singleQuote": true,
3+
"useTabs": false,
4+
"endOfLine": "auto",
5+
"arrowParens": "avoid",
6+
"printWidth": 100
7+
}

‎.travis.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
language: node_js
2+
node_js:
3+
- 'stable'
4+
os: osx
5+
jobs:
6+
# allow_failures:
7+
# - os: osx
8+
fast_finish: true
9+
install:
10+
- npm install
11+
script:
12+
npm run test:app
13+
# safelist
14+
# branches:
15+
# only:
16+
# - master
17+
# - middleware
18+
# - chronosWebsite

0 commit comments

Comments
 (0)