From e3106ec0ead117f4002a59cd2ac264c97e8372f3 Mon Sep 17 00:00:00 2001 From: H4CK3R-01 Date: Mon, 14 Mar 2022 17:36:38 +0100 Subject: [PATCH] Fixed imports --- .../keyword.py => api_blueprint_keyword.py} | 6 +++--- .../shares.py => api_blueprint_shares.py} | 6 +++--- .../{blueprints/user.py => api_blueprint_user.py} | 6 +++--- webservice/app.py | 12 ++++++------ webservice/{interface.py => blueprint_interface.py} | 4 ++-- webservice/helper_functions.py | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) rename webservice/{blueprints/keyword.py => api_blueprint_keyword.py} (91%) rename webservice/{blueprints/shares.py => api_blueprint_shares.py} (91%) rename webservice/{blueprints/user.py => api_blueprint_user.py} (92%) rename webservice/{interface.py => blueprint_interface.py} (64%) diff --git a/webservice/blueprints/keyword.py b/webservice/api_blueprint_keyword.py similarity index 91% rename from webservice/blueprints/keyword.py rename to webservice/api_blueprint_keyword.py index 5a01828..5ba32fe 100644 --- a/webservice/blueprints/keyword.py +++ b/webservice/api_blueprint_keyword.py @@ -2,9 +2,9 @@ import os from flask import Blueprint, jsonify, request -from webservice.db import db -from webservice.helper_functions import get_username_from_token_data, extract_token_data, get_token, get_user_id_from_username -from webservice.models import Keyword +from db import db +from helper_functions import get_username_from_token_data, extract_token_data, get_token, get_user_id_from_username +from models import Keyword keyword_blueprint = Blueprint('keyword', __name__, url_prefix='/api') __location__ = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))) diff --git a/webservice/blueprints/shares.py b/webservice/api_blueprint_shares.py similarity index 91% rename from webservice/blueprints/shares.py rename to webservice/api_blueprint_shares.py index eb9808c..728e137 100644 --- a/webservice/blueprints/shares.py +++ b/webservice/api_blueprint_shares.py @@ -2,9 +2,9 @@ import os from flask import Blueprint, jsonify, request -from webservice.db import db -from webservice.helper_functions import get_username_from_token_data, extract_token_data, get_token, get_user_id_from_username -from webservice.models import Keyword, Share +from db import db +from helper_functions import get_username_from_token_data, extract_token_data, get_token, get_user_id_from_username +from models import Share shares_blueprint = Blueprint('share', __name__, url_prefix='/api') __location__ = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))) diff --git a/webservice/blueprints/user.py b/webservice/api_blueprint_user.py similarity index 92% rename from webservice/blueprints/user.py rename to webservice/api_blueprint_user.py index 2926294..5024281 100644 --- a/webservice/blueprints/user.py +++ b/webservice/api_blueprint_user.py @@ -4,9 +4,9 @@ import os import jwt from flask import Blueprint, jsonify, request -from webservice.db import db -from webservice.helper_functions import check_password, hash_password, get_token, extract_token_data -from webservice.models import User +from db import db +from helper_functions import check_password, hash_password, get_token, extract_token_data +from models import User users_blueprint = Blueprint('users', __name__, url_prefix='/api') __location__ = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))) diff --git a/webservice/app.py b/webservice/app.py index 1c5c0cc..f8dac64 100644 --- a/webservice/app.py +++ b/webservice/app.py @@ -1,11 +1,11 @@ from flask import Flask from dotenv import load_dotenv -from webservice.models import * -from webservice.interface import interface -from webservice.blueprints.keyword import keyword_blueprint -from webservice.blueprints.shares import shares_blueprint -from webservice.blueprints.user import users_blueprint +from models import * +from blueprint_interface import interface_blueprint +from api_blueprint_keyword import keyword_blueprint +from api_blueprint_shares import shares_blueprint +from api_blueprint_user import users_blueprint def create_app(): @@ -28,7 +28,7 @@ def create_app(): application.register_blueprint(users_blueprint) # interface blueprint - application.register_blueprint(interface) + application.register_blueprint(interface_blueprint) return application diff --git a/webservice/interface.py b/webservice/blueprint_interface.py similarity index 64% rename from webservice/interface.py rename to webservice/blueprint_interface.py index c6d95eb..860be9b 100644 --- a/webservice/interface.py +++ b/webservice/blueprint_interface.py @@ -2,11 +2,11 @@ import os from flask import Blueprint, render_template -interface = Blueprint('interface', __name__, url_prefix='/') +interface_blueprint = Blueprint('interface', __name__, url_prefix='/') __location__ = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__))) # Return all tags -@interface.route('/', methods=['GET']) +@interface_blueprint.route('/', methods=['GET']) def get_html(): return render_template("index.html") diff --git a/webservice/helper_functions.py b/webservice/helper_functions.py index 1468407..3fe846d 100644 --- a/webservice/helper_functions.py +++ b/webservice/helper_functions.py @@ -5,8 +5,8 @@ import uuid import jwt from flask import request -from webservice.db import db -from webservice.models import User +from db import db +from models import User def hash_password(password):