diff --git a/client/src/App.js b/client/src/App.js index ed657c4..1edb7f1 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -7,15 +7,12 @@ import Signup from './components/Signup'; import Logo from './quizLogo.svg'; import Hello from './components/Hello'; import { Menu } from 'antd'; -import { MailOutlined, AppstoreOutlined, SettingOutlined } from '@ant-design/icons'; - - +import { UserAddOutlined, DatabaseOutlined, EditOutlined } from '@ant-design/icons'; const { SubMenu } = Menu; class App extends Component { - constructor(props) { super(props); this.handleClick = this.handleClick.bind(this); @@ -25,16 +22,11 @@ class App extends Component { title: "Quiz Master", serve: "" }; - - } componentDidMount() { this.setState({ serve: }) } - - - handleClick = e => { if (e.key === "Signup"){ @@ -44,9 +36,7 @@ class App extends Component { console.log('click ', e.key); this.setState({ current: e.key }); - this.setState({ quiz: e.key, - serve: }); - + this.setState({ serve: }); } }; @@ -59,43 +49,32 @@ class App extends Component { const { current } = this.state; return (
- - -
- }> + }> Signup - }> + }> Make a quiz - } title="Choose a quiz"> + } title="Choose a quiz"> Quiz 1 Quiz 2 Quiz 3 - -
{this.state.serve}
- - - - -
); } } - export default App; diff --git a/client/src/components/Hello.js b/client/src/components/Hello.js index c017000..3d8b197 100644 --- a/client/src/components/Hello.js +++ b/client/src/components/Hello.js @@ -20,12 +20,15 @@ class Hello extends React.Component { } render() { return ( - -

Hello {this.props.name}

+
+

Hello and welcome to Quiz Maker{this.props.name}

+

by Josh King

+

Select from the menu above to get started

+
) - + } } diff --git a/client/src/components/quiz/Quiz.js b/client/src/components/quiz/Quiz.js index 40215fd..fdad4d4 100644 --- a/client/src/components/quiz/Quiz.js +++ b/client/src/components/quiz/Quiz.js @@ -94,9 +94,7 @@ updateQuiz(){ } -Question.defaultProps = { - quizNum: '1' -} +