diff --git a/app.py b/app.py index e7513a5..00fcf14 100644 --- a/app.py +++ b/app.py @@ -7,14 +7,15 @@ from werkzeug.debug import DebuggedApplication from whitenoise import WhiteNoise -from admin import admin -from blog import blog from calculator import calculator from extentions import db, elastic, jwt, mail, migrate from foods import foods -from foods import models as food_models from users import models as user_models +from foods import models as food_models +from blog import models as blog_models from users import users +from blog import blog +from admin import admin def create_app(environment='Development'): @@ -44,9 +45,9 @@ def temp_main_function(): } app.register_blueprint(calculator) - app.register_blueprint(blog) app.register_blueprint(users) app.register_blueprint(foods) + app.register_blueprint(blog) db.init_app(app) diff --git a/blog/views.py b/blog/views.py index 07555d6..876bbed 100644 --- a/blog/views.py +++ b/blog/views.py @@ -6,6 +6,7 @@ from . import blog from .forms import PostForm from .models import Post +from users.models import User @blog.route('/', methods=['GET']) @@ -15,7 +16,7 @@ def list_posts(): for p in posts: tmp = dict() tmp['id'] = p.id - tmp = {'slug': p.slug, 'title' : p.title, 'summary': p.summary, 'content': p.content, 'category': p.category} + tmp = {'slug': p.slug, 'title': p.title, 'summary': p.summary, 'content': p.content, 'category': p.category} result.update({f'{p.id}': tmp}) return jsonify(result), 200 @@ -23,7 +24,8 @@ def list_posts(): @blog.route('/', methods=['GET']) def single_post(slug): post = Post.query.filter(Post.slug == slug).first() - result = {'slug': post.slug, 'title' : post.title, 'summary': post.summary, 'content': post.content, 'category': post.category} + result = {'slug': post.slug, 'title': post.title, 'summary': post.summary, 'content': post.content, + 'category': post.category} return jsonify(result), 200 @@ -63,4 +65,4 @@ def delete_post(post_id): # post.summary = form.summary.data # post.category = form.category.data # db.session.commit() -# return {'msg': 'Post Modified!'}, 201 \ No newline at end of file +# return {'msg': 'Post Modified!'}, 201 diff --git a/users/models.py b/users/models.py index ebe1ce7..2fe9e61 100644 --- a/users/models.py +++ b/users/models.py @@ -4,7 +4,6 @@ from werkzeug.security import check_password_hash, generate_password_hash from extentions import db -from blog.models import Post from flask_admin.contrib.sqla import ModelView diff --git a/users/views.py b/users/views.py index 9c434d0..c41df88 100644 --- a/users/views.py +++ b/users/views.py @@ -11,7 +11,6 @@ from users.forms import ChangePasswordForm, LoginForm, RegisterForm from users.models import User from users.token import confirm_token, generate_confirmation_token -from utils.decorators import confirmed_only, json_only @users.route('/signup', methods=['POST'])