Commit Graph

69 Commits

Author SHA1 Message Date
hgrsd
a14ad2670a feat: dynamic initial time range 2022-03-31 18:12:16 -04:00
Lachlan Kermode
330a7c56d0 Improved styles for timeline and card 2022-03-07 09:11:30 -05:00
Lachlan Kermode
a84fd55e62 Add ticks to redux state 2022-03-06 21:20:03 -05:00
efarooqui
8e8416136e All filters working in conjunction; can filter on shape, filter, and category separately 2021-05-21 17:17:43 -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
123ed80d74 Allow categories to be selected by title and not id; allow for primary key field 2021-04-30 17:47:16 -07:00
Zac Ioannidis
81e00fd917 Using prettier for linting 2020-12-08 13:13:50 +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
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
efarooqui
6927ecc3ce Linting fixes 2020-10-19 09:05:54 -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
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
Sol
9d846c5c4c initial search bar feature added on new branch 2020-09-20 10:23:15 +01:00
efarooqui
8442ca7bb4 Fixed linting issues 2020-09-14 08:12:57 -07:00
efarooqui
bd4f61e7ed Working narrative feature minus getNarrativeLinks (need further clarification); working on modifying narrativise filters feature 2020-09-07 16:10:09 -07:00
efarooqui
6492be18d9 Refactored filter list for display; converting filter paths to node, child objects that are toggleable 2020-09-01 09:33:05 -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
Sol
19201a5808 console logs removed and changes made 2020-08-07 19:26:01 +02:00
Sol
cc2561aa30 added and changed var names 2020-08-07 19:26:01 +02:00
Sol
0a6e13ba88 Refactored to pass down methods as props. Added CSS pointer 2020-08-07 19:26:01 +02:00
Sol
90f1de296a lint fixes 2020-08-07 19:26:01 +02:00
Sol
31bdbd0313 map and cards clickable 2020-08-07 19:26:01 +02:00
Sol
956534e247 remove comment on minTime and maxTime variables 2020-07-21 09:48:43 +02:00
Sol Abrahams
0673242148 Update app.js
Update for linter
2020-07-21 09:48:43 +02:00
Sol
71d1664542 Remove unneccesary if statement
name = Sol
email = solomonabrahams100@gmail.com
2020-07-21 09:48:43 +02:00
Lachlan Kermode
16358f5ab9 all tags->filters 2020-06-18 10:30:25 +02:00
Lachlan Kermode
65befef6e0 add loading 2020-06-18 10:30:25 +02:00
Lachlan Kermode
28501fe867 narratives fixed 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
64087bf1e5 return hierarchical tags 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
Sam Ludford
7755a8fee2 renamed js folder as common + moved hardcoded colors into global.js 2019-05-22 12:50:22 +01:00
Lachlan Kermode
552685f196 lint 2019-02-19 14:52:28 +00:00
Lachlan Kermode
eeed18e6b8 fix narrativeStepStyles inconsistency 2019-02-19 14:51:06 +00:00
Lachlan Kermode
2a275f7bd4 rm old reset action 2019-02-14 15:47:39 +00:00
Lachlan Kermode
7463aa33ca clear tags and categories when switching to narrative 2019-02-14 15:40:38 +00:00
Lachlan Kermode
5174814244 clean category filtering 2019-02-14 15:27:48 +00:00
Lachlan Kermode
4e9128476d clean tag representation and filtering 2019-02-14 14:27:36 +00:00
Lachlan Kermode
ed9af1cbf6 add cover with toggle 2019-02-07 12:04:47 +00:00
Lachlan Kermode
3de7b3a8c5 lint additional files 2019-01-22 16:15:55 +00:00
Lachlan Kermode
20d39f3bf9 Merge remote-tracking branch 'origin/develop' into add-linting 2019-01-22 15:34:07 +00:00
Lachlan Kermode
38f7662ff6 correct updateTimerange reducer 2019-01-18 17:47:28 +00:00
Lachlan Kermode
3ebf668d27 refactor timeline config to redux state 2019-01-18 14:58:25 +00:00
Phil Denoncourt
0002fe0df8 Add linting and cleaned up obvious suggestions 2019-01-18 07:56:53 -05:00
Lachlan Kermode
ed57ff82e8 return lost import 2019-01-17 17:12:09 +00:00
Franc Camps-Febrer
4251ed0e94 Allow filtering by category, intersecting with tags 2019-01-16 11:18:57 -05:00
Franc Camps-Febrer
7beb5f4039 Make map on narrative center in first, keep eth in scope 2019-01-13 11:44:35 +01:00
Franc Camps-Febrer
aa3da2d744 Add secure check to set map bounds with narrative 2019-01-13 11:44:35 +01:00
Franc Camps-Febrer
88092c711d Add buffer to time zoom on narrative 2019-01-13 11:44:35 +01:00