From 3974b7e8c7ee34da4b543fb350ea93109df57901 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Thu, 4 Aug 2022 19:45:44 -0400 Subject: [PATCH 001/296] poorly attempt to add "add to home" feature --- .../static/assets/images/Crafty_4-0.png | Bin 0 -> 5013 bytes app/frontend/templates/base.html | 15 ++++++++++----- app/frontend/templates/crafty.webmanifest | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 app/frontend/static/assets/images/Crafty_4-0.png create mode 100644 app/frontend/templates/crafty.webmanifest diff --git a/app/frontend/static/assets/images/Crafty_4-0.png b/app/frontend/static/assets/images/Crafty_4-0.png new file mode 100644 index 0000000000000000000000000000000000000000..d873eedc46f1f3c3d9be420e8a8e44ec015f6ced GIT binary patch literal 5013 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 D3&c&V literal 0 HcmV?d00001 diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index 4133dfac..f13fc2f4 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -15,9 +15,14 @@ + href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> + + + + + @@ -72,7 +77,7 @@ {% include notify.html %} @@ -163,7 +168,7 @@ + src="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.js"> @@ -191,7 +196,7 @@ $.extend($.fn.dataTable.defaults, { // {{ '\nlanguage:' }} {% raw translate('datatables', 'i18n', data['lang']) %} - }) + }) //used to get cookies from browser - this is part of tornados xsrf protection - it's for extra security function getCookie(name) { @@ -525,4 +530,4 @@ - + \ No newline at end of file diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.webmanifest new file mode 100644 index 00000000..c2db095c --- /dev/null +++ b/app/frontend/templates/crafty.webmanifest @@ -0,0 +1,16 @@ +{ + "background_color": "purple", + "description": "Server management control.", + "display": "fullscreen", + "icons": [ + { + "src": "../static/assets/images/Crafty_4-0.png", + "sizes": "192x192", + "type": "icon/png" + } + ], + "scope": "/", + "name": "Crafty 4", + "short_name": "Crafty", + "start_url": "/panel/dashboard" +} \ No newline at end of file From 8adcfbaf452bea807f989d7849dfab470a2e0805 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 7 Aug 2022 13:23:45 -0400 Subject: [PATCH 002/296] Updates --- app/frontend/templates/base.html | 5 ++++ app/frontend/templates/crafty.webmanifest | 34 +++++++++++++++++------ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index f13fc2f4..cdb0b5e4 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -20,6 +20,11 @@ + + + + + diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.webmanifest index c2db095c..06d6cafe 100644 --- a/app/frontend/templates/crafty.webmanifest +++ b/app/frontend/templates/crafty.webmanifest @@ -1,16 +1,32 @@ { - "background_color": "purple", - "description": "Server management control.", - "display": "fullscreen", + "$schema": "https://json.schemastore.org/web-manifest-combined.json", + "short_name": "Crafty", + "name": "Crafty Controller 4", "icons": [ { - "src": "../static/assets/images/Crafty_4-0.png", - "sizes": "192x192", - "type": "icon/png" + "src": "../static/images/Crafty_4-0.png", + "type": "image/png", + "sizes": "192x192" } ], + "start_url": "/public/login", + "background_color": "#3367D6", + "display": "fullscreen", "scope": "/", - "name": "Crafty 4", - "short_name": "Crafty", - "start_url": "/panel/dashboard" + "theme_color": "#3367D6", + "shortcuts": [ + { + "name": "Crafty Controller 4", + "short_name": "Crafty", + "description": "View weather information for today", + "url": "/panel/dashboard", + "icons": [ + { + "src": "../static/images/Crafty_4-0.png", + "sizes": "192x192" + } + ] + } + ], + "description": "Server Management Console/Wrapper" } \ No newline at end of file From 893d166c7224f73aa90a5a45eadd3872a6467fd0 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 8 Aug 2022 13:04:36 -0400 Subject: [PATCH 003/296] More testing --- app/frontend/templates/base.html | 2 +- app/frontend/templates/{crafty.webmanifest => crafty.json} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/frontend/templates/{crafty.webmanifest => crafty.json} (85%) diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index cdb0b5e4..a1abb058 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -18,7 +18,7 @@ href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> - + diff --git a/app/frontend/templates/crafty.webmanifest b/app/frontend/templates/crafty.json similarity index 85% rename from app/frontend/templates/crafty.webmanifest rename to app/frontend/templates/crafty.json index 06d6cafe..ab83b913 100644 --- a/app/frontend/templates/crafty.webmanifest +++ b/app/frontend/templates/crafty.json @@ -4,7 +4,7 @@ "name": "Crafty Controller 4", "icons": [ { - "src": "../static/images/Crafty_4-0.png", + "src": "../static/assets/images/Crafty_4-0.png", "type": "image/png", "sizes": "192x192" } @@ -22,7 +22,7 @@ "url": "/panel/dashboard", "icons": [ { - "src": "../static/images/Crafty_4-0.png", + "src": "../static/assets/images/Crafty_4-0.png", "sizes": "192x192" } ] From 7949db65ac38521e6d8afbf31f475ab7b8b48fe0 Mon Sep 17 00:00:00 2001 From: Silversthorn Date: Tue, 31 Jan 2023 20:20:08 +0100 Subject: [PATCH 004/296] Improving Switches on Config Server Page --- .../templates/panel/server_config.html | 147 +++++++++++------- 1 file changed, 93 insertions(+), 54 deletions(-) diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index fb19ec05..3937e8d1 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -50,17 +50,17 @@
+ value="{{ data['server_stats']['server_id']['server_name'] }}" + placeholder="{{ translate('serverConfig', 'serverName', data['lang']) }}" required>
{% if data['super_user'] %}
{{ data['server_stats']['server_id']['path'] }} @@ -71,21 +71,21 @@ {% if data['server_stats']['server_type'] != "minecraft-bedrock" %}
+ value="{{ data['server_stats']['server_id']['log_path'] }}" + placeholder="{{ translate('serverConfig', 'serverLogLocation', data['lang']) }}" required>
{% end %}
+ value="{{ data['server_stats']['server_id']['executable'] }}" + placeholder="{{ translate('serverConfig', 'serverExecutable', data['lang']) }}" required>
{% end %} {% if data['server_stats']['server_type'] == "minecraft-java" %} @@ -95,7 +95,7 @@ }} + value="{{ data['server_stats']['server_id']['execution_command'] }}" + placeholder="{{ translate('serverConfig', 'serverExecutionCommand', data['lang']) }}" required>
{% else %} + value="{{ data['server_stats']['server_id']['executable_update_url'] }}" + placeholder="{{ translate('serverConfig', 'exeUpdateURL', data['lang']) }}">
{% end %}
+ value="{{ data['server_stats']['server_id']['server_ip'] }}" required>
+ value="{{ data['server_stats']['server_id']['server_port'] }}" step="1" max="65566" min="1" + required> " , + data-content="{{ translate('serverConfig', 'statsHint1' , data['lang'])}}

{{ translate('serverConfig', 'statsHint2', data['lang'])}}" , - data-placement="right"> + data-placement="right">
{% end %} @@ -181,8 +181,8 @@ 'timeoutExplain2', data['lang']) }} + value="{{ data['server_stats']['server_id']['shutdown_timeout'] }}" step="2" max="300" min="60" + required>
@@ -190,19 +190,20 @@ - {{ translate('serverConfig', 'removeOldLogsAfterDesc', data['lang']) }} + value="{{ data['server_stats']['server_id']['logs_delete_after'] }}" step="1" max="365" min="0" + required>
+ + +
+
+ {% if data['server_stats']['server_id']['auto_start'] %} + + + {% else %} + + + {% end %} +
+
+
+
+ {% if data['server_stats']['server_id']['crash_detection'] %} + + + {% else %} + + + {% end %} +
+
+
+
+ {% if data['super_user'] %} + {% if data['server_stats']['server_id']['show_status'] %} + + + {% else %} +   {{ translate('serverConfig', 'showStatus', data['lang']) }} + + {% end %} + {% end %} +
+
@@ -257,13 +295,13 @@ {% if data['server_stats']['running'] %} {% if data['server_stats']['updating'] %}   {% else %}   {% end %} {{ translate('serverConfig', 'deleteServer', data['lang']) @@ -273,13 +311,13 @@ {% if not data['failed'] %} {% if data['server_stats']['updating'] %}   {% else %}   {% end %} {% end %} @@ -305,18 +343,19 @@ From 137ae3041ffe689a34d8552bbf7bdd5d2626a157 Mon Sep 17 00:00:00 2001 From: Silversthorn Date: Thu, 2 Feb 2023 23:47:54 +0100 Subject: [PATCH 005/296] Improving Forms Displays for upload files and server creation --- .../templates/panel/custom_login.html | 52 +- .../templates/server/bedrock_wizard.html | 659 ++++++++---------- app/frontend/templates/server/wizard.html | 392 ++++++----- app/translations/en_EN.json | 2 + 4 files changed, 548 insertions(+), 557 deletions(-) diff --git a/app/frontend/templates/panel/custom_login.html b/app/frontend/templates/panel/custom_login.html index 018eb006..deb69210 100644 --- a/app/frontend/templates/panel/custom_login.html +++ b/app/frontend/templates/panel/custom_login.html @@ -51,16 +51,19 @@

{{ translate('customLogin', 'loginImage', data['lang']) }}

-
+ {% raw xsrf_form_html() %} -
- -
-
- +
+
+
+ + +
+
+ +
+
@@ -228,6 +231,34 @@
+ @@ -231,30 +227,6 @@
+ + +
+
+
+
+
+ +
+
+

+
+ +
+
+ + +
+ +
+
+
+ +
+ +
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/frontend/templates/public/status.html b/app/frontend/templates/public/status.html index e5b100e2..30ffcd8c 100644 --- a/app/frontend/templates/public/status.html +++ b/app/frontend/templates/public/status.html @@ -89,7 +89,7 @@
-