Commit Graph

788 Commits

Author SHA1 Message Date
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
Zac Ioannidis
78b497b7c2 Merge pull request #188 from forensic-architecture/feature/build-system-cra-ejected
New build system with ejected Create React App
2020-12-23 17:12:11 +02:00
Zac Ioannidis
1697ded2f6 Revert to default config for test suite 2020-12-14 14:37:35 +00:00
Zac Ioannidis
6a553795c4 Adding package.json command that plays well with Travis 2020-12-14 14:20:13 +00: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
cd8b7230c4 Added pre-commit git hooks for linting the src folder 2020-12-14 13:43:09 +00:00
Zac Ioannidis
bb973d8b2b Ignore formatting on Create React App-related scaffolding 2020-12-14 13:42:53 +00:00
Zac Ioannidis
730828fc5f Changed default port to 8080 2020-12-14 13:42:08 +00:00
Zac Ioannidis
02128ceed3 Added Jest test suite 2020-12-14 13:30:49 +00:00
Zac Ioannidis
1efd2ec15b un-gitignored relevant files under config/ 2020-12-09 11:17:13 +00:00
Zac Ioannidis
02095e91e2 Merge pull request #189 from forensic-architecture/bug/card-layout-template-ingestion
Use templates from our design-system for card layouts
2020-12-09 11:07:05 +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
8497864479 Removed eslintcache 2020-12-08 13:18:45 +00:00
Zac Ioannidis
81e00fd917 Using prettier for linting 2020-12-08 13:13:50 +00:00
Zac Ioannidis
fa329066e4 This is working, apart from ingesting configuration files when building 2020-12-08 12:51:22 +00:00
Zac Ioannidis
539dccdb86 Tried building 2020-12-07 19:39:30 +00:00
Zac Ioannidis
3a54cd7df5 Ingesting config through Create React App 2020-12-07 19:28:07 +00:00
Zac Ioannidis
00d840a65b Added eject script 2020-12-07 18:46:42 +00:00
Zac Ioannidis
b658d55800 Initial commit before adding Craco 2020-12-07 18:14:21 +00:00
Ebrahem Farooqui
14ace9a0d5 Merge pull request #187 from 1cgonza/feature/spanish-translation
Feature/spanish translation
2020-12-01 08:29:55 -08:00
Juan Camilo González
df2ccd33fa export language from utilities 2020-11-30 14:21:27 -05:00
Juan Camilo González
71e0e24b86 default "en-US" if language is not in config.js 2020-11-30 09:57:48 -05: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
Juan Camilo González
13dfc2af15 🌐 Spanish copy 2020-11-29 18:23:53 -05:00
Juan Camilo González
3c8b543316 merge upstream from fork 2020-11-29 10:58:03 -05:00