From 054c67db51af3de7740cd99f60cf9ac43dec3d23 Mon Sep 17 00:00:00 2001 From: ajmaley Date: Sat, 27 Oct 2018 13:24:25 -0400 Subject: [PATCH] Merged flamelink branch with develop and added info page to menu. The content on the info page may populate the home page in the future. --- src/components/Main.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/Main.js b/src/components/Main.js index 62336af..984555e 100644 --- a/src/components/Main.js +++ b/src/components/Main.js @@ -16,10 +16,12 @@ import MenuIcon from '@material-ui/icons/Menu'; import HomeIcon from '@material-ui/icons/Home'; import AssignmentIcon from '@material-ui/icons/Assignment'; import MapIcon from '@material-ui/icons/Map'; +import InfoIcon from '@material-ui/icons/Info'; import ListIcon from '@material-ui/icons/List'; import SlideshowIcon from '@material-ui/icons/Slideshow'; import Home from '../pages/Home'; import ViewMap from '../pages/ViewMap'; +import Info from '../pages/Info'; import Quiz from '../pages/QuizPage'; import SightingList from '../pages/SightingList'; import Report from '../pages/Report'; @@ -110,6 +112,10 @@ class ResponsiveDrawer extends React.Component { + this.nav('Info')}> + + + @@ -189,6 +195,7 @@ class ResponsiveDrawer extends React.Component { {this.state.key === 'Report' && } {this.state.key === 'Map' && } {this.state.key === 'List' && } + {this.state.key === 'Info' && } {this.state.key === 'Easy-Quiz' && } {this.state.key === 'Medium-Quiz' && } {this.state.key === 'Hard-Quiz' && }