diff --git a/app.py b/app.py index c1a256c..0d177ea 100644 --- a/app.py +++ b/app.py @@ -3,8 +3,9 @@ # ========================= # Librarys # ========================= -from dotenv import load_dotenv, find_dotenv import os +from os.path import join, dirname +from dotenv import load_dotenv from flask import Flask, request from flask_restplus import Resource, Api from models import db, User, Notice, Comment @@ -13,7 +14,8 @@ from flask_marshmallow import Marshmallow # ========================= # Extensions initialization # ========================= -load_dotenv(find_dotenv()) +dotenv_path = join(dirname(__file__), 'env') +load_dotenv(dotenv_path) app = Flask(__name__) ma = Marshmallow(app) api = Api(app) diff --git a/env b/env new file mode 100644 index 0000000..72eb7f9 --- /dev/null +++ b/env @@ -0,0 +1,3 @@ +DEBUG=True +DATABASE_URI='sqlite:///database.sqlite' +SECRET_KEY='my secret' diff --git a/models.py b/models.py index fb7ccf2..5129eff 100644 --- a/models.py +++ b/models.py @@ -1,14 +1,17 @@ # -*- coding: utf-8 -*- # Librarys import os +from os.path import join, dirname from flask import Flask from datetime import datetime from flask_sqlalchemy import SQLAlchemy from flask_script import Manager from flask_migrate import Migrate, MigrateCommand -from dotenv import load_dotenv, find_dotenv +from dotenv import load_dotenv + +dotenv_path = join(dirname(__file__), 'env') +load_dotenv(dotenv_path) -load_dotenv(find_dotenv()) app = Flask(__name__) @@ -58,7 +61,11 @@ class Notice(db.Model): # Relations user = db.relationship( - 'User', backref=db.backref('Notice', lazy=True, cascade="all, delete-orphan")) + 'User', + backref=db.backref( + 'Notice', + lazy=True, + cascade="all, delete-orphan")) def __repr__(self): return ''.format(self.title) @@ -82,9 +89,13 @@ class Comment(db.Model): # Relations user = db.relationship( - 'User', backref=db.backref('Comment', lazy=True, cascade="all, delete-orphan")) - notice = db.relationship( - 'Notice', backref=db.backref('Comment', lazy=True, cascade="all, delete-orphan")) + 'User', + backref=db.backref( + 'Comment', + lazy=True, + cascade="all, delete-orphan")) + notice = db.relationship('Notice', backref=db.backref( + 'Comment', lazy=True, cascade="all, delete-orphan")) def __repr__(self): return ''.format(self.id)