From b62ac8e6a5cd7fde404afc6bfb34968c5db9c54b Mon Sep 17 00:00:00 2001
From: Abhishek P Anil <abhishek@culturecreates.com>
Date: Mon, 24 Jul 2023 11:39:18 +0530
Subject: [PATCH 1/3] feat: added padding for col in Card to css page

---
 src/components/Card/Common/Event.jsx      | 2 +-
 src/pages/Dashboard/AddEvent/addEvent.css | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Card/Common/Event.jsx b/src/components/Card/Common/Event.jsx
index 6f1cfc8bc..0e58ead5e 100644
--- a/src/components/Card/Common/Event.jsx
+++ b/src/components/Card/Common/Event.jsx
@@ -7,7 +7,7 @@ function Event(props) {
     <Col
       flex={'780px'}
       className="add-event-section-col"
-      style={{ display: hidden && 'none', borderRadius: '4px', backgroundColor: '#ffffff', padding: '24px' }}>
+      style={{ display: hidden && 'none', borderRadius: '4px', backgroundColor: '#ffffff' }}>
       <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }} className="events-content">
         <Col flex={'423px'}>
           <div className="add-event-section-wrapper">
diff --git a/src/pages/Dashboard/AddEvent/addEvent.css b/src/pages/Dashboard/AddEvent/addEvent.css
index 126d673dd..f6c513372 100644
--- a/src/pages/Dashboard/AddEvent/addEvent.css
+++ b/src/pages/Dashboard/AddEvent/addEvent.css
@@ -63,6 +63,7 @@
 .add-edit-wrapper .add-event-section-col {
   background-color: #ffffff;
   border-radius: 4px;
+  padding: 24px;
 }
 
 .add-edit-wrapper .event-description-footer {

From 09202b1da159e2cafd98862b65f4a1665396b5dd Mon Sep 17 00:00:00 2001
From: Abhishek P Anil <abhishek@culturecreates.com>
Date: Mon, 24 Jul 2023 11:45:13 +0530
Subject: [PATCH 2/3] fix: for the page navigation in user profile page

---
 src/pages/Dashboard/Users/Users.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Dashboard/Users/Users.jsx b/src/pages/Dashboard/Users/Users.jsx
index 98691de3d..92595fec1 100644
--- a/src/pages/Dashboard/Users/Users.jsx
+++ b/src/pages/Dashboard/Users/Users.jsx
@@ -16,7 +16,6 @@ import { locale } from '../../../constants/localeSupport';
 import { usePrompt } from '../../../hooks/usePrompt';
 import { useSelector, useDispatch } from 'react-redux';
 import { getUserDetails, setUser } from '../../../redux/reducer/userSlice';
-import { PathName } from '../../../constants/pathName';
 import i18n from 'i18next';
 import CardEvent from '../../../components/Card/Common/Event';
 
@@ -113,7 +112,7 @@ function Users() {
       });
   };
   const handleSave = () => {
-    if (!showDialog) navigate(`${PathName.Dashboard}/${calendarId}${PathName.Events}`);
+    if (!showDialog) navigate(-1);
     else {
       setShowDialog(false);
       form
@@ -157,7 +156,7 @@ function Users() {
                 };
                 dispatch(setUser(userDetails));
 
-                navigate(`${PathName.Dashboard}/${calendarId}${PathName.Events}`);
+                navigate(-1);
               }
             })
             .catch((error) => {

From 52ce04f230a195b39ad0c4a1d992f34ff503d2e7 Mon Sep 17 00:00:00 2001
From: Abhishek P Anil <abhishek@culturecreates.com>
Date: Mon, 24 Jul 2023 11:48:02 +0530
Subject: [PATCH 3/3] fix: for the page navigation in user profile page

---
 src/components/Sidebar/Main/Sidebar.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Sidebar/Main/Sidebar.jsx b/src/components/Sidebar/Main/Sidebar.jsx
index a461c7789..09403917f 100644
--- a/src/components/Sidebar/Main/Sidebar.jsx
+++ b/src/components/Sidebar/Main/Sidebar.jsx
@@ -61,7 +61,7 @@ function Sidebar(props) {
     items?.forEach((item) => {
       if (location.pathname?.includes(item?.path)) setSelectedKey([item?.key]);
     });
-  }, []);
+  }, [location]);
 
   useEffect(() => {
     const calendarLabel = contentLanguageBilingual({