Skip to content

Commit ecf7d39

Browse files
Merge pull request #126 from conveyal/dev
v3.0.0
2 parents d4c3508 + d37fada commit ecf7d39

File tree

137 files changed

+6046
-17089
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+6046
-17089
lines changed

.flowconfig

-14
This file was deleted.

.gitignore

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
*.swp
2+
.env
3+
.next
24
node_modules
35
npm-debug.log
46
assets
5-
configurations/*
6-
!configurations/default
7-
!configurations/messages
87
tmp
9-
config.json
108
yarn-error.log
9+
store.json

.travis.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
sudo: false
22
language: node_js
3-
cache:
4-
yarn: true
53
notifications:
64
email: false
75
node_js:
8-
- '8'
9-
before_install:
10-
- yarn global add codecov
6+
- '10'
117
scripts:
12-
- yarn test -- --coverage --coverage-paths src/**/*.js
13-
- codecov
8+
- yarn run check-format
9+
- yarn test
1410
- yarn run build
1511
after_success:
1612
- yarn run semantic-release

README.md

+10-12
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,23 @@
77

88
## Running
99

10-
Clone the repository and with [yarn](https://yarnpkg.com/en/) and [node v8](https://nodejs.org/en/) installed run `yarn start`. Changes to JavaScript and CSS will be rebuilt automatically. Refresh your web page to see changes. Changes to configuration files require a full stop and fresh `yarn start`.
10+
Clone the repository and with [yarn](https://yarnpkg.com/en/) and [node v10](https://nodejs.org/en/) installed run `yarn run dev`. Taui is built and run with [next.js](https://nextjs.org) and [now](https://now.js).
1111

1212
## Configuration
1313

14-
Taui allows changing it's source data live by default. It's set via JSON and an example can be found in `config.json.tmp`. Opportunities can be set in the `grids` field and transit networks generated by an r5 regional analysis can be set in networks.
14+
Copy the `empty-store.json` file to `store.json`. This file populates the data used for running a Taui.
1515

16-
For permanent deployments, set `DISABLE_CONFIG: true` in the `env.yml` file and set the configuration data in `store.yml` under the `data` field.
16+
**Key fields:**
1717

18-
## Deploy
18+
* `allowChangeConfig` -- Set to `false` when deploying a site for a user.
19+
* `map.accessToken` -- A [Mapbox](https://mapbox.com) access token is required for Mapbox GL maps and Mapbox Geocoding to work.
20+
* `grids` -- Point sets or opportunities can be set here.
21+
* `networks` -- A url to an S3 bucket containing the results of regional analysis generated from R5.
22+
* `poiUrl` -- URL to a GeoJSON file that contains a `FeatureCollection` of `Points` to be shown on the map. Add a `label` to the `properties` field of each point.
1923

20-
Once you see that TAUI is working properly with your static site data, deploy it to the S3 bucket specified in settings.yml with the following command (replacing the --config switch to point to your configuration directory):
24+
## Deployment
2125

22-
`mastarm deploy --config configurations/marseilles --minify --env production`
23-
24-
The AWS SDK for JS will detect and use the same AWS credentials you should have set up for AWSCLI. The deployment copies JS and CSS files into a sub-bucket called assets, but does not upload `index.html`. You need to edit `index.html` in the root of the TAUI repository to customize the page name, then upload it with `aws s3 cp index.html s3://your-bucket-name/index.html`.
25-
26-
`mastarm deploy` will not create the bucket or set its contents public. You need to ensure the bucket exists before running `mastarm deploy` and set all its contents public afterward using the S3 web console or CLI. You don’t need to set any permissions on the bucket itself.
27-
28-
If S3 reports “access denied” when you try to fetch a page over HTTP in your browser, this is often because an object you are requesting does not exist.
26+
[![Deploy to now](https://deploy.now.sh/static/button.svg)](https://deploy.now.sh/?repo=https://github.com/conveyal/taui)
2927

3028
[npm-image]: https://img.shields.io/npm/v/@conveyal/taui.svg?maxAge=2592000&style=flat-square
3129
[npm-url]: https://www.npmjs.com/package/@conveyal/taui

__mocks__/leaflet.js

-176
This file was deleted.

__mocks__/react-leaflet.js

-7
This file was deleted.

config.json.tmp

-15
This file was deleted.

configurations/default/.gitignore

-1
This file was deleted.

configurations/default/env.yml.tmp

-5
This file was deleted.

configurations/default/messages.yml

-39
This file was deleted.

configurations/default/settings.yml

-7
This file was deleted.

configurations/default/store.yml

-14
This file was deleted.

configurations/messages/messages-fr.yml

-12
This file was deleted.

configurations/test/env.yml

-7
This file was deleted.

0 commit comments

Comments
 (0)