-
Восстановить с помощью
-
-
Номера телефона
-
Электронной почты
+import { sendEmailCheck, sendEmailCode, sendPassword } from "../actions/recoveryActions";
+
+export default class RecoveryPage extends React.Component
+{
+ constructor(props)
+ {
+ super(props);
+ this.state = {
+ email: "",
+ email_code: "",
+ password: "",
+ password_repeat: "",
+ tab: "email",
+ email_error: false,
+ recovery_form_step: 1,
+ email_code_error: false,
+ email_send_disabled: false,
+ set_password_disabled: true,
+ email_code_submit_disabled: true,
+ email_code_resend_disabled: true,
+ timer: 0,
+ email_auth_loading: false,
+ email_check_loading: false,
+ code_check_loading: false,
+ password_check_loading: false,
+ password_submit_disabled: true,
+ password_error: false,
+ };
+
+ this.timer_ref = null;
+ }
+
+ _handle_onEmailSubmit = (event) =>
+ {
+ event.preventDefault();
+
+ const { email, email_check_loading } = this.state;
+
+ if(!email_check_loading)
+ {
+ this.setState({ email_check_loading: true }, () =>
+ {
+ sendEmailCheck({ email })
+ .then(() =>
+ {
+ this.setState({ email_check_loading: false, email_error: false, timer: 60, recovery_form_step: 2, }, () =>
+ {
+ this.timer_ref = setInterval(() =>
+ {
+ const t = this.state.timer - 1;
+ this.setState({ timer: t, }, () =>
+ {
+ if(t === 0)
+ {
+ clearInterval(this.timer_ref);
+ }
+ });
+ }, 1000);
+ });
+ })
+ .catch(() =>
+ {
+ this.setState({ email_error: true, email_check_loading: false });
+ });
+ });
+ }
+ }
+
+ _handle_onCodeSubmit = (event) =>
+ {
+ event.preventDefault();
+
+ const { email, email_code, code_check_loading } = this.state;
+
+ if(!code_check_loading)
+ {
+ this.setState({ code_check_loading: true }, () =>
+ {
+ sendEmailCode({ email, code: email_code })
+ .then(() =>
+ {
+ this.setState({ email_code_error: false, code_check_loading: false, recovery_form_step: 3, });
+ })
+ .catch(() =>
+ {
+ this.setState({ email_code_error: true, code_check_loading: false });
+ });
+ });
+ }
+ }
+
+ _handle_onPasswordSubmit = (event) =>
+ {
+ event.preventDefault();
+
+ const { email, email_code, password, password_repeat, password_check_loading, } = this.state;
+
+ if(!password_check_loading)
+ {
+ this.setState({ password_check_loading: true }, () =>
+ {
+ sendPassword({ email, code: email_code, password, password_repeat, })
+ .then(() =>
+ {
+ this.setState({ password_error: false, password_check_loading: false, recovery_form_step: 4, });
+ })
+ .catch(() =>
+ {
+ this.setState({ password_error: true, password_check_loading: false });
+ });
+ });
+ }
+ }
+
+ _handle_onResendEmailCode = (event) =>
+ {
+ this.setState({ email_code_error: false }, () =>
+ {
+ this._handle_onEmailSubmit(event);
+ });
+ }
+
+ _handle_onEmailChange = (value) =>
+ {
+ this.setState({ email: value, email_send_disabled: this._check_fields_disabled([ value, this.state.email ]), email_error: false });
+ }
+
+ _handle_onPasswordChange = (value) =>
+ {
+ this.setState({ password: value, set_password_disabled: this._check_fields_disabled([ value, this.state.password ]), password_error: false });
+ }
+
+ _handle_onPasswordCheckChange = (value) =>
+ {
+ this.setState({ password_repeat: value, set_password_disabled: this._check_fields_disabled([ value, this.state.password_repeat ]), password_error: false });
+ }
+
+ _handle_onEmailCodeChange = (value) =>
+ {
+ this.setState({ email_code: value, email_code_submit_disabled: this._check_fields_disabled([ value ]), email_code_error: false });
+ }
+
+ _handle_onPasswordChange = (value) =>
+ {
+ let error = value === this.state.password_repeat ? false : true;
+ error = value.length < 6 ? true : error;
+
+ this.setState({ password: value, password_submit_disabled: error ? true : this._check_fields_disabled([ value ]), password_error: error });
+ }
+
+ _handle_onPasswordRepeatChange = (value) =>
+ {
+ let error = value === this.state.password ? false : true;
+ error = value.length < 6 ? true : error;
+
+ this.setState({ password_repeat: value, password_submit_disabled: error ? true : this._check_fields_disabled([ value ]), password_error: error });
+ }
+
+ _check_fields_disabled = (values) =>
+ {
+ for(let i in values)
+ {
+ if(values[i] === "")
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ render()
+ {
+ const { email, email_code, tab, email_error, email_code_error,
+ set_password_disabled, email_send_disabled, recovery_form_step, email_code_submit_disabled, email_code_resend_disabled,
+ timer, email_auth_loading, email_check_loading, code_check_loading,
+ password, password_repeat, password_submit_disabled, password_check_loading, password_error } = this.state;
+
+ return (
+
+
+ ЛК Эволюция автолизинга
+
+
+
+
+
+
+
+
Восстановление пароля
+
+
+
Восстановить с помощью
+
+ { recovery_form_step === 1 && (
+ <>
+
+
{ email_error ? 'Ошибка: Неверный адрес E-mail' : `\u00A0` }
+
+ ) }
+ { recovery_form_step === 2 && (
+ <>
+
На адрес E-mail { email } отправлен код подтверждения.
+
+
+ { timer !== 0 ? (
+
Запросить код повторно можно через: { timer } { pluralize(timer, 'секунд', 'секунду', 'секунды', 'секунд') }
+ ) : (
+
+ ) }
+ {/* disabled={ email_code_resend_disabled }*/}
+
+
{ email_code_error ? 'Ошибка: Вы указали неверный код' : `\u00A0` }
+
+ ) }
+ { recovery_form_step === 3 && (
+ <>
+
Вы указали верный код. Введите новый пароль и повторите новый пароль
+
+
{ password_error ? 'Внимание: пароли не совпадают' : `\u00A0` }
+
{ password.length < 6 ? 'Внимание: минимальная длина пароля - 6 символов' : `\u00A0` }
+
+ ) }
+ { recovery_form_step === 4 && (
+ <>
+
Поздравляем, пароль успешно изменен. Нажмите здесь для авторизации.
+
+ ) }
-
- {/* Step 2
-
На указанный номер отправлен код.
-
-
-
-
Запросить код повторно можно через: 60 секунд
-
-
- */}
- {/* Step 3 */}
- {/*
*/}
-
-
-
-
-
- )
-}
+
+
+
+
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/pages/settings.js b/pages/settings.js
deleted file mode 100644
index 763c6c4..0000000
--- a/pages/settings.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import React from "react";
-import Head from 'next/head';
-import Image from 'next/image';
-import Link from "next/link";
-import cookie from 'cookie';
-import { connect } from "react-redux";
-import numeral from "numeral";
-
-import { withRouter } from 'next/router';
-import { reduxWrapper } from '../store';
-
-import Header from './components/Header';
-import Footer from './components/Footer';
-import Pagination from './components/Pagination';
-
-import { logout } from '../actions';
-
-class IndexPage extends React.Component
-{
- constructor(props)
- {
- super(props);
- this.state = {
- };
- }
-
- static getDerivedStateFromProps(nextProps, prevState)
- {
- return {
- };
- }
-
- _handle_onLogout = () =>
- {
- logout({ dispatch: this.props.dispatch }).then().catch();
- }
-
- render()
- {
- const { loading, page, pages, search, date_from, date_from_type, date_to, date_to_type, contracts, sort_number, sort_date, sort_status } = this.state;
- console.log("contracts");
- console.log(contracts);
- const contract_status = {
- "Действующий": "opened",
- "Закрыт": "closed",
- };
-
- return (
-
-
- ЛК Эволюция автолизинга
-
-
-
-
-
-
-
-
Настройки
-
-
-
-
-
-
- )
- }
-}
-
-function mapStateToProps(state, ownProps)
-{
- return {
- }
-}
-
-export const getServerSideProps = reduxWrapper.getServerSideProps(store =>
- async ({ req, res, query }) =>
- {
- let props = {};
-
- if(req.headers.cookie !== undefined)
- {
- const cookies = cookie.parse(req.headers?.cookie ? req.headers?.cookie : "");
-
- if(cookies.jwt === undefined || cookies.jwt === null)
- {
- res.statusCode = 302;
- res.setHeader('Location', `/login`);
- }
- else
- {
- //const tokenValid = await checkToken(cookies.jwt);
- const tokenValid = true;
- if(!tokenValid)
- {
- res.statusCode = 302;
- res.setHeader('Location', `/login`);
- }
- }
- }
- else
- {
- res.statusCode = 302;
- res.setHeader('Location', `/login`);
- }
-
- return { props: props };
- }
-);
-
-export default withRouter(connect(mapStateToProps)(IndexPage));
\ No newline at end of file
diff --git a/pages/settings/components/InnerMenu/index.js b/pages/settings/components/InnerMenu/index.js
new file mode 100644
index 0000000..129e026
--- /dev/null
+++ b/pages/settings/components/InnerMenu/index.js
@@ -0,0 +1,66 @@
+import React from "react";
+import Link from "next/link";
+
+const menu = [
+ {id: 1, name: "Номер телефона", link: "/settings/phone"},
+ {id: 2, name: "Пароль", link: "/settings/password"},
+]
+
+export default class InnerMenu extends React.Component
+{
+ constructor(props)
+ {
+ super(props);
+ this.menuRef = React.createRef();
+
+ menu.forEach(item =>
+ {
+ this[item.id] = React.createRef();
+ });
+ }
+
+ componentDidMount()
+ {
+ let l = 0;
+ let m = 0;
+
+ for(let i in menu)
+ {
+ if(this.props.router.asPath.indexOf(menu[i].link) > -1)
+ {
+ m = i;
+ }
+ }
+
+ for(let i = 0; i < m; i++)
+ {
+ l = l + this.menuRef.current.children[i].getBoundingClientRect().width;
+ }
+
+ this.menuRef.current.scrollLeft = l - 50;
+ }
+
+ scrollToCategory = id => {
+
+ };
+
+ render()
+ {
+ return (
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/pages/settings/password.js b/pages/settings/password.js
new file mode 100644
index 0000000..51dbe68
--- /dev/null
+++ b/pages/settings/password.js
@@ -0,0 +1,231 @@
+import React from "react";
+import Head from 'next/head';
+import Image from 'next/image';
+import Link from "next/link";
+import cookie from 'cookie';
+import { connect } from "react-redux";
+import numeral from "numeral";
+import { SpinnerCircular } from 'spinners-react';
+
+import { withRouter } from 'next/router';
+import { reduxWrapper } from '../../store';
+
+import InnerMenu from "./components/InnerMenu";
+import Header from '../components/Header';
+import Footer from '../components/Footer';
+import Pagination from '../components/Pagination';
+import Company from "../components/Company";
+
+import { sendNewPassword } from '../../actions';
+
+class IndexPage extends React.Component
+{
+ constructor(props)
+ {
+ super(props);
+ this.state = {
+ password_form_step: 1,
+ password: "",
+ password_error: false,
+ new_password: "",
+ new_password_repeat: "",
+ new_password_check_loading: false,
+ new_password_submit_disabled: true,
+ new_password_error: false,
+ user: {},
+ };
+ }
+
+ static getDerivedStateFromProps(nextProps, prevState)
+ {
+ return {
+ user: nextProps.user,
+ };
+ }
+
+ _handle_onPasswordSubmit = (event) =>
+ {
+ event.preventDefault();
+
+ const { password, new_password, new_password_repeat, new_password_check_loading, user, } = this.state;
+
+ if(!new_password_check_loading)
+ {
+ this.setState({ new_password_check_loading: true }, () =>
+ {
+ sendNewPassword({ email: user.email, password, new_password, new_password_repeat, })
+ .then((response) =>
+ {
+ if(response.status === "success")
+ {
+ this.setState({ new_password_error: false, new_password_check_loading: false, password_form_step: 2, });
+ }
+ else
+ {
+ console.log(response.error);
+ if(response.status === "error" && response.error === "wrong_email")
+ {
+ this.setState({ password_error: true, new_password_error: false, new_password_check_loading: false });
+ }
+ }
+ })
+ .catch(() =>
+ {
+ this.setState({ new_password_error: true, new_password_check_loading: false });
+ });
+ });
+ }
+ }
+
+ _handle_onPasswordChange = (value) =>
+ {
+ this.setState({ password: value, password_error: false, new_password_submit_disabled: this._check_fields_disabled([ value, this.state.new_password, this.state.new_password_repeat ]), });
+ }
+
+ _handle_onNewPasswordChange = (value) =>
+ {
+ let error = false;
+ if(this.state.new_password_repeat.length > 0)
+ {
+ value === this.state.new_password ? false : true;
+ error = value.length < 6 ? true : error;
+ }
+
+ this.setState({ new_password: value, new_password_submit_disabled: this._check_fields_disabled([ value, this.state.password, this.state.new_password_repeat ]), new_password_error: false });
+ }
+
+ _handle_onNewPasswordRepeatChange = (value) =>
+ {
+ let error = value === this.state.new_password ? false : true;
+ error = value.length < 6 ? true : error;
+
+ this.setState({ new_password_repeat: value, new_password_submit_disabled: error ? true : this._check_fields_disabled([ value, this.state.password, this.state.new_password ]), new_password_error: error });
+ }
+
+ _check_fields_disabled = (values) =>
+ {
+ for(let i in values)
+ {
+ if(values[i] === "")
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ render()
+ {
+ console.log("this.state.user", this.state.user);
+ const { password, password_error, new_password, new_password_repeat, new_password_submit_disabled, new_password_check_loading, new_password_error, password_form_step } = this.state;
+
+ return (
+
+
+ ЛК Эволюция автолизинга
+
+
+
+
+
+
+
+
+
+
+
+ { password_form_step === 1 && (
+
+
+
{ new_password_error ? 'Внимание: пароли не совпадают' : `\u00A0` }
+
{ new_password.length < 6 ? 'Внимание: минимальная длина пароля - 6 символов' : `\u00A0` }
+
+
Ваш пароль был успешно изменен.
+
+
+
+ )
+ }
+}
+
+function mapStateToProps(state, ownProps)
+{
+ return {
+ user: state.user,
+ }
+}
+
+export const getServerSideProps = reduxWrapper.getServerSideProps(store =>
+ async ({ req, res, query }) =>
+ {
+ let props = {};
+
+ if(req.headers.cookie !== undefined)
+ {
+ const cookies = cookie.parse(req.headers?.cookie ? req.headers?.cookie : "");
+
+ if(cookies.jwt === undefined || cookies.jwt === null)
+ {
+ res.statusCode = 302;
+ res.setHeader('Location', `/login`);
+ }
+ else
+ {
+ //const tokenValid = await checkToken(cookies.jwt);
+ const tokenValid = true;
+ if(!tokenValid)
+ {
+ res.statusCode = 302;
+ res.setHeader('Location', `/login`);
+ }
+ }
+ }
+ else
+ {
+ res.statusCode = 302;
+ res.setHeader('Location', `/login`);
+ }
+
+ return { props: props };
+ }
+);
+
+export default withRouter(connect(mapStateToProps)(IndexPage));
\ No newline at end of file
diff --git a/pages/settings/phone.js b/pages/settings/phone.js
new file mode 100644
index 0000000..7ed46f9
--- /dev/null
+++ b/pages/settings/phone.js
@@ -0,0 +1,285 @@
+import React from "react";
+import Head from 'next/head';
+import Image from 'next/image';
+import Link from "next/link";
+import cookie from 'cookie';
+import { connect } from "react-redux";
+import numeral from "numeral";
+import pluralize from 'pluralize-ru';
+import { SpinnerCircular } from 'spinners-react';
+
+import { withRouter } from 'next/router';
+import { reduxWrapper } from '../../store';
+
+import InnerMenu from "./components/InnerMenu";
+import Header from '../components/Header';
+import Footer from '../components/Footer';
+import Pagination from '../components/Pagination';
+import Company from "../components/Company";
+
+import { sendPhoneChangeNumber, sendPhoneChangeNumberSmsCode, setUserPhone } from '../../actions';
+
+class IndexPage extends React.Component
+{
+ constructor(props)
+ {
+ super(props);
+ this.state = {
+ phone: "",
+ phone_code: "",
+ phone_form_step: 1,
+ phone_number_error: false,
+ phone_number_format_error: false,
+ phone_code_error: false,
+ phone_login_disabled: true,
+ phone_code_submit_disabled: true,
+ phone_code_resend_disabled: true,
+ phone_sms_code_error: false,
+ timer: 0,
+ phone_check_loading: false,
+ code_check_loading: false,
+ user: {},
+ };
+ }
+
+ static getDerivedStateFromProps(nextProps, prevState)
+ {
+ return {
+ user: nextProps.user,
+ };
+ }
+
+ _handle_onPhoneSubmit = (event) =>
+ {
+ event.preventDefault();
+
+ const { user, phone, phone_check_loading } = this.state;
+
+ if(!phone_check_loading)
+ {
+ this.setState({ phone_check_loading: true }, () =>
+ {
+ sendPhoneChangeNumber({ email: user.email, phone })
+ .then(() =>
+ {
+ this.setState({ phone_check_loading: false, phone_number_error: false, timer: 60, phone_form_step: 2, }, () =>
+ {
+ this.timer_ref = setInterval(() =>
+ {
+ const t = this.state.timer - 1;
+ this.setState({ timer: t, }, () =>
+ {
+ if(t === 0)
+ {
+ clearInterval(this.timer_ref);
+ }
+ });
+ }, 1000);
+ });
+ })
+ .catch(() =>
+ {
+ this.setState({ phone_number_error: true, phone_check_loading: false });
+ });
+ });
+ }
+ }
+
+ _handle_onCodeSubmit = (event) =>
+ {
+ event.preventDefault();
+
+ const { phone, phone_code, code_check_loading } = this.state;
+
+ if(!code_check_loading)
+ {
+ this.setState({ code_check_loading: true }, () =>
+ {
+ sendPhoneChangeNumberSmsCode({ phone, code: phone_code })
+ .then(() =>
+ {
+ const new_user = { ...this.state.user };
+ new_user.phone = phone;
+
+ setUserPhone({ dispatch: this.props.dispatch, user: new_user });
+
+ this.setState({ phone_sms_code_error: false, code_check_loading: false, phone_form_step: 3 });
+ })
+ .catch(() =>
+ {
+ this.setState({ phone_sms_code_error: true, code_check_loading: false });
+ });
+ });
+ }
+ }
+
+ _handle_onResendCode = (event) =>
+ {
+ this.setState({ phone_sms_code_error: false }, () =>
+ {
+ this._handle_onPhoneSubmit(event);
+ });
+ }
+
+ _handle_onPhoneChange = (value) =>
+ {
+ const phone_number_format_error = value.length > 1 && (value[0] !== "+" || value[1] !== "7") ? true : false;
+ this.setState({ phone: value, phone_login_disabled: this._check_fields_disabled([ value ]), phone_number_error: false, phone_number_format_error: phone_number_format_error });
+ }
+
+ _handle_onPhoneCodeChange = (value) =>
+ {
+ this.setState({ phone_code: value, phone_code_submit_disabled: this._check_fields_disabled([ value ]), phone_sms_code_error: false });
+ }
+
+ _check_fields_disabled = (values) =>
+ {
+ for(let i in values)
+ {
+ if(values[i] === "")
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ render()
+ {
+ const { user, phone, phone_code, phone_number_error, phone_code_error,
+ phone_login_disabled, phone_form_step, phone_code_submit_disabled, phone_code_resend_disabled,
+ timer, phone_sms_code_error, phone_check_loading, code_check_loading, phone_number_format_error } = this.state;
+
+ return (
+
+
+ ЛК Эволюция автолизинга
+
+
+
+
+
+
+
+
+
+
Вход по номеру телефона
+
+
+
+
+
+
+ { phone_form_step !== 2 && phone_form_step !== 3 && (
+ <>
+ { user.phone !== undefined && user.phone !== null && user.phone !== "" ? (
+ Номер для авторизации +{ user.phone.replace(/[^0-9.]/g, '') }. Вы можете изменить номер телефона для авторизации.
+ ) : (
+ У Вас отсутствует привязанный номер телефона. Вы можете добавить номер телефона для авторизации.
+ ) }
+
+ ) }
+
+
+ { phone_form_step === 1 && (
+ <>
+
+
{ phone_number_error ? 'Ошибка: нет аккаунта с таким номером телефона' : `\u00A0` }
+
{ phone_number_format_error ? 'Ошибка: номер должен начинаться на +7' : `\u00A0` }
+
+ ) }
+ { phone_form_step === 2 && (
+ <>
+
На номер +{ phone.replace(/[^0-9.]/g, '') } отправлен код подтверждения.
+
+
+ { timer !== 0 ? (
+
Запросить код повторно можно через: { timer } { pluralize(timer, 'секунд', 'секунду', 'секунды', 'секунд') }
+ ) : (
+
+ ) }
+ {/* disabled={ phone_code_resend_disabled }*/}
+
+
{ phone_sms_code_error ? 'Ошибка: Вы указали неверный код' : `\u00A0` }
+
+ ) }
+ { phone_form_step === 3 && (
+
Вы успешно привязали номер +{ phone.replace(/[^0-9.]/g, '') } к Вашей учетной записи.
+ ) }
+
+
+
+ )
+ }
+}
+
+function mapStateToProps(state, ownProps)
+{
+ return {
+ user: state.user,
+ }
+}
+
+export const getServerSideProps = reduxWrapper.getServerSideProps(store =>
+ async ({ req, res, query }) =>
+ {
+ let props = {};
+
+ if(req.headers.cookie !== undefined)
+ {
+ const cookies = cookie.parse(req.headers?.cookie ? req.headers?.cookie : "");
+
+ if(cookies.jwt === undefined || cookies.jwt === null)
+ {
+ res.statusCode = 302;
+ res.setHeader('Location', `/login`);
+ }
+ else
+ {
+ //const tokenValid = await checkToken(cookies.jwt);
+ const tokenValid = true;
+ if(!tokenValid)
+ {
+ res.statusCode = 302;
+ res.setHeader('Location', `/login`);
+ }
+ }
+ }
+ else
+ {
+ res.statusCode = 302;
+ res.setHeader('Location', `/login`);
+ }
+
+ return { props: props };
+ }
+);
+
+export default withRouter(connect(mapStateToProps)(IndexPage));
\ No newline at end of file
diff --git a/reducers/contractReducer.js b/reducers/contractReducer.js
index 6552cdd..9dbcfd6 100644
--- a/reducers/contractReducer.js
+++ b/reducers/contractReducer.js
@@ -97,6 +97,14 @@ const contractReducer = (state = initialState.contract, action) =>
};
}
+ case actionTypes.CONTRACT_MATERIALS:
+ {
+ return {
+ ...state,
+ materials: action.data.materials,
+ };
+ }
+
default: {
return state;
}
diff --git a/reducers/initialState.js b/reducers/initialState.js
index c2f0006..ec75787 100644
--- a/reducers/initialState.js
+++ b/reducers/initialState.js
@@ -32,6 +32,7 @@ export const defaultState = {
agreement: null,
documents: null,
rules: null,
+ materials: null,
},
calendar: {
payments: null,