Merge pull request #878 from acm-ucr/menthy/nav

acm-ucr · Nov 17, 2023 · 8972bf5 · 8972bf5
2 parents f8e9c9f + 2fcbec7
commit 8972bf5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/app/page.js b/src/app/page.js
@@ -7,7 +7,7 @@ import Upcoming from "@/components/static/upcoming/Upcoming";
 
 const Home = () => {
   return (
-    <>
+    <div className="w-full">
       <Release release={RELEASES.STATIC.UPCOMING}>
         <Upcoming />
       </Release>
@@ -20,7 +20,7 @@ const Home = () => {
       <Release release={RELEASES.STATIC.POSTLIVE}>
         <Postlive />
       </Release>
-    </>
+    </div>
   );
 };
 

diff --git a/src/components/dynamic/Navigation.jsx b/src/components/dynamic/Navigation.jsx
@@ -12,8 +12,7 @@ import { BiSolidDownArrow } from "react-icons/bi";
 const Navigation = () => {
   const [expand, setExpand] = useState(false);
   const pathName = usePathname();
-  const tabs = TABS[pathName.split("/")[1]];
-  const [dropdown, setDropdown] = useState(Object.keys(tabs)[0]);
+  const [tabs, setTabs] = useState(TABS[pathName.split("/")[1]]);
 
   return (
     <>
@@ -50,23 +49,28 @@ const Navigation = () => {
           </div>
           <div className="w-full flex flex-col items-center h-full">
             {Object.entries(tabs)
-              .filter(([title]) => title !== " ")
+              .filter(([title]) => title !== " " && title !== "dropdown")
               .map(([title, subTabs], index) => (
                 <div key={index} className="w-full">
                   <p
                     className={`text-white text-xl font-poppin font-bold w-full px-2 mb-0 flex items-center justify-between hover:cursor-pointer ${subTabs.mt}`}
-                    onClick={() => setDropdown(title === dropdown ? "" : title)}
+                    onClick={() =>
+                      setTabs({
+                        ...tabs,
+                        [title]: { ...subTabs, expand: !subTabs.expand },
+                      })
+                    }
                   >
                     {title}
-                    {subTabs.expand && (
+                    {tabs.dropdown && (
                       <BiSolidDownArrow
                         className={`text-sm duration-300 ${
-                          dropdown === title && "rotate-180"
+                          subTabs.expand && "rotate-180"
                         }`}
                       />
                     )}
                   </p>
-                  {(dropdown === title || !subTabs.expand) &&
+                  {(subTabs.expand || !tabs.dropdown) &&
                     subTabs.tabs.map((tab, index) => (
                       <Link
                         key={index}

diff --git a/src/data/Releases.js b/src/data/Releases.js
@@ -39,6 +39,8 @@ const DEV = {
     "/form/mentor": new Date("10/01/2023"),
     "/form/admin": new Date("10/01/2023"),
     "/form/committee": new Date("10/01/2023"),
+    "/form/feedback": new Date("10/01/2023"),
+    "/form/interest": new Date("10/01/2023"),
 
     "/user/checkin": new Date("10/01/2023"),
     "/user/dashboard": new Date("10/01/2023"),
@@ -87,6 +89,8 @@ const PRODUCTION = {
     "/form/mentor": new Date("10/01/2023"),
     "/form/admin": new Date("10/01/2023"),
     "/form/committee": new Date("10/01/2023"),
+    "/form/feedback": new Date("10/01/2023"),
+    "/form/interest": new Date("10/01/2023"),
 
     "/user/checkin": new Date("10/01/2023"),
     "/user/dashboard": new Date("10/01/2023"),

diff --git a/src/data/dynamic/Navigation.js b/src/data/dynamic/Navigation.js
@@ -23,6 +23,7 @@ const iconStyle = "mr-2";
 
 export const TABS = {
   admin: {
+    dropdown: true,
     Dashboards: {
       expand: true,
       mt: "mt-0",