Commit Graph

57 Commits

Author SHA1 Message Date
efarooqui
99fd2198e2 Merge branch 'develop' of https://github.com/forensic-architecture/timemap into feature/refactor-filters-and-narratives-to-associations 2020-09-22 10:26:10 -07:00
Sol
9d846c5c4c initial search bar feature added on new branch 2020-09-20 10:23:15 +01:00
efarooqui
8442ca7bb4 Fixed linting issues 2020-09-14 08:12:57 -07:00
efarooqui
bd4f61e7ed Working narrative feature minus getNarrativeLinks (need further clarification); working on modifying narrativise filters feature 2020-09-07 16:10:09 -07:00
efarooqui
6492be18d9 Refactored filter list for display; converting filter paths to node, child objects that are toggleable 2020-09-01 09:33:05 -07:00
efarooqui
2aaf7c09ff Filter render broken; moved narrative and narrativeState to app.filters and restructured appropriately with narrativeIdx selector 2020-08-27 08:42:47 -07:00
Sol
19201a5808 console logs removed and changes made 2020-08-07 19:26:01 +02:00
Sol
cc2561aa30 added and changed var names 2020-08-07 19:26:01 +02:00
Sol
0a6e13ba88 Refactored to pass down methods as props. Added CSS pointer 2020-08-07 19:26:01 +02:00
Sol
90f1de296a lint fixes 2020-08-07 19:26:01 +02:00
Sol
31bdbd0313 map and cards clickable 2020-08-07 19:26:01 +02:00
Sol
956534e247 remove comment on minTime and maxTime variables 2020-07-21 09:48:43 +02:00
Sol Abrahams
0673242148 Update app.js
Update for linter
2020-07-21 09:48:43 +02:00
Sol
71d1664542 Remove unneccesary if statement
name = Sol
email = solomonabrahams100@gmail.com
2020-07-21 09:48:43 +02:00
Lachlan Kermode
16358f5ab9 all tags->filters 2020-06-18 10:30:25 +02:00
Lachlan Kermode
65befef6e0 add loading 2020-06-18 10:30:25 +02:00
Lachlan Kermode
28501fe867 narratives fixed 2020-06-18 10:30:25 +02:00
Lachlan Kermode
e49b0e2fb0 WIP: gritty rewrite of timestamp handling 2020-06-18 10:30:25 +02:00
Lachlan Kermode
64087bf1e5 return hierarchical tags 2020-06-18 10:30:25 +02:00
Lachlan Kermode
ffb4548fce update dimensions of track according to number of categories 2020-06-18 10:30:25 +02:00
Sam Ludford
7755a8fee2 renamed js folder as common + moved hardcoded colors into global.js 2019-05-22 12:50:22 +01:00
Lachlan Kermode
552685f196 lint 2019-02-19 14:52:28 +00:00
Lachlan Kermode
eeed18e6b8 fix narrativeStepStyles inconsistency 2019-02-19 14:51:06 +00:00
Lachlan Kermode
2a275f7bd4 rm old reset action 2019-02-14 15:47:39 +00:00
Lachlan Kermode
7463aa33ca clear tags and categories when switching to narrative 2019-02-14 15:40:38 +00:00
Lachlan Kermode
5174814244 clean category filtering 2019-02-14 15:27:48 +00:00
Lachlan Kermode
4e9128476d clean tag representation and filtering 2019-02-14 14:27:36 +00:00
Lachlan Kermode
ed9af1cbf6 add cover with toggle 2019-02-07 12:04:47 +00:00
Lachlan Kermode
3de7b3a8c5 lint additional files 2019-01-22 16:15:55 +00:00
Lachlan Kermode
20d39f3bf9 Merge remote-tracking branch 'origin/develop' into add-linting 2019-01-22 15:34:07 +00:00
Lachlan Kermode
38f7662ff6 correct updateTimerange reducer 2019-01-18 17:47:28 +00:00
Lachlan Kermode
3ebf668d27 refactor timeline config to redux state 2019-01-18 14:58:25 +00:00
Phil Denoncourt
0002fe0df8 Add linting and cleaned up obvious suggestions 2019-01-18 07:56:53 -05:00
Lachlan Kermode
ed57ff82e8 return lost import 2019-01-17 17:12:09 +00:00
Franc Camps-Febrer
4251ed0e94 Allow filtering by category, intersecting with tags 2019-01-16 11:18:57 -05:00
Franc Camps-Febrer
7beb5f4039 Make map on narrative center in first, keep eth in scope 2019-01-13 11:44:35 +01:00
Franc Camps-Febrer
aa3da2d744 Add secure check to set map bounds with narrative 2019-01-13 11:44:35 +01:00
Franc Camps-Febrer
88092c711d Add buffer to time zoom on narrative 2019-01-13 11:44:35 +01:00
Franc Camps-Febrer
e1dc09301b Set map bounds on narrative 2019-01-13 11:44:35 +01:00
Franc Camps-Febrer
8d36671a48 Focus timeline zoom on narrative 2019-01-13 11:44:35 +01:00
Lachlan Kermode
d9c86ee6a8 add toggle button for sites 2019-01-08 14:02:25 +00:00
Lachlan Kermode
1126d54def next/prev functionality on narrative card 2019-01-03 16:48:03 +00:00
Lachlan Kermode
125bd06f59 WIP: increment narrative through redux 2019-01-03 16:40:38 +00:00
Lachlan Kermode
e6742d0b04 factor step state of narrative from NarrativeCard comp to redux 2019-01-03 16:11:03 +00:00
Lachlan Kermode
c75405f2ba WIP: simplify narratives selection 2019-01-03 15:51:09 +00:00
Lachlan Kermode
a39af029a3 WIP: refactor Toolbar.jsx 2019-01-03 15:04:42 +00:00
Lachlan Kermode
c10b741325 synchronous updateSource logic 2018-12-21 12:47:25 +00:00
Lachlan Kermode
ab20d962ad display source errors in card 2018-12-11 11:25:11 +00:00
Franc Camps-Febrer
ccd917f73b Rebase with cleaning up fetchingEvents actions 2018-12-07 09:06:47 +00:00
Franc Camps-Febrer
89a7290dbf Clean store fields, move from state.ui to state.app those that make sense 2018-12-07 08:51:37 +00:00