From 6ffd9ba4fdb459eb2e425ba1bf873baf7576c3f9 Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Tue, 28 Jan 2020 12:41:35 +0300
Subject: feat!: migrate to BENZIN library

---
 src/pages/Timer/Timer.js                   | 13 ++++++++-----
 src/pages/Timer/TimerButton/TimerButton.js |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/pages/Timer')

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()}
-- 
cgit v1.2.3


From ac791ff6d0c80f90b51866caa3b5195e5f47a045 Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Tue, 28 Jan 2020 22:13:00 +0300
Subject: feat: use react-benzin v1.0.1

---
 src/pages/Timer/Timer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pages/Timer')

diff --git a/src/pages/Timer/Timer.js b/src/pages/Timer/Timer.js
index e42e318..6020c1b 100644
--- a/src/pages/Timer/Timer.js
+++ b/src/pages/Timer/Timer.js
@@ -6,7 +6,7 @@ import {
   Window,
   ContentSection,
   SmartList,
-} from 'react-benzin-test';
+} from 'react-benzin';
 
 import TimerButton from './TimerButton/TimerButton';
 import SolutionCard from '../../components/SolutionCard/SolutionCard';
-- 
cgit v1.2.3


From 1ea6ae2f80e5e3f60ad89b4d6d02281c817cee43 Mon Sep 17 00:00:00 2001
From: asketonim <anton.dubik33@gmail.com>
Date: Tue, 28 Jan 2020 22:42:47 +0300
Subject: fix: change message on 'running' mode

---
 src/pages/Timer/TimerButton/TimerButton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pages/Timer')

diff --git a/src/pages/Timer/TimerButton/TimerButton.js b/src/pages/Timer/TimerButton/TimerButton.js
index 254f73c..fdb6b7c 100644
--- a/src/pages/Timer/TimerButton/TimerButton.js
+++ b/src/pages/Timer/TimerButton/TimerButton.js
@@ -74,7 +74,7 @@ const TimerButton = ({ registerResult }) => {
 
   const composeHelperText = () => {
     switch (mode) {
-      case 'running': return '_';
+      case 'running': return 'Go fast!';
       case 'countdown': return 'Release SPACE to begin';
       case 'over': return 'You are too late!';
       default: return 'Hold SPACE to start countdown';
-- 
cgit v1.2.3