Merge pull request #449 from culturecreates/feature/issue-420

Feature/issue 420
culturecreates · Jul 24, 2023 · b5dce7f · b5dce7f
2 parents 0f5a132 + 52ce04f
commit b5dce7f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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/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({

diff --git 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 {

diff --git 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) => {