GVSU/marten-application
GVSU
/
marten-application
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into flamelink

This commit is contained in:
ajmaley 2018-11-03 15:32:18 -04:00
parent 65f2b4ecb9 c7cbe42d51
commit 8b7021684c
8 changed files with 709 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Main.js
View File

@ -70,7 +70,7 @@ const styles = theme => ({
class ResponsiveDrawer extends React.Component { class ResponsiveDrawer extends React.Component {
state = { state = {
mobileOpen: false, mobileOpen: false,
key: '', key: 'Home',
open: false open: false
}; };
@ -85,7 +85,7 @@ class ResponsiveDrawer extends React.Component {
nav = (text) => { nav = (text) => {
this.setState({ this.setState({
key: text key: text
}) });
} }
render() { render() {
@ -195,10 +195,13 @@ class ResponsiveDrawer extends React.Component {
{this.state.key === 'Report' && <Report />} {this.state.key === 'Report' && <Report />}
{this.state.key === 'Map' && <ViewMap />} {this.state.key === 'Map' && <ViewMap />}
{this.state.key === 'List' && <SightingList />} {this.state.key === 'List' && <SightingList />}
{this.state.key === 'Info' && <Info />} {this.state.key === 'About' && <Info />}
{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'/>}
{this.state.key === 'Easy-Quiz' && <Quiz difficulty='Easy' />}
{this.state.key === 'Medium-Quiz' && <Quiz difficulty='Medium' />}
{this.state.key === 'Hard-Quiz' && <Quiz difficulty='Hard' />}
</main> </main>
</div> </div>
); );

26
src/components/QuizGame.js
View File

@ -239,33 +239,33 @@ class QuizGame extends React.Component {
* @param {*} difficulty The difficulty setting passed in. * @param {*} difficulty The difficulty setting passed in.
*/ */
pickDifficulty = difficulty => { pickDifficulty = difficulty => {
let level let level;
switch (difficulty) { switch (difficulty) {
case 'Easy': 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': 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': 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: default:
break break;
} }
return level return level;
} }
// The state of the component. // The state of the component.
state = { state = {
difficulty: this.pickDifficulty(this.props.difficulty), difficulty: this.pickDifficulty(this.props.difficulty),
key: Math.random() key: Math.random()
} };
// Renders the quiz component. // Renders the quiz component.
render() { render() {

937
src/components/ReportForm.js
View File

@ -11,6 +11,8 @@ import CloseIcon from '@material-ui/icons/Close';
import Button from '@material-ui/core/Button'; import Button from '@material-ui/core/Button';
import firebase from '../firebase.js'; import firebase from '../firebase.js';
import GoogleMap from '../components/ReportMap'; import GoogleMap from '../components/ReportMap';
import Modal from '@material-ui/core/Modal';
import Typography from '@material-ui/core/Typography';
/** /**
* Styles that the different * Styles that the different
@ -18,39 +20,46 @@ import GoogleMap from '../components/ReportMap';
* in. Mostly used for spacing. * in. Mostly used for spacing.
*/ */
const styles = theme => ({ const styles = theme => ({
container: { container: {
display: 'flex', display: 'flex',
flexWrap: 'wrap' flexWrap: 'wrap'
}, },
textField: { textField: {
marginLeft: theme.spacing.unit * 2, marginLeft: theme.spacing.unit * 2,
marginRight: theme.spacing.unit, marginRight: theme.spacing.unit,
marginTop: theme.spacing.unit * 2, marginTop: theme.spacing.unit * 2,
flexBasis: 280, flexBasis: 280,
width: '90%' width: '90%'
}, },
button: { button: {
marginLeft: theme.spacing.unit * 2, marginLeft: theme.spacing.unit * 2,
marginRight: theme.spacing.unit, marginRight: theme.spacing.unit,
marginTop: theme.spacing.unit * 2, marginTop: theme.spacing.unit * 2,
}, },
dense: { dense: {
marginTop: 30, marginTop: 30,
}, },
close: { close: {
padding: theme.spacing.unit / 2, padding: theme.spacing.unit / 2,
}, },
icon: { icon: {
fontSize: 20, fontSize: 20,
marginRight: theme.spacing.unit, marginRight: theme.spacing.unit,
}, },
message: { message: {
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
}, },
menu: { menu: {
width: 200, width: 200,
}, },
paper: {
position: 'absolute',
width: theme.spacing.unit * 50,
backgroundColor: theme.palette.background.paper,
boxShadow: theme.shadows[5],
padding: theme.spacing.unit * 4,
}
}); });
/** /**
@ -59,30 +68,30 @@ const styles = theme => ({
* what is stored in the database. * what is stored in the database.
*/ */
const sightingTypes = [ const sightingTypes = [
{ {
value: 'visual', value: 'visual',
label: 'Visual', label: 'Visual',
}, },
{ {
value: 'roadkill', value: 'roadkill',
label: 'Roadkill', label: 'Roadkill',
}, },
{ {
value: 'trapped', value: 'trapped',
label: 'Trapped', label: 'Trapped',
}, },
{ {
value: 'viewed_tracks', value: 'viewed_tracks',
label: 'Viewed Tracks', label: 'Viewed Tracks',
}, },
{ {
value: 'photo', value: 'photo',
label: 'Photo', label: 'Photo',
}, },
{ {
value: 'other', value: 'other',
label: 'Other', label: 'Other',
}, },
]; ];
/** /**
@ -91,54 +100,54 @@ const sightingTypes = [
* what is stored in the database. * what is stored in the database.
*/ */
const monthTypes = [ const monthTypes = [
{ {
value: '01', value: '01',
label: 'January', label: 'January',
}, },
{ {
value: '02', value: '02',
label: 'February', label: 'February',
}, },
{ {
value: '03', value: '03',
label: 'March', label: 'March',
}, },
{ {
value: '04', value: '04',
label: 'April', label: 'April',
}, },
{ {
value: '05', value: '05',
label: 'May', label: 'May',
}, },
{ {
value: '06', value: '06',
label: 'June', label: 'June',
}, },
{ {
value: '07', value: '07',
label: 'July', label: 'July',
}, },
{ {
value: '08', value: '08',
label: 'August', label: 'August',
}, },
{ {
value: '09', value: '09',
label: 'September', label: 'September',
}, },
{ {
value: '10', value: '10',
label: 'October', label: 'October',
}, },
{ {
value: '11', value: '11',
label: 'November', label: 'November',
}, },
{ {
value: '12', value: '12',
label: 'December', label: 'December',
}, },
]; ];
/** /**
@ -147,26 +156,26 @@ const monthTypes = [
* what is stored in the database. * what is stored in the database.
*/ */
const timeTypes = [ const timeTypes = [
{ {
value: 'unknown', value: 'unknown',
label: 'Unknown', label: 'Unknown',
}, },
{ {
value: 'morning', value: 'morning',
label: 'Morning', label: 'Morning',
}, },
{ {
value: 'midday', value: 'midday',
label: 'Midday', label: 'Midday',
}, },
{ {
value: 'evening', value: 'evening',
label: 'Evening', label: 'Evening',
}, },
{ {
value: 'night', value: 'night',
label: 'Night', label: 'Night',
}, },
]; ];
/** /**
@ -175,349 +184,379 @@ const timeTypes = [
* what is stored in the database. * what is stored in the database.
*/ */
const confidenceLevels = [ const confidenceLevels = [
{ {
value: '1', value: '1',
label: '1 - Strongly disagree', label: '1 - Strongly disagree',
}, },
{ {
value: '2', value: '2',
label: '2 - Disagree', label: '2 - Disagree',
}, },
{ {
value: '3', value: '3',
label: '3 - Neutral', label: '3 - Neutral',
}, },
{ {
value: '4', value: '4',
label: '4 - Agree', label: '4 - Agree',
}, },
{ {
value: '5', value: '5',
label: '5 - Strongly agree', label: '5 - Strongly agree',
}, },
]; ];
/** /**
* The form component. * The form component.
*/ */
class ReportForm extends React.Component { class ReportForm extends React.Component {
/** /**
* Component contructor. Currently * Component contructor. Currently
* only used to bind event * only used to bind event
* handlers. * handlers.
*/ */
constructor() { constructor() {
super(); super();
this.handleSubmit = this.handleSubmit.bind(this); 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: this.getMonth(new Date()),
year: this.getYear(new Date()),
time: 'unknown',
type: 'visual',
confidence: '1',
desc: '',
lat: '',
lng: '',
open: false
};
/**
* Handles state change in form
* components.
*/
handleChange = name => event => {
this.setState({
[name]: event.target.value,
});
};
/**
* Handles closing the toast.
*/
handleClose = (event, reason) => {
if (reason === 'clickaway') {
return;
} }
this.setState({ open: false });
};
/*
* Get the coordinates
*
*/
getCoordinates = (lat, lng) => {
let latitude = lat;
let longitude = lng;
this.setState({
lat: latitude,
lng: longitude
});
}
/**
* Event listener for form.
* When the form is submitted,
* this function passes the
* data along to Firebase.
*/
handleSubmit(e) {
e.preventDefault();
const sightingsRef = firebase.database().ref('sightings');
const sighting = {
type: this.state.type,
confidence: this.state.confidence,
date: this.state.year + '-' + this.state.month,
time: this.state.time,
desc: this.state.desc,
lat: this.state.lat,
lng: this.state.lng
}
sightingsRef.push(sighting);
this.setState({
year: this.getYear(new Date()),
month: this.getMonth(new Date()),
time: 'unknown',
type: 'visual',
confidence: '1',
desc: '',
lat: '',
lng: '',
open: true
});
};
/**
* The render method for this component.
*/
render() {
const { classes } = this.props;
/** /**
* The actual form. * 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.
*/ */
return ( state = {
<Fragment> month: this.getMonth(new Date()),
<form className={classes.container} autoComplete="off" onSubmit={this.handleSubmit}> year: this.getYear(new Date()),
<Grid container> time: 'unknown',
<Grid item xs={12} md={6}> type: 'visual',
<Grid container spacing={8}> confidence: '1',
<Grid item xs={12}> desc: '',
<TextField lat: '',
id="select-sighting-type" lng: '',
select open: false,
required openModal: false,
name="sighting-type" hasModalOpened: false
label="Select" };
className={classes.textField}
value={this.state.type}
onChange={this.handleChange('type')}
SelectProps={{
MenuProps: {
className: classes.menu,
},
}}
helperText="Please select type of sighting"
>
{sightingTypes.map(option => (
<MenuItem key={option.value} value={option.value}>
{option.label}
</MenuItem>
))}
</TextField>
</Grid>
<Grid item xs={12}> handleModalOpen = () => !this.state.hasModalOpened ? this.setState({ openModal: true, hasModalOpened: true }) : null;
<TextField
id="select-confidence"
select
required
name="sighting-confidence"
label="Select"
className={classes.textField}
value={this.state.confidence}
onChange={this.handleChange('confidence')}
SelectProps={{
MenuProps: {
className: classes.menu,
},
}}
helperText="I am confident of my marten sighting"
>
{confidenceLevels.map(option => (
<MenuItem key={option.value} value={option.value}>
{option.label}
</MenuItem>
))}
</TextField>
</Grid>
<Grid item xs={12}> handleModalClose = () => {
<TextField this.setState({ openModal: false });
id="sighting-time" };
select
required
label="Sighting time"
name="sighting-time"
className={classes.textField}
value={this.state.time}
onChange={this.handleChange('time')}
SelectProps={{
MenuProps: {
className: classes.menu,
},
}}
>
{timeTypes.map(option => (
<MenuItem key={option.value} value={option.value}>
{option.label}
</MenuItem>
))}
</TextField>
</Grid>
<Grid item xs={12}> getModalStyle = () => {
<TextField return {
id="sighting-month" top: `25%`,
select left: `75%`,
required transform: `translate(-25%, -75%)`,
label="Sighting month" };
name="sighting-month" }
className={classes.textField}
value={this.state.month}
onChange={this.handleChange('month')}
SelectProps={{
MenuProps: {
className: classes.menu,
},
}}
>
{monthTypes.map(option => (
<MenuItem key={option.value} value={option.value}>
{option.label}
</MenuItem>
))}
</TextField>
</Grid>
<Grid item xs={12}> /**
<TextField * Handles state change in form
id="sighting-year" * components.
required */
label="Sighting year" handleChange = name => event => {
name="sighting-year" this.setState({
value={this.state.year} [name]: event.target.value,
type="number" });
className={classes.textField} };
onChange={this.handleChange('year')}
InputLabelProps={{
shrink: true,
}}
/>
</Grid>
<Grid item xs={12}> /**
<TextField * Handles closing the toast.
id="sighting-description" */
required handleClose = (event, reason) => {
label="Description" if (reason === 'clickaway') {
name="sighting-desc" return;
multiline }
rows="5"
placeholder="Describe the sighting to the best of your ability."
value={this.state.desc}
className={classes.textField}
onChange={this.handleChange('desc')}
margin="normal"
variant="outlined"
InputLabelProps={{
shrink: true,
}}
/>
</Grid>
<Grid item xs={12}> this.setState({ open: false });
<Button variant="contained" type="submit" color="primary" className={classes.button}> };
Submit
</Button> /*
</Grid> * Get the coordinates
</Grid> *
</Grid> */
<Grid item xs={12} md={6}> getCoordinates = (lat, lng) => {
<GoogleMap onClick={this.getCoordinates} /> let latitude = lat;
</Grid> let longitude = lng;
</Grid>
</form> this.setState({
<Snackbar lat: latitude,
anchorOrigin={{ lng: longitude
vertical: 'bottom', });
horizontal: 'left', }
}}
open={this.state.open} /**
autoHideDuration={6000} * Event listener for form.
onClose={this.handleClose} * When the form is submitted,
ContentProps={{ * this function passes the
'aria-describedby': 'message-id', * data along to Firebase.
}} */
message={<span id="message-id" className={classes.message}><CheckCircleIcon className={classes.icon} />Report received.</span>} handleSubmit(e) {
action={[ e.preventDefault();
<IconButton const sightingsRef = firebase.database().ref('sightings');
key="close" const sighting = {
aria-label="Close" type: this.state.type,
color="inherit" confidence: this.state.confidence,
className={classes.close} date: this.state.year + '-' + this.state.month,
onClick={this.handleClose} time: this.state.time,
> desc: this.state.desc,
<CloseIcon /> lat: this.state.lat,
</IconButton>, lng: this.state.lng
]} }
/> sightingsRef.push(sighting);
</Fragment> this.setState({
); year: this.getYear(new Date()),
} month: this.getMonth(new Date()),
time: 'unknown',
type: 'visual',
confidence: '1',
desc: '',
lat: '',
lng: '',
open: true
});
};
/**
* The render method for this component.
*/
render() {
const { classes } = this.props;
/**
* The actual form.
*/
return (
<Fragment>
<form className={classes.container} autoComplete="off" onSubmit={this.handleSubmit}>
<Grid container>
<Grid item xs={12} md={6}>
<Grid container spacing={8}>
<Grid item xs={12}>
<TextField
id="select-sighting-type"
select
required
name="sighting-type"
label="Select"
className={classes.textField}
value={this.state.type}
onChange={this.handleChange('type')}
SelectProps={{
MenuProps: {
className: classes.menu,
},
}}
helperText="Please select type of sighting"
>
{sightingTypes.map(option => (
<MenuItem key={option.value} value={option.value}>
{option.label}
</MenuItem>
))}
</TextField>
</Grid>
<Grid item xs={12}>
<TextField
id="select-confidence"
select
required
name="sighting-confidence"
label="Select"
className={classes.textField}
value={this.state.confidence}
onChange={this.handleChange('confidence')}
SelectProps={{
MenuProps: {
className: classes.menu,
},
}}
helperText="I am confident of my marten sighting"
>
{confidenceLevels.map(option => (
<MenuItem key={option.value} value={option.value}>
{option.label}
</MenuItem>
))}
</TextField>
</Grid>
<Grid item xs={12}>
<TextField
id="sighting-time"
select
required
label="Sighting time"
name="sighting-time"
className={classes.textField}
value={this.state.time}
onChange={this.handleChange('time')}
SelectProps={{
MenuProps: {
className: classes.menu,
},
}}
>
{timeTypes.map(option => (
<MenuItem key={option.value} value={option.value}>
{option.label}
</MenuItem>
))}
</TextField>
</Grid>
<Grid item xs={12}>
<TextField
id="sighting-month"
select
required
label="Sighting month"
name="sighting-month"
className={classes.textField}
value={this.state.month}
onChange={this.handleChange('month')}
SelectProps={{
MenuProps: {
className: classes.menu,
},
}}
>
{monthTypes.map(option => (
<MenuItem key={option.value} value={option.value}>
{option.label}
</MenuItem>
))}
</TextField>
</Grid>
<Grid item xs={12}>
<TextField
id="sighting-year"
required
label="Sighting year"
name="sighting-year"
value={this.state.year}
type="number"
className={classes.textField}
onChange={this.handleChange('year')}
InputLabelProps={{
shrink: true,
}}
/>
</Grid>
<Grid item xs={12}>
<TextField
id="sighting-description"
required
label="Description"
name="sighting-desc"
multiline
rows="5"
placeholder="Describe the sighting to the best of your ability."
value={this.state.desc}
className={classes.textField}
onChange={this.handleChange('desc')}
margin="normal"
variant="outlined"
InputLabelProps={{
shrink: true,
}}
/>
</Grid>
<Grid item xs={12}>
<Button variant="contained" type="submit" color="primary" className={classes.button}>
Submit
</Button>
</Grid>
</Grid>
</Grid>
<Grid item xs={12} md={6} onMouseEnter={this.handleModalOpen}>
<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>
<Snackbar
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
}}
open={this.state.open}
autoHideDuration={6000}
onClose={this.handleClose}
ContentProps={{
'aria-describedby': 'message-id',
}}
message={<span id="message-id" className={classes.message}><CheckCircleIcon className={classes.icon} />Report received.</span>}
action={[
<IconButton
key="close"
aria-label="Close"
color="inherit"
className={classes.close}
onClick={this.handleClose}
>
<CloseIcon />
</IconButton>,
]}
/>
</Fragment>
);
}
} }
ReportForm.propTypes = { ReportForm.propTypes = {
classes: PropTypes.object.isRequired, classes: PropTypes.object.isRequired,
}; };
export default withStyles(styles)(ReportForm); export default withStyles(styles)(ReportForm);

70
src/components/ReportMap.js
View File

@ -9,7 +9,7 @@ const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM';
const mapStyles = { const mapStyles = {
width: '100%', width: '100%',
height: '100%' height: '100%'
} };
export class MapContainer extends Component { export class MapContainer extends Component {
@ -18,22 +18,22 @@ export class MapContainer extends Component {
if (navigator.geolocation) { if (navigator.geolocation) {
navigator.geolocation.getCurrentPosition((position) => { navigator.geolocation.getCurrentPosition((position) => {
this.setState({ this.setState({
myLatLng: { myLatLng: {
lat: position.coords.latitude, lat: position.coords.latitude,
lng: position.coords.longitude lng: position.coords.longitude
}
} }
}
); );
}) })
} else { } else {
// If browser doesn't support geolocation or if user does not allow it, // If browser doesn't support geolocation or if user does not allow it,
// center map on Grand Rapids, Michigan // center map on Grand Rapids, Michigan
this.setState({ this.setState({
myLatLng: { myLatLng: {
lat: 42.9634, lat: 42.9634,
lng: 85.6681 lng: 85.6681
}
} }
}
); );
} }
} }
@ -52,7 +52,7 @@ export class MapContainer extends Component {
showingInfoWindow: true showingInfoWindow: true
}); });
} }
// When the user clicks on the map, if a info window is visible then close it // When the user clicks on the map, if a info window is visible then close it
// and 'unactive' that marker // and 'unactive' that marker
onMapClick = (props, map, e) => { onMapClick = (props, map, e) => {
@ -68,13 +68,13 @@ export class MapContainer extends Component {
lat: e.latLng.lat(), lat: e.latLng.lat(),
lng: e.latLng.lng() lng: e.latLng.lng()
} }
}) });
let lat = e.latLng.lat(); let lat = e.latLng.lat();
let lng = e.latLng.lng(); let lng = e.latLng.lng();
if (this.props.onClick) { if (this.props.onClick) {
this.props.onClick(lat,lng); this.props.onClick(lat, lng);
} }
} }
@ -98,36 +98,36 @@ export class MapContainer extends Component {
return ( return (
// Render the Google Map, Marker, and InfoWindow components // Render the Google Map, Marker, and InfoWindow components
<div className = "report-google-map-container"> <div className="report-google-map-container">
<Map <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 <Marker
position = { this.state.markerLatLng } position={this.state.markerLatLng}
/> />
<Marker <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 <InfoWindow
marker = { this.state.activeMarker } marker={this.state.activeMarker}
visible = { this.state.showingInfoWindow } > visible={this.state.showingInfoWindow} >
<Fragment> <Fragment>
<Typography variant = "display1" gutterBottom> <Typography variant="display1" gutterBottom>
{ this.state.selectedPlace.title } {this.state.selectedPlace.title}
</Typography> </Typography>
<Typography variant = "subheading" gutterBottom> <Typography variant="subheading" gutterBottom>
{ this.state.selectedPlace.name } {this.state.selectedPlace.name}
</Typography> </Typography>
</Fragment> </Fragment>
</InfoWindow> </InfoWindow>
@ -138,6 +138,4 @@ export class MapContainer extends Component {
} }
// Send the Google Map API Key with the MapContainer 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)

142
src/components/SightingDetail.js
View File

@ -1,24 +1,154 @@
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import Disqus from 'disqus-react'; import Disqus from 'disqus-react';
import moment from 'moment';
import SightingDetailMap from './SightingDetailMap'; 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 { 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() { render() {
const disqusShortname = 'https-marten-application-netlify-com'; const disqusShortname = 'https-marten-application-netlify-com';
const disqusConfig = { const disqusConfig = {
url: `http://localhost:3000/${this.props.detail.id}`, url: `http://localhost:3000/${this.props.detail.id}`,
identifier: this.props.detail.id, identifier: this.props.detail.id,
title: this.props.detail.id title: this.props.detail.id
} };
return ( return (
<Fragment> <Fragment>
<SightingDetailMap lat={this.props.detail.lat} lng={this.props.detail.lng}/> <SightingDetailMap lat={this.props.detail.lat} lng={this.props.detail.lng} />
<div className='sighting-details-content'> <div className='sighting-details-content'>
<p>{`Confidence: ${this.props.detail.confidence}`}</p> <p><b>Type:</b> {this.getType(this.props.detail.type)}</p>
<p>{`When: ${this.props.detail.date}, ${this.props.detail.time}`}</p> <p><b>When:</b> {this.formatDate(this.props.detail.date)}, {this.getTime(this.props.detail.time)}</p>
<p>{`Where: ${this.props.detail.lat} degrees N, and ${this.props.detail.lng} degrees E`}</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> <p>{`${this.props.detail.desc}`}</p>
</div> </div>
<Disqus.DiscussionEmbed shortname={disqusShortname} config={disqusConfig} /> <Disqus.DiscussionEmbed shortname={disqusShortname} config={disqusConfig} />
@ -27,4 +157,4 @@ class SightingDetail extends Component {
} }
} }
export default SightingDetail; export default SightingDetail;

22
src/components/SightingDetailMap.js
View File

@ -8,23 +8,23 @@ const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM';
const mapStyles = { const mapStyles = {
width: '100%', width: '100%',
height: '100%' height: '100%'
} };
export class MapContainer extends Component { export class MapContainer extends Component {
render() { render() {
return ( return (
// Render the Google Map, Marker, and InfoWindow components // Render the Google Map, Marker, and InfoWindow components
<div className = "sighting-detail-google-map-container"> <div className="sighting-detail-google-map-container">
<Map <Map
style = { mapStyles } style={mapStyles}
google = { this.props.google } google={this.props.google}
initialCenter = {{ lat: this.props.lat, lng: this.props.lng }} initialCenter={{ lat: this.props.lat, lng: this.props.lng }}
center = {{ lat: this.props.lat, lng: this.props.lng }} center={{ lat: this.props.lat, lng: this.props.lng }}
defaultZoom = { 15 }> defaultZoom={15}>
<Marker <Marker
position = {{ lat: this.props.lat, lng: this.props.lng }} position={{ lat: this.props.lat, lng: this.props.lng }}
/> />
</Map> </Map>
</div> </div>
@ -33,6 +33,4 @@ export class MapContainer extends Component {
} }
// Send the Google Map API Key with the MapContainer 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)

41
src/components/SightingMap.js
View File

@ -1,6 +1,6 @@
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import { Map, InfoWindow, Marker, GoogleApiWrapper } from 'google-maps-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 Typography from '@material-ui/core/Typography';
import firebase from '../firebase.js'; import firebase from '../firebase.js';
@ -11,7 +11,7 @@ const API_KEY = 'AIzaSyAZ_0J01bA6wCbIPK4UBq2RUBC-hIqG4mM';
const mapStyles = { const mapStyles = {
width: '100%', width: '100%',
height: '100%' height: '100%'
} };
/** /**
* Types of sightings. Label is what is * Types of sightings. Label is what is
@ -81,23 +81,23 @@ const timeTypes = [
const confidenceLevels = [ const confidenceLevels = [
{ {
value: '1', value: '1',
label: '1 - Strongly unconfident', label: '1 - Strongly disagree',
}, },
{ {
value: '2', value: '2',
label: '2 - Unconfident', label: '2 - Disagree',
}, },
{ {
value: '3', value: '3',
label: '3 - Somewhat confident', label: '3 - Neutral',
}, },
{ {
value: '4', value: '4',
label: '4 - Confident', label: '4 - Agree',
}, },
{ {
value: '5', value: '5',
label: '5 - Very confident', label: '5 - Strongly agree',
}, },
]; ];
@ -112,9 +112,8 @@ export class MapContainer extends Component {
lat: position.coords.latitude, lat: position.coords.latitude,
lng: position.coords.longitude lng: position.coords.longitude
} }
} });
); });
})
} else { } else {
// If browser doesn't support geolocation or if user does not allow it, // If browser doesn't support geolocation or if user does not allow it,
// center map on Grand Rapids, Michigan // center map on Grand Rapids, Michigan
@ -123,8 +122,7 @@ export class MapContainer extends Component {
lat: 42.9634, lat: 42.9634,
lng: 85.6681 lng: 85.6681
} }
} });
);
} }
} }
@ -210,7 +208,7 @@ export class MapContainer extends Component {
} }
formatDate = date => { formatDate = date => {
return (moment(date, "YYYY-MM").format("MMMM YYYY").toString()) return (moment(date, "YYYY-MM").format("MMMM YYYY").toString());
} }
// Set the state of the component to contain user coordinates and initial // Set the state of the component to contain user coordinates and initial
@ -224,7 +222,7 @@ export class MapContainer extends Component {
activeMarker: {}, activeMarker: {},
selectedPlace: {}, selectedPlace: {},
sightings: [] sightings: []
} };
render() { render() {
return ( return (
@ -236,7 +234,8 @@ export class MapContainer extends Component {
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 <Marker
position={this.state.myLatLng} position={this.state.myLatLng}
@ -251,9 +250,9 @@ export class MapContainer extends Component {
position={{ lat: sighting.lat, lng: sighting.lng }} position={{ lat: sighting.lat, lng: sighting.lng }}
onClick={this.onMarkerClick} onClick={this.onMarkerClick}
type={'Type: ' + this.getType(sighting.type)} type={'Type: ' + this.getType(sighting.type)}
confidence={<Fragment><b>Confidence:</b> {this.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> {this.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>}
/> />
) )
@ -267,15 +266,15 @@ export class MapContainer extends Component {
<Typography variant="display1" gutterBottom> <Typography variant="display1" gutterBottom>
{this.state.selectedPlace.type} {this.state.selectedPlace.type}
</Typography> </Typography>
<Typography variant="subheading" gutterBottom>
{this.state.selectedPlace.confidence}
</Typography>
<Typography variant="subheading" gutterBottom> <Typography variant="subheading" gutterBottom>
{this.state.selectedPlace.date} {this.state.selectedPlace.date}
</Typography> </Typography>
<Typography variant="subheading" gutterBottom> <Typography variant="subheading" gutterBottom>
{this.state.selectedPlace.time} {this.state.selectedPlace.time}
</Typography> </Typography>
<Typography variant="subheading" gutterBottom>
{this.state.selectedPlace.confidence}
</Typography>
<Typography variant="subheading" gutterBottom> <Typography variant="subheading" gutterBottom>
{this.state.selectedPlace.description} {this.state.selectedPlace.description}
</Typography> </Typography>
@ -288,6 +287,4 @@ export class MapContainer extends Component {
} }
// Send the Google Map API Key with the MapContainer 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)

6
src/components/ViewSightings.js
View File

@ -16,7 +16,7 @@ class ViewSightings extends Component {
let newState = []; let newState = [];
for (let sighting in sightings) { for (let sighting in sightings) {
newState.push({ newState.unshift({
id: sighting, id: sighting,
lat: sightings[sighting].lat, lat: sightings[sighting].lat,
lng: sightings[sighting].lng, lng: sightings[sighting].lng,
@ -62,7 +62,7 @@ class ViewSightings extends Component {
time: null time: null
}, },
clicked: false clicked: false
} };
render() { render() {
return ( return (
@ -77,7 +77,7 @@ class ViewSightings extends Component {
<ListItem button key={ sighting.id } onClick={() => this.getDetail(sighting.id, sighting.lat, sighting.lng, sighting.desc, sighting.type, sighting.confidence, sighting.date, sighting.time)}> <ListItem button key={ sighting.id } onClick={() => this.getDetail(sighting.id, sighting.lat, sighting.lng, sighting.desc, sighting.type, sighting.confidence, sighting.date, sighting.time)}>
<ListItemText primary={`${sighting.desc}`}/> <ListItemText primary={`${sighting.desc}`}/>
</ListItem> </ListItem>
) );
}) })
} }
</List> </List>