From 03cbc4456fdfaf87a1eae8731455c608c8b681ed Mon Sep 17 00:00:00 2001
From: 3zachm <3zachm2@gmail.com>
Date: Mon, 6 Feb 2023 17:19:08 -0800
Subject: [PATCH] revert state usage for navicons

---
 components/dashboard/NavBar.tsx | 59 +++++++++++----------------------
 layouts/DashLayout.tsx          |  3 +-
 pages/dashboard/index.tsx       |  6 +---
 pages/ranking/index.tsx         |  6 +---
 pages/user/[username]/index.tsx |  6 +---
 pages/wiki/[...slug]/index.tsx  |  6 +---
 6 files changed, 25 insertions(+), 61 deletions(-)

diff --git a/components/dashboard/NavBar.tsx b/components/dashboard/NavBar.tsx
index c31bfdd..72b6be6 100644
--- a/components/dashboard/NavBar.tsx
+++ b/components/dashboard/NavBar.tsx
@@ -3,29 +3,25 @@ import { useRouter } from "next/router";
 import Link from "next/link";
 import { useState } from "react";
 
-interface NavBarProps {
-  initialPage: string;
-}
-
-function NavBar(props: NavBarProps) {
-  const [activePage, setActivePage] = useState(props.initialPage);
-  const ActiveLink = (props: {
-    href: string;
-    pageName: string;
-    children: React.ReactNode;
-  }) => {
-    const router = useRouter();
-    let styling = "text-white";
-    if (activePage === props.pageName) {
-      styling = "text-[#a855f7]";
-    }
-    return (
-      <Link href={props.href} className={styling}>
-        {props.children}
-      </Link>
-    );
-  };
+const ActiveLink = (props: {
+  href: string;
+  pageName: string;
+  children: React.ReactNode;
+}) => {
+  const router = useRouter();
+  let styling = "text-white";
+  // if first part of path equals the pageName
+  if (router.pathname.split("/")[1] === props.pageName) {
+    styling = "text-[#a855f7]";
+  }
+  return (
+    <Link href={props.href} className={styling}>
+      {props.children}
+    </Link>
+  );
+};
 
+function NavBar() {
   return (
     <div className="m-3">
       <m.div
@@ -38,13 +34,7 @@ function NavBar(props: NavBarProps) {
           className="flex flex-row items-center justify-center pl-5 lg:flex-col lg:pl-0 lg:pt-5"
           variants={navStripVariants}
         >
-          <m.div
-            variants={navIconVariants}
-            className="pr-5 lg:pr-0 lg:pb-3"
-            onClick={() => {
-              setActivePage("dashboard");
-            }}
-          >
+          <m.div variants={navIconVariants} className="pr-5 lg:pr-0 lg:pb-3">
             <ActiveLink href="/dashboard" pageName="dashboard">
               <DashIcon />
             </ActiveLink>
@@ -52,9 +42,6 @@ function NavBar(props: NavBarProps) {
           <m.div
             variants={navIconVariants}
             className="pr-5 lg:pr-0 lg:pt-3 lg:pb-3"
-            onClick={() => {
-              setActivePage("ranking");
-            }}
           >
             <ActiveLink href="/ranking" pageName="ranking">
               <RankingIcon />
@@ -65,13 +52,7 @@ function NavBar(props: NavBarProps) {
           className="flex flex-row items-center justify-center pr-5 lg:w-full lg:flex-col lg:pr-0 lg:pb-5"
           variants={navStripVariants}
         >
-          <m.div
-            variants={navIconVariants}
-            className="pr-5 lg:pr-0 lg:pb-3"
-            onClick={() => {
-              setActivePage("wiki");
-            }}
-          >
+          <m.div variants={navIconVariants} className="pr-5 lg:pr-0 lg:pb-3">
             <ActiveLink href="/wiki" pageName="wiki">
               <WikiIcon />
             </ActiveLink>
diff --git a/layouts/DashLayout.tsx b/layouts/DashLayout.tsx
index 3ddf05e..2bbc55d 100644
--- a/layouts/DashLayout.tsx
+++ b/layouts/DashLayout.tsx
@@ -11,7 +11,6 @@ import NavBar from "../components/dashboard/NavBar";
 
 interface DashLayoutProps {
   children: React.ReactNode;
-  navIcon?: string;
   metaTags: {
     title?: string;
     ogTitle?: string;
@@ -89,7 +88,7 @@ function DashLayout(props: DashLayoutProps) {
         {/* dashboard nav bar */}
         <LazyMotion features={domAnimation}>
           <AnimatePresence mode="wait">
-            <NavBar initialPage={props.navIcon ?? ""} />
+            <NavBar />
           </AnimatePresence>
         </LazyMotion>
         {/* dashboard content */}
diff --git a/pages/dashboard/index.tsx b/pages/dashboard/index.tsx
index 3f8913a..0c88f80 100644
--- a/pages/dashboard/index.tsx
+++ b/pages/dashboard/index.tsx
@@ -80,11 +80,7 @@ const gridItemVariants: Variants = {
 
 Dashboard.getLayout = function getLayout(page: ReactElement) {
   const metaTags = {};
-  return (
-    <DashLayout metaTags={metaTags} navIcon="dashboard">
-      {page}
-    </DashLayout>
-  );
+  return <DashLayout metaTags={metaTags}>{page}</DashLayout>;
 };
 
 export default Dashboard;
diff --git a/pages/ranking/index.tsx b/pages/ranking/index.tsx
index 766832f..ed61365 100644
--- a/pages/ranking/index.tsx
+++ b/pages/ranking/index.tsx
@@ -290,11 +290,7 @@ Ranking.getLayout = function getLayout(page: ReactElement) {
     title: "Ranking - toffee",
     description: "Top investors on toffee",
   };
-  return (
-    <DashLayout metaTags={metaTags} navIcon="ranking">
-      {page}
-    </DashLayout>
-  );
+  return <DashLayout metaTags={metaTags}>{page}</DashLayout>;
 };
 
 export default Ranking;
diff --git a/pages/user/[username]/index.tsx b/pages/user/[username]/index.tsx
index 74b5d9e..a84a7df 100644
--- a/pages/user/[username]/index.tsx
+++ b/pages/user/[username]/index.tsx
@@ -662,11 +662,7 @@ UserPage.getLayout = function getLayout(page: ReactElement) {
       "twitter:card": "summary",
     },
   };
-  return (
-    <DashLayout metaTags={metaTags} navIcon="user">
-      {page}
-    </DashLayout>
-  );
+  return <DashLayout metaTags={metaTags}>{page}</DashLayout>;
 };
 
 export default UserPage;
diff --git a/pages/wiki/[...slug]/index.tsx b/pages/wiki/[...slug]/index.tsx
index 0b5dbd8..9e48730 100644
--- a/pages/wiki/[...slug]/index.tsx
+++ b/pages/wiki/[...slug]/index.tsx
@@ -152,11 +152,7 @@ WikiLandingPage.getLayout = function getLayout(page: React.ReactNode) {
     title: "Wiki - toffee",
     description: "Wiki for toffee",
   };
-  return (
-    <DashLayout metaTags={metaTags} navIcon="wiki">
-      {page}
-    </DashLayout>
-  );
+  return <DashLayout metaTags={metaTags}>{page}</DashLayout>;
 };
 
 export default WikiLandingPage;