diff options
Diffstat (limited to 'src/pages')
-rw-r--r-- | src/pages/Contribute/Contribute.js | 11 | ||||
-rw-r--r-- | src/pages/Profile/Profile.js | 11 | ||||
-rw-r--r-- | src/pages/Profile/Registration/Registration.js | 6 | ||||
-rw-r--r-- | src/pages/Scoreboard/Scoreboard.js | 6 | ||||
-rw-r--r-- | src/pages/Timer/Timer.js | 13 | ||||
-rw-r--r-- | src/pages/Timer/TimerButton/TimerButton.js | 4 |
6 files changed, 28 insertions, 23 deletions
diff --git a/src/pages/Contribute/Contribute.js b/src/pages/Contribute/Contribute.js index d94cc80..70003ba 100644 --- a/src/pages/Contribute/Contribute.js +++ b/src/pages/Contribute/Contribute.js @@ -15,8 +15,7 @@ import TrendingUpIcon from '@material-ui/icons/TrendingUp'; import BugReportIcon from '@material-ui/icons/BugReport'; import NewReleasesIcon from '@material-ui/icons/NewReleases'; -import Window from '../../components/Window/Window'; -import ContentSection from '../../components/ContentSection/ContentSection'; +import { Window, ContentSection } from 'react-benzin-test'; const useStyles = makeStyles(theme => ({ @@ -47,7 +46,7 @@ const Contribute = () => { </p> <Button variant="contained" - color="secondary" + color="primary" startIcon={<TrendingUpIcon />} href="https://github.com/users/Eug-VS/projects/3" > @@ -94,7 +93,7 @@ const Contribute = () => { </p> <Button variant="contained" - color="secondary" + color="primary" startIcon={<NewReleasesIcon />} href="https://github.com/Eug-VS/chrono-cube/issues/new" > @@ -102,7 +101,7 @@ const Contribute = () => { </Button> <Button variant="contained" - color="secondary" + color="primary" startIcon={<BugReportIcon />} href="https://github.com/Eug-VS/chrono-cube/issues/new" > @@ -142,7 +141,7 @@ const Contribute = () => { </List> <Button variant="contained" - color="secondary" + color="primary" size="large" href="https://github.com/users/Eug-VS/projects/3" > diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 783d497..6ea90c4 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -1,5 +1,4 @@ import React, { useState, useEffect } from 'react'; -import Window from '../../components/Window/Window'; import { Button, @@ -7,12 +6,16 @@ import { } from '@material-ui/core'; import Registration from './Registration/Registration'; -import ContentSection from '../../components/ContentSection/ContentSection'; -import SmartList from '../../components/SmartList/SmartList'; +import { + Window, + ContentSection, + SmartList, +} from 'react-benzin-test'; -import { get } from '../../requests'; import SolutionCard from '../../components/SolutionCard/SolutionCard'; +import { get } from '../../requests'; + const useStyles = makeStyles(theme => ({ primary: { diff --git a/src/pages/Profile/Registration/Registration.js b/src/pages/Profile/Registration/Registration.js index af4ec30..2aecc4a 100644 --- a/src/pages/Profile/Registration/Registration.js +++ b/src/pages/Profile/Registration/Registration.js @@ -8,8 +8,8 @@ import { Grid, } from '@material-ui/core'; -import ContentSection from '../../../components/ContentSection/ContentSection'; -import {get, post} from '../../../requests'; +import { ContentSection } from 'react-benzin-test'; +import { get, post } from '../../../requests'; const Registration = ({ setUser }) => { @@ -67,7 +67,7 @@ const Registration = ({ setUser }) => { /> </Grid> <Grid item> - <Button variant="contained" color="secondary" size="large" onClick={handleSubmit}> + <Button variant="contained" color="secondary" onClick={handleSubmit}> Submit! </Button> </Grid> diff --git a/src/pages/Scoreboard/Scoreboard.js b/src/pages/Scoreboard/Scoreboard.js index 335c06b..7385f3a 100644 --- a/src/pages/Scoreboard/Scoreboard.js +++ b/src/pages/Scoreboard/Scoreboard.js @@ -2,12 +2,12 @@ import React, { useEffect, useState } from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import { get } from '../../requests'; +import { Window, SmartList } from 'react-benzin-test'; -import SmartList from '../../components/SmartList/SmartList'; import SolutionCard from '../../components/SolutionCard/SolutionCard'; import Loading from '../../components/Loading/Loading'; -import Window from '../../components/Window/Window'; + +import { get } from '../../requests'; const useStyles = makeStyles(theme => ({ diff --git a/src/pages/Timer/Timer.js b/src/pages/Timer/Timer.js index 1323d97..e42e318 100644 --- a/src/pages/Timer/Timer.js +++ b/src/pages/Timer/Timer.js @@ -2,10 +2,13 @@ import React from 'react'; import { post } from '../../requests'; -import Window from '../../components/Window/Window'; -import ContentSection from '../../components/ContentSection/ContentSection'; +import { + Window, + ContentSection, + SmartList, +} from 'react-benzin-test'; + import TimerButton from './TimerButton/TimerButton'; -import SmartList from '../../components/SmartList/SmartList'; import SolutionCard from '../../components/SolutionCard/SolutionCard'; import { Button, makeStyles } from '@material-ui/core'; @@ -63,12 +66,12 @@ const Timer = ({ user, recentSolutions, setRecentSolutions, setPage }) => { Every speedcuber will benefit from using it - both amateur and professional! </p> - <Button variant="contained" color="secondary" onClick={handleLearnMore}> Learn more </Button> + <Button variant="contained" color="primary" onClick={handleLearnMore}> Learn more </Button> </ContentSection> {user.id === null && <ContentSection sectionName="Log into an account"> <p> Tell us your name so we can track your progress</p> - <Button variant="contained" color="secondary" onClick={handleLogin} size="large"> Login </Button> + <Button variant="contained" color="primary" onClick={handleLogin} size="large"> Login </Button> </ContentSection> } <TimerButton registerResult={registerResult} /> diff --git a/src/pages/Timer/TimerButton/TimerButton.js b/src/pages/Timer/TimerButton/TimerButton.js index 0f43c5a..254f73c 100644 --- a/src/pages/Timer/TimerButton/TimerButton.js +++ b/src/pages/Timer/TimerButton/TimerButton.js @@ -7,7 +7,7 @@ const useStyles = makeStyles(theme => ({ root: { textAlign: 'center', padding: theme.spacing(5), - background: theme.palette.primary.main, + background: theme.palette.background.elevation3, marginTop: theme.spacing(10), }, })); @@ -90,7 +90,7 @@ const TimerButton = ({ registerResult }) => { }; return ( - <Paper elevation={3} className={classes.root}> + <Paper className={classes.root}> <Typography variant="h1"> {time} </Typography> <Typography variant="h5" color={helperColor()}> {composeHelperText()} |