From d792a2dae65349e61c7568f3642decb64309f1d2 Mon Sep 17 00:00:00 2001 From: Phillip Tarrant Date: Wed, 23 Sep 2020 15:58:15 -0400 Subject: [PATCH 1/7] edited ultrablacks bio --- app/frontend/templates/panel/credits.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/frontend/templates/panel/credits.html b/app/frontend/templates/panel/credits.html index 0389c19c..2d726b6b 100644 --- a/app/frontend/templates/panel/credits.html +++ b/app/frontend/templates/panel/credits.html @@ -324,7 +324,7 @@
Hi, my name is Tim, and I'm a huge fan of linux. - I'm often gaming and occasionally coding some java + I'm often gaming and occasionally coding.
From 10bd7a74c9cabc39f284a37ad163a5ec05484aa1 Mon Sep 17 00:00:00 2001 From: Phillip Tarrant Date: Wed, 7 Oct 2020 09:19:47 -0400 Subject: [PATCH 2/7] fixed issue where server settings don't get reloaded when changing server config without restarting crafty. Now server settings get repulled from DB after writing new settings on config change --- app/classes/shared/controller.py | 4 ++++ app/classes/shared/server.py | 6 +++++- app/classes/web/panel_handler.py | 2 ++ app/config/serverjars.json | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/classes/shared/controller.py b/app/classes/shared/controller.py index 4712cbed..805abe5d 100644 --- a/app/classes/shared/controller.py +++ b/app/classes/shared/controller.py @@ -87,6 +87,10 @@ class Controller: s['auto_start_delay'] )) + def refresh_server_settings(self, server_id: int): + server_obj = self.get_server_obj(server_id) + server_obj.reload_server_settings() + def get_server_obj(self, server_id): for s in self.servers_list: diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 58e5a041..a52cb73a 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -13,7 +13,7 @@ import logging.config from app.classes.shared.helpers import helper from app.classes.shared.console import console - +from app.classes.shared.models import db_helper, Servers logger = logging.getLogger(__name__) @@ -45,6 +45,10 @@ class Server: self.is_crashed = False self.restart_count = 0 + def reload_server_settings(self): + server_data = db_helper.get_server_data_by_id(self.server_id) + self.settings = server_data + def do_server_setup(self, server_data_obj): logger.info('Creating Server object: {} | Server Name: {} | Auto Start: {}'.format( server_data_obj['server_id'], diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 7bd323bd..d14d6bcc 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -161,6 +161,8 @@ class PanelHandler(BaseHandler): Servers.crash_detection: crash_detection, }).where(Servers.server_id == server_id).execute() + controller.refresh_server_settings(server_id) + user_data = json.loads(self.get_secure_cookie("user_data")) db_helper.add_to_audit_log(user_data['user_id'], diff --git a/app/config/serverjars.json b/app/config/serverjars.json index 736bef8a..f8f4d04f 100644 --- a/app/config/serverjars.json +++ b/app/config/serverjars.json @@ -1,5 +1,5 @@ { - "last_refreshed": "09/21/2020, 21:59:31", + "last_refreshed": "10/07/2020, 09:09:10", "servers": { "nukkitx": [ "1.14" From 192922159f5d5692b3ebaffb0c641c952145a430 Mon Sep 17 00:00:00 2001 From: Phillip Tarrant Date: Tue, 1 Dec 2020 11:11:40 -0500 Subject: [PATCH 3/7] version bump --- app/config/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/version.json b/app/config/version.json index ad7a7de8..35afb1e0 100644 --- a/app/config/version.json +++ b/app/config/version.json @@ -1,5 +1,5 @@ { "major": 4, "minor": 0, - "sub": "Alpha 1" + "sub": "Alpha 2" } \ No newline at end of file From 4c3c0eb16b998ba600c5b6a6db798b9bbed0ef8f Mon Sep 17 00:00:00 2001 From: LukasDoesDev Date: Wed, 9 Dec 2020 17:55:30 +0200 Subject: [PATCH 4/7] Contribute page title changed. --- app/frontend/templates/panel/contribute.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/frontend/templates/panel/contribute.html b/app/frontend/templates/panel/contribute.html index 2dd5d32a..e7727d2f 100644 --- a/app/frontend/templates/panel/contribute.html +++ b/app/frontend/templates/panel/contribute.html @@ -4,7 +4,7 @@ {% end %} -{% block title %}Crafty Controller - Blank Page{% end %} +{% block title %}Crafty Controller - Contribute{% end %} {% block content %} From cc0c036f792040f41c36ef3a6e95f9dbd7af0829 Mon Sep 17 00:00:00 2001 From: LukasDoesDev Date: Wed, 9 Dec 2020 23:10:52 +0200 Subject: [PATCH 5/7] Change main scrollbar colors. (Only for Firefox) Example: https://imgur.com/a/pjJ0wuL --- app/frontend/static/assets/css/crafty.css | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/frontend/static/assets/css/crafty.css b/app/frontend/static/assets/css/crafty.css index fd2c0852..ecea77ad 100644 --- a/app/frontend/static/assets/css/crafty.css +++ b/app/frontend/static/assets/css/crafty.css @@ -62,4 +62,17 @@ } .term-nav-item { padding: 1%; -} \ No newline at end of file +} + +/* Fix body scrollbar color */ +body { background-color: var(--dark) !important; /* Firefox */ } + +/* Webkit */ +/* Didn't really work out +::-webkit-scrollbar { background-color: #202538; } +::-webkit-scrollbar-button { background-color: #1D212F; } +::-webkit-scrollbar-thumb { background-color: #777A86; } +::-webkit-scrollbar-thumb:hover { background-color: #646773; } + +::-webkit-scrollbar-track { background-color: #202538; } +::-webkit-scrollbar-corner { background-color: #202538; }*/ \ No newline at end of file From 3563deae6afdb014de38a33b80300dc288d46434 Mon Sep 17 00:00:00 2001 From: LukasDoesDev Date: Thu, 10 Dec 2020 21:53:03 +0200 Subject: [PATCH 6/7] Add spacing below CPU and Memory indicators in dashboard.html. https://imgur.com/a/D614Ftt --- app/frontend/templates/panel/dashboard.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html index 67e58b39..0d3674ad 100644 --- a/app/frontend/templates/panel/dashboard.html +++ b/app/frontend/templates/panel/dashboard.html @@ -136,7 +136,7 @@ -
+
+
{% if server['stats'][0]['running'] %}