From 3b170615e044328789492f1dac394c478ff1e7c2 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 16 Jul 2023 11:29:24 +0330 Subject: [PATCH] notification handling for register and login in navy and welfare --- src/components/login-navy/SendToken.jsx | 4 +++- src/components/login-welfare-services/SendUserData.jsx | 6 ++++-- src/components/login-welfare-services/sendToken.jsx | 2 ++ src/components/register-navy/SendToken.jsx | 4 +++- src/components/register-navy/SendUserData.jsx | 4 ++++ .../register-welfare-services/SendUserData.jsx | 5 +++++ src/components/register-welfare-services/sendToken.jsx | 9 ++++++--- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/components/login-navy/SendToken.jsx b/src/components/login-navy/SendToken.jsx index d7fb84b..b274224 100644 --- a/src/components/login-navy/SendToken.jsx +++ b/src/components/login-navy/SendToken.jsx @@ -1,4 +1,4 @@ -// import Notifications from "@/core/components/notifications"; +import Notifications from "@/core/components/notifications"; import StyledForm from "@/core/components/StyledForm"; import { LOGIN } from "@/core/data/apiRoutes"; import CenterLayout from "@/layouts/CenterLayout"; @@ -38,12 +38,14 @@ const SendToken = ({ PhoneNumber }) => { }); const handleSubmit = async (values, props) => { + Notifications(directionApp, t, undefined); await axios .post(LOGIN, { phone_number: values.phone_number, verification_code: values.verification_code, }) .then(function (response) { + Notifications(directionApp, t, response); setToken(response.data.token); }) .catch(function (error) { diff --git a/src/components/login-welfare-services/SendUserData.jsx b/src/components/login-welfare-services/SendUserData.jsx index ec8072f..0a8280b 100644 --- a/src/components/login-welfare-services/SendUserData.jsx +++ b/src/components/login-welfare-services/SendUserData.jsx @@ -1,4 +1,4 @@ -// import Notifications from "@/core/components/notifications"; +import Notifications from "@/core/components/notifications"; import LinkRouting from "@/core/components/LinkRouting"; import StyledForm from "@/core/components/StyledForm"; import { LOGIN_SEND_OTP_TOKEN } from "@/core/data/apiRoutes"; @@ -39,16 +39,18 @@ const SendUserData = ({ setOtpToken, setPhoneNumber }) => { }); const handleSubmit = async (values, props) => { + Notifications(directionApp, t, undefined); await axios .post(LOGIN_SEND_OTP_TOKEN, { phone_number: values.phone_number, }) .then(function (response) { + Notifications(directionApp, t, response); setPhoneNumber(values.phone_number); setOtpToken(true); }) .catch(function (error) { - // Notifications(directionApp, error.response, t); + Notifications(directionApp, error.response, t); props.setSubmitting(false); }); }; diff --git a/src/components/login-welfare-services/sendToken.jsx b/src/components/login-welfare-services/sendToken.jsx index 00414b7..2ddefe2 100644 --- a/src/components/login-welfare-services/sendToken.jsx +++ b/src/components/login-welfare-services/sendToken.jsx @@ -38,12 +38,14 @@ const SendToken = ({ PhoneNumber }) => { }); const handleSubmit = async (values, props) => { + Notifications(directionApp, t, undefined); await axios .post(LOGIN, { phone_number: values.phone_number, verification_code: values.verification_code, }) .then(function (response) { + Notifications(directionApp, t, response); setToken(response.data.token); }) .catch(function (error) { diff --git a/src/components/register-navy/SendToken.jsx b/src/components/register-navy/SendToken.jsx index ab8a4ba..45d3606 100644 --- a/src/components/register-navy/SendToken.jsx +++ b/src/components/register-navy/SendToken.jsx @@ -37,6 +37,7 @@ const SendToken = ({ PhoneNumber, nationalId, navganId, typeId }) => { }); const handleSubmit = async (values, props) => { + Notifications(directionApp, t, undefined); await axios .post(REGISTER, { phone_number: values.phone_number, @@ -46,10 +47,11 @@ const SendToken = ({ PhoneNumber, nationalId, navganId, typeId }) => { verification_code: values.verification_code, }) .then(function (response) { + Notifications(directionApp, t, response); setToken(response.data.token); }) .catch(function (error) { - // Notifications(directionApp, error.response, t); + Notifications(directionApp, error.response, t); props.setSubmitting(false); }); }; diff --git a/src/components/register-navy/SendUserData.jsx b/src/components/register-navy/SendUserData.jsx index 8766d44..ff7431e 100644 --- a/src/components/register-navy/SendUserData.jsx +++ b/src/components/register-navy/SendUserData.jsx @@ -1,4 +1,5 @@ import LinkRouting from "@/core/components/LinkRouting"; +import Notifications from "@/core/components/notifications"; import StyledForm from "@/core/components/StyledForm"; import { REGISTER_SEND_OTP_TOKEN } from "@/core/data/apiRoutes"; import CenterLayout from "@/layouts/CenterLayout"; @@ -26,6 +27,7 @@ const SendUserData = ({ setTypeId, }) => { const t = useTranslations(); + const { directionApp } = useDirection(); const searchParams = useSearchParams(); const backUrlDecodedPath = searchParams.get("back_url"); @@ -47,6 +49,7 @@ const SendUserData = ({ }); const handleSubmit = async (values, props) => { + Notifications(directionApp, t, undefined); await axios .post(REGISTER_SEND_OTP_TOKEN, { type_id: values.type_id, @@ -55,6 +58,7 @@ const SendUserData = ({ phone_number: values.phone_number, }) .then(function (response) { + Notifications(directionApp, t, response); setPhoneNumber(values.phone_number); setNationalId(values.national_id); setNavganId(values.navgan_id); diff --git a/src/components/register-welfare-services/SendUserData.jsx b/src/components/register-welfare-services/SendUserData.jsx index ddf4933..b579131 100644 --- a/src/components/register-welfare-services/SendUserData.jsx +++ b/src/components/register-welfare-services/SendUserData.jsx @@ -1,8 +1,10 @@ import LinkRouting from "@/core/components/LinkRouting"; +import Notifications from "@/core/components/notifications"; import StyledForm from "@/core/components/StyledForm"; import { REGISTER_SEND_OTP_TOKEN } from "@/core/data/apiRoutes"; import CenterLayout from "@/layouts/CenterLayout"; import FullPageLayout from "@/layouts/FullPageLayout"; +import useDirection from "@/lib/app/hooks/useDirection"; import FingerprintIcon from "@mui/icons-material/Fingerprint"; import { Box, @@ -27,6 +29,7 @@ const SendUserData = ({ setTypeId, }) => { const t = useTranslations(); + const { directionApp } = useDirection(); const searchParams = useSearchParams(); const backUrlDecodedPath = searchParams.get("back_url"); @@ -46,6 +49,7 @@ const SendUserData = ({ }); const handleSubmit = async (values, props) => { + Notifications(directionApp, t, undefined); await axios .post(REGISTER_SEND_OTP_TOKEN, { type_id: values.type_id, @@ -53,6 +57,7 @@ const SendUserData = ({ phone_number: values.phone_number, }) .then(function (response) { + Notifications(directionApp, t, response); setPhoneNumber(values.phone_number); setNationalId(values.national_id); setTypeId(values.type_id); diff --git a/src/components/register-welfare-services/sendToken.jsx b/src/components/register-welfare-services/sendToken.jsx index 3fa7f1c..02431cc 100644 --- a/src/components/register-welfare-services/sendToken.jsx +++ b/src/components/register-welfare-services/sendToken.jsx @@ -1,8 +1,9 @@ +import Notifications from "@/core/components/notifications"; import StyledForm from "@/core/components/StyledForm"; import { REGISTER } from "@/core/data/apiRoutes"; import CenterLayout from "@/layouts/CenterLayout"; import FullPageLayout from "@/layouts/FullPageLayout"; -// import useDirection from "@/lib/app/hooks/useDirection"; +import useDirection from "@/lib/app/hooks/useDirection"; import useUser from "@/lib/app/hooks/useUser"; import LoginIcon from "@mui/icons-material/Login"; import { @@ -22,7 +23,7 @@ import * as Yup from "yup"; const SendToken = ({ PhoneNumber, nationalId, typeId }) => { const t = useTranslations(); - // const { directionApp } = useDirection(); + const { directionApp } = useDirection(); const { setToken } = useUser(); const initialValues = { @@ -38,6 +39,7 @@ const SendToken = ({ PhoneNumber, nationalId, typeId }) => { }); const handleSubmit = async (values, props) => { + Notifications(directionApp, t, undefined); await axios .post(REGISTER, { phone_number: values.phone_number, @@ -46,10 +48,11 @@ const SendToken = ({ PhoneNumber, nationalId, typeId }) => { verification_code: values.verification_code, }) .then(function (response) { + Notifications(directionApp, t, response); setToken(response.data.token); }) .catch(function (error) { - // Notifications(directionApp, error.response, t); + Notifications(directionApp, error.response, t); props.setSubmitting(false); }); };