update navbar after active sidebar

AmruthaPariprolu · Jul 3, 2024 · 07a634e · 07a634e
1 parent 288a5a1
commit 07a634e
Show file tree

Hide file tree

Showing 189 changed files with 102 additions and 352,372 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -41,6 +41,7 @@
     "react-scripts": "^5.0.1",
     "react-spinners": "^0.13.8",
     "react-toastify": "^10.0.5",
+    "run": "^1.5.0",
     "styled-components": "^6.1.11",
     "web-vitals": "^2.1.4"
   },

diff --git a/frontend/src/Component/Navbar/Navbar.js b/frontend/src/Component/Navbar/Navbar.js
@@ -12,7 +12,7 @@ function Navbar(props) {
     <header>
       <div className="navbar">
         <NavbarLeft showSideNav={showSideNav} setShowSideNav={setShowSideNav} />
-        <NavbarCenter />
+        <NavbarCenter showSideNav={showSideNav} />
 
         {/* Pass setSearchQuery directly 
         <NavbarRight setSearchQuery={props.setSearchQuery} />

diff --git a/frontend/src/Component/Navbar/NavbarCenter.js b/frontend/src/Component/Navbar/NavbarCenter.js
@@ -15,7 +15,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { Modal, Backdrop, Box } from "@mui/material";
 
-function NavbarCenter() {
+function NavbarCenter( ) {
   const totalBookmarks =
     useSelector((state) => state.SourceReducer.totalBookmarks) || 0;
   const [isModalOpen, setIsModalOpen] = useState(false);

diff --git a/frontend/src/Component/Navbar/NavbarLeft.js b/frontend/src/Component/Navbar/NavbarLeft.js
@@ -3,7 +3,7 @@ import { IoReorderThree, IoClose } from "react-icons/io5";
 import "../../style/Navbar.css"
 import logo from "../../image/logo1.png";
 
-function NavbarLeft(props) {
+function NavbarLeft(props, showSideNav) {
   useEffect(() => {
     const handleDocumentClick = (e) => {
       if (!e.target.closest('.navbar-left')) {
@@ -29,7 +29,7 @@ function NavbarLeft(props) {
   }
 
   return (
-    <span className="navbar-left">
+    <span className="navbar-left" style={{marginTop : showSideNav ? "0px":"0px"}}>
       <a
         onClick={handleClick}
         className="navbar-brand sdbar-logo"

diff --git a/frontend/src/style/Navbar.css b/frontend/src/style/Navbar.css
@@ -188,7 +188,7 @@
 
 .navbar-content ul li a.active {
   color: white;
-  background-color: green;
+  background-color: rgb(0, 128, 0);
 }
 
 .nav-item {
@@ -205,14 +205,13 @@
   height: 92%;
   background-color: #8b5cf6;
   position: fixed;
-  top: 4.4rem;
-  z-index: 3;
+  top: 4.6rem;
+  z-index: 4;
   display: flex;
   flex-direction: column;
   font-size: 1.4rem;
   overflow-y: scroll;
   transition: width 0.3s;
-  z-index: 4;
 }
 
 .nav-item::before {
@@ -475,3 +474,4 @@
 .nav-item a, .navbar-content ul li a {
   text-decoration: none !important;
 }
+
diff --git a/frontend/src/style/faq.css b/frontend/src/style/faq.css
@@ -147,18 +147,18 @@
   }
   @keyframes open-animation {
     from {
-      height: 55px;
+      height: 60px;
     }
     to {
-      height: 140px;
+      height: 60px;
     }
   }
 
   @keyframes close-animation {
     from {
-      height: 140px;
+      height: 60px;
     }
     to {
-      height: 55px;
+      height: 60px;
     }
   }
diff --git a/node_modules/.bin/loose-envify b/node_modules/.bin/loose-envify
diff --git a/node_modules/.bin/loose-envify.cmd b/node_modules/.bin/loose-envify.cmd
diff --git a/node_modules/.bin/loose-envify.ps1 b/node_modules/.bin/loose-envify.ps1
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/node_modules/loose-envify/LICENSE b/node_modules/loose-envify/LICENSE
diff --git a/node_modules/loose-envify/README.md b/node_modules/loose-envify/README.md
diff --git a/node_modules/loose-envify/cli.js b/node_modules/loose-envify/cli.js
diff --git a/node_modules/loose-envify/custom.js b/node_modules/loose-envify/custom.js
diff --git a/node_modules/loose-envify/index.js b/node_modules/loose-envify/index.js
diff --git a/node_modules/loose-envify/loose-envify.js b/node_modules/loose-envify/loose-envify.js