ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-24 03:54:20 +00:00
Code Activity

Add debug notice

Browse source
This commit is contained in:
Steffo 2018-09-13 01:51:06 +02:00
parent 01044213b0
commit b6e9c914c5
3 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/nryg.less
View file

@ -789,6 +789,12 @@ nav {
} }
} }
#debug-mode {
color: red;
font-weight: bold;
background-color: darkred;
}
#edit-css { #edit-css {
font-size: medium; font-size: medium;
} }

9
templates/base.html
View file

@ -19,14 +19,19 @@
<a href="/">Home</a> <a href="/">Home</a>
<span class="desktop-only"> <span class="desktop-only">
{% if session.get('username') is not none %} {% if session.get('username') is not none %}
<a href="{{ config['Telegram']['invite_link'] }}">Telegram</a> <a href="{{ rygconf['Telegram']['invite_link'] }}">Telegram</a>
<a href="{{ config['Discord']['invite_link'] }}">Discord</a> <a href="{{ rygconf['Discord']['invite_link'] }}">Discord</a>
<a href="https://steamcommunity.com/groups/royalgamescastle">Steam</a> <a href="https://steamcommunity.com/groups/royalgamescastle">Steam</a>
<a href="https://new.reddit.com/r/RoyalGames/">/r/RoyalGames</a> <a href="https://new.reddit.com/r/RoyalGames/">/r/RoyalGames</a>
{% endif %} {% endif %}
</span> </span>
</div> </div>
<div class="right"> <div class="right">
{% if config["DEBUG"] %}
<span id="debug-mode">
DEBUG
</span>
{% endif %}
<span class="login-status"> <span class="login-status">
{% if session.get('username') is not none %} {% if session.get('username') is not none %}
<a href="/profile/{{ session.get('username') }}">{{ session.get('username') }}</a> <a href="/profile/{{ session.get('username') }}">{{ session.get('username') }}</a>

26
webserver.py
View file

@ -28,7 +28,7 @@ sentry = Sentry(app, dsn=config["Sentry"]["token"])
@app.errorhandler(400) @app.errorhandler(400)
def error_400(_=None): def error_400(_=None):
return render_template("400.html", config=config) return render_template("400.html", rygconf=config)
@app.route("/400") @app.route("/400")
@ -38,7 +38,7 @@ def page_400():
@app.errorhandler(403) @app.errorhandler(403)
def error_403(_=None): def error_403(_=None):
return render_template("403.html", config=config) return render_template("403.html", rygconf=config)
@app.route("/403") @app.route("/403")
@ -48,7 +48,7 @@ def page_403():
@app.errorhandler(500) @app.errorhandler(500)
def error_500(_=None): def error_500(_=None):
return render_template("500.html", config=config) return render_template("500.html", rygconf=config)
@app.route("/500") @app.route("/500")
@ -68,7 +68,7 @@ def page_main():
db.Event.time).all() db.Event.time).all()
db_session.close() db_session.close()
return render_template("main.html", royals=royals, wiki_pages=wiki_pages, entry=random_diario, return render_template("main.html", royals=royals, wiki_pages=wiki_pages, entry=random_diario,
next_events=next_events, config=config, escape=escape) next_events=next_events, rygconf=config, escape=escape)
@app.route("/profile/<name>") @app.route("/profile/<name>")
@ -95,12 +95,12 @@ def page_profile(name: str):
else: else:
converted_bio = "" converted_bio = ""
return render_template("profile.html", ryg=user, css=css, osu=osu, dota=dota, lol=lol, steam=steam, ow=ow, return render_template("profile.html", ryg=user, css=css, osu=osu, dota=dota, lol=lol, steam=steam, ow=ow,
tg=tg, discord=discord, config=config, bio=converted_bio) tg=tg, discord=discord, rygconf=config, bio=converted_bio)
@app.route("/login") @app.route("/login")
def page_login(): def page_login():
return render_template("login.html", config=config) return render_template("login.html", rygconf=config)
@app.route("/loggedin", methods=["POST"]) @app.route("/loggedin", methods=["POST"])
@ -140,7 +140,7 @@ def page_password():
if request.method == "GET": if request.method == "GET":
if user_id is None: if user_id is None:
return redirect(url_for("page_login")) return redirect(url_for("page_login"))
return render_template("password.html", config=config) return render_template("password.html", rygconf=config)
elif request.method == "POST": elif request.method == "POST":
new_password = request.form.get("new", "") new_password = request.form.get("new", "")
db_session = db.Session() db_session = db.Session()
@ -165,7 +165,7 @@ def page_editprofile():
db_session.close() db_session.close()
if user_id is None: if user_id is None:
return redirect(url_for("page_login")) return redirect(url_for("page_login"))
return render_template("profileedit.html", data=profile_data, config=config) return render_template("profileedit.html", data=profile_data, rygconf=config)
elif request.method == "POST": elif request.method == "POST":
if user_id is None: if user_id is None:
return redirect(url_for("page_login")) return redirect(url_for("page_login"))
@ -228,7 +228,7 @@ def page_game(name: str):
abort(404) abort(404)
return return
db_session.close() db_session.close()
return render_template("game.html", minis=query, game_name=game_name, game_short_name=name, config=config) return render_template("game.html", minis=query, game_name=game_name, game_short_name=name, rygconf=config)
@app.route("/wiki") @app.route("/wiki")
@ -236,7 +236,7 @@ def page_wikihome():
db_session = db.Session() db_session = db.Session()
wiki_pages = db_session.query(db.WikiEntry).order_by(db.WikiEntry.key).all() wiki_pages = db_session.query(db.WikiEntry).order_by(db.WikiEntry.key).all()
db_session.close() db_session.close()
return render_template("wikilist.html", wiki_pages=wiki_pages, config=config) return render_template("wikilist.html", wiki_pages=wiki_pages, rygconf=config)
@app.route("/wiki/<key>", methods=["GET", "POST"]) @app.route("/wiki/<key>", methods=["GET", "POST"])
@ -248,7 +248,7 @@ def page_wiki(key: str):
.order_by(db.WikiLog.timestamp.desc()).first() .order_by(db.WikiLog.timestamp.desc()).first()
db_session.close() db_session.close()
if wiki_page is None: if wiki_page is None:
return render_template("wikipage.html", key=key, config=config) return render_template("wikipage.html", key=key, rygconf=config)
# Embed YouTube videos # Embed YouTube videos
converted_md = markdown2.markdown(wiki_page.content.replace("<", "&lt;"), converted_md = markdown2.markdown(wiki_page.content.replace("<", "&lt;"),
extras=["spoiler", "tables", "smarty-pants", "fenced-code-blocks"]) extras=["spoiler", "tables", "smarty-pants", "fenced-code-blocks"])
@ -258,7 +258,7 @@ def page_wiki(key: str):
r' allow="autoplay; encrypted-media" allowfullscreen width="640px" height="320px"></iframe>' r' allow="autoplay; encrypted-media" allowfullscreen width="640px" height="320px"></iframe>'
r'</div>', converted_md) r'</div>', converted_md)
return render_template("wikipage.html", key=key, wiki_page=wiki_page, converted_md=Markup(converted_md), return render_template("wikipage.html", key=key, wiki_page=wiki_page, converted_md=Markup(converted_md),
wiki_log=wiki_latest_edit, config=config) wiki_log=wiki_latest_edit, rygconf=config)
elif request.method == "POST": elif request.method == "POST":
user_id = fl_session.get('user_id') user_id = fl_session.get('user_id')
user = db_session.query(db.Royal).filter_by(id=user_id).one() user = db_session.query(db.Royal).filter_by(id=user_id).one()
@ -308,7 +308,7 @@ def page_diario():
db_session = db.Session() db_session = db.Session()
diario_entries = db_session.query(db.Diario).order_by(db.Diario.timestamp.desc()).all() diario_entries = db_session.query(db.Diario).order_by(db.Diario.timestamp.desc()).all()
db_session.close() db_session.close()
return render_template("diario.html", config=config, entries=diario_entries) return render_template("diario.html", rygconf=config, entries=diario_entries)
if __name__ == "__main__": if __name__ == "__main__":