Commit Graph

101 Commits

Author SHA1 Message Date
Miguel Sozinho Ramalho
ad1ccc4fd3 editors note (delayed commit) (#63) 2023-01-06 22:14:28 +00:00
Andrew Mudrov
53d6f389e3 feat(main): style changes and mobile version (#58)
Co-authored-by: msramalho <19508417+msramalho@users.noreply.github.com>
2022-10-31 17:40:35 +00:00
Logan Williams
64d6b34469 Adds "feat: serialize platform state to the url" to ukraine-timemap (#59)
Co-authored-by: Felix Spöttel <1682504+fspoettel@users.noreply.github.com>
Co-authored-by: msramalho <19508417+msramalho@users.noreply.github.com>
2022-10-26 17:46:00 +01:00
msramalho
94812b97ce format 2022-04-06 19:16:51 +02:00
msramalho
799f67ea49 implements csv+json downloads 2022-04-06 18:57:09 +02:00
hgrsd
a14ad2670a feat: dynamic initial time range 2022-03-31 18:12:16 -04:00
msramalho
1b30f320b5 closes #9 missing events in filter 2022-03-22 16:29:31 +01:00
Logan Williams
ca048c38cf Fix bug caused by interrupting flyTo 2022-03-22 16:10:58 +01:00
Logan Williams
137603dfaa Clean up mobile changes, fixes #5 2022-03-21 17:05:05 +01:00
Logan Williams
28a5f644fc Quick fixes for mobile 2022-03-20 08:16:47 +01:00
msramalho
57ca9921ae allows cover hide 2022-03-17 12:42:01 +01:00
msramalho
5fdee5020f minor UI improvements 2022-03-14 14:42:02 +01:00
Lachlan Kermode
c1c3c1a2db Nicer arrows on timeline when zoomed in 2022-03-06 21:43:13 -05:00
Lachlan Kermode
cb69b40ae2 Zoom to timeframe on timeline click 2022-03-06 21:00:00 -05:00
efarooqui
7156639ec3 Polygon shapes abstracted to be types of checkboxes; abstracted rendering of panel into one component; importing shapes from separate endpoint 2021-05-20 18:44:26 -07:00
Lachlan Kermode
e99398ceab Cleaning technical debt (#192)
* abstract Space component to switch out Map

* basic viewing possible

* restructure components dir

* all jsx --> js

* App.jsx --> App.js

* comment out 3d for now
2021-01-19 22:22:12 +01:00
Lachlan Kermode
1bbcd57e5e Fix/clean errors (#191)
* clean dev errors

* add check command

* yarn -> npm in travis

* fix all warnings

* fix base test

* 💄
2021-01-17 18:16:28 +13:00
Zac Ioannidis
81e00fd917 Using prettier for linting 2020-12-08 13:13:50 +00:00
Zac Ioannidis
6eb6083984 Don't fall back when on tablet - Fix infopoup on top of screen, so the close button isn't obscured on small viewports 2020-10-30 16:00:20 +00:00
Lachlan Kermode
8b507fde96 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
2020-10-29 18:14:32 +01: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
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
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
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
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
efarooqui
9dd5eabd3a Linting fixes 2020-10-06 10:31:17 -07:00
efarooqui
9357b5e281 Broken onClick clusters working after validating longitude and latitude and only allowing locations to contain valid coordinates 2020-10-01 15:35:46 -07:00
efarooqui
13295c5f42 Linting fixes 2020-09-22 20:31:05 -07:00
efarooqui
930aaaa752 Working onSelect with respect to caret toggle; onSelect doesnt fire off when caret is selected 2020-09-22 17:12:09 -07:00
efarooqui
2423a5a5ad Issue with the difference between clicking on a card and clicking on the caret (ie is there an onClick functionality for the card?) 2020-09-22 16:55:13 -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
efarooqui
a4cd28d19f Debugging issues with broken sources 2020-09-22 10:26:05 -07:00
Sol Abrahams
a1e772b72f requested changes made 2020-09-20 10:24:05 +01:00
Sol
bdc683aa1d cards clickability added 2020-09-20 10:23:45 +01:00
Sol
1f4f307f0d lint fixes 2020-09-20 10:23:45 +01:00
Sol
9d846c5c4c initial search bar feature added on new branch 2020-09-20 10:23:15 +01:00
efarooqui
da4e640360 Need to resolve minor issues with association duplicates; removing prototype tooltip; source not showing up and event gets deselected 2020-09-18 07:52:08 -07:00
efarooqui
7f12d1e86c Linting fixes 2020-09-15 11:36:52 -07:00
efarooqui
d968280b1a No associated events for a filter => alert shows when attempting to narrativise 2020-09-15 11:36:12 -07:00
efarooqui
8442ca7bb4 Fixed linting issues 2020-09-14 08:12:57 -07:00
efarooqui
57818dd971 Events now only have associations; when filters and narratives are needed fromevents, interpolate from evt.associations 2020-09-10 22:39:29 -07:00
efarooqui
ed7c3551d6 Got rid of narrativeLinks in CardStack and deprecated usage of USE_ASSOCIATION_DESCRIPTIONS in embedded logic 2020-09-09 20:41:57 -07:00
efarooqui
10e905afeb 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 2020-09-09 20:38:11 -07:00
efarooqui
a1f7cf69d4 Beginning to remove extraneous components and logic 2020-09-09 07:43:33 -07:00