From d1a6c3d2d8a811ebd8911a664f967f86815bd76d Mon Sep 17 00:00:00 2001
From: mrmur <andreiduvakin@mail.ru>
Date: Sun, 3 Apr 2022 18:11:35 +0500
Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=BE=D0=BD=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=20=D0=B8=20=D1=84?=
 =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F=20=D1=80=D0=B5=D0=B3=D0=B8?=
 =?UTF-8?q?=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       |   3 ++-
 main.py                 |  19 +++++++++++--------
 templates/register.html |   2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/db/moona_data.db b/db/moona_data.db
index 85b507ce76c0a92ca44a0b0bf10ab894a9c826a5..2d927f7616cdb55fdf917880864526e2e17f4009 100644
GIT binary patch
delta 185
zcmZojXh@hK&B!%T#+i|8W5P;)M!C&`0^<Cfj~G-nr5Vk6BPR#Q+te4AB$i|*>u2Vs
z>z5X%7R482<d@{@yOfqCW@qNb=j5m7>lNgs7bIn;q#0QiXCxY#npqi{832JwPKJ4i
zuXl*6e^qF1QCd}qie<8qiJ7I5X_941lBr>$p@E5UvQe_Jv6)$#Sz4-5s+qBgu}N}r
jqD87js<EY^QIe@Cuc4_$vPrU~xsiE_Ny_F=@_YgSq8K-o

delta 171
zcmZojXh@hK&B!)U#+i|AW5P;)MwiWk3by>5dl*zTr5Vk6876DV+te2%Wv8SWSrum_
z8kw3|8JQUXfr?>Spl5iVrF&IYYK4<gQKgERfqAk~YGPVyVxonaWs;?#X_Bc?l1Z|0
zqM@m=k&&r+ikU&Op=Gj}Ns_sFN~)QKp_#Eoib<-unNd=rrKN?Dfsv7}fr+kxacOaC
U5f=jx2rw}4KWEs?t?-o}0GQ`37ytkO

diff --git a/forms/register.py b/forms/register.py
index 70e2fd1..945c9d8 100644
--- a/forms/register.py
+++ b/forms/register.py
@@ -1,4 +1,5 @@
 from flask_wtf import FlaskForm
+from flask_wtf.file import FileAllowed
 from wtforms import EmailField, StringField, PasswordField, SubmitField, FileField, IntegerField, TextAreaField
 from wtforms.validators import DataRequired
 
@@ -10,7 +11,7 @@ class RegisterForm(FlaskForm):
     login = StringField('Логин', validators=[DataRequired()])
     age = IntegerField('Age', validators=[DataRequired()])
     about = TextAreaField('Расскажите о себе', default='')
-    photo = FileField('Фото')
+    photo = FileField('Фото', validators=[FileAllowed(['jpg', 'png'])])
     password = PasswordField('Пароль', validators=[DataRequired()])
     password2 = PasswordField('Повторите пароль', validators=[DataRequired()])
     submit = SubmitField('Регистрация')
diff --git a/main.py b/main.py
index 27e02c7..829f4c9 100644
--- a/main.py
+++ b/main.py
@@ -1,9 +1,9 @@
 from random import randint
 
-from PIL import Image
-from flask import Flask, render_template, request
+from flask import Flask, render_template
 from werkzeug.utils import redirect
 
+from PIL import Image
 from data import db_session
 from data.users import User
 from forms.register import RegisterForm, Confirmation
@@ -14,14 +14,13 @@ app.config['SECRET_KEY'] = 'moona_secret_key'
 help_arg = None
 send_msg = False
 secret_code = None
+photo = None
 
 
 def save_photo(photo, login):
-    size = (250, 250)
-    im = Image.open(photo)
-    im.thumbnail(size)
-    im.save(f'static/img/user_photo/{login}.png')
-    return f'static/img/user_photo/{login}.png'
+    with open(f'static/img/user_photo/{login}_logo.png', 'wb') as f:
+        photo.save(f)
+    return f'static/img/user_photo/{login}_logo.png'
 
 
 def secret_key():
@@ -38,6 +37,7 @@ def confirmation():
     global help_arg
     global send_msg
     global secret_code
+    global photo
     form = help_arg
     session = db_session.create_session()
     conf = Confirmation()
@@ -55,7 +55,7 @@ def confirmation():
                     age=form.age.data,
                     about=form.about.data,
                     email=form.email.data,
-                    photo=save_photo(request.files['file'], form.login.data),
+                    photo=photo,
                     role='user'
                 )
             else:
@@ -82,6 +82,7 @@ def confirmation():
 @app.route('/register', methods=['GET', 'POST'])
 def register():
     global help_arg
+    global photo
     form = RegisterForm()
     if form.validate_on_submit():
         if form.password.data != form.password2.data:
@@ -94,6 +95,8 @@ def register():
                                    form=form,
                                    message="Такой пользователь уже есть")
         help_arg = form
+        if form.photo.data:
+            photo = save_photo(form.photo.data, form.login.data)
         return redirect('/confirmation')
     return render_template('register.html', title='Регистрация', form=form, message='')
 
diff --git a/templates/register.html b/templates/register.html
index 99a4b1e..b2523d8 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -4,7 +4,7 @@
 {% block content %}
 <div class="divlog">
     <h1 class="title">Регистрация</h1>
-    <form action="" method="post">
+    <form action="" method="POST" enctype="multipart/form-data">
         {{ form.hidden_tag() }}
         {{ form.csrf_token }}
         <p>