moves models to database folder
This commit is contained in:
parent
c9cbb53eea
commit
0cfc801f59
2
backend
2
backend
@ -1 +1 @@
|
|||||||
Subproject commit f94c64e699e29cac8c707337e219ada64a1ae01e
|
Subproject commit 26cc3425ee50ff516d75903d9e281b30860c497b
|
@ -23,5 +23,5 @@ migrate = Migrate(app, db)
|
|||||||
# https://flask-login.readthedocs.io/en/latest
|
# https://flask-login.readthedocs.io/en/latest
|
||||||
login_manager = LoginManager(app)
|
login_manager = LoginManager(app)
|
||||||
|
|
||||||
|
from server import routes
|
||||||
from server import routes, models
|
from database import models
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
from flask_wtf import FlaskForm
|
from flask_wtf import FlaskForm
|
||||||
from wtforms import StringField, PasswordField, BooleanField, SubmitField
|
from wtforms import StringField, PasswordField, BooleanField, SubmitField
|
||||||
from wtforms.validators import DataRequired, ValidationError, Email, EqualTo
|
from wtforms.validators import DataRequired, ValidationError, Email, EqualTo
|
||||||
from server.models import User
|
from database.models import User
|
||||||
import email_validator
|
import email_validator
|
||||||
|
|
||||||
class LoginForm(FlaskForm):
|
class LoginForm(FlaskForm):
|
||||||
|
@ -23,7 +23,7 @@ from flask_login import (
|
|||||||
)
|
)
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from server.models import Calendar as dbCalendar
|
from database.models import Calendar as dbCalendar
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
CLIENT_SECRETS_FILE = "certificate/client_secret.json"
|
CLIENT_SECRETS_FILE = "certificate/client_secret.json"
|
||||||
|
@ -21,7 +21,7 @@ import server.googleHandler as google
|
|||||||
from backend.Routine import Routine
|
from backend.Routine import Routine
|
||||||
from server import login_manager, app, db
|
from server import login_manager, app, db
|
||||||
from server.forms import LoginForm, RegistrationForm, DeviceForm
|
from server.forms import LoginForm, RegistrationForm, DeviceForm
|
||||||
from server.models import User, Calendar, Device
|
from database.models import User, Calendar, Device
|
||||||
|
|
||||||
os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
|
os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user