Merge pull request #49 from catalogueglobal/dev

v2.0.0

Author: Landon Reed

.flowconfig

@@ -0,0 +1,15 @@
+[ignore]
+.*/node_modules/auth0-lock/.*
+.*/node_modules/config-chain/.*
+.*/node_modules/fbjs/flow/.*
+.*/node_modules/mapbox.js/docs/examples/.*
+.*/node_modules/nock/node_modules/changelog/examples/.*
+.*/node_modules/npmconf/.*
+.*/node_modules/react-leaflet/src/.*
+.*/node_modules/reqwest/.*
+
+[include]
+
+[libs]
+
+[options]

.gitignore

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

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 notifications:
   email: false
+  slack: conveyal:WQxmWiu8PdmujwLw4ziW72Gc
 node_js:
   - '6'
 cache:
@@ -10,6 +11,7 @@ before_install:
   - pip install --user mkdocs
 script:
   - yarn run lint
+  - yarn run flow
   - yarn run cover-client
   - codecov
   - yarn run build
@@ -18,10 +20,6 @@ script:
 # 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/).

configurations/default/settings.yml

@@ -4,6 +4,7 @@ entries:
 application:
   data:
     gtfs_s3_bucket: bucket-name
+    use_s3_storage: false
   title: Data Manager
   logo: http://gtfs-assets-dev.conveyal.com/data_manager.png # defaults to src/main/client/assets/application_logo.png
   active_project: project-id
@@ -17,20 +18,10 @@ modules:
     enabled: false
   editor:
     enabled: true
-  alerts:
-    enabled: false
-    use_extension: mtc
-  sign_config:
-    enabled: false
   user_admin:
     enabled: true
   validator:
     enabled: true
-  deployment:
-    enabled: false
-  gtfsapi:
-    enabled: false
-    use_extension: mtc
 extensions:
   transitland:
     enabled: false

configurations/test/env.yml

@@ -0,0 +1,6 @@
+AUTH0_CLIENT_ID: test
+AUTH0_DOMAIN: test.com
+MAPZEN_TURN_BY_TURN_KEY: test
+MAPBOX_ACCESS_TOKEN: test
+MAPBOX_MAP_ID: test
+MAPBOX_ATTRIBUTION: <a href="https://www.mapbox.com/about/maps/" target="_blank">&copy; Mapbox &copy; OpenStreetMap</a> <a href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a>

configurations/test/settings.yml

@@ -0,0 +1,29 @@
+entries:
+  - lib/main.js:dist/index.js
+  - lib/index.css:dist/index.css
+application:
+  data:
+    gtfs_s3_bucket: bucket-name
+    use_s3_storage: false
+  title: Data Manager
+  logo: http://lorempixel.com/400/200/
+  active_project: project-id
+  notifications_enabled: false
+  docs_url: http://docs.example.com
+  changelog_url: https://changelog.example.com
+  support_email: support@example.com
+  date_format: MMM Do YYYY
+modules:
+  enterprise:
+    enabled: false
+  editor:
+    enabled: true
+  user_admin:
+    enabled: true
+  validator:
+    enabled: true
+extensions:
+  transitland:
+    enabled: false
+  transitfeeds:
+    enabled: false

docs/dev/migration.md

@@ -0,0 +1,11 @@
+# Migration
+
+## Migrating manager application data
+datatools-server offers a way to migrate application data (e.g., due to either breaking application schema changes or server changes). **Note:** this process requires temporarily exposing a `GET` request that exposes the entirety of the manager database.
+
+1. Set the config setting `modules:dump:enabled` to `true`.
+2. Restart the application.
+3. Download copy of application data to local json file `curl localhost:4000/dump > db_backup.json`.
+4. Change dump config setting back to `false`.
+5. (optional) If looking to reload into the existing server, delete the manager mapdb (`.db` and `.dbp`) files in `application:data:mapdb`
+6. Follow instructions in [`/scripts/load.py`](https://github.com/conveyal/datatools-ui/blob/master/scripts/load.py) to upload the json data to the new server.