From 775d5036277b6cb77afd3c78fa655cd10ce811e3 Mon Sep 17 00:00:00 2001
From: vigdorov <vignikbor@gmail.com>
Date: Thu, 10 Sep 2020 23:20:36 +0300
Subject: [PATCH] =?UTF-8?q?HM-131.=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5?=
 =?UTF-8?q?=20=D0=9B=D0=BE=D0=B3=D0=B8=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.html                                        |  4 ----
 src/pages/login/components/login-form/LoginForm.js  |  7 +++++--
 src/pages/login/components/page/Page.js             | 13 +++++++++++--
 .../profile/components/profile-content/consts.js    |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

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 @@
                 <div class="Login__title h3"></div>
                 <form class="Login__form needs-validation" novalidate>
                     <div class="Login__inputContainer"></div>
-                    <div class="form-group form-check Login__check">
-                        <input type="checkbox" class="form-check-input" id="check">
-                        <label class="form-check-label" for="check">Оставаться в системе</label>
-                    </div>
                     <button type="submit" class="btn btn-primary Login__submit">Войти</button>
                 </form>
             </div>
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: 'Неверный старый пароль',
 };