Commit Graph

730 Commits

Author SHA1 Message Date
Zac Ioannidis
955e3631f9 Merge pull request #179 from forensic-architecture/fix/infopopup-responsiveness
Fix infopopup responsiveness
2020-10-29 12:23:54 +00:00
Zac Ioannidis
d1f4ade83d Make width responsive through a CSS variable that's accessed in React 2020-10-29 11:42:00 +00:00
Zac Ioannidis
4fdfd12401 Lint fix 2020-10-29 11:25:07 +00:00
Zac Ioannidis
ad5995b498 Bump up opacity of infopopup 2020-10-29 11:21:38 +00:00
Zac Ioannidis
e3a7dbe039 Pin infopopup to top, let it float on top of timeline on reduced viewport height 2020-10-29 11:21:26 +00:00
Lachlan Kermode
7080c6d7af Feature/smallfixes (#177)
* return logos

* dates w/o commas

* make arrows slightly larger

* intro/info popup fixes
2020-10-29 09:31:13 +01:00
Ebrahem Farooqui
001365976c Feature/update splash page copy (#176)
* Updating some styles for cover; updating copy

* Changed font size to 18

Co-authored-by: efarooqui <efarooqui@pandora.com>
Co-authored-by: Lachlan Kermode <lachiekermode@gmail.com>
2020-10-29 07:12:29 +01:00
Ebrahem Farooqui
9175057015 Feature/handle cluster select from timeline (#175)
* Updating some styles for cover; updating copy

* Wrote up getSelectedClusters function; testing

* Working on select with clusters being highlighted; rendering highlight around both clusters and individual points, so there's a little overlap

* Removed extraneous props being passed down to cluster

Co-authored-by: efarooqui <efarooqui@pandora.com>
2020-10-29 07:10:56 +01:00
Ebrahem Farooqui
e25b437f75 Merge pull request #174 from forensic-architecture/feature/simplified-card-props
Feature/simplified card props
2020-10-28 17:30:02 -07:00
Zac Ioannidis
5831c9ce4d Update version of design-system 2020-10-28 23:49:32 +00:00
Zac Ioannidis
e9c1497ee8 Added new layout for cards 2020-10-28 23:41:14 +00:00
Zac Ioannidis
e9542f42a9 Lint fix 2020-10-28 19:33:05 +00:00
Zac Ioannidis
f09189469c Added markdown component for hiding source 2020-10-28 19:28:18 +00:00
Zac Ioannidis
e3276dfe8e Added against field 2020-10-28 19:02:22 +00:00
Zac Ioannidis
ac5565167e Merge branch 'develop' into feature/simplified-card-props 2020-10-28 18:25:16 +00:00
Zac Ioannidis
84c32ecf8d Adding color for categories 2020-10-28 18:23:41 +00:00
Zac Ioannidis
c382662093 Added new fields to the rendering of the Card Component 2020-10-28 17:19:28 +00:00
Lachlan Kermode
eff13c3d92 Feature/infopopup (#173)
* make intropopup possible

* aesthetic changes

* lint

* correct infopopup styles
2020-10-28 17:54:59 +01:00
Zac Ioannidis
3e20337b5e Using new Card API 2020-10-28 16:09:29 +00:00
Zac Ioannidis
029bc4a03e Importing <Card /> from NPM-published design-system library (#171)
* Importing cards from NPM

* Added an abstraction inside the store and config for creating layouts for cards

* Adding layout render order for Card

* Allowing lists in the reducer validation

* Added design system package to package.json

* Any version over 0.5.0

* fix lint

Co-authored-by: Lachlan Kermode <lachiekermode@gmail.com>
2020-10-28 11:09:02 +01:00
Lachlan Kermode
901100d756 Feature/add coloring algorithm (#172)
* 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

* wip: fixing corner case

* Cluster opacity feature was out of date

* When deselecting a child, whose parent is on, you cant reselect the child; fixed that bug but replaced it with a bug where you deselect a child and then toggle the parent and the toggle of the child switches instead of toggling like the parent

* generalize isOn check when creating click handler

* rename vars, fix styling

* rm cherrpick

Co-authored-by: efarooqui <efarooqui@pandora.com>
2020-10-28 09:54:16 +01:00
Ebrahem Farooqui
d034258e01 Update toolbar.scss
removing hover and default active color for name of filter in panel
2020-10-27 12:36:37 -07:00
Ebrahem Farooqui
fff1e46b16 Update utilities.js
change opacity back to not using a base value
2020-10-27 12:22:50 -07:00
Ebrahem Farooqui
dba264ced6 Merge pull request #168 from forensic-architecture/fix/dot-vs-bar
fix check to render a dot or bar in timeline
2020-10-27 08:24:22 -07:00
efarooqui
e0cc5e1964 Merged in changes from develop 2020-10-27 08:15:55 -07:00
Ebrahem Farooqui
7438cba250 Merge pull request #170 from forensic-architecture/fix/recursive-corner-case
Fix/recursive corner case
2020-10-27 08:13:29 -07:00
Lachlan Kermode
d38520ea3d fix corner case for toggling parents off 2020-10-27 15:34:46 +01:00
Lachlan Kermode
c1afd75cea fix recursive case
fix corner case for nested filters

cleanup
2020-10-27 14:52:45 +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
Lachlan Kermode
411c39a209 fix check to render a dot or bar in timeline 2020-10-26 11:13:57 +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
Ebrahem Farooqui
f44d3e2481 Merge pull request #166 from forensic-architecture/bugfix/make-supercluster-independently-configurable
Bugfix/make supercluster independently configurable
2020-10-21 21:00:06 -07:00
efarooqui
4107058ec6 Trailing comma 2020-10-21 20:54:25 -07:00
efarooqui
d7ddc80c5c Moved supercluster config outside of map; to set the lowest level at which clusters appear, set maxZoom in config 2020-10-21 20:52:59 -07:00
Ebrahem Farooqui
534400cc7f Merge pull request #165 from forensic-architecture/feature/supercluster-corners
Feature/supercluster corners
2020-10-21 10:24:23 -07:00
efarooqui
779894de77 Merge branch 'develop' of https://github.com/forensic-architecture/timemap into feature/supercluster-corners 2020-10-21 10:11:19 -07:00
efarooqui
080102cd37 Working index load on initial map render; needed to add callback to set state function 2020-10-21 10:03:21 -07:00
Lachlan Kermode
8f01b73b7d Merge pull request #164 from forensic-architecture/feature/supercluster-corners
Render events in timeline when no categories exist
2020-10-21 19:53:29 +03:00
Lachlan Kermode
57c7c3f96e lint 2020-10-21 18:33:51 +03:00
Lachlan Kermode
ceed82e4f3 fix corner case where clusters sometimes remain on screen without events 2020-10-21 18:33:06 +03:00
Lachlan Kermode
adb5d6f959 lint 2020-10-21 17:53:56 +03:00
Lachlan Kermode
3d010e4558 return reduce logic for when event shadows exist 2020-10-21 17:45:12 +03:00
Lachlan Kermode
9a1e2f6ad1 fix timeline render when there are no categories 2020-10-21 17:35:36 +03:00
Lachlan Kermode
59d2685879 check for USE_CATEGORIES 2020-10-21 16:57:26 +03:00
Ebrahem Farooqui
a66bc3a896 Merge pull request #162 from forensic-architecture/feature/add-supercluster-visualization
Feature/add supercluster visualization
2020-10-20 15:31:31 -07:00
efarooqui
9bc9c6d9a2 Merging in develop branch 2020-10-20 15:26:15 -07:00
Ebrahem Farooqui
303abe8b94 Merge pull request #163 from forensic-architecture/feature/refactor-categories
Feature/refactor categories
2020-10-20 15:21:43 -07:00
efarooqui
5e2982786f Linting fixes 2020-10-20 15:15:04 -07:00
efarooqui
cd19910b06 Loads index when locations are finally available in props; added through componentDidUpdate method 2020-10-20 13:28:58 -07:00
efarooqui
e03fc472e0 Removed line 2020-10-19 21:00:31 -07:00