From c50e38fde33925bc7b2324b86241ca78888dbafc Mon Sep 17 00:00:00 2001
From: mrmur <andreiduvakin@mail.ru>
Date: Sun, 3 Apr 2022 16:26:21 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=20css=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/moona_data.db                | Bin 12288 -> 12288 bytes
 forms/register.py               |   4 ++--
 main.py                         |   4 ++--
 static/css/register.css         |   9 +++++++++
 templates/confirmation_reg.html |   8 ++++++--
 templates/register.html         |  21 ++++++++++++---------
 6 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 static/css/register.css

diff --git a/db/moona_data.db b/db/moona_data.db
index 90f50f7661f3aa76a26d3f0b691bd0e4fb71ac42..85b507ce76c0a92ca44a0b0bf10ab894a9c826a5 100644
GIT binary patch
delta 219
zcmZojXh@hK&B!)U#+i|AW5P;)MwiWk0=E3Tdl*zTr5Vk685$!MMJHdDSFTUYODRgt
zOerl(%+Abn$W6@5(JLw~NXkx0GqNhqNHj7vvobO>00I@mvOv%9JWKbgtkeo8qoPU`
zGXwKvqtwK-)Wk#!Gs`4PL(?Qvqa>4L<3vMKV<RI|^At0KWJAkjGm|89^ORIG3qvzw
yixiVob2Fo)L`zExBLgEN5nTflT?6CN;?yE81|Se%VBmkgSy15tznCOervU(fg+H1A

delta 71
zcmZojXh@hK&B!uQ#+i|2W5P;)#-p1B754FSTdQhHGcxcpFeoxi4v|+DF)}bR(ls#A
ZH8A3000IF92L3-ll{fh(Hpnot003z556S=l

diff --git a/forms/register.py b/forms/register.py
index f6057c6..70e2fd1 100644
--- a/forms/register.py
+++ b/forms/register.py
@@ -1,5 +1,5 @@
 from flask_wtf import FlaskForm
-from wtforms import EmailField, StringField, PasswordField, SubmitField, FileField, IntegerField
+from wtforms import EmailField, StringField, PasswordField, SubmitField, FileField, IntegerField, TextAreaField
 from wtforms.validators import DataRequired
 
 
@@ -9,7 +9,7 @@ class RegisterForm(FlaskForm):
     surname = StringField('Фамилия', validators=[DataRequired()])
     login = StringField('Логин', validators=[DataRequired()])
     age = IntegerField('Age', validators=[DataRequired()])
-    about = StringField('Расскажите о себе', default='')
+    about = TextAreaField('Расскажите о себе', default='')
     photo = FileField('Фото')
     password = PasswordField('Пароль', validators=[DataRequired()])
     password2 = PasswordField('Повторите пароль', validators=[DataRequired()])
diff --git a/main.py b/main.py
index 3cd4948..27e02c7 100644
--- a/main.py
+++ b/main.py
@@ -76,7 +76,7 @@ def confirmation():
         else:
             return render_template('confirmation_reg.html', title='Подтверждение', form=conf,
                                    message='Коды не совпадают')
-    return render_template('confirmation_reg.html', title='Подтверждение', form=conf)
+    return render_template('confirmation_reg.html', title='Подтверждение', form=conf, message='')
 
 
 @app.route('/register', methods=['GET', 'POST'])
@@ -95,7 +95,7 @@ def register():
                                    message="Такой пользователь уже есть")
         help_arg = form
         return redirect('/confirmation')
-    return render_template('register.html', title='Регистрация', form=form)
+    return render_template('register.html', title='Регистрация', form=form, message='')
 
 
 def main():
diff --git a/static/css/register.css b/static/css/register.css
new file mode 100644
index 0000000..9e8a169
--- /dev/null
+++ b/static/css/register.css
@@ -0,0 +1,9 @@
+.divlog {
+  margin-left: auto;
+    margin-right: auto;
+   width: 80%;
+   height: 50%
+}
+.title {
+text-align: center;
+}
\ No newline at end of file
diff --git a/templates/confirmation_reg.html b/templates/confirmation_reg.html
index b630ec6..db2dabf 100644
--- a/templates/confirmation_reg.html
+++ b/templates/confirmation_reg.html
@@ -1,8 +1,10 @@
 <meta charset="UTF-8">
+<link rel="stylesheet" href="../static/css/register.css">
 {% extends "base.html" %}
 {% block content %}
-<h1 class="title">Register Form</h1>
 <div class="divlog">
+
+    <h1 class="title">Подтверждение почты</h1>
     <form action="" method="post">
         {{ form.hidden_tag() }}
         {{ form.csrf_token }}
@@ -17,7 +19,9 @@
         {% endfor %}
         </p>
         <p>{{ form.submit(type="submit", class="btn btn-primary") }}</p>
-        {{message}}
+        {% if message != '' %}
+        <div class="alert alert-danger" role="alert">{{ message }}</div>
+        {% endif %}
     </form>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/register.html b/templates/register.html
index b4bcac1..99a4b1e 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -1,8 +1,9 @@
 <meta charset="UTF-8">
+<link rel="stylesheet" href="../static/css/register.css">
 {% extends "base.html" %}
 {% block content %}
-<h1 class="title">Register Form</h1>
 <div class="divlog">
+    <h1 class="title">Регистрация</h1>
     <form action="" method="post">
         {{ form.hidden_tag() }}
         {{ form.csrf_token }}
@@ -17,7 +18,7 @@
         </p>
         <p>
             {{ form.name.label }}<br>
-            {{ form.name(class="form-control", type="password") }}<br>
+            {{ form.name(class="form-control") }}<br>
             {% for error in form.name.errors %}
         <div class="alert alert-danger" role="alert">
             {{ error }}
@@ -26,7 +27,7 @@
         </p>
         <p>
             {{ form.surname.label }}<br>
-            {{ form.surname(class="form-control", type="password") }}<br>
+            {{ form.surname(class="form-control") }}<br>
             {% for error in form.surname.errors %}
         <div class="alert alert-danger" role="alert">
             {{ error }}
@@ -60,15 +61,15 @@
         </div>
         {% endfor %}
         </p>
-        <p>
+        <div>
             {{ form.photo.label }}<br>
             {{ form.photo(class="form-control") }}<br>
             {% for error in form.photo.errors %}
-        <div class="alert alert-danger" role="alert">
-            {{ error }}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
-        {% endfor %}
-        </p>
         <p>
             {{ form.password.label }}<br>
             {{ form.password(class="form-control") }}<br>
@@ -88,7 +89,9 @@
         {% endfor %}
         </p>
         <p>{{ form.submit(type="submit", class="btn btn-primary") }}</p>
-        {{message}}
+        {% if message != '' %}
+        <div class="alert alert-danger" role="alert">{{ message }}</div>
+        {% endif %}
     </form>
 </div>
 {% endblock %}
\ No newline at end of file