From 9611e8539d9e7de8617bec8f54b21bd7f3354919 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 14 May 2023 13:59:47 -0400 Subject: [PATCH 1/4] Add alert for API down --- app/frontend/templates/server/wizard.html | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index aea48f1c..40860bd6 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -19,7 +19,11 @@
{% if data['online'] %}
-
+
+

Server JARs API unreachable. Please check Crafty's status Page + for more information.

+

{{ translate('serverWizard', 'newServer', data['lang']) }}

@@ -27,6 +31,16 @@

+ {% if data["server_api"] %} +
+ {% else %} +
+ + {% end %} {% raw xsrf_form_html() %}
@@ -145,7 +159,7 @@ data['lang']) }} - +

From 3262b5fd15b4eb7623d5b1971137dcd5969ab903 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 14 May 2023 14:23:06 -0400 Subject: [PATCH 2/4] Add grayscale warning over creation when api down --- app/classes/shared/helpers.py | 10 +++++++ app/classes/web/server_handler.py | 6 +++- app/frontend/templates/server/wizard.html | 35 +++++++++++++++++++---- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 9efb8b0a..e545d4aa 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -301,6 +301,16 @@ class Helpers: except Exception: return False + @staticmethod + def check_address_status(address): + try: + requests.get(address, timeout=1) + time.sleep(1) + requests.get(address, timeout=1) + return True + except: + return False + @staticmethod def check_port(server_port): try: diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py index 8b533bdf..f452be33 100644 --- a/app/classes/web/server_handler.py +++ b/app/classes/web/server_handler.py @@ -143,7 +143,11 @@ class ServerHandler(BaseHandler): "not a server creator or server limit reached" ) return - + page_data["server_api"] = False + if page_data["online"]: + page_data["server_api"] = self.helper.check_address_status( + "https://serverjars.com/api/fetchTypes" + ) page_data["server_types"] = self.controller.server_jars.get_serverjar_data() page_data["js_server_types"] = json.dumps( self.controller.server_jars.get_serverjar_data() diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index 40860bd6..13875cc8 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -19,10 +19,6 @@
{% if data['online'] %}
-
-

Server JARs API unreachable. Please check Crafty's status Page - for more information.

@@ -39,6 +35,28 @@ #creation_wizard { -webkit-filter: grayscale(1); } + .api-alert{ + position:absolute; + top:-5px; + left:0; + font-size: 50px !important; + color:#fff; + background:rgb(0,170,170); + opacity:.4; + width:100%; + height:100%; + z-index: 100; + } + .api-alert p { + margin: 0; + position: absolute; + top: 50%; + left: 50%; + text-align: center; + font-size: 20px; + -ms-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); + } {% end %} {% raw xsrf_form_html() %} @@ -160,10 +178,15 @@ - -

+ {% if not data["server_api"] %} +
+

Server JARs API unreachable. Please check Crafty's status Page + for more information.

+ {% end %}
+ {% end %}
From d02fe1cb6c595815efc5b8cf3b07c7fed6f42403 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 14 May 2023 14:35:23 -0400 Subject: [PATCH 3/4] Add translation --- app/frontend/templates/server/wizard.html | 6 +++--- app/translations/en_EN.json | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html index 13875cc8..5f6c1ef4 100644 --- a/app/frontend/templates/server/wizard.html +++ b/app/frontend/templates/server/wizard.html @@ -180,9 +180,9 @@ {% if not data["server_api"] %}
-

Server JARs API unreachable. Please check Crafty's status Page - for more information.

+

 {{ translate('error', 'serverJars1', data['lang']) }} {{ translate('error', 'craftyStatus', data['lang']) }} +  {{ translate('error', 'serverJars2', data['lang']) }}

{% end %}
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index de5da99a..eeef6673 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -186,7 +186,10 @@ "terribleFailure": "What a Terrible Failure!", "superError": "You must be a super user to complete this action.", "fileError": "File type must be an image.", - "migration": "Crafty's main server storage is being mirgated to a new location. All server starts have been suspended during this time. Please wait while we finish this migration" + "migration": "Crafty's main server storage is being mirgated to a new location. All server starts have been suspended during this time. Please wait while we finish this migration", + "serverJars1": "Server JARs API unreachable. Please check", + "craftyStatus": "Crafty's status page", + "serverJars2": "for the most up to date information." }, "footer": { "allRightsReserved": "All rights reserved", @@ -614,4 +617,4 @@ "manager": "Manager", "selectManager": "Select Manager for User" } -} +} \ No newline at end of file From 93c06c852221cbc819a0aa3cbdf42ae609c1b75b Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sun, 14 May 2023 22:36:49 +0100 Subject: [PATCH 4/4] Update changelog !581 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bb38301..2cb87465 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Fix project root error on first start ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/580)) ### Tweaks - Check for python version so we don't just fail out on unsupported python versions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/577)) +- Show warning for serverjars API connection issues ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/581)) ### Lang TBD