don't hide navbar if it's homepage

acmucsd · Dec 14, 2024 · 277214e · 277214e
1 parent b2f9d69
commit 277214e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
@@ -9,7 +9,12 @@ import MenuIcon from '@mui/icons-material/Menu';
 import CloseIcon from '@mui/icons-material/Close';
 import { SwipeableDrawer } from '@mui/material';
 
-const links = [
+interface LinkMetadata {
+  name: string;
+  href: string;
+}
+
+const links: LinkMetadata[] = [
   { name: 'Home', href: '/' },
   { name: 'About', href: '/#about' },
   { name: 'Impact', href: '/#impact' },
@@ -27,10 +32,13 @@ export default function Navbar() {
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
   const lastUpdate = useRef(0);
 
-  const onLinkClick = () => {
+  const onLinkClick = (link: LinkMetadata) => {
     lastUpdate.current = Date.now();
-    setVisible(false);
     setMobileMenuOpen(false);
+
+    if (link.name !== 'Home') {
+      setVisible(false);
+    }
   };
 
   useEffect(() => {
@@ -82,7 +90,12 @@ export default function Navbar() {
         </div>
         <Typography variant="body/large" className={styles.desktopLinks}>
           {links.map(link => (
-            <Link href={link.href} className={styles.link} onClick={onLinkClick} key={link.name}>
+            <Link
+              href={link.href}
+              className={styles.link}
+              onClick={() => onLinkClick(link)}
+              key={link.name}
+            >
               {link.name}
             </Link>
           ))}
@@ -104,7 +117,12 @@ export default function Navbar() {
       >
         <div className={styles.mobileMenu}>
           {links.map(link => (
-            <Link href={link.href} className={styles.link} onClick={onLinkClick} key={link.name}>
+            <Link
+              href={link.href}
+              className={styles.link}
+              onClick={() => onLinkClick(link)}
+              key={link.name}
+            >
               {link.name}
             </Link>
           ))}

diff --git a/src/sections/Hero/style.module.scss b/src/sections/Hero/style.module.scss
@@ -8,13 +8,13 @@
   grid-template-columns: auto 1fr;
   align-items: flex-start;
   padding: 0 vars.$side-padding;
-  margin: 0 calc(vars.$side-padding * -1);
+  margin: 8rem calc(vars.$side-padding * -1);
   overflow: hidden;
   margin-bottom: -35rem;
 
   @media screen and (max-width: vars.$breakpoint-md) {
     padding: 0 vars.$side-padding-mobile;
-    margin: 0 calc(vars.$side-padding-mobile * -1);
+    margin: 6rem calc(vars.$side-padding-mobile * -1);
   }
 
   .text {

diff --git a/src/styles/globals.scss b/src/styles/globals.scss
@@ -19,11 +19,9 @@ html {
 
 body {
   padding: 0 vars.$side-padding;
-  margin-top: 8rem;
 
   @media screen and (max-width: vars.$breakpoint-md) {
     padding: 0 vars.$side-padding-mobile;
-    margin-top: 6rem;
   }
 }