From 4a8a967d861774af1bfd460cadff0792f1f9fe00 Mon Sep 17 00:00:00 2001
From: Andrei <andreiduvakin@mail.ru>
Date: Tue, 20 Dec 2022 13:10:16 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D1=8E=20=D0=BF=D0=BE=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BD=D1=83,?=
 =?UTF-8?q?=20=D0=B2=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=86=D1=83=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D0=B8,=20=D0=BD=D0=B0=20=D0=B3=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BD=D0=BE=D0=B9=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=86=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?=
 =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D1=80=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=B0=D0=B2=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 forms/login.py          | 4 ++--
 main.py                 | 7 +++++--
 templates/main.html     | 4 ++--
 templates/register.html | 3 +++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/forms/login.py b/forms/login.py
index 2ecd8b9..f98dc3b 100644
--- a/forms/login.py
+++ b/forms/login.py
@@ -1,10 +1,10 @@
 from flask_wtf import FlaskForm
-from wtforms import EmailField, PasswordField, BooleanField, SubmitField
+from wtforms import StringField, PasswordField, BooleanField, SubmitField
 from wtforms.validators import DataRequired
 
 
 class LoginForm(FlaskForm):
-    login = EmailField('Почта', validators=[DataRequired()])
+    login = StringField('Почта', validators=[DataRequired()])
     password = PasswordField('Пароль', validators=[DataRequired()])
     remember_me = BooleanField('Запомнить меня')
     submit = SubmitField('Войти')
\ No newline at end of file
diff --git a/main.py b/main.py
index b399594..43067ab 100644
--- a/main.py
+++ b/main.py
@@ -97,8 +97,11 @@ def login():
         danger = request.args.get('danger') if request.args.get('danger') else False
         form = LoginForm()
         if form.validate_on_submit():
-            db_sess = db_session.create_session()
-            user = db_sess.query(User).filter(User.email == form.login.data).first()
+            data_session = db_session.create_session()
+            user = data_session.query(User).filter(User.email == form.login.data).first()
+            if not user:
+                user = data_session.query(User).filter(User.login == form.login.data).first()
+            data_session.close()
             if user and user.check_password(form.password.data):
                 if user.activated:
                     login_user(user, remember=form.remember_me.data)
diff --git a/templates/main.html b/templates/main.html
index 72e3f88..1a922ce 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -13,9 +13,9 @@
         <strong class="header_title_2">Самый удобный сайт для создания проектов</strong>
     </div>
     <div class="header_buttons">
-        <a class="header_button" href="/register">
+        <a class="header_button" href="/login">
             <div class="header_button_text">
-                <p>Регистрация</p>
+                <p>Авторизация</p>
             </div>
         </a>
         <a class="header_button" id="link_to_about" href="#about_block">
diff --git a/templates/register.html b/templates/register.html
index f1445ae..5199570 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -37,6 +37,9 @@
                     </div>
                     <div class="form_data_button">
                         {{ form.submit(type="submit", class="register_button") }}
+                        <a class="auth_button" type="submit" href="/login">
+                            <div class="auth"><strong>Уже есть аккаунт?</strong></div>
+                        </a>
                     </div>
                 </div>
                 <div class="message_block">