juggy1233/COMP-2707-final-project
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects 2 Releases Wiki Activity

#21 Cleanup

Browse Source
This commit was merged in pull request #23.
This commit is contained in:
Jagraj Aulakh
2023-03-19 16:41:52 -04:00
parent f6e2b445d7
commit d05e0fb0e0
4 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
frontend/src/components/MyNavbar.jsx
View File

@@ -7,26 +7,28 @@ const MyNavbar = () => {
const { currentUser } = useContext(UserContext);
const MyLink = ({ children, ...rest }) => {
return <Nav.Link as={Link} {...rest}>{children}</Nav.Link>;
return (
<Nav.Link as={Link} {...rest}>
{children}
</Nav.Link>
);
};
return (
<React.Fragment>
<Navbar variant="dark" bg="dark" expand="lg">
<Container>
<Navbar.Brand href="/">LearningTree</Navbar.Brand>
<Navbar.Toggle aria-controls="navbar-nav" />
<Navbar.Collapse id="navbar-nav">
<Nav className="ms-auto">
<MyLink href="/">Home</MyLink>
{(currentUser?.id && (
<MyLink href="/logout">Logout</MyLink>
)) || <MyLink href="/login">Login</MyLink>}
</Nav>
</Navbar.Collapse>
</Container>
</Navbar>
</React.Fragment>
<Navbar variant="dark" bg="dark" expand="lg">
<Container>
<Navbar.Brand as={Link} href="/">LearningTree</Navbar.Brand>
<Navbar.Toggle aria-controls="navbar-nav" />
<Navbar.Collapse id="navbar-nav">
<Nav className="ms-auto">
<MyLink href="/">Home</MyLink>
{(currentUser?.id && <MyLink href="/logout">Logout</MyLink>) || (
<MyLink href="/login">Login</MyLink>
)}
</Nav>
</Navbar.Collapse>
</Container>
</Navbar>
);
};