Fixed merge conflict.

package-lock.json

@@ -3051,6 +3051,16 @@
         "sha.js": "^2.4.8"
       }
     },
+    "create-react-class": {
+      "version": "15.6.3",
+      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
+      "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
+      "requires": {
+        "fbjs": "^0.8.9",
+        "loose-envify": "^1.3.1",
+        "object-assign": "^4.1.1"
+      }
+    },
     "cross-spawn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -3567,6 +3577,40 @@
         }
       }
     },
+    "disqus-react": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/disqus-react/-/disqus-react-1.0.5.tgz",
+      "integrity": "sha1-go6hhr0kHF4qbf66tRNeUqLZHRE=",
+      "requires": {
+        "react": "^15.6.1",
+        "react-dom": "^15.6.1"
+      },
+      "dependencies": {
+        "react": {
+          "version": "15.6.2",
+          "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
+          "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
+          "requires": {
+            "create-react-class": "^15.6.0",
+            "fbjs": "^0.8.9",
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.0",
+            "prop-types": "^15.5.10"
+          }
+        },
+        "react-dom": {
+          "version": "15.6.2",
+          "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
+          "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
+          "requires": {
+            "fbjs": "^0.8.9",
+            "loose-envify": "^1.1.0",
+            "object-assign": "^4.1.0",
+            "prop-types": "^15.5.10"
+          }
+        }
+      }
+    },
     "dns-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",

package.json

@@ -5,6 +5,7 @@
   "dependencies": {
     "@material-ui/core": "^3.1.0",
     "@material-ui/icons": "^3.0.1",
+    "disqus-react": "^1.0.5",
     "firebase": "^5.5.2",
     "firebase-admin": "^6.0.0",
     "flamelink": "^0.19.2",

src/App.css

@@ -14,3 +14,37 @@ body {
         width: calc(100% - 50% - 120px) !important;
     }
 }
+
+#disqus_thread {
+    width: 89% !important;
+    margin: 0 auto;
+}
+
+.sighting-list {
+    height: calc(50vh - 64px);
+    overflow-y: scroll;
+}
+
+@media (min-width: 960px) {
+    .sighting-list {
+        height: calc(100vh - 64px);
+        overflow-y: scroll;
+    }
+}
+
+.sighting-details-content {
+    width: 89%;
+    margin: 330px auto 0 auto;
+}
+
+.sighting-detail-google-map-container > div {
+    width: 100% !important;
+    height: 300px !important;
+}
+
+@media (min-width: 960px) {
+    .sighting-detail-google-map-container > div {
+        width: calc(100% - 50% - 120px) !important;
+        height: 300px !important;
+    }
+}

src/components/Flamelink.js

@@ -2,7 +2,6 @@ import { Component } from 'react';
 
 class Flamelink extends Component {
     render() {
-
         return(null);
     }
 }

src/components/Main.js

@@ -68,7 +68,7 @@ const styles = theme => ({
 class ResponsiveDrawer extends React.Component {
     state = {
         mobileOpen: false,
-        key: '',
+        key: 'Home',
         open: false
     };
 
@@ -83,7 +83,7 @@ class ResponsiveDrawer extends React.Component {
     nav = (text) => {
         this.setState({
             key: text
-        })
+        });
     }
 
     render() {
@@ -149,7 +149,7 @@ class ResponsiveDrawer extends React.Component {
                             <MenuIcon />
                         </IconButton>
                         <Typography variant="title" color="inherit" noWrap>
-                            The American Marten
+                            Marten Tracker
                         </Typography>
                     </Toolbar>
                 </AppBar>
@@ -189,9 +189,9 @@ class ResponsiveDrawer extends React.Component {
                     {this.state.key === 'Report' && <Report />}
                     {this.state.key === 'Map' && <ViewMap />}
                     {this.state.key === 'List' && <SightingList />}
-                    {this.state.key === 'Easy-Quiz' && <Quiz difficulty='Easy'/>}
+                    {this.state.key === 'Easy-Quiz' && <Quiz difficulty='Easy' />}
-                    {this.state.key === 'Medium-Quiz' && <Quiz difficulty='Medium'/>}
+                    {this.state.key === 'Medium-Quiz' && <Quiz difficulty='Medium' />}
-                    {this.state.key === 'Hard-Quiz' && <Quiz difficulty='Hard'/>}
+                    {this.state.key === 'Hard-Quiz' && <Quiz difficulty='Hard' />}
                 </main>
             </div>
         );

src/components/QuizGame.js

@@ -239,33 +239,33 @@ class QuizGame extends React.Component {
      * @param {*} difficulty The difficulty setting passed in.
      */
     pickDifficulty = difficulty => {
-        let level
+        let level;
 
         switch (difficulty) {
             case 'Easy':
-                this.easy.questions = this.shuffleArray(this.easy.questions)
+                this.easy.questions = this.shuffleArray(this.easy.questions);
-                level = this.easy
+                level = this.easy;
-                break
+                break;
             case 'Medium':
-                this.medium.questions = this.shuffleArray(this.medium.questions)
+                this.medium.questions = this.shuffleArray(this.medium.questions);
-                level = this.medium
+                level = this.medium;
-                break
+                break;
             case 'Hard':
-                this.hard.questions = this.shuffleArray(this.hard.questions)
+                this.hard.questions = this.shuffleArray(this.hard.questions);
-                level = this.hard
+                level = this.hard;
-                break
+                break;
             default:
-                break
+                break;
         }
 
-        return level
+        return level;
     }
 
     // The state of the component.
     state = {
         difficulty: this.pickDifficulty(this.props.difficulty),
         key: Math.random()
-    }
+    };
 
     // Renders the quiz component.
     render() {

src/components/ReportForm.js

@@ -11,6 +11,8 @@ import CloseIcon from '@material-ui/icons/Close';
 import Button from '@material-ui/core/Button';
 import firebase from '../firebase.js';
 import GoogleMap from '../components/ReportMap';
+import Modal from '@material-ui/core/Modal';
+import Typography from '@material-ui/core/Typography';
 
 /**
  * Styles that the different
@@ -51,21 +53,15 @@ const styles = theme => ({
     menu: {
         width: 200,
     },
+    paper: {
+        position: 'absolute',
+        width: theme.spacing.unit * 50,
+        backgroundColor: theme.palette.background.paper,
+        boxShadow: theme.shadows[5],
+        padding: theme.spacing.unit * 4,
+    }
 });
 
-/**
- * Function for formatting the
- * year as a string that
- * Material UI can use.
- * @param {*} date, Date passed in. 
- */
-function getYear(date) {
-  var d = new Date(date),
-    year = d.getFullYear();
-
-  return year;
-}
-
 /** 
  * Types of sightings. Label is what is
  * viewed in the application, value is
@@ -224,21 +220,69 @@ class ReportForm extends React.Component {
         this.handleSubmit = this.handleSubmit.bind(this);
     }
 
+    /**
+    * Function for formatting the
+    * year as a string that
+    * Material UI can use.
+    * @param {*} date, Date passed in. 
+    */
+    getYear = date => {
+        var d = new Date(date),
+            year = d.getFullYear();
+
+        return year;
+    }
+
+    /**
+    * Function for formatting the
+    * month as a string that
+    * Material UI can use.
+    * @param {*} date, Date passed in. 
+    */
+    getMonth = date => {
+        var d = new Date(date),
+            month = d.getMonth() + 1;
+
+        month = month.toString();
+
+        if (month.length === 1) {
+            month = "0" + month;
+        }
+
+        return month;
+    }
+
     /**
      * State of form components.
      */
     state = {
-    month: '01',
+        month: this.getMonth(new Date()),
-    year: getYear(new Date()),
+        year: this.getYear(new Date()),
         time: 'unknown',
         type: 'visual',
         confidence: '1',
         desc: '',
         lat: '',
         lng: '',
-    open: false
+        open: false,
+        openModal: false, 
+        hasModalOpened: false
     };
 
+    handleModalOpen = () => !this.state.hasModalOpened ? this.setState({ openModal: true, hasModalOpened: true }) : null;
+
+    handleModalClose = () => {
+        this.setState({ openModal: false });
+    };
+
+    getModalStyle = () => {
+        return {
+            top: `25%`,
+            left: `75%`,
+            transform: `translate(-25%, -75%)`,
+        };
+    }
+
     /**
      * Handles state change in form
      * components.
@@ -294,8 +338,8 @@ class ReportForm extends React.Component {
         }
         sightingsRef.push(sighting);
         this.setState({
-      year: getYear(new Date()),
+            year: this.getYear(new Date()),
-      month: '01',
+            month: this.getMonth(new Date()),
             time: 'unknown',
             type: 'visual',
             confidence: '1',
@@ -455,7 +499,6 @@ class ReportForm extends React.Component {
                                         }}
                                     />
                                 </Grid>
-
                                 <Grid item xs={12}>
                                     <Button variant="contained" type="submit" color="primary" className={classes.button}>
                                         Submit
@@ -463,8 +506,23 @@ class ReportForm extends React.Component {
                                 </Grid>
                             </Grid>
                         </Grid>
-            <Grid item xs={12} md={6}>
+                        <Grid item xs={12} md={6} onMouseEnter={this.handleModalOpen}>
-              <GoogleMap onClick={this.getCoordinates} />
+                            <GoogleMap onClick={this.getCoordinates}/>
+                            <Modal
+                                aria-labelledby="simple-modal-title"
+                                aria-describedby="simple-modal-description"
+                                open={this.state.openModal}
+                                onClose={this.handleModalClose}
+                            >
+                                <div style={this.getModalStyle()} className={classes.paper}>
+                                    <Typography variant="title" id="modal-title">
+                                        Need a little help?
+                                    </Typography>
+                                    <Typography variant="subheading" id="simple-modal-description">
+                                        Click on the map to drop a pin!
+                                    </Typography>
+                                </div>
+                            </Modal>
                         </Grid>
                     </Grid>
                 </form>
@@ -479,7 +537,7 @@ class ReportForm extends React.Component {
                     ContentProps={{
                         'aria-describedby': 'message-id',
                     }}
-          message={<span id="message-id" className={classes.message}><CheckCircleIcon className={classes.icon}/>Report received.</span>}
+                    message={<span id="message-id" className={classes.message}><CheckCircleIcon className={classes.icon} />Report received.</span>}
                     action={[
                         <IconButton
                             key="close"

src/components/ReportMap.js

@@ -9,7 +9,7 @@ const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM';
 const mapStyles = {
     width: '100%',
     height: '100%'
-}
+};
 
 export class MapContainer extends Component {
 
@@ -68,13 +68,13 @@ export class MapContainer extends Component {
                 lat: e.latLng.lat(),
                 lng: e.latLng.lng()
             }
-        })
+        });
 
         let lat = e.latLng.lat();
         let lng = e.latLng.lng();
 
         if (this.props.onClick) {
-            this.props.onClick(lat,lng);
+            this.props.onClick(lat, lng);
         }
     }
 
@@ -98,36 +98,36 @@ export class MapContainer extends Component {
 
         return (
             // Render the Google Map, Marker, and InfoWindow components
-            <div className = "report-google-map-container">
+            <div className="report-google-map-container">
                 <Map
-                    style = { mapStyles }
+                    style={mapStyles}
-                    google = { this.props.google }
+                    google={this.props.google}
-                    initialCenter = { this.state.myLatLng }
+                    initialCenter={this.state.myLatLng}
-                    center = { this.state.myLatLng }
+                    center={this.state.myLatLng}
-                    defaultZoom = { 15 }
+                    defaultZoom={15}
-                    onClick = { this.onMapClick } >
+                    onClick={this.onMapClick} >
 
                     <Marker
-                        position = { this.state.markerLatLng }
+                        position={this.state.markerLatLng}
                     />
 
                     <Marker
-                        position = { this.state.myLatLng }
+                        position={this.state.myLatLng}
-                        onClick = { this.onMarkerClick }
+                        onClick={this.onMarkerClick}
-                        title = { 'You are here' }
+                        title={'You are here'}
-                        name = { '' } 
+                        name={''}
                     />
 
                     <InfoWindow
-                        marker = { this.state.activeMarker }
+                        marker={this.state.activeMarker}
-                        visible = { this.state.showingInfoWindow } >
+                        visible={this.state.showingInfoWindow} >
 
                         <Fragment>
-                            <Typography variant = "display1" gutterBottom>
+                            <Typography variant="display1" gutterBottom>
-                                { this.state.selectedPlace.title }
+                                {this.state.selectedPlace.title}
                             </Typography>
-                            <Typography variant = "subheading" gutterBottom>
+                            <Typography variant="subheading" gutterBottom>
-                                { this.state.selectedPlace.name }
+                                {this.state.selectedPlace.name}
                             </Typography>
                         </Fragment>
                     </InfoWindow>
@@ -138,6 +138,4 @@ export class MapContainer extends Component {
 }
 
 // Send the Google Map API Key with the MapContainer component
-export default GoogleApiWrapper({
+export default GoogleApiWrapper({ apiKey: (API_KEY) })(MapContainer);
-    apiKey: (API_KEY)
-})(MapContainer)

src/components/SightingDetail.js

@@ -0,0 +1,160 @@
+import React, { Component, Fragment } from 'react';
+import Disqus from 'disqus-react';
+import moment from 'moment';
+import SightingDetailMap from './SightingDetailMap';
+
+/** 
+  * Types of sightings. Label is what is
+  * viewed in the application, value is
+  * what is stored in the database.
+  */
+ const sightingTypes = [
+    {
+        value: 'visual',
+        label: 'Visual',
+    },
+    {
+        value: 'roadkill',
+        label: 'Roadkill',
+    },
+    {
+        value: 'trapped',
+        label: 'Trapped',
+    },
+    {
+        value: 'viewed_tracks',
+        label: 'Viewed Tracks',
+    },
+    {
+        value: 'photo',
+        label: 'Photo',
+    },
+    {
+        value: 'other',
+        label: 'Other',
+    },
+];
+
+/** 
+ * Types of sightings. Label is what is
+ * viewed in the application, value is
+ * what is stored in the database.
+*/
+const timeTypes = [
+    {
+        value: 'unknown',
+        label: 'Unknown',
+    },
+    {
+        value: 'morning',
+        label: 'Morning',
+    },
+    {
+        value: 'midday',
+        label: 'Midday',
+    },
+    {
+        value: 'evening',
+        label: 'Evening',
+    },
+    {
+        value: 'night',
+        label: 'Night',
+    },
+];
+
+/** 
+ * Levels of confidence. Label is what is
+ * viewed in the application, value is
+ * what is stored in the database.
+*/
+const confidenceLevels = [
+    {
+        value: '1',
+        label: '1 - Strongly disagree',
+    },
+    {
+        value: '2',
+        label: '2 - Disagree',
+    },
+    {
+        value: '3',
+        label: '3 - Neutral',
+    },
+    {
+        value: '4',
+        label: '4 - Agree',
+    },
+    {
+        value: '5',
+        label: '5 - Strongly agree',
+    },
+];
+
+class SightingDetail extends Component {
+
+    /**
+    * Gets formatted type value.
+    */
+    getType = item => {
+        for (var i = 0; i < sightingTypes.length; i++) {
+            if (sightingTypes[i].value === item) {
+                return sightingTypes[i].label;
+            }
+        }
+    }
+
+
+    /**
+     * Gets formatted time value.
+     */
+    getTime = item => {
+        for (var i = 0; i < timeTypes.length; i++) {
+            if (timeTypes[i].value === item) {
+                return timeTypes[i].label;
+            }
+        }
+    }
+
+    /**
+    * Gets formatted confidence value.
+    */
+    getConfidence = item => {
+        for (var i = 0; i < confidenceLevels.length; i++) {
+            if (confidenceLevels[i].value === item) {
+                return confidenceLevels[i].label;
+            }
+        }
+
+    }
+
+    formatDate = date => {
+        return (moment(date, "YYYY-MM").format("MMMM YYYY").toString());
+    }
+
+    render() {
+        const disqusShortname = 'https-marten-application-netlify-com';
+        const disqusConfig = {
+            url: `http://localhost:3000/${this.props.detail.id}`,
+            identifier: this.props.detail.id,
+            title: this.props.detail.id
+        };
+
+        return (
+            <Fragment>
+                <SightingDetailMap lat={this.props.detail.lat} lng={this.props.detail.lng} />
+                <div className='sighting-details-content'>
+                    <p><b>Type:</b> {this.getType(this.props.detail.type)}</p>
+                    <p><b>When:</b> {this.formatDate(this.props.detail.date)}, {this.getTime(this.props.detail.time)}</p>
+                    <p><b>Where:</b> {this.props.detail.lat} degrees N, and {this.props.detail.lng} degrees E</p>
+                    <p><b>I am confident of my sighting:</b> {this.getConfidence(this.props.detail.confidence)}</p>
+                    <hr/>
+                    <p>{`${this.props.detail.desc}`}</p>
+                </div>
+                <Disqus.DiscussionEmbed shortname={disqusShortname} config={disqusConfig} />
+            </Fragment>
+        );
+    }
+}
+
+export default SightingDetail;

src/components/SightingDetailMap.js

@@ -0,0 +1,36 @@
+import React, { Component } from 'react';
+import { Map, Marker, GoogleApiWrapper } from 'google-maps-react';
+
+// Google Maps API Key
+const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM';
+
+// Map container styles
+const mapStyles = {
+    width: '100%',
+    height: '100%'
+};
+
+export class MapContainer extends Component {
+
+    render() {
+        return (
+            // Render the Google Map, Marker, and InfoWindow components
+            <div className="sighting-detail-google-map-container">
+                <Map
+                    style={mapStyles}
+                    google={this.props.google}
+                    initialCenter={{ lat: this.props.lat, lng: this.props.lng }}
+                    center={{ lat: this.props.lat, lng: this.props.lng }}
+                    defaultZoom={15}>
+
+                    <Marker
+                        position={{ lat: this.props.lat, lng: this.props.lng }}
+                    />
+                </Map>
+            </div>
+        );
+    }
+}
+
+// Send the Google Map API Key with the MapContainer component
+export default GoogleApiWrapper({ apiKey: (API_KEY) })(MapContainer);

src/components/SightingMap.js

@@ -1,6 +1,6 @@
 import React, { Component, Fragment } from 'react';
 import { Map, InfoWindow, Marker, GoogleApiWrapper } from 'google-maps-react';
-import moment from 'moment'
+import moment from 'moment';
 import Typography from '@material-ui/core/Typography';
 import firebase from '../firebase.js';
 
@@ -11,7 +11,7 @@ const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM';
 const mapStyles = {
     width: '100%',
     height: '100%'
-}
+};
 
 /** 
   * Types of sightings. Label is what is
@@ -81,60 +81,26 @@ const timeTypes = [
 const confidenceLevels = [
     {
         value: '1',
-        label: '1 - Strongly unconfident',
+        label: '1 - Strongly disagree',
     },
     {
         value: '2',
-        label: '2 - Unconfident',
+        label: '2 - Disagree',
     },
     {
         value: '3',
-        label: '3 - Somewhat confident',
+        label: '3 - Neutral',
     },
     {
         value: '4',
-        label: '4 - Confident',
+        label: '4 - Agree',
     },
     {
         value: '5',
-        label: '5 - Very confident',
+        label: '5 - Strongly agree',
     },
 ];
 
-/**
- * Gets formatted confidence value.
- */
-function getConfidence(item) {
-    for (var i = 0; i < confidenceLevels.length; i++) {
-        if (confidenceLevels[i].value === item) {
-            return confidenceLevels[i].label;
-        }
-    }
-
-}
-
-/**
- * Gets formatted time value.
- */
-function getTime(item) {
-    for (var i = 0; i < timeTypes.length; i++) {
-        if (timeTypes[i].value === item) {
-            return timeTypes[i].label;
-        }
-    }
-}
-
-/**
- * Gets formatted type value.
- */
-function getType(item) {
-    for (var i = 0; i < sightingTypes.length; i++) {
-        if (sightingTypes[i].value === item) {
-            return sightingTypes[i].label;
-        }
-    }
-}
-
 export class MapContainer extends Component {
 
     // Get the user's location using Google's geolocation
@@ -146,9 +112,8 @@ export class MapContainer extends Component {
                         lat: position.coords.latitude,
                         lng: position.coords.longitude
                     }
-                }
+                });
-                );
+            });
-            })
         } else {
             // If browser doesn't support geolocation or if user does not allow it, 
             // center map on Grand Rapids, Michigan
@@ -157,9 +122,43 @@ export class MapContainer extends Component {
                     lat: 42.9634,
                     lng: 85.6681
                 }
+            });
         }
-            );
     }
+
+    /**
+    * Gets formatted type value.
+    */
+    getType = item => {
+        for (var i = 0; i < sightingTypes.length; i++) {
+            if (sightingTypes[i].value === item) {
+                return sightingTypes[i].label;
+            }
+        }
+    }
+
+
+    /**
+     * Gets formatted time value.
+     */
+    getTime = item => {
+        for (var i = 0; i < timeTypes.length; i++) {
+            if (timeTypes[i].value === item) {
+                return timeTypes[i].label;
+            }
+        }
+    }
+
+    /**
+    * Gets formatted confidence value.
+    */
+    getConfidence = item => {
+        for (var i = 0; i < confidenceLevels.length; i++) {
+            if (confidenceLevels[i].value === item) {
+                return confidenceLevels[i].label;
+            }
+        }
+
     }
 
     // When the component has mounted to the DOM, get the user's location
@@ -231,7 +230,6 @@ export class MapContainer extends Component {
             default:
                 break
         }
-
         return pinIcon
     }
 
@@ -250,7 +248,7 @@ export class MapContainer extends Component {
         activeMarker: {},
         selectedPlace: {},
         sightings: []
-    }
+    };
 
     render() {
         const {google} = this.props;
@@ -264,7 +262,8 @@ export class MapContainer extends Component {
                     initialCenter={this.state.myLatLng}
                     center={this.state.myLatLng}
                     defaultZoom={15}
-                    onClick={this.onMapClick} >
+                    onClick={this.onMapClick}
+                >
 
                     <Marker
                         position={this.state.myLatLng}
@@ -273,18 +272,19 @@ export class MapContainer extends Component {
                     />
 
                     {this.state.sightings.map((sighting) => {
+
                         let pinIcon = this.sightingIcon(sighting.type)
                         
                         return (
                             <Marker
-                                key = {sighting.id}
+                                key={sighting.id}
-                                position = {{ lat: sighting.lat, lng: sighting.lng }}
+                                position={{ lat: sighting.lat, lng: sighting.lng }}
-                                onClick = {this.onMarkerClick}
+                                onClick={this.onMarkerClick}
-                                type = {'Type: ' + getType(sighting.type)}
+                                type={'Type: ' + this.getType(sighting.type)}
-                                confidence = {<Fragment><b>Confidence:</b> {getConfidence(sighting.confidence)}</Fragment>}
+                                date={<Fragment><b>Date:</b> {this.formatDate(sighting.date)}</Fragment>}
-                                date = {<Fragment><b>Date:</b> {this.formatDate(sighting.date)}</Fragment>}
+                                time={<Fragment><b>Time:</b> {this.getTime(sighting.time)}</Fragment>}
-                                time = {<Fragment><b>Time:</b> {getTime(sighting.time)}</Fragment>}
+                                confidence={<Fragment><b>I am confident of my sighting:</b> {this.getConfidence(sighting.confidence)}</Fragment>}
-                                description = {<Fragment><b>Description:</b> {sighting.desc}</Fragment>}
+                                description={<Fragment><b>Description:</b> {sighting.desc}</Fragment>}
                                 icon={{
                                     url: pinIcon,
                                     anchor: new google.maps.Point(32,32),
@@ -302,15 +302,15 @@ export class MapContainer extends Component {
                             <Typography variant="display1" gutterBottom>
                                 {this.state.selectedPlace.type}
                             </Typography>
-                            <Typography variant="subheading" gutterBottom>
-                                {this.state.selectedPlace.confidence}
-                            </Typography>
                             <Typography variant="subheading" gutterBottom>
                                 {this.state.selectedPlace.date}
                             </Typography>
                             <Typography variant="subheading" gutterBottom>
                                 {this.state.selectedPlace.time}
                             </Typography>
+                            <Typography variant="subheading" gutterBottom>
+                                {this.state.selectedPlace.confidence}
+                            </Typography>
                             <Typography variant="subheading" gutterBottom>
                                 {this.state.selectedPlace.description}
                             </Typography>
@@ -323,6 +323,4 @@ export class MapContainer extends Component {
 }
 
 // Send the Google Map API Key with the MapContainer component
-export default GoogleApiWrapper({
+export default GoogleApiWrapper({ apiKey: (API_KEY) })(MapContainer);
-    apiKey: (API_KEY)
-})(MapContainer)

src/components/ViewSightings.js

@@ -1,232 +1,95 @@
-import React, {Fragment} from 'react';
+import React, { Component, Fragment } from 'react';
-import PropTypes from 'prop-types';
 import Grid from '@material-ui/core/Grid';
-import TextField from '@material-ui/core/TextField'
-import Button from '@material-ui/core/Button'
-import Paper from '@material-ui/core/Paper'
-import { withStyles } from '@material-ui/core/styles';
-import Typography from '@material-ui/core/Typography';
 import firebase from '../firebase.js';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
+import ListItemText from '@material-ui/core/ListItemText';
+import SightingDetail from './SightingDetail';
 
-const styles = theme => ({
+class ViewSightings extends Component {
-    root: {
+
-      ...theme.mixins.gutters(),
+    componentDidMount() {
-      paddingTop: theme.spacing.unit * 2,
+        const sightingsRef = firebase.database().ref('sightings');
-      paddingBottom: theme.spacing.unit * 2,
+
-    },
+        sightingsRef.on('value', (snapshot) => {
-    container: {
+            let sightings = snapshot.val();
-        display: 'flex',
+            let newState = [];
-        flexWrap: 'wrap',
+
-      },
+            for (let sighting in sightings) {
-    textField: {
+                newState.unshift({
-        marginLeft: theme.spacing.unit * 2,
+                    id: sighting,
-        marginRight: theme.spacing.unit * 2,
+                    lat: sightings[sighting].lat,
-        marginTop: theme.spacing.unit * 2,
+                    lng: sightings[sighting].lng,
-        flexBasis: 280,
+                    desc: sightings[sighting].desc,
-    },
+                    type: sightings[sighting].type,
-    button: {
+                    confidence: sightings[sighting].confidence,
-        marginLeft: theme.spacing.unit * 3,
+                    date: sightings[sighting].date,
-        marginRight: theme.spacing.unit * 3,
+                    time: sightings[sighting].time
-        marginTop: theme.spacing.unit * 3,
-      },
-    paper: {
-        marginLeft: theme.spacing.unit * 2,
-        marginRight: theme.spacing.unit,
-        marginTop: theme.spacing.unit * 2,
-      },
                 });
-
-  /** 
-  * Types of sightings. Label is what is
-  * viewed in the application, value is
-  * what is stored in the database.
-  */
-  const sightingTypes = [
-    {
-      value: 'visual',
-      label: 'Visual',
-    },
-    {
-      value: 'roadkill',
-      label: 'Roadkill',
-    },
-    {
-      value: 'trapped',
-      label: 'Trapped',
-    },
-    {
-      value: 'viewed_tracks',
-      label: 'Viewed Tracks',
-    },
-    {
-      value: 'photo',
-      label: 'Photo',
-    },
-    {
-      value: 'other',
-      label: 'Other',
-    },
-  ];
-  
-  /** 
-   * Levels of confidence. Label is what is
-   * viewed in the application, value is
-   * what is stored in the database.
-  */
-  const confidenceLevels = [
-      {
-        value: '1',
-        label: '1 - Strongly unconfident',
-      },
-      {
-        value: '2',
-        label: '2 - Unconfident',
-      },
-      {
-        value: '3',
-        label: '3 - Somewhat confident',
-      },
-      {
-        value: '4',
-        label: '4 - Confident',
-      },
-      {
-        value: '5',
-        label: '5 - Very confident',
-      },
-    ];
-
-    /**
-     * Gets formatted confidence value.
-     */
-    function getConfidence(item) {
-        for (var i = 0; i < confidenceLevels.length; i++) {
-            if (confidenceLevels[i].value === item) {
-                return confidenceLevels[i].label;
             }
+            this.setState({
+                sightings: newState
+            });
+        });
     }
 
-    }
+    getDetail = (id, lat, lng, desc, type, confidence, date, time) => {
-
+        this.setState({
-    /**
+            selectedSighting: {
-     * Gets formatted type value.
+                id: id,
-     */
+                lat: lat,
-    function getType(item) {
+                lng: lng,
-        for (var i = 0; i < sightingTypes.length; i++) {
+                desc: desc,
-            if (sightingTypes[i].value === item) {
+                type: type,
-                return sightingTypes[i].label;
+                confidence: confidence,
-            }
+                date: date,
-        }
+                time: time
-    }
+            },
-
+            clicked: true
-class ViewSightings extends React.Component {
+        })
-    constructor(props){
-       super(props);
-
-       this.handleSubmit = this.handleSubmit.bind(this);
     }
 
     state = {
-        id: '',
+        sightings: [],
-        type: 'N/A',
+        selectedSighting: {
-        confidence: 'N/A',
+            id: null,
-        date: 'N/A',
+            lat: null,
-        time: 'N/A',
+            lng: null,
-        desc: 'N/A',
+            desc: null,
-        lat: 'N/A',
+            type: null,
-        lng: 'N/A'
+            confidence: null,
+            date: null,
+            time: null
+        },
+        clicked: false
     };
 
-
+    render() {
-    /**
-     * Handles state change.
-     */
-    handleChange = name => event => {
-        this.setState({
-        [name]: event.target.value,
-        });
-    };
-
-    /**
-     * Handles submit on search.
-     */
-    handleSubmit(e){
-        e.preventDefault();
-        const itemSighting = firebase.database().ref("sightings/" + this.state.id);
-        itemSighting.once("value").then((snapshot) => {
-            // Die if there's no data for that ID.
-            if (!snapshot.exists()) {
-                return;
-            }
-            
-            let data = snapshot.val();
-
-            this.setState({
-                date: data.date,
-                time: data.time,
-                type: getType(data.type),
-                confidence: getConfidence(data.confidence),
-                desc: data.desc,
-                lat: data.lat,
-                lng: data.lng
-            });
-        });
-    };
-
-    render(){
-        const { classes } = this.props;
         return (
-            /**
-             * The below houses the search
-             * and submit button along with
-             * the sighting information
-             * it pulls.
-             */
             <Fragment>
-                <Grid container justify="center">
+                <Grid container>
-                    <form className={classes.container} onSubmit={this.handleSubmit}>
+                    <Grid item xs={12} md={6} className='sighting-list'>
-                    <Grid item xs={6}>
+                        <Fragment>
-                        <TextField
+                            <List>
-                        id="sighting-id"
+                            { 
-                        name="sighting-id"
+                                this.state.sightings.map((sighting) => {
-                        label="Input ID"
+                                    return (
-                        value={this.state.id}
+                                        <ListItem button key={ sighting.id } onClick={() => this.getDetail(sighting.id, sighting.lat, sighting.lng, sighting.desc, sighting.type, sighting.confidence, sighting.date, sighting.time)}>
-                        margin="normal"
+                                            <ListItemText primary={`${sighting.desc}`}/>
-                        onChange={this.handleChange('id')}
+                                        </ListItem>
-                        />
+                                    );
+                                })
+                            }
+                            </List>
+                        </Fragment>
                     </Grid>
-                    <Grid item xs={6}>
+                    <Grid item xs={12} md={6} className='sighting-details'>
-                        <Button variant="contained" type="submit" color="primary" className={classes.button}>
+                        {this.state.clicked === true && <SightingDetail detail={ this.state.selectedSighting }/>}
-                            Submit
-                        </Button>
-                    </Grid>
-                    </form>
-                    <Grid item xs={12}>
-                        <Paper elevation={2}>
-                            <Typography variant="headline" component="h3">
-                            Sighting
-                            </Typography>
-                            <Typography component="p">
-                            <b>Type:</b> {this.state.type} {<br/>}
-                            <b>Confidence:</b> {this.state.confidence} {<br/>}
-                            <b>Date:</b> {this.state.date} {<br/>}
-                            <b>Time:</b> {this.state.time} {<br/>}
-                            <b>Latitude:</b> {this.state.lat} {<br/>}
-                            <b>Longitude:</b> {this.state.lng} {<br/>}
-                            <b>Description:</b> {this.state.desc}
-                            </Typography>
-                        </Paper>
                     </Grid>
                 </Grid>
             </Fragment>
-        )
+        );
-
     }
-
 }
 
-ViewSightings.propTypes = {
+export default ViewSightings;
-    classes: PropTypes.object.isRequired,
-  };
-
-export default withStyles(styles)(ViewSightings);

src/pages/SightingList.js

@@ -1,13 +1,10 @@
 import React, { Component } from 'react';
 import ViewSightings from '../components/ViewSightings.js';
-import Typography from '@material-ui/core/Typography';
 
 class Sighting extends Component {
     render() {
         return (
-            <Typography variant='display1' align='center' gutterBottom>
             <ViewSightings/>
-            </Typography>
         );
     }
 }