-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #46 from conveyal/dev
UI refactor and semantic versioning
- Loading branch information
Showing
518 changed files
with
29,755 additions
and
39,949 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
language: node_js | ||
notifications: | ||
email: false | ||
node_js: | ||
- '6' | ||
cache: | ||
yarn: true | ||
before_install: | ||
- npm i -g codecov | ||
script: | ||
- yarn run lint | ||
- yarn run cover-client | ||
- codecov | ||
- yarn run 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) | ||
- yarn run semantic-release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
entries: | ||
- lib/main.js:dist/index.js | ||
- lib/index.css:dist/index.css | ||
application: | ||
data: | ||
mapdb: /path/to/mapdb | ||
gtfs: /path/to/gtfs | ||
editor_mapdb: /path/to/editor | ||
regions: /path/to/regions/geojson | ||
use_s3_storage: false | ||
gtfs_s3_bucket: bucket-name | ||
port: 4000 | ||
title: Data Manager | ||
assets_bucket: bucket-name | ||
logo: http://gtfs-assets-dev.conveyal.com/data_manager.png # defaults to src/main/client/assets/application_logo.png | ||
active_project: project-id | ||
notifications_enabled: false | ||
public_url: http://localhost:9000 | ||
docs_url: http://docs.example.com | ||
changelog_url: https://changelog.example.com | ||
support_email: support@example.com | ||
osm_vex: http://localhost:1000 | ||
r5: http://localhost:8080 | ||
date_format: MMM Do YYYY | ||
|
||
auth0: | ||
domain: your-auth0-domain | ||
client_id: your-auth0-client-id | ||
MAPZEN_TURN_BY_TURN_KEY: API_KEY | ||
mapbox: | ||
access_token: MAPBOX_ACCESS_TOKEN | ||
map_id: conveyal.ie3o67m0 | ||
modules: | ||
enterprise: | ||
enabled: false | ||
editor: | ||
enabled: true | ||
legacy_editor: | ||
enabled: false | ||
url: http://localhost:9001 | ||
alerts: | ||
enabled: false | ||
use_extension: mtc | ||
sign_config: | ||
enabled: false | ||
user_admin: | ||
enabled: true | ||
validator: | ||
enabled: true | ||
deployment: | ||
enabled: false | ||
gtfsapi: | ||
enabled: false | ||
load_on_fetch: false | ||
load_on_startup: false | ||
use_extension: mtc | ||
update_frequency: 3600 # in seconds | ||
|
||
extensions: | ||
transitland: | ||
enabled: true | ||
api: https://transit.land/api/v1/feeds | ||
transitfeeds: | ||
enabled: true | ||
api: http://api.transitfeeds.com/v1/getFeeds | ||
key: your-api-key |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,13 @@ | ||
# Development | ||
|
||
## Using `combine-serve` | ||
## mastarm | ||
|
||
Spark does not hot-reload static web files, i.e. the application frontend. To make life easier when doing frontend development, we recommend using [combine-serve](https://github.com/conveyal/combine-serve) to serve both the backend and frontend as a unified service. Used in conjunction with `webpack --watch`, this will eliminate the need to constantly rebuild/reload the frontend for testing. | ||
We use Conveyal's front-end JS tool-belt [`mastarm`](https://github.com/conveyal/mastarm) to build, run, and lint while developing. | ||
|
||
For example, if running the Java backend on port 9000 (typically via an IDE such as IntelliJ), and you want to serve the combined application on port 9001 for development purposes, use: | ||
To kick off a development server at [http://localhost:9966](http://localhost:9966): | ||
|
||
``` | ||
combine-serve --serve / src/main/resources/public/ --proxy / http://localhost:9000 --port 9001 | ||
npm start | ||
``` | ||
|
||
This will use `mastarm` to run a browserify server at the above port along with a proxy for the back-end API, which is assumed to be running on http://localhost:4000. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.