diff --git a/app.py b/app.py index 14aa76c..59629f1 100644 --- a/app.py +++ b/app.py @@ -11,7 +11,7 @@ from flask_login import LoginManager, current_user from flask_wtf.csrf import CSRFProtect, CSRFError from werkzeug.security import generate_password_hash -from database import db +from runnerspace.database import db csrf = CSRFProtect() @@ -39,22 +39,22 @@ def create_app(): login_manager.login_view = 'auth.login' login_manager.init_app(app) - from models import User, Post, Comment + from runnerspace.models import User, Post, Comment @login_manager.user_loader def load_user(user_id): return User.query.get(int(user_id)) - from auth import blueprint as auth_blueprint + from runnerspace.auth import blueprint as auth_blueprint app.register_blueprint(auth_blueprint) - from routes import blueprint as routes_blueprint + from runnerspace.routes import blueprint as routes_blueprint app.register_blueprint(routes_blueprint) - from route_forms import blueprint as forms_blueprint + from runnerspace.route_forms import blueprint as forms_blueprint app.register_blueprint(forms_blueprint) - from static_routes import blueprint as static_blueprint + from runnerspace.static_routes import blueprint as static_blueprint app.register_blueprint(static_blueprint) @app.errorhandler(404) diff --git a/auth.py b/runnerspace/auth.py similarity index 94% rename from auth.py rename to runnerspace/auth.py index d809e49..ee28755 100644 --- a/auth.py +++ b/runnerspace/auth.py @@ -2,9 +2,9 @@ from flask import Blueprint, flash, redirect, request, url_for, render_template, from flask_login import login_required, login_user, logout_user, current_user from werkzeug.security import check_password_hash, generate_password_hash -from forms import LoginForm, RegistrationForm, EditProfileForm -from models import User -from database import db +from runnerspace.forms import LoginForm, RegistrationForm, EditProfileForm +from runnerspace.models import User +from runnerspace.database import db blueprint = Blueprint('auth', __name__) diff --git a/database.py b/runnerspace/database.py similarity index 100% rename from database.py rename to runnerspace/database.py diff --git a/forms.py b/runnerspace/forms.py similarity index 97% rename from forms.py rename to runnerspace/forms.py index 8a5b0a5..bde3321 100644 --- a/forms.py +++ b/runnerspace/forms.py @@ -1,7 +1,7 @@ from flask_wtf import FlaskForm from wtforms import BooleanField, StringField, PasswordField, TextAreaField, validators -from validators import NoProfanity +from runnerspace.validators import NoProfanity class RegistrationForm(FlaskForm): diff --git a/models.py b/runnerspace/models.py similarity index 99% rename from models.py rename to runnerspace/models.py index 8d290e2..fb92291 100644 --- a/models.py +++ b/runnerspace/models.py @@ -1,13 +1,11 @@ import datetime -import json -from typing import List import humanize from flask import url_for from flask_login import UserMixin from sqlalchemy import func -from database import db +from runnerspace.database import db # Amount of time before a user is considered 'offline' MAXIMUM_ONLINE_DELTA = datetime.timedelta(minutes=3) diff --git a/route_forms.py b/runnerspace/route_forms.py similarity index 88% rename from route_forms.py rename to runnerspace/route_forms.py index 0248865..a9a6303 100644 --- a/route_forms.py +++ b/runnerspace/route_forms.py @@ -1,8 +1,8 @@ from flask import Blueprint, flash, redirect, request, url_for, render_template from flask_login import current_user, login_required -from forms import RegistrationForm, EditProfileForm, NewPostForm, NewCommentForm -from database import db -from models import User, Post, Comment +from runnerspace.forms import RegistrationForm, EditProfileForm, NewPostForm, NewCommentForm +from runnerspace.database import db +from runnerspace.models import User, Post, Comment blueprint = Blueprint('forms', __name__) diff --git a/routes.py b/runnerspace/routes.py similarity index 94% rename from routes.py rename to runnerspace/routes.py index 0d36540..d0537fa 100644 --- a/routes.py +++ b/runnerspace/routes.py @@ -1,9 +1,9 @@ from flask import Blueprint, redirect, render_template, url_for, request, jsonify from flask_login import current_user, login_required -from models import User, Post, Comment, PostLike, CommentLike -from forms import NewPostForm, NewCommentForm, EditProfileForm -from database import db +from runnerspace.models import User, Post, Comment, PostLike, CommentLike +from runnerspace.forms import NewPostForm, NewCommentForm, EditProfileForm +from runnerspace.database import db blueprint = Blueprint('main', __name__) diff --git a/static_routes.py b/runnerspace/static_routes.py similarity index 100% rename from static_routes.py rename to runnerspace/static_routes.py diff --git a/validators.py b/runnerspace/validators.py similarity index 100% rename from validators.py rename to runnerspace/validators.py