diff --git a/code/frontend/public/assets/icons/close_orange.svg b/code/frontend/public/assets/icons/close_orange.svg deleted file mode 100644 index d58416c..0000000 --- a/code/frontend/public/assets/icons/close_orange.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/code/frontend/public/assets/icons/three_menu_stripes_black.svg b/code/frontend/public/assets/icons/three_menu_stripes_black.svg deleted file mode 100644 index 082cc0d..0000000 --- a/code/frontend/public/assets/icons/three_menu_stripes_black.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/code/frontend/public/assets/icons/x.svg b/code/frontend/public/assets/icons/x.svg deleted file mode 100644 index 6918b9d..0000000 --- a/code/frontend/public/assets/icons/x.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/code/frontend/src/components/Header.tsx b/code/frontend/src/components/Header.tsx index 9271c67..6a1e9a0 100644 --- a/code/frontend/src/components/Header.tsx +++ b/code/frontend/src/components/Header.tsx @@ -1,6 +1,6 @@ import "./header.css"; import React, { useState, useRef } from "react"; -import { createTheme, List, ListItem, ListItemButton, ListItemIcon, ListItemText, StyledEngineProvider, SwipeableDrawer, ThemeProvider } from '@mui/material'; +import { List, ListItem, ListItemButton, ListItemIcon, ListItemText, StyledEngineProvider, SwipeableDrawer, ThemeProvider } from '@mui/material'; import Box from '@mui/material/Box'; import AddAPhotoIcon from '@mui/icons-material/AddAPhoto'; import DynamicFeedIcon from '@mui/icons-material/DynamicFeed'; @@ -8,7 +8,7 @@ import PersonIcon from '@mui/icons-material/Person'; import InfoIcon from '@mui/icons-material/Info'; import LogoutIcon from '@mui/icons-material/Logout'; import { Link } from "react-router-dom"; -import axios from "axios"; +import { useAuth } from "../api/Auth"; // TODO: Dinge so umstrukturieren, dass der State für das offene menü in Header ist und das Menü auch in Header, sodass es mit width 100% die volle breite einnehmen kann @@ -19,17 +19,12 @@ function Header() { const toggleMenu = () => { setIsOpen(!isOpen); }; - // TODO - const logOut = async () => { - try { - const response = await axios.delete("http://localhost:3001/api/user/logout"); - } catch (err: any) { - console.error("error: ", err.response.data); - } - }; + const { logout } = useAuth(); const iconList = [DynamicFeedIcon, AddAPhotoIcon, PersonIcon, InfoIcon, LogoutIcon]; const routerLinksList = ["/","/createpost","/profile","/about","/"] + // TODO: Logout nur anzeigen wenn user eingeloggt ist + const DrawerList = ( setIsOpen(false)}> @@ -44,7 +39,7 @@ function Header() { ))} - + {React.createElement(iconList[4])} @@ -62,7 +57,7 @@ function Header() {

Feather Feed

-
{isOpen? close menu : menu}
+
menu