From b2fe1b816044b8630f570c04c884c8ffcf3e3e61 Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Sat, 11 Jan 2020 17:56:38 +0300
Subject: Improve names, getPageComponent() -->  <Page />

Remove 'Page' word from page-components, since they are all
now located in the pages/ folder.
---
 src/pages/Timer/Timer.js | 76 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 src/pages/Timer/Timer.js

(limited to 'src/pages/Timer/Timer.js')

diff --git a/src/pages/Timer/Timer.js b/src/pages/Timer/Timer.js
new file mode 100644
index 0000000..4b5925f
--- /dev/null
+++ b/src/pages/Timer/Timer.js
@@ -0,0 +1,76 @@
+import React from 'react';
+
+import { post } from '../../requests';
+
+import Window from "../../components/Window/Window";
+import ContentSection from "../../components/ContentSection/ContentSection";
+import TimerButton from "./TimerButton/TimerButton";
+import SmartList from "../../components/SmartList/SmartList";
+import SolutionCard from "../../components/SolutionCard/SolutionCard";
+
+import { Typography, makeStyles } from "@material-ui/core";
+
+
+const useStyles = makeStyles(theme => ({
+  primary: {
+    padding: theme.spacing(4),
+  },
+  cell: {
+    padding: theme.spacing(5),
+  },
+}));
+
+const Timer = ({ recentSolutions, setRecentSolutions }) => {
+  const classes = useStyles();
+
+  const user = {
+    id: null,
+    username: 'anonymous',
+  };
+
+  const registerResult = result => {
+    const solution = { author_id: user.id, result };
+    post('solutions/', solution).then(response => {
+      setRecentSolutions([response.data].concat(recentSolutions));
+    });
+  };
+
+  const removeSolution = (id) => {
+    setRecentSolutions(recentSolutions.filter((solution => solution.id !== id)));
+  };
+
+  const renderItem = ({ index, style }) => {
+    const solution = recentSolutions[index];
+    return (
+      <div style={style} className={classes.cell}>
+        <SolutionCard data={solution} removeThisCard={removeSolution} />
+      </div>
+    );
+  };
+
+  return (
+    <>
+      <Window type="primary">
+        <div className={classes.primary}>
+          <ContentSection sectionName="Welcome to ChronoCube!">
+            <Typography>
+              Here is some text about how cool this application is, why you should use it
+              and how to make it better!
+            </Typography>
+          </ContentSection>
+          <TimerButton registerResult={registerResult} />
+        </div>
+      </Window>
+      <Window type="secondary" name="Recent solutions">
+        <SmartList
+          itemSize={270}
+          itemCount={recentSolutions.length}
+          renderItem={renderItem}
+        />
+      </Window>
+    </>
+  );
+};
+
+
+export default Timer;
-- 
cgit v1.2.3


From 02ddc8f3ed6858521480a3c3928f50ff40f34501 Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Sat, 11 Jan 2020 20:04:34 +0300
Subject: Edit description on Timer page, add 'Lean More'

---
 src/pages/Timer/Timer.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/pages/Timer/Timer.js')

diff --git a/src/pages/Timer/Timer.js b/src/pages/Timer/Timer.js
index 4b5925f..66e1b8f 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, makeStyles } from "@material-ui/core";
+import { Typography, Button, makeStyles } from "@material-ui/core";
 
 
 const useStyles = makeStyles(theme => ({
@@ -20,7 +20,7 @@ const useStyles = makeStyles(theme => ({
   },
 }));
 
-const Timer = ({ recentSolutions, setRecentSolutions }) => {
+const Timer = ({ recentSolutions, setRecentSolutions, setPage }) => {
   const classes = useStyles();
 
   const user = {
@@ -35,6 +35,10 @@ const Timer = ({ recentSolutions, setRecentSolutions }) => {
     });
   };
 
+  const handleLearnMore = () => {
+    setPage('contribute');
+  };
+
   const removeSolution = (id) => {
     setRecentSolutions(recentSolutions.filter((solution => solution.id !== id)));
   };
@@ -54,8 +58,14 @@ const Timer = ({ recentSolutions, setRecentSolutions }) => {
         <div className={classes.primary}>
           <ContentSection sectionName="Welcome to ChronoCube!">
             <Typography>
-              Here is some text about how cool this application is, why you should use it
-              and how to make it better!
+              <p>
+                ChronoCube is a professional speedcubing timer.
+                Share your results publicly - let everyone see your progress and
+                achievements!
+                Every speedcuber will benefit
+                from using it - both amateur and professional!
+              </p>
+              <Button variant="contained" color="secondary" onClick={handleLearnMore}> Learn more </Button>
             </Typography>
           </ContentSection>
           <TimerButton registerResult={registerResult} />
-- 
cgit v1.2.3


From 106d489a53e9069a74ed6b90984c15cc48a8823f Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Sun, 12 Jan 2020 03:47:59 +0300
Subject: Perform cleanup, resolve warnings

---
 src/pages/Timer/Timer.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/pages/Timer/Timer.js')

diff --git a/src/pages/Timer/Timer.js b/src/pages/Timer/Timer.js
index 66e1b8f..d63c661 100644
--- a/src/pages/Timer/Timer.js
+++ b/src/pages/Timer/Timer.js
@@ -57,16 +57,14 @@ const Timer = ({ recentSolutions, setRecentSolutions, setPage }) => {
       <Window type="primary">
         <div className={classes.primary}>
           <ContentSection sectionName="Welcome to ChronoCube!">
-            <Typography>
-              <p>
-                ChronoCube is a professional speedcubing timer.
-                Share your results publicly - let everyone see your progress and
-                achievements!
-                Every speedcuber will benefit
-                from using it - both amateur and professional!
-              </p>
-              <Button variant="contained" color="secondary" onClick={handleLearnMore}> Learn more </Button>
-            </Typography>
+            <p>
+              ChronoCube is a professional speedcubing timer.
+              Share your results publicly - let everyone see your progress and
+              achievements!
+              Every speedcuber will benefit
+              from using it - both amateur and professional!
+            </p>
+            <Button variant="contained" color="secondary" onClick={handleLearnMore}> Learn more </Button>
           </ContentSection>
           <TimerButton registerResult={registerResult} />
         </div>
-- 
cgit v1.2.3