[FAIR-85] refactoring authentication feature

fairDataSociety · Dec 17, 2021 · a57a1d7 · a57a1d7
1 parent 0fee086
commit a57a1d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/components/Topbar/index.tsx b/components/Topbar/index.tsx
@@ -8,7 +8,7 @@ import DappIcon from 'assets/icons/dapp.svg';
 import useUser from 'hooks/useUser';
 
 const Topbar = () => {
-  const { user, logout } = useUser();
+  const { user, isAuthenticated } = useUser();
 
   return (
     <header
@@ -25,18 +25,19 @@ const Topbar = () => {
 
       <div className="flex-grow flex items-center justify-between">
         <div className="pl-2">
-          <Dropdown>FairOS (Server)</Dropdown>
+          {isAuthenticated && <Dropdown>FairOS (Server)</Dropdown>}
         </div>
 
         <div className="flex items-center mr-8">
-          <SearchBar />
+          {isAuthenticated && <SearchBar />}
 
           <Link href="/">
             <a>
               <DappIcon className="mx-3" />
             </a>
           </Link>
-          {!!user && (
+
+          {isAuthenticated && (
             <>
               <Link href="/">
                 <a className="mx-3 text-purple">Activity</a>

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -5,19 +5,20 @@ import Router from 'next/router';
 import { useEffect } from 'react';
 
 const Home: NextPage = () => {
-  const { user } = useUser();
+  const { isAuthenticated } = useUser();
 
   useEffect(() => {
-    if (!user) {
+    if (!isAuthenticated) {
       Router.push('/login');
     }
-  }, [user]);
+  }, [isAuthenticated]);
 
   return (
-    <Layout>
-      <h1 className="text-center">Fairdrive</h1>
-      {!user && <h3 className="text-center">user loggeout</h3>}
-    </Layout>
+    isAuthenticated && (
+      <Layout>
+        <h1 className="text-center">Fairdrive</h1>
+      </Layout>
+    )
   );
 };