Commit Graph

505 Commits

Author SHA1 Message Date
efarooqui
8206edb310 Polygon checkbox working active and inactive; need to hook up action to filter through events 2021-05-21 14:48:40 -07: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
efarooqui
87d84df8b4 Reading in from toolbar copy from config for narrative and filter panels 2021-05-13 18:23:40 -07:00
efarooqui
b50ee8b5fe Creates an event type called TIMELINE_ONLY which doesnt get filtered by filter panel; allowing for panel copy to be read in via the config 2021-05-12 20:03:02 -07:00
efarooqui
de48bf3556 Modified square and star shapes 2021-05-12 16:59:02 -07:00
efarooqui
fb954d1b3d Added new triangle and pentagon shapes; modified star shape to rotate into position 2021-05-11 23:04:23 -07:00
efarooqui
0430ecbe02 Removing extraneous comment 2021-05-11 21:24:06 -07:00
efarooqui
c06afb9919 Fixing extraneous errors with html attrs 2021-05-10 16:07:12 -07:00
efarooqui
0b989465f6 Fixing bugs with timeline markers; issues with using category as associations obj vs just title 2021-05-10 15:57:59 -07:00
efarooqui
a1b7fb5259 Refactored all of filter logic to accomodate for paths instead of simply looking at leaf node in tree; fixes bugs where leaf path is non-unique 2021-05-06 19:49:32 -07:00
efarooqui
d3c4c44da5 Working aggregate filter paths with path as key; need to reorganize coloring algorithm 2021-05-06 16:42:29 -07:00
efarooqui
016add8840 Merge branch 'develop' of https://github.com/forensic-architecture/timemap into bugfix/modify-filters-to-use-id-not-title 2021-05-06 16:24:48 -07:00
efarooqui
62ff945ff6 Extraneous comment 2021-04-30 18:57:34 -07:00
Ebrahem Farooqui
6f7cd47ee4 Merge pull request #201 from forensic-architecture/bugfix/select-category-by-title
Allow categories to be selected by title and not id
2021-04-30 17:51:53 -07:00
efarooqui
604ff44ff2 Removing misc comments 2021-04-30 17:49:59 -07:00
efarooqui
123ed80d74 Allow categories to be selected by title and not id; allow for primary key field 2021-04-30 17:47:16 -07:00
Ebrahem Farooqui
1d10ef1d99 Triggering job from develop branch 2021-04-28 19:49:03 -07:00
Ebrahem Farooqui
d6c5b55152 open street maps is our default base map 2021-04-28 18:48:07 -07:00
efarooqui
6b2e110295 Modifying aggregatedpaths func to return paths as keys to object instead of just singular leaf 2021-04-28 18:05:23 -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
2108a79808 Changed import path for the React design system, so that it can be used by Jest 2020-12-14 13:50:17 +00:00
Zac Ioannidis
02128ceed3 Added Jest test suite 2020-12-14 13:30:49 +00:00
Zac Ioannidis
3746705ee2 Using generateCardLayout from our design library to switch between appropriate card layouts 2020-12-08 13:40:46 +00:00
Zac Ioannidis
81e00fd917 Using prettier for linting 2020-12-08 13:13:50 +00:00
Zac Ioannidis
3a54cd7df5 Ingesting config through Create React App 2020-12-07 19:28:07 +00:00
Juan Camilo González
ffdb330f7f Lint fixes 2020-11-30 09:19:23 -05:00
Juan Camilo González
c0a7036803 🌐 Translate JS dates & propose utility for d3 locale 2020-11-29 18:28:24 -05:00
Juan Camilo González
430440569a 🌐 Use locale throughout layouts 2020-11-29 18:25:51 -05:00
Zac Ioannidis
e1de58e701 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
2020-11-20 07:35:57 +01: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
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
efarooqui
e0cc5e1964 Merged in changes from develop 2020-10-27 08:15:55 -07:00