From 48e8c85e742c476205f55e44a5f4111bcde44770 Mon Sep 17 00:00:00 2001
From: asketonim <anton.dubik33@gmail.com>
Date: Thu, 2 Jan 2020 14:53:52 +0300
Subject: Implement core timer functionality

---
 src/index.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/index.js')

diff --git a/src/index.js b/src/index.js
index 5c657f9..f062952 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,6 +5,7 @@ import styled from 'styled-components';
 import CssBaseline from '@material-ui/core/CssBaseline'
 
 import Header from './components/Header/Header';
+import Timer from './components/Timer/Timer';
 
 
 const App = () => {
@@ -20,6 +21,7 @@ const App = () => {
         This text is rendered outside of <code>Header</code> component, but
         interacting with <code>Header</code> can influence content of this page!
       </p>
+      <Timer />
     </Root>
   );
 };
-- 
cgit v1.2.3


From 2b917f53e806191340a7a26bef3468320dd29917 Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Thu, 2 Jan 2020 23:42:37 +0300
Subject: Fix invalid merge commit

---
 src/index.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/index.js')

diff --git a/src/index.js b/src/index.js
index de4cb2a..725d270 100644
--- a/src/index.js
+++ b/src/index.js
@@ -35,17 +35,18 @@ const App = () => {
     }
   };
 
-  const classes = useStyles();
   return (
-    <ThemeProvider theme={theme}>
+    <Root>
       <CssBaseline/>
-      <Header setPage={setPage}/>
-      <Box className={classes.root}>
-        <Typography variant="h4"> This is the {page} page! </Typography>
-        { getPageComponent(page)}
-      </Box>
-    </ThemeProvider>
-  );
+      <Header setPage={setPage} />
+      <Container maxWidth="xl">
+        <Paper elevation={4} style={{backgroundColor: "bisque"}}>
+          <Typography variant="h4"> This is the {page} page! </Typography>
+          { getPageComponent(page) }
+        </Paper>
+      </Container>
+    </Root>
+);
 };
 const Root = styled.div`
   background: cornsilk;
-- 
cgit v1.2.3