From 9170d35652d7817085d79ae2c082c4e941071d42 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Sun, 20 Apr 2025 15:50:19 +0530 Subject: [PATCH 1/5] Added tooltip --- src/components/master/CreateActivity.jsx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/master/CreateActivity.jsx b/src/components/master/CreateActivity.jsx index b7d2c862..8ccd3404 100644 --- a/src/components/master/CreateActivity.jsx +++ b/src/components/master/CreateActivity.jsx @@ -111,6 +111,14 @@ const CreateActivity = ({ onClose }) => { reset(); onClose(); }; + + + + // for tooltip + useEffect(() => { + const tooltipTriggerList = Array.from(document.querySelectorAll('[data-bs-toggle="tooltip"]')); + tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el)); + }, [checklistItems]); return (
Create Activity
@@ -197,7 +205,9 @@ const CreateActivity = ({ onClose }) => { onClick={() => removeChecklistItem(index)} className="btn btn-xs btn-icon btn-text-secondary" > - + @@ -210,7 +220,9 @@ const CreateActivity = ({ onClose }) => { className="btn btn-xs btn-primary mt-2" onClick={addChecklistItem} > - + -- 2.43.0 From 4ffab89aac3cab42fdfb9e90838490b9899ee01c Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Sun, 20 Apr 2025 15:50:30 +0530 Subject: [PATCH 2/5] added tooltip --- src/components/master/EditActivity.jsx | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/master/EditActivity.jsx b/src/components/master/EditActivity.jsx index ea1cd364..bccdbd2f 100644 --- a/src/components/master/EditActivity.jsx +++ b/src/components/master/EditActivity.jsx @@ -123,6 +123,13 @@ const UpdateActivity = ({ activityData, onClose }) => { remove(index); }; + + // for tooltip + useEffect(() => { + const tooltipTriggerList = Array.from(document.querySelectorAll('[data-bs-toggle="tooltip"]')); + tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el)); + }, []); + return (
Update Activity
@@ -206,9 +213,12 @@ const UpdateActivity = ({ activityData, onClose }) => { @@ -223,7 +233,9 @@ const UpdateActivity = ({ activityData, onClose }) => { className="btn btn-xs btn-primary mt-2" onClick={addChecklistItem} > - + -- 2.43.0 From e46a94dd1aed0ae33213da0be80da2e458c64f6c Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Sun, 20 Apr 2025 15:51:17 +0530 Subject: [PATCH 3/5] modified model size for application role --- src/components/master/MasterModal.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx index 3a2dd4ae..38c5f589 100644 --- a/src/components/master/MasterModal.jsx +++ b/src/components/master/MasterModal.jsx @@ -19,9 +19,12 @@ const MasterModal = ({ modaldata, closeModal }) => { aria-labelledby="modalToggleLabel" >
-- 2.43.0 From dc21e578de5a23bf168b1f3fd02f73dc0d106648 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Sun, 20 Apr 2025 15:54:39 +0530 Subject: [PATCH 4/5] Replaced the btn class with input-group-text because broken click even in classt input-group --- src/pages/authentication/LoginPage.jsx | 31 +++++++++-------- .../authentication/ResetPasswordPage.jsx | 34 +++++++++++++------ 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx index 0952f022..84b46aeb 100644 --- a/src/pages/authentication/LoginPage.jsx +++ b/src/pages/authentication/LoginPage.jsx @@ -88,7 +88,6 @@ const LoginPage = () => { -
{ placeholder="············" aria-describedby="password" /> - setHidepass(!hidepass)} + style={{ + borderTopLeftRadius: 0, + borderBottomLeftRadius: 0, + borderLeft: 0, + }} > {hidepass ? ( - + ) : ( - + )} - +
{errors.password && (
{ name="rememberMe" {...register("rememberMe")} /> - +
- Forgot Password? - + aria-label="Go to Forgot Password Page" + to="/auth/forgot-password" + > + Forgot Password? +
{errors.password && (
{ placeholder="············" aria-describedby="password" /> - setHidepass1(!hidepass1)} + style={{ + borderTopLeftRadius: 0, + borderBottomLeftRadius: 0, + borderLeft: 0, + + }} > {hidepass1 ? ( - + ) : ( - + )} - +
{errors.confirmPassword && (
Date: Sun, 20 Apr 2025 16:04:04 +0530 Subject: [PATCH 5/5] removed unnecessary code --- src/components/master/CreateActivity.jsx | 2 +- src/components/master/MasterModal.jsx | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/components/master/CreateActivity.jsx b/src/components/master/CreateActivity.jsx index 8ccd3404..2970d0c1 100644 --- a/src/components/master/CreateActivity.jsx +++ b/src/components/master/CreateActivity.jsx @@ -118,7 +118,7 @@ const CreateActivity = ({ onClose }) => { useEffect(() => { const tooltipTriggerList = Array.from(document.querySelectorAll('[data-bs-toggle="tooltip"]')); tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el)); - }, [checklistItems]); + }, []); return (
Create Activity
diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx index 38c5f589..dbc8bbee 100644 --- a/src/components/master/MasterModal.jsx +++ b/src/components/master/MasterModal.jsx @@ -19,12 +19,13 @@ const MasterModal = ({ modaldata, closeModal }) => { aria-labelledby="modalToggleLabel" >
@@ -55,10 +56,13 @@ const MasterModal = ({ modaldata, closeModal }) => { )} {modaldata?.modalType === "Activity" && ( - ) - } - {modaldata?.modalType === 'Edit-Activity' && ( - + + )} + {modaldata?.modalType === "Edit-Activity" && ( + )}
-- 2.43.0