diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js index b8af9bf..ba935e6 100644 --- a/src/components/Navbar/index.js +++ b/src/components/Navbar/index.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { Link, useNavigate } from "react-router-dom"; +import { Link, useNavigate, NavLink } from "react-router-dom"; import { connect } from "react-redux"; import { userProduct, userFavorite } from "../../redux/actions"; import location from "../../utils/location"; @@ -99,7 +99,6 @@ function Navbar({ /> )} - {!title && back ? ( {pages.map((page, index) => (
  • - ({ + color: isActive ? "rgb(19, 123, 79)" : "#202020", + fontWeight: isActive ? "700" : "200", + })} > {page.name} - +
  • ))} diff --git a/src/views/Auth/SignUp/index.js b/src/views/Auth/SignUp/index.js index 408b0d1..4d5c8d1 100644 --- a/src/views/Auth/SignUp/index.js +++ b/src/views/Auth/SignUp/index.js @@ -23,6 +23,7 @@ function SignUp({ loading, level, setLevel, + isMobile, }) { const [signUpFields, setSignUpFiels] = useState({}); const [error, setError] = useState(""); @@ -105,18 +106,21 @@ function SignUp({ } }; - const numberInput = useRef(); - useEffect(() => { // numberInput.current.focus(); setHeaderOptions(headerOptions); }, []); useEffect(() => { - if (signUpFields?.otp?.length === 4) { + if ( + signUpFields?.otp1 && + signUpFields?.otp2 && + signUpFields?.otp3 && + signUpFields?.otp4 + ) { sendOtp({ cellphone: signUpFields?.cellphone, - otp: signUpFields?.otp, + otp: signUpFields?.otp1 + signUpFields?.otp2 + signUpFields?.otp3 + signUpFields?.otp4, userToken: "2", applicationToken: "22", }); @@ -137,8 +141,6 @@ function SignUp({ } }, [loginFlag]); - const light = theme === "light"; - return (
    - -

    + +

    {window.t("سلام به ")} {window.t(" دانوین خوش ")} @@ -168,7 +170,7 @@ function SignUp({

    -

    +

    {window.t( " لطفا جهت ورود یا ثبت نام شماره همراه خود را وارد نمایید." )} @@ -198,7 +200,7 @@ function SignUp({

    @@ -218,13 +220,13 @@ function SignUp({
    -
    +
    ({ loginFlag: state.user.status, loading: state.user.loading, + isMobile: state.publicApi.isMobile, }); const mapDispatchToProps = {