Skip to content

Commit

Permalink
Merge pull request #4 from profoundhub/master
Browse files Browse the repository at this point in the history
Master
  • Loading branch information
profoundhub committed Dec 25, 2017
2 parents 63f4ea5 + 174d832 commit 747fdde
Show file tree
Hide file tree
Showing 886 changed files with 113,588 additions and 33,451 deletions.
5 changes: 4 additions & 1 deletion .babelrc
@@ -1,4 +1,7 @@
{
"presets": ["es2015", "react", "stage-0"],
"plugins": ["babel-plugin-add-module-exports"]
"plugins": [
"babel-plugin-add-module-exports",
"lodash"
]
}
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

261 changes: 1 addition & 260 deletions .eslintrc
@@ -1,262 +1,3 @@
{
"parserOption": {
"ecmaVersion": 6,
"ecmaFeatures": {
"jsx": true
}
},
"env": {
"es6": true,
"browser": true,
"mocha": true,
"node": true
},
"parser": "babel-eslint",
"plugins": [
"react",
"import"
],
"settings": {
"import/ignore": [
"node_modules",
"\\.json$"
],
"import/extensions": [
".js",
".jsx"
]
},
"globals": {
"Promise": true,
"window": true,
"$": true,
"ga": true,
"jQuery": true,
"router": true
},
"rules": {
"comma-dangle": 2,
"no-cond-assign": 2,
"no-console": 0,
"no-constant-condition": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-dupe-keys": 2,
"no-empty": 2,
"no-empty-character-class": 2,
"no-ex-assign": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": 0,
"no-extra-semi": 2,
"no-func-assign": 2,
"no-inner-declarations": 2,
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-negated-in-lhs": 2,
"no-obj-calls": 2,
"no-regex-spaces": 2,
"no-reserved-keys": 0,
"no-sparse-arrays": 2,
"no-unreachable": 2,
"use-isnan": 2,
"valid-jsdoc": 2,
"valid-typeof": 2,

"block-scoped-var": 0,
"complexity": 0,
"consistent-return": 2,
"curly": 2,
"default-case": 2,
"dot-notation": 0,
"eqeqeq": 2,
"guard-for-in": 2,
"no-alert": 2,
"no-caller": 2,
"no-div-regex": 2,
"no-else-return": 0,
"no-eq-null": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-implied-eval": 2,
"no-iterator": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-native-reassign": 2,
"no-new": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-octal": 2,
"no-octal-escape": 2,
"no-process-env": 0,
"no-proto": 2,
"no-redeclare": 2,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-unused-expressions": 2,
"no-void": 2,
"no-warning-comments": [
2,
{
"terms": [
"fixme"
],
"location": "start"
}
],
"no-with": 2,
"radix": 2,
"vars-on-top": 0,
"wrap-iife": [2, "any"],
"yoda": 0,

"strict": 0,

"no-catch-shadow": 2,
"no-delete-var": 2,
"no-label-var": 2,
"no-shadow": 0,
"no-shadow-restricted-names": 2,
"no-undef": 2,
"no-undef-init": 2,
"no-undefined": 2,
"no-unused-vars": 2,
"no-use-before-define": 0,

"handle-callback-err": 2,
"no-mixed-requires": 0,
"no-new-require": 2,
"no-path-concat": 2,
"no-process-exit": 2,
"no-restricted-modules": 0,
"no-sync": 0,

"brace-style": [
2,
"1tbs",
{ "allowSingleLine": true }
],
"camelcase": 2,
"comma-spacing": [
2,
{
"before": false,
"after": true
}
],
"comma-style": [
2, "last"
],
"consistent-this": 0,
"eol-last": 2,
"func-names": 0,
"func-style": 0,
"key-spacing": [
2,
{
"beforeColon": false,
"afterColon": true
}
],
"max-nested-callbacks": 0,
"new-cap": 0,
"new-parens": 2,
"no-array-constructor": 2,
"no-inline-comments": 2,
"no-lonely-if": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": [
2,
{ "max": 2 }
],
"no-nested-ternary": 2,
"no-new-object": 2,
"semi-spacing": [2, { "before": false, "after": true }],
"no-spaced-func": 2,
"no-ternary": 0,
"no-trailing-spaces": 2,
"no-underscore-dangle": 0,
"one-var": 0,
"operator-assignment": 0,
"padded-blocks": 0,
"quote-props": [2, "as-needed"],
"quotes": [
2,
"single",
"avoid-escape"
],
"semi": [
2,
"always"
],
"sort-vars": 0,
"keyword-spacing": [ 2 ],
"space-before-function-paren": [
2,
"never"
],
"space-before-blocks": [
2,
"always"
],
"space-in-brackets": 0,
"space-in-parens": 0,
"space-infix-ops": 2,
"space-unary-ops": [
2,
{
"words": true,
"nonwords": false
}
],
"spaced-comment": [
2,
"always",
{ "exceptions": ["-"] }
],
"wrap-regex": 2,

"max-depth": 0,
"max-len": [
2,
80,
2
],
"max-params": 0,
"max-statements": 0,
"no-bitwise": 2,
"no-plusplus": 0,

"jsx-quotes": [2, "prefer-single"],
"react/display-name": 2,
"react/jsx-boolean-value": [2, "always"],
"react/jsx-no-undef": 2,
"react/jsx-sort-props": [2, { "ignoreCase": true }],
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"react/no-did-mount-set-state": 2,
"react/no-did-update-set-state": 2,
"react/no-multi-comp": [2, { "ignoreStateless": true } ],
"react/prop-types": 2,
"react/react-in-jsx-scope": 2,
"react/self-closing-comp": 2,
"react/wrap-multilines": 2,
"react/jsx-closing-bracket-location": [ 2, { "selfClosing": "line-aligned", "nonEmpty": "props-aligned" } ],

"import/no-unresolved": 2,
"import/named": 2,
"import/namespace": 2,
"import/default": 2,
"import/export": 2,
"import/imports-first": 2,
"import/no-duplicates": 2,
"import/newline-after-import": 2
}
"extends": "freecodecamp"
}
11 changes: 7 additions & 4 deletions .github/ISSUE_TEMPLATE.md
@@ -1,8 +1,11 @@
<!-- FreeCodeCamp Issue Template -->
<!-- freeCodeCamp Issue Template -->

<!-- Please provide as much detail as possible for us to fix your issue -->
<!-- Remove any heading sections you did not fill out -->

<!-- NOTE: If your issue is CodePen Project / Test Suite related, please open it using the below URL instead -->
<!-- https://github.com/freeCodeCamp/testable-projects-fcc/issues/new -->

#### Challenge Name
<!-- Insert link to challenge below -->

Expand All @@ -21,9 +24,9 @@
#### Your Code
<!-- If relevant, paste all of your challenge code in here -->
```js



```
#### Screenshot
<!-- Add a screenshot of your issue -->
Expand Down
18 changes: 10 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -1,17 +1,17 @@
<!-- FreeCodeCamp Pull Request Template -->
<!-- freeCodeCamp Pull Request Template -->

<!-- IMPORTANT Please review https://github.com/FreeCodeCamp/FreeCodeCamp/blob/staging/CONTRIBUTING.md for detailed contributing guidelines -->
<!-- Help with PRs can be found at https://gitter.im/FreeCodeCamp/HelpContributors -->
<!-- IMPORTANT Please review https://github.com/freeCodeCamp/freeCodeCamp/blob/staging/CONTRIBUTING.md for detailed contributing guidelines -->
<!-- Help with PRs can be found at https://gitter.im/FreeCodeCamp/Contributors -->
<!-- Make sure that your PR is not a duplicate -->

#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply. -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] Your pull request targets the `staging` branch of FreeCodeCamp.
- [ ] Your pull request targets the `staging` branch of freeCodeCamp.
- [ ] Branch starts with either `fix/`, `feature/`, or `translate/` (e.g. `fix/signin-issue`)
- [ ] You have only one commit (if not, [squash](http://forum.freecodecamp.com/t/how-to-squash-multiple-commits-into-one-with-git/13231) them into one commit).
- [ ] All new and existing tests pass the command `npm run test-challenges`. Use `git commit --amend` to amend any fixes.
- [ ] You have only one commit (if not, [squash](http://forum.freecodecamp.org/t/how-to-squash-multiple-commits-into-one-with-git/13231) them into one commit).
- [ ] All new and existing tests pass the command `npm test`. Use `git commit --amend` to amend any fixes.

#### Type of Change
<!-- What type of change does your code introduce? After creating the PR, tick the checkboxes that apply. -->
Expand All @@ -22,9 +22,11 @@

#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply. -->
<!-- If you're unsure about any of these, don't hesitate to ask in the Help Contributors room linked above. We're here to help! -->
<!-- If you're unsure about any of these, don't hesitate to ask in the Contributors room linked above. We're here to help! -->
- [ ] Tested changes locally.
- [ ] Closes currently open issue (replace XXXX with an issue no): Closes #XXXX
- [ ] Addressed currently open issue (replace XXXXX with an issue no in next line)

Closes #XXXXX

#### Description
<!-- Describe your changes in detail -->
3 changes: 3 additions & 0 deletions .gitignore
@@ -1,4 +1,5 @@
lib-cov
*~
*.seed
*.log
*.csv
Expand All @@ -17,6 +18,7 @@ logs
results
tmp
.ds_store
.vscode

npm-debug.log
node_modules
Expand Down Expand Up @@ -53,3 +55,4 @@ public/js/frame-runner*
public/css/main*

server/rev-manifest.json
google-credentials.json

0 comments on commit 747fdde

Please sign in to comment.