diff --git a/code/frontend/src/components/Footer.tsx b/code/frontend/src/components/Footer.tsx
index 072bb4c..3e00420 100644
--- a/code/frontend/src/components/Footer.tsx
+++ b/code/frontend/src/components/Footer.tsx
@@ -41,7 +41,7 @@ function Footer() {
>
)}
-
+
Create Post
diff --git a/code/frontend/src/components/Header.tsx b/code/frontend/src/components/Header.tsx
index c2ab78d..194498a 100644
--- a/code/frontend/src/components/Header.tsx
+++ b/code/frontend/src/components/Header.tsx
@@ -1,12 +1,12 @@
import "./header.css";
import React, { useState } from "react";
import {
- List,
- ListItem,
- ListItemButton,
- ListItemIcon,
- ListItemText,
- SwipeableDrawer,
+ List,
+ ListItem,
+ ListItemButton,
+ ListItemIcon,
+ ListItemText,
+ SwipeableDrawer,
} from "@mui/material";
import Box from "@mui/material/Box";
import AddAPhotoIcon from "@mui/icons-material/AddAPhoto";
@@ -20,120 +20,123 @@ import { useNavigate } from "react-router-dom";
import { useAuth } from "../api/Auth";
function Header() {
- interface ListItemAttributes {
- text: string;
- icon: React.ElementType;
- onClick: () => void;
- onlyShowWhen: "loggedIn" | "loggedOut" | "always";
- }
- const navigate = useNavigate();
- const [isOpen, setIsOpen] = useState(false);
- const toggleMenu = () => {
- setIsOpen(!isOpen);
- };
- const { logout, user } = useAuth();
- const ListItems: ListItemAttributes[] = [
- {
- text: "Feed",
- icon: DynamicFeedIcon,
- onClick: () => navigate("/feed", { replace: true }),
- onlyShowWhen: "always",
- },
- {
- text: "Create Post",
- icon: AddAPhotoIcon,
- onClick: () => navigate("/createpost", { replace: true }),
- onlyShowWhen: "loggedIn",
- },
- {
- text: "Profile",
- icon: PersonIcon,
- onClick: () => navigate("/profile", { replace: true }),
- onlyShowWhen: "loggedIn",
- },
- {
- text: "About",
- icon: InfoIcon,
- onClick: () => navigate("/about", { replace: true }),
- onlyShowWhen: "always",
- },
- {
- text: "Log Out",
- icon: LogoutIcon,
- onClick: logout,
- onlyShowWhen: "loggedIn",
- },
- {
- text: "Log In",
- icon: ExitToAppIcon,
- onClick: () => navigate("/login", { replace: true }),
- onlyShowWhen: "loggedOut",
- },
- {
- text: "Sign Up",
- icon: FollowTheSignsIcon,
- onClick: () => navigate("/register", { replace: true }),
- onlyShowWhen: "loggedOut",
- },
- ];
+ interface ListItemAttributes {
+ text: string;
+ icon: React.ElementType;
+ onClick: () => void;
+ onlyShowWhen: "loggedIn" | "loggedOut" | "always";
+ }
+ const navigate = useNavigate();
+ const [isOpen, setIsOpen] = useState(false);
+ const toggleMenu = () => {
+ setIsOpen(!isOpen);
+ };
+ const { logout, user } = useAuth();
+ const ListItems: ListItemAttributes[] = [
+ {
+ text: "Feed",
+ icon: DynamicFeedIcon,
+ onClick: () => navigate("/"),
+ onlyShowWhen: "always",
+ },
+ {
+ text: "Create Post",
+ icon: AddAPhotoIcon,
+ onClick: () => navigate("/createpost"),
+ onlyShowWhen: "loggedIn",
+ },
+ {
+ text: "Profile",
+ icon: PersonIcon,
+ onClick: () => navigate(`/profile/${user?.username}`),
+ onlyShowWhen: "loggedIn",
+ },
+ {
+ text: "About",
+ icon: InfoIcon,
+ onClick: () => navigate("/about"),
+ onlyShowWhen: "always",
+ },
+ {
+ text: "Log Out",
+ icon: LogoutIcon,
+ onClick: logout,
+ onlyShowWhen: "loggedIn",
+ },
+ {
+ text: "Log In",
+ icon: ExitToAppIcon,
+ onClick: () => navigate("/login"),
+ onlyShowWhen: "loggedOut",
+ },
+ {
+ text: "Sign Up",
+ icon: FollowTheSignsIcon,
+ onClick: () => navigate("/register"),
+ onlyShowWhen: "loggedOut",
+ },
+ ];
- const DrawerList = (
- Feather Feed navigate("/")}>
+ Feather Feed
+
- {ListItems.map((ListItemObject, index) =>
- ListItemObject.onlyShowWhen == "always" ||
- (ListItemObject.onlyShowWhen == "loggedIn" && user) ||
- (ListItemObject.onlyShowWhen == "loggedOut" && !user) ? (
-
-
+ {ListItems.map((ListItemObject, index) =>
+ ListItemObject.onlyShowWhen == "always" ||
+ (ListItemObject.onlyShowWhen == "loggedIn" && user) ||
+ (ListItemObject.onlyShowWhen == "loggedOut" && !user) ? (
+
+
-
-
navigate("/")}
+ />
+
+