Commit Graph

88 Commits

Author SHA1 Message Date
Alex Duncanson 1d6d1b5d6b
Merge pull request #40 from alDuncanson/feature/als-sighting-list
Feature/als sighting list
2018-10-29 13:31:19 -04:00
Al Duncanson 94f5222c61 merging 2018-10-27 18:07:30 -04:00
Al Duncanson 71b6ce9ad7 fixed sighting detail and disqus size 2018-10-27 17:24:42 -04:00
Al Duncanson 5366b67a98 fixed map sizing 2018-10-27 17:14:16 -04:00
Al Duncanson 7736f3ff33 made list scrollable 2018-10-27 16:59:36 -04:00
Al Duncanson 7543839985 best I got right now 2018-10-27 16:08:53 -04:00
Al Duncanson 49eaa2a4f4 added sighting detail map 2018-10-26 17:43:09 -04:00
Al Duncanson 48273519cb reworked GA 2018-10-26 16:34:08 -04:00
Al Duncanson 97bb9d03cf added google analytics 2018-10-26 16:26:00 -04:00
Al Duncanson d539a3b293 merge 2018-10-26 14:27:03 -04:00
Al Duncanson 8c08f37c1d Merge branch 'master' of https://github.com/alDuncanson/marten-application 2018-10-26 14:22:20 -04:00
Al Duncanson d026ae12e2 added hotjar 2018-10-26 14:18:14 -04:00
Al Duncanson 66fb1fc6f1 quick changes 2018-10-26 13:24:10 -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
Alex Duncanson 26ce296cb3
Merge pull request #35 from alDuncanson/feature/quiz-game-improvement
Added reset button to quiz and made text Material UI-esque.
2018-10-26 11:45:14 -04:00
Al Duncanson 4f064e546e added styles and sighting details 2018-10-26 11:04:44 -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
Al Duncanson 15e853640d removed window state 2018-10-25 21:55:48 -04:00
Al Duncanson 4d0188d144 added sighting list, and custom comment thread 2018-10-25 21:26:18 -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
Alex Duncanson 16f6dde825
Merge pull request #34 from alDuncanson/feature/nav-bar
Feature/nav bar
2018-10-25 13:27:42 -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 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
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
Jacob McCloughan de484052f7
Merge pull request #33 from alDuncanson/refactor/report-form
Updated report form to sponsor's specifications.
2018-10-19 22:13:22 -04:00
wildscotsmen 204f3d2a7a Updated confidence level labels to sponsor's suggestions. 2018-10-19 16:25:09 -04:00
wildscotsmen 7b86f4e2d6 Changed alignment in package.json. 2018-10-18 20:17:35 -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 f464485aee Removed extraneous comma. 2018-10-18 13:04:02 -04:00
wildscotsmen 5e130b3d77 Added quiz component to dependencies. 2018-10-18 13:03:03 -04:00
wildscotsmen 38357dd44c Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/quiz-game 2018-10-18 12:49:44 -04:00
wildscotsmen 3b91b09e09 Added a draft of the quiz game. 2018-10-18 12:48:01 -04:00
Jacob McCloughan a7ca249d1e
Merge pull request #27 from alDuncanson/refactor/readme-edit
Updated readme
2018-10-08 02:32:28 -04:00
Jacob McCloughan 60e8ff2e2e
Merge pull request #29 from alDuncanson/feature/single-sighting
feature/single-sighting
2018-10-08 00:50:09 -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