From d37496bdbf1f70ec2f5acbda7a2fb92a91ed1b65 Mon Sep 17 00:00:00 2001
From: Andrei <andreiduvakin@mail.ru>
Date: Thu, 3 Nov 2022 22:34:57 +0500
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20age=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=B0=D1=82=D1=83=20=D1=80=D0=BE=D0=B6=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F,=20=D0=B8=20=D0=B2=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/users.py                           |  1 +
 forms/register.py                       |  4 +-
 main.log                                | 24 ---------
 main.py                                 | 18 +++----
 templates/diary/edit_profile.html       | 16 +++---
 templates/diary/register.html           | 18 +++----
 templates/main/register.html            |  9 ++++
 templates/safe_app_school/register.html | 67 ++++++++++++++-----------
 templates/simple/simple_register.html   | 67 ++++++++++++++-----------
 9 files changed, 114 insertions(+), 110 deletions(-)

diff --git a/data/users.py b/data/users.py
index 40c1380..b74c10a 100644
--- a/data/users.py
+++ b/data/users.py
@@ -25,6 +25,7 @@ class User(SqlAlchemyBase, UserMixin):
                                  default=date.today())
     role = sqlalchemy.Column(sqlalchemy.String, nullable=True)
     activity = sqlalchemy.Column(sqlalchemy.Date, nullable=True)
+    birthday = sqlalchemy.Column(sqlalchemy.Date, nullable=True)
 
     def check_password(self, password):
         return check_password_hash(self.password, password)
diff --git a/forms/register.py b/forms/register.py
index 2fac0e2..2e0d33b 100644
--- a/forms/register.py
+++ b/forms/register.py
@@ -1,6 +1,6 @@
 from flask_wtf import FlaskForm
 from flask_wtf.file import FileAllowed
-from wtforms import EmailField, StringField, PasswordField, SubmitField, FileField, IntegerField, TextAreaField
+from wtforms import EmailField, StringField, PasswordField, SubmitField, FileField, DateField, TextAreaField
 from wtforms.validators import DataRequired
 
 
@@ -9,7 +9,7 @@ class RegisterForm(FlaskForm):
     name = StringField('Имя', validators=[DataRequired()])
     surname = StringField('Фамилия', validators=[DataRequired()])
     login = StringField('Логин', validators=[DataRequired()])
-    age = IntegerField('Возраст')
+    birthday = DateField('Дата рождения', validators=[DataRequired()])
     about = TextAreaField('Расскажите о себе', default='')
     photo = FileField('Фото', validators=[FileAllowed(['jpg', 'png'], 'Images only!')])
     password = PasswordField('Пароль', validators=[DataRequired()])
diff --git a/main.log b/main.log
index 4fe5036..e69de29 100644
--- a/main.log
+++ b/main.log
@@ -1,24 +0,0 @@
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 2
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
-WARNING:waitress.queue:Task queue depth is 1
diff --git a/main.py b/main.py
index 3f595a2..555b011 100644
--- a/main.py
+++ b/main.py
@@ -124,7 +124,7 @@ def register():
         session['ps'] = form.password.data
         return redirect(
             url_for('confirmation', photo=photo, name=form.name.data, surname=form.surname.data, login=form.login.data,
-                    age=form.age.data, about=form.about.data, email=form.email.data, form=True))
+                    birthday=form.birthday.data, about=form.about.data, email=form.email.data, form=True))
     return render_template('main/register.html', title='Регистрация', form=form, message='')
 
 
@@ -137,7 +137,7 @@ def confirmation():
             name=request.args.get('name'),
             surname=request.args.get('surname'),
             login=request.args.get('login'),
-            age=request.args.get('age'),
+            birthday=request.args.get('age'),
             about=request.args.get('about'),
             email=request.args.get('email'),
             password=session['ps']
@@ -168,7 +168,7 @@ def confirmation():
                         name=form.name.data,
                         surname=form.surname.data,
                         login=form.login.data,
-                        age=form.age.data,
+                        birthday=form.birthday.data,
                         about=form.about.data,
                         email=form.email.data,
                         photo=session['photo'],
@@ -179,7 +179,7 @@ def confirmation():
                         name=form.name.data,
                         surname=form.surname.data,
                         login=form.login.data,
-                        age=form.age.data,
+                        birthday=form.birthday.data,
                         about=form.about.data,
                         email=form.email.data,
                         role='user',
@@ -281,7 +281,7 @@ def safe_app_school_register():
             return redirect(
                 url_for('confirmation', photo=photo, name=form.name.data, surname=form.surname.data,
                         login=form.login.data,
-                        age=form.age.data, about=form.about.data, email=form.email.data, form=True, app_school=True))
+                        birthday=form.birthday.data, about=form.about.data, email=form.email.data, form=True, app_school=True))
         return render_template('safe_app_school/register.html', title='Регистрация', form=form, message='')
 
 
@@ -398,7 +398,7 @@ def edit_profile(logins):
                     return redirect('/diary/confirmation')
             user.name = form.name.data
             user.surname = form.surname.data
-            user.age = form.age.data
+            user.birthday = form.birthday.data
             user.about = form.about.data
             if not ph_f and form.photo.data:
                 photo = save_photo(form.photo.data, logins)
@@ -420,7 +420,7 @@ def edit_profile(logins):
                 form.name.data = current_user.name
                 form.surname.data = current_user.surname
                 form.login.data = logins
-                form.age.data = current_user.age
+                form.birthday.data = current_user.birthday
                 form.about.data = current_user.about
                 form.password.data = None
                 form.password2.data = None
@@ -963,7 +963,7 @@ def diary_onfirmation():
                             name=form.name.data,
                             surname=form.surname.data,
                             login=form.login.data,
-                            age=form.age.data,
+                            birthday=form.birthday.data,
                             about=form.about.data,
                             email=form.email.data,
                             photo=photo,
@@ -974,7 +974,7 @@ def diary_onfirmation():
                             name=form.name.data,
                             surname=form.surname.data,
                             login=form.login.data,
-                            age=form.age.data,
+                            birthday=form.birthday.data,
                             about=form.about.data,
                             email=form.email.data,
                             role='user',
diff --git a/templates/diary/edit_profile.html b/templates/diary/edit_profile.html
index 7c2b2f6..66141b6 100644
--- a/templates/diary/edit_profile.html
+++ b/templates/diary/edit_profile.html
@@ -34,14 +34,14 @@
                     </div>
                     {% endfor %}
         </div>
-        <div class="col-md-6">
-            <label class="form-label">{{ form.age.label }}</label>
-            {{ form.age(class="form-control", type="number") }}
-            {% for error in form.age.errors %}
-                <div class="alert alert-danger" role="alert">
-                    {{ error }}
-                </div>
-                {% endfor %}
+        <div class="col-md-4">
+            <label class="form-label">{{ form.birthday.label }}</label>
+            {{ form.birthday(class="form-control", type="date") }}
+            {% for error in form.birthday.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-12">
             <label class="form-label">{{ form.about.label }}</label>
diff --git a/templates/diary/register.html b/templates/diary/register.html
index f478ed9..4ce5a9e 100644
--- a/templates/diary/register.html
+++ b/templates/diary/register.html
@@ -33,6 +33,15 @@
                     </div>
                     {% endfor %}
         </div>
+        <div class="col-md-4">
+            <label class="form-label">{{ form.birthday.label }}</label>
+            {{ form.birthday(class="form-control", type="date") }}
+            {% for error in form.birthday.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
+        </div>
         <div class="col-md-4">
             <label class="form-label">{{ form.password.label }}</label>
             {{ form.password(class="form-control", type="password") }}
@@ -60,15 +69,6 @@
                 </div>
                 {% endfor %}
         </div>
-        <div class="col-md-6">
-            <label class="form-label">{{ form.age.label }}</label>
-            {{ form.age(class="form-control", type="number") }}
-            {% for error in form.age.errors %}
-                <div class="alert alert-danger" role="alert">
-                    {{ error }}
-                </div>
-                {% endfor %}
-        </div>
         <div class="col-12">
             <label class="form-label">{{ form.about.label }}</label>
             {{ form.about(class="form-control", type="textarea") }}
diff --git a/templates/main/register.html b/templates/main/register.html
index b7cdef0..12523b5 100644
--- a/templates/main/register.html
+++ b/templates/main/register.html
@@ -38,6 +38,15 @@
                 </div>
                 {% endfor %}
             </div>
+            <div>
+                <label class="form-label">{{ form.birthday.label }}</label>
+                {{ form.birthday(class="form-control", type="date") }}
+                {% for error in form.birthday.errors %}
+                <div class="alert alert-danger" role="alert">
+                    {{ error }}
+                </div>
+                {% endfor %}
+            </div>
             <div>
                 <label class="form-label">{{ form.password.label }}</label>
                 {{ form.password(class="form-control", type="password") }}
diff --git a/templates/safe_app_school/register.html b/templates/safe_app_school/register.html
index 0daf341..9cff156 100644
--- a/templates/safe_app_school/register.html
+++ b/templates/safe_app_school/register.html
@@ -13,56 +13,65 @@
         <div class="col-md-6">
             <label class="form-label">{{ form.name.label }}</label>
             {{ form.name(class="form-control", type="text") }}
-                  {% for error in form.name.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.name.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-6">
             <label class="form-label">{{ form.surname.label }}</label>
             {{ form.surname(class="form-control", type="text") }}
-                  {% for error in form.surname.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.surname.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-4">
             <label class="form-label">{{ form.email.label }}</label>
             {{ form.email(class="form-control", type="email") }}
-                  {% for error in form.email.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.email.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
+        </div>
+        <div class="col-md-4">
+            <label class="form-label">{{ form.birthday.label }}</label>
+            {{ form.birthday(class="form-control", type="date") }}
+            {% for error in form.birthday.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-4">
             <label class="form-label">{{ form.password.label }}</label>
             {{ form.password(class="form-control", type="password") }}
-                  {% for error in form.password.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.password.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-4">
             <label class="form-label">{{ form.password2.label }}</label>
             {{ form.password2(class="form-control", type="password") }}
-                  {% for error in form.password2.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.password2.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-6">
             <label class="form-label">{{ form.login.label }}</label>
             {{ form.login(class="form-control", type="text") }}
             {% for error in form.login.errors %}
-                <div class="alert alert-danger" role="alert">
-                    {{ error }}
-                </div>
-                {% endfor %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="but">
             <p>{{ form.submit(type="submit", class="btn btn-primary", style="background-color:#38aaff") }}</p>
diff --git a/templates/simple/simple_register.html b/templates/simple/simple_register.html
index bda46f9..3fdc38a 100644
--- a/templates/simple/simple_register.html
+++ b/templates/simple/simple_register.html
@@ -21,56 +21,65 @@
         <div class="col-md-6">
             <label class="form-label">{{ form.name.label }}</label>
             {{ form.name(class="form-control", type="text") }}
-                  {% for error in form.name.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.name.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-6">
             <label class="form-label">{{ form.surname.label }}</label>
             {{ form.surname(class="form-control", type="text") }}
-                  {% for error in form.surname.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.surname.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-4">
             <label class="form-label">{{ form.email.label }}</label>
             {{ form.email(class="form-control", type="email") }}
-                  {% for error in form.email.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.email.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
+        </div>
+        <div class="col-md-4">
+            <label class="form-label">{{ form.birthday.label }}</label>
+            {{ form.birthday(class="form-control", type="date") }}
+            {% for error in form.birthday.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-4">
             <label class="form-label">{{ form.password.label }}</label>
             {{ form.password(class="form-control", type="password") }}
-                  {% for error in form.password.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.password.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-4">
             <label class="form-label">{{ form.password2.label }}</label>
             {{ form.password2(class="form-control", type="password") }}
-                  {% for error in form.password2.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ error }}
-                    </div>
-                    {% endfor %}
+            {% for error in form.password2.errors %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="col-md-6">
             <label class="form-label">{{ form.login.label }}</label>
             {{ form.login(class="form-control", type="text") }}
             {% for error in form.login.errors %}
-                <div class="alert alert-danger" role="alert">
-                    {{ error }}
-                </div>
-                {% endfor %}
+            <div class="alert alert-danger" role="alert">
+                {{ error }}
+            </div>
+            {% endfor %}
         </div>
         <div class="but">
             <p>{{ form.submit(type="submit", class="btn btn-primary", style="background-color:#38aaff") }}</p>