Merge pull request #747 from 18F/develop

Merge in work of  August `Kanban` sprint

.env.example

@@ -30,6 +30,7 @@ SAML_SIGN_REQUEST=1
 SAML_CONSUMER_SERVICE_URL=http://localhost:3000/auth/saml/callback
 TLS_CERT=
 TLS_KEY=
+WS_ENABLED=0
 WS_URL=
 WS_KEY=
 WS_CALLERINFO_AGENCY_ID=

.eslintrc.yml

@@ -0,0 +1,30 @@
+extends:
+  - eslint:recommended
+  - plugin:import/errors
+  - plugin:import/warnings
+  - plugin:react/recommended
+env:
+  browser: true
+  es6: true
+  node: true
+  jest: true
+parserOptions:
+  ecmaVersion: 9
+  sourceType: module
+  ecmaFeatures:
+    jsx: true
+plugins:
+  - react
+rules:
+  # the following rules are disabled for legacy reasons, and most should be removed over time
+  import/no-duplicates: 'off'
+  no-console: 'off'
+  no-unused-vars: 'off'
+  react/no-deprecated: 'off'
+  react/no-string-refs: 'off'
+  react/display-name: 'off'
+  react/prop-types:
+    - error
+    - skipUndeclared: true
+settings:
+  import/resolver: webpack

.gitignore

@@ -41,9 +41,6 @@ package-lock.json
 # Optional REPL history
 .node_repl_history
 
-# ReactJS caches
-__snapshots__/
-
 # Go vendoring
 # We will just track the vendor.json file to rehydrate packages during development
 # For release all vendored packages should be frozen
@@ -85,6 +82,7 @@ TAGS
 xmlsec1
 
 # Test artifacts
+/api/coverage.txt
 /jest*
 /specs/reports
 /specs/screenshots

.prettierrc.yml

@@ -0,0 +1,6 @@
+proseWrap: never
+singleQuote: true
+
+# these options are here for legacy reasons, i.e. the bulk of the code was originally written that way
+jsxBracketSameLine: true
+semi: false

CONTRIBUTING.md

@@ -1,39 +1,26 @@
-## Welcome!
+# Welcome!
 
-We're so glad you're thinking about contributing to an 18F open source project! If you're unsure about anything,
-just ask -- or submit the issue or pull request anyway. The worst that can happen is you'll be politely asked to
-change something. We love all friendly contributions.
+We're so glad you're thinking about contributing to an 18F open source project! If you're unsure about anything, just ask -- or submit the issue or pull request anyway. The worst that can happen is you'll be politely asked to change something. We love all friendly contributions.
 
-We want to ensure a welcoming environment for all of our projects. Our staff follow the
-[18F Code of Conduct](https://github.com/18F/code-of-conduct/blob/master/code-of-conduct.md) and all contributors
-should do the same.
+We want to ensure a welcoming environment for all of our projects. Our staff follow the [18F Code of Conduct](https://github.com/18F/code-of-conduct/blob/master/code-of-conduct.md) and all contributors should do the same.
 
-We encourage you to read this project's CONTRIBUTING policy (you are here), its [LICENSE](LICENSE.md), and its
-[README](README.md).
+We encourage you to read this project's CONTRIBUTING policy (you are here), its [LICENSE](LICENSE.md), and its [README](README.md).
 
-If you have any questions or want to read more, check out the
-[18F Open Source Policy GitHub repository](https://github.com/18f/open-source-policy), or just
-[shoot us an email](mailto:18f@gsa.gov).
+If you have any questions or want to read more, check out the [18F Open Source Policy GitHub repository](https://github.com/18f/open-source-policy), or just [shoot us an email](mailto:18f@gsa.gov).
 
 ## Where to contribute?
 
-During the development process the development fork of the project will be hosted at [18F/e-QIP-prototype](https://github.com/18F/e-QIP-prototype).
-This may cause some confusion so we have outlined some basic steps for contributing:
+During the development process the development fork of the project will be hosted at [18F/e-QIP-prototype](https://github.com/18F/e-QIP-prototype). This may cause some confusion so we have outlined some basic steps for contributing:
 
- 1. Clone the repository `git clone https://github.com/18F/e-QIP-prototype $GOPATH/src/18F/e-QIP-prototype`
- 2. Change in to the new directory `cd $GOPATH/src/18F/e-QIP-prototype`
- 3. Fork the code on Github
- 4. Add a **git remote** with `git remote add fork <path/to/forked/repository>`
- 5. Make changes and commit them locally
- 6. Push to **fork** using `git push fork`
- 7. Create a **pull request** from the forked repository to the [18F/e-QIP-prototype](https://github.com/18F/e-QIP-prototype) repository
+1. Go through the [development setup](../README.md#development)
+1. Fork the code on Github
+1. Add a **git remote** with `git remote add fork <path/to/forked/repository>`
+1. Make changes and commit them locally
+1. Push to **fork** using `git push fork`
+1. Create a **pull request** from the forked repository to the [18F/e-QIP-prototype](https://github.com/18F/e-QIP-prototype) repository
 
 ## Public domain
 
-This project is in the public domain within the United States, and
-copyright and related rights in the work worldwide are waived through
-the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
+This project is in the public domain within the United States, and copyright and related rights in the work worldwide are waived through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
 
-All contributions to this project will be released under the CC0
-dedication. By submitting a pull request, you are agreeing to comply
-with this waiver of copyright interest.
+All contributions to this project will be released under the CC0 dedication. By submitting a pull request, you are agreeing to comply with this waiver of copyright interest.

Makefile

@@ -86,9 +86,21 @@ specs:
 #
 # Coverage
 #
-coverage:
-	$(info Running code coverage)
-	@docker-compose run --rm js yarn coverage
+.PHONY: coverage
+# Run coverage-go first – it removes its backend coverage data
+# afterwards, so coverage-js will not label its report data as
+# belonging to the frontend.
+coverage: coverage-go coverage-js
+coverage-js:
+	$(info Running code coverage for JS)
+	@docker-compose run --rm \
+        -e "CODECOV_TOKEN=${CODECOV_TOKEN}" \
+        js yarn coverage
+coverage-go:
+	$(info Running code coverage for Go)
+	@docker-compose run --rm \
+        -e "CODECOV_TOKEN=${CODECOV_TOKEN}" \
+        api make coverage
 
 #
 # Building
@@ -220,6 +232,7 @@ start:
 stop:
 	docker-compose stop
 run:
+	docker-compose rm -f api css js
 	$(info Running local development server)
 	docker-compose up --abort-on-container-exit --build
 identity: