Commit Graph

137 Commits

Author SHA1 Message Date
msramalho
4081710de4 displaying civid 2022-03-15 12:06:09 +01: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
Lachlan Kermode
3d8ec706ed Minor cleanup (#220)
* Fix README; add missing dev dependency

* Fix validators to filter out bad events and sources

* Better defaults in config
2021-10-21 17:28:16 +02: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
c688a35958 event.shape is initially shape ID, interpolated during domain fetch; adding base styles for checkbox inline with said component; generalized checkbox comp across three panels 2021-05-21 16:18:35 -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
15fbba8d06 Refactored selectEvents to account for filter path strs; working coloring alg again; evts not showing up on timeline 2021-05-07 15:07:48 -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
efarooqui
b09f85748b Modifying lat long to have decimals and not commas; adding extra title field to associations 2021-04-28 18:10:41 -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
Zac Ioannidis
81e00fd917 Using prettier for linting 2020-12-08 13:13:50 +00: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
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
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
2cff35c3f2 Removed commented out logic 2020-10-16 11:23:00 -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
67c336c131 Categories showing up on timeline with events; events are stacked on both and connected by a bar which looks like a UI bug somewhere 2020-10-06 17:22:47 -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
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
c60ee24792 Removed tags array from event schema 2020-09-10 22:40: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
2bc6affbf5 Fixed up event schema to reduce filters and narratives to associations; removed extraneous comments for deprecated functions 2020-09-09 21:22:22 -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
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
efarooqui
fe9a5302fa Finding association duplicates; sanitizing appropriately; beginning to edit narrativise function in UI 2020-08-26 22:06:13 -07:00
efarooqui
1d1a9971ab Modified validators file to match new associations schema and necessary semantic and sanitization changes 2020-08-26 09:38:41 -07:00
efarooqui
0ea109968c Pulling in associations correctly; condensed filters and narratives into associations 2020-08-25 08:52:04 -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
e985857d73 add support for custom fields 2020-07-15 10:22:47 +02:00
Lachlan Kermode
a708fd5670 add support for showing filter descriptions in narrativised mode 2020-07-15 10:22:47 +02:00
Lachlan Kermode
e381d0d15a add USE_FILTER_DESCRIPTIONS option 2020-07-15 10:22:47 +02:00
Lachlan Kermode
79d2acec22 drop invalidly dated events entirely 2020-06-26 17:10:48 +02:00
Lachlan Kermode
cdd88917d4 show error for invalid dates
it srsly messes with binary search!
2020-06-26 17:10:48 +02:00
Lachlan Kermode
c1863fba07 desc -> description in sources 2020-06-26 17:10:48 +02:00
Lachlan Kermode
3a847a2042 implicit ids in events 2020-06-19 12:08:14 +02:00