Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* implicit ids in events * fix timeline selections * fix corner condition * allow loading multiple events * filters on OSM * WIP: filters as narratives always * move those dates to the top * apply narratives only if FILTERS_AS_NARRATIVES set * update example config * fix hierarchical tag toggle * update React to latest * fix too small message * desc -> description in sources * add hack to fix timeline not showing * add support for arrow keys * show error for invalid dates it srsly messes with binary search! * drop invalidly dated events entirely * fix corner cases in narrative left/right * insetSource in filter narrative * lint * fix lint * Bump npm-registry-fetch from 4.0.0 to 4.0.5 Bumps [npm-registry-fetch](https://github.com/npm/registry-fetch) from 4.0.0 to 4.0.5. - [Release notes](https://github.com/npm/registry-fetch/releases) - [Changelog](https://github.com/npm/npm-registry-fetch/blob/latest/CHANGELOG.md) - [Commits](https://github.com/npm/registry-fetch/commits) Signed-off-by: dependabot[bot] <[email protected]> * move cover over loading * add USE_FILTER_DESCRIPTIONS option * add support for showing filter descriptions in narrativised mode * infopopup copy more general * make caret flip on card open * nicer date, remove precision magic * cover more sensible defaults * up and down arrows for movement * better logo styling, variable button text * add bellingcat logo * add support for custom fields * nicer dates in timeline header * don't rely on unique location names * update cover * cover with optional buttons * change to red! * fix img occlusion * fix on safari * ++ * update * lint * Remove unneccesary if statement name = Sol email = [email protected] * Update app.js Update for linter * Remove lines for linter * remove comment on minTime and maxTime variables * Bump lodash from 4.17.11 to 4.17.19 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.11...4.17.19) Signed-off-by: dependabot[bot] <[email protected]> * add default rangeLimits * fix corner case when bad data * rm unnecessary deps * initial search bar feature added on new branch * bug fixes * lint fixes * more lint fixes * cards clickability added * lint fixes * lint * map and cards clickable * lint fix * lint fixes * lint fixes * Refactored to pass down methods as props. Added CSS pointer * lint fix * rename variables * remove moveinnarrative function * refactor onselect * added and changed var names * lint fixes * lint fixes * removed console log * simplified component logic * lint fixes * console logs removed and changes made * Pulling in associations correctly; condensed filters and narratives into associations * Modified validators file to match new associations schema and necessary semantic and sanitization changes * Finding association duplicates; sanitizing appropriately; beginning to edit narrativise function in UI * Filter render broken; moved narrative and narrativeState to app.filters and restructured appropriately with narrativeIdx selector * Refactored filter list for display; converting filter paths to node, child objects that are toggleable * correct * Bump node-sass from 4.12.0 to 4.13.1 Bumps [node-sass](https://github.com/sass/node-sass) from 4.12.0 to 4.13.1. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](sass/node-sass@v4.12.0...v4.13.1) Signed-off-by: dependabot[bot] <[email protected]> * requested changes made * Bump js-yaml from 3.12.0 to 3.14.0 Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.14.0. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](nodeca/js-yaml@3.12.0...3.14.0) Signed-off-by: dependabot[bot] <[email protected]> * Bump esm from 3.0.84 to 3.2.25 Bumps [esm](https://github.com/standard-things/esm) from 3.0.84 to 3.2.25. - [Release notes](https://github.com/standard-things/esm/releases) - [Commits](standard-things/esm@3.0.84...3.2.25) Signed-off-by: dependabot[bot] <[email protected]> * Bump http-proxy from 1.17.0 to 1.18.1 Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1. - [Release notes](https://github.com/http-party/node-http-proxy/releases) - [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md) - [Commits](http-party/node-http-proxy@1.17.0...1.18.1) Signed-off-by: dependabot[bot] <[email protected]> * Working narrative feature minus getNarrativeLinks (need further clarification); working on modifying narrativise filters feature * Need clarification on USE_ASSOCIATION_DESCRIPTIONS for narrativise feature * Setting USE_ASSOC_DESC to fals * Beginning to remove extraneous components and logic * Deprecated usage of env constants USE_ASSOCIATION_DESCRIPTIONS, USE_NARRATIVESand FILTERS_AS_NARRATIVES to instead check for existence of narratives; deprecated usage of unused components such as CardFilters, CardNarrative, and NarrativeLink * Got rid of narrativeLinks in CardStack and deprecated usage of USE_ASSOCIATION_DESCRIPTIONS in embedded logic * Fixed up event schema to reduce filters and narratives to associations; removed extraneous comments for deprecated functions * Events now only have associations; when filters and narratives are needed fromevents, interpolate from evt.associations * Removed tags array from event schema * Minor typo with env var GRAPH_NONLOCATED * Fixed linting issues * No associated events for a filter => alert shows when attempting to narrativise * Linting fixes * map changed to some * console.log removed * Need to resolve minor issues with association duplicates; removing prototype tooltip; source not showing up and event gets deselected * Removing tooltip import * initial search bar feature added on new branch * lint fixes * more lint fixes * cards clickability added * lint fixes * requested changes made * map changed to some * console.log removed * Wrote new recursive function to accurately map filter paths to filter list in panel; need to fix selection of filters upon toggle * Debugging issues with broken sources * Issue with the difference between clicking on a card and clicking on the caret (ie is there an onClick functionality for the card?) * Working onSelect with respect to caret toggle; onSelect doesnt fire off when caret is selected * Linting fixes * Working multi-select; need to stop firing update timerange upon select * rm unused search * rm import * Removed extraneous USE_SEARCH declarations * Timeline no longer adjusts upon selection of events; set of events aren't modified according to their place in the timeline * Building with supercluster; working on map refactor * Clustering working upon zoom; loading cluster data appropriately initially; need to style and add markers * Individual points showing with cluster logic; need to define styling and appearance for larger clusters * Creating cluster styling and component to handle cluster visualization and mapping * Working cluster visualization; need to modify styling for clusters for size and work out color based on events * Cluster sizes showing up appropriately and unclustering upon zoom; need to nail down styling and add onSelect for clusters * Getting appropriate clusterZoom; flyto moving to incorrect location on map * Working onCluster select; zooming in and watching clusters break down into individual clusters and points * Broken onClick clusters working after validating longitude and latitude and only allowing locations to contain valid coordinates * Working on select that selects all events in a cluster; need to configure UI to both zoom and select events * Removed logic for selecting all cards on cluster select; putting out PR to get feedback * Linting fixes * Removing commented out sections * Categories showing up on timeline with events; events are stacked on both and connected by a bar which looks like a UI bug somewhere * Working filters with added check to make sure empty locations dont create clusters * Configuring maxbounds in config to allow pan to not snap out of center * Bug with graph nonlocated and getY function; need to refactor toolbar so that it selects the categories on the timeline * Setting initial categories upon load; need to modify for timeline and related events * Events showing up on timeline after interpolating categories from associations and passing into getY * Ability to toggle categories on / off on timeline * Rewrote opacity alg for clusters * Modified cluster styling to have gradients * Changed back to normal opacities instead of radial gradients; could add a var that's read from the config to determine styling: radial gradient || normal opacity * Modified clusters to take in radial gradient as input if specified * Removed commented out logic * Linting fixes * Linting fixes * Created utility function isIdentical; moved DefsClusters into Clusters file * Some linting fixes * Injecting loading overlay into map for cases where domain hasnt been loaded yet * Removed line * Loads index when locations are finally available in props; added through componentDidUpdate method * Linting fixes * check for USE_CATEGORIES * fix timeline render when there are no categories * return reduce logic for when event shadows exist * lint * fix corner case where clusters sometimes remain on screen without events * lint * Working index load on initial map render; needed to add callback to set state function * Moved supercluster config outside of map; to set the lowest level at which clusters appear, set maxZoom in config * Trailing comma * 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 <[email protected]> * fix check to render a dot or bar in timeline * 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 <[email protected]> Co-authored-by: Lachlan Kermode <[email protected]> * fix recursive case fix corner case for nested filters cleanup * fix corner case for toggling parents off * Update utilities.js change opacity back to not using a base value * Update toolbar.scss removing hover and default active color for name of filter in panel * 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 <[email protected]> * 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 <[email protected]> * Using new Card API * Feature/infopopup (#173) * make intropopup possible * aesthetic changes * lint * correct infopopup styles * Added new fields to the rendering of the Card Component * Adding color for categories * Added against field * Added markdown component for hiding source * Lint fix * Added new layout for cards * Update version of design-system * 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 <[email protected]> * Feature/update splash page copy (#176) * Updating some styles for cover; updating copy * Changed font size to 18 Co-authored-by: efarooqui <[email protected]> Co-authored-by: Lachlan Kermode <[email protected]> * Feature/smallfixes (#177) * return logos * dates w/o commas * make arrows slightly larger * intro/info popup fixes * Pin infopopup to top, let it float on top of timeline on reduced viewport height * Bump up opacity of infopopup * Lint fix * Make width responsive through a CSS variable that's accessed in React * some styling fixes (#178) * logos at bottom * use GT-Zirkon font * update filter/category copy * add a fallback font * stop tracking * make timeline smaller for smaller laptops * fix for firefox responsive intropopup * mobile fallback * update design system version * update example (#180) * Don't fall back when on tablet - Fix infopoup on top of screen, so the close button isn't obscured on small viewports * Added generators for card layouts. (#182) * Added generators for card layouts. These are optionally defined in the timemap config * Removed US2020-specific layout generation - now it's being specified in the config * amend config (#183) * update CONTRIBUTING.md (#185) * update contributing * update READMe Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sol <[email protected]> Co-authored-by: efarooqui <[email protected]> Co-authored-by: Sol Abrahams <[email protected]> Co-authored-by: Ebrahem Farooqui <[email protected]> Co-authored-by: Zac Ioannidis <[email protected]>
- Loading branch information
7 people
authored
Nov 25, 2020
1 parent
13a8420
commit 32feff8
