Final

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: <Hello /> })
   }
-
-
-
 
   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: <Quiz quizNum={e.key} /> });
-
+    this.setState({ serve: <Quiz quizNum={e.key} /> });
     }
   };
 
@@ -59,43 +49,32 @@ class App extends Component {
     const { current } = this.state;
     return (
       <div>
-
-
-
         <Header logo={Logo} title={this.state.title} onSearchClick={this.onSearch} />
 
         <Menu className="menu" style={{ zIndex: '50' }} onClick={this.handleClick} selectedKeys={[current]} mode="horizontal">
-          <Menu.Item key="Signup" icon={<MailOutlined />}>
+          <Menu.Item key="Signup" icon={<UserAddOutlined />}>
             Signup
         </Menu.Item>
-          <Menu.Item key="app" disabled icon={<AppstoreOutlined />}>
+          <Menu.Item key="app" disabled icon={<EditOutlined />}>
             Make a quiz
         </Menu.Item>
-          <SubMenu icon={<SettingOutlined />} title="Choose a quiz">
+          <SubMenu icon={<DatabaseOutlined />} title="Choose a quiz">
             <Menu.ItemGroup title="Quizes">
               <Menu.Item key="1">Quiz 1</Menu.Item>
               <Menu.Item key="2">Quiz 2</Menu.Item>
               <Menu.Item key="3">Quiz 3</Menu.Item>
             </Menu.ItemGroup>
           </SubMenu>
-
         </Menu>
 
-
         <div>
           {this.state.serve}
         </div>
-
-
-
-
-
       </div>
     );
   }
 }
 
-
 export default App;
 
 

client/src/components/Hello.js

@@ -20,12 +20,15 @@ class Hello extends React.Component {
     }
     render() {
         return (
-
-        <h1 onMouseEnter={this.setColor}
-            onMouseLeave={this.revertColor}
-            style={{ color: this.state.color }}>Hello {this.props.name}</h1>
+            <div>
+                <h1 onMouseEnter={this.setColor}
+                    onMouseLeave={this.revertColor}
+                    style={{ paddingTop: 200, color: this.state.color }}>Hello and welcome to Quiz Maker{this.props.name}</h1>
+                    <h2>by Josh King</h2>
+                    <p>Select from the menu above to get started</p>
+            </div>
         )
-            
+
     }
 }
 

client/src/components/quiz/Quiz.js

@@ -94,9 +94,7 @@ updateQuiz(){
 
 }
 
-Question.defaultProps = {
-    quizNum: '1'
-}
+