diff --git a/uwume/__init__.py b/uwume/__init__.py index dfcffe2..add7ff2 100644 --- a/uwume/__init__.py +++ b/uwume/__init__.py @@ -1,8 +1,7 @@ -from flask import Flask, Response -from flask_login import LoginManager, login_required +from flask import Flask from os import urandom app = Flask(__name__) app.secret_key = urandom(12).hex() -from . import views +from . import uwume diff --git a/uwume/loginManager.py b/uwume/loginManager.py deleted file mode 100644 index 3d2182d..0000000 --- a/uwume/loginManager.py +++ /dev/null @@ -1,34 +0,0 @@ -from flask import Response -from flask_login import LoginManager, login_required -try: - from .lib.classUser import User -except: - from lib.classUser import User - - -@login_manager.request_loader -def load_user(request): - token = request.headers.get('Authorization') - if(token is None): - token = request.args.get('token') - - if(token is not None): - username, password = token.split(':') # naive token - user_entry = User.get(username) - if(user_entry is not None): - user = User(user_entry[0], user_entry[1]) - if(user.password == password): - return user - - return None - - -@app.route("/", methods=["GET"]) -def index(): - return Response(response="Hello World!", status=200) - - -@app.route("/protected/", methods=["GET"]) -@login_required -def protected(): - return Response(response="Hello Protected World!", status=200) diff --git a/uwume/views.py b/uwume/uwume.py similarity index 96% rename from uwume/views.py rename to uwume/uwume.py index ab4d9c7..5e54536 100644 --- a/uwume/views.py +++ b/uwume/uwume.py @@ -1,9 +1,11 @@ try: from .lib.helpers import get_static_paths, get_content_text from .lib.classUser import User + from .lib.classUwuCounter import UwuCounter except: from lib.classUser import User from lib.helpers import get_static_paths, get_content_text + from lib.classUwuCounter import UwuCounter from . import app from flask import Flask, render_template, redirect, url_for, request, flash from flask_login import LoginManager, UserMixin, login_required, login_user, current_user, logout_user @@ -90,9 +92,7 @@ def signup(): username = request.form['username'] password = request.form['password'] if(not username in User.user_database.keys()): - - userClass = User(username, password) - User.user_database[username] = (username, password) + User.user_database[username] = (username, password, UwuCounter(0)) return redirect('/') else: flash('It looks like a user already exists with that name.')