From 023632930298c06588fa8ed8706b111a923591e5 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Tue, 10 May 2016 22:13:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B2=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D1=91=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=B0\=D0=BC=D1=8B=D0=BB=D0=B0=20=D0=B2=20?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D1=83=20=D0=B2=D0=BE=D1=81=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=BB=D1=8F=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=86=D0=B2=D0=B5=D1=82=20=D1=81?=
 =?UTF-8?q?=D1=81=D1=8B=D0=BB=D0=BE=D0=BA=20=D0=B2=20error=20message=20?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=B2=D1=85=D0=BE=D0=B4=D0=B0?=
 =?UTF-8?q?=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20=D1=81=D1=81=D1=8B?=
 =?UTF-8?q?=D0=BB=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D0=B2=D0=BE=D1=81=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8F=20=D1=81=20=D1=84=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BC=D1=8B=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B0\=D0=BC=D1=8B=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/auth/forgotPassword/ForgotPassword.jsx | 8 ++++----
 src/components/auth/login/Login.jsx                   | 4 +---
 src/components/auth/password/Password.jsx             | 5 ++++-
 src/components/ui/panel.scss                          | 9 ++-------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/components/auth/forgotPassword/ForgotPassword.jsx b/src/components/auth/forgotPassword/ForgotPassword.jsx
index 1d37462..9abc38a 100644
--- a/src/components/auth/forgotPassword/ForgotPassword.jsx
+++ b/src/components/auth/forgotPassword/ForgotPassword.jsx
@@ -20,6 +20,8 @@ class Body extends BaseAuthBody {
 
     // Если юзер вводил своё мыло во время попытки авторизации, то почему бы его сюда автоматически не подставить?
     render() {
+        const {user} = this.context;
+
         return (
             <div>
                 {this.renderErrors()}
@@ -33,16 +35,14 @@ class Body extends BaseAuthBody {
                     color="lightViolet"
                     required
                     placeholder={messages.accountEmail}
+                    defaultValue={user.email || user.username || ''}
                 />
-
-                <p>TODO: тут ещё должна быть капча</p>
-                <p>TODO: эту страницу пока что не имплементим</p>
             </div>
         );
     }
 
     onFormSubmit() {
-        // TODO: обработчик отправки письма с инструкцией по смене аккаунта
+        // TODO: обработчик отправки письма с инструкцией по смене пароля
     }
 }
 
diff --git a/src/components/auth/login/Login.jsx b/src/components/auth/login/Login.jsx
index 375607d..cbd0b69 100644
--- a/src/components/auth/login/Login.jsx
+++ b/src/components/auth/login/Login.jsx
@@ -46,9 +46,7 @@ export default function Login() {
             </button>
         ),
         Links: () => (
-            <Link to="/forgot-password">
-                <Message {...passwordMessages.forgotPassword} />
-            </Link>
+            <span/>
         )
     };
 }
diff --git a/src/components/auth/password/Password.jsx b/src/components/auth/password/Password.jsx
index d2c1587..67183c7 100644
--- a/src/components/auth/password/Password.jsx
+++ b/src/components/auth/password/Password.jsx
@@ -44,7 +44,10 @@ class Body extends BaseAuthBody {
                     placeholder={messages.accountPassword}
                 />
 
-                <Checkbox {...this.bindField('rememberMe')} label={<Message {...messages.rememberMe} />} />
+                <Checkbox {...this.bindField('rememberMe')}
+                    defaultChecked={true}
+                    label={<Message {...messages.rememberMe} />}
+                />
             </div>
         );
     }
diff --git a/src/components/ui/panel.scss b/src/components/ui/panel.scss
index 6aca2a1..ad440be 100644
--- a/src/components/ui/panel.scss
+++ b/src/components/ui/panel.scss
@@ -54,11 +54,6 @@ $bodyTopBottomPadding: 15px;
         border-bottom: 1px dotted rgba(#fff, 0.75);
         text-decoration: none;
         transition: .25s;
-
-        &:hover {
-            text-shadow: 0 0 1px #fff;
-            border-bottom-color: transparent;
-        }
     }
 }
 
@@ -102,8 +97,8 @@ $bodyTopBottomPadding: 15px;
 
     a {
         &:hover {
-            color: #fff;
-            opacity: 0.7;
+            text-shadow: 0 0 1px #fff;
+            border-bottom-color: transparent;
         }
     }
 }