Merge pull request #36 from atlp-rwanda/bgfix-orders-redirection

fixing redirect to login on orders page
atlp-rwanda · Jul 26, 2024 · 94e13a0 · 94e13a0
2 parents 53b1756 + d1b9102
commit 94e13a0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
@@ -13,27 +13,21 @@ import { fetchUser } from "../../redux/slices/userSlices";
 import { logoutUser } from "../../redux/slices/loginSlice";
 import { resetToken } from "../../redux/slices/tokenSlice";
 
-interface Props{
+interface Props {
   sideBarActive: boolean,
-  updateSideBarActive: ((state:boolean)=>void)
+  updateSideBarActive: ((state: boolean) => void)
 }
 
 
-const NavBar: React.FC<Props> = ({sideBarActive,updateSideBarActive}) => {
+const NavBar: React.FC<Props> = ({ sideBarActive, updateSideBarActive }) => {
 
-  const [profileActive, setProfileActive] = useState<boolean>(false)  
+  const [profileActive, setProfileActive] = useState<boolean>(false)
 
   const dispatch = useDispatch<AppDispatch>()
   const navigate = useNavigate()
 
   const token: string | null = localStorage.getItem('token')
 
-  const { id } = useParams<{ id?: string | undefined }>();
-
-  if(!id || id==="undefined"){
-    navigate('/login')
-  }
-
   function handleResize() {
     if (window.innerWidth >= 1000) {
       updateSideBarActive(false)
@@ -46,16 +40,12 @@ const NavBar: React.FC<Props> = ({sideBarActive,updateSideBarActive}) => {
     navigate("/");
   }
 
-  function handleProfileClick(event: any){
-    setProfileActive(prev=>!prev)
-  }
-
-  function handleProfileRedirect(event: any){
-    navigate(`/MyAccount/${id}`)
+  function handleProfileClick(event: any) {
+    setProfileActive(prev => !prev)
   }
 
-  function handleClickOutsideProfile(event: any){
-    if(!event.target.closest(".accountContainer")) setProfileActive(false)
+  function handleClickOutsideProfile(event: any) {
+    if (!event.target.closest(".accountContainer")) setProfileActive(false)
   }
 
   interface User {
@@ -78,7 +68,6 @@ const NavBar: React.FC<Props> = ({sideBarActive,updateSideBarActive}) => {
   }, [])
 
   const { user } = useSelector((state: RootState) => state.user);
-
 
   return (
     <>
@@ -89,7 +78,7 @@ const NavBar: React.FC<Props> = ({sideBarActive,updateSideBarActive}) => {
           <hr />
           <h4>OnesAndZeros</h4>
         </div>
-        <Link to={`/${id}`} className="start-buying-link">
+        <Link to={`/${user?.userId}`} className="start-buying-link">
           Start buying
         </Link>
         <div className="accountContainer">
@@ -105,7 +94,7 @@ const NavBar: React.FC<Props> = ({sideBarActive,updateSideBarActive}) => {
           {
             profileActive ?
               <div className="profileContainer">
-                <div className="userDetails" onClick={handleProfileRedirect}>
+                <div className="userDetails" onClick={() => navigate(`/MyAccount/${user?.userId}`)}>
                   <FontAwesomeIcon icon={faUser}></FontAwesomeIcon>
                   <p>{user ? `${user.firstName}` : `Account`}</p>
                 </div>

diff --git a/src/components/Sidebar/Sidebar.scss b/src/components/Sidebar/Sidebar.scss
@@ -9,6 +9,7 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
+  height: 100%;
 
   ul {
     list-style: none;

diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx
@@ -36,8 +36,6 @@ const SideBar: React.FC<SideBarProps> = ({children,className}) => {
     navigate('/')
   }
 
-  const { id } = useParams<{ id?: string }>();
-
   return (
     <>
       <nav ref={ref} className={`SideBar ${className}`}>