22 Commits

Author SHA1 Message Date
ajmaley
31a5887b7b Removed Info.js and replaced with About.js for clarity. Also added some stylings for FlameLink images using css. 2018-11-12 19:03:00 -05:00
WildScotsmen
7dd2fbfeaf Fixed merge after effect. 2018-11-03 15:47:13 -04:00
ajmaley
f9186c3155 Changed Info to About 2018-11-03 15:34:11 -04:00
ajmaley
8b7021684c Merge branch 'master' into flamelink 2018-11-03 15:32:18 -04:00
Al Duncanson
b4f7c0a4cb fixed merge conflicts 2018-11-02 14:49:00 -04:00
wildscotsmen
3c3a737822 Fixed merge conflict. 2018-11-01 23:00:15 -04:00
WildScotsmen
3f36ee55a1 Set default key of the application to Home. It was set to blank, which meant that the application wasn't on any page when the user first visits the application. 2018-10-31 19:14:24 -04:00
WildScotsmen
bfbb27842a Cleaned up code according to what we decided on. Also formatted raw database data in SightingDetail component. Finally, ordered list in reverse order. 2018-10-31 18:57:25 -04:00
ajmaley
054c67db51 Merged flamelink branch with develop and added info page to menu. The content on the info page may populate the home page in the future. 2018-10-27 13:24:25 -04:00
Al Duncanson
66fb1fc6f1 quick changes 2018-10-26 13:24:10 -04:00
Al Duncanson
147513571f fixed mobile styles 2018-10-25 11:31:38 -04:00
Al Duncanson
fc452c5e35 changed quiz icons 2018-10-25 01:20:27 -04:00
Al Duncanson
1c959b7a32 rewrote structure for new nav 2018-10-25 01:09:49 -04:00
Al Duncanson
970762faa3 fixed merge conflicts, added new nav 2018-10-24 18:09:23 -04:00
Al Duncanson
60e252cb72 updated navigation structure 2018-10-24 13:09:53 -04:00
wildscotsmen
deb5cc8a01 Segregated quiz into component. 2018-10-18 13:30:08 -04:00
wildscotsmen
3b91b09e09 Added a draft of the quiz game. 2018-10-18 12:48:01 -04:00
Al Duncanson
7dd828a38c split maps into multiple components, render sighting markers in real time, pull sighting info into marker info boxes 2018-10-04 17:19:27 -04:00
Al Duncanson
ee0404a82b resolve merge conflicts 2018-09-28 15:10:32 -04:00
Al Duncanson
aeae021f2b added google-map-react component, added geolocation 2018-09-24 14:42:41 -04:00
wildscotsmen
cf9e4d384a Updated application to include report page and also added basic component for report form. 2018-09-21 15:11:52 -04:00
Al Duncanson
aa9ab5530d initial commit 2018-09-19 16:42:56 -04:00