Модель сессии и логина переписана и работает

.gitignore

@@ -1,3 +1,4 @@
 ./idea
 ./venv
 ./vscode
+./data.db

__init__.py

@@ -9,9 +9,9 @@ login_manager = LoginManager(app)
 
 
 @login_manager.user_loader
-def load_user(user):
+def load_user(user_id):
-    user_id = user.UserID
+    userID = db_routing.find_user(id=user_id).UserID
-    return user_id
+    return userID
 
 
 @app.route('/', methods=['GET'])
@@ -22,21 +22,22 @@ def index():
 @app.route('/registration', methods=['GET', 'POST'])
 def register():
     if request.method == 'POST':
-        userLogin = request.form['RegUserLogin']
+        userName = request.form['RegUserLogin']
         userPassw = request.form['RegUserPassw']
-        if db_routing.add_user(userLogin, passw_hash(userPassw)):
+        if db_routing.add_user(userName, passw_hash(userPassw)):
-            return redirect('/content')
+            login_user(db_routing.find_user(username=userName))
+            return redirect('content.html')
     return render_template('registration.html')
 
 
 @app.route('/login', methods=['POST'])
 def login():
-    userLogin = request.form['LogUserLogin']
+    userName = request.form['LogUserLogin']
     userPassw = request.form['LogUserPassw']
-    user = verify_password(userLogin, userPassw)
+    user = verify_password(userName, userPassw)
     if user:
         login_user(user)
-        return redirect('/content')
+        return render_template('content.html')
 
 
 @app.route('/content', methods=['GET'])
@@ -58,11 +59,11 @@ def passw_hash(user_passw, salt=os.urandom(32)):
     return storage
 
 
-def verify_password(user_login, user_passw):
+def verify_password(username, password):
-    User = db_routing.find_user(user_login)
+    User = db_routing.find_user(username=username)
     if User:
-        userSalt = User.UserPassw[:32]
+        userSalt = User.password[:32]
-        if passw_hash(user_passw, userSalt) == User.UserPassw:
+        if passw_hash(password, userSalt) == User.password:
             return User
     else:
         print('Неверный пароль')

db_routing.py

@@ -1,43 +1,48 @@
 from flask_sqlalchemy import SQLAlchemy
 from flask import Flask
-
+from flask_login import UserMixin
 
 app = Flask('Jarvis', static_folder='static', template_folder='templates')
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db'
+app.config['SECRET_KEY'] = 'Radius'
 db = SQLAlchemy(app)
 
 
-class User(db.Model):
+class User(UserMixin, db.Model):
     __tablename__ = 'Users'
-    UserID = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True)
-    UserName = db.Column(db.String(80), unique=True, nullable=False)
+    username = db.Column(db.String(80), unique=True, nullable=False)
-    UserPassw = db.Column(db.String(120), nullable=False)
+    password = db.Column(db.String(120), nullable=False)
+
+    def __init__(self, username, password):
+        self.username = username
+        self.password = password
 
 
 class Trigger(db.Model):
     __tablename__ = 'Triggers'
-    TriggerID = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True)
-    TriggerName = db.Column(db.String(80), unique=True, nullable=False)
+    triggername = db.Column(db.String(80), unique=True, nullable=False)
-    TriggerArgs = db.Column(db.String(200))
+    triggerargs = db.Column(db.String(200))
 
 
 class Action(db.Model):
     __tablename__ = 'Actions'
-    ActionID = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True)
-    ActionName = db.Column(db.String(80), unique=True, nullable=False)
+    actionname = db.Column(db.String(80), unique=True, nullable=False)
-    ActionArgs = db.Column(db.String(200))
+    actionargs = db.Column(db.String(200))
 
 
 class Scenario(db.Model):
     __tablename__ = 'Scenarios'
-    ScenarioID = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.Integer, primary_key=True)
-    ScenarioTrigger = db.Column(db.Integer, nullable=False)
+    scenariotrigger = db.Column(db.Integer, nullable=False)
-    ScenarioAction = db.Column(db.Integer, nullable=False)
+    scenarioaction = db.Column(db.Integer, nullable=False)
 
 
 def add_user(user_name, passw_hash):
     if not find_user(user_name):
-        new_user = User(UserName=user_name, UserPassw=passw_hash)
+        new_user = User(username=user_name, password=passw_hash)
         db.session.add(new_user)
         db.session.commit()
         return new_user
@@ -46,5 +51,8 @@ def add_user(user_name, passw_hash):
         return False
 
 
-def find_user(user_name):
+def find_user(id=None, username=None):
-    return User.query.filter_by(UserName=user_name).first()
+    if id:
+        return User.query.filter_by(id=id).first()
+    if username:
+        return User.query.filter_by(username=username).first()

templates/index.html

@@ -22,22 +22,20 @@
                 <div class="header_right">
                     <div class="contacts">
                         <div class="drop">                   
-                            <div href="" class="contacts__schedule">Войти</div>
+                            <div class="contacts__schedule">Войти</div>
                             <div class="dropdown">
-                                <form action="" method="POST">
+                                <div class="drop-block">
-                                    <div class="drop-block">                                        
+                                    <form action="/login" method="POST">
                                         <div class="triangle"></div>
                                         <label class="form__cell-header ">
                                             <input type="text" class="form__input-text-mod" placeholder="Логин" name= "LogUserLogin">
                                         </label>
                                         <label class="form__cell-header">
-                                            <input type="password" class="form__input-text-mod" placeholder="Пароль" name= "LogUserLogin">
+                                            <input type="password" class="form__input-text-mod" placeholder="Пароль" name= "LogUserPassw">
                                         </label>
-                                        <a href="/login" class="input">
+                                        <button type="submit" value="Войти" class="header_btn" name="LogButton" >Вход</button>
-                                            <input type="button" href="/login" name="LogButton" class="header_btn" value="Войти" >
+                                    </form>
-                                        </a> 
+                                </div>
-                                    </div>
-                                </form>
                             </div>
                         </div>
                     </div>
@@ -63,7 +61,7 @@
                                 <p class="text_content">Ваш индивидуальный помощник на каждый день</p>
                             </div>
                             <div class="input-button">
-                                <a href="" class="input">
+                                <a href="/registration" class="input">
                                     <input type="button" href="/registration" name="scriptbutton" class="welcome__btn" value="Регистрация" >
                                 </a>
                         </div>

templates/registration.html

@@ -31,7 +31,7 @@
                                             <input type="text" class="form__input-text-mod" placeholder="Логин" name= "LogUserLogin">
                                         </label>
                                         <label class="form__cell-header">
-                                            <input type="password" class="form__input-text-mod" placeholder="Пароль" name= "LogUserLogin">
+                                            <input type="password" class="form__input-text-mod" placeholder="Пароль" name= "LogUserPassw">
                                         </label>
                                         <a href="" class="input">
                                             <input type="button" href="/content.html" name="LogButton" class="header_btn" value="Войти" >
@@ -88,7 +88,7 @@
                             <div class="form__controls">
                                 <div class="form__controls-btns clearfix">
                                     <div class="form__controls-right">
-                                        <button type="submit" value="Отправить" class="form__submit" name="RegButton" href="/content" >Регистрация</button>
+                                        <button type="submit" value="Отправить" class="form__submit" name="RegButton" >Регистрация</button>
                                     </div>
                                 </div>
                             </div>