GVSU/marten-application
GVSU
/
marten-application
1
0
Fork 0
Code Pull Requests Releases Activity
120 Commits 2 Branches 0 Tags 29 MiB
Commit Graph

120 Commits

Author SHA1 Message Date
WildScotsmen 7dd2fbfeaf Fixed merge after effect. 2018-11-03 15:47:13 -04:00
ajmaley f9186c3155 Changed Info to About 2018-11-03 15:34:11 -04:00
ajmaley 8b7021684c Merge branch 'master' into flamelink 2018-11-03 15:32:18 -04:00
ajmaley 65f2b4ecb9 Merge branch 'develop' into flamelink 2018-11-03 14:38:33 -04:00
ajmaley 2962afb84e Merge branch 'flamelink' of https://github.com/alDuncanson/marten-application into flamelink 2018-11-03 14:33:39 -04:00
ajmaley 58a892bfa8 Added ability to center images, resizing images (which I may need to revisit later), removed memory leak in FlamelinkImage.js 2018-11-03 14:28:36 -04:00
Alex Duncanson c7cbe42d51
Merge pull request #42 from alDuncanson/feature/massive-refactor 
Big refactor
 2018-11-02 14:50:07 -04:00
Al Duncanson b4f7c0a4cb fixed merge conflicts 2018-11-02 14:49:00 -04:00
Alex Duncanson 9baa3f942f
Merge pull request #43 from alDuncanson/refactor/default-key 
Set default key of the application to Home.
 2018-11-02 14:41:42 -04:00
Alex Duncanson 07c8d0ecf7
Merge pull request #44 from alDuncanson/feature/map-addtion 
added report map tooltip
 2018-11-02 14:41:19 -04:00
wildscotsmen dea74f5059 Removed to-do Typography in Info page. 2018-11-02 00:07:48 -04:00
wildscotsmen 3c3a737822 Fixed merge conflict. 2018-11-01 23:00:15 -04:00
ajmaley 7df07ff7c4 Worked on Flamelink stylings for images but didn't really get anywhere 2018-11-01 22:51:05 -04:00
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
Al Duncanson 4301a3d6cd added report map tooltip 2018-10-31 22:18:45 -04:00
WildScotsmen 3f36ee55a1 Set default key of the application to Home. It was set to blank, which meant that the application wasn't on any page when the user first visits the application. 2018-10-31 19:14:24 -04:00
WildScotsmen bfbb27842a Cleaned up code according to what we decided on. Also formatted raw database data in SightingDetail component. Finally, ordered list in reverse order. 2018-10-31 18:57:25 -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 1d722693c4 Merge branch 'develop' of https://github.com/alDuncanson/marten-application into develop 2018-10-30 19:51:49 -04:00
ajmaley 88490b4f2d Add Firebase admin SDK 2018-10-30 19:50:38 -04:00
Alex Duncanson a9bf3aa5e4
Merge pull request #41 from alDuncanson/refactor/code-cleanup 
Code cleanup
 2018-10-29 13:32:48 -04:00
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
wildscotsmen 4617f31be2 Fixed some issues with ordering in report form code. 2018-10-29 00:38:19 -04:00
wildscotsmen c9f22b74d5 Cleaned code for consistency. Additionally added month function for report form. 2018-10-29 00:33:35 -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
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 3566fc5252 Added material UI icons package 2018-10-27 13:00:23 -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
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