Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Frontend #164

Merged
merged 1 commit into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -34,7 +36,7 @@ function App() {
</div>
);
}
return [<Navbar />, <Footer />];
return [<Navbar />, <LandingPage />,<Footer />];
}

export default App;
1 change: 0 additions & 1 deletion frontend/src/Components/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/Components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</>
) : (
Expand Down