Llloooggg/Jarvis
1
0
Fork 0
mirror of https://github.com/Llloooggg/Jarvis.git synced 2026-03-06 20:16:23 +03:00
Code Issues 21 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Denis Podshivalov
2020-03-15 22:45:11 +03:00
parent fb0fa13a4e
commit 60f3fd5c09
5 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
db_routing.py
View File

@@ -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)
UserName = db.Column(db.String(80), unique=True, nullable=False)
UserPassw = db.Column(db.String(120), nullable=False)
id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, 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)
TriggerName = db.Column(db.String(80), unique=True, nullable=False)
TriggerArgs = db.Column(db.String(200))
id = db.Column(db.Integer, primary_key=True)
triggername = db.Column(db.String(80), unique=True, nullable=False)
triggerargs = db.Column(db.String(200))
class Action(db.Model):
__tablename__ = 'Actions'
ActionID = db.Column(db.Integer, primary_key=True)
ActionName = db.Column(db.String(80), unique=True, nullable=False)
ActionArgs = db.Column(db.String(200))
id = db.Column(db.Integer, primary_key=True)
actionname = db.Column(db.String(80), unique=True, nullable=False)
actionargs = db.Column(db.String(200))
class Scenario(db.Model):
__tablename__ = 'Scenarios'
ScenarioID = db.Column(db.Integer, primary_key=True)
ScenarioTrigger = db.Column(db.Integer, nullable=False)
ScenarioAction = db.Column(db.Integer, nullable=False)
id = db.Column(db.Integer, primary_key=True)
scenariotrigger = 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):
return User.query.filter_by(UserName=user_name).first()
def find_user(id=None, username=None):
if id:
return User.query.filter_by(id=id).first()
if username:
return User.query.filter_by(username=username).first()