change css for fullpagepost page

So-Fan · Sep 2, 2023 · 68297f2 · 68297f2
1 parent 3aeb20c
commit 68297f2
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 80 deletions.
diff --git 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 = ({
     `}
         </style>
       )}
-      <section className="navbar-section">
-        <div className="navbar-wrap">
-          <div className="navbar-wrap-1">
-            <Link to="/">
-              <img className="navbar-main-logo" src={SofanLogo2} alt="Sofan" />
-            </Link>
-            <Searchbar />
-          </div>
-          <div
-            className={
-              isLogged && Object.keys(isLogged).length > 0
-                ? "navbar-wrap-2"
-                : "navbar-wrap-2-unauthenticated"
-            }
-          >
-            {/* <NavLink location={location} name="Feed" link="/" /> */}
-            <Link className="navbar-navicon" to="/">
-              <div
-                className={
-                  isPageHomeDisplay
-                    ? "navbar-navicon-name-active-home"
-                    : "navbar-navicon-name"
-                }
-              >
-                Feed
+      {path === "post" ? (
+        <>
+          <Link to="/">
+            <img
+              style={{ marginTop: "60px", width: "200px" }}
+              className="navbar-main-logo"
+              src={SofanLogo2}
+              alt="Sofan"
+            />
+          </Link>
+        </>
+      ) : (
+        <>
+          <section className="navbar-section">
+            <div className="navbar-wrap">
+              <div className="navbar-wrap-1">
+                <Link to="/">
+                  <img
+                    className="navbar-main-logo"
+                    src={SofanLogo2}
+                    alt="Sofan"
+                  />
+                </Link>
+                <Searchbar />
               </div>
-            </Link>
-            <Link className="navbar-navicon" to="/Launchpad">
               <div
                 className={
-                  isPageLaunchpadDisplay
-                    ? "navbar-navicon-name-active-launchpad"
-                    : "navbar-navicon-name"
+                  isLogged && Object.keys(isLogged).length > 0
+                    ? "navbar-wrap-2"
+                    : "navbar-wrap-2-unauthenticated"
                 }
               >
-                Launchpad
+                {/* <NavLink location={location} name="Feed" link="/" /> */}
+                <Link className="navbar-navicon" to="/">
+                  <div
+                    className={
+                      isPageHomeDisplay
+                        ? "navbar-navicon-name-active-home"
+                        : "navbar-navicon-name"
+                    }
+                  >
+                    Feed
+                  </div>
+                </Link>
+                <Link className="navbar-navicon" to="/Launchpad">
+                  <div
+                    className={
+                      isPageLaunchpadDisplay
+                        ? "navbar-navicon-name-active-launchpad"
+                        : "navbar-navicon-name"
+                    }
+                  >
+                    Launchpad
+                  </div>
+                </Link>
+                {/* <NavLink location={location} name="Launchpad" link="/Launchpad" /> */}
+                {isLogged && Object.keys(isLogged).length > 0 ? (
+                  <div className="navbar-wrap-2-subwrap-navicon-and-navprofile">
+                    <div className="navbar-wrap-2-navicon-wrap">
+                      <div className="navbar-vertical"></div>
+                      <NavIcon
+                        isNotificationsRead={isNotificationsRead}
+                        handleNotificationPopup={handleNotificationPopup}
+                        src={notification}
+                      />
+                      <div className="navbar-vertical"></div>
+                    </div>
+                    <NavProfile
+                      userInfo={isLogged}
+                      isProfileClicked={isProfileClicked}
+                      src={isLogged.profile_avatar}
+                      web3auth={web3auth}
+                    />
+                  </div>
+                ) : (
+                  <div className="navbar-wrap-2-subwrap-sign">
+                    <div className="navbar-wrap-2-subwrap-sign-up-button">
+                      <Button
+                        onClick={handleSignUpButtonClick}
+                        text="S'inscrire"
+                        style={NavbarButtonStyle.signUp}
+                        customMediaQueries={customNavbarButtonMediaQueries}
+                      />
+                    </div>
+                    <div className="navbar-wrap-2-subwrap-sign-in-button">
+                      <Button
+                        onClick={handleSignInButtonClick}
+                        text="Se connecter"
+                        style={NavbarButtonStyle.signIn}
+                      />
+                    </div>
+                  </div>
+                )}
               </div>
-            </Link>
-            {/* <NavLink location={location} name="Launchpad" link="/Launchpad" /> */}
-            {isLogged && Object.keys(isLogged).length > 0 ? (
-              <div className="navbar-wrap-2-subwrap-navicon-and-navprofile">
-                <div className="navbar-wrap-2-navicon-wrap">
-                  <div className="navbar-vertical"></div>
-                  <NavIcon
-                    isNotificationsRead={isNotificationsRead}
-                    handleNotificationPopup={handleNotificationPopup}
-                    src={notification}
-                  />
-                  <div className="navbar-vertical"></div>
-                </div>
-                <NavProfile
-                  userInfo={isLogged}
-                  isProfileClicked={isProfileClicked}
-                  src={isLogged.profile_avatar}
-                  web3auth={web3auth}
-                />
-              </div>
-            ) : (
-              <div className="navbar-wrap-2-subwrap-sign">
-                <div className="navbar-wrap-2-subwrap-sign-up-button">
-                  <Button
-                    onClick={handleSignUpButtonClick}
-                    text="S'inscrire"
-                    style={NavbarButtonStyle.signUp}
-                    customMediaQueries={customNavbarButtonMediaQueries}
-                  />
-                </div>
-                <div className="navbar-wrap-2-subwrap-sign-in-button">
-                  <Button
-                    onClick={handleSignInButtonClick}
-                    text="Se connecter"
-                    style={NavbarButtonStyle.signIn}
-                  />
-                </div>
-              </div>
-            )}
-          </div>
-        </div>
-      </section>
+            </div>
+          </section>
+        </>
+      )}
       {isNotificationButtonClicked && (
         <Modal
           setState={setIsNotificationButtonClicked}

diff --git a/client/src/Components/PostsComponents/DropDownMenu/DropDownMenu.css b/client/src/Components/PostsComponents/DropDownMenu/DropDownMenu.css
@@ -4,10 +4,10 @@
   justify-content: space-evenly;
   align-items: center;
   font-size: 0.9rem;
-  width: 120px;
+  width: 100px;
   height: auto;
   box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
-  border-radius: 20px;
+  border-radius: 10px;
   position: absolute;
   /* top: 7%; */
   /* right: 5%; */
@@ -51,10 +51,10 @@
   justify-content: space-evenly;
   align-items: center;
   font-size: 0.9rem;
-  width: 120px;
+  width: 100px;
   height: auto;
   box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
-  border-radius: 20px;
+  border-radius: 10px;
   position: absolute;
   /* top: 20% !important;
   right: 15% ; */

diff --git a/client/src/Components/PostsComponents/DropDownMenu/DropDownMenu.js b/client/src/Components/PostsComponents/DropDownMenu/DropDownMenu.js
@@ -20,7 +20,7 @@ function DropDownMenu({
         id={id}
         style={
           fullPagePostPageStyle
-            ? { top: "24%", right: "16%" }
+            ? { top: "25%", right: "12.5%" }
             : fullPagePostModalStyle
             ? { top: "9%", right: "2%" }
             : dropdownStates && id && dropdownStates[id]

diff --git a/client/src/Pages/FullPagePostPage/FullPagePostPage.css b/client/src/Pages/FullPagePostPage/FullPagePostPage.css
@@ -3,6 +3,6 @@
     height: 100vh !important;
     position: absolute;
     /* position: relative; */
-    /* z-index: 32; */
-    /* background-color: rgba(0, 0, 0, 0.651); */
+    z-index: 465465456432;
+    background-color: rgba(0, 0, 0, 0.651);
 }