Commit Graph

47 Commits

Author SHA1 Message Date
wildscotsmen
3feec479f2 Initial feature commit. 2018-12-10 13:58:01 -05:00
wildscotsmen
aeb880d8fa Updated file and folder names. Made updates to Readme. 2018-12-01 21:06:28 -05:00
wildscotsmen
d8119c8773 Fixed minor bug with theme swap and restructured components folder. 2018-12-01 19:56:09 -05:00
WildScotsmen
260e08512f Fixed merge conflict. 2018-11-25 17:44:25 -05:00
WildScotsmen
970449fc5f Added titles to pages. 2018-11-25 16:37:26 -05:00
ajmaley
477a8d264c Handles displaying titles of galleries 2018-11-25 12:32:12 -05:00
ajmaley
00a3566dec Set up Galleries to use flamelink images. Set up to use collection schema type only. There is one bug I need to address. Gallery doesn't render when the webpage is loaded but works otherwise. 2018-11-25 11:28:23 -05:00
ajmaley
212bca8d35 Progress so far converting a collection schema filled with single media entries into a gallery 2018-11-24 21:26:40 -05:00
ajmaley
886db4a12d Merge branch 'feature/flamelinkCollections' into develop 2018-11-23 13:40:35 -05:00
ajmaley
598f3bd0a0 Added ability to handle collection type schemas 2018-11-23 13:07:42 -05:00
WildScotsmen
60e1e5e31f Added contact form to application. Sends requests through EmailJS. 2018-11-18 01:10:04 -05:00
wildscotsmen
413906db05 Merge branch 'develop' of https://github.com/alDuncanson/marten-application into develop 2018-11-14 11:54:04 -05:00
ajmaley
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
wildscotsmen
a343458f8c Added page titles and modified Favicon. 2018-11-08 21:53:19 -05:00
Al Duncanson
f015e11864 removed home placeholder from home page 2018-11-05 09:45:47 -05: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
6ecf626659 Added ability to parse fieldset data. Added some basic stylings for content. Cleaned up code. 2018-11-01 20:59:47 -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
2ab2b5842e Merge branch 'develop' into flamelink 2018-10-27 13:06:05 -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
4d0188d144 added sighting list, and custom comment thread 2018-10-25 21:26:18 -04:00
Al Duncanson
1c959b7a32 rewrote structure for new nav 2018-10-25 01:09:49 -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
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
3b91b09e09 Added a draft of the quiz game. 2018-10-18 12:48:01 -04:00
ajmaley
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
Joey Coscarelli
1f6aeb44b7 Merge branch 'master' of https://github.com/alDuncanson/marten-application into Sightings 2018-10-04 20:47:59 -04:00
ajmaley
1e61914815 Fixed merge conflict 2018-10-04 18:52:34 -04:00
ajmaley
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
Al Duncanson
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
Joey Coscarelli
26c87b92d3 Sightings component - FIXME 2018-10-03 23:55:29 -04:00
Al Duncanson
9dc5c4d69c added check for props 2018-10-03 16:41:09 -04:00
Al Duncanson
d0d9820699 map renders markers on click, sends lat and lng to firebase, yeet 2018-10-02 14:51:26 -04:00
Al Duncanson
603156def7 added map 2018-09-28 15:21:29 -04:00
Al Duncanson
ee0404a82b resolve merge conflicts 2018-09-28 15:10:32 -04:00
Al Duncanson
f8b998cf52 added images, added styles, record lat/lng onClick() 2018-09-27 18:00:35 -04:00
Al Duncanson
a19b738c26 added comments 2018-09-27 14:48:59 -04:00
Al Duncanson
477ba66608 updated map component, wrapped with api key, added markers/info windows 2018-09-27 14:28:49 -04:00
Al Duncanson
aeae021f2b added google-map-react component, added geolocation 2018-09-24 14:42:41 -04:00
wildscotsmen
c22bcae00d Improved layout of form. Actually got data sending over a GET form method. 2018-09-21 16:38:20 -04:00
wildscotsmen
cf9e4d384a Updated application to include report page and also added basic component for report form. 2018-09-21 15:11:52 -04:00
Al Duncanson
aa9ab5530d initial commit 2018-09-19 16:42:56 -04:00