diff --git a/.gitignore b/.gitignore index b4d3c61..91510da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +dev_build.sh geckodriver.log .vscode/ /Git diff --git a/Flask/app.py b/Flask/app.py index d3071b4..3b3d572 100644 --- a/Flask/app.py +++ b/Flask/app.py @@ -31,10 +31,9 @@ if secret == "": """ def daily_command(): subprocess.Popen(["git",'pull']) - subprocess.Popen(["pkill -9 chrome"]) - subprocess.Popen(["pkill -9 Xvfb"]) - subprocess.Popen(["pkill -9 undetected_chromedriver"]) - + subprocess.Popen(["pkill","-9","chrome"]) + subprocess.Popen(["pkill","-9","Xvfb"]) + subprocess.Popen(["pkill","-9", "undetected_chromedriver"]) scheduler = BackgroundScheduler() scheduler.start() @@ -54,8 +53,6 @@ def start_ms(i): log.close() - - TriggerDict = {} def update_jobs(): with open("/app/MsRewards-Reborn/user_data/configs.json", "r") as inFile: @@ -178,15 +175,6 @@ def load_user(userid): #end of login stuff """ -@app.route("/", methods=["post"]) -def dev(): - action = request.form - print(action) - if action == "dev": - print("dev action test") - return(f"

TO IMPLEMENT - {action}

") - - @app.route("/") def main(): with open("/app/MsRewards-Reborn/user_data/configs.json", "r") as inFile: @@ -329,36 +317,6 @@ def override_post(): return(render_template("override.html", data=configs)) -@app.route("/database/") -def database_get(): - with open("/app/MsRewards-Reborn/user_data/database.json", "r") as inFile: - database = json.load(inFile) - return(render_template("database.html", data = database)) - - -@app.route("/database/", methods=["post"]) -def database_post(): - action = request.form - data = { - "host": action['address'], - "table": action['table'], - "usr": action['user'], - "pwd": action['password'], - "checked": "" - } - - try : - if action["switch"] : - data['checked'] = "checked" - except: - pass - - with open("/app/MsRewards-Reborn/user_data/database.json", "w") as inFile: - json.dump(data, inFile) - - return(render_template("database.html", data = data)) - - @app.route("/config/") def config_get(): with open("/app/MsRewards-Reborn/user_data/proxy.json", "r") as inFile: @@ -413,7 +371,6 @@ def logs(): @app.route('/download/', methods=['GET', 'POST']) @login_required def download(filename): - print("file send !") return send_from_directory(directory='/app/MsRewards-Reborn/user_data/', path=filename, as_attachment=True) @@ -453,12 +410,6 @@ def maxi(dict): return(m+1) +update_jobs() +edit_version() subprocess.Popen(["bash",'/app/MsRewards-Reborn/config/request.sh']) - -#if __name__ == '__main__': -# print("this is launched") -# setup_grafana() -# update_jobs() -# edit_version() -# app.run(host='0.0.0.0', port=1234, debug=True) -# \ No newline at end of file diff --git a/Flask/templates/change_password.html b/Flask/templates/change_password.html index a0b0a12..165e005 100644 --- a/Flask/templates/change_password.html +++ b/Flask/templates/change_password.html @@ -17,11 +17,6 @@ - - - - - @@ -44,7 +39,6 @@ {%if not current_user.is_authenticated %}

Already logged in

{% else %} -
diff --git a/Flask/templates/config.html b/Flask/templates/config.html index e7d820c..6c4a9af 100644 --- a/Flask/templates/config.html +++ b/Flask/templates/config.html @@ -16,11 +16,6 @@ - - - - - - - - - - - - - - - - - -
- -
diff --git a/Flask/templates/database.html b/Flask/templates/database.html deleted file mode 100644 index 844ba3d..0000000 --- a/Flask/templates/database.html +++ /dev/null @@ -1,99 +0,0 @@ -{% extends "base.html" %} -{% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
-{% endblock %} - - - -{% block content %} - -{%if not current_user.is_authenticated %} - -{% else %} - - - - - - - - - - - - - - - - - - - - - - - - - - - -
address :
table :
user :
password :
- - - - - - - -{% endif %} -{% endblock %} \ No newline at end of file diff --git a/Flask/templates/discord.html b/Flask/templates/discord.html index e0eca88..a7fae49 100644 --- a/Flask/templates/discord.html +++ b/Flask/templates/discord.html @@ -17,11 +17,6 @@
- -
diff --git a/Flask/templates/login.html b/Flask/templates/login.html index 501be02..f366e22 100644 --- a/Flask/templates/login.html +++ b/Flask/templates/login.html @@ -17,11 +17,6 @@
- -
diff --git a/Flask/templates/override.html b/Flask/templates/override.html index 67530d1..cd735e7 100644 --- a/Flask/templates/override.html +++ b/Flask/templates/override.html @@ -17,11 +17,6 @@
- -
diff --git a/Flask/templates/proxy.html b/Flask/templates/proxy.html index 6b4445b..025cdad 100644 --- a/Flask/templates/proxy.html +++ b/Flask/templates/proxy.html @@ -17,11 +17,6 @@
- -
diff --git a/Flask/templates/settings.html b/Flask/templates/settings.html index 47ba860..67dd293 100644 --- a/Flask/templates/settings.html +++ b/Flask/templates/settings.html @@ -17,11 +17,6 @@
- -
diff --git a/version b/version index ed15bef..2dc8e03 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.1.0 +v6.2.0