From 8f9f0091eae723a90eb71208c853e1bb3ddb7718 Mon Sep 17 00:00:00 2001
From: Vikas Nale <vikas@marcoaiot.com>
Date: Fri, 4 Jul 2025 13:24:47 +0530
Subject: [PATCH] modify change password UI

---
 src/pages/authentication/ChangePassword.jsx | 169 +++++++++-----------
 1 file changed, 75 insertions(+), 94 deletions(-)

diff --git a/src/pages/authentication/ChangePassword.jsx b/src/pages/authentication/ChangePassword.jsx
index 753340e4..5191d6c3 100644
--- a/src/pages/authentication/ChangePassword.jsx
+++ b/src/pages/authentication/ChangePassword.jsx
@@ -52,7 +52,6 @@ const ChangePasswordPage = ({ onClose }) => {
         oldPassword: data.oldPassword,
         newPassword: data.newPassword,
       };
-      console.log(formData);
       setLoading(true);
       await AuthRepository.changepassword(formData);
       showToast("Your Password changed Successfully", "success");
@@ -72,23 +71,20 @@ const ChangePasswordPage = ({ onClose }) => {
       role="dialog"
       style={{ display: "flex", backgroundColor: "rgba(0,0,0,0.5)" }}
     >
-      <div
-        className="modal-dialog"
-        role="document"
-        style={{
-          maxWidth: "600px",
-          width: "100%",
-        }}
-      >
-        <div className="modal-content p-4 rounded shadow bg-white position-relative">
-          {/* Close Button */}
+      <div className="modal-dialog" role="document">
+        <div className="modal-header">
+          {" "}
           <button
             type="button"
-            className="btn-close position-absolute"
-            style={{ top: "30px", right: "25px" }}
+            class="btn-close"
+            data-bs-dismiss="modal"
+            style={{ top: "40px", right: "15px" }}
             aria-label="Close"
-            onClick={onClose}
           ></button>
+        </div>
+
+        <div className="modal-content p-10 rounded shadow bg-white position-relative">
+          {/* Close Button */}
 
           <h5 className="mb-2">Change Password</h5>
           <p className="mb-4" style={{ fontSize: "14px" }}>
@@ -97,7 +93,7 @@ const ChangePasswordPage = ({ onClose }) => {
 
           <form onSubmit={handleSubmit(onChangePassword)}>
             {/* Old Password */}
-            <div className="mb-3">
+            <div className="mb-3 text-start">
               <label className="form-label">Old Password</label>
               <div className="input-group input-group-merge d-flex align-items-center border rounded px-2">
                 <input
@@ -123,75 +119,75 @@ const ChangePasswordPage = ({ onClose }) => {
               )}
             </div>
 
-            <div className="row">
-              <div className="mb-3 col-md-6">
-                <label className="form-label">New Password</label>
-                <div className="input-group input-group-merge d-flex align-items-center border rounded px-2">
-                  <input
-                    type={hideNewPass ? "password" : "text"}
-                    className="form-control form-control-sm border-0 shadow-none"
-                    {...register("newPassword")}
-                    placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
-                    style={{ flex: 1 }}
-                  />
-                  <button
-                    type="button"
-                    className="btn btn-link p-0 ms-2"
-                    style={{ fontSize: "18px", color: "#6c757d" }}
-                    onClick={() => setHideNewPass(!hideNewPass)}
-                  >
-                    <i
-                      className={`bx ${hideNewPass ? "bx-hide" : "bx-show"}`}
-                    />
-                  </button>
-                </div>
-                {errors.newPassword && (
-                  <div
-                    className="danger-text text-start"
-                    style={{ fontSize: "12px" }}
-                  >
-                    {errors.newPassword.message}
-                  </div>
-                )}
+            {/* <div className="row"> */}
+            <div className="mb-3 text-start">
+              <label className="form-label">New Password</label>
+              <div className="input-group input-group-merge d-flex align-items-center border rounded px-2">
+                <input
+                  type={hideNewPass ? "password" : "text"}
+                  className="form-control form-control-sm border-0 shadow-none"
+                  {...register("newPassword")}
+                  placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
+                  style={{ flex: 1 }}
+                />
+                <button
+                  type="button"
+                  className="btn btn-link p-0 ms-2"
+                  style={{ fontSize: "18px", color: "#6c757d" }}
+                  onClick={() => setHideNewPass(!hideNewPass)}
+                >
+                  <i className={`bx ${hideNewPass ? "bx-hide" : "bx-show"}`} />
+                </button>
               </div>
-
-              {/* Confirm Password */}
-              <div className="mb-3 col-md-6">
-                <label className="form-label">Confirm New Password</label>
-                <div className="input-group input-group-merge d-flex align-items-center border rounded px-2">
-                  <input
-                    type={hideConfirmPass ? "password" : "text"}
-                    className="form-control form-control-sm border-0 shadow-none"
-                    {...register("confirmPassword")}
-                    placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
-                    style={{ flex: 1 }}
-                  />
-                  <button
-                    type="button"
-                    className="btn btn-link p-0 ms-2"
-                    style={{ fontSize: "18px", color: "#6c757d" }}
-                    onClick={() => setHideConfirmPass(!hideConfirmPass)}
-                  >
-                    <i
-                      className={`bx ${
-                        hideConfirmPass ? "bx-hide" : "bx-show"
-                      }`}
-                    />
-                  </button>
+              {errors.newPassword && (
+                <div
+                  className="danger-text text-start"
+                  style={{ fontSize: "12px" }}
+                >
+                  {errors.newPassword.message}
                 </div>
-                {errors.confirmPassword && (
-                  <div
-                    className="danger-text text-start"
-                    style={{ fontSize: "12px" }}
-                  >
-                    {errors.confirmPassword.message}
-                  </div>
-                )}
-              </div>
+              )}
             </div>
 
+            {/* Confirm Password */}
+            <div className="mb-3 text-start">
+              <label className="form-label">Confirm New Password</label>
+              <div className="input-group input-group-merge d-flex align-items-center border rounded px-2">
+                <input
+                  type={hideConfirmPass ? "password" : "text"}
+                  className="form-control form-control-sm border-0 shadow-none"
+                  {...register("confirmPassword")}
+                  placeholder="&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;&#xb7;"
+                  style={{ flex: 1 }}
+                />
+                <button
+                  type="button"
+                  className="btn btn-link p-0 ms-2"
+                  style={{ fontSize: "18px", color: "#6c757d" }}
+                  onClick={() => setHideConfirmPass(!hideConfirmPass)}
+                >
+                  <i
+                    className={`bx ${hideConfirmPass ? "bx-hide" : "bx-show"}`}
+                  />
+                </button>
+              </div>
+              {errors.confirmPassword && (
+                <div
+                  className="danger-text text-start"
+                  style={{ fontSize: "12px" }}
+                >
+                  {errors.confirmPassword.message}
+                </div>
+              )}
+            </div>
+            {/* </div> */}
+            <div className="d-flex justify-content-center  pt-2">
+              Your password must have at least 8 characters and include a lower
+              case latter, an uppercase letter, a number, and a special
+              character.
+            </div>
             {/* Action Buttons */}
-            <div className="d-flex justify-content-end  pt-2">
+            <div className="d-flex justify-content-center  pt-2">
               <button
                 type="submit"
                 className="btn btn-primary btn-sm me-2"
@@ -208,21 +204,6 @@ const ChangePasswordPage = ({ onClose }) => {
                 Cancel
               </button>
             </div>
-            <div className="mb-3 text-start ">
-              <p className="p-0 m-0">Password must be:</p>
-              <p className="p-0 m-0">- at least 8 characters long</p>
-              <p className="p-0 m-0">
-                - must contain one uppercase, one lowercase letter, at least one
-                number, at least one special character
-              </p>
-              {/* <p className="p-0 m-0">
-                - must contain at least one lowercase letter
-              </p>
-              <p className="p-0 m-0">- must contain at least one number</p>
-              <p className="p-0 m-0">
-                - must contain at least one special character
-              </p> */}
-            </div>
           </form>
         </div>
       </div>