From defbc63a65b98482e8092b3ff05aba15d379ab1f Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 6 Sep 2023 16:04:42 +0200 Subject: [PATCH 01/14] fixed error --- V6.py | 3 ++- version | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/V6.py b/V6.py index 084defc..502fa6a 100755 --- a/V6.py +++ b/V6.py @@ -366,7 +366,8 @@ def try_play(nom="inconnu"): driver.find_element(By.CSS_SELECTOR, '[onclick="setsrchusr()"]').click() custom_sleep(5) printf("not connected, fixed") - + if "legaltextbox" in driver.current_url: + driver.find_element(By.CLASS_NAME, "actionLink").click() try: if wait_until_visible(By.ID, "rqStartQuiz", 5, driver): custom_sleep(3) diff --git a/version b/version index 68380a8..0611d73 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.3.2 +v6.3.3 From 01f678a216f34b4e06be37afcb360ca5f22b2d5e Mon Sep 17 00:00:00 2001 From: piair Date: Sun, 10 Sep 2023 10:56:04 +0200 Subject: [PATCH 02/14] hmm why doesn't this work ? --- Flask/static/js/main.js | 4 +--- version | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Flask/static/js/main.js b/Flask/static/js/main.js index c2495fc..d2e9fd9 100644 --- a/Flask/static/js/main.js +++ b/Flask/static/js/main.js @@ -3,7 +3,6 @@ function addline(ligne){ document.getElementById("table").insertRow(lplus).insertCell(0).innerHTML = '' } - function change_discord(value, data, len) { if (value == len){ document.getElementById("name").value = ""; @@ -25,6 +24,7 @@ function change_discord(value, data, len) { } function change_config(value, data, len) { + console.log(data); document.getElementById("delete").style.visibility = "hidden"; if (value == len){ document.getElementById("submit").value = "Create !"; @@ -52,7 +52,6 @@ function change_config(value, data, len) { } } - function change_proxy(value, data, len) { if (value == len){ document.getElementById("submit").value = "Create"; @@ -68,7 +67,6 @@ function change_proxy(value, data, len) { } } - function change_logs(value) { document.getElementById("embed").src = "/static/logs/" + value + ".txt"; } diff --git a/version b/version index 0611d73..8e54c22 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.3.3 +v6.3.4 From e7f74e68828fad9490d52d0c21089c19bbccdae8 Mon Sep 17 00:00:00 2001 From: piair Date: Sun, 10 Sep 2023 11:02:15 +0200 Subject: [PATCH 03/14] mais quoi ?? --- Flask/static/js/main.js | 2 +- Flask/templates/config.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Flask/static/js/main.js b/Flask/static/js/main.js index d2e9fd9..cfaae78 100644 --- a/Flask/static/js/main.js +++ b/Flask/static/js/main.js @@ -24,7 +24,7 @@ function change_discord(value, data, len) { } function change_config(value, data, len) { - console.log(data); + console.log(data[2]); document.getElementById("delete").style.visibility = "hidden"; if (value == len){ document.getElementById("submit").value = "Create !"; diff --git a/Flask/templates/config.html b/Flask/templates/config.html index 8f8ebd9..bd9c7dc 100644 --- a/Flask/templates/config.html +++ b/Flask/templates/config.html @@ -42,7 +42,7 @@ {% block content %} - + {%if not current_user.is_authenticated %} {% else %} From 5a1a5b880bff19377e6550f1f433444a21a869c6 Mon Sep 17 00:00:00 2001 From: piair Date: Sun, 10 Sep 2023 11:03:05 +0200 Subject: [PATCH 04/14] hmmm --- Flask/templates/config.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Flask/templates/config.html b/Flask/templates/config.html index bd9c7dc..ca751c3 100644 --- a/Flask/templates/config.html +++ b/Flask/templates/config.html @@ -43,6 +43,7 @@ {% block content %} + {%if not current_user.is_authenticated %} {% else %} @@ -51,7 +52,7 @@ config : - {% for i in configs %} From 58ab110d5588cc525c9439d72a2140985d8b946f Mon Sep 17 00:00:00 2001 From: piair Date: Sun, 10 Sep 2023 11:04:28 +0200 Subject: [PATCH 05/14] =?UTF-8?q?aucune=20id=C3=A9e=20pourquoi=20ca=20a=20?= =?UTF-8?q?fix=20mais=20bon,=20fine=20=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Flask/templates/config.html | 1 - 1 file changed, 1 deletion(-) diff --git a/Flask/templates/config.html b/Flask/templates/config.html index ca751c3..caa492f 100644 --- a/Flask/templates/config.html +++ b/Flask/templates/config.html @@ -42,7 +42,6 @@ {% block content %} - {%if not current_user.is_authenticated %} From a07b55fab72ab22a406d640ed0fef58057a8333e Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 11:46:35 +0200 Subject: [PATCH 06/14] euh ouais j'ai ptet rajouter un VNC, bref on verra --- Dockerfile | 2 +- Flask/templates/vnc.html | 57 ++++++++++++++++++++++++++++++++++++++++ V6.py | 4 ++- config/config.sh | 21 ++++++++++++++- 4 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 Flask/templates/vnc.html diff --git a/Dockerfile b/Dockerfile index 3d2fc9e..2522a04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN curl -sSLO https://piair.xyz/download/chrome.deb \ && wget -q -O /usr/share/keyrings/grafana.key https://apt.grafana.com/gpg.key \ && echo "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main" | tee -a /etc/apt/sources.list.d/grafana.list \ && apt update \ - && apt install grafana xvfb nginx nano tzdata sqlite3 apt-transport-https software-properties-common wget wfrench tigervnc-standalone-server libasound2 libatk-bridge2.0-0 libnss3 libnspr4 xvfb libgbm1 libatk1.0-0 libu2f-udev libatspi2.0-0 libcups2 libxkbcommon0 libxrandr2 libdbus-1-3 xdg-utils fonts-liberation libdrm2 -y \ + && apt install novnc websockify grafana xvfb nginx nano tzdata sqlite3 apt-transport-https software-properties-common wget wfrench tigervnc-standalone-server libasound2 libatk-bridge2.0-0 libnss3 libnspr4 xvfb libgbm1 libatk1.0-0 libu2f-udev libatspi2.0-0 libcups2 libxkbcommon0 libxrandr2 libdbus-1-3 xdg-utils fonts-liberation libdrm2 -y \ && bash MsRewards-Reborn/config/config.sh \ && dpkg -i chrome.deb diff --git a/Flask/templates/vnc.html b/Flask/templates/vnc.html new file mode 100644 index 0000000..55d89c7 --- /dev/null +++ b/Flask/templates/vnc.html @@ -0,0 +1,57 @@ + +{% extends "base.html" %} +{% block left_pannel %} + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+{% endblock %} + +{% block content %} + +{%if not current_user.is_authenticated %} + +{% else %} + +{% endif %} + +{%endblock %} \ No newline at end of file diff --git a/V6.py b/V6.py index 502fa6a..ee5134d 100755 --- a/V6.py +++ b/V6.py @@ -367,7 +367,9 @@ def try_play(nom="inconnu"): custom_sleep(5) printf("not connected, fixed") if "legaltextbox" in driver.current_url: + log_error("dev1") driver.find_element(By.CLASS_NAME, "actionLink").click() + log_error("dev2") try: if wait_until_visible(By.ID, "rqStartQuiz", 5, driver): custom_sleep(3) @@ -827,7 +829,7 @@ else : display = SmartDisplay(size=(1920, 1080)) display.start() -webhookFailure.send(f"Starting on this config", username="Check de lancement", avatar_url="https://cdn-icons-png.flaticon.com/512/1688/1688988.png") +webhookFailure.send(f"@silent Starting on this config", username="Check de lancement", avatar_url="https://cdn-icons-png.flaticon.com/512/1688/1688988.png") if g.custom_start: CustomStart() diff --git a/config/config.sh b/config/config.sh index 88de766..4395d41 100644 --- a/config/config.sh +++ b/config/config.sh @@ -27,6 +27,19 @@ server { proxy_pass http://grafana; rewrite ^/grafana/(.*) /\$1 break; } + + location /novnc/ { + proxy_pass http://127.0.0.1:6080/; + } + + location /novnc/websockify { + proxy_pass http://127.0.0.1:6080/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + } + location / { proxy_set_header X-Forwarded-For \$remote_addr; proxy_set_header Host \$http_host; @@ -47,4 +60,10 @@ cp /app/MsRewards-Reborn/config/grafana.ini /etc/grafana/ grafana-cli plugins install frser-sqlite-datasource printf "setting up default dashboard" -cp /app/MsRewards-Reborn/config/Stats-dashbord.json /usr/share/grafana/public/dashboards/home.json \ No newline at end of file +cp /app/MsRewards-Reborn/config/Stats-dashbord.json /usr/share/grafana/public/dashboards/home.json + + +websockify -D \ + --web /usr/share/novnc/ \ + 6080 \ + localhost:2345 \ No newline at end of file From 15823c850f14024031af481b1bc6979d5ba2e790 Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 11:46:56 +0200 Subject: [PATCH 07/14] bump --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 8e54c22..914ed93 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.3.4 +v6.4.0 From 192be842a3551b50d41b7bfbb047b9f99a602bb0 Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 11:48:03 +0200 Subject: [PATCH 08/14] et le app.py --- Flask/app.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Flask/app.py b/Flask/app.py index a19a36c..0e7af82 100644 --- a/Flask/app.py +++ b/Flask/app.py @@ -363,11 +363,16 @@ def logs(): print(configs) return(render_template("logs.html", data=configs)) + @app.route("/stats/", methods=["GET", "POST"]) def stats(): return(render_template("stats.html")) +@app.route("/dev_override/", methods=["GET", "POST"]) +def stats(): + return(render_template("vnc.html")) + @app.route('/download/', methods=['GET', 'POST']) @login_required From 7a59891f3771f38c523bc90d7e6cc2d34fd9dbec Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 11:48:37 +0200 Subject: [PATCH 09/14] ofc j'ai oublier ca --- Flask/app.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Flask/app.py b/Flask/app.py index 0e7af82..427e217 100644 --- a/Flask/app.py +++ b/Flask/app.py @@ -370,7 +370,7 @@ def stats(): @app.route("/dev_override/", methods=["GET", "POST"]) -def stats(): +def real_override(): return(render_template("vnc.html")) diff --git a/version b/version index 914ed93..397ed6d 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.4.0 +v6.4.1 From d166b164e676211655ee317f9d8ffb14a40c75b1 Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 11:54:43 +0200 Subject: [PATCH 10/14] =?UTF-8?q?des=20ptit=20probl=C3=A8mes=20par=20ci=20?= =?UTF-8?q?par=20la?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Flask/templates/vnc.html | 2 +- config/config.sh | 5 ----- config/request.sh | 5 +++++ version | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Flask/templates/vnc.html b/Flask/templates/vnc.html index 55d89c7..0d315fb 100644 --- a/Flask/templates/vnc.html +++ b/Flask/templates/vnc.html @@ -51,7 +51,7 @@ {%if not current_user.is_authenticated %} {% else %} - + {% endif %} {%endblock %} \ No newline at end of file diff --git a/config/config.sh b/config/config.sh index 4395d41..fb2fe5c 100644 --- a/config/config.sh +++ b/config/config.sh @@ -62,8 +62,3 @@ grafana-cli plugins install frser-sqlite-datasource printf "setting up default dashboard" cp /app/MsRewards-Reborn/config/Stats-dashbord.json /usr/share/grafana/public/dashboards/home.json - -websockify -D \ - --web /usr/share/novnc/ \ - 6080 \ - localhost:2345 \ No newline at end of file diff --git a/config/request.sh b/config/request.sh index ed70b22..8616dd5 100644 --- a/config/request.sh +++ b/config/request.sh @@ -12,3 +12,8 @@ curl 'http://localhost:1234/grafana/api/dashboards/import' \ --compressed \ --insecure + +websockify -D \ + --web /usr/share/novnc/ \ + 6080 \ + localhost:2345 \ No newline at end of file diff --git a/version b/version index 397ed6d..4948248 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.4.1 +v6.4.2 From 2c05937663cdf154ce58cf2fafc3b12b7fde92d7 Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 12:58:33 +0200 Subject: [PATCH 11/14] updated --- Flask/templates/base.html | 47 ++++++++++++++++++++++++++-- Flask/templates/change_password.html | 38 ---------------------- Flask/templates/config.html | 38 +--------------------- Flask/templates/discord.html | 39 +---------------------- Flask/templates/logs.html | 39 +---------------------- Flask/templates/override.html | 39 +---------------------- Flask/templates/proxy.html | 39 +---------------------- Flask/templates/settings.html | 39 +---------------------- Flask/templates/stats.html | 39 +---------------------- Flask/templates/vnc.html | 44 +------------------------- version | 2 +- 11 files changed, 54 insertions(+), 349 deletions(-) diff --git a/Flask/templates/base.html b/Flask/templates/base.html index 5fb9d51..d37fc3d 100644 --- a/Flask/templates/base.html +++ b/Flask/templates/base.html @@ -24,8 +24,51 @@
- {% block left_pannel %} - {% endblock %} + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
{% block content %} diff --git a/Flask/templates/change_password.html b/Flask/templates/change_password.html index 572479e..e5851fd 100644 --- a/Flask/templates/change_password.html +++ b/Flask/templates/change_password.html @@ -1,43 +1,5 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
{% endblock %} {% block content %} diff --git a/Flask/templates/config.html b/Flask/templates/config.html index caa492f..984b667 100644 --- a/Flask/templates/config.html +++ b/Flask/templates/config.html @@ -1,42 +1,6 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
+discord {% endblock %} diff --git a/Flask/templates/discord.html b/Flask/templates/discord.html index 803e0cf..af3c8f4 100644 --- a/Flask/templates/discord.html +++ b/Flask/templates/discord.html @@ -1,43 +1,6 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
+discord {% endblock %} {% block content %} diff --git a/Flask/templates/logs.html b/Flask/templates/logs.html index 741f238..5f4ec41 100644 --- a/Flask/templates/logs.html +++ b/Flask/templates/logs.html @@ -1,43 +1,6 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
+logs {% endblock %} {% block content %} diff --git a/Flask/templates/override.html b/Flask/templates/override.html index 436f6b6..258cf37 100644 --- a/Flask/templates/override.html +++ b/Flask/templates/override.html @@ -1,43 +1,6 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
+schedule {% endblock %} {% block content %} diff --git a/Flask/templates/proxy.html b/Flask/templates/proxy.html index e020772..d49b5a2 100644 --- a/Flask/templates/proxy.html +++ b/Flask/templates/proxy.html @@ -1,43 +1,6 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
+proxy {% endblock %} diff --git a/Flask/templates/settings.html b/Flask/templates/settings.html index 284b2a0..4830b19 100644 --- a/Flask/templates/settings.html +++ b/Flask/templates/settings.html @@ -1,43 +1,6 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
+settings {% endblock %} {% block content %} diff --git a/Flask/templates/stats.html b/Flask/templates/stats.html index 94e5d3d..9746a0b 100644 --- a/Flask/templates/stats.html +++ b/Flask/templates/stats.html @@ -1,43 +1,6 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
+stats {% endblock %} {% block content %} diff --git a/Flask/templates/vnc.html b/Flask/templates/vnc.html index 0d315fb..1ef14da 100644 --- a/Flask/templates/vnc.html +++ b/Flask/templates/vnc.html @@ -1,49 +1,7 @@ {% extends "base.html" %} {% block left_pannel %} - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- -
- -
- -
- -
- -
+override {% endblock %} {% block content %} diff --git a/version b/version index 4948248..b684048 100644 --- a/version +++ b/version @@ -1 +1 @@ -v6.4.2 +v6.4.3 From 9316317d2b86f9354d316f9b7996c9193801b757 Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 13:00:48 +0200 Subject: [PATCH 12/14] push --- Flask/templates/discord.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Flask/templates/discord.html b/Flask/templates/discord.html index af3c8f4..d569fee 100644 --- a/Flask/templates/discord.html +++ b/Flask/templates/discord.html @@ -1,7 +1,5 @@ {% extends "base.html" %} -{% block left_pannel %} -discord -{% endblock %} +{% block left_pannel %}discord{% endblock %} {% block content %} {%if not current_user.is_authenticated %} From f0447b2d1d09c110f2410f8bba71196f3f8d901e Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 13:05:13 +0200 Subject: [PATCH 13/14] push --- Flask/templates/base.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Flask/templates/base.html b/Flask/templates/base.html index d37fc3d..9960b71 100644 --- a/Flask/templates/base.html +++ b/Flask/templates/base.html @@ -24,8 +24,6 @@
- -
@@ -68,7 +66,7 @@
- +
{% block content %} From 424798c7f6fc6e53878e44666ce8eb033d2d03d0 Mon Sep 17 00:00:00 2001 From: piair Date: Wed, 20 Sep 2023 13:13:41 +0200 Subject: [PATCH 14/14] OMG C'est trop bie --- Flask/app.py | 20 +++++++++---------- Flask/templates/config.html | 4 +--- Flask/templates/login.html | 7 +------ Flask/templates/logs.html | 4 +--- Flask/templates/proxy.html | 4 +--- .../{override.html => schedule.html} | 4 +--- Flask/templates/settings.html | 4 +--- Flask/templates/stats.html | 4 +--- Flask/templates/vnc.html | 4 +--- version | 2 +- 10 files changed, 19 insertions(+), 38 deletions(-) rename Flask/templates/{override.html => schedule.html} (94%) 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 94% 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