Commit Graph

66 Commits

Author SHA1 Message Date
Franc Camps-Febrer
b7c73ab9bd All components use getCategoryColor 2018-12-03 14:50:38 +00:00
Franc Camps-Febrer
0a6ba78389 Add color categories correct shade to card 2018-12-03 14:43:13 +00:00
Unknown
576aceba35 rm comments 2018-12-03 13:06:01 +00:00
Lachie Kermode
1b9f5e6349 return loc/lat/long to required 2018-12-03 13:01:36 +00:00
Unknown
4f4c80b3a3 categoryGroups removed 2018-12-03 12:54:33 +00:00
Unknown
5c23c2ae9a wip: categories working with timeline
have removed map for the time being, as it was interrupting the timeline render. will return it in next commit
2018-12-03 10:47:53 +00:00
Lachie Kermode
5b83a82c35 wip: categoryGroups -> categories 2018-12-03 09:05:39 +00:00
Lachie Kermode
e9bd136082 modify event schema to allow empty location 2018-12-03 09:05:39 +00:00
Lachlan Kermode
1d123c11c3 Merge pull request #22 from forensic-architecture/feature-narrative-seq
Feature: Narrative sequences closes #11
2018-11-30 20:30:10 +00:00
Lachie Kermode
a2d5fdf3da fall back on a default red styling for narratives 2018-11-30 14:46:44 +00:00
Unknown
70dbcd96e0 fix console errors and warnings 2018-11-29 10:43:51 +00:00
Franc Camps-Febrer
a82da33d1a Cosmetic 2018-11-27 15:05:02 -05:00
Franc Camps-Febrer
100c307fb5 Clean up renders for CardStack 2018-11-27 15:03:43 -05:00
Franc Camps-Febrer
f345b76e57 Some further cleanup of presentational stuff 2018-11-27 15:03:43 -05:00
Franc Camps-Febrer
20051db90a Additional card cleanup 2018-11-27 15:03:43 -05:00
Franc Camps-Febrer
b658356448 Add narrative styling options to store 2018-11-27 15:03:43 -05:00
Franc Camps-Febrer
16625ba1f1 Clean up unused code, add comments, tidy up 2018-11-27 15:02:44 -05:00
Franc Camps-Febrer
a33e8769a9 Apply further cleanup and renaming 2018-11-27 15:01:38 -05:00
Franc Camps-Febrer
640baf904e Apply better naming and cleanup 2018-11-27 15:01:38 -05:00
Franc Camps-Febrer
24a8c9363c Pass narratives with links down to cards and events 2018-11-27 14:59:28 -05:00
Franc Camps-Febrer
0201931000 Pass narratives and render in map 2018-11-27 14:59:28 -05:00
Franc Camps-Febrer
bd0e6b673e Add selector and reducer for narrative 2018-11-27 14:59:28 -05:00
Franc Camps-Febrer
6727d88e4e Merge pull request #21 from forensic-architecture/topic/with-example
Topic/with example
2018-11-19 18:39:38 -05:00
Lachie Kermode
c3fc243f49 update travis config 2018-11-19 16:47:32 +00:00
Lachie Kermode
96e30ad806 update example.config.js 2018-11-19 16:45:04 +00:00
Unknown
8c82a9c24c add wiki link to readme 2018-11-19 15:13:51 +00:00
Unknown
7e705fee34 rm some semicolons, add tags check in getTagFilters 2018-11-19 15:01:22 +00:00
Unknown
3d42942a5c update error handling logic, add empty check for validateTree 2018-11-19 14:40:55 +00:00
Lachie Kermode
e7036277f9 add mapbox error if token null 2018-11-19 13:53:15 +00:00
Lachie Kermode
2ead3fb22a modify config to example sheet 2018-11-19 13:52:56 +00:00
Lachlan Kermode
f0a87fb3a5 Merge pull request #18 from forensic-architecture/topic/add-travis-badge
Topic/add travis badge
2018-11-15 10:08:45 +00:00
Lachlan Kermode
91b70658e0 Merge pull request #19 from feature-creature/develop
corrects ayotzinapa url
2018-11-14 16:43:13 +00:00
Feature Creature
83d9611b66 corrects ayotzinapa url 2018-11-14 14:44:11 +00:00
scztt
1eebd293f2 Fix extraneous } 2018-11-13 09:18:57 -08:00
Scott Carver
fa8fb9d2aa Add travis badge to readme 2018-11-13 09:08:19 -08:00
Unknown
7b35909d1e rename example to example.config.js
to keep consistent with the config file in datasheet-server
2018-11-12 09:38:30 +00:00
Lachlan Kermode
1db9757a5b Merge pull request #17 from scztt/topic/basic-smoke-test
Topic/basic smoke test
2018-11-12 09:33:19 +00:00
Scott Carver
163fccdb02 Add test-watch script 2018-11-11 21:27:26 -08:00
Scott Carver
39f9bdc5eb Run ava directly 2018-11-11 13:32:45 -08:00
Scott Carver
eccef18724 Switch test framework to ava
Should match datasheet-server.
2018-11-11 13:26:15 -08:00
Lachlan Kermode
14b005c897 Merge pull request #14 from forensic-architecture/tag-selection-fix
Tag selection fix closes #12
2018-11-11 10:01:32 +00:00
Scott Carver
1a6ec88c2d Fix travis subprocess.kill problem - attempt 3
- Don't connect to pipes of spawned yawn process (we don't need them, and they can prevent us from exiting the mocha process)
- agent: false to avoid keeping http connection alive even after get is finished (also keeping mocha process alive)
2018-11-10 15:51:32 -08:00
Scott Carver
3beefe0925 Fix travis subprocess.kill problem - attempt 3
Spawn a detached process, which should also prevent parent from waiting for kill to finish.
2018-11-09 18:24:37 -08:00
Scott Carver
08b3543b87 Fix travis subprocess.kill problem - attempt 2 2018-11-09 18:08:42 -08:00
Scott Carver
9b69feff2c Use bash for shell
This may work around a problem where kill() does not work correctly in a travis context (https://github.com/travis-ci/travis-ci/issues/704)
2018-11-09 17:51:21 -08:00
Scott Carver
d0259756a5 Increase GET test timeout
Tests are not currently passing on travis, probably because of slower machine.
2018-11-09 17:29:57 -08:00
Scott Carver
669a701a20 Add basic http smoke test
- Add mocha dev dependency
- Add test to launch server and GET basic urls
- Add `yarn test` to travis
2018-11-09 17:26:07 -08:00
Franc Camps-Febrer
46be9884f6 Move tag activation logic to reducer 2018-11-09 13:40:27 -05:00
Franc Camps-Febrer
28e0ebae9e Change name of validator to something more intuitive 2018-11-09 12:32:52 -05:00
Franc Camps-Febrer
8fcba69051 Validate uniqueness of tags and ignore global tag duplicates 2018-11-08 16:16:50 -05:00