Добавлены внешние ключи в модель бд

This commit is contained in:
2020-03-16 21:25:11 +03:00
parent 7ee6d0c29e
commit 07ded24e2c
3 changed files with 13 additions and 6 deletions

View File

@@ -42,7 +42,7 @@ def login():
@app.route('/logout') @app.route('/logout')
def logout(): def logout():
logout_user() logout_user()
return redirect(url_for('/')) return redirect(url_for('index'))
@app.route('/workshop', methods=['GET']) @app.route('/workshop', methods=['GET'])

View File

@@ -1,4 +1,5 @@
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from sqlalchemy import ForeignKey
from flask import Flask from flask import Flask
app = Flask('Jarvis', static_folder='static', template_folder='templates') app = Flask('Jarvis', static_folder='static', template_folder='templates')
@@ -13,6 +14,7 @@ class User(db.Model):
username = db.Column(db.String(80), unique=True, nullable=False) username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(120), nullable=False) password = db.Column(db.String(120), nullable=False)
def __init__(self, username, password): def __init__(self, username, password):
self.username = username self.username = username
self.password = password self.password = password
@@ -31,21 +33,24 @@ class Trigger(db.Model):
__tablename__ = 'Triggers' __tablename__ = 'Triggers'
id = 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)) trigger_def = db.Column(db.String(200))
class Action(db.Model): class Action(db.Model):
__tablename__ = 'Actions' __tablename__ = 'Actions'
id = 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)) action_def = db.Column(db.String(200))
class Scenario(db.Model): class Scenario(db.Model):
__tablename__ = 'Scenarios' __tablename__ = 'Scenarios'
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
scenariotrigger = db.Column(db.Integer, nullable=False) owner_id = db.Column(db.Integer, ForeignKey('Users.id'))
scenarioaction = db.Column(db.Integer, nullable=False) trigger_id = db.Column(db.Integer, ForeignKey('Triggers.id'))
trigger_args = db.Column(db.String(200))
action_id = db.Column(db.Integer, ForeignKey('Action.id'))
action_args = db.Column(db.String(200))
def add_user(user_name, passw_hash): def add_user(user_name, passw_hash):
@@ -64,3 +69,5 @@ def find_user(id=None, username=None):
return User.query.filter_by(id=id).first() return User.query.filter_by(id=id).first()
if username: if username:
return User.query.filter_by(username=username).first() return User.query.filter_by(username=username).first()
#def get_trigers():

View File

@@ -44,7 +44,7 @@
</div> </div>
<div class="not_found-img"> <div class="not_found-img">
<img src="{{ url_for('static', filename='./static/img/travolta.png') }}" alt="" class="img404"> <img src="{{ url_for('static', filename='./img/travolta.png') }}" alt="" class="img404">
</div> </div>
</section> </section>