diff --git a/uwume/assets/user/content.txt b/uwume/assets/user/content.txt new file mode 100644 index 0000000..e69de29 diff --git a/uwume/lib/helpers.py b/uwume/lib/helpers.py index ebeb318..bafab7c 100644 --- a/uwume/lib/helpers.py +++ b/uwume/lib/helpers.py @@ -1,6 +1,7 @@ from flask import request from os import getcwd from os.path import exists +from re import search def is_docker(): @@ -32,4 +33,9 @@ def get_static_paths(): if(str(request.url_rule) == '/'): return (f'static/css/index.css', f'static/js/index.js') else: + if('<' in str(request.url_rule)): + delete = search('<.*>', str(request.url_rule)) + delete = '/' + delete.group(0) + new_path = str(request.url_rule).replace(delete, '') + return (f'static/css{new_path}/index.css', f'static/js{new_path}/index.js') return (f'static/css{request.url_rule}/index.css', f'static/js{request.url_rule}/index.js') diff --git a/uwume/static/css/user/index.css b/uwume/static/css/user/index.css new file mode 100644 index 0000000..e69de29 diff --git a/uwume/static/js/user/index.js b/uwume/static/js/user/index.js new file mode 100644 index 0000000..e69de29 diff --git a/uwume/templates/index.html b/uwume/templates/index.html index 0ed5b14..4006db1 100644 --- a/uwume/templates/index.html +++ b/uwume/templates/index.html @@ -2,11 +2,11 @@ - - - - - + + + + + UwU Me!{{ optional_title_status }} diff --git a/uwume/templates/signup/index.html b/uwume/templates/signup/index.html index 87c2c50..1eb185b 100644 --- a/uwume/templates/signup/index.html +++ b/uwume/templates/signup/index.html @@ -5,8 +5,7 @@
Sign Up Page
-{% endblock %} {% block content %} -{% for message in get_flashed_messages() %} +{% endblock %} {% block content %} {% for message in get_flashed_messages() %}

{{ message }} diff --git a/uwume/templates/user/index.html b/uwume/templates/user/index.html new file mode 100644 index 0000000..d474e48 --- /dev/null +++ b/uwume/templates/user/index.html @@ -0,0 +1,21 @@ +{% extends 'index.html' %} {% block header %} +

+ UwU {{ this_user }}! +

+
+ Say UwU to them! +
+{% endblock %} {% block content %} +
+
+ +
+ {% for item in content_text %} +

+ {{ item }} +

+ {% endfor %} +
+{% endblock %} diff --git a/uwume/views.py b/uwume/views.py index 98915aa..2d5d079 100644 --- a/uwume/views.py +++ b/uwume/views.py @@ -37,6 +37,14 @@ def load_user(request): return User(request, User.user_database[request][1]) +@app.route('/user/', methods=['GET']) +def user_page(username): + error = '' + if(request.method == 'GET'): + return render_template('user/index.html', this_user=username, static_paths=get_static_paths(), content_text=get_content_text()) + return f'ERROR: {error}' + + @app.route('/home', methods=['GET']) @login_required def home(): @@ -67,7 +75,7 @@ def login(): if(request.method == 'POST'): username = request.form['username'] password = request.form['password'] - if(username in User.user_database.keys()): + if(username in User.user_database.keys() and password == User.user_database.get(username)[1]): userClass = User(username, password) login_user(userClass) return redirect('home')