From 3f66e6476dec074b4f5e2ba25285dedad0ca50cb Mon Sep 17 00:00:00 2001
From: mrmur <andreiduvakin@mail.ru>
Date: Sat, 2 Apr 2022 21:38:23 +0500
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20(=D0=BF=D0=BE=D1=87=D1=82=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

---
 data/users.py    |  12 ++++++++++--
 db/moona_data.db | Bin 12288 -> 12288 bytes
 main.py          |  44 ++++++++++++++++++++++++++++++++------------
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/data/users.py b/data/users.py
index 6f9873d..d85bfa0 100644
--- a/data/users.py
+++ b/data/users.py
@@ -1,5 +1,7 @@
-import sqlalchemy
 from datetime import date
+
+import sqlalchemy
+from werkzeug.security import check_password_hash, generate_password_hash
 from .db_session import SqlAlchemyBase
 
 
@@ -20,4 +22,10 @@ class User(SqlAlchemyBase):
     data_reg = sqlalchemy.Column(sqlalchemy.Date,
                                  default=date.today())
     role = sqlalchemy.Column(sqlalchemy.String, nullable=True)
-    activity = sqlalchemy.Column(sqlalchemy.Date, nullable=True)
\ No newline at end of file
+    activity = sqlalchemy.Column(sqlalchemy.Date, nullable=True)
+
+    def check_password(self, password):
+        return check_password_hash(self.hashed_password, password)
+
+    def set_password(self, password):
+        self.password = generate_password_hash(password)
diff --git a/db/moona_data.db b/db/moona_data.db
index 6272247e9188302ddccd3ee527e4d02b42cca8d2..90f50f7661f3aa76a26d3f0b691bd0e4fb71ac42 100644
GIT binary patch
delta 124
zcmZojXh@hK&B!uQ##xYsLC?R2mw|zSiEkDI-#flpn*{~5_%_et%VT8XKMLgR<9D)F
z)s$vr04h>sV7M^h!rlv8E;d})dST~<DHoeBY`U=F!mbNDF6?zFElbSK%o8v&Ff!6L
bFwr$I;sP4WAi%)D{|9K!d;W<5Y>X@bnPDja

delta 62
zcmZojXh@hK&B!!S##xYwLC?RImw|zSiEkDI-#flpn*{~5_%_et%VXRutnh|^VgL^t
P7f_l(V6&jYI}jHD<a7^N

diff --git a/main.py b/main.py
index cbabcbc..3cd4948 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,7 @@
 from random import randint
 
 from PIL import Image
-from flask import Flask, render_template
+from flask import Flask, render_template, request
 from werkzeug.utils import redirect
 
 from data import db_session
@@ -12,6 +12,8 @@ from post import mail
 app = Flask(__name__)
 app.config['SECRET_KEY'] = 'moona_secret_key'
 help_arg = None
+send_msg = False
+secret_code = None
 
 
 def save_photo(photo, login):
@@ -34,27 +36,45 @@ def main_page():
 @app.route('/confirmation', methods=['GET', 'POST'])
 def confirmation():
     global help_arg
+    global send_msg
+    global secret_code
     form = help_arg
     session = db_session.create_session()
     conf = Confirmation()
-    secret_code = secret_key()
-    mail(f'Ваш секретный код: {secret_code}', form.email.data, 'Moona Код')
+    if not send_msg:
+        secret_code = secret_key()
+        mail(f'Ваш секретный код: {secret_code}', form.email.data, 'Moona Код')
+        send_msg = True
     if conf.validate_on_submit():
         if str(conf.code_key.data).strip() == str(secret_code).strip():
-            user = User(
-                name=form.name.data,
-                surname=form.surname.data,
-                login=form.login.data,
-                age=form.age.data,
-                about=form.about.data,
-                photo=save_photo(form.photo.data, form.login.data)
-            )
+            if form.photo.data:
+                user = User(
+                    name=form.name.data,
+                    surname=form.surname.data,
+                    login=form.login.data,
+                    age=form.age.data,
+                    about=form.about.data,
+                    email=form.email.data,
+                    photo=save_photo(request.files['file'], form.login.data),
+                    role='user'
+                )
+            else:
+                user = User(
+                    name=form.name.data,
+                    surname=form.surname.data,
+                    login=form.login.data,
+                    age=form.age.data,
+                    about=form.about.data,
+                    email=form.email.data,
+                    role='user'
+                )
             user.set_password(form.password.data)
             session.add(user)
             session.commit()
+            send_msg = False
             return redirect('/login')
         else:
-            return render_template('confirmation_reg.html', title='Подтверждение', form=form,
+            return render_template('confirmation_reg.html', title='Подтверждение', form=conf,
                                    message='Коды не совпадают')
     return render_template('confirmation_reg.html', title='Подтверждение', form=conf)