Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 79dcd0f2b5 | |||
| 47b25f3dfe | |||
| 89925a6af9 | |||
| 3c0f951b6e | |||
| ffbfb1da35 | |||
| ab191b6a72 |
@@ -87,4 +87,7 @@ REACT_APP_MAX_FAMILY_MEMBERS=8
|
|||||||
REACT_APP_SHOW_OFFER_GROUP_JOB=0
|
REACT_APP_SHOW_OFFER_GROUP_JOB=0
|
||||||
|
|
||||||
#UPLOAD PROFILE PICTURE
|
#UPLOAD PROFILE PICTURE
|
||||||
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
|
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
|
||||||
|
|
||||||
|
#GOOGLE RECAPTCHA SITEKEY
|
||||||
|
REACT_APP_GOOGLE_RECAPTCHA_SITEKEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
|
||||||
+4
-1
@@ -55,4 +55,7 @@ REACT_APP_MAX_FAMILY_MEMBERS=8
|
|||||||
REACT_APP_SHOW_OFFER_GROUP_JOB=0
|
REACT_APP_SHOW_OFFER_GROUP_JOB=0
|
||||||
|
|
||||||
#UPLOAD PROFILE PICTURE
|
#UPLOAD PROFILE PICTURE
|
||||||
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
|
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
|
||||||
|
|
||||||
|
#GOOGLE RECAPTCHA SITEKEY
|
||||||
|
REACT_APP_GOOGLE_RECAPTCHA_SITEKEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
|
||||||
@@ -62,3 +62,6 @@ REACT_APP_SHOW_OFFER_GROUP_JOB=0
|
|||||||
|
|
||||||
#UPLOAD PROFILE PICTURE
|
#UPLOAD PROFILE PICTURE
|
||||||
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
|
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
|
||||||
|
|
||||||
|
#GOOGLE RECAPTCHA SITEKEY
|
||||||
|
REACT_APP_GOOGLE_RECAPTCHA_SITEKEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
"react-chartjs-2": "^4.1.0",
|
"react-chartjs-2": "^4.1.0",
|
||||||
"react-countup": "^6.2.0",
|
"react-countup": "^6.2.0",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
|
"react-google-recaptcha": "^3.1.0",
|
||||||
"react-qr-code": "^2.0.11",
|
"react-qr-code": "^2.0.11",
|
||||||
"react-redux": "^8.0.5",
|
"react-redux": "^8.0.5",
|
||||||
"react-router-dom": "^6.0.2",
|
"react-router-dom": "^6.0.2",
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import AuthLayout from "../AuthLayout";
|
|||||||
import EmailValidator from "../../../lib/EmailValidator";
|
import EmailValidator from "../../../lib/EmailValidator";
|
||||||
import ForgetPwdResponse from "../ForgetPwdResponse";
|
import ForgetPwdResponse from "../ForgetPwdResponse";
|
||||||
|
|
||||||
|
import ReCAPTCHA from "react-google-recaptcha";
|
||||||
|
|
||||||
export default function ForgotPassword() {
|
export default function ForgotPassword() {
|
||||||
const [checked, setValue] = useState(false);
|
const [checked, setValue] = useState(false);
|
||||||
const [resetLoading, setResetLoading] = useState(false);
|
const [resetLoading, setResetLoading] = useState(false);
|
||||||
@@ -22,9 +24,18 @@ export default function ForgotPassword() {
|
|||||||
setMail(e?.target.value);
|
setMail(e?.target.value);
|
||||||
};
|
};
|
||||||
|
|
||||||
const humanChecker = () => {
|
// const humanChecker = () => {
|
||||||
setValue(!checked);
|
// setValue(!checked);
|
||||||
};
|
// };
|
||||||
|
|
||||||
|
function humanChecker(value) {
|
||||||
|
// console.log("Captcha value:", value);
|
||||||
|
if(value){
|
||||||
|
setValue(true)
|
||||||
|
}else{
|
||||||
|
setValue(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const resetHandler = async () => {
|
const resetHandler = async () => {
|
||||||
if (email == "") {
|
if (email == "") {
|
||||||
@@ -113,10 +124,16 @@ export default function ForgotPassword() {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{/* hCaptha clone for the time being */}
|
{/* hCaptha clone for the time being */}
|
||||||
<div className="mb-10">
|
<div className="mb-10 flex justify-center w-full">
|
||||||
|
<ReCAPTCHA
|
||||||
|
sitekey={process.env.REACT_APP_GOOGLE_RECAPTCHA_SITEKEY}
|
||||||
|
onChange={humanChecker}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{/* <div className="mb-10">
|
||||||
<div className="w-[303px] h-[78px] mx-auto overflow-hidden">
|
<div className="w-[303px] h-[78px] mx-auto overflow-hidden">
|
||||||
<div className="w-[300px] h-[74px] bg-white bottom-[1px] rounded border-gray-100 overflow-hidden cursor-pointer">
|
<div className="w-[300px] h-[74px] bg-white bottom-[1px] rounded border-gray-100 overflow-hidden cursor-pointer">
|
||||||
{/* Checkbox */}
|
|
||||||
<div className="h-full relative inline-block">
|
<div className="h-full relative inline-block">
|
||||||
<div className="relative table top-0 h-full">
|
<div className="relative table top-0 h-full">
|
||||||
<div className="table-cell align-middle">
|
<div className="table-cell align-middle">
|
||||||
@@ -148,18 +165,25 @@ export default function ForgotPassword() {
|
|||||||
<div className="h-full relative inline-block w-16"></div>
|
<div className="h-full relative inline-block w-16"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div> */}
|
||||||
{msgError && (
|
{msgError && (
|
||||||
<div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
|
<div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
|
||||||
{msgError}
|
{msgError}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="signin-area mb-3.5">
|
<div className="signin-area mb-3.5">
|
||||||
<div className="flex justify-center items-center gap-2">
|
<div className="flex justify-center items-center gap-4">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => navigate("/login")}
|
||||||
|
className={`rounded-full mb-6 text-[15px] font-semibold text-white hover:text-white flex justify-center bg-red-500 hover:bg-red-600 transition-all duration-300 items-center py-[0.8875rem] px-[1.8125rem] `}
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={resetHandler}
|
onClick={resetHandler}
|
||||||
className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
|
className={`rounded-full mb-6 text-[15px] font-semibold text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
|
||||||
>
|
>
|
||||||
{resetLoading ? (
|
{resetLoading ? (
|
||||||
<div className="signup btn-loader"></div>
|
<div className="signup btn-loader"></div>
|
||||||
@@ -167,13 +191,6 @@ export default function ForgotPassword() {
|
|||||||
<span>Send Code</span>
|
<span>Send Code</span>
|
||||||
)}
|
)}
|
||||||
</button>
|
</button>
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => navigate("/login")}
|
|
||||||
className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.8125rem] `}
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ export default function Login() {
|
|||||||
onClick={doLogin}
|
onClick={doLogin}
|
||||||
type="button"
|
type="button"
|
||||||
disabled={loginLoading}
|
disabled={loginLoading}
|
||||||
className={`btn-login rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
|
className={`btn-login rounded-full mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
|
||||||
>
|
>
|
||||||
{loginLoading ? (
|
{loginLoading ? (
|
||||||
<div className="signup btn-loader"></div>
|
<div className="signup btn-loader"></div>
|
||||||
@@ -433,7 +433,7 @@ export default function Login() {
|
|||||||
onClick={doLogin}
|
onClick={doLogin}
|
||||||
disabled={loginLoading}
|
disabled={loginLoading}
|
||||||
type="button"
|
type="button"
|
||||||
className={`btn-login rounded-[0.475rem] text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
|
className={`btn-login rounded-full text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
|
||||||
>
|
>
|
||||||
{loginLoading ? (
|
{loginLoading ? (
|
||||||
<div className="signup btn-loader"></div>
|
<div className="signup btn-loader"></div>
|
||||||
|
|||||||
@@ -325,7 +325,7 @@ export default function SignUp() {
|
|||||||
disabled={countries.loading}
|
disabled={countries.loading}
|
||||||
type="button"
|
type="button"
|
||||||
onClick={handleSignUp}
|
onClick={handleSignUp}
|
||||||
className={`rounded-[0.475rem] mb-6 text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
|
className={`rounded-full mb-6 text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
|
||||||
>
|
>
|
||||||
{signUpLoading ? (
|
{signUpLoading ? (
|
||||||
<div className="signup btn-loader"></div>
|
<div className="signup btn-loader"></div>
|
||||||
|
|||||||
Reference in New Issue
Block a user