From db403644b3ca691e8a0caf208e676d0813f9d92a Mon Sep 17 00:00:00 2001 From: Alexander Huddleston Date: Sat, 14 Mar 2020 21:45:30 -0500 Subject: [PATCH] Explore page created, links added. Minor formatting. --- uwume/assets/explore/content.txt | 0 uwume/lib/databaseMethods.py | 11 ++++ uwume/static/css/explore/index.css | 0 uwume/static/js/explore/index.js | 6 +++ uwume/templates/explore/index.html | 33 ++++++++++++ uwume/templates/explore/userlist.html | 72 +++++++++++++++++++++++++++ uwume/templates/home/index.html | 21 ++++++-- uwume/templates/homepage.html | 29 ++++++----- uwume/templates/login/index.html | 8 ++- uwume/templates/signup/index.html | 18 +++---- uwume/uwume.py | 14 +++++- 11 files changed, 179 insertions(+), 33 deletions(-) create mode 100644 uwume/assets/explore/content.txt create mode 100644 uwume/static/css/explore/index.css create mode 100644 uwume/static/js/explore/index.js create mode 100644 uwume/templates/explore/index.html create mode 100644 uwume/templates/explore/userlist.html diff --git a/uwume/assets/explore/content.txt b/uwume/assets/explore/content.txt new file mode 100644 index 0000000..e69de29 diff --git a/uwume/lib/databaseMethods.py b/uwume/lib/databaseMethods.py index 61dc7fb..93c4003 100644 --- a/uwume/lib/databaseMethods.py +++ b/uwume/lib/databaseMethods.py @@ -81,6 +81,17 @@ def get_users(): return user_list_formatted +def get_users_list(partition): + users = Table('users', md, autoload=True, autoload_with=engine) + query = select([users.columns.name, users.columns.count]).order_by(users.columns.name.asc()).offset(partition*10).limit(10) + output = conn.execute(query) + user_list = output.fetchall() + user_list_formatted = [] + for u in user_list: + user_list_formatted += [(str(u[0]), str(u[1]))] + return user_list_formatted + + def get_all(): users = Table('users', md, autoload=True, autoload_with=engine) query = select([users]) diff --git a/uwume/static/css/explore/index.css b/uwume/static/css/explore/index.css new file mode 100644 index 0000000..e69de29 diff --git a/uwume/static/js/explore/index.js b/uwume/static/js/explore/index.js new file mode 100644 index 0000000..1a64ece --- /dev/null +++ b/uwume/static/js/explore/index.js @@ -0,0 +1,6 @@ + + +window.addEventListener("load", function() { + console.log("View specific JS initialized."); + // If JS is enabled, set view to update pages without refreshing +}); diff --git a/uwume/templates/explore/index.html b/uwume/templates/explore/index.html new file mode 100644 index 0000000..688fc13 --- /dev/null +++ b/uwume/templates/explore/index.html @@ -0,0 +1,33 @@ +{% extends 'index.html' %} {% block header %} +

+ UwU Me! +

+
+ Explore Users +
+{% endblock %} {% block content %} +
+
+
+ + Login + +
+
+ + Sign Up + +
+
+
+
+ {% for item in content_text %} +

+ {{ item }} +

+ {% endfor %} +
+
+ {% include 'explore/userlist.html'%} +
+{% endblock %} diff --git a/uwume/templates/explore/userlist.html b/uwume/templates/explore/userlist.html new file mode 100644 index 0000000..dedb86a --- /dev/null +++ b/uwume/templates/explore/userlist.html @@ -0,0 +1,72 @@ +{% block userlist %} +
+
+
+
+ Username +
+
+ Amount of UwU +
+
+ {% for user in user_page_list %} +
+
+ +
+ {{ user[0] }} +
+
+ {{ user[1] }} +
+ +
+ {% endfor %} +
+
+
+ +
+ +{% endblock %} diff --git a/uwume/templates/home/index.html b/uwume/templates/home/index.html index 84105f7..f800d2e 100644 --- a/uwume/templates/home/index.html +++ b/uwume/templates/home/index.html @@ -21,10 +21,23 @@ {% endfor %}
-
- - Logout - +
+
+ + Explore + +
+
+ + Logout + +
{% endblock %} diff --git a/uwume/templates/homepage.html b/uwume/templates/homepage.html index d7e16ac..8c9a49a 100644 --- a/uwume/templates/homepage.html +++ b/uwume/templates/homepage.html @@ -5,21 +5,24 @@ {% endblock %} {% block content %}
-
-
-
- - Login - -
-
- - Sign Up - -
-
+
+ + Login + +
+
+ + Explore + +
+
+ + Sign Up +
+
+
{% for item in content_text %}

{{ item }} diff --git a/uwume/templates/login/index.html b/uwume/templates/login/index.html index f5897c3..5109cde 100644 --- a/uwume/templates/login/index.html +++ b/uwume/templates/login/index.html @@ -10,7 +10,7 @@

-
+
-
+
-
-
diff --git a/uwume/templates/signup/index.html b/uwume/templates/signup/index.html index 1eb185b..b702059 100644 --- a/uwume/templates/signup/index.html +++ b/uwume/templates/signup/index.html @@ -16,7 +16,7 @@
-
+
-
+
-
- -
+
diff --git a/uwume/uwume.py b/uwume/uwume.py index b058cb9..913ebd4 100644 --- a/uwume/uwume.py +++ b/uwume/uwume.py @@ -2,7 +2,7 @@ try: from .lib.helpers import get_static_paths, get_content_text from .lib.classUser import User from .lib.classUwuCounter import UwuCounter - from .lib.databaseMethods import get_table, get_count, update_count, get_users, get_all, check_password + from .lib.databaseMethods import get_table, get_count, update_count, get_users, get_users_list, get_all, check_password except: from lib.classUser import User from lib.helpers import get_static_paths, get_content_text @@ -11,6 +11,7 @@ except: 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 +from math import ceil login_manager = LoginManager() login_manager.init_app(app) @@ -41,6 +42,16 @@ def load_user(request): return User.get(request) +@app.route('/explore/', methods=['GET']) +def explore_users_list(page): + return render_template('explore/index.html', user_page_current=int(page), user_page_list=get_users_list(int(page)), user_pages_length=ceil(len(get_users())/10), static_paths=get_static_paths(), content_text=get_content_text()) + + +@app.route('/explore', methods=['GET']) +def explore_users(): + return redirect('/explore/0') + + @app.route('/user//getCurval', methods=['GET']) def get_curval(username): error = '' @@ -70,6 +81,7 @@ def user_page(username): error = f'{e}' return f'ERROR: {error}' + @app.route('/home/getCurval', methods=['GET']) @login_required def home_get_curval():