80b0d4d52c
Merge branch 'master' into develop
2018-11-14 16:58:22 -05:00
b8ac327139
fixed china problem
2018-11-14 16:55:40 -05:00
545db78a66
fixed merge conflicts
2018-11-14 16:40:11 -05:00
413906db05
Merge branch 'develop' of https://github.com/alDuncanson/marten-application into develop
2018-11-14 11:54:04 -05:00
b0b449abb3
Added security to Firebase in application.
2018-11-14 11:51:59 -05:00
31a5887b7b
Removed Info.js and replaced with About.js for clarity. Also added some stylings for FlameLink images using css.
2018-11-12 19:03:00 -05:00
4b56907006
Rearranged code.
2018-11-08 22:11:08 -05:00
86580d4a40
Made title in index.js more specific to first page.
2018-11-08 22:01:29 -05:00
2cb53178df
Fixed issue.
2018-11-08 21:59:38 -05:00
691f96506b
Added page title to App.js
2018-11-08 21:57:00 -05:00
a343458f8c
Added page titles and modified Favicon.
2018-11-08 21:53:19 -05:00
e0e1a7e9e4
new disqus
2018-11-07 17:24:43 -05:00
f015e11864
removed home placeholder from home page
2018-11-05 09:45:47 -05:00
05817e7e9e
Merge branch 'master' of https://github.com/alDuncanson/marten-application into feature/custom-icons
2018-11-05 00:32:31 -05:00
a98025f8bb
Added semicolons I forgot.
2018-11-04 22:06:58 -05:00
bcf5c30718
Added comment I forgot.
2018-11-04 22:05:41 -05:00
83982d8f88
App now loads map icons from public folder. Also added icons for the sighting types photo and other.
2018-11-04 22:04:31 -05:00
0a8120e826
Fixed merge conflict.
2018-11-04 21:50:16 -05:00
d926c107c0
fix merge conflicts
2018-11-04 18:34:46 -05:00
7dd2fbfeaf
Fixed merge after effect.
2018-11-03 15:47:13 -04:00
f9186c3155
Changed Info to About
2018-11-03 15:34:11 -04:00
8b7021684c
Merge branch 'master' into flamelink
2018-11-03 15:32:18 -04:00
2962afb84e
Merge branch 'flamelink' of https://github.com/alDuncanson/marten-application into flamelink
2018-11-03 14:33:39 -04:00
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
b4f7c0a4cb
fixed merge conflicts
2018-11-02 14:49:00 -04:00
39f06f844b
changed maps default zoom
2018-11-02 14:46:06 -04:00
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
dea74f5059
Removed to-do Typography in Info page.
2018-11-02 00:07:48 -04:00
3c3a737822
Fixed merge conflict.
2018-11-01 23:00:15 -04:00
7df07ff7c4
Worked on Flamelink stylings for images but didn't really get anywhere
2018-11-01 22:51:05 -04:00
4fba3db3db
Added FlameLink to Homepage.
2018-11-01 21:19:34 -04:00
035608a19b
Added padding for fieldset data
2018-11-01 21:08:50 -04:00
6ecf626659
Added ability to parse fieldset data. Added some basic stylings for content. Cleaned up code.
2018-11-01 20:59:47 -04:00
4301a3d6cd
added report map tooltip
2018-10-31 22:18:45 -04:00
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
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
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
d975fbfe2a
Initializing firebaseApp using firebase-admin sdk
2018-10-30 20:20:05 -04:00
88490b4f2d
Add Firebase admin SDK
2018-10-30 19:50:38 -04:00
a9bf3aa5e4
Merge pull request #41 from alDuncanson/refactor/code-cleanup
...
Code cleanup
2018-10-29 13:32:48 -04:00
4617f31be2
Fixed some issues with ordering in report form code.
2018-10-29 00:38:19 -04:00
c9f22b74d5
Cleaned code for consistency. Additionally added month function for report form.
2018-10-29 00:33:35 -04:00
94f5222c61
merging
2018-10-27 18:07:30 -04:00
71b6ce9ad7
fixed sighting detail and disqus size
2018-10-27 17:24:42 -04:00
5366b67a98
fixed map sizing
2018-10-27 17:14:16 -04:00
7736f3ff33
made list scrollable
2018-10-27 16:59:36 -04:00
7543839985
best I got right now
2018-10-27 16:08:53 -04:00
5182b92b82
Fixed issue from merge conflict.
2018-10-27 15:15:47 -04:00
229bc1fa51
Fixed merge conflict.
2018-10-27 15:15:03 -04:00
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
2ab2b5842e
Merge branch 'develop' into flamelink
2018-10-27 13:06:05 -04:00
0070b333e8
Forgot to add this file in my last commit
2018-10-27 12:50:01 -04:00
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
49eaa2a4f4
added sighting detail map
2018-10-26 17:43:09 -04:00
66fb1fc6f1
quick changes
2018-10-26 13:24:10 -04:00
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
d44eb373f9
Merge pull request #37 from alDuncanson/feature/report-form-toast
...
Added toast to report form.
2018-10-26 11:45:33 -04:00
4f064e546e
added styles and sighting details
2018-10-26 11:04:44 -04:00
f0d1821aea
Added toast to report form.
2018-10-25 22:46:36 -04:00
700515a66b
Formatted database data in InfoWindows on Sighting Map.
2018-10-25 22:15:48 -04:00
15e853640d
removed window state
2018-10-25 21:55:48 -04:00
4d0188d144
added sighting list, and custom comment thread
2018-10-25 21:26:18 -04:00
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
Al Duncanson
wildscotsmen
ajmaley
Alex Duncanson
malfecient
Joey Coscarelli