From f7488e93bc5a250ff8ebc2035d653d6cf3ed8c21 Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Tue, 28 Jan 2020 12:01:48 +0300
Subject: feat: upgrade dependencies, install benzin

---
 src/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/index.js')

diff --git a/src/index.js b/src/index.js
index 869ec3d..2da3b2e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom';
 
 import CssBaseline from '@material-ui/core/CssBaseline';
-import { ThemeProvider } from '@material-ui/core/styles';
+import { BenzinThemeProvider } from 'react-benzin-test';
 import 'typeface-roboto';
 
 import theme from './theme';
@@ -57,11 +57,11 @@ const App = () => {
   };
 
   return (
-    <ThemeProvider theme={theme}>
+    <BenzinThemeProvider>
       <CssBaseline/>
       <Header page={page} setPage={setPage}/>
       <Page page={page} />
-    </ThemeProvider>
+    </BenzinThemeProvider>
   );
 };
 
-- 
cgit v1.2.3


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/index.js | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'src/index.js')

diff --git a/src/index.js b/src/index.js
index 2da3b2e..399a6bb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,16 +2,22 @@ import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom';
 
 import CssBaseline from '@material-ui/core/CssBaseline';
-import { BenzinThemeProvider } from 'react-benzin-test';
+import {
+  BenzinThemeProvider,
+  Header,
+} from 'react-benzin-test';
 import 'typeface-roboto';
 
-import theme from './theme';
-import Header from './components/Header/Header';
 import Timer from './pages/Timer/Timer';
 import Scoreboard from './pages/Scoreboard/Scoreboard';
 import Contribute from './pages/Contribute/Contribute';
 import Profile from './pages/Profile/Profile';
 
+import TimerIcon from '@material-ui/icons/Timer';
+import AccountCircleIcon from '@material-ui/icons/AccountCircle';
+import AssignmentIcon from '@material-ui/icons/Assignment';
+import GitHubIcon from '@material-ui/icons/GitHub';
+
 import { get } from './requests';
 
 
@@ -21,6 +27,13 @@ const App = () => {
   const [user, setUser] = useState({ username: 'anonymous', id: null });
   const [recentSolutions, setRecentSolutions] = useState([]);
 
+  const headerContents = {
+    app: (<TimerIcon />),
+    profile: (<AccountCircleIcon />),
+    scoreboard: (<AssignmentIcon />),
+    contribute: (<GitHubIcon />),
+  };
+
   useEffect(() => {
     const userId = +localStorage.getItem('userId');
     if (userId) {
@@ -59,7 +72,13 @@ const App = () => {
   return (
     <BenzinThemeProvider>
       <CssBaseline/>
-      <Header page={page} setPage={setPage}/>
+      <Header
+        logo={{
+          title: 'ChronoCube'
+        }}
+        contents={headerContents}
+        page={page}
+        setPage={setPage}/>
       <Page page={page} />
     </BenzinThemeProvider>
   );
-- 
cgit v1.2.3


From cde5160d1d9b2528de7894ce9d8b73c5ef8fb0e7 Mon Sep 17 00:00:00 2001
From: Eug-VS <eug-vs@keemail.me>
Date: Tue, 28 Jan 2020 12:48:51 +0300
Subject: fix: remove unnecessary CssBaseline

---
 src/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/index.js')

diff --git a/src/index.js b/src/index.js
index 399a6bb..dd5ea8c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom';
 
-import CssBaseline from '@material-ui/core/CssBaseline';
 import {
   BenzinThemeProvider,
   Header,
 } from 'react-benzin-test';
+
 import 'typeface-roboto';
 
 import Timer from './pages/Timer/Timer';
@@ -71,7 +71,6 @@ const App = () => {
 
   return (
     <BenzinThemeProvider>
-      <CssBaseline/>
       <Header
         logo={{
           title: 'ChronoCube'
-- 
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/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/index.js')

diff --git a/src/index.js b/src/index.js
index dd5ea8c..49c66e7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
 import {
   BenzinThemeProvider,
   Header,
-} from 'react-benzin-test';
+} from 'react-benzin';
 
 import 'typeface-roboto';
 
-- 
cgit v1.2.3