From 0fa6eaf4e8e81eaf9cbac85a32db9ae831d438f7 Mon Sep 17 00:00:00 2001
From: BFlat <bombayapirat@gmail.com>
Date: Thu, 7 Mar 2024 14:52:16 +0700
Subject: [PATCH] sidebar logic fixes

---
 .../src/components/layout/SideNav/SideNav.tsx |  7 +++----
 .../src/components/layout/TopNav/TopNav.tsx   | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx
index 817dc103d4..a96377a081 100644
--- a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx
+++ b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx
@@ -53,9 +53,8 @@ export default function SideNav({
   const isMenuOpen = wrapper?.classList.contains("toggled");
   const isLoggedIn = sessionWrapper.isLoggedIn();
   const isOnLandingPage = window.location.pathname === "/";
-  const isOnLoginOrSignUpPage = window.location.pathname.includes(
-    "/login" || "/signup"
-  );
+  const isOnLoginPage = window.location.pathname.includes("/login");
+  const isOnSignUpPage = window.location.pathname.includes("/signup");
   const isOnStudioPage = window.location.pathname.includes("/studio");
 
   let history = useHistory();
@@ -107,7 +106,7 @@ export default function SideNav({
   }, []);
 
   const shouldNotShowSidebar =
-    (!isLoggedIn && (isOnLandingPage || isOnLoginOrSignUpPage)) ||
+    (!isLoggedIn && (isOnLandingPage || isOnLoginPage || isOnSignUpPage)) ||
     isOnStudioPage;
   const shouldShowSidebar = windowWidth >= 992 && !shouldNotShowSidebar;
   const sidebarClassName = `sidebar ${
diff --git a/packages/fakeyou.com/src/components/layout/TopNav/TopNav.tsx b/packages/fakeyou.com/src/components/layout/TopNav/TopNav.tsx
index f9e6e77623..1396cb1600 100644
--- a/packages/fakeyou.com/src/components/layout/TopNav/TopNav.tsx
+++ b/packages/fakeyou.com/src/components/layout/TopNav/TopNav.tsx
@@ -45,16 +45,16 @@ export default function TopNav({
   const [menuButtonIcon, setMenuButtonIcon] = useState(faBars);
   // const { t } = useLocalize("TopNav");
   const isOnLandingPage = window.location.pathname === "/";
-  const isOnLoginOrSignUpPage = window.location.pathname.includes(
-    "/login" || "/signup"
-  );
+  const isOnLoginPage = window.location.pathname.includes("/login");
+  const isOnSignUpPage = window.location.pathname.includes("/signup");
   const isOnStudioPage = window.location.pathname.includes("/studio");
 
   const { open } = useModal();
   const openModal = () => open({ component: InferenceJobsModal });
   const [isScrolled, setIsScrolled] = useState(false);
   const loggedIn = sessionWrapper.isLoggedIn();
-  const showNavItem = !loggedIn && (isOnLandingPage || isOnLoginOrSignUpPage);
+  const showNavItem =
+    !loggedIn && (isOnLandingPage || isOnLoginPage || isOnSignUpPage);
 
   const handleMenuButtonClick = () => {
     if (window.innerWidth < 1200) {
@@ -241,11 +241,18 @@ export default function TopNav({
         <div className="topbar-nav-center">
           {/* Search Bar */}
           <div className="d-none d-lg-block">
-            {(!isOnLandingPage && !isOnLoginOrSignUpPage && !isOnStudioPage) ||
-            (loggedIn && !isOnLoginOrSignUpPage && !isOnStudioPage) ||
+            {(!isOnLandingPage &&
+              !isOnLoginPage &&
+              !isOnSignUpPage &&
+              !isOnStudioPage) ||
+            (loggedIn &&
+              !isOnLoginPage &&
+              !isOnSignUpPage &&
+              !isOnStudioPage) ||
             (isOnLandingPage &&
               isScrolled &&
-              !isOnLoginOrSignUpPage &&
+              !isOnLoginPage &&
+              !isOnSignUpPage &&
               !isOnStudioPage) ? (
               <SearchBar
                 onFocus={onFocusHandler}