From b124be4d5067570a8f5db4813d45e1bf49d95f56 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Fri, 7 Aug 2020 22:53:53 +0300
Subject: feat: support routing in Header

---
 src/components/Header/Header.tsx | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/components/Header/Header.tsx')

diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 41aeec7..ef5f9fb 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import {
   AppBar,
   Toolbar,
@@ -11,10 +12,11 @@ import { makeStyles, useTheme } from '@material-ui/core/styles';
 import AccountCircle from '@material-ui/icons/AccountCircle';
 import NotificationsIcon from '@material-ui/icons/Notifications';
 import HomeIcon from '@material-ui/icons/Home';
-import { useAuth } from '../../hooks/useAuth';
-import { useNavigate } from '../../hooks/useNavigate';
 
+import { useAuth } from '../../hooks/useAuth';
 import SearchBar from './SearchBar';
+import urls from '../../pages/urls';
+
 
 const useStyles = makeStyles(theme => ({
   mobile: {
@@ -40,28 +42,29 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
+
 const Header: React.FC = () => {
   const classes = useStyles();
   const { user } = useAuth();
-  const { navigate } = useNavigate();
   const theme = useTheme();
+  const history = useHistory();
   const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
 
   const handleHome = (): void => {
-    navigate('home');
+    history.push(urls.home);
   };
 
   const handleFeed = (): void => {
-    navigate('feed');
+    history.push(urls.feed)
   };
 
   const handleProfile = (): void => {
-    if (user) navigate('profile');
-    else navigate('auth');
+    if (user) history.push(urls.profile(user.username));
+    else history.push(urls.login);
   };
 
   const handleNotifications = (): void => {
-    navigate('notifications');
+    history.push(urls.notifications);
   };
 
   const FeedButton = (
-- 
cgit v1.2.3


From 10e146ef0215d41527f0466b0e139a6805b96540 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Sat, 8 Aug 2020 09:33:45 +0300
Subject: refactor: remove urls file

---
 src/components/Header/Header.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/components/Header/Header.tsx')

diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index ef5f9fb..9c42c31 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -15,7 +15,6 @@ import HomeIcon from '@material-ui/icons/Home';
 
 import { useAuth } from '../../hooks/useAuth';
 import SearchBar from './SearchBar';
-import urls from '../../pages/urls';
 
 
 const useStyles = makeStyles(theme => ({
@@ -51,20 +50,20 @@ const Header: React.FC = () => {
   const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
 
   const handleHome = (): void => {
-    history.push(urls.home);
+    history.push('/');
   };
 
   const handleFeed = (): void => {
-    history.push(urls.feed)
+    history.push('/feed')
   };
 
   const handleProfile = (): void => {
-    if (user) history.push(urls.profile(user.username));
-    else history.push(urls.login);
+    if (user) history.push(`/profile/${user.username}`);
+    else history.push('/login');
   };
 
   const handleNotifications = (): void => {
-    history.push(urls.notifications);
+    history.push('/notifications');
   };
 
   const FeedButton = (
-- 
cgit v1.2.3


From b446a83ff24ed5ea2233c544446557ee29f44364 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Sat, 8 Aug 2020 09:49:38 +0300
Subject: refactor: use native Route component

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

(limited to 'src/components/Header/Header.tsx')

diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 9c42c31..5aa66ba 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -54,7 +54,7 @@ const Header: React.FC = () => {
   };
 
   const handleFeed = (): void => {
-    history.push('/feed')
+    history.push('/feed');
   };
 
   const handleProfile = (): void => {
-- 
cgit v1.2.3

