From ab641fc8a664768981fb8da408b57fa6f85f0550 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Wed, 25 Jul 2018 23:52:38 +0200 Subject: [PATCH] Telegram and Discord! --- static/nryg.less | 32 ++++++++++++++++++++- static/whitney.woff | Bin 0 -> 15488 bytes templates/minis/discord.html | 15 ++++++++++ templates/minis/{telegram.html => tg.html} | 0 templates/profile.html | 25 +++++++++------- webserver.py | 13 ++++++++- 6 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 static/whitney.woff create mode 100644 templates/minis/discord.html rename templates/minis/{telegram.html => tg.html} (100%) diff --git a/static/nryg.less b/static/nryg.less index 57ea7029..5b87b4a0 100644 --- a/static/nryg.less +++ b/static/nryg.less @@ -590,9 +590,39 @@ nav { } .telegram { + font-family: "Lucida Sans Unicode", sans-serif; background-color: #32afed; - color: white !important; + border: 6px solid white; + padding: 12px; + color: black; + + a, a:hover, a:active, a:visited { + color: black; + } + + .player { + font-weight: bold; + } + + .useless-stuff { + grid-column: 1; + } +} + +.discord { + background-color: #7289da; padding: 18px; + color: white; + font-family: "Whitney", sans-serif; + opacity: 0.8; + + a, a:hover, a:active, a:visited { + color: white; + } + + .player-image { + border-radius: 16px; + } .useless-stuff { grid-column: 1; diff --git a/static/whitney.woff b/static/whitney.woff new file mode 100644 index 0000000000000000000000000000000000000000..98aa23958fa0ca00f03fd2d00400d0307ed12e43 GIT binary patch literal 15488 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 CQ9i){ literal 0 HcmV?d00001 diff --git a/templates/minis/discord.html b/templates/minis/discord.html new file mode 100644 index 00000000..e03643b9 --- /dev/null +++ b/templates/minis/discord.html @@ -0,0 +1,15 @@ + +
+
+
+ + {{ record }} +
+
รจ su Discord!
+
+
diff --git a/templates/minis/telegram.html b/templates/minis/tg.html similarity index 100% rename from templates/minis/telegram.html rename to templates/minis/tg.html diff --git a/templates/profile.html b/templates/profile.html index f7711a6e..eff13888 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -26,21 +26,31 @@ {% with record = ryg %} {% include "minis/ryg.html" %} {% endwith %} + {% if tg %} + {% with record = tg %} + {% include "minis/tg.html" %} + {% endwith %} + {% endif %} + {% if discord %} + {% with record = discord %} + {% include "minis/discord.html" %} + {% endwith %} + {% endif %} {% if steam %} {% with record = steam %} {% include "minis/steam.html" %} {% endwith %} {% endif %} - {% if rl %} - {% with record = rl %} - {% include "minis/rl.html" %} - {% endwith %} - {% endif %} {% if dota %} {% with record = dota %} {% include "minis/dota.html" %} {% endwith %} {% endif %} + {% if rl %} + {% with record = rl %} + {% include "minis/rl.html" %} + {% endwith %} + {% endif %} {% if osu %} {% with record = osu %} {% include "minis/osu.html" %} @@ -56,10 +66,5 @@ {% include "minis/ow.html" %} {% endwith %} {% endif %} - {% if tg %} - {% with record = tg %} - {% include "minis/telegram.html" %} - {% endwith %} - {% endif %} {% endblock %} \ No newline at end of file diff --git a/webserver.py b/webserver.py index cfd43752..2b798734 100644 --- a/webserver.py +++ b/webserver.py @@ -80,9 +80,10 @@ def page_profile(name: str): lol = db_session.query(db.LeagueOfLegends).filter_by(royal=user).one_or_none() ow = db_session.query(db.Overwatch).filter_by(royal=user).one_or_none() tg = db_session.query(db.Telegram).filter_by(royal=user).one_or_none() + discord = db_session.query(db.Discord).filter_by(royal=user).one_or_none() db_session.close() return render_template("profile.html", ryg=user, css=css, osu=osu, rl=rl, dota=dota, lol=lol, steam=steam, ow=ow, - tg=tg, config=config) + tg=tg, discord=discord, config=config) @app.route("/login") @@ -194,6 +195,16 @@ def page_game(name: str): elif name == "ryg": game_name = "Royalnet" query = db_session.query(db.Royal).all() + elif name == "tg": + game_name = "Telegram" + query = db_session.query(db.Telegram).all() + elif name == "discord": + game_name = "Discord" + # noinspection PyComparisonWithNone + query = db_session.query(db.Discord).filter(db.Discord.royal_id != None).all() + else: + abort(404) + return db_session.close() return render_template("game.html", minis=query, game_name=game_name, game_short_name=name, config=config)