From 31da3a746ce7d86ade32b60acb68365670d97726 Mon Sep 17 00:00:00 2001 From: Eug-VS Date: Sat, 11 Jan 2020 17:44:46 +0300 Subject: Move all pages to separate folder --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/index.js') diff --git a/src/index.js b/src/index.js index 431e139..ed053a6 100644 --- a/src/index.js +++ b/src/index.js @@ -7,8 +7,8 @@ import { ThemeProvider, makeStyles } from '@material-ui/core/styles'; import theme from "./theme"; import Header from './components/Header/Header'; -import TimerPage from "./components/TimerPage/TimerPage"; -import Scoreboard from "./components/Scoreboard/Scoreboard"; +import TimerPage from "./pages/TimerPage/TimerPage"; +import Scoreboard from "./pages/Scoreboard/Scoreboard"; const useStyles = makeStyles(theme => ({ -- cgit v1.2.3 From d517398707f74c670d47ed0a277ba328e531579e Mon Sep 17 00:00:00 2001 From: Eug-VS Date: Sat, 11 Jan 2020 17:47:22 +0300 Subject: Cleanup index.js --- src/index.js | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/index.js') diff --git a/src/index.js b/src/index.js index ed053a6..3ec39c3 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,8 @@ 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 theme from "./theme"; import Header from './components/Header/Header'; @@ -11,19 +10,11 @@ import TimerPage from "./pages/TimerPage/TimerPage"; import Scoreboard from "./pages/Scoreboard/Scoreboard"; -const useStyles = makeStyles(theme => ({ - root: { - }, -})); - - const App = () => { const [page, setPage] = useState('app'); const [recentSolutions, setRecentSolutions] = useState([]); - const classes = useStyles(); - const getPageComponent = page => { switch (page) { case 'app': @@ -49,9 +40,7 @@ const App = () => {
- - { getPageComponent(page) } - + { getPageComponent(page) } ); }; -- cgit v1.2.3 From b2fe1b816044b8630f570c04c884c8ffcf3e3e61 Mon Sep 17 00:00:00 2001 From: Eug-VS Date: Sat, 11 Jan 2020 17:56:38 +0300 Subject: Improve names, getPageComponent() --> Remove 'Page' word from page-components, since they are all now located in the pages/ folder. --- src/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/index.js') diff --git a/src/index.js b/src/index.js index 3ec39c3..b14708e 100644 --- a/src/index.js +++ b/src/index.js @@ -6,7 +6,7 @@ import { ThemeProvider } from '@material-ui/core/styles'; import theme from "./theme"; import Header from './components/Header/Header'; -import TimerPage from "./pages/TimerPage/TimerPage"; +import Timer from "./pages/Timer/Timer"; import Scoreboard from "./pages/Scoreboard/Scoreboard"; @@ -15,11 +15,11 @@ const App = () => { const [page, setPage] = useState('app'); const [recentSolutions, setRecentSolutions] = useState([]); - const getPageComponent = page => { + const Page = ({ page }) => { switch (page) { case 'app': return ( - @@ -40,7 +40,7 @@ const App = () => {
- { getPageComponent(page) } + ); }; -- cgit v1.2.3 From 31a205016f9e811ece59f3f1101a06ebcd846cd2 Mon Sep 17 00:00:00 2001 From: Eug-VS Date: Sat, 11 Jan 2020 19:42:47 +0300 Subject: Markup initial Contribute page --- src/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/index.js') diff --git a/src/index.js b/src/index.js index b14708e..f9d7e32 100644 --- a/src/index.js +++ b/src/index.js @@ -8,6 +8,7 @@ import theme from "./theme"; import Header from './components/Header/Header'; import Timer from "./pages/Timer/Timer"; import Scoreboard from "./pages/Scoreboard/Scoreboard"; +import Contribute from "./pages/Contribute/Contribute"; const App = () => { @@ -24,8 +25,13 @@ const App = () => { setRecentSolutions={setRecentSolutions} /> ); + case 'scoreboard': - return (); + return (); + + case 'contribute': + return (); + default: return (

-- cgit v1.2.3 From 7211ac852ea3620755d37b2e3a8345540069ee0c Mon Sep 17 00:00:00 2001 From: Eug-VS Date: Sat, 11 Jan 2020 19:44:36 +0300 Subject: Install Roboto font --- src/index.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/index.js') diff --git a/src/index.js b/src/index.js index f9d7e32..48d7eb8 100644 --- a/src/index.js +++ b/src/index.js @@ -3,6 +3,7 @@ import ReactDOM from 'react-dom'; import CssBaseline from '@material-ui/core/CssBaseline'; import { ThemeProvider } from '@material-ui/core/styles'; +import 'typeface-roboto'; import theme from "./theme"; import Header from './components/Header/Header'; -- cgit v1.2.3 From 02ddc8f3ed6858521480a3c3928f50ff40f34501 Mon Sep 17 00:00:00 2001 From: Eug-VS Date: Sat, 11 Jan 2020 20:04:34 +0300 Subject: Edit description on Timer page, add 'Lean More' --- src/index.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/index.js') diff --git a/src/index.js b/src/index.js index 48d7eb8..0c3d415 100644 --- a/src/index.js +++ b/src/index.js @@ -24,6 +24,7 @@ const App = () => { ); -- cgit v1.2.3