diff --git a/frontend/src/app/components/icons/hamburger.jsx b/frontend/src/app/components/icons/hamburger.jsx new file mode 100644 index 0000000..8ff361a --- /dev/null +++ b/frontend/src/app/components/icons/hamburger.jsx @@ -0,0 +1,21 @@ +import React from "react"; + +const hamburger = () => { + return ( + + + + ); +}; + +export default hamburger; diff --git a/frontend/src/app/components/icons/verticalEllipsis.jsx b/frontend/src/app/components/icons/verticalEllipsis.jsx new file mode 100644 index 0000000..448a8ee --- /dev/null +++ b/frontend/src/app/components/icons/verticalEllipsis.jsx @@ -0,0 +1,21 @@ +import React from "react"; + +const verticalEllipsis = () => { + return ( + + + + ); +}; + +export default verticalEllipsis; diff --git a/frontend/src/app/components/navbar/Navbar.jsx b/frontend/src/app/components/navbar/Navbar.jsx index 571ed8a..822dfbb 100644 --- a/frontend/src/app/components/navbar/Navbar.jsx +++ b/frontend/src/app/components/navbar/Navbar.jsx @@ -4,12 +4,23 @@ import React from "react"; import styles from "./styles.module.css"; import NavLeft from "./navleft/Header"; import NavRight from "./navright/Profile"; +import HamburgerIcon from "../../components/icons/hamburger"; +import VerticalEllipsis from "../icons/verticalEllipsis"; +import useIsMobile from "@/app/hooks/useIsMobile"; const Navbar = () => { + const isMobile = useIsMobile(); return (
- - + {/* Mobile Hamburger Button */} +
+ {isMobile && } + +
+ {/* Mobile Menu Button */} +
+ {isMobile ? : } +
); }; diff --git a/frontend/src/app/components/navbar/navleft/Header.jsx b/frontend/src/app/components/navbar/navleft/Header.jsx index 14b6aec..0277f22 100644 --- a/frontend/src/app/components/navbar/navleft/Header.jsx +++ b/frontend/src/app/components/navbar/navleft/Header.jsx @@ -9,22 +9,6 @@ const Header = () => { {/* Organization Header */}
- {/* Burger Button */} - {/*
- - - -
*/} {/* Logo */}
diff --git a/frontend/src/app/components/navbar/navleft/styles.module.css b/frontend/src/app/components/navbar/navleft/styles.module.css index d00d53b..4d7cb87 100644 --- a/frontend/src/app/components/navbar/navleft/styles.module.css +++ b/frontend/src/app/components/navbar/navleft/styles.module.css @@ -10,9 +10,7 @@ gap: 16px; border-radius: 4px; } -.burgerBtn { - display: none; -} + .orgLogo { width: 38px; height: 38px; diff --git a/frontend/src/app/components/navbar/navright/Profile.jsx b/frontend/src/app/components/navbar/navright/Profile.jsx index 697ce25..1155ec4 100644 --- a/frontend/src/app/components/navbar/navright/Profile.jsx +++ b/frontend/src/app/components/navbar/navright/Profile.jsx @@ -22,22 +22,6 @@ const Profile = () => {
- {/* Burger Button */} - {/*
- - - -
*/}
{/* Dropdown */} diff --git a/frontend/src/app/components/navbar/navright/styles.module.css b/frontend/src/app/components/navbar/navright/styles.module.css index 37682a2..5d2f4d4 100644 --- a/frontend/src/app/components/navbar/navright/styles.module.css +++ b/frontend/src/app/components/navbar/navright/styles.module.css @@ -69,9 +69,6 @@ border-radius: 32px; background: url(/profile/PROFILE.svg) lightgray 50% / cover no-repeat; } -.ellipsisBtn { - display: none; -} .dropdownContainer { display: flex; @@ -142,4 +139,7 @@ } /* Mobile */ @media (max-width: 768px) { + .profileBadge { + display: none; + } } diff --git a/frontend/src/app/components/navbar/styles.module.css b/frontend/src/app/components/navbar/styles.module.css index 1ed90bf..3554845 100644 --- a/frontend/src/app/components/navbar/styles.module.css +++ b/frontend/src/app/components/navbar/styles.module.css @@ -6,9 +6,31 @@ align-items: center; align-self: stretch; border-bottom: 1px solid #2c2d3d; - border-bottom: 1px solid color(display-p3 0.1725 0.1765 0.2353); } /* Mobile */ @media (max-width: 768px) { + .mobileHamburger { + display: flex; + height: 61px; + padding-left: 16px; + align-items: center; + gap: 10px; + flex-shrink: 0; + } + + .mobileEllipsis { + display: flex; + height: 61px; + align-items: center; + gap: 10px; + flex-shrink: 0; + } + + .mainContainer { + display: flex; + padding: 12px 0px; + align-items: center; + border-bottom: none; + } }