1 files changed, 15 insertions, 18 deletions

diff --git a/src/index.js b/src/index.js
index 431e139..0c3d415 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,20 +1,15 @@
 import React, { useState } from 'react';
 import ReactDOM from 'react-dom';
 
-import { Box } from "@material-ui/core";
 import CssBaseline from '@material-ui/core/CssBaseline';
-import { ThemeProvider, makeStyles } from '@material-ui/core/styles';
+import { ThemeProvider } from '@material-ui/core/styles';
+import 'typeface-roboto';
 
 import theme from "./theme";
 import Header from './components/Header/Header';
-import TimerPage from "./components/TimerPage/TimerPage";
-import Scoreboard from "./components/Scoreboard/Scoreboard";
-
-
-const useStyles = makeStyles(theme => ({
-  root: {
-  },
-}));
+import Timer from "./pages/Timer/Timer";
+import Scoreboard from "./pages/Scoreboard/Scoreboard";
+import Contribute from "./pages/Contribute/Contribute";
 
 
 const App = () => {
@@ -22,19 +17,23 @@ const App = () => {
   const [page, setPage] = useState('app');
   const [recentSolutions, setRecentSolutions] = useState([]);
 
-  const classes = useStyles();
-
-  const getPageComponent = page => {
+  const Page = ({ page }) => {
     switch (page) {
       case 'app':
         return (
-          <TimerPage
+          <Timer
             recentSolutions={recentSolutions}
             setRecentSolutions={setRecentSolutions}
+            setPage={setPage}
           />
         );
+
       case 'scoreboard':
-        return (<Scoreboard/>);
+        return (<Scoreboard />);
+
+      case 'contribute':
+        return (<Contribute />);
+
       default:
         return (
           <p>
@@ -49,9 +48,7 @@ const App = () => {
     <ThemeProvider theme={theme}>
       <CssBaseline/>
       <Header page={page} setPage={setPage}/>
-      <Box className={classes.root}>
-        { getPageComponent(page) }
-      </Box>
+      <Page page={page} />
     </ThemeProvider>
   );
 };