From 1778f02d9e55b66dc825a1df08f1ee4509819bce Mon Sep 17 00:00:00 2001
From: WildScotsmen <thewildscotsmen@gmail.com>
Date: Tue, 11 Dec 2018 15:01:38 -0500
Subject: [PATCH 1/5] Changed the text on the contact page to sponsor's wishes.

---
 src/components/forms/ContactForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/forms/ContactForm.js b/src/components/forms/ContactForm.js
index 28ccef3..8170995 100644
--- a/src/components/forms/ContactForm.js
+++ b/src/components/forms/ContactForm.js
@@ -130,7 +130,7 @@ class ContactForm extends React.Component {
             <Fragment>
                 <Typography variant="headline" align="center">
                 {<br/>}
-                Send us an email!
+                Feel free to contact us if you have any questions about American martens,{<br/>}encountered any difficulties with the website, or if you have any ideas for future marten research.
 
                 <form className={classes.container} autoComplete="off" onSubmit={this.handleSubmit}>
                     <Grid container className="contact-form">

From edfbabe08a50967e1411d54b7b6a4e218c0f3f15 Mon Sep 17 00:00:00 2001
From: WildScotsmen <thewildscotsmen@gmail.com>
Date: Tue, 11 Dec 2018 15:06:27 -0500
Subject: [PATCH 2/5] Shotgunned a fix for gallery page titles.

---
 .../flamelink/FlameLinkCollectionGallery.js   | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/components/flamelink/FlameLinkCollectionGallery.js b/src/components/flamelink/FlameLinkCollectionGallery.js
index eb0f8ed..298ba5a 100644
--- a/src/components/flamelink/FlameLinkCollectionGallery.js
+++ b/src/components/flamelink/FlameLinkCollectionGallery.js
@@ -41,23 +41,6 @@ const styles = theme => ({
 });
 
 class FlameLinkCollectionGallery extends Component {
-    getPageTitle = galleryName => {
-        switch (galleryName) {
-            case 'martensAndKits':
-                document.title = 'Marten Tracker | Martens and Kits';
-                break;
-            case 'martensAtNight':
-                document.title = 'Marten Tracker | Martens at Night';
-                break;
-            case 'martensBeingMartens':
-                document.title = 'Marten Tracker | Martens Being Martens';
-                break;
-            default:
-                document.title = 'Marten Tracker | Galleries';
-                break;
-        }
-    }
-
     constructor(props) {
         super(props);
 
@@ -84,8 +67,10 @@ class FlameLinkCollectionGallery extends Component {
                     schemaDescription: result.title
                 }))
         }
+    }
 
-        this.getPageTitle(this.props.galleryName);
+    componentDidMount() {
+        document.title = 'Marten Tracker | Galleries';
     }
 
     getGalleryInfo(schemaDetails, schemaContent) {

From 6d4d73afdd9ee8c57e773c153173e6b94f36715a Mon Sep 17 00:00:00 2001
From: WildScotsmen <thewildscotsmen@gmail.com>
Date: Tue, 11 Dec 2018 16:04:36 -0500
Subject: [PATCH 3/5] Somewhat fixed router issue.

---
 src/components/Main.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/Main.js b/src/components/Main.js
index 5d6c69a..f184b37 100644
--- a/src/components/Main.js
+++ b/src/components/Main.js
@@ -348,19 +348,19 @@ class ResponsiveDrawer extends React.Component {
                     <main className={classes.content}>
                         <div className={classes.toolbar} />
                         <Switch>
-                          <Route path="/" exact={true} component={Home} />
-                          <Route path="/report" component={ () => { return <Report/> }} />
-                          <Route path="/view-map" component={ () => { return <ViewMap/> }} />
-                          <Route path="/sighting-list" component={ () => { return <SightingList themeName={this.state.themeName}/> }} />
-                          <Route path="/about" component={ () => { return <About/> }} />
-                          <Route path="/contact" component={ () => { return <Contact/> }} />
-                          <Route path="/quiz-easy" component={ () => { return <Quiz difficulty='Easy'/> }} />
-                          <Route path="/quiz-intermediate" component={ () => { return <Quiz difficulty='Intermediate'/> }} />
-                          <Route path="/quiz-advanced" component={ () => { return <Quiz difficulty='Advanced'/> }} />
-                          <Route path="/galleries-martens-and-kits" component={ () => { return <FlameLinkCollectionGallery galleryName={'martensAndKits'}/> }} />
-                          <Route path="/galleries-martens-at-night" component={ () => { return <FlameLinkCollectionGallery galleryName={'martensAtNight'}/> }} />
-                          <Route path="/galleries-martens-by-day" component={ () => { return <FlameLinkCollectionGallery galleryName={'martensBeingMartens'}/> }} />
-                          <Route path="/galleries-species-similar-to-martens" component={ () => { return <FlameLinkCollectionGallery galleryName={'similarSpecies'}/> }} />
+                          <Route path="/" exact={true} render={Home} />
+                          <Route path="/report" render={ (props) => { return <Report {...props}/> }} />
+                          <Route path="/view-map" render={ (props) => { return <ViewMap {...props}/> }} />
+                          <Route path="/sighting-list" render={ (props) => { return <SightingList {...props} themeName={this.state.themeName}/> }} />
+                          <Route path="/about" render={ (props) => { return <About {...props}/> }} />
+                          <Route path="/contact" render={ (props) => { return <Contact {...props}/> }} />
+                          <Route path="/quiz-easy" render={ (props) => { return <Quiz {...props} difficulty='Easy'/> }} />
+                          <Route path="/quiz-intermediate" render={ (props) => { return <Quiz {...props} difficulty='Intermediate'/> }} />
+                          <Route path="/quiz-advanced" render={ (props) => { return <Quiz {...props} difficulty='Advanced'/> }} />
+                          <Route path="/galleries-martens-and-kits" render={ (props) => { return <FlameLinkCollectionGallery {...props} galleryName={'martensAndKits'}/> }} />
+                          <Route path="/galleries-martens-at-night" render={ (props) => { return <FlameLinkCollectionGallery {...props} galleryName={'martensAtNight'}/> }} />
+                          <Route path="/galleries-martens-by-day" render={ (props) => { return <FlameLinkCollectionGallery {...props} galleryName={'martensBeingMartens'}/> }} />
+                          <Route path="/galleries-species-similar-to-martens" render={ (props) => { return <FlameLinkCollectionGallery {...props} galleryName={'similarSpecies'}/> }} />
                         </Switch>
                     </main>
                 </div>

From 8b2fe49b31ca2efa81201639310c94600cf01b80 Mon Sep 17 00:00:00 2001
From: WildScotsmen <thewildscotsmen@gmail.com>
Date: Tue, 11 Dec 2018 16:52:23 -0500
Subject: [PATCH 4/5] Fixed router.

---
 src/components/Main.js                        | 40 +++++++++----------
 .../flamelink/FlameLinkCollectionGallery.js   | 24 +++++++++--
 src/pages/QuizPage.js                         |  5 ++-
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/components/Main.js b/src/components/Main.js
index f184b37..b196583 100644
--- a/src/components/Main.js
+++ b/src/components/Main.js
@@ -224,17 +224,17 @@ class ResponsiveDrawer extends React.Component {
                     </ListItem>
                       <Collapse in={this.state.open} timeout="auto" unmountOnExit>
                         <List component="div" disablePadding>
-                            <Link to='/quiz-easy'>
+                            <Link to={{pathname: '/quiz-easy', state: {difficulty: 'Easy'}}}>
                               <ListItem button className={classes.nested}>
                                   <ListItemText inset primary="Easy" />
                               </ListItem>
                             </Link>
-                            <Link to='/quiz-intermediate'>
+                            <Link to={{pathname: '/quiz-intermediate', state: {difficulty: 'Intermediate'}}}>
                               <ListItem button className={classes.nested}>
                                   <ListItemText inset primary="Intermediate" />
                               </ListItem>
                             </Link>
-                            <Link to='/quiz-advanced'>
+                            <Link to={{pathname: '/quiz-advanced', state: {difficulty: 'Advanced'}}}>
                               <ListItem button className={classes.nested}>
                                   <ListItemText inset primary="Advanced" />
                               </ListItem>
@@ -262,22 +262,22 @@ class ResponsiveDrawer extends React.Component {
                     </ListItem>
                       <Collapse in={this.state.open2} timeout="auto" unmountOnExit>
                         <List component="div" disablePadding>
-                            <Link to='galleries-martens-and-kits'>
+                            <Link to={{pathname: 'galleries-martens-and-kits', state: {galleryName: 'martensAndKits'}}}>
                               <ListItem button className={classes.nested}>
                                   <ListItemText inset primary="Martens and Kits" />
                               </ListItem>
                             </Link>
-                            <Link to='galleries-martens-at-night'>
+                            <Link to={{pathname: 'galleries-martens-at-night', state: {galleryName: 'martensAtNight'}}}>
                               <ListItem button className={classes.nested}>
                                   <ListItemText inset primary="Martens at Night" />
                               </ListItem>
                             </Link>
-                            <Link to='galleries-martens-by-day'>
+                            <Link to={{pathname: 'galleries-martens-by-day', state: {galleryName: 'martensBeingMartens'}}}>
                               <ListItem button className={classes.nested}>
                                   <ListItemText inset primary="Martens by Day" />
                               </ListItem>
                             </Link>
-                            <Link to='galleries-species-similar-to-martens'>
+                            <Link to={{pathname: 'galleries-species-similar-to-martens', state: {galleryName: 'similarSpecies'}}}>
                               <ListItem button className={classes.nested}>
                                   <ListItemText inset primary="Species Similar to Martens" />
                               </ListItem>
@@ -348,19 +348,19 @@ class ResponsiveDrawer extends React.Component {
                     <main className={classes.content}>
                         <div className={classes.toolbar} />
                         <Switch>
-                          <Route path="/" exact={true} render={Home} />
-                          <Route path="/report" render={ (props) => { return <Report {...props}/> }} />
-                          <Route path="/view-map" render={ (props) => { return <ViewMap {...props}/> }} />
-                          <Route path="/sighting-list" render={ (props) => { return <SightingList {...props} themeName={this.state.themeName}/> }} />
-                          <Route path="/about" render={ (props) => { return <About {...props}/> }} />
-                          <Route path="/contact" render={ (props) => { return <Contact {...props}/> }} />
-                          <Route path="/quiz-easy" render={ (props) => { return <Quiz {...props} difficulty='Easy'/> }} />
-                          <Route path="/quiz-intermediate" render={ (props) => { return <Quiz {...props} difficulty='Intermediate'/> }} />
-                          <Route path="/quiz-advanced" render={ (props) => { return <Quiz {...props} difficulty='Advanced'/> }} />
-                          <Route path="/galleries-martens-and-kits" render={ (props) => { return <FlameLinkCollectionGallery {...props} galleryName={'martensAndKits'}/> }} />
-                          <Route path="/galleries-martens-at-night" render={ (props) => { return <FlameLinkCollectionGallery {...props} galleryName={'martensAtNight'}/> }} />
-                          <Route path="/galleries-martens-by-day" render={ (props) => { return <FlameLinkCollectionGallery {...props} galleryName={'martensBeingMartens'}/> }} />
-                          <Route path="/galleries-species-similar-to-martens" render={ (props) => { return <FlameLinkCollectionGallery {...props} galleryName={'similarSpecies'}/> }} />
+                          <Route path="/" component={Home} exact={true} />
+                          <Route path="/report" component={Report} />
+                          <Route path="/view-map" component={ViewMap} />
+                          <Route path="/sighting-list" component={SightingList} />
+                          <Route path="/about" component={About} />
+                          <Route path="/contact" component={Contact} />
+                          <Route path="/quiz-easy" component={Quiz} key={"Easy"}/>
+                          <Route path="/quiz-intermediate" component={Quiz} key={"Intermediate"}/>
+                          <Route path="/quiz-advanced" component={Quiz} key={"Advanced"} />
+                          <Route path="/galleries-martens-and-kits" component={FlameLinkCollectionGallery} key={"martensAndKits"}/>
+                          <Route path="/galleries-martens-at-night" component={FlameLinkCollectionGallery} key={"martensAtNight"} />
+                          <Route path="/galleries-martens-by-day" component={FlameLinkCollectionGallery} key={"martensByDay"} />
+                          <Route path="/galleries-species-similar-to-martens" component={FlameLinkCollectionGallery} key={"similarSpecies"} />
                         </Switch>
                     </main>
                 </div>
diff --git a/src/components/flamelink/FlameLinkCollectionGallery.js b/src/components/flamelink/FlameLinkCollectionGallery.js
index 298ba5a..242de80 100644
--- a/src/components/flamelink/FlameLinkCollectionGallery.js
+++ b/src/components/flamelink/FlameLinkCollectionGallery.js
@@ -44,25 +44,41 @@ class FlameLinkCollectionGallery extends Component {
     constructor(props) {
         super(props);
 
+        var galleryName, showTitle;
+        
+        if (this.props.galleryName !== undefined) {
+            galleryName = this.props.galleryName;
+        } else {
+            galleryName = this.props.location.state.galleryName;
+        }
+
+        if (this.props.showTitle !== undefined) {
+            showTitle = this.props.showTitle;
+        } else {
+            showTitle = this.props.location.state.showTitle;
+        }
+
         this.state = {
+            galleryName: galleryName,
+            showTitle: showTitle,
             schemaDetails: '',
             schemaContent: '',
             schemaDescription: '',
         };
 
-        flamelinkApp.schemas.getFields(this.props.galleryName, { fields: ['title', 'key', 'type', 'gridColumns', 'description', 'options'] })
+        flamelinkApp.schemas.getFields(this.state.galleryName, { fields: ['title', 'key', 'type', 'gridColumns', 'description', 'options'] })
             .then(result => this.setState({
                 schemaDetails: result
             }))
 
-        flamelinkApp.content.get(this.props.galleryName)
+        flamelinkApp.content.get(this.state.galleryName)
             .then(result => this.setState({
                 schemaContent: result
             }))
 
-        if (this.props.showTitle === false) {
+        if (this.state.showTitle === false) {
         } else {
-            flamelinkApp.schemas.get(this.props.galleryName)
+            flamelinkApp.schemas.get(this.state.galleryName)
                 .then(result => this.setState({
                     schemaDescription: result.title
                 }))
diff --git a/src/pages/QuizPage.js b/src/pages/QuizPage.js
index 9abcb0e..bbe9a9c 100644
--- a/src/pages/QuizPage.js
+++ b/src/pages/QuizPage.js
@@ -3,13 +3,14 @@ import QuizGame from '../components/QuizGame';
 
 
 class QuizPage extends Component {
-    componentDidMount() {
+    componentWillMount() {
         document.title = 'Marten Tracker | Quiz';
+        this.setState({difficulty: this.props.location.state.difficulty});
     }
 
     render() {
         return (
-            <QuizGame difficulty={this.props.difficulty}/>
+            <QuizGame difficulty={this.state.difficulty}/>
         );
     }
 }

From 93f86ea46a22cc81b4c2efa7f58c1cd71384e477 Mon Sep 17 00:00:00 2001
From: Al Duncanson <alexjduncanson@gmail.com>
Date: Tue, 11 Dec 2018 16:53:49 -0500
Subject: [PATCH 5/5] icon size change

---
 src/components/SightingMap.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SightingMap.js b/src/components/SightingMap.js
index ebe21cd..abc06b8 100644
--- a/src/components/SightingMap.js
+++ b/src/components/SightingMap.js
@@ -297,8 +297,8 @@ export class MapContainer extends Component {
                                 description={<Fragment><b>Description:</b> {sighting.desc}</Fragment>}
                                 icon={{
                                     url: pinIcon,
-                                    anchor: new google.maps.Point(48,48),
-                                    scaledSize: new google.maps.Size(48,48)
+                                    anchor: new google.maps.Point(32,32),
+                                    scaledSize: new google.maps.Size(32,32)
                                 }}
                             />
                         )