Merge pull request ibi-group#413 from conveyal/dev

Merge dev to master

Author: Landon Reed

.flowconfig

@@ -0,0 +1,17 @@
+[ignore]
+.*/node_modules/config-chain/.*
+.*/node_modules/fbjs/flow/.*
+.*/node_modules/immutable/.*
+.*/node_modules/mapbox.js/docs/examples/.*
+.*/node_modules/nock/node_modules/changelog/examples/.*
+.*/node_modules/npmconf/.*
+.*/node_modules/react-leaflet/src/.*
+.*/node_modules/reqwest/.*
+.*/node_modules/module-deps/test/invalid_pkg/package.json
+.*/node_modules/immutable/dist/immutable.js.flow
+
+[include]
+
+[libs]
+
+[options]

.gitignore

@@ -2,15 +2,9 @@ node_modules/
 .DS_Store
 dist
 *.log
-coverage
-target/
-src/main/client/config.js
-datatools-manager.iml
-config.yml
-config_server.yml
-configurations/*
-!configurations/default
+coverage*
 tmp/
+.tags
 
 # Optional npm cache directory
 .npm
@@ -21,9 +15,13 @@ tmp/
 # Configurations
 configurations/*
 !configurations/default
+!configurations/test
+!configurations/end-to-end
 dist
 assets
 
 # Secret config files
 env.yml
 env.yml-original
+.env
+!configurations/test/env.yml

.travis.yml

@@ -1,27 +1,31 @@
 language: node_js
 notifications:
   email: false
+  slack: conveyal:WQxmWiu8PdmujwLw4ziW72Gc
 node_js:
-  - '6'
+  - '8'
 cache:
   yarn: true
 before_install:
   - npm i -g codecov
+  # Use updated python to avoid SSL insecure warnings:
+  # https://urllib3.readthedocs.io/en/latest/advanced-usage.html#ssl-warnings
+  - python --version
+  - pyenv versions
+  - pyenv global 2.7.14
   - pip install --user mkdocs
 script:
   - yarn run lint
+  - yarn run lint-messages
+  - yarn run flow
   - yarn run cover-client
   - codecov
-  - yarn run build
+  - yarn run build -- --minify
   - mkdocs build
 
 # If sudo is disabled, CI runs on container based infrastructure (allows caching &c.)
 sudo: false
 
-# Notify us of the build status on the Slack channel
-notifications:
-  slack: conveyal:WQxmWiu8PdmujwLw4ziW72Gc
-
 # Push results to codecov.io
 after_success:
   - bash <(curl -s https://codecov.io/bash)

README.md

@@ -8,4 +8,6 @@ This repository serves as the front end UI for the Data Manager application. It
 
 ## Documentation
 
-View the [latest documentation](http://conveyal-data-tools.readthedocs.org/en/latest/) at ReadTheDocs for more info on deployment and development as well as a user guide.
+View the [latest release documentation](http://conveyal-data-tools.readthedocs.org/en/latest/) at ReadTheDocs for more info on deployment and development as well as a user guide.
+
+Note: `dev` branch docs can be found [here](http://conveyal-data-tools.readthedocs.org/en/dev/).

__mocks__/auth0-js.js

@@ -0,0 +1,41 @@
+import jwt from 'jsonwebtoken'
+
+module.exports = {
+  WebAuth: class WebAuth {
+    constructor ({domain, clientID}) {
+      if (!domain) {
+        throw new Error('Domain required')
+      }
+      if (!clientID) {
+        throw new Error('Client ID required')
+      }
+    }
+
+    renewAuth (
+      {
+        audience,
+        nonce,
+        postMessageDataType,
+        redirectUri,
+        scope,
+        usePostMessage
+      },
+      callback
+    ) {
+      return callback(null, {
+        accessToken: jwt.sign(
+          {
+            nonce
+          },
+          'signingKey'
+        ),
+        idToken: jwt.sign(
+          {
+            nonce
+          },
+          'signingKey'
+        )
+      })
+    }
+  }
+}

__mocks__/auth0-lock.js

@@ -0,0 +1,3 @@
+// TODO: remove.  There was an import issue, so this is a temporary hack.
+// perhaps a later version of Auth0 will have negate the need for this file.
+module.exports = function () {}