diff --git a/web_server/blueprints/__init__.py b/web_server/blueprints/__init__.py index 5277f00..3aad87a 100644 --- a/web_server/blueprints/__init__.py +++ b/web_server/blueprints/__init__.py @@ -24,9 +24,13 @@ def create_app(): from blueprints.authentication import auth_bp from blueprints.main import main_bp from blueprints.stripe import stripe_bp + from blueprints.user import user_bp + from blueprints.streams import stream_bp app.register_blueprint(auth_bp) app.register_blueprint(main_bp) app.register_blueprint(stripe_bp) + app.register_blueprint(user_bp) + app.register_blueprint(stream_bp) return app \ No newline at end of file diff --git a/web_server/blueprints/main.py b/web_server/blueprints/main.py index 4d7b6f1..b16913f 100644 --- a/web_server/blueprints/main.py +++ b/web_server/blueprints/main.py @@ -10,20 +10,6 @@ def hls(stream_id): #-------------------------------------------------------- -@main_bp.route('/get_login_status') -def get_login_status(): - logged_in = False - """ - Returns whether the user is logged in or not - """ - return {"logged_in": logged_in} - -@main_bp.route('/authenticate_user') -def authenticate_user(): - """ - Authenticates the user - """ - return {"authenticated": True} diff --git a/web_server/blueprints/user.py b/web_server/blueprints/user.py index 869da7b..4d1691c 100644 --- a/web_server/blueprints/user.py +++ b/web_server/blueprints/user.py @@ -1,4 +1,5 @@ from flask import Blueprint +from database.database import Database user_bp = Blueprint("stream", __name__) @@ -7,6 +8,8 @@ def user_subscribed(user_id, streamer_id): """ Checks to see if user is subscribed to a streamer """ + db = Database() + cursor = db.create_connection() return @user_bp.route('/is_following//', methods=['GET']) @@ -15,3 +18,25 @@ def user_following(user_id, streamer_id): Checks to see if user is following a streamer """ return + +@user_bp.route('/subscription_remaining//', methods=['GET']) +def user_subscription_expiration(user_id, streamer_id): + """ + Returns remaining time until subscription expiration + """ + return + +@user_bp.route('/get_login_status') +def get_login_status(): + logged_in = False + """ + Returns whether the user is logged in or not + """ + return {"logged_in": logged_in} + +@user_bp.route('/authenticate_user') +def authenticate_user(): + """ + Authenticates the user + """ + return {"authenticated": True}