Merge branch 'develop' into flamelink

This commit is contained in:
ajmaley
2018-10-27 13:06:05 -04:00
21 changed files with 1321 additions and 299 deletions

View File

@@ -1,14 +0,0 @@
import React, { Component } from 'react';
import Typography from '@material-ui/core/Typography';
class Quiz extends Component {
render() {
return (
<Typography variant='display1' align='center' gutterBottom>
Quiz
</Typography>
);
}
}
export default Quiz;

13
src/pages/QuizPage.js Normal file
View File

@@ -0,0 +1,13 @@
import React, { Component } from 'react';
import QuizGame from '../components/QuizGame';
class QuizPage extends Component {
render() {
return (
<QuizGame difficulty={this.props.difficulty}/>
);
}
}
export default QuizPage;

View File

@@ -1,11 +1,12 @@
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>
Sightings
<ViewSightings/>
</Typography>
);
}