Merge pull request #72 from which-ecosystem/feat/routing

Add basic routing

1 files changed, 10 insertions, 8 deletions

diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 41aeec7..5aa66ba 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,11 +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';
 
+
 const useStyles = makeStyles(theme => ({
   mobile: {
     top: 'auto',
@@ -40,28 +41,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('/');
   };
 
   const handleFeed = (): void => {
-    navigate('feed');
+    history.push('/feed');
   };
 
   const handleProfile = (): void => {
-    if (user) navigate('profile');
-    else navigate('auth');
+    if (user) history.push(`/profile/${user.username}`);
+    else history.push('/login');
   };
 
   const handleNotifications = (): void => {
-    navigate('notifications');
+    history.push('/notifications');
   };
 
   const FeedButton = (