From b1786ec16ab3c634482388511b5dbe24e5d72b90 Mon Sep 17 00:00:00 2001
From: prafull-opensignlabs <prafull.navkar@nxglabs.com>
Date: Wed, 15 May 2024 20:03:30 +0530
Subject: [PATCH] feat: move forget password button in login box

---
 apps/OpenSign/src/pages/ForgetPassword.js |  2 +-
 apps/OpenSign/src/pages/Login.js          | 34 ++++++-----------------
 apps/OpenSign/src/pages/Signup.js         | 32 ++++++++++++++++++---
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/apps/OpenSign/src/pages/ForgetPassword.js b/apps/OpenSign/src/pages/ForgetPassword.js
index 22721b7e3..53e048387 100644
--- a/apps/OpenSign/src/pages/ForgetPassword.js
+++ b/apps/OpenSign/src/pages/ForgetPassword.js
@@ -108,7 +108,7 @@ function ForgotPassword() {
                   </button>
                   <NavLink
                     to="/"
-                    className="rounded-sm bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] px-4 py-3 text-xs font-semibold shadow uppercase"
+                    className="rounded-sm bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] px-4 py-3 text-xs font-semibold shadow uppercase cursor-pointer"
                   >
                     Login
                   </NavLink>
diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.js
index a2e4b401c..5d2886564 100644
--- a/apps/OpenSign/src/pages/Login.js
+++ b/apps/OpenSign/src/pages/Login.js
@@ -1136,34 +1136,16 @@ function Login() {
                               )}
                             </span>
                           </div>
+                          <div className="relative mt-1">
+                            <NavLink
+                              to="/forgetpassword"
+                              className="text-[13px] text-[#002864] hover:underline underline-offset-1 focus:outline-none cursor-pointer ml-1"
+                            >
+                              Forgot Password?
+                            </NavLink>
+                          </div>
                         </div>
                       </fieldset>
-                      <div className="flex flex-row justify-between items-center ml-4 py-2">
-                        <div>
-                          <label
-                            className="form-check-label inline-block cursor-pointer"
-                            htmlFor="rememberpassword"
-                          >
-                            <input
-                              type="checkbox"
-                              className="form-check-input mr-1"
-                              value=""
-                              id="rememberpassword"
-                            />
-                            <span className="text-[13px]">
-                              Remember Password
-                            </span>
-                          </label>
-                        </div>
-                        <div>
-                          <NavLink
-                            to="/forgetpassword"
-                            className="text-[13px] underline focus:outline-none focus:ring-2 focus:ring-blue-600"
-                          >
-                            Forgot Password ?
-                          </NavLink>
-                        </div>
-                      </div>
                       <div className="flex flex-col md:flex-row justify-between items-stretch gap-8 text-center text-xs font-bold mt-2">
                         <button
                           type="submit"
diff --git a/apps/OpenSign/src/pages/Signup.js b/apps/OpenSign/src/pages/Signup.js
index ec8f8461a..673bdea3a 100644
--- a/apps/OpenSign/src/pages/Signup.js
+++ b/apps/OpenSign/src/pages/Signup.js
@@ -11,7 +11,7 @@ import { useDispatch } from "react-redux";
 import { fetchAppInfo } from "../redux/reducers/infoReducer";
 import { showTenant } from "../redux/reducers/ShowTenant";
 import { isEnableSubscription } from "../constant/const";
-import { getAppLogo } from "../constant/Utils";
+import { getAppLogo, openInNewTab } from "../constant/Utils";
 const Signup = () => {
   const { width } = useWindowSize();
   const navigate = useNavigate();
@@ -33,7 +33,7 @@ const Signup = () => {
   const [lengthValid, setLengthValid] = useState(false);
   const [caseDigitValid, setCaseDigitValid] = useState(false);
   const [specialCharValid, setSpecialCharValid] = useState(false);
-
+  const [isAuthorize, setIsAuthorize] = useState(false);
   const togglePasswordVisibility = () => setShowPassword(!showPassword);
 
   const clearStorage = async () => {
@@ -658,10 +658,34 @@ const Signup = () => {
                             {specialCharValid ? "✓" : "✗"} Password should
                             contain special character
                           </p>
-                          {/* </>
-                          )} */}
                         </div>
                       )}
+                      <div className="mt-2.5 ml-1 flex flex-row items-center">
+                        <input
+                          type="checkbox"
+                          id="termsandcondition"
+                          checked={isAuthorize}
+                          onChange={(e) => setIsAuthorize(e.target.checked)}
+                          required
+                        />
+                        <label
+                          className="text-xs cursor-pointer ml-1 mb-0"
+                          htmlFor="termsandcondition"
+                        >
+                          I agree to the
+                        </label>
+                        <span
+                          className="underline cursor-pointer ml-1"
+                          onClick={() =>
+                            openInNewTab(
+                              "https://www.opensignlabs.com/terms-and-conditions"
+                            )
+                          }
+                        >
+                          Terms of Service
+                        </span>
+                        <span>.</span>
+                      </div>
                     </div>
                   </div>
                   <div className="flex flex-col md:flex-row justify-between items-stretch gap-8 text-center text-xs font-bold mt-2">