From 9e9c18cd1d02a0185d0387770a7bafc18020d6c0 Mon Sep 17 00:00:00 2001
From: ilyayudovin <ilyayudovin123@gmail.com>
Date: Fri, 26 Jun 2020 03:03:33 +0300
Subject: display user avatar instead avatarIcon in header

---
 src/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/index.tsx')

diff --git a/src/index.tsx b/src/index.tsx
index 50b19f7..d50700b 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -90,7 +90,7 @@ const App: React.FC = () => {
   return (
     <ThemeProvider theme={theme}>
       <CssBaseline />
-      <Header navigate={navigate} />
+      <Header navigate={navigate} userImage={user?.avatarUrl}/>
       <div className={classes.root}>
         { page.prefix === 'profile' && <ProfilePage logOut={logOut} id={page.id} navigate={navigate} /> }
         { page.prefix === 'feed' && <FeedPage navigate={navigate} /> }
-- 
cgit v1.2.3


From e199f28a384dfd6fdf71e6ddaa21799096099cf9 Mon Sep 17 00:00:00 2001
From: ilyayudovin <ilyayudovin123@gmail.com>
Date: Sat, 27 Jun 2020 16:49:58 +0300
Subject: add dialog window for uploading avatar

---
 src/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/index.tsx')

diff --git a/src/index.tsx b/src/index.tsx
index d50700b..0e6f761 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -92,7 +92,7 @@ const App: React.FC = () => {
       <CssBaseline />
       <Header navigate={navigate} userImage={user?.avatarUrl}/>
       <div className={classes.root}>
-        { page.prefix === 'profile' && <ProfilePage logOut={logOut} id={page.id} navigate={navigate} /> }
+        { page.prefix === 'profile' && <ProfilePage logOut={logOut} id={page.id} navigate={navigate} setUser={setUser}/> }
         { page.prefix === 'feed' && <FeedPage navigate={navigate} /> }
         { page.prefix === 'auth' && <AuthPage logIn={logIn} /> }
       </div>
-- 
cgit v1.2.3


From 5b08023e0aa0e626264673ebb86dc82299a3b54b Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Sat, 27 Jun 2020 19:15:41 +0300
Subject: style: fix ALL linting errors

---
 src/index.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/index.tsx')

diff --git a/src/index.tsx b/src/index.tsx
index 0e6f761..9139e4b 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -90,9 +90,16 @@ const App: React.FC = () => {
   return (
     <ThemeProvider theme={theme}>
       <CssBaseline />
-      <Header navigate={navigate} userImage={user?.avatarUrl}/>
+      <Header navigate={navigate} userImage={user?.avatarUrl} />
       <div className={classes.root}>
-        { page.prefix === 'profile' && <ProfilePage logOut={logOut} id={page.id} navigate={navigate} setUser={setUser}/> }
+        { page.prefix === 'profile' && (
+          <ProfilePage
+            logOut={logOut}
+            id={page.id}
+            navigate={navigate}
+            setUser={setUser}
+          />
+        ) }
         { page.prefix === 'feed' && <FeedPage navigate={navigate} /> }
         { page.prefix === 'auth' && <AuthPage logIn={logIn} /> }
       </div>
-- 
cgit v1.2.3