Compare commits

..

1 Commits

Author SHA1 Message Date
Jianqi Jin
d719a45b92 feat: change menu style 2023-09-16 21:30:38 -05:00
5 changed files with 16 additions and 16 deletions

View File

@ -7,7 +7,7 @@ import Hamburger from "hamburger-react";
const NavBar = () => { const NavBar = () => {
const [navBackground, setNavBackground] = useState({ backgroundColor: "transparent" }); const [navBackground, setNavBackground] = useState({ backgroundColor: "transparent" });
const { toggleMenu, isHamburger } = useContainer(GlobalStore); const { toggleMenu, isMenu } = useContainer(GlobalStore);
useEffect(() => { useEffect(() => {
document.addEventListener("scroll", (event) => { document.addEventListener("scroll", (event) => {
if (window.scrollY < 10) { if (window.scrollY < 10) {
@ -42,7 +42,7 @@ const NavBar = () => {
Login Login
</NavLink> */} </NavLink> */}
<div className="nav__placeholder"></div> <div className="nav__placeholder"></div>
<Hamburger toggled={isHamburger} toggle={toggleMenu} /> <Hamburger toggled={isMenu} toggle={toggleMenu} />
{/* <div className="navbar__hamburger"> {/* <div className="navbar__hamburger">
<div className="navbar__hamburger_line"></div> <div className="navbar__hamburger_line"></div>
<div className="navbar__hamburger_line"></div> <div className="navbar__hamburger_line"></div>

View File

@ -9,15 +9,15 @@ import GlobalStore from "../store/global";
const Inner = () => { const Inner = () => {
const { isHamburger, setIsHamburger } = useContainer(GlobalStore); const { isMenu, setIsMenu } = useContainer(GlobalStore);
useEffect(() => { useEffect(() => {
setIsHamburger(false); setIsMenu(false);
}, []); }, []);
return ( return (
<div className="container"> <div className="container">
{isHamburger ? <DropdownContainer hamburgerToggle={setIsHamburger}/> : null} {isMenu ? <DropdownContainer hamburgerToggle={setIsMenu}/> : null}
<About></About> <About></About>
<NavBar hamburgerToggle={setIsHamburger}></NavBar> <NavBar hamburgerToggle={setIsMenu}></NavBar>
<Footer></Footer> <Footer></Footer>
</div> </div>
); );

View File

@ -12,7 +12,7 @@ import GlobalStore from "../store/global";
export default function ErrorRoute() { export default function ErrorRoute() {
const error = useRouteError(); const error = useRouteError();
console.error(error); console.error(error);
const { isHamburger: hamburger, setIsHamburger: setHamburger } = useContainer(GlobalStore); const { isMenu: hamburger, setIsMenu: setHamburger } = useContainer(GlobalStore);
useEffect(() => { useEffect(() => {
setHamburger(false); setHamburger(false);
}, []); }, []);

View File

@ -11,15 +11,15 @@ import GlobalStore from "../store/global";
const Inner = () => { const Inner = () => {
const { isHamburger, setIsHamburger } = useContainer(GlobalStore); const { isMenu, setIsMenu } = useContainer(GlobalStore);
useEffect(() => { useEffect(() => {
setIsHamburger(false); setIsMenu(false);
}, []); }, []);
return ( return (
<div className="container"> <div className="container">
{isHamburger ? <DropdownContainer hamburgerToggle={setIsHamburger}/> : null} {isMenu ? <DropdownContainer hamburgerToggle={setIsMenu}/> : null}
<Home></Home> <Home></Home>
<NavBar hamburgerToggle={setIsHamburger}></NavBar> <NavBar hamburgerToggle={setIsMenu}></NavBar>
<ToastContainer <ToastContainer
position="bottom-right" position="bottom-right"
autoClose={5000} autoClose={5000}

View File

@ -5,16 +5,16 @@ import { createContainer } from 'unstated-next';
const useGlobalStore = () => { const useGlobalStore = () => {
const bodySize = useSize(document.querySelector('body')); const bodySize = useSize(document.querySelector('body'));
const [isMobile, setIsMobile] = useState(false); const [isMobile, setIsMobile] = useState(false);
const [isHamburger, setIsHamburger] = useState(false); const [isMenu, setIsMenu] = useState(false);
const toggleMenu = () => { const toggleMenu = () => {
setIsHamburger(!isHamburger); setIsMenu(!isMenu);
}; };
const isScrollLock = isHamburger && isMobile; const isScrollLock = isMenu && isMobile;
useEffect(() => { useEffect(() => {
const isMobile = (bodySize?.width || 1200) < 650; const isMobile = (bodySize?.width || 1200) < 650;
setIsMobile(isMobile); setIsMobile(isMobile);
if (!isMobile) { if (!isMobile) {
setIsHamburger(false); setIsMenu(false);
} }
}, [bodySize]); }, [bodySize]);
useEffect(() => { useEffect(() => {
@ -30,7 +30,7 @@ const useGlobalStore = () => {
return { return {
bodySize, bodySize,
isMobile, isMobile,
isHamburger, toggleMenu, setIsHamburger, isMenu, toggleMenu, setIsMenu,
isScrollLock isScrollLock
}; };
}; };