Skip to content

Commit baeaec8

Browse files
authored
Merge pull request #9 from tutorcruncher/switch-to-react
switch to react
2 parents 5bf6405 + a78d0db commit baeaec8

Some content is hidden

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

70 files changed

+8413
-1556
lines changed

.babelrc

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

.env

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
REACT_APP_SOCKET_API_URL='https://socket.tutorcruncher.com'
2+
PUBLIC_URL='/'
3+
REACT_APP_GRECAPTCHA_KEY='6LdyXRgUAAAAADUNhMVKJDXiRr6DUN8TGOgllqbt'

.env.production

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
REACT_APP_SOCKET_API_URL='https://socket.tutorcruncher.com'
2+
REACT_APP_RAVEN_DSN='https://[email protected]/128441'
3+
REACT_APP_GA_ID='UA-41117087-3'

.eslintignore

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

.eslintrc.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,28 @@ module.exports = {
22
root: true,
33
parser: 'babel-eslint',
44
parserOptions: {
5-
sourceType: 'module'
5+
sourceType: 'module',
6+
ecmaFeatures: {
7+
'jsx': true
8+
},
69
},
7-
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
8-
extends: 'standard',
9-
// required to lint *.vue files
1010
plugins: [
11-
'html'
11+
'react'
1212
],
13-
// add your custom rules here
14-
'rules': {
13+
extends: 'react-app',
14+
rules: {
15+
'semi': [2, 'never'],
1516
// allow paren-less arrow functions
1617
'arrow-parens': 0,
1718
// allow async-await
18-
'generator-star-spacing': 0,
19+
'generator-star-spacing': 2,
1920
// allow debugger during development
20-
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
21+
'no-debugger': 2,
2122
'comma-dangle': 0,
2223
'camelcase': 0,
24+
'no-alert': 2,
25+
'space-before-function-paren': 2,
26+
'react/jsx-uses-react': 2,
27+
'react/jsx-uses-vars': 2,
2328
}
2429
}

.gitignore

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
6+
# testing
7+
/coverage
8+
9+
# production
10+
/build/
11+
/dist/
12+
13+
# misc
114
.DS_Store
2-
node_modules/
3-
dist/
4-
npm-debug.log
5-
test/unit/coverage
6-
test/e2e/reports
7-
selenium-debug.log
8-
.idea
9-
vanilla
15+
.env.local
16+
.env.development.local
17+
.env.test.local
18+
.env.production.local
19+
20+
npm-debug.log*
21+
yarn-debug.log*
22+
yarn-error.log*
23+
/.idea/
24+
README-CRA.md
1025
test-live.html
26+
old-main.js
27+
/TODO.md

.travis.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
language: node_js
22

33
node_js:
4-
- 6.9
4+
- 8
55

66
cache:
7+
yarn: true
78
directories:
89
- node_modules
910

1011
install:
11-
- npm install
12+
- yarn
1213

1314
script:
14-
- npm test
15-
- npm run lint
16-
- npm run build
15+
- yarn lint
16+
- yarn test -- --coverage
17+
- yarn dist
18+
- ls -lhaR dist/
1719

1820
after_success:
1921
- ls -lha
@@ -23,9 +25,9 @@ deploy:
2325
# deploying to cdn.tutorcruncher.com/socket/
2426
- provider: s3
2527
access_key_id:
26-
secure: "SKus8C48fdO72ch31uR2YKLAZFJRNRRbjQKJWG4xaAh7AOIvVQXXzBgqeDlY5vz4BreIHDOkMDF0/wSHF6Lm5wgNaelbu6VAn3ASupRybrpvEsD92HbDlcUAjjl8OCqaPAXnfwFMKQZ07g61nBOlQIvRGgJvgP0WLflWrB4kyjnyEbH2qIfRnfjYHMFP/xHpLrEr3fL+im2O4W12nTj5AMiS0FM/yb8NZrep8IK/c7jiQIceQuroPm5vTNdBC9ZiKSf0ggwCc2m/hmi+i8KX+OiHz8h8Q8T84J8aik7ig16CQsfXAZq+SUSIDTWIJ1VWY5L67aBaApZKZ1WNASFrREWAgLZvEEEqKUQCDqTE6nYn3Xmu8T1CQK23VObxAJMGs6KZ2DYB9Qsi15bgUK8TYZkKxTxeLLMWtPl9k3mD14NkkeE5TWOVlLr7ATURbzJCgaYkYhf5+4Pudhn8PnzFoJHEzcpEARP+GFAm6SFh8KXQvNiYqSGN2ui2gsb5m2PHjyxpbK2awGjs2EMxTuYHQcIfhEuT+qJ2G6fG9lcpe+/YLwky3E8BgAhMy/5Wzx03JMCwoc+K3/kMGiugGrNdfx5mofbG+lZVDTquPsHl2wzJorZ8Z1zhgWYJWt5LsgQD1u8FyBSOJDxtReaGN7B5qQ1wwNR+lVu3oNcfi3pOUMg="
28+
secure: "CCCNAIe5UxzvtS1thmNcNcl6Ln7pYl2IQYRSVXaPEN1vMfkmakYx40oKaDMG2XnlJBM0XPJe7gvnQjQ0oekRDAflp/Sqr8KiXEP3HgXQxj0p65I9B5cjNnEKyjiqcQvTfTIgmcFKVgu0A6CDeaFDODxSRAbCpQwNhH3VWHYFRN6YCah52r6RY4mVwuOmA7W/g2NXjKhSNGwdBB9BPDTnL5+Yr4Itipfq/xa2yF8rRqLLHvbVIBOfpgc1ghHn2EPpCZ9WS70EoNmKZEnjJ2SQ5s1m2cgxPFJKRy3wCthYu6Fqz9Nfxs8ytUphT+RFTxoHGUGgh7xfcT1iYue/Fv8d8xm33Djdqhzys7qO7Nb/sAjmBABL0BNiIVnK5skyA8+L+iO8tyyygLm2hHslSdJH0N+z9oz8OXrWJsIrUwOy2+OmtFpDl69cwP225W/6Gu2OwBa3AWGMg/UGWkO25QQH+CqvUWTr4kic8up0QLfGQo2FRDWvHa33sRlmMzQlQojURPv3DLueflyRE9xmzV9YPGH5lhKdIl9AgxU+M4Lh2WCb9G1j2yXNT7mWZkB2R7FMc6v6cQqKuGRdiG6AqTbz0ISs0y8RjH8hijPWMBu3mA9S58yNR52LNVzsPHB99a3iqejA9BHmzA7nEc1HQXAEgfljV/4iLbC4jCivloyCgrI="
2729
secret_access_key:
28-
secure: "ZsSpMvYPBlPHfMwrzT32iBM9CS2JPTazuz1PGiSpcXuISCwVOjoXaJKlDvUHa55rF67BdMRvu0nqMWKhhi9AnQkWKWIMnfBJ4T0qZ1eDfphLuT9YkJ/OerT03IHfY8VbxUuYLPJZ0p4Dh4BjZU5AlL5AzXUr82yMgrx+0sscAVY8yUvrtBxgrOKEoCCXd27rayOC6nLNQtpk8W4hd3gZ/4yRpK1ph0jrgb7MM57VoXYGOIE7ep4v3ejHl/8WLQoupAm8mTi4bwJzElGQTI6HLAACRDjSBjisKV0ZKoyxes6fvMV+jgeI+vwMUMzE8XTuXFnonnmNrxP9q55YFtrAENGBtenALGKMzf2VEKa1YFcXQbQZOpzIXJ8eGxTg2HLDreDr5cQ/T1sCZ4Ks9vGP6AYm//FgY8Q3Y7txqyTUNADtP9qvXTjc1HU1QVBAVeuW8YuuvrjElzAY2P5akObvPF3ks2J8J0oQ9BrVsB529d2KY8ym0ti5tLhe1Vu70yBKB7jfDPCXAIXIQ+2yOU9RrixE0NDHQcLCBFWB8/P9MhYXzGZuzTQM+BiLgSWM0pmlgRqFSg3VVa9GnbqQ7hIkTXTj4Gxi2pTU4VGHrr2BkL1yAdV36JXEx9BoGinB/H4NPcyW0gdsRElBpNn/4KJgGqzD48fa2hU7E5SvQGzUykg="
30+
secure: "kN61iNDo9xJn5oEhckqZBnXQXCDiTYkd1FFxLn5aGxvP/VJu/br19DvZa9zeBJYh3qjtIwgH75fkjq4ydgqZGlDOL0lhTuIF8gxt+H6UEo0bkUtO9spp9NBVZyaPajf+5zJFaDHN/7MDyUSgJckHTabaBTwo0A6onv9vE+S+Nwi7TW7O6JjfIs+NQzYlMudkhrgJmKTWx+qMGkW95n/VgUihIYoFjchJO6sMym6FfB/8HXj8TPqgnVtz9TSqUWAI1Up0KoYyaV9O9XS5cALOucxMm+djqtuu6Ar0DT/C2Hqp75OTFDcIT5DT9cPgh16BQQUXQIe1mYOP9xJdm7vOXUpRfGbhYewAAIsbhydHBbn70/hLQDj0Uxx9QgW+LM15K5YVHQ3Yj34aG3PPJfMtmRbQxvE3BO3Pmr5oMUHtBP5bS+w5WF9s9uU/tBisRxg4Qt78GYwxOBVXwNYxtk1eMpmEXj96gZiactpVovHl8gXbX7zwOj6l4Gd34shYKHerXiuBp47Ma4+cJjfwgQSqtki3Q6X4KEdmdsjG30nzPOEFuni0HxohH1GNeKAe0nou493NS/aaQ7Z66U3rn2h8ZPXzJvK+HcXzYMt3bYPQHQHIfCLzgD+GoUio2ypp+PGMhRJqXC4XbpGWGIJUUG+YqYTqFm4AY1SLJ/WfnDFzvWw="
2931
bucket: cdn.tutorcruncher.com
3032
skip_cleanup: true
3133
acl: public_read

build/build.js

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

build/dev-client.js

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

build/dev-server.js

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

0 commit comments

Comments
 (0)