Commit Graph

61 Commits

Author SHA1 Message Date
ajmaley 4fba3db3db Added FlameLink to Homepage. 2018-11-01 21:19:34 -04:00
ajmaley 035608a19b Added padding for fieldset data 2018-11-01 21:08:50 -04:00
ajmaley 6ecf626659 Added ability to parse fieldset data. Added some basic stylings for content. Cleaned up code. 2018-11-01 20:59:47 -04:00
ajmaley ce0d5d2e1e Can now grab text and images from firebase using Flamelink's API. I've also included a solution for adding different header styles. Next on the agenda is styling the Info page and filling it with sponsor's data. 2018-10-30 23:56:24 -04:00
ajmaley d975fbfe2a Initializing firebaseApp using firebase-admin sdk 2018-10-30 20:20:05 -04:00
ajmaley 88490b4f2d Add Firebase admin SDK 2018-10-30 19:50:38 -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
ajmaley 2ab2b5842e Merge branch 'develop' into flamelink 2018-10-27 13:06:05 -04:00
ajmaley 0070b333e8 Forgot to add this file in my last commit 2018-10-27 12:50:01 -04:00
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
Alex Duncanson 9aca4c949b
Merge pull request #36 from alDuncanson/feature/map-formatting
Formatted database data in InfoWindows on Sighting Map.
2018-10-26 12:06:11 -04:00
Alex Duncanson d44eb373f9
Merge pull request #37 from alDuncanson/feature/report-form-toast
Added toast to report form.
2018-10-26 11:45:33 -04:00
wildscotsmen f0d1821aea Added toast to report form. 2018-10-25 22:46:36 -04:00
wildscotsmen 700515a66b Formatted database data in InfoWindows on Sighting Map. 2018-10-25 22:15:48 -04:00
wildscotsmen 760c5b77de Put button inside div and rearranged some code. 2018-10-25 20:53:17 -04:00
wildscotsmen 19e24a2747 Added reset button to quiz and made text Material UI-esque. 2018-10-25 20:32:55 -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
Alex Duncanson b02e9d26a6
Merge pull request #32 from alDuncanson/feature/quiz-game
feature/quiz-game
2018-10-24 17:13:41 -04:00
Al Duncanson 60e252cb72 updated navigation structure 2018-10-24 13:09:53 -04:00
wildscotsmen 1fefd8cf1c Updated quiz component to include questions by sponsor and also have tabs for different difficulty settings. Will implement the harder quizzes next sprint, likely. 2018-10-22 19:25:49 -04:00
wildscotsmen 204f3d2a7a Updated confidence level labels to sponsor's suggestions. 2018-10-19 16:25:09 -04:00
wildscotsmen 22608cff37 Changed default value for time to 'Unknown'. 2018-10-18 16:10:31 -04:00
wildscotsmen 85ad71d964 Changed language used for Likert scale. 2018-10-18 15:39:52 -04:00
wildscotsmen 1df1c090d0 Updated comments. 2018-10-18 15:25:16 -04:00
wildscotsmen 9296eb6e7b Updated report form to sponsor's specifications. 2018-10-18 15:22:31 -04:00
wildscotsmen bd270a0e13 Added shuffling for array. 2018-10-18 13:51:32 -04:00
wildscotsmen deb5cc8a01 Segregated quiz into component. 2018-10-18 13:30:08 -04:00
wildscotsmen eecae7bb29 Changed title of quiz. 2018-10-18 13:08:53 -04:00
wildscotsmen 3b91b09e09 Added a draft of the quiz game. 2018-10-18 12:48:01 -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
wildscotsmen e792bb3483 Made sure that we don't try to fetch IDs that aren't in the database. 2018-10-08 00:47:24 -04:00
wildscotsmen 74cd0ec307 Updated comment to reflect its component. 2018-10-08 00:30:06 -04:00
malfecient 8c69f5351a Created a component for pulling in a single sighting. 2018-10-07 23:14:57 -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
Al Duncanson f19d0361e3 removed comments 2018-10-04 19:48:43 -04:00
ajmaley 8a6ce0012a Prepared feature for production 2018-10-04 19:22:31 -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
Joey Coscarelli 26c87b92d3 Sightings component - FIXME 2018-10-03 23:55:29 -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