Commit Graph

103 Commits

Author SHA1 Message Date
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
Lachlan Kermode
ddbee03f50 Feature/ux fixes (#167)
* fix card toggle

* fix bug and bar marker

* reinstate timeline arrows

* adjust (hard to interpret) category y calculation

* shadows for markers as well

* return markers when there are no categories

* remove year in timeline

* make notifications optional

* WIP: render hovered counts

* show number on hover

* lint

* revert to filteredLocations

* linting

* return mapClustersToLocations

* 💄

* lint

Co-authored-by: efarooqui <efarooqui@pandora.com>
2020-10-22 20:09:13 +03:00
Lachlan Kermode
adb5d6f959 lint 2020-10-21 17:53:56 +03:00
Lachlan Kermode
59d2685879 check for USE_CATEGORIES 2020-10-21 16:57:26 +03:00
efarooqui
9bc9c6d9a2 Merging in develop branch 2020-10-20 15:26:15 -07:00
efarooqui
6927ecc3ce Linting fixes 2020-10-19 09:05:54 -07:00
efarooqui
b8b7c712de Ability to toggle categories on / off on timeline 2020-10-12 16:33:19 -07:00
efarooqui
cde94262be Events showing up on timeline after interpolating categories from associations and passing into getY 2020-10-12 14:54:45 -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
909307a6ae Bug with graph nonlocated and getY function; need to refactor toolbar so that it selects the categories on the timeline 2020-10-08 16:58:31 -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
233ddbfc99 Removed logic for selecting all cards on cluster select; putting out PR to get feedback 2020-10-06 10:19:09 -07:00
efarooqui
15729da731 Timeline no longer adjusts upon selection of events; set of events aren't modified according to their place in the timeline 2020-09-23 13:13:11 -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
Lachlan Kermode
84198be0d6 fix corner case when bad data 2020-07-27 10:25:29 +02:00
Lachlan Kermode
4c04e2cf95 add support for arrow keys 2020-06-26 17:10:48 +02:00
Lachlan Kermode
00a8080eba lint 2020-06-18 10:30:25 +02:00
Lachlan Kermode
12e309ed8a enable modifying event radius from config 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
65befef6e0 add loading 2020-06-18 10:30:25 +02:00
Lachlan Kermode
e8a883dbac fix markers (again) 2020-06-18 10:30:25 +02:00
Lachlan Kermode
681447c15b proper fix of GRAPH_NONLOCATED 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
404dd618ae refix map selection 2020-06-18 10:30:25 +02:00
Lachlan Kermode
3b4a3312d5 correct timeline selection 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
154b62f924 remove 'timestamps' in rendering events, clean projects 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
7973d5c1f3 lint 2020-06-18 10:30:25 +02:00
Lachlan Kermode
d676878ab6 💄 2020-06-18 10:30:25 +02:00
Lachlan Kermode
eac3eeaf93 WIP: lots of messy code for better timelines 2020-06-18 10:30:25 +02:00
Lachlan Kermode
85476ee6fb layered projects working; with some bugs 2020-06-18 10:30:25 +02:00
Lachlan Kermode
b9efee8cca WIP: better timeline styles 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
Lachlan Kermode
f303267041 configures category size dynamically 2020-06-18 10:30:25 +02:00
Lachlan Kermode
b977a9a44f fmts dates in timeline better for larger timeframes 2020-06-18 10:30:25 +02:00
Lachlan Kermode
958afb6a41 implements first attempt of unlocated bars
needs profiling and better calculated styles
2020-06-18 10:30:25 +02:00
Lachlan Kermode
afc84e61ac removes numbers, increases opacity for more events instead 2020-06-18 10:30:25 +02:00
delucis
b0e2e6dd45 Make d3 an npm-managed dependency
Closes #91
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
5174814244 clean category filtering 2019-02-14 15:27:48 +00:00
Franc Camps-Febrer
4af0c9c2ef fix lint errors 2019-02-01 12:23:11 -05:00
Franc Camps-Febrer
5bf306453d Add absolute time limites to timeline 2019-01-31 15:49:27 -05:00
Franc Camps-Febrer
7eed1d6fc3 Sync styling of marker in both map and timeline from config 2019-01-31 15:28:46 -05:00
Lachlan Kermode
fb4d0c2d86 lint jsx files 2019-01-23 11:35:34 +00:00
Lachlan Kermode
238e220d9f fix categories labels y position 2019-01-18 16:46:02 +00:00
Lachlan Kermode
3ebf668d27 refactor timeline config to redux state 2019-01-18 14:58:25 +00:00
Lachlan Kermode
e7cac13fb5 significantly refactor presentational components 2019-01-18 11:51:00 +00:00
Lachlan Kermode
5560b09d7b move timeline dimensions to store 2019-01-17 17:17:03 +00:00
Lachlan Kermode
b7618543f7 compose store with custom values in config.js 2019-01-17 11:52:17 -05:00