Commit Graph

19 Commits

Author SHA1 Message Date
Joey Coscarelli a24455dbff created contact page and component 2018-11-18 21:40:21 -05:00
Al Duncanson b8ac327139 fixed china problem 2018-11-14 16:55:40 -05:00
wildscotsmen 3c3a737822 Fixed merge conflict. 2018-11-01 23:00:15 -04:00
ajmaley 88490b4f2d Add Firebase admin SDK 2018-10-30 19:50:38 -04:00
Al Duncanson 94f5222c61 merging 2018-10-27 18:07:30 -04:00
ajmaley 3566fc5252 Added material UI icons package 2018-10-27 13:00:23 -04:00
Al Duncanson d539a3b293 merge 2018-10-26 14:27:03 -04:00
Al Duncanson 4d0188d144 added sighting list, and custom comment thread 2018-10-25 21:26:18 -04:00
Al Duncanson 582b3f4a6a package updates 2018-10-24 18:15:08 -04:00
Al Duncanson 970762faa3 fixed merge conflicts, added new nav 2018-10-24 18:09:23 -04:00
Joey Coscarelli 1f6aeb44b7 Merge branch 'master' of https://github.com/alDuncanson/marten-application into Sightings 2018-10-04 20:47:59 -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
Joey Coscarelli 26c87b92d3 Sightings component - FIXME 2018-10-03 23:55:29 -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 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 aa9ab5530d initial commit 2018-09-19 16:42:56 -04:00