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.
This commit is contained in:
parent
2ab2b5842e
commit
054c67db51
|
@ -16,10 +16,12 @@ import MenuIcon from '@material-ui/icons/Menu';
|
||||||
import HomeIcon from '@material-ui/icons/Home';
|
import HomeIcon from '@material-ui/icons/Home';
|
||||||
import AssignmentIcon from '@material-ui/icons/Assignment';
|
import AssignmentIcon from '@material-ui/icons/Assignment';
|
||||||
import MapIcon from '@material-ui/icons/Map';
|
import MapIcon from '@material-ui/icons/Map';
|
||||||
|
import InfoIcon from '@material-ui/icons/Info';
|
||||||
import ListIcon from '@material-ui/icons/List';
|
import ListIcon from '@material-ui/icons/List';
|
||||||
import SlideshowIcon from '@material-ui/icons/Slideshow';
|
import SlideshowIcon from '@material-ui/icons/Slideshow';
|
||||||
import Home from '../pages/Home';
|
import Home from '../pages/Home';
|
||||||
import ViewMap from '../pages/ViewMap';
|
import ViewMap from '../pages/ViewMap';
|
||||||
|
import Info from '../pages/Info';
|
||||||
import Quiz from '../pages/QuizPage';
|
import Quiz from '../pages/QuizPage';
|
||||||
import SightingList from '../pages/SightingList';
|
import SightingList from '../pages/SightingList';
|
||||||
import Report from '../pages/Report';
|
import Report from '../pages/Report';
|
||||||
|
@ -110,6 +112,10 @@ class ResponsiveDrawer extends React.Component {
|
||||||
<ListItemIcon><ListIcon /></ListItemIcon>
|
<ListItemIcon><ListIcon /></ListItemIcon>
|
||||||
<ListItemText primary='List' />
|
<ListItemText primary='List' />
|
||||||
</ListItem>
|
</ListItem>
|
||||||
|
<ListItem button key='Info' onClick={() => this.nav('Info')}>
|
||||||
|
<ListItemIcon><InfoIcon /></ListItemIcon>
|
||||||
|
<ListItemText primary='Info' />
|
||||||
|
</ListItem>
|
||||||
<ListItem button onClick={this.handleClick}>
|
<ListItem button onClick={this.handleClick}>
|
||||||
<ListItemIcon>
|
<ListItemIcon>
|
||||||
<SlideshowIcon />
|
<SlideshowIcon />
|
||||||
|
@ -189,6 +195,7 @@ 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 === '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'/>}
|
||||||
|
|
Loading…
Reference in New Issue