Commit Graph

31 Commits

Author SHA1 Message Date
ajmaley 7a8e840e1b Added code to handle flamelink data. It handles schema field order, grid sizes and displays text. Getting storage bucket errors when attempting to grab media info. Need to use the firebase-admin package instead of the firebase package. This is a known issue with flamelink. I'll fix this shortly. 2018-10-27 12:46:00 -04:00
ajmaley e7052dfb5b Added a better demo displaying how our app communicates with Flamelink Schemas and displays schema details in the right order. 2018-10-08 15:41:05 -04:00
ajmaley e427e3f702 updated git ignore 2018-10-04 19:17:44 -04:00
ajmaley 9556e0eb99 Added flamelink features 2018-10-04 19:14:48 -04:00
ajmaley 1e61914815 Fixed merge conflict 2018-10-04 18:52:34 -04:00
ajmaley 987c89837f Created Flamelink component to grab data from flamelink and sends data to the <p id="flamelinkDemo"> tag. Still need to firgure out how to grab all fields and display without hardcoding.
Added my Flamelink instance to Main.js and added it as a prop for the Info component.
Info.js calls the Flamelink component and pushes the Flamelink instance to the Flamelink component as a prop.
2018-10-04 18:35:36 -04:00
Al Duncanson 754e534914 removed todos, fixmes 2018-10-04 18:34:06 -04:00
Al Duncanson 861dc783bf edited the current location marker 2018-10-04 18:30:20 -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 9dc5c4d69c added check for props 2018-10-03 16:41:09 -04:00
Al Duncanson 2cb980822b changed textField width 2018-10-02 15:10:02 -04:00
Al Duncanson d0d9820699 map renders markers on click, sends lat and lng to firebase, yeet 2018-10-02 14:51:26 -04:00
Al Duncanson 603156def7 added map 2018-09-28 15:21:29 -04:00
Al Duncanson ee0404a82b resolve merge conflicts 2018-09-28 15:10:32 -04:00
Al Duncanson f8b998cf52 added images, added styles, record lat/lng onClick() 2018-09-27 18:00:35 -04:00
Al Duncanson a19b738c26 added comments 2018-09-27 14:48:59 -04:00
Al Duncanson 477ba66608 updated map component, wrapped with api key, added markers/info windows 2018-09-27 14:28:49 -04:00
Al Duncanson aeae021f2b added google-map-react component, added geolocation 2018-09-24 14:42:41 -04:00
Al Duncanson 56972690cc added Google Maps API key, unencrypted temporarily 2018-09-24 14:41:32 -04:00
wildscotsmen 2b572d50f8 Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/#2 2018-09-23 19:38:53 -04:00
wildscotsmen c3f05ef67f Got the form to send data to Firebase. Still needs a toast or something to tell the user the data was sent. 2018-09-23 19:37:35 -04:00
Jacob McCloughan a144e9f805
Merge pull request #22 from alDuncanson/WildScotsmen-patch-1-1
Updated readme.md
2018-09-21 17:30:04 -04:00
wildscotsmen ed0a607560 Fixed spacing issues between desktop and mobile. 2018-09-21 17:24:40 -04:00
wildscotsmen 2a402407ae Added proper form validation for description field. 2018-09-21 17:19:56 -04:00
wildscotsmen c22bcae00d Improved layout of form. Actually got data sending over a GET form method. 2018-09-21 16:38:20 -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 008d75fe3b added build folder 2018-09-19 17:47:55 -04:00
Al Duncanson aa9ab5530d initial commit 2018-09-19 16:42:56 -04:00
Jacob McCloughan d53a9c7f9d
Update readme.md 2018-09-13 22:25:57 -04:00
Jacob McCloughan f0c7b1712d
Update readme.md 2018-08-30 17:38:52 -04:00
wildscotsmen 4d20042c05 Added readme. 2018-08-30 17:36:52 -04:00