Commit Graph

646 Commits

Author SHA1 Message Date
Ebrahem Farooqui
794a69b72d Merge pull request #160 from forensic-architecture/topic/rm-search
remove unused search
2020-09-23 10:30:28 -07:00
efarooqui
0374ac5d76 Removed extraneous USE_SEARCH declarations 2020-09-23 10:25:18 -07:00
Lachlan Kermode
a089ea587b rm import 2020-09-23 19:02:59 +02:00
Lachlan Kermode
251eee4c96 rm unused search 2020-09-23 18:41:01 +02:00
Lachlan Kermode
f46b4ebfd3 Merge pull request #159 from forensic-architecture/feature/refactor-filters-and-narratives-to-associations
Feature/refactor filters and narratives to associations
2020-09-23 17:12:34 +01: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
efarooqui
3b4efc0cce Wrote new recursive function to accurately map filter paths to filter list in panel; need to fix selection of filters upon toggle 2020-09-21 21:37:11 -07:00
Lachlan Kermode
2e736ad9fe Merge pull request #151 from sol-austin/add-search-bar
Add search bar
2020-09-21 13:04:01 +01:00
Sol Abrahams
546faa15bc Merge branch 'add-search-bar' of https://github.com/sol-austin/timemap into add-search-bar 2020-09-20 10:27:18 +01:00
Sol Abrahams
648d014de6 console.log removed 2020-09-20 10:24:08 +01:00
Sol Abrahams
f9a0cd77b2 map changed to some 2020-09-20 10:24:08 +01:00
Sol Abrahams
a1e772b72f requested changes made 2020-09-20 10:24:05 +01:00
Sol
0602eb1593 lint fixes 2020-09-20 10:23:45 +01:00
Sol
bdc683aa1d cards clickability added 2020-09-20 10:23:45 +01:00
Sol
da51dabe82 more lint fixes 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
6ae472b96f Removing tooltip import 2020-09-18 10:50:23 -07: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
Sol Abrahams
1c4c6f07a6 console.log removed 2020-09-17 19:28:38 +01:00
Sol Abrahams
4dbe70b90d map changed to some 2020-09-17 19:27:53 +01:00
Sol Abrahams
4e27e0a727 Merge branch 'develop' of https://github.com/forensic-architecture/timemap into add-search-bar 2020-09-17 19:17:38 +01: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
5b2fd22405 Minor typo with env var GRAPH_NONLOCATED 2020-09-11 08:14:23 -07:00
efarooqui
a0bf8a90f6 Merge branch 'develop' of https://github.com/forensic-architecture/timemap into feature/refactor-filters-and-narratives-to-associations 2020-09-11 08:04:03 -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
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
efarooqui
c264071cdb Setting USE_ASSOC_DESC to fals 2020-09-07 16:28:19 -07:00
efarooqui
4c5bafcc05 Need clarification on USE_ASSOCIATION_DESCRIPTIONS for narrativise feature 2020-09-07 16:26:10 -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
dependabot[bot]
6a3b83fb3b 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](https://github.com/http-party/node-http-proxy/compare/1.17.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-07 17:22:00 +02:00
dependabot[bot]
79d8bee0ab 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](https://github.com/standard-things/esm/compare/3.0.84...3.2.25)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-07 15:48:13 +02:00
dependabot[bot]
cc42a46056 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](https://github.com/nodeca/js-yaml/compare/3.12.0...3.14.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-07 15:47:59 +02:00
Sol Abrahams
718e350a3f requested changes made 2020-09-05 21:07:01 +01:00
dependabot[bot]
d51f7b1ede 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](https://github.com/sass/node-sass/compare/v4.12.0...v4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-04 16:58:30 +02:00
Lachlan Kermode
875f83a3e6 correct 2020-09-02 16:45:24 +02: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