aboutsummaryrefslogtreecommitdiff
path: root/src/pages/Timer
diff options
context:
space:
mode:
Diffstat (limited to 'src/pages/Timer')
-rw-r--r--src/pages/Timer/Timer.js19
-rw-r--r--src/pages/Timer/TimerButton/TimerButton.js2
2 files changed, 13 insertions, 8 deletions
diff --git a/src/pages/Timer/Timer.js b/src/pages/Timer/Timer.js
index d63c661..a41c47b 100644
--- a/src/pages/Timer/Timer.js
+++ b/src/pages/Timer/Timer.js
@@ -8,7 +8,7 @@ import TimerButton from "./TimerButton/TimerButton";
import SmartList from "../../components/SmartList/SmartList";
import SolutionCard from "../../components/SolutionCard/SolutionCard";
-import { Typography, Button, makeStyles } from "@material-ui/core";
+import { Button, makeStyles } from "@material-ui/core";
const useStyles = makeStyles(theme => ({
@@ -20,14 +20,9 @@ const useStyles = makeStyles(theme => ({
},
}));
-const Timer = ({ recentSolutions, setRecentSolutions, setPage }) => {
+const Timer = ({ user, recentSolutions, setRecentSolutions, setPage }) => {
const classes = useStyles();
- const user = {
- id: null,
- username: 'anonymous',
- };
-
const registerResult = result => {
const solution = { author_id: user.id, result };
post('solutions/', solution).then(response => {
@@ -39,6 +34,10 @@ const Timer = ({ recentSolutions, setRecentSolutions, setPage }) => {
setPage('contribute');
};
+ const handleLogin = () => {
+ setPage('profile');
+ };
+
const removeSolution = (id) => {
setRecentSolutions(recentSolutions.filter((solution => solution.id !== id)));
};
@@ -66,6 +65,12 @@ const Timer = ({ recentSolutions, setRecentSolutions, setPage }) => {
</p>
<Button variant="contained" color="secondary" 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>
+ </ContentSection>
+ }
<TimerButton registerResult={registerResult} />
</div>
</Window>
diff --git a/src/pages/Timer/TimerButton/TimerButton.js b/src/pages/Timer/TimerButton/TimerButton.js
index 56d3084..82af6ec 100644
--- a/src/pages/Timer/TimerButton/TimerButton.js
+++ b/src/pages/Timer/TimerButton/TimerButton.js
@@ -8,7 +8,7 @@ const useStyles = makeStyles(theme => ({
textAlign: 'center',
padding: theme.spacing(5),
background: theme.palette.primary.main,
- marginTop: theme.spacing(20),
+ marginTop: theme.spacing(10),
},
}));