diff --git a/Flask/app.py b/Flask/app.py index 427e217..024f7e5 100644 --- a/Flask/app.py +++ b/Flask/app.py @@ -134,7 +134,7 @@ def login(): login_user(user) if password == "ChangeMe": return(redirect('/change_password')) - return(redirect('/override')) + return(redirect('/schedule')) else: return abort(401) else: @@ -175,7 +175,7 @@ def load_user(userid): def main(): with open("/app/MsRewards-Reborn/user_data/configs.json", "r") as inFile: configs = json.load(inFile) - return(render_template("override.html", data=configs)) + return(render_template("schedule.html", data=configs)) @app.route("/discord/") @@ -282,15 +282,15 @@ def proxy_post(): return(render_template("proxy.html", data=data, len=maxi(data))) -@app.route("/override/") -def override_get(): +@app.route("/schedule/") +def schedule_get(): with open("/app/MsRewards-Reborn/user_data/configs.json", "r") as inFile: configs = json.load(inFile) - return(render_template("override.html", data=configs)) + return(render_template("schedule.html", data=configs)) -@app.route("/override/", methods=["post"]) -def override_post(): +@app.route("/schedule/", methods=["post"]) +def schedule_post(): with open("/app/MsRewards-Reborn/user_data/configs.json", "r") as inFile: configs = json.load(inFile) @@ -308,7 +308,7 @@ def override_post(): with open("/app/MsRewards-Reborn/user_data/configs.json", "w") as inFile: json.dump(configs, inFile) update_jobs() - return(render_template("override.html", data=configs)) + return(render_template("schedule.html", data=configs)) @app.route("/config/") @@ -369,8 +369,8 @@ def stats(): return(render_template("stats.html")) -@app.route("/dev_override/", methods=["GET", "POST"]) -def real_override(): +@app.route("/override/", methods=["GET", "POST"]) +def override(): return(render_template("vnc.html")) diff --git a/Flask/templates/config.html b/Flask/templates/config.html index 984b667..eb3fc6f 100644 --- a/Flask/templates/config.html +++ b/Flask/templates/config.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% block left_pannel %} -discord -{% endblock %} +{% block left_pannel %}config{% endblock %} diff --git a/Flask/templates/login.html b/Flask/templates/login.html index b11d5b5..bb7b340 100644 --- a/Flask/templates/login.html +++ b/Flask/templates/login.html @@ -1,10 +1,5 @@ {% extends "base.html" %} -{% block left_pannel %} - - - -
-{% endblock %} +{% block left_pannel %}login{% endblock %} {% block content %} {%if not current_user.is_authenticated %} diff --git a/Flask/templates/logs.html b/Flask/templates/logs.html index 5f4ec41..69ab013 100644 --- a/Flask/templates/logs.html +++ b/Flask/templates/logs.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% block left_pannel %} -logs -{% endblock %} +{% block left_pannel %}logs{% endblock %} {% block content %} {%if not current_user.is_authenticated %} diff --git a/Flask/templates/proxy.html b/Flask/templates/proxy.html index d49b5a2..fa6fc06 100644 --- a/Flask/templates/proxy.html +++ b/Flask/templates/proxy.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% block left_pannel %} -proxy -{% endblock %} +{% block left_pannel %}proxy{% endblock %} diff --git a/Flask/templates/override.html b/Flask/templates/schedule.html similarity index 93% rename from Flask/templates/override.html rename to Flask/templates/schedule.html index 258cf37..b428401 100644 --- a/Flask/templates/override.html +++ b/Flask/templates/schedule.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% block left_pannel %} -schedule -{% endblock %} +{% block left_pannel %}schedule{% endblock %} {% block content %} diff --git a/Flask/templates/settings.html b/Flask/templates/settings.html index 4830b19..e65cbb0 100644 --- a/Flask/templates/settings.html +++ b/Flask/templates/settings.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% block left_pannel %} -settings -{% endblock %} +{% block left_pannel %}settings{% endblock %} {% block content %} {%if not current_user.is_authenticated %} diff --git a/Flask/templates/stats.html b/Flask/templates/stats.html index 9746a0b..b994e12 100644 --- a/Flask/templates/stats.html +++ b/Flask/templates/stats.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% block left_pannel %} -stats -{% endblock %} +{% block left_pannel %}stats{% endblock %} {% block content %} diff --git a/Flask/templates/vnc.html b/Flask/templates/vnc.html index 1ef14da..9eea470 100644 --- a/Flask/templates/vnc.html +++ b/Flask/templates/vnc.html @@ -1,8 +1,6 @@ {% extends "base.html" %} -{% block left_pannel %} -override -{% endblock %} +{% block left_pannel %}override{% endblock %} {% block content %} diff --git a/version b/version index b684048..dfe77b4 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.4.3 +v6.4.4