efarooqui
1563e62311
Removing custom changes from example config
2021-08-08 17:09:06 -07:00
efarooqui
096cfaa073
Minor changes to example config for feature flags
2021-08-08 17:06:48 -07:00
Ebrahem Farooqui
ba4f5efdd2
Merge pull request #211 from forensic-architecture/feature/allow-for-multiple-categories
...
Feature/allow for multiple categories
2021-05-24 22:50:20 -07:00
efarooqui
14593aeba2
Removing extraneous USE_MULTIPLE_FILTERS feature from initial store
2021-05-24 22:49:42 -07:00
efarooqui
938f4a7239
Merge branch 'develop' of https://github.com/forensic-architecture/timemap into feature/allow-for-multiple-categories
2021-05-24 22:48:17 -07:00
Ebrahem Farooqui
dff3080a74
Merge pull request #210 from forensic-architecture/feature/add-shapes-filter-panel
...
Feature/add shapes filter panel
2021-05-24 22:45:50 -07:00
Ebrahem Farooqui
7178acb24b
change push branch to dev
2021-05-24 22:19:54 -07:00
Ebrahem Farooqui
bf9ead624f
Changing push branch temp
2021-05-24 22:16:48 -07:00
efarooqui
76140ab261
Merge branch 'feature/add-shapes-filter-panel' of https://github.com/forensic-architecture/timemap into feature/allow-for-multiple-categories
2021-05-24 22:14:22 -07:00
efarooqui
65f32e8e0c
Minor edit to containerStyles for Checkbox component
2021-05-24 22:09:51 -07:00
efarooqui
09d82b4da5
Working with default category values from store if none are provided in config
2021-05-24 22:00:51 -07:00
efarooqui
5c3fffd99e
Allows for multiple specified categories that are customizable panelsin left hand side toolbar
2021-05-24 20:31:00 -07: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
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
e431422c19
Removing extraneous log
2021-05-13 20:33:12 -07:00
efarooqui
885a3e74e1
Adding comments to utils functions
2021-05-13 19:11:42 -07:00
Ebrahem Farooqui
849340ec53
Merge pull request #208 from forensic-architecture/feature/move-copy-for-panels-into-config
...
Feature/move copy for panels into config
2021-05-13 18:53:05 -07:00
efarooqui
0504e65b5f
Moving extraneous comments
2021-05-13 18:39:33 -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
Ebrahem Farooqui
7e14f5427d
Merge pull request #207 from forensic-architecture/feature/add-additional-shape-types
...
Feature/add additional shape types
2021-05-12 17:05:06 -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
Ebrahem Farooqui
fbc3e095ca
Merge pull request #206 from forensic-architecture/bugfix/modify-filters-to-use-id-not-title
...
Modify filters logic to use association ID's and not titles
2021-05-11 21:27:19 -07:00
efarooqui
0430ecbe02
Removing extraneous comment
2021-05-11 21:24:06 -07:00
efarooqui
8abe017785
Changing clusterSize calculation
2021-05-11 19:57:20 -07:00
efarooqui
b4981f1bbf
Bumping maxsize for clusters
2021-05-11 19:24:05 -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
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
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
Ebrahem Farooqui
11113550e1
Merge pull request #200 from forensic-architecture/bugfix/lat-long-should-be-decimal-format
...
Modifying lat long to have decimals and not commas; adding extra titl…
2021-04-28 18:13: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
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
Ebrahem Farooqui
62274fdb23
Adding github head ref
...
Adding the branch that is requesting the pull request in order to run the file on that branch exclusively
2021-03-01 16:06:02 -08: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
745953a435
Topic/cd workflow ( #193 )
...
* add cd dispatch
* add CI
* fix
* create config.js before testing
* Update cd.yml
2021-01-19 22:08:06 +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
Ebrahem Farooqui
1f20fd68ec
Update homepage to search for static assets in the relative dir
2021-01-06 15:47:08 -08:00
Ebrahem Farooqui
491c46546e
Create index file in develop
2021-01-06 11:24:43 -08:00
