From 33036a69e052eecc8a2c3d9184c6c169a4b6cf00 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 5 Jun 2018 12:31:11 +0200 Subject: [PATCH] More updates --- db.py | 11 ++++++++- static/nryg.less | 4 ++++ templates/main.html | 7 +++++- templates/minis/lol.html | 12 +++++----- templates/profile.html | 10 ++++++++- templates/setcss.html | 15 +++++++++++++ webserver.py | 48 +++++++++++++++++++++++++++++++--------- 7 files changed, 88 insertions(+), 19 deletions(-) create mode 100644 templates/setcss.html diff --git a/db.py b/db.py index 72e3071a..9642686a 100644 --- a/db.py +++ b/db.py @@ -1,7 +1,7 @@ import datetime from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import sessionmaker, relationship -from sqlalchemy import Column, BigInteger, Integer, String, DateTime, ForeignKey, Float, Enum, create_engine, UniqueConstraint, PrimaryKeyConstraint, Boolean, or_, LargeBinary +from sqlalchemy import Column, BigInteger, Integer, String, DateTime, ForeignKey, Float, Enum, create_engine, UniqueConstraint, PrimaryKeyConstraint, Boolean, or_, LargeBinary, Text import requests from errors import RequestError, NotFoundError, AlreadyExistingError import re @@ -795,6 +795,15 @@ class AprilFoolsBan(Base): datetime = Column(DateTime, nullable=False) +class CustomCSS(Base): + __tablename__ = "customcss" + + royal_id = Column(Integer, ForeignKey("royals.id"), primary_key=True) + royal = relationship("Royal", lazy="joined") + + css = Column(Text, nullable=False) + + # If run as script, create all the tables in the db if __name__ == "__main__": print("Creating new tables...") diff --git a/static/nryg.less b/static/nryg.less index f932d8ec..1aeee5ba 100644 --- a/static/nryg.less +++ b/static/nryg.less @@ -349,4 +349,8 @@ input[type="text"], input[type="password"] { background-color: rgba(102,192,244,0.4); color: #ffffff; } +} + +#edit-css { + font-size: medium; } \ No newline at end of file diff --git a/templates/main.html b/templates/main.html index d83e1b52..f8530a83 100644 --- a/templates/main.html +++ b/templates/main.html @@ -12,6 +12,11 @@ Benvenuto al sito web della Royal Games! E' ancora un po' triste e spoglio, ma spero che collaboriate a migliorarlo!

- Attualmente, sto sviluppando i profili RYG! Clicca qui per vedere il tuo. + Attualmente, sto sviluppando i profili RYG!

+ {% endblock %} \ No newline at end of file diff --git a/templates/minis/lol.html b/templates/minis/lol.html index 79c30303..c49e0d3e 100644 --- a/templates/minis/lol.html +++ b/templates/minis/lol.html @@ -21,9 +21,9 @@
{% if lol.solo_division is none %} - + {% else %} - + {% endif %}
@@ -31,9 +31,9 @@
{% if lol.flex_division is none %} - + {% else %} - + {% endif %}
@@ -41,9 +41,9 @@
{% if lol.twtr_division is none %} - + {% else %} - + {% endif %}
diff --git a/templates/profile.html b/templates/profile.html index 37614473..0160ac1c 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -4,9 +4,17 @@ Royal Games {% endblock %} +{% block posthead %} + {% if css %} + + {% endif %} +{% endblock %} + {% block body %}

- Profilo di {{ royal.username }} + Profilo di {{ royal.username }} {% if session.get('user_id', '') == royal.id %}Modifica{% endif %}

{% if steam %} {% include "minis/steam.html" %} diff --git a/templates/setcss.html b/templates/setcss.html new file mode 100644 index 00000000..6c45ed3d --- /dev/null +++ b/templates/setcss.html @@ -0,0 +1,15 @@ +{% extends 'base.html' %} + +{% block pagetitle %} + CSS +{% endblock %} + +{% block body %} +

+ CSS +

+
+ + +
+{% endblock %} \ No newline at end of file diff --git a/webserver.py b/webserver.py index 8a6d8e66..cffc671b 100644 --- a/webserver.py +++ b/webserver.py @@ -1,10 +1,8 @@ from flask import Flask, render_template, request, abort, redirect, url_for from flask import session as fl_session import db -from sqlalchemy import func, alias import bcrypt import configparser -import requests app = Flask(__name__) @@ -19,8 +17,11 @@ app.secret_key = config["Flask"]["secret_key"] @app.route("/") def page_main(): - if fl_session.get("username"): - return render_template("main.html", easter_egg=config["Flask"]["easter_egg"]) + if fl_session.get("user_id"): + db_session = db.Session() + royals = db_session.query(db.Royal).all() + db_session.close() + return render_template("main.html", royals=royals) return redirect(url_for("page_login")) @@ -32,13 +33,14 @@ def page_profile(name: str): db_session.close() abort(404) return + css = db_session.query(db.CustomCSS).filter_by(royal=user).one_or_none() steam = db_session.query(db.Steam).filter_by(royal=user).one_or_none() osu = db_session.query(db.Osu).filter_by(royal=user).one_or_none() rl = db_session.query(db.RocketLeague).join(db.Steam).filter_by(royal=user).one_or_none() dota = db_session.query(db.Dota).join(db.Steam).filter_by(royal=user).one_or_none() lol = db_session.query(db.LeagueOfLegends).filter_by(royal=user).one_or_none() db_session.close() - return render_template("profile.html", royal=user, osu=osu, rl=rl, dota=dota, lol=lol, steam=steam) + return render_template("profile.html", royal=user, css=css, osu=osu, rl=rl, dota=dota, lol=lol, steam=steam) @app.route("/login") @@ -57,10 +59,10 @@ def page_loggedin(): abort(403) return if user.password is None: - fl_session["username"] = username + fl_session["user_id"] = user.id return redirect(url_for("page_password")) if bcrypt.checkpw(bytes(password, encoding="utf8"), user.password): - fl_session["username"] = username + fl_session["user_id"] = user.id return redirect(url_for("page_main")) else: abort(403) @@ -69,16 +71,16 @@ def page_loggedin(): @app.route("/password", methods=["GET", "POST"]) def page_password(): - username = fl_session.get("username") + user_id = fl_session.get("user_id") if request.method == "GET": - if username is None: + if user_id is None: abort(403) return return render_template("password.html") elif request.method == "POST": new_password = request.form.get("new", "") db_session = db.Session() - user = db_session.query(db.Royal).filter_by(username=username).one() + user = db_session.query(db.Royal).filter_by(id=user_id).one() if user.password is None: user.password = bcrypt.hashpw(bytes(new_password, encoding="utf8"), bcrypt.gensalt()) db_session.commit() @@ -90,6 +92,32 @@ def page_password(): return +@app.route("/setcss", methods=["GET", "POST"]) +def page_setcss(): + user_id = fl_session.get("user_id") + db_session = db.Session() + ccss = db_session.query(db.CustomCSS).filter_by(royal_id=user_id).one_or_none() + if request.method == "GET": + db_session.close() + if user_id is None: + abort(403) + return + return render_template("setcss.html", css=ccss.css) + elif request.method == "POST": + if user_id is None: + abort(403) + return + if ccss is None: + ccss = db.CustomCSS(royal_id=user_id, css=request.form.get("css", "")) + db_session.add(ccss) + else: + ccss.css = request.form.get("css", "") + db_session.commit() + royal = db_session.query(db.Royal).filter_by(id=user_id).one() + db_session.close() + return redirect(url_for("page_profile", name=royal.username)) + + if __name__ == "__main__": try: app.run(host="0.0.0.0", port=1234, debug=__debug__)