Merge pull request #419 from aslams2020/NavMenu

✔️Moved Nav Menu-Links to 'More' Dropdown Menu
girlscript · Sep 17, 2024 · cf52fe7 · cf52fe7
2 parents 04f8daa + 966732d
commit cf52fe7
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 33 deletions.
diff --git a/components/MoreMenu.js b/components/MoreMenu.js
@@ -36,6 +36,90 @@ const MoreMenu = ({ handleClick }) => {
       >
         <Menu.Items className="origin-top-right absolute -right-5 mt-2 w-56 rounded-md shadow-lg dark:bg-black ring-1 bg-white ring-black ring-opacity-5 focus:outline-none">
           <div className="py-1">
+            <Link href={"/caLeaderboard"}>
+              <Menu.Item>
+                {({ active }) => (
+                  <a
+                  onClick={handleClick}
+                  className={classNames(
+                    active
+                      ? `hover:text-primary_orange-0 dark:hover:text-primary_orange-0 dark:text-white`
+                      : `hover:text-primary_orange-0 dark:text-white`,
+                    "block px-4 py-2 text-sm cursor-pointer"
+                  )}
+                >
+                  CA LEADERBOARD
+                </a>
+                )}
+              </Menu.Item>
+            </Link>
+            <Link href={"/jobfair"}>
+              <Menu.Item>
+                {({ active }) => (
+                  <a
+                  onClick={handleClick}
+                   className={classNames(
+                    active
+                      ? `hover:text-primary_orange-0 dark:hover:text-primary_orange-0 dark:text-white`
+                      : `hover:text-primary_orange-0 dark:text-white`,
+                    "block px-4 py-2 text-sm cursor-pointer"
+                  )}>
+                  JOB FAIR
+                </a>
+                )}
+              </Menu.Item>
+            </Link>
+            <Link href={"/faq"}>
+              <Menu.Item>
+                {({ active }) => (
+                  <a
+                  onClick={handleClick}
+                  className={classNames(
+                    active
+                      ? `hover:text-primary_orange-0 dark:hover:text-primary_orange-0 dark:text-white`
+                      : `hover:text-primary_orange-0 dark:text-white`,
+                    "block px-4 py-2 text-sm cursor-pointer"
+                  )}>
+                    FAQ
+                  </a>
+                )}
+              </Menu.Item>
+            </Link>
+            <Link href={"/blog"}>
+              <Menu.Item>
+                {({ active }) => (
+                  <a
+                  onClick={handleClick}
+                  className={classNames(
+                    active
+                      ? `hover:text-primary_orange-0 dark:hover:text-primary_orange-0 dark:text-white`
+                      : `hover:text-primary_orange-0 dark:text-white`,
+                    "block px-4 py-2 text-sm cursor-pointer"
+                  )}
+                >
+                  BLOG
+                </a>
+                )}
+              </Menu.Item>
+            </Link>
+            <Link href={"/contact"}>
+              <Menu.Item>
+                {({ active }) => (
+                  <a
+                  onClick={handleClick}
+                  href="/contact"
+                  className={classNames(
+                    active 
+                      ? `hover:text-primary_orange-0 dark:hover:text-primary_orange-0 dark:text-white`
+                      : `hover:text-primary_orange-0 dark:text-white`,
+                    "block px-4 py-2 text-sm cursor-pointer"
+                  )} 
+                >
+                  CONTACT
+                </a>
+                )}
+              </Menu.Item>
+            </Link>
             <Link href={"/codeofconduct"}>
               <Menu.Item>
                 {({ active }) => (

diff --git a/components/Navbar.js b/components/Navbar.js
@@ -117,24 +117,6 @@ export const Navbar = () => {
                 LEADERBOARD
               </a>
             </Link>
-            <Link href="/caLeaderboard">
-              <a
-                onClick={handleClick}
-                className="xl:inline-flex xl:w-auto w-full px-2.5 py-2 text-center rounded text-grey-700 text-1xl font-medium mr-1 hover:text-primary_orange-0 dark:hover:text-primary_orange-0 hover:text-xl transition-all link link-underline link-underline-black"
-              >
-                CA LEADERBOARD
-              </a>
-            </Link>
-            <Link href="/jobfair">
-              <a className="xl:inline-flex xl:w-auto w-full px-2.5 py-2 text-center rounded text-grey-700 text-1xl font-medium mr-1 hover:text-primary_orange-0 dark:hover:text-primary_orange-0 hover:text-xl transition-all link link-underline link-underline-black">
-                JOB FAIR
-              </a>
-            </Link>
-            <Link href="/faq">
-              <a className="xl:inline-flex xl:w-auto w-full px-2.5 py-2 text-center rounded text-grey-700 text-1xl font-medium mr-1 hover:text-primary_orange-0 dark:hover:text-primary_orange-0 hover:text-xl transition-all link link-underline link-underline-black">
-                FAQ
-              </a>
-            </Link>
             <Link href="/team">
               <a
                 onClick={handleClick}
@@ -143,21 +125,6 @@ export const Navbar = () => {
                 TEAM
               </a>
             </Link>
-            <Link href="/blog">
-              <a
-                onClick={handleClick}
-                className="xl:inline-flex xl:w-auto w-full px-2.5 py-2 text-center rounded text-grey-700 text-1xl font-medium mr-1 hover:text-primary_orange-0 dark:hover:text-primary_orange-0 hover:text-xl transition-all link link-underline link-underline-black"
-              >
-                BLOG
-              </a>
-            </Link>
-            <a
-              onClick={handleClick}
-              href="/contact"
-              className="xl:inline-flex xl:w-auto w-full px-2.5 py-2 text-center rounded text-grey-700 text-1xl font-medium mr-1 hover:text-primary_orange-0 dark:hover:text-primary_orange-0 hover:text-xl transition-all link link-underline link-underline-black"
-            >
-              CONTACT
-            </a>
             <div className="xl:inline-flex xl:w-auto w-full px-2 text-center rounded">
               <MoreMenu handleClick={handleClick} />
             </div>