diff --git a/src/app.html b/src/app.html index 05d3ce0..2e1017f 100644 --- a/src/app.html +++ b/src/app.html @@ -101,10 +101,6 @@
-
- - -
diff --git a/src/pages/login/components/login-form/LoginForm.js b/src/pages/login/components/login-form/LoginForm.js index 99f65de..33ee781 100644 --- a/src/pages/login/components/login-form/LoginForm.js +++ b/src/pages/login/components/login-form/LoginForm.js @@ -11,7 +11,6 @@ class LoginForm extends Component { this.form = this.mainNode.querySelector('.Login__form'); this.inputContainer = this.mainNode.querySelector('.Login__inputContainer'); this.submitButton = this.mainNode.querySelector('.Login__submit'); - this.checkboxSystem = this.mainNode.querySelector('.form-check-input'); this.logoImage = this.mainNode.querySelector('.Login__logo'); this.logoImage.src = Image; @@ -39,7 +38,6 @@ class LoginForm extends Component { this.loginControl.input, this.passwordControl.input, this.submitButton, - this.checkboxSystem, ]; elements.forEach((element) => { @@ -61,6 +59,11 @@ class LoginForm extends Component { return this.form.checkValidity(); } + setError = (message) => { + this.loginControl.setError(message); + this.passwordControl.setError(message); + } + submit = (event) => { event.preventDefault(); if (this.validateInputs()) { diff --git a/src/pages/login/components/page/Page.js b/src/pages/login/components/page/Page.js index 34e6c68..df526d6 100644 --- a/src/pages/login/components/page/Page.js +++ b/src/pages/login/components/page/Page.js @@ -6,6 +6,11 @@ import routeService from '../../../../services/RouteService'; import notify from '../../../../services/NotifyService'; import {ROUTES, EVENTS} from '../../../../core/consts'; +const ERRORS = { + NOT_CORRECT: 'Неверный логин или пароль', + UNKNOWN_ERROR: 'Неизвестная ошибка', +}; + class LoginPage extends Component { constructor (mainNodeSelector, parentNode) { super(mainNodeSelector, parentNode); @@ -21,8 +26,12 @@ class LoginPage extends Component { routeService.goTo(ROUTES.MAIN); }) .catch((e) => { - const message = e?.response?.data?.message || 'Неизвестная ошибка'; - notify.warn(message); + const message = e?.response?.data?.message || ERRORS.UNKNOWN_ERROR; + if (message === ERRORS.NOT_CORRECT) { + this.form.setError(ERRORS.NOT_CORRECT); + } else { + notify.warn(message); + } this.form.disabled(false); }); }); diff --git a/src/pages/profile/components/profile-content/consts.js b/src/pages/profile/components/profile-content/consts.js index c9068fc..0fa1cf7 100644 --- a/src/pages/profile/components/profile-content/consts.js +++ b/src/pages/profile/components/profile-content/consts.js @@ -19,5 +19,5 @@ export const ERRORS = { TYPED_NEW_PASSWORD: 'Заполните новый пароль', PASSWORD_NOT_EQUAL: 'Пароли не совпадают', REPEAT_PASSWORD: 'Повторите новый пароль', - NOT_CORRECT_PASSWORD: 'Не верный старый пароль', + NOT_CORRECT_PASSWORD: 'Неверный старый пароль', };