Commit Graph

68 Commits

Author SHA1 Message Date
Lachlan Kermode
eff13c3d92 Feature/infopopup (#173)
* make intropopup possible

* aesthetic changes

* lint

* correct infopopup styles
2020-10-28 17:54:59 +01:00
Ebrahem Farooqui
c454775fcb Feature/add coloring algorithm (#169)
* Fixed bug: when all child filters unselected, turn off parent as well

* Refactored placement of onSelectFilter to be in Layout; working logic for updating coloring sets

* Linting fixes and removal of console logs

* Added separate component for colored markers which clusters and events will use; working calculation of color percentages based off of coloringset

* Working colors for clusters; need to implement for individual points as well

* Adding two new features to select whether to color by association or by category (can't do both)

* Working colors for filter list panel; text and checkbox change according to colorset groupings

* Working timeline events with coloring algorithm

* Handle select acts different on map when we don't render all points and only filter through clusters; can fix this by not filtering before passing in locations to events in map

* Removed extraneous prop

* Working point count on hover again; numbers were showing up below the colored markers

* Linting fixes and minor refactor of calculateColorPercentage for linting to ass

* Comments and more linting fixes

* add dev command for windows subsystem for linux

* return default styles for category toggles

* dynamically filter out timelines

* calibrate styling

* further calibrations

* correct contrast

* lint

Co-authored-by: efarooqui <efarooqui@pandora.com>
Co-authored-by: Lachlan Kermode <lachiekermode@gmail.com>
2020-10-27 13:33:32 +01:00
efarooqui
6927ecc3ce Linting fixes 2020-10-19 09:05:54 -07:00
efarooqui
2cff35c3f2 Removed commented out logic 2020-10-16 11:23:00 -07:00
efarooqui
b35fb48860 Setting initial categories upon load; need to modify for timeline and related events 2020-10-12 11:15:34 -07:00
efarooqui
67c336c131 Categories showing up on timeline with events; events are stacked on both and connected by a bar which looks like a UI bug somewhere 2020-10-06 17:22:47 -07:00
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
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
efarooqui
0ea109968c Pulling in associations correctly; condensed filters and narratives into associations 2020-08-25 08:52:04 -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
Lachlan Kermode
e381d0d15a add USE_FILTER_DESCRIPTIONS option 2020-07-15 10:22:47 +02:00
Lachlan Kermode
cf322b8f0d fix lint 2020-06-26 17:10:48 +02:00
Lachlan Kermode
bcabc2b2dc lint 2020-06-26 17:10:48 +02:00
Lachlan Kermode
de2515063e allow loading multiple events 2020-06-26 17:10:48 +02:00
Lachlan Kermode
f6fb40d4be toolbar and zoom control fixes 2020-06-18 10:30:25 +02:00
Lachlan Kermode
c473e4a998 make USE_CATEGORIES optional 2020-06-18 10:30:25 +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
8d2879e227 USE_TAGS -> USE_FILTERS 2020-06-18 10:30:25 +02:00
Lachlan Kermode
e93d7d8831 rewrite features as part of store + add HIGHLIGHT_GROUPS 2020-06-18 10:30:25 +02:00
Lachlan Kermode
3641756539 WIP: overridden colours and shapes 2020-06-18 10:30:25 +02:00
Lachlan Kermode
421af5e60c improve project graph 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
2a275f7bd4 rm old reset action 2019-02-14 15:47:39 +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
Phil Denoncourt
0002fe0df8 Add linting and cleaned up obvious suggestions 2019-01-18 07:56:53 -05:00
Lachlan Kermode
9d6d51e11d load shape data from ext 2019-01-17 17:40:47 +00:00
Lachlan Kermode
68d43ad9a2 💄 2019-01-17 10:00:55 +00:00
Lachlan Kermode
a6e04b23ee more generic error handling actions 2019-01-17 09:50:07 +00:00
Lachlan Kermode
79af252b33 add more descriptive error handling for optional exts 2019-01-17 09:40:04 +00:00
Franc Camps-Febrer
4251ed0e94 Allow filtering by category, intersecting with tags 2019-01-16 11:18:57 -05:00
Lachlan Kermode
d9c86ee6a8 add toggle button for sites 2019-01-08 14:02:25 +00:00
Lachlan Kermode
125bd06f59 WIP: increment narrative through redux 2019-01-03 16:40:38 +00:00
Lachlan Kermode
795acac7ca redux action infrastructure 2018-12-21 12:47:25 +00:00
Lachlan Kermode
ce18bfb5ea temp fix to render domain error visible 2018-12-18 17:35:07 +00:00
Lachlan Kermode
fb84d6883b basic source schema reading data in 2018-12-13 17:31:32 +00:00
Lachlan Kermode
0c54e07f8f fetchSelected -> updateSelected 2018-12-13 17:31:32 +00:00
Lachlan Kermode
92c98e9199 fix default category style 2018-12-11 17:05:21 +00:00
Lachlan Kermode
ab20d962ad display source errors in card 2018-12-11 11:25:11 +00:00
Franc Camps-Febrer
dc1dece1d9 Fix some rebasing conflicts 2018-12-10 16:46:18 +01:00