From 68297f2beba338825c824b5723d0a0ef79db8f1b Mon Sep 17 00:00:00 2001 From: Ra Date: Sat, 2 Sep 2023 07:18:41 +0200 Subject: [PATCH] change css for fullpagepost page --- client/src/Components/Navbar/Navbar.js | 168 ++++++++++-------- .../DropDownMenu/DropDownMenu.css | 8 +- .../DropDownMenu/DropDownMenu.js | 2 +- .../FullPagePostPage/FullPagePostPage.css | 4 +- 4 files changed, 102 insertions(+), 80 deletions(-) diff --git a/client/src/Components/Navbar/Navbar.js b/client/src/Components/Navbar/Navbar.js index 782f9eba..94a57e3a 100644 --- a/client/src/Components/Navbar/Navbar.js +++ b/client/src/Components/Navbar/Navbar.js @@ -40,6 +40,9 @@ const Navbar = ({ const [isPageLaunchpadDisplay, setIsPageLaunchpadDisplay] = useState(false); // const navigate = useNavigate(); const location = useLocation(); + const segments = location.pathname.split("/"); + const path = segments[1]; + // console.log(path) // console.log(location.pathname); function handleSignInButtonClick() { // navigate('/login'); // redirect to signin popup @@ -125,85 +128,104 @@ const Navbar = ({ `} )} -
-
-
- - Sofan - - -
-
0 - ? "navbar-wrap-2" - : "navbar-wrap-2-unauthenticated" - } - > - {/* */} - -
- Feed + {path === "post" ? ( + <> + + Sofan + + + ) : ( + <> +
+
+
+ + Sofan + +
- -
0 + ? "navbar-wrap-2" + : "navbar-wrap-2-unauthenticated" } > - Launchpad + {/* */} + +
+ Feed +
+ + +
+ Launchpad +
+ + {/* */} + {isLogged && Object.keys(isLogged).length > 0 ? ( +
+
+
+ +
+
+ +
+ ) : ( +
+
+
+
+
+
+ )}
- - {/* */} - {isLogged && Object.keys(isLogged).length > 0 ? ( -
-
-
- -
-
- -
- ) : ( -
-
-
-
-
-
- )} -
-
-
+ + + + )} {isNotificationButtonClicked && (