From 2a3edcf3be0555db24d838435e657cd32c886561 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Tue, 9 Apr 2024 15:15:00 +0100
Subject: [PATCH 1/2] removed popout background corner color

---
 src/components/JobGroups/AddGroup.jsx     | 2 +-
 src/components/JobGroups/DeleteGroup.jsx  | 8 ++++----
 src/components/JobGroups/DeleteMember.jsx | 2 +-
 src/components/Partials/Layout.jsx        | 2 +-
 src/components/countdown/CustomTimer.jsx  | 6 ++++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/JobGroups/AddGroup.jsx b/src/components/JobGroups/AddGroup.jsx
index bd96fe0..10525de 100644
--- a/src/components/JobGroups/AddGroup.jsx
+++ b/src/components/JobGroups/AddGroup.jsx
@@ -88,7 +88,7 @@ export default function AddGroup({ action, situation, setUpdateList }) {
 
   return (
     <ModalCom action={action} situation={situation}>
-      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="modal-header-con">
           <h1 className="modal-title">
             Add Group
diff --git a/src/components/JobGroups/DeleteGroup.jsx b/src/components/JobGroups/DeleteGroup.jsx
index c07064b..b3993a9 100644
--- a/src/components/JobGroups/DeleteGroup.jsx
+++ b/src/components/JobGroups/DeleteGroup.jsx
@@ -20,14 +20,14 @@ export default function DeleteGroup({action, situation, details}) {
         action={action}
         situation={situation}
     >
-      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
             Delete Group
           </h1>
           <button
             type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
             onClick={action}
           >
             <svg
diff --git a/src/components/JobGroups/DeleteMember.jsx b/src/components/JobGroups/DeleteMember.jsx
index cff7288..c6b0491 100644
--- a/src/components/JobGroups/DeleteMember.jsx
+++ b/src/components/JobGroups/DeleteMember.jsx
@@ -20,7 +20,7 @@ export default function DeleteMember({action, situation, details}) {
         action={action}
         situation={situation}
     >
-      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="modal-header-con">
           <h1 className="modal-title">
             Remove Member
diff --git a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx
index 6dba967..1c08db1 100644
--- a/src/components/Partials/Layout.jsx
+++ b/src/components/Partials/Layout.jsx
@@ -67,7 +67,7 @@ export default function Layout({ children }) {
       </div>
       {logoutModal && (
         <ModalCom action={logoutModalHandler} situation={logoutModal}>
-          <div className="logout-modal-wrapper w-11/12 sm:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl">
+          <div className="logout-modal-wrapper w-11/12 sm:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
             <div className="modal-header-con">
               <h1 className="modal-title">
                 Confirm
diff --git a/src/components/countdown/CustomTimer.jsx b/src/components/countdown/CustomTimer.jsx
index a8b394b..a0a5bf3 100644
--- a/src/components/countdown/CustomTimer.jsx
+++ b/src/components/countdown/CustomTimer.jsx
@@ -6,12 +6,14 @@ export default function CustomTimer({className='text-emerald-500'}) {
 
     useEffect(()=>{
         const timer = setInterval(()=>{
-            setTime(prev => prev - 1)
+            if(time > 0 ){
+                setTime(prev => prev - 1)
+            }
         },1000)
         return ()=>{
             clearInterval(timer)
         }
-    },[])
+    },[time])
 
     let minutes = time == 0 ? 0 : Math.floor(time/60)
     let seconds = time == 0 ? 0 :time - (minutes * 60)

From e6bc18474785671bf9e1b444bd63f68ca4a656d4 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Tue, 9 Apr 2024 17:40:45 +0100
Subject: [PATCH 2/2] footer style added

---
 src/components/JobGroups/AddGroup.jsx     | 45 ++++++++++++-----------
 src/components/JobGroups/DeleteGroup.jsx  | 40 ++++++++++----------
 src/components/JobGroups/DeleteMember.jsx | 42 ++++++++++-----------
 3 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/src/components/JobGroups/AddGroup.jsx b/src/components/JobGroups/AddGroup.jsx
index 10525de..c6f5379 100644
--- a/src/components/JobGroups/AddGroup.jsx
+++ b/src/components/JobGroups/AddGroup.jsx
@@ -135,28 +135,6 @@ export default function AddGroup({ action, situation, setUpdateList }) {
               />
             </div>
           </div>
-          <div className="w-full flex justify-between items-center gap-4">
-            <button
-              onClick={action}
-              type="button"
-              className="w-[152px] h-[46px] flex justify-center items-center rounded-full text-base text-light-red tracking-wide border border-light-red"
-            >
-              <span className="">
-                Cancel
-              </span>
-            </button>
-            {requestStatus.loading ? (
-              <LoadingSpinner size="8" color="sky-blue" />
-            ) : (
-              <button
-                onClick={() => addGroup()}
-                type="button"
-                className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-              >
-                Add Group
-              </button>
-            )}
-          </div>
 
           {/* ERROR DISPLAY AND SUBMIT BUTTON */}
           {requestStatus.message != "" &&
@@ -177,6 +155,29 @@ export default function AddGroup({ action, situation, setUpdateList }) {
             ))}
           {/* End of error or success display */}
         </div>
+
+        <div className="modal-footer-wrapper">
+            <button
+              onClick={action}
+              type="button"
+              className="custom-btn text-light-red border border-light-red"
+            >
+              <span className="">
+                Cancel
+              </span>
+            </button>
+            {requestStatus.loading ? (
+              <LoadingSpinner size="8" color="sky-blue" />
+            ) : (
+              <button
+                onClick={() => addGroup()}
+                type="button"
+                className="custom-btn btn-gradient text-white"
+              >
+                Add Group
+              </button>
+            )}
+          </div>
       </div>
     </ModalCom>
   );
diff --git a/src/components/JobGroups/DeleteGroup.jsx b/src/components/JobGroups/DeleteGroup.jsx
index b3993a9..8112b15 100644
--- a/src/components/JobGroups/DeleteGroup.jsx
+++ b/src/components/JobGroups/DeleteGroup.jsx
@@ -76,26 +76,6 @@ export default function DeleteGroup({action, situation, details}) {
               Are you sure, you want to delete <br /> <span>'{details?.group_name}'</span> group?
             </p>
           </div>
-          <div className="flex space-x-2.5">
-            <button
-              onClick={action}
-              type="button"
-              className=" border-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-            >
-              <span className="text-gradient">Cancel</span>
-            </button>
-            {requestStatus.laoding ? (
-              <LoadingSpinner size="8" color="sky-blue" />
-            ) : (
-              <button
-                onClick={() => deleteGroup()}
-                type="button"
-                className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-              >
-                Confirm Delete
-              </button>
-            )}
-          </div>
 
           {/* ERROR DISPLAY AND SUBMIT BUTTON */}
           {requestStatus.message != "" &&
@@ -116,6 +96,26 @@ export default function DeleteGroup({action, situation, details}) {
             ))}
           {/* End of error or success display */}
         </div>
+        <div className="modal-footer-wrapper">
+            <button
+              onClick={action}
+              type="button"
+              className="custom-btn border-gradient"
+            >
+              <span className="text-gradient">Cancel</span>
+            </button>
+            {requestStatus.laoding ? (
+              <LoadingSpinner size="8" color="sky-blue" />
+            ) : (
+              <button
+                onClick={() => deleteGroup()}
+                type="button"
+                className="custom-btn primary-gradient text-white"
+              >
+                Confirm Delete
+              </button>
+            )}
+          </div>
       </div>
     </ModalCom>
   )
diff --git a/src/components/JobGroups/DeleteMember.jsx b/src/components/JobGroups/DeleteMember.jsx
index c6b0491..f99ea25 100644
--- a/src/components/JobGroups/DeleteMember.jsx
+++ b/src/components/JobGroups/DeleteMember.jsx
@@ -76,26 +76,6 @@ export default function DeleteMember({action, situation, details}) {
               Are you sure, you want to remove <br /> <span>'{details?.firstname} {details.lastname}'</span>
             </p>
           </div>
-          <div className="flex space-x-2.5">
-            <button
-              onClick={action}
-              type="button"
-              className=" border-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-            >
-              <span className="text-gradient">Cancel</span>
-            </button>
-            {requestStatus.laoding ? (
-              <LoadingSpinner size="8" color="sky-blue" />
-            ) : (
-              <button
-                onClick={() => deleteMember()}
-                type="button"
-                className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-              >
-                Remove
-              </button>
-            )}
-          </div>
 
           {/* ERROR DISPLAY AND SUBMIT BUTTON */}
           {requestStatus.message != "" &&
@@ -115,7 +95,27 @@ export default function DeleteMember({action, situation, details}) {
               )
             ))}
           {/* End of error or success display */}
-        </div>
+        </div>          
+        <div className="modal-footer-wrapper">
+            <button
+              onClick={action}
+              type="button"
+              className="custom-btn border-gradient"
+            >
+              <span className="text-gradient">Cancel</span>
+            </button>
+            {requestStatus.laoding ? (
+              <LoadingSpinner size="8" color="sky-blue" />
+            ) : (
+              <button
+                onClick={() => deleteMember()}
+                type="button"
+                className="custom-btn primary-gradient text-white"
+              >
+                Remove
+              </button>
+            )}
+          </div>
       </div>
     </ModalCom>
   )