GVSU/marten-application
1
0
Fork 0
Code Pull Requests Releases Activity

Commit Graph

  • 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. wildscotsmen 2018-10-22 19:25:49 -04:00
  • de484052f7 Merge pull request #33 from alDuncanson/refactor/report-form Jacob McCloughan 2018-10-19 22:13:22 -04:00
  • 204f3d2a7a Updated confidence level labels to sponsor's suggestions. wildscotsmen 2018-10-19 16:25:09 -04:00
  • 7b86f4e2d6 Changed alignment in package.json. wildscotsmen 2018-10-18 20:17:35 -04:00
  • 22608cff37 Changed default value for time to 'Unknown'. wildscotsmen 2018-10-18 16:10:31 -04:00
  • 85ad71d964 Changed language used for Likert scale. wildscotsmen 2018-10-18 15:39:52 -04:00
  • 1df1c090d0 Updated comments. wildscotsmen 2018-10-18 15:25:16 -04:00
  • 9296eb6e7b Updated report form to sponsor's specifications. wildscotsmen 2018-10-18 15:22:31 -04:00
  • bd270a0e13 Added shuffling for array. wildscotsmen 2018-10-18 13:51:32 -04:00
  • deb5cc8a01 Segregated quiz into component. wildscotsmen 2018-10-18 13:30:08 -04:00
  • eecae7bb29 Changed title of quiz. wildscotsmen 2018-10-18 13:08:53 -04:00
  • f464485aee Removed extraneous comma. wildscotsmen 2018-10-18 13:04:02 -04:00
  • 5e130b3d77 Added quiz component to dependencies. wildscotsmen 2018-10-18 13:03:03 -04:00
  • 38357dd44c Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/quiz-game wildscotsmen 2018-10-18 12:49:44 -04:00
  • 3b91b09e09 Added a draft of the quiz game. wildscotsmen 2018-10-18 12:48:01 -04:00
  • e7052dfb5b Added a better demo displaying how our app communicates with Flamelink Schemas and displays schema details in the right order. ajmaley 2018-10-08 15:41:05 -04:00
  • a7ca249d1e Merge pull request #27 from alDuncanson/refactor/readme-edit Jacob McCloughan 2018-10-08 02:32:28 -04:00
  • 60e8ff2e2e Merge pull request #29 from alDuncanson/feature/single-sighting Jacob McCloughan 2018-10-08 00:50:09 -04:00
  • e792bb3483 Made sure that we don't try to fetch IDs that aren't in the database. wildscotsmen 2018-10-08 00:47:24 -04:00
  • 74cd0ec307 Updated comment to reflect its component. wildscotsmen 2018-10-08 00:30:06 -04:00
  • 8c69f5351a Created a component for pulling in a single sighting. malfecient 2018-10-07 23:14:57 -04:00
  • 062051a38c Updated readme Jacob McCloughan 2018-10-06 19:19:58 -04:00
  • 1f6aeb44b7 Merge branch 'master' of https://github.com/alDuncanson/marten-application into Sightings Joey Coscarelli 2018-10-04 20:47:59 -04:00
  • f19d0361e3 removed comments Al Duncanson 2018-10-04 19:48:43 -04:00
  • 664d4dc926 Merge pull request #24 from alDuncanson/develop Jacob McCloughan 2018-10-04 19:29:07 -04:00
  • 25bbe3088d Merge branch 'feature/flamelink' of https://github.com/alDuncanson/marten-application into develop ajmaley 2018-10-04 19:24:22 -04:00
  • 8a6ce0012a Prepared feature for production ajmaley 2018-10-04 19:22:31 -04:00
  • e427e3f702 updated git ignore ajmaley 2018-10-04 19:17:44 -04:00
  • 9556e0eb99 Added flamelink features ajmaley 2018-10-04 19:14:48 -04:00
  • 1e61914815 Fixed merge conflict ajmaley 2018-10-04 18:52:34 -04:00
  • 376e58bb6f update gitignore, remove vscode settings json Al Duncanson 2018-10-04 18:39:24 -04:00
  • 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. ajmaley 2018-10-04 18:35:36 -04:00
  • 754e534914 removed todos, fixmes Al Duncanson 2018-10-04 18:34:06 -04:00
  • 861dc783bf edited the current location marker Al Duncanson 2018-10-04 18:30:20 -04:00
  • 7dd828a38c split maps into multiple components, render sighting markers in real time, pull sighting info into marker info boxes Al Duncanson 2018-10-04 17:19:27 -04:00
  • 26c87b92d3 Sightings component - FIXME Joey Coscarelli 2018-10-03 23:55:29 -04:00
  • 9dc5c4d69c added check for props Al Duncanson 2018-10-03 16:41:09 -04:00
  • 2cb980822b changed textField width Al Duncanson 2018-10-02 15:10:02 -04:00
  • d0d9820699 map renders markers on click, sends lat and lng to firebase, yeet Al Duncanson 2018-10-02 14:51:26 -04:00
  • 603156def7 added map Al Duncanson 2018-09-28 15:21:29 -04:00
  • ee0404a82b resolve merge conflicts Al Duncanson 2018-09-28 15:10:32 -04:00
  • f8b998cf52 added images, added styles, record lat/lng onClick() Al Duncanson 2018-09-27 18:00:35 -04:00
  • a19b738c26 added comments Al Duncanson 2018-09-27 14:48:59 -04:00
  • 477ba66608 updated map component, wrapped with api key, added markers/info windows Al Duncanson 2018-09-27 14:28:49 -04:00
  • aeae021f2b added google-map-react component, added geolocation Al Duncanson 2018-09-24 14:42:41 -04:00
  • 56972690cc added Google Maps API key, unencrypted temporarily Al Duncanson 2018-09-24 14:41:32 -04:00
  • 2b572d50f8 Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/#2 wildscotsmen 2018-09-23 19:38:53 -04:00
  • c3f05ef67f Got the form to send data to Firebase. Still needs a toast or something to tell the user the data was sent. wildscotsmen 2018-09-23 19:37:35 -04:00
  • a144e9f805 Merge pull request #22 from alDuncanson/WildScotsmen-patch-1-1 Jacob McCloughan 2018-09-21 17:30:04 -04:00
  • ed0a607560 Fixed spacing issues between desktop and mobile. wildscotsmen 2018-09-21 17:24:40 -04:00
  • 2a402407ae Added proper form validation for description field. wildscotsmen 2018-09-21 17:19:56 -04:00
  • c22bcae00d Improved layout of form. Actually got data sending over a GET form method. wildscotsmen 2018-09-21 16:38:20 -04:00
  • cf9e4d384a Updated application to include report page and also added basic component for report form. wildscotsmen 2018-09-21 15:11:52 -04:00
  • 008d75fe3b added build folder Al Duncanson 2018-09-19 17:47:55 -04:00
  • aa9ab5530d initial commit Al Duncanson 2018-09-19 16:42:56 -04:00
  • d53a9c7f9d Update readme.md Jacob McCloughan 2018-09-13 22:25:57 -04:00
  • f0c7b1712d Update readme.md Jacob McCloughan 2018-08-30 17:38:52 -04:00
  • 4d20042c05 Added readme. wildscotsmen 2018-08-30 17:36:52 -04:00