From 178aba63dd0c1d4d4f63e33e992123969cdfb31c Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 23 May 2023 18:21:04 -0400
Subject: [PATCH 1/5] Send empty json for no banned/cached players

---
 app/classes/controllers/servers_controller.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py
index b7c10ed8..ca6c8d22 100644
--- a/app/classes/controllers/servers_controller.py
+++ b/app/classes/controllers/servers_controller.py
@@ -529,8 +529,8 @@ class ServersController(metaclass=Singleton):
                 content = file.read()
                 file.close()
         except Exception as ex:
-            print(ex)
-            return None
+            logger.error(ex)
+            return {}
 
         return json.loads(content)
 
@@ -548,8 +548,8 @@ class ServersController(metaclass=Singleton):
                 content = file.read()
                 file.close()
         except Exception as ex:
-            print(ex)
-            return None
+            logger.error(ex)
+            return {}
 
         return json.loads(content)
 

From 898744c39e2c7e0429fa3c1e8ede300c30c352cd Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 23 May 2023 19:56:41 -0400
Subject: [PATCH 2/5] Remove old server commands

Fix spelling
---
 .../templates/panel/parts/server_players.html |  2 +-
 .../panel/server_admin_controls.html          | 63 -------------------
 2 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/app/frontend/templates/panel/parts/server_players.html b/app/frontend/templates/panel/parts/server_players.html
index 3ecc5efb..fd014018 100644
--- a/app/frontend/templates/panel/parts/server_players.html
+++ b/app/frontend/templates/panel/parts/server_players.html
@@ -17,7 +17,7 @@
                 {% if player['status'] == 'online' %}
                 <td><span class="text-success"><i class="fas fa-signal"></i> {{ player['status'] }}</span></td>
                 {% elif player['status'] == 'offline' %}
-                <td><span class="text-warning"><i class="fa-solid fa-signal-slash"></i> Last connexion : {{ player['last_seen'] }}</span></td>
+                <td><span class="text-warning"><i class="fa-solid fa-signal-slash"></i> Last connection : {{ player['last_seen'] }}</span></td>
                 {% end %}
                 <td class="buttons">
                     {% if data['server_stats']['running'] %}
diff --git a/app/frontend/templates/panel/server_admin_controls.html b/app/frontend/templates/panel/server_admin_controls.html
index 486139c5..b7b8d5a2 100644
--- a/app/frontend/templates/panel/server_admin_controls.html
+++ b/app/frontend/templates/panel/server_admin_controls.html
@@ -45,69 +45,6 @@
 
           <hr />
 
-          <div class="row">
-
-            <div class="col-md-6 col-sm-12">
-              <style>
-                .playerItem {
-                  padding: 1rem;
-                  display: flex;
-                  flex-flow: row wrap;
-                  align-items: center;
-                  justify-content: space-between;
-                  margin: 1rem 0px 1rem 0px;
-                }
-
-                .playerItem h3 {
-                  vertical-align: middle;
-                  padding: 0px;
-                  margin: 0px;
-                  margin-right: 1.5rem;
-                }
-
-                .playerItem button {
-                  vertical-align: middle;
-                  margin: 0.25rem;
-                }
-
-                .playerUnban {
-                  margin-bottom: 1rem;
-                }
-
-                .banned span {
-                  font-size: 1.1rem;
-                }
-              </style>
-              <h2>{{ translate('serverPlayerManagement', 'players', data['lang']) }}:</h2>
-              <ul style="list-style: none;padding: 0px;margin: 0px; margin-bottom: 1rem;gap: 1rem;">
-                {% for player in data['get_players'] %}
-                <li class="playerItem">
-                  <h3>{{ player }}</h3>
-                  <div class="buttons">
-                    <button onclick="send_command_to_server('ban {{ player }}')" type="button"
-                      class="btn btn-danger">Ban</button>
-                    <button onclick="send_command_to_server('kick {{ player }}')" type="button"
-                      class="btn btn-outline-danger">Kick</button>
-                    <button onclick="send_command_to_server('op {{ player }}')" type="button"
-                      class="btn btn-warning">OP</button>
-                    <button onclick="send_command_to_server('deop {{ player }}')" type="button"
-                      class="btn btn-outline-warning">De-OP</button>
-                  </div>
-                </li>
-                {% end %}
-              </ul>
-            </div>
-            <div class="col-md-6 col-sm-12">
-              <h2>{{ translate('serverPlayerManagement', 'bannedPlayers', data['lang']) }}:</h2>
-              <ul id="bannedPlayers" style="list-style: none;padding: 0px;margin: 0px; margin-bottom: 1rem;gap: 1rem;">
-                <li class="playerItem banned">
-                  <h3>{{ translate('serverPlayerManagement', 'loadingBannedPlayers', data['lang']) }}</h3>
-                </li>
-
-              </ul>
-            </div>
-          </div>
-
         </div>
       </div>
     </div>

From a6d30d7242e523d4861b40d3eb6b5327c0b5cfc8 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 25 May 2023 00:23:15 -0400
Subject: [PATCH 3/5] Fix upload root files being hidden

---
 app/frontend/templates/server/wizard.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 4d3e20fb..ec251739 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -553,6 +553,7 @@
                 <div class="form-group">
                   <input type="text" class="form-control" id="zip_root_path" name="zip_root_path">
                 </div>
+              </div>
                 <div class="modal fade" id="dir_upload_select" tabindex="-1" role="dialog" aria-labelledby="dir_select" aria-hidden="true">
                   <div class="modal-dialog" role="document">
                     <div class="modal-content">
@@ -596,7 +597,6 @@
       </div>
     </div>
   </div>
-</div>
 <style>
   button>i.refresh-class {
     margin: 0px;
@@ -949,6 +949,7 @@
 
     function show_file_tree() {
       if (upload) {
+        console.log("upload true")
         $("#dir_upload_select").modal();
       } else {
         $("#dir_select").modal();

From 79a4b8649676450c89d6fe7a07bcbe8e912a7331 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 29 May 2023 21:17:46 +0100
Subject: [PATCH 4/5] Update changelog !589

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a5aa565..822edc0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ TBD
 ### Bug fixes
 TBD
 ### Tweaks
-TBD
+- Send empty json for no banned/cached players ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/589))
 ### Lang
 TBD
 <br><br>

From 4484283a8f647f80d15e5bd39ea717793bb4edc1 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Mon, 29 May 2023 21:31:10 +0100
Subject: [PATCH 5/5] Update changelog !590

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 822edc0f..4a18074f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,10 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
-### Tweaks
+- Fix upload root files being hidden ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/590))
 - Send empty json for no banned/cached players ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/589))
+### Tweaks
+TBD
 ### Lang
 TBD
 <br><br>