From f2f72a97c64619488cf75b9f1c2431fa56f91b67 Mon Sep 17 00:00:00 2001
From: Khushi Pushkar <khushipushkar.kp@gmail.com>
Date: Tue, 30 Jul 2024 00:36:29 +0530
Subject: [PATCH 1/2] Fixed Navbar Content

---
 src/components/Navbar/Navbar.jsx | 82 +++++++++++++++++++++++---------
 1 file changed, 59 insertions(+), 23 deletions(-)

diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx
index 5e4a501..014d7c9 100644
--- a/src/components/Navbar/Navbar.jsx
+++ b/src/components/Navbar/Navbar.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import { FaBars, FaTimes } from "react-icons/fa"; 
 import { Nav, NavbarContainer, NavImg, NavMenu, NavItem, NavLinks, MobileIcon, NavLogo, SubLogo, Dropdown, DropdownContent, ButtonDropdown } from "./NavbarElements";
 import { Link, useNavigate } from "react-router-dom";
@@ -10,8 +10,6 @@ import styled from "styled-components";
 
 import ProgressBar from "./Progressbar";
 
-
-
 const Button = styled.button`
   padding: 5px 24px;
   font-style: normal;
@@ -42,7 +40,7 @@ const Navbar = () => {
   };
 
   const handleLogoClick = () => {
-    setIsOpen(!isOpen);
+    setIsOpen(false);
     window.scrollTo(0, 0);
   };
 
@@ -64,16 +62,8 @@ const Navbar = () => {
   };
 
   return (
-      <>
-      <Nav
-        style={{
-          background: "#2B394A",
-        }}
-      >
-        
-
-      <Nav>
-
+    <>
+      <Nav style={{ background: "#2B394A" }}>
         <NavbarContainer>
           <NavImg>
             <Link to="/" onClick={handleLogoClick}>
@@ -90,20 +80,66 @@ const Navbar = () => {
           </MobileIcon>
 
           <NavMenu isOpen={isOpen}>
-          
-            
+            <NavItem>
+              <NavLinks to="/" onClick={handleLogoClick}>
+                Home
+              </NavLinks>
+            </NavItem>
+            <NavItem>
+              <NavLinks to="/#about" onClick={() => handleNavClick('/', 'about')}>
+                About
+              </NavLinks>
+            </NavItem>
+            <NavItem>
+              <NavLinks to="/#Features" onClick={() => handleNavClick('/', 'featureSection')}>
+                Features
+              </NavLinks>
+            </NavItem>
+            <NavItem>
+              <NavLinks to="/contact" onClick={handleLogoClick}>
+                Contact
+              </NavLinks>
+            </NavItem>
+            <NavItem>
+              <NavLinks to="/review" onClick={handleLogoClick}>
+                Review
+              </NavLinks>
+            </NavItem>
+            <NavItem>
+              <NavLinks to="/login" onClick={handleLogoClick} style={{ border: '1px solid rgb(48,175,91)' }}>
+                Log In
+              </NavLinks>
+            </NavItem>
+            {isAuthenticated && (
+              <NavItem>
+                <Dropdown>
+                  <FontAwesomeIcon icon={faUser} style={{ color: '#fff' }} />
+                  <ButtonDropdown onClick={toggleDropdown}>
+                    Account
+                    <FontAwesomeIcon icon={faCaretDown} style={{ color: '#fff' }} />
+                  </ButtonDropdown>
+                  {isOpen && (
+                    <DropdownContent>
+                      <Link to="/profile">User Profile</Link>
+                      <Button
+                        onClick={() =>
+                          logout({ logoutParams: { returnTo: window.location.origin } })
+                        }
+                      >
+                        Log Out
+                      </Button>
+                    </DropdownContent>
+                  )}
+                </Dropdown>
+              </NavItem>
+            )}
           </NavMenu>
-          
         </NavbarContainer>
-        
       </Nav>
-      <ProgressBar/>
-    
-    </Nav>
-      <ProgressBar/>
+      <ProgressBar />
     </>
   );
 };
 
-
 export default Navbar;
+

From cbdfdd1a1d8f1a757274a09775ccbf9e67153b78 Mon Sep 17 00:00:00 2001
From: Khushi Pushkar <142687709+Khushi-Pushkar@users.noreply.github.com>
Date: Wed, 31 Jul 2024 08:49:36 +0530
Subject: [PATCH 2/2]  Navbar items

---
 src/components/Navbar/Navbar.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx
index 014d7c9..913fe62 100644
--- a/src/components/Navbar/Navbar.jsx
+++ b/src/components/Navbar/Navbar.jsx
@@ -136,7 +136,6 @@ const Navbar = () => {
           </NavMenu>
         </NavbarContainer>
       </Nav>
-      <ProgressBar />
     </>
   );
 };