Frontend (#164)

smartuni · Jul 1, 2024 · 98dda0e · 98dda0e
2 parents 6717878 + 9ebd88b
commit 98dda0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -2,6 +2,8 @@ import { useAuth } from "react-oidc-context";
 import "./App.css";
 import Footer from "./Components/Footer";
 import Navbar from "./Components/Navbar/Navbar";
+import LandingPage from "./Components/LandingPage";
+
 
 function App() {
   const auth = useAuth();
@@ -34,7 +36,7 @@ function App() {
       </div>
     );
   }
-  return [<Navbar />, <Footer />];
+  return [<Navbar />, <LandingPage />,<Footer />];
 }
 
 export default App;
diff --git a/frontend/src/Components/LandingPage.tsx b/frontend/src/Components/LandingPage.tsx
@@ -13,7 +13,6 @@ const LandingPage = () => {
 
     return (
         <div>
-            <Navbar />
             <div className="vh-100 vw-100 d-flex justify-content-center align-items-center" style={{ backgroundImage: `url(${backgroundImage})`, backgroundSize: 'cover', backgroundPosition: 'center', backgroundRepeat: 'no-repeat' }}>
                 <div className="text-white p-4 rounded text-center">
                     <main role="main">

diff --git a/frontend/src/Components/Navbar/Navbar.tsx b/frontend/src/Components/Navbar/Navbar.tsx
@@ -114,13 +114,14 @@ const Navbar = () => {
                     </Link>
                   </li>
                   <li className="navbar-item">
-                    <button
+                    <Link
                       className="nav-link"
                       onClick={() => auth.removeUser()}
+                      to="/LandingPage"
                       style={loginButtonStyles}
                     >
                       Log out
-                    </button>
+                    </Link>
                   </li>
                 </>
               ) : (