760c5b77de
Put button inside div and rearranged some code.
2018-10-25 20:53:17 -04:00
19e24a2747
Added reset button to quiz and made text Material UI-esque.
2018-10-25 20:32:55 -04:00
147513571f
fixed mobile styles
2018-10-25 11:31:38 -04:00
fc452c5e35
changed quiz icons
2018-10-25 01:20:27 -04:00
1c959b7a32
rewrote structure for new nav
2018-10-25 01:09:49 -04:00
970762faa3
fixed merge conflicts, added new nav
2018-10-24 18:09:23 -04:00
b02e9d26a6
Merge pull request #32 from alDuncanson/feature/quiz-game
...
feature/quiz-game
2018-10-24 17:13:41 -04:00
60e252cb72
updated navigation structure
2018-10-24 13:09:53 -04:00
2839943cfe
added custom icons
2018-10-23 18:38:00 -04:00
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
204f3d2a7a
Updated confidence level labels to sponsor's suggestions.
2018-10-19 16:25:09 -04:00
22608cff37
Changed default value for time to 'Unknown'.
2018-10-18 16:10:31 -04:00
85ad71d964
Changed language used for Likert scale.
2018-10-18 15:39:52 -04:00
1df1c090d0
Updated comments.
2018-10-18 15:25:16 -04:00
9296eb6e7b
Updated report form to sponsor's specifications.
2018-10-18 15:22:31 -04:00
bd270a0e13
Added shuffling for array.
2018-10-18 13:51:32 -04:00
deb5cc8a01
Segregated quiz into component.
2018-10-18 13:30:08 -04:00
eecae7bb29
Changed title of quiz.
2018-10-18 13:08:53 -04:00
3b91b09e09
Added a draft of the quiz game.
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.
2018-10-08 15:41:05 -04:00
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
74cd0ec307
Updated comment to reflect its component.
2018-10-08 00:30:06 -04:00
8c69f5351a
Created a component for pulling in a single sighting.
2018-10-07 23:14:57 -04:00
1f6aeb44b7
Merge branch 'master' of https://github.com/alDuncanson/marten-application into Sightings
2018-10-04 20:47:59 -04:00
f19d0361e3
removed comments
2018-10-04 19:48:43 -04:00
8a6ce0012a
Prepared feature for production
2018-10-04 19:22:31 -04:00
9556e0eb99
Added flamelink features
2018-10-04 19:14:48 -04:00
1e61914815
Fixed merge conflict
2018-10-04 18:52:34 -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.
2018-10-04 18:35:36 -04:00
754e534914
removed todos, fixmes
2018-10-04 18:34:06 -04:00
861dc783bf
edited the current location marker
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
2018-10-04 17:19:27 -04:00
26c87b92d3
Sightings component - FIXME
2018-10-03 23:55:29 -04:00
9dc5c4d69c
added check for props
2018-10-03 16:41:09 -04:00
2cb980822b
changed textField width
2018-10-02 15:10:02 -04:00
d0d9820699
map renders markers on click, sends lat and lng to firebase, yeet
2018-10-02 14:51:26 -04:00
603156def7
added map
2018-09-28 15:21:29 -04:00
ee0404a82b
resolve merge conflicts
2018-09-28 15:10:32 -04:00
f8b998cf52
added images, added styles, record lat/lng onClick()
2018-09-27 18:00:35 -04:00
a19b738c26
added comments
2018-09-27 14:48:59 -04:00
477ba66608
updated map component, wrapped with api key, added markers/info windows
2018-09-27 14:28:49 -04:00
aeae021f2b
added google-map-react component, added geolocation
2018-09-24 14:42:41 -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.
2018-09-23 19:37:35 -04:00
ed0a607560
Fixed spacing issues between desktop and mobile.
2018-09-21 17:24:40 -04:00
2a402407ae
Added proper form validation for description field.
2018-09-21 17:19:56 -04:00
c22bcae00d
Improved layout of form. Actually got data sending over a GET form method.
2018-09-21 16:38:20 -04:00
cf9e4d384a
Updated application to include report page and also added basic component for report form.
2018-09-21 15:11:52 -04:00
aa9ab5530d
initial commit
2018-09-19 16:42:56 -04:00
wildscotsmen
Al Duncanson
Alex Duncanson
ajmaley
malfecient
Joey Coscarelli