From b9bd654e580ca2de2fc0c5be5298b70cc8cd545b Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 27 Sep 2022 22:06:22 -0400
Subject: [PATCH 1/7] Add upload import functionality.

Update gitignore
---
 .gitignore                                    |   1 +
 app/classes/web/ajax_handler.py               |   6 +
 app/classes/web/upload_handler.py             | 359 +++++--
 .../templates/panel/server_files.html         |   1 +
 app/frontend/templates/server/wizard.html     | 898 +++++++++++-------
 app/translations/en_EN.json                   |   1 +
 6 files changed, 840 insertions(+), 426 deletions(-)

diff --git a/.gitignore b/.gitignore
index 02a40213..b7f2d2b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ env.bak/
 venv.bak/
 
 .idea/
+/imports/
 /servers/
 /backups/
 /temp/
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 845b2886..20c8cbef 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -476,6 +476,12 @@ class AjaxHandler(BaseHandler):
 
         elif page == "unzip_server":
             path = self.get_argument("path", None)
+            if not path:
+                path = os.path.join(
+                    self.controller.project_root,
+                    "imports",
+                    self.get_argument("file", ""),
+                )
             if Helpers.check_file_exists(path):
                 self.helper.unzip_server(path, exec_user["user_id"])
             else:
diff --git a/app/classes/web/upload_handler.py b/app/classes/web/upload_handler.py
index 92892ed1..26f94a06 100644
--- a/app/classes/web/upload_handler.py
+++ b/app/classes/web/upload_handler.py
@@ -4,6 +4,7 @@ import time
 import tornado.web
 import tornado.options
 import tornado.httpserver
+from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.shared.console import Console
@@ -33,115 +34,293 @@ class UploadHandler(BaseHandler):
     def prepare(self):
         # Class & Function Defination
         api_key, _token_data, exec_user = self.current_user
-        server_id = self.get_argument("server_id", None)
-        superuser = exec_user["superuser"]
-        if api_key is not None:
-            superuser = superuser and api_key.superuser
-        user_id = exec_user["user_id"]
-        stream_size_value = self.helper.get_setting("stream_size_GB")
+        self.upload_type = str(self.request.headers.get("X-Content-Upload-Type"))
+        print(self.upload_type)
 
-        max_streamed_size = (1024 * 1024 * 1024) * stream_size_value
+        if self.upload_type == "server_import":
+            superuser = exec_user["superuser"]
+            if api_key is not None:
+                superuser = superuser and api_key.superuser
+            user_id = exec_user["user_id"]
+            stream_size_value = self.helper.get_setting("stream_size_GB")
 
-        self.content_len = int(self.request.headers.get("Content-Length"))
-        if self.content_len > max_streamed_size:
-            logger.error(
-                f"User with ID {user_id} attempted to upload a file that"
-                f" exceeded the max body size."
-            )
-            self.helper.websocket_helper.broadcast_user(
-                user_id,
-                "send_start_error",
-                {
-                    "error": self.helper.translation.translate(
-                        "error",
-                        "fileTooLarge",
-                        self.controller.users.get_user_lang_by_id(user_id),
-                    ),
-                },
-            )
-            return
-        self.do_upload = True
+            max_streamed_size = (1024 * 1024 * 1024) * stream_size_value
 
-        if superuser:
-            exec_user_server_permissions = (
-                self.controller.server_perms.list_defined_permissions()
-            )
-        elif api_key is not None:
-            exec_user_server_permissions = (
-                self.controller.server_perms.get_api_key_permissions_list(
-                    api_key, server_id
+            self.content_len = int(self.request.headers.get("Content-Length"))
+            if self.content_len > max_streamed_size:
+                logger.error(
+                    f"User with ID {user_id} attempted to upload a file that"
+                    f" exceeded the max body size."
                 )
-            )
-        else:
-            exec_user_server_permissions = (
-                self.controller.server_perms.get_user_id_permissions_list(
-                    exec_user["user_id"], server_id
+                self.helper.websocket_helper.broadcast_user(
+                    user_id,
+                    "send_start_error",
+                    {
+                        "error": self.helper.translation.translate(
+                            "error",
+                            "fileTooLarge",
+                            self.controller.users.get_user_lang_by_id(user_id),
+                        ),
+                    },
                 )
-            )
+                return
+            self.do_upload = True
 
-        server_id = self.request.headers.get("X-ServerId", None)
+            if superuser:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.list_defined_permissions()
+                )
+            elif api_key is not None:
+                exec_user_server_permissions = (
+                    self.controller.crafty_perms.get_api_key_permissions_list(api_key)
+                )
+            else:
+                exec_user_server_permissions = (
+                    self.controller.crafty_perms.get_crafty_permissions_list(
+                        exec_user["user_id"]
+                    )
+                )
 
-        if user_id is None:
-            logger.warning("User ID not found in upload handler call")
-            Console.warning("User ID not found in upload handler call")
-            self.do_upload = False
+            if user_id is None:
+                logger.warning("User ID not found in upload handler call")
+                Console.warning("User ID not found in upload handler call")
+                self.do_upload = False
 
-        if server_id is None:
-            logger.warning("Server ID not found in upload handler call")
-            Console.warning("Server ID not found in upload handler call")
-            self.do_upload = False
+            if (
+                EnumPermissionsCrafty.SERVER_CREATION
+                not in exec_user_server_permissions
+                and not exec_user["superuser"]
+            ):
+                logger.warning(
+                    f"User {user_id} tried to upload a server" " without permissions!"
+                )
+                Console.warning(
+                    f"User {user_id} tried to upload a server" " without permissions!"
+                )
+                self.do_upload = False
 
-        if EnumPermissionsServer.FILES not in exec_user_server_permissions:
-            logger.warning(
-                f"User {user_id} tried to upload a file to "
-                f"{server_id} without permissions!"
-            )
-            Console.warning(
-                f"User {user_id} tried to upload a file to "
-                f"{server_id} without permissions!"
-            )
-            self.do_upload = False
+            path = os.path.join(self.controller.project_root, "imports")
+            # Delete existing files
+            if len(os.listdir(path)) > 0:
+                for item in os.listdir():
+                    try:
+                        os.remove(os.path.join(path, item))
+                    except:
+                        logger.debug("Could not delete file on user server upload")
 
-        path = self.request.headers.get("X-Path", None)
-        filename = self.request.headers.get("X-FileName", None)
-        full_path = os.path.join(path, filename)
+            self.helper.ensure_dir_exists(path)
+            filename = self.request.headers.get("X-FileName", None)
+            full_path = os.path.join(path, filename)
 
-        if not Helpers.in_path(
-            Helpers.get_os_understandable_path(
-                self.controller.servers.get_server_data_by_id(server_id)["path"]
-            ),
-            full_path,
-        ):
-            print(
-                user_id,
-                server_id,
+            if self.do_upload:
+                try:
+                    self.f = open(full_path, "wb")
+                except Exception as e:
+                    logger.error(f"Upload failed with error: {e}")
+                    self.do_upload = False
+            # If max_body_size is not set, you cannot upload files > 100MB
+            self.request.connection.set_max_body_size(max_streamed_size)
+
+        elif self.upload_type == "background":
+            superuser = exec_user["superuser"]
+            if api_key is not None:
+                superuser = superuser and api_key.superuser
+            user_id = exec_user["user_id"]
+            stream_size_value = self.helper.get_setting("stream_size_GB")
+
+            max_streamed_size = (1024 * 1024 * 1024) * stream_size_value
+
+            self.content_len = int(self.request.headers.get("Content-Length"))
+            if self.content_len > max_streamed_size:
+                logger.error(
+                    f"User with ID {user_id} attempted to upload a file that"
+                    f" exceeded the max body size."
+                )
+                self.helper.websocket_helper.broadcast_user(
+                    user_id,
+                    "send_start_error",
+                    {
+                        "error": self.helper.translation.translate(
+                            "error",
+                            "fileTooLarge",
+                            self.controller.users.get_user_lang_by_id(user_id),
+                        ),
+                    },
+                )
+                return
+            self.do_upload = True
+
+            if superuser:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.list_defined_permissions()
+                )
+            elif api_key is not None:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.get_api_key_permissions_list(
+                        api_key, server_id
+                    )
+                )
+            else:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.get_user_id_permissions_list(
+                        exec_user["user_id"], server_id
+                    )
+                )
+
+            server_id = self.request.headers.get("X-ServerId", None)
+            if server_id is None:
+                logger.warning("Server ID not found in upload handler call")
+                Console.warning("Server ID not found in upload handler call")
+                self.do_upload = False
+
+            if user_id is None:
+                logger.warning("User ID not found in upload handler call")
+                Console.warning("User ID not found in upload handler call")
+                self.do_upload = False
+
+            if EnumPermissionsServer.FILES not in exec_user_server_permissions:
+                logger.warning(
+                    f"User {user_id} tried to upload a file to "
+                    f"{server_id} without permissions!"
+                )
+                Console.warning(
+                    f"User {user_id} tried to upload a file to "
+                    f"{server_id} without permissions!"
+                )
+                self.do_upload = False
+
+            path = self.request.headers.get("X-Path", None)
+            filename = self.request.headers.get("X-FileName", None)
+            full_path = os.path.join(path, filename)
+
+            if not Helpers.in_path(
                 Helpers.get_os_understandable_path(
                     self.controller.servers.get_server_data_by_id(server_id)["path"]
                 ),
                 full_path,
-            )
-            logger.warning(
-                f"User {user_id} tried to upload a file to {server_id} "
-                f"but the path is not inside of the server!"
-            )
-            Console.warning(
-                f"User {user_id} tried to upload a file to {server_id} "
-                f"but the path is not inside of the server!"
-            )
-            self.do_upload = False
-
-        if self.do_upload:
-            try:
-                self.f = open(full_path, "wb")
-            except Exception as e:
-                logger.error(f"Upload failed with error: {e}")
+            ):
+                logger.warning(
+                    f"User {user_id} tried to upload a file to {server_id} "
+                    f"but the path is not inside of the server!"
+                )
+                Console.warning(
+                    f"User {user_id} tried to upload a file to {server_id} "
+                    f"but the path is not inside of the server!"
+                )
                 self.do_upload = False
-        # If max_body_size is not set, you cannot upload files > 100MB
-        self.request.connection.set_max_body_size(max_streamed_size)
+
+            if self.do_upload:
+                try:
+                    self.f = open(full_path, "wb")
+                except Exception as e:
+                    logger.error(f"Upload failed with error: {e}")
+                    self.do_upload = False
+            # If max_body_size is not set, you cannot upload files > 100MB
+            self.request.connection.set_max_body_size(max_streamed_size)
+        else:
+            server_id = self.get_argument("server_id", None)
+            superuser = exec_user["superuser"]
+            if api_key is not None:
+                superuser = superuser and api_key.superuser
+            user_id = exec_user["user_id"]
+            stream_size_value = self.helper.get_setting("stream_size_GB")
+
+            max_streamed_size = (1024 * 1024 * 1024) * stream_size_value
+
+            self.content_len = int(self.request.headers.get("Content-Length"))
+            if self.content_len > max_streamed_size:
+                logger.error(
+                    f"User with ID {user_id} attempted to upload a file that"
+                    f" exceeded the max body size."
+                )
+                self.helper.websocket_helper.broadcast_user(
+                    user_id,
+                    "send_start_error",
+                    {
+                        "error": self.helper.translation.translate(
+                            "error",
+                            "fileTooLarge",
+                            self.controller.users.get_user_lang_by_id(user_id),
+                        ),
+                    },
+                )
+                return
+            self.do_upload = True
+
+            if superuser:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.list_defined_permissions()
+                )
+            elif api_key is not None:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.get_api_key_permissions_list(
+                        api_key, server_id
+                    )
+                )
+            else:
+                exec_user_server_permissions = (
+                    self.controller.server_perms.get_user_id_permissions_list(
+                        exec_user["user_id"], server_id
+                    )
+                )
+
+            server_id = self.request.headers.get("X-ServerId", None)
+            if server_id is None:
+                logger.warning("Server ID not found in upload handler call")
+                Console.warning("Server ID not found in upload handler call")
+                self.do_upload = False
+
+            if user_id is None:
+                logger.warning("User ID not found in upload handler call")
+                Console.warning("User ID not found in upload handler call")
+                self.do_upload = False
+
+            if EnumPermissionsServer.FILES not in exec_user_server_permissions:
+                logger.warning(
+                    f"User {user_id} tried to upload a file to "
+                    f"{server_id} without permissions!"
+                )
+                Console.warning(
+                    f"User {user_id} tried to upload a file to "
+                    f"{server_id} without permissions!"
+                )
+                self.do_upload = False
+
+            path = self.request.headers.get("X-Path", None)
+            filename = self.request.headers.get("X-FileName", None)
+            full_path = os.path.join(path, filename)
+
+            if not Helpers.in_path(
+                Helpers.get_os_understandable_path(
+                    self.controller.servers.get_server_data_by_id(server_id)["path"]
+                ),
+                full_path,
+            ):
+                logger.warning(
+                    f"User {user_id} tried to upload a file to {server_id} "
+                    f"but the path is not inside of the server!"
+                )
+                Console.warning(
+                    f"User {user_id} tried to upload a file to {server_id} "
+                    f"but the path is not inside of the server!"
+                )
+                self.do_upload = False
+
+            if self.do_upload:
+                try:
+                    self.f = open(full_path, "wb")
+                except Exception as e:
+                    logger.error(f"Upload failed with error: {e}")
+                    self.do_upload = False
+            # If max_body_size is not set, you cannot upload files > 100MB
+            self.request.connection.set_max_body_size(max_streamed_size)
 
     def post(self):
         logger.info("Upload completed")
-        files_left = int(self.request.headers.get("X-Files-Left", None))
+        if self.upload_type == "server_files":
+            files_left = int(self.request.headers.get("X-Files-Left", None))
+        else:
+            files_left = 0
 
         if self.do_upload:
             time.sleep(5)
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 800a55c3..ff7bf998 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -711,6 +711,7 @@
     xmlHttpRequest.setRequestHeader('X-Content-Length', size);
     xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
     xmlHttpRequest.setRequestHeader('X-Path', path);
+    xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', 'server_files')
     xmlHttpRequest.setRequestHeader('X-Files-Left', left);
     xmlHttpRequest.setRequestHeader('X-FileName', fileName);
     xmlHttpRequest.setRequestHeader('X-ServerId', serverId);
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 10b4d35a..481ab957 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -431,388 +431,614 @@
         </p>
       </div>
     </div>
-    <div class="col-sm-6 grid-margin">
-      <img id="op_logo" style="filter: grayscale(10%); opacity: .1;" src="../../static/assets/images/logo_small.svg"
-        alt="Crafty logo" />
+    <div class="col-sm-6 grid-margin stretch-card">
+      <div class="card">
+        <div class="card-body">
+
+          <h4>{{ translate('serverWizard', 'uploadZip', data['lang']) }}</h4>
+          <br />
+          <p class="card-description">
+
+          <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
+            {% raw xsrf_form_html() %}
+            <input type="hidden" value="import_zip" name="create_type">
+
+            <div class="row">
+              <div class="col-sm-12">
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
+                    <input type="text" class="form-control" id="server_name" name="server_name" value=""
+                      placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                  </div>
+                </div>
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server">Server Upload </label><br>
+                    <span id="upload_input">
+                      <input type="file" multiple="false" class="form-control" id="file" name="file" required
+                        style="width: 70%;">
+                      <button type="button" class="btn btn-info" onclick="sendFile()">UPLOAD</button>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div id="lower_half" style="visibility: hidden;">
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server">{{ translate('serverWizard', 'selectRoot', data['lang']) }} <small>{{
+                        translate('serverWizard', 'explainRoot', data['lang']) }}</small></label>
+                    <br>
+                    <button class="btn btn-primary mr-2" id="root_upload_button" type="button">{{
+                      translate('serverWizard', 'clickRoot', data['lang']) }}</button>
+                  </div>
+                </div>
+
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
+                    <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                      placeholder="paper.jar" required>
+                  </div>
+                </div>
+
+                <div class="col-sm-12">
+                  <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                      style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+                      data['lang']) }}</small></h4>
+                  <hr>
+                  <div class="row">
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <label for="min_memory3">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
+                            translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
+                        <input type="number" class="form-control" id="min_memory3" name="min_memory" value="1"
+                          step="0.5" min="0.5" required>
+                      </div>
+                    </div>
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <label for="max_memory3">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
+                            translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
+                        <input type="number" class="form-control" id="max_memory3" name="max_memory" value="2"
+                          step="0.5" min="0.5" required>
+                      </div>
+                    </div>
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{
+                            translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
+                        <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1"
+                          required>
+                      </div>
+                    </div>
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <div id="accordion-3">
+                          <div class="card">
+                            <div class="card-header p-2" id="Role-3">
+                              <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3"
+                                aria-expanded="true" aria-controls="collapseRole-3">
+                                <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
+                                data['lang'])
+                                }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                                  data['lang']) }}</small>
+                              </p>
+                            </div>
+                            <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                              <div class="card-body scroll">
+                                <div class="form-group">
+                                  {% for r in data['roles'] %}
+                                  <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                        type="checkbox">&nbsp;
+                                      {{ r['role_name'].capitalize() }}</label></span>
+                                  {% end %}
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="col-sm-12" style="visibility: hidden;">
+                      <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_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+                      aria-hidden="true">
+                      <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                          <div class="modal-header">
+                            <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard',
+                              'selectZipDir', data['lang']) }}</h5>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                              <span aria-hidden="true">&times;</span>
+                            </button>
+                          </div>
+                          <div class="modal-body">
+                            <div class="tree-ctx-item" id="main-tree-div" data-path=""
+                              style="overflow: scroll; max-height:75%;">
+                              <input type="radio" id="main-tree-input-upload" name="root_path" value="" checked>
+                              <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
+                                <i class="far fa-folder"></i>
+                                <i class="far fa-folder-open"></i>
+                                {{ translate('serverFiles', 'files', data['lang']) }}
+                              </span>
+                              </input>
+                            </div>
+                          </div>
+                          <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-dismiss="modal">{{
+                              translate('serverWizard', 'close', data['lang']) }}</button>
+                            <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{
+                              translate('serverWizard', 'save', data['lang']) }}</button>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <button id="upload_submit" type="submit" title="You must select server root dir first" disabled
+                  class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
+                  }}</button>
+                <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+                  }}</button>
+              </div>
+            </div>
+          </form>
+          </p>
+        </div>
+      </div>
     </div>
   </div>
-</div>
-<style>
-  .refresh-class:hover {
-    cursor: grab;
-  }
-
-  .scroll {
-    max-height: 12em;
-    overflow-y: auto;
-  }
-
-  .menu-btn {
-    font-size: 0.9em;
-    padding: 2px 10px;
-  }
-
-  .menu {
-    padding-top: 10px;
-    z-index: 200;
-    margin-top: 4px;
-    position: absolute;
-    background-color: #2a2c44;
-  }
-
-  .menu-option {
-    padding: 6px 20px 6px;
-    color: white;
-  }
-
-  #overlay {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    width: 100%;
-    height: 100%;
-    z-index: 100;
-  }
-</style>
-<style>
-  /* Remove default bullets */
-  .tree-view,
-  .tree-nested {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    margin-left: 10px;
-  }
-
-  /* Style the items */
-  .tree-item,
-  .files-tree-title {
-    cursor: pointer;
-    user-select: none;
-    /* Prevent text selection */
-  }
-
-  /* Create the caret/arrow with a unicode, and style it */
-  .tree-caret .fa-folder {
-    display: inline-block;
-  }
-
-  .tree-caret .fa-folder-open {
-    display: none;
-  }
-
-  /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
-  .tree-caret-down .fa-folder {
-    display: none;
-  }
-
-  .tree-caret-down .fa-folder-open {
-    display: inline-block;
-  }
-
-  /* Hide the nested list */
-  .tree-nested {
-    display: none;
-  }
-
-  #op_logo {
-    position: relative;
-    top: 50%;
-    transform: translateY(-50%);
-  }
-</style>
-
-{% end %}
-
-{% block js%}
-<script>
-  document.getElementById("root_files_button").addEventListener("click", function () {
-    if (document.forms["zip"]["server_path"].value != "") {
-      if (document.getElementById('root_files_button').classList.contains('clicked')) {
-        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
-      } else {
-        document.getElementById('root_files_button').classList.add('clicked')
-      }
-      path = document.forms["zip"]["server_path"].value;
-      console.log(document.forms["zip"]["server_path"].value)
-      var token = getCookie("_xsrf");
-      var dialog = bootbox.dialog({
-        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-        closeButton: false
-      });
-      $.ajax({
-        type: "POST",
-        headers: { 'X-XSRFToken': token },
-        url: '/ajax/unzip_server?id=-1&path=' + path,
-      });
-    } else {
-      bootbox.alert("You must input a path before selecting this button");
+  <style>
+    .refresh-class:hover {
+      cursor: grab;
     }
-  });
-</script>
 
-<script>
-  function dropDown(event) {
-    event.target.parentElement.children[1].classList.remove("d-none");
-    document.getElementById("overlay").classList.remove("d-none");
-  }
-
-  function hide(event) {
-    var items = document.getElementsByClassName('menu');
-    items.forEach(item => {
-      item.classList.add("d-none");
-    })
-
-    document.getElementById("overlay").classList.add("d-none");
-  }
-
-  $(document).ready(function () {
-    console.log('ready');
-    var forms = $('form.server-wizard');
-    forms.each(function (i, formEl) {
-      var form = $(formEl);
-      var min = form.find('[name=min_memory]');
-      var max = form.find('[name=max_memory]');
-      console.log(form, min, max)
-      min.change(function () {
-        check_sizes(max, min, 'min');
-      });
-      max.change(function () {
-        check_sizes(max, min, 'max');
-      });
-    });
-  });
-
-  function wait_msg(importing) {
-    bootbox.alert({
-      title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}',
-      message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}',
-    });
-  }
-
-  function show_file_tree() {
-    $("#dir_select").modal();
-  }
-
-  function check_sizes(a, b, changed) {
-    max_mem = parseFloat(a.val());
-    min_mem = parseFloat(b.val());
-    if (max_mem < min_mem && changed === 'min') {
-      a.val(min_mem)
+    .scroll {
+      max-height: 12em;
+      overflow-y: auto;
     }
-    if (max_mem < min_mem && changed === 'max') {
-      b.val(max_mem)
+
+    .menu-btn {
+      font-size: 0.9em;
+      padding: 2px 10px;
     }
-  }
 
-  function getTreeView(path) {
-    document.getElementById('zip_submit').disabled = false;
-    path = path
+    .menu {
+      padding-top: 10px;
+      z-index: 200;
+      margin-top: 4px;
+      position: absolute;
+      background-color: #2a2c44;
+    }
 
-    $.ajax({
-      type: "GET",
-      url: '/ajax/get_zip_tree?id=-1&path=' + path,
-      dataType: 'text',
-      success: function (data) {
-        console.log("got response:");
-        console.log(data);
+    .menu-option {
+      padding: 6px 20px 6px;
+      color: white;
+    }
 
-        dataArr = data.split('\n');
-        serverDir = dataArr.shift(); // Remove & return first element (server directory)
-        text = dataArr.join('\n');
+    #overlay {
+      position: absolute;
+      top: 0px;
+      left: 0px;
+      width: 100%;
+      height: 100%;
+      z-index: 100;
+    }
+  </style>
+  <style>
+    /* Remove default bullets */
+    .tree-view,
+    .tree-nested {
+      list-style-type: none;
+      margin: 0;
+      padding: 0;
+      margin-left: 10px;
+    }
 
-        try {
-          document.getElementById('main-tree-div').innerHTML += text;
-          document.getElementById('main-tree').parentElement.classList.add("clicked");
-        } catch {
-          document.getElementById('files-tree').innerHTML = text;
+    /* Style the items */
+    .tree-item,
+    .files-tree-title {
+      cursor: pointer;
+      user-select: none;
+      /* Prevent text selection */
+    }
+
+    /* Create the caret/arrow with a unicode, and style it */
+    .tree-caret .fa-folder {
+      display: inline-block;
+    }
+
+    .tree-caret .fa-folder-open {
+      display: none;
+    }
+
+    /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
+    .tree-caret-down .fa-folder {
+      display: none;
+    }
+
+    .tree-caret-down .fa-folder-open {
+      display: inline-block;
+    }
+
+    /* Hide the nested list */
+    .tree-nested {
+      display: none;
+    }
+
+    #op_logo {
+      position: relative;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  </style>
+
+  {% end %}
+
+  {% block js%}
+  <script>
+    var file;
+    function sendFile() {
+      file = $("#file")[0].files[0]
+      document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
+      let xmlHttpRequest = new XMLHttpRequest();
+      let token = getCookie("_xsrf")
+      let fileName = file.name
+      let target = '/upload'
+      let mimeType = file.type
+      let size = file.size
+      let type = 'server_import'
+
+      xmlHttpRequest.open('POST', target, true);
+      xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
+      xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
+      xmlHttpRequest.setRequestHeader('X-Content-Length', size);
+      xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
+      xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', type);
+      xmlHttpRequest.setRequestHeader('X-FileName', fileName);
+      xmlHttpRequest.addEventListener('load', (event) => {
+        if (event.target.responseText == 'success') {
+          console.log('Upload for file', file.name, 'was successful!')
+          document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>';
+          document.getElementById("lower_half").style.visibility = "visible";
         }
+        else {
+          alert('Upload failed with response: ' + event.target.responseText);
+          doUpload = false;
+        }
+      }, false);
+      xmlHttpRequest.addEventListener('error', (e) => {
+        console.error('Error while uploading file', file.name + '.', 'Event:', e)
+      }, false);
+      xmlHttpRequest.send(file);
+    }
 
 
-        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
-        document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
-
-      },
-    });
-  }
-
-  function getToggleMain(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-    document.getElementById("files-tree").classList.toggle("d-block");
-    document.getElementById(path + "span").classList.toggle("tree-caret-down");
-    document.getElementById(path + "span").classList.toggle("tree-caret");
-  }
-
-
-  function getDirView(event) {
-    path = event.target.parentElement.getAttribute('data-path');
-
-    if (document.getElementById(path).classList.contains('clicked')) {
-
-      var toggler = document.getElementById(path + "span");
-
-      if (toggler.classList.contains('files-tree-title')) {
-        document.getElementById(path + "ul").classList.toggle("d-block");
-        document.getElementById(path + "span").classList.toggle("tree-caret-down");
+    document.getElementById("root_files_button").addEventListener("click", function () {
+      if (document.forms["zip"]["server_path"].value != "") {
+        if (document.getElementById('root_files_button').classList.contains('clicked')) {
+          document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+        } else {
+          document.getElementById('root_files_button').classList.add('clicked')
+        }
+        path = document.forms["zip"]["server_path"].value;
+        console.log(document.forms["zip"]["server_path"].value)
+        var token = getCookie("_xsrf");
+        var dialog = bootbox.dialog({
+          message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+          closeButton: false
+        });
+        $.ajax({
+          type: "POST",
+          headers: { 'X-XSRFToken': token },
+          url: '/ajax/unzip_server?id=-1&path=' + path,
+        });
+      } else {
+        bootbox.alert("You must input a path before selecting this button");
       }
-      return;
-    } else {
+    });
+
+    document.getElementById("root_upload_button").addEventListener("click", function () {
+      if (file) {
+        if (document.getElementById('root_upload_button').classList.contains('clicked')) {
+          document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+        } else {
+          document.getElementById('root_upload_button').classList.add('clicked')
+        }
+        var token = getCookie("_xsrf");
+        var dialog = bootbox.dialog({
+          message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+          closeButton: false
+        });
+        $.ajax({
+          type: "POST",
+          headers: { 'X-XSRFToken': token },
+          url: '/ajax/unzip_server?id=-1&file=' + file.name,
+        });
+      } else {
+        bootbox.alert("You must input a path before selecting this button");
+      }
+    });
+  </script>
+
+  <script>
+    function dropDown(event) {
+      event.target.parentElement.children[1].classList.remove("d-none");
+      document.getElementById("overlay").classList.remove("d-none");
+    }
+
+    function hide(event) {
+      var items = document.getElementsByClassName('menu');
+      items.forEach(item => {
+        item.classList.add("d-none");
+      })
+
+      document.getElementById("overlay").classList.add("d-none");
+    }
+
+    $(document).ready(function () {
+      console.log('ready');
+      var forms = $('form.server-wizard');
+      forms.each(function (i, formEl) {
+        var form = $(formEl);
+        var min = form.find('[name=min_memory]');
+        var max = form.find('[name=max_memory]');
+        console.log(form, min, max)
+        min.change(function () {
+          check_sizes(max, min, 'min');
+        });
+        max.change(function () {
+          check_sizes(max, min, 'max');
+        });
+      });
+    });
+
+    function wait_msg(importing) {
+      bootbox.alert({
+        title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}',
+        message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}',
+      });
+    }
+
+    function show_file_tree() {
+      $("#dir_select").modal();
+    }
+
+    function check_sizes(a, b, changed) {
+      max_mem = parseFloat(a.val());
+      min_mem = parseFloat(b.val());
+      if (max_mem < min_mem && changed === 'min') {
+        a.val(min_mem)
+      }
+      if (max_mem < min_mem && changed === 'max') {
+        b.val(max_mem)
+      }
+    }
+
+    function getTreeView(path) {
+      //If this value is still hidden we know the user is executing a zip import and not an upload
+      if (document.getElementById("lower_half").visibility == "hidden") {
+        document.getElementById('zip_submit').disabled = false;
+      } else {
+        document.getElementById('upload_submit').disabled = false;
+      }
+      path = path
+
       $.ajax({
         type: "GET",
-        url: '/ajax/get_zip_dir?id=-1&path=' + path,
+        url: '/ajax/get_zip_tree?id=-1&path=' + path,
         dataType: 'text',
         success: function (data) {
           console.log("got response:");
+          console.log(data);
 
           dataArr = data.split('\n');
           serverDir = dataArr.shift(); // Remove & return first element (server directory)
           text = dataArr.join('\n');
 
           try {
-            document.getElementById(path + "span").classList.add('tree-caret-down');
-            document.getElementById(path).innerHTML += text;
-            document.getElementById(path).classList.add("clicked");
+            document.getElementById('main-tree-div').innerHTML += text;
+            document.getElementById('main-tree').parentElement.classList.add("clicked");
           } catch {
-            console.log("Bad")
+            document.getElementById('files-tree').innerHTML = text;
           }
 
-          var toggler = document.getElementById(path);
 
-          if (toggler.classList.contains('files-tree-title')) {
-            document.getElementById(path + "span").addEventListener("click", function caretListener() {
-              document.getElementById(path + "ul").classList.toggle("d-block");
-              document.getElementById(path + "span").classList.toggle("tree-caret-down");
-            });
-          }
+          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
+          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
+
         },
       });
     }
-  }
-  if (webSocket) {
-    webSocket.on('send_temp_path', function (data) {
-      setTimeout(function () {
-        var x = document.querySelector('.bootbox');
-        if (x) {
-          x.remove()
+
+    function getToggleMain(event) {
+      path = event.target.parentElement.getAttribute('data-path');
+      document.getElementById("files-tree").classList.toggle("d-block");
+      document.getElementById(path + "span").classList.toggle("tree-caret-down");
+      document.getElementById(path + "span").classList.toggle("tree-caret");
+    }
+
+
+    function getDirView(event) {
+      path = event.target.parentElement.getAttribute('data-path');
+
+      if (document.getElementById(path).classList.contains('clicked')) {
+
+        var toggler = document.getElementById(path + "span");
+
+        if (toggler.classList.contains('files-tree-title')) {
+          document.getElementById(path + "ul").classList.toggle("d-block");
+          document.getElementById(path + "span").classList.toggle("tree-caret-down");
         }
-        var x = document.querySelector('.modal-backdrop');
-        if (x) {
-          x.remove()
-        }
-        document.getElementById('main-tree-input').setAttribute('value', data.path)
-        getTreeView(data.path);
-        show_file_tree();
+        return;
+      } else {
+        $.ajax({
+          type: "GET",
+          url: '/ajax/get_zip_dir?id=-1&path=' + path,
+          dataType: 'text',
+          success: function (data) {
+            console.log("got response:");
 
-      }, 5000);
-    });
-  }
+            dataArr = data.split('\n');
+            serverDir = dataArr.shift(); // Remove & return first element (server directory)
+            text = dataArr.join('\n');
 
-  function refreshCache() {
-    var token = getCookie("_xsrf")
-    document.getElementById("refresh-cache").classList.add("fa-spin")
-    $.ajax({
-      type: "POST",
-      headers: { 'X-XSRFToken': token },
-      url: '/ajax/jar_cache',
-      success: function () {
-        document.getElementById("refresh-cache").classList.remove("fa-sync");
-        document.getElementById("refresh-cache").classList.remove("fa-spin");
-        document.getElementById("refresh-cache").classList.add("fa-check");
+            try {
+              document.getElementById(path + "span").classList.add('tree-caret-down');
+              document.getElementById(path).innerHTML += text;
+              document.getElementById(path).classList.add("clicked");
+            } catch {
+              console.log("Bad")
+            }
 
+            var toggler = document.getElementById(path);
+
+            if (toggler.classList.contains('files-tree-title')) {
+              document.getElementById(path + "span").addEventListener("click", function caretListener() {
+                document.getElementById(path + "ul").classList.toggle("d-block");
+                document.getElementById(path + "span").classList.toggle("tree-caret-down");
+              });
+            }
+          },
+        });
+      }
+    }
+    if (webSocket) {
+      webSocket.on('send_temp_path', function (data) {
         setTimeout(function () {
-          location.reload();
-        }, 2000);
-      },
-    });
-  }
+          var x = document.querySelector('.bootbox');
+          if (x) {
+            x.remove()
+          }
+          var x = document.querySelector('.modal-backdrop');
+          if (x) {
+            x.remove()
+          }
+          document.getElementById('main-tree-input').setAttribute('value', data.path)
+          document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
+          getTreeView(data.path);
+          show_file_tree();
 
-</script>
-<script type="text/javascript">
-  var text = '{% raw data["js_server_types"] %}';
-  var serverTypesLists = JSON.parse(text);
-  /* CountryChange() is called from the onchange event of a select element.
-  * param selectObj - the select object which fired the on change event.
-  */
-  function serverTypeChange(selectObj) {
-    // get the index of the selected option
-    var idx = document.getElementById('server_type').selectedIndex;
-    // get the value of the selected option
-    var cSelect = document.getElementById("server");
-    try {
-      var which = document.getElementById('server_type').options[idx].value;
-    } catch {
+        }, 5000);
+      });
+    }
+
+    function refreshCache() {
+      var token = getCookie("_xsrf")
+      document.getElementById("refresh-cache").classList.add("fa-spin")
+      $.ajax({
+        type: "POST",
+        headers: { 'X-XSRFToken': token },
+        url: '/ajax/jar_cache',
+        success: function () {
+          document.getElementById("refresh-cache").classList.remove("fa-sync");
+          document.getElementById("refresh-cache").classList.remove("fa-spin");
+          document.getElementById("refresh-cache").classList.add("fa-check");
+
+          setTimeout(function () {
+            location.reload();
+          }, 2000);
+        },
+      });
+    }
+
+  </script>
+  <script type="text/javascript">
+    var text = '{% raw data["js_server_types"] %}';
+    var serverTypesLists = JSON.parse(text);
+    /* CountryChange() is called from the onchange event of a select element.
+    * param selectObj - the select object which fired the on change event.
+    */
+    function serverTypeChange(selectObj) {
+      // get the index of the selected option
+      var idx = document.getElementById('server_type').selectedIndex;
+      // get the value of the selected option
+      var cSelect = document.getElementById("server");
+      try {
+        var which = document.getElementById('server_type').options[idx].value;
+      } catch {
+        while (cSelect.options.length > 0) {
+          cSelect.remove(0);
+        }
+        return;
+      }
+      let server_type = which.split('|')[0];
+      let server = which.split('|')[1];
+      // use the selected option value to retrieve the list of items from the serverTypesLists array
+      let cList = serverTypesLists[server_type];
+      // get the country select element via its known id
+      var cSelect = document.getElementById("server");
+      // remove the current options from the country select
+      var len = cSelect.options.length;
       while (cSelect.options.length > 0) {
         cSelect.remove(0);
       }
-      return;
+      var newOption;
+      // create new options ordered by ascending
+      cList[server].forEach(type => {
+        newOption = document.createElement("option");
+        newOption.value = which + "|" + type;  // assumes option string and value are the same
+        newOption.text = type;
+        // add the new option
+        try {
+          cSelect.add(newOption);  // this will fail in DOM browsers but is needed for IE
+        }
+        catch (e) {
+          cSelect.appendChild(newOption);
+        }
+      })
     }
-    let server_type = which.split('|')[0];
-    let server = which.split('|')[1];
-    // use the selected option value to retrieve the list of items from the serverTypesLists array
-    let cList = serverTypesLists[server_type];
-    // get the country select element via its known id
-    var cSelect = document.getElementById("server");
-    // remove the current options from the country select
-    var len = cSelect.options.length;
-    while (cSelect.options.length > 0) {
-      cSelect.remove(0);
-    }
-    var newOption;
-    // create new options ordered by ascending
-    cList[server].forEach(type => {
-      newOption = document.createElement("option");
-      newOption.value = which + "|" + type;  // assumes option string and value are the same
-      newOption.text = type;
-      // add the new option
-      try {
-        cSelect.add(newOption);  // this will fail in DOM browsers but is needed for IE
-      }
-      catch (e) {
-        cSelect.appendChild(newOption);
-      }
-    })
-  }
 
-  function serverJarChange(selectObj) {
-    let type_select = document.getElementById('server_jar')
-    let tidx = type_select.selectedIndex;
-    let val = type_select.options[tidx].value;
-    if (val == 'None') {
+    function serverJarChange(selectObj) {
+      let type_select = document.getElementById('server_jar')
+      let tidx = type_select.selectedIndex;
+      let val = type_select.options[tidx].value;
+      if (val == 'None') {
+        var jcSelect = document.getElementById("server_type");
+        while (jcSelect.options.length > 0) {
+          jcSelect.remove(0);
+        }
+        serverTypeChange(selectObj);
+        return;
+      }
+      // get the index of the selected option
+      var jidx = selectObj.selectedIndex;
+      // get the value of the selected option
+      var jwhich = selectObj.options[jidx].value;
+      // use the selected option value to retrieve the list of items from the serverTypesLists array
+      jcList = Object.keys(serverTypesLists[jwhich]);
+      // get the country select element via its known id
       var jcSelect = document.getElementById("server_type");
+      // remove the current options from the country select
+      var jlen = jcSelect.options.length;
       while (jcSelect.options.length > 0) {
         jcSelect.remove(0);
       }
+      var jnewOption;
+      // create new options ordered by ascending
+      jcList.forEach(type => {
+        jnewOption = document.createElement("option");
+        jnewOption.value = jwhich + "|" + type;  // assumes option string and value are the same
+        jnewOption.text = type;
+        // add the new option
+        try {
+          jcSelect.add(jnewOption);  // this will fail in DOM browsers but is needed for IE
+        }
+        catch (e) {
+          jcSelect.appendChild(jnewOption);
+        }
+      })
       serverTypeChange(selectObj);
-      return;
     }
-    // get the index of the selected option
-    var jidx = selectObj.selectedIndex;
-    // get the value of the selected option
-    var jwhich = selectObj.options[jidx].value;
-    // use the selected option value to retrieve the list of items from the serverTypesLists array
-    jcList = Object.keys(serverTypesLists[jwhich]);
-    // get the country select element via its known id
-    var jcSelect = document.getElementById("server_type");
-    // remove the current options from the country select
-    var jlen = jcSelect.options.length;
-    while (jcSelect.options.length > 0) {
-      jcSelect.remove(0);
-    }
-    var jnewOption;
-    // create new options ordered by ascending
-    jcList.forEach(type => {
-      jnewOption = document.createElement("option");
-      jnewOption.value = jwhich + "|" + type;  // assumes option string and value are the same
-      jnewOption.text = type;
-      // add the new option
-      try {
-        jcSelect.add(jnewOption);  // this will fail in DOM browsers but is needed for IE
-      }
-      catch (e) {
-        jcSelect.appendChild(jnewOption);
-      }
-    })
-    serverTypeChange(selectObj);
-  }
-</script>
-{% end %}
\ No newline at end of file
+  </script>
+  {% end %}
\ No newline at end of file
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json
index bd21b722..86f4db3f 100644
--- a/app/translations/en_EN.json
+++ b/app/translations/en_EN.json
@@ -502,6 +502,7 @@
         "importServer": "Import an Existing Server",
         "importServerButton": "Import Server!",
         "importZip": "Import from a Zip File",
+        "uploadZip": "Upload Zip File For Server Import",
         "maxMem": "Maximum Memory",
         "minMem": "Minimum Memory",
         "myNewServer": "My New Server",

From ab344cbff43cb87f38bbaa3aff93be1c27b8ed55 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 27 Sep 2022 22:49:52 -0400
Subject: [PATCH 2/7] Add zip upload to bedrock servers

---
 app/classes/web/upload_handler.py             |   1 -
 .../templates/server/bedrock_wizard.html      | 234 +++++++++++++++++-
 2 files changed, 230 insertions(+), 5 deletions(-)

diff --git a/app/classes/web/upload_handler.py b/app/classes/web/upload_handler.py
index 26f94a06..e4ba8222 100644
--- a/app/classes/web/upload_handler.py
+++ b/app/classes/web/upload_handler.py
@@ -35,7 +35,6 @@ class UploadHandler(BaseHandler):
         # Class & Function Defination
         api_key, _token_data, exec_user = self.current_user
         self.upload_type = str(self.request.headers.get("X-Content-Upload-Type"))
-        print(self.upload_type)
 
         if self.upload_type == "server_import":
             superuser = exec_user["superuser"]
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index a756ae1c..b105ed0c 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -321,9 +321,171 @@
         </p>
       </div>
     </div>
-    <div class="col-sm-6 grid-margin">
-      <img id="op_logo" style="filter: grayscale(10%); opacity: .1;" src="../../static/assets/images/logo_small.svg"
-        alt="Crafty logo" />
+    <div class="col-sm-6 grid-margin stretch-card">
+      <div class="card">
+        <div class="card-body">
+
+          <h4>{{ translate('serverWizard', 'uploadZip', data['lang']) }}</h4>
+          <br />
+          <p class="card-description">
+
+          <form name="zip" method="post" class="server-wizard" onSubmit="wait_msg(true)">
+            {% raw xsrf_form_html() %}
+            <input type="hidden" value="import_zip" name="create_type">
+
+            <div class="row">
+              <div class="col-sm-12">
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server_name">{{ translate('serverWizard', 'serverName', data['lang']) }}</label>
+                    <input type="text" class="form-control" id="server_name" name="server_name" value=""
+                      placeholder="{{ translate('serverWizard', 'myNewServer', data['lang']) }}" required>
+                  </div>
+                </div>
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server">Server Upload </label><br>
+                    <span id="upload_input">
+                      <input type="file" multiple="false" class="form-control" id="file" name="file" required
+                        style="width: 70%;">
+                      <button type="button" class="btn btn-info" onclick="sendFile()">UPLOAD</button>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div id="lower_half" style="visibility: hidden;">
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server">{{ translate('serverWizard', 'selectRoot', data['lang']) }} <small>{{
+                        translate('serverWizard', 'explainRoot', data['lang']) }}</small></label>
+                    <br>
+                    <button class="btn btn-primary mr-2" id="root_upload_button" type="button">{{
+                      translate('serverWizard', 'clickRoot', data['lang']) }}</button>
+                  </div>
+                </div>
+
+
+                <div class="col-sm-12">
+                  <div class="form-group">
+                    <label for="server_jar">{{ translate('serverWizard', 'serverJar', data['lang']) }}</label>
+                    <input type="text" class="form-control" id="server_jar" name="server_jar" value=""
+                      placeholder="paper.jar" required>
+                  </div>
+                </div>
+
+                <div class="col-sm-12">
+                  <h4 class="card-title">{{ translate('serverWizard', 'quickSettings', data['lang']) }} <small
+                      style="text-transform: none;"> - {{ translate('serverWizard', 'quickSettingsDescription',
+                      data['lang']) }}</small></h4>
+                  <hr>
+                  <div class="row">
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <label for="min_memory3">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
+                            translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
+                        <input type="number" class="form-control" id="min_memory3" name="min_memory" value="1"
+                          step="0.5" min="0.5" required>
+                      </div>
+                    </div>
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <label for="max_memory3">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
+                            translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
+                        <input type="number" class="form-control" id="max_memory3" name="max_memory" value="2"
+                          step="0.5" min="0.5" required>
+                      </div>
+                    </div>
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{
+                            translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
+                        <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1"
+                          required>
+                      </div>
+                    </div>
+
+                    <div class="col-sm-12">
+                      <div class="form-group">
+                        <div id="accordion-3">
+                          <div class="card">
+                            <div class="card-header p-2" id="Role-3">
+                              <p class="mb-0 p-0" data-toggle="collapse" data-target="#collapseRole-3"
+                                aria-expanded="true" aria-controls="collapseRole-3">
+                                <i class="fas fa-chevron-down"></i> {{ translate('serverWizard', 'addRole',
+                                data['lang'])
+                                }} <small style="text-transform: none;"> - {{ translate('serverWizard', 'autoCreate',
+                                  data['lang']) }}</small>
+                              </p>
+                            </div>
+                            <div id="collapseRole-3" class="collapse" aria-labelledby="Role-3" data-parent="">
+                              <div class="card-body scroll">
+                                <div class="form-group">
+                                  {% for r in data['roles'] %}
+                                  <span class="d-block menu-option"><label><input name="{{ r['role_id'] }}"
+                                        type="checkbox">&nbsp;
+                                      {{ r['role_name'].capitalize() }}</label></span>
+                                  {% end %}
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="col-sm-12" style="visibility: hidden;">
+                      <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_select" tabindex="-1" role="dialog" aria-labelledby="dir_select"
+                      aria-hidden="true">
+                      <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                          <div class="modal-header">
+                            <h5 class="modal-title" id="exampleModalLongTitle">{{ translate('serverWizard',
+                              'selectZipDir', data['lang']) }}</h5>
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                              <span aria-hidden="true">&times;</span>
+                            </button>
+                          </div>
+                          <div class="modal-body">
+                            <div class="tree-ctx-item" id="main-tree-div" data-path=""
+                              style="overflow: scroll; max-height:75%;">
+                              <input type="radio" id="main-tree-input-upload" name="root_path" value="" checked>
+                              <span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path="">
+                                <i class="far fa-folder"></i>
+                                <i class="far fa-folder-open"></i>
+                                {{ translate('serverFiles', 'files', data['lang']) }}
+                              </span>
+                              </input>
+                            </div>
+                          </div>
+                          <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-dismiss="modal">{{
+                              translate('serverWizard', 'close', data['lang']) }}</button>
+                            <button type="button" id="modal-okay" data-dismiss="modal" class="btn btn-primary">{{
+                              translate('serverWizard', 'save', data['lang']) }}</button>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <button id="upload_submit" type="submit" title="You must select server root dir first" disabled
+                  class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
+                  }}</button>
+                <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+                  }}</button>
+              </div>
+            </div>
+          </form>
+          </p>
+        </div>
+      </div>
     </div>
   </div>
 </div>
@@ -412,6 +574,65 @@
 
 {% block js%}
 <script>
+
+  var file;
+  function sendFile() {
+    file = $("#file")[0].files[0]
+    document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
+    let xmlHttpRequest = new XMLHttpRequest();
+    let token = getCookie("_xsrf")
+    let fileName = file.name
+    let target = '/upload'
+    let mimeType = file.type
+    let size = file.size
+    let type = 'server_import'
+
+    xmlHttpRequest.open('POST', target, true);
+    xmlHttpRequest.setRequestHeader('X-Content-Type', mimeType);
+    xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
+    xmlHttpRequest.setRequestHeader('X-Content-Length', size);
+    xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
+    xmlHttpRequest.setRequestHeader('X-Content-Upload-Type', type);
+    xmlHttpRequest.setRequestHeader('X-FileName', fileName);
+    xmlHttpRequest.addEventListener('load', (event) => {
+      if (event.target.responseText == 'success') {
+        console.log('Upload for file', file.name, 'was successful!')
+        document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>';
+        document.getElementById("lower_half").style.visibility = "visible";
+      }
+      else {
+        alert('Upload failed with response: ' + event.target.responseText);
+        doUpload = false;
+      }
+    }, false);
+    xmlHttpRequest.addEventListener('error', (e) => {
+      console.error('Error while uploading file', file.name + '.', 'Event:', e)
+    }, false);
+    xmlHttpRequest.send(file);
+  }
+
+  document.getElementById("root_upload_button").addEventListener("click", function () {
+    if (file) {
+      if (document.getElementById('root_upload_button').classList.contains('clicked')) {
+        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+      } else {
+        document.getElementById('root_upload_button').classList.add('clicked')
+      }
+      var token = getCookie("_xsrf");
+      var dialog = bootbox.dialog({
+        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+        closeButton: false
+      });
+      $.ajax({
+        type: "POST",
+        headers: { 'X-XSRFToken': token },
+        url: '/ajax/unzip_server?id=-1&file=' + file.name,
+      });
+    } else {
+      bootbox.alert("You must input a path before selecting this button");
+    }
+  });
+
   function eula_confirm() {
     bootbox.confirm({
       title: "{% raw translate('error', 'eulaTitle', data['lang']) %}",
@@ -488,7 +709,11 @@
   }
 
   function getTreeView(path) {
-    document.getElementById('zip_submit').disabled = false;
+    if (document.getElementById("lower_half").visibility == "hidden") {
+      document.getElementById('zip_submit').disabled = false;
+    } else {
+      document.getElementById('upload_submit').disabled = false;
+    }
     path = path
 
     $.ajax({
@@ -582,6 +807,7 @@
           x.remove()
         }
         document.getElementById('main-tree-input').setAttribute('value', data.path)
+        document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
         getTreeView(data.path);
         show_file_tree();
 

From f090bf8c6ff29fe65b9a29b115d5e31d245f728b Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 27 Sep 2022 22:57:24 -0400
Subject: [PATCH 3/7] Add task to check for old files every 12 hours

---
 app/classes/shared/tasks.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index f3b5b24b..6ce0f49a 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -672,6 +672,15 @@ class TasksManager:
                 HelperUsers.update_user(
                     user.id, {"pfp": self.helper.get_gravatar_image(user.email)}
                 )
+        # Search for old files in imports
+        for file in os.listdir(os.path.join(self.controller.project_root), "imports"):
+            if self.helper.is_file_older_than_x_days(
+                os.path.join(self.controller.project_root), "imports", file
+            ):
+                try:
+                    os.remove(os.path.join(file))
+                except:
+                    logger.debug("Could not clear out file from import directory")
 
     def log_watcher(self):
         self.controller.servers.check_for_old_logs()

From a21bb36f7c481c996fbe12612cf4c870859d2238 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Tue, 27 Sep 2022 23:07:44 -0400
Subject: [PATCH 4/7] Make it so a user cannot upload anything but zip

TODO add better feedback than "error"
---
 app/classes/shared/tasks.py       | 4 ++--
 app/classes/web/upload_handler.py | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 6ce0f49a..06c76f0b 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -673,9 +673,9 @@ class TasksManager:
                     user.id, {"pfp": self.helper.get_gravatar_image(user.email)}
                 )
         # Search for old files in imports
-        for file in os.listdir(os.path.join(self.controller.project_root), "imports"):
+        for file in os.listdir(os.path.join(self.controller.project_root, "imports")):
             if self.helper.is_file_older_than_x_days(
-                os.path.join(self.controller.project_root), "imports", file
+                os.path.join(self.controller.project_root, "imports", file)
             ):
                 try:
                     os.remove(os.path.join(file))
diff --git a/app/classes/web/upload_handler.py b/app/classes/web/upload_handler.py
index e4ba8222..077128e4 100644
--- a/app/classes/web/upload_handler.py
+++ b/app/classes/web/upload_handler.py
@@ -109,6 +109,9 @@ class UploadHandler(BaseHandler):
 
             self.helper.ensure_dir_exists(path)
             filename = self.request.headers.get("X-FileName", None)
+            if not str(filename).endswith(".zip"):
+                self.helper.websocket_helper.broadcast("close_upload_box", "error")
+                self.finish("error")
             full_path = os.path.join(path, filename)
 
             if self.do_upload:

From dc218eb9d5216d6fcd3b939708de262538ac0688 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 28 Sep 2022 18:23:12 -0400
Subject: [PATCH 5/7] Remove java specific settings from bedrock upload

---
 .../templates/server/bedrock_wizard.html      | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index b105ed0c..1a5cca9d 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -381,29 +381,11 @@
                   <hr>
                   <div class="row">
 
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="min_memory3">{{ translate('serverWizard', 'minMem', data['lang']) }} <small> - {{
-                            translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                        <input type="number" class="form-control" id="min_memory3" name="min_memory" value="1"
-                          step="0.5" min="0.5" required>
-                      </div>
-                    </div>
-
-                    <div class="col-sm-12">
-                      <div class="form-group">
-                        <label for="max_memory3">{{ translate('serverWizard', 'maxMem', data['lang']) }} <small> - {{
-                            translate('serverWizard', 'sizeInGB', data['lang']) }}</small></label>
-                        <input type="number" class="form-control" id="max_memory3" name="max_memory" value="2"
-                          step="0.5" min="0.5" required>
-                      </div>
-                    </div>
-
                     <div class="col-sm-12">
                       <div class="form-group">
                         <label for="port3">{{ translate('serverWizard', 'serverPort', data['lang']) }} <small> - {{
                             translate('serverWizard', 'defaultPort', data['lang']) }}</small></label>
-                        <input type="number" class="form-control" id="port3" name="port" value="25565" step="1" min="1"
+                        <input type="number" class="form-control" id="port4" name="port" value="19132" step="1" min="1"
                           required>
                       </div>
                     </div>

From 352a3e12e7715e9e6fc3541f01784fa3a142b6a7 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 2 Oct 2022 15:54:13 -0400
Subject: [PATCH 6/7] Fix minor bugs with uploads import

---
 app/classes/shared/tasks.py                   |   3 +
 .../templates/server/bedrock_wizard.html      |  11 +-
 app/frontend/templates/server/wizard.html     | 382 +++++++++---------
 3 files changed, 207 insertions(+), 189 deletions(-)

diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 06c76f0b..a0c2eb7a 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -673,6 +673,9 @@ class TasksManager:
                     user.id, {"pfp": self.helper.get_gravatar_image(user.email)}
                 )
         # Search for old files in imports
+        self.helper.ensure_dir_exists(
+            os.path.join(self.controller.project_root, "imports")
+        )
         for file in os.listdir(os.path.join(self.controller.project_root, "imports")):
             if self.helper.is_file_older_than_x_days(
                 os.path.join(self.controller.project_root, "imports", file)
diff --git a/app/frontend/templates/server/bedrock_wizard.html b/app/frontend/templates/server/bedrock_wizard.html
index 0a974c51..47c26492 100644
--- a/app/frontend/templates/server/bedrock_wizard.html
+++ b/app/frontend/templates/server/bedrock_wizard.html
@@ -313,7 +313,8 @@
               <button id="zip_submit" type="submit" title="You must select server root dir first" disabled
                 class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
                 }}</button>
-              <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+              <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
+                data['lang'])
                 }}</button>
             </div>
         </div>
@@ -460,7 +461,8 @@
                 <button id="upload_submit" type="submit" title="You must select server root dir first" disabled
                   class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
                   }}</button>
-                <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+                <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
+                  data['lang'])
                   }}</button>
               </div>
             </div>
@@ -641,6 +643,9 @@
   }
 </script>
 <script>
+  $(".tree-reset").on("click", function () {
+    location.href = "/server/bedrock_step1";
+  });
   document.getElementById("root_files_button").addEventListener("click", function () {
     if (document.forms["zip"]["server_path"].value != "") {
       if (document.getElementById('root_files_button').classList.contains('clicked')) {
@@ -792,6 +797,8 @@
         document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
         getTreeView(data.path);
         show_file_tree();
+        $("#root_files_button").attr("disabled", "disabled");
+        $("#root_upload_button").attr("disabled", "disabled");
 
       }, 5000);
     });
diff --git a/app/frontend/templates/server/wizard.html b/app/frontend/templates/server/wizard.html
index 1d80bc3b..a749743f 100644
--- a/app/frontend/templates/server/wizard.html
+++ b/app/frontend/templates/server/wizard.html
@@ -423,7 +423,8 @@
               <button id="zip_submit" type="submit" title="You must select server root dir first" disabled
                 class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
                 }}</button>
-              <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+              <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
+                data['lang'])
                 }}</button>
             </div>
         </div>
@@ -588,7 +589,8 @@
                 <button id="upload_submit" type="submit" title="You must select server root dir first" disabled
                   class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
                   }}</button>
-                <button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang'])
+                <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
+                  data['lang'])
                   }}</button>
               </div>
             </div>
@@ -712,24 +714,24 @@
     }
 
     .scroll {
-      max-height: 12em;
-      overflow-y: auto;
+      max - height: 12em;
+      overflow - y: auto;
     }
 
-    .menu-btn {
-      font-size: 0.9em;
+    .menu - btn {
+      font - size: 0.9em;
       padding: 2px 10px;
     }
 
     .menu {
-      padding-top: 10px;
-      z-index: 200;
-      margin-top: 4px;
+      padding - top: 10px;
+      z - index: 200;
+      margin - top: 4px;
       position: absolute;
-      background-color: #2a2c44;
+      background - color: #2a2c44;
     }
 
-    .menu-option {
+    .menu - option {
       padding: 6px 20px 6px;
       color: white;
     }
@@ -738,66 +740,66 @@
       position: absolute;
       top: 0px;
       left: 0px;
-      width: 100%;
-      height: 100%;
-      z-index: 100;
+      width: 100 %;
+      height: 100 %;
+      z - index: 100;
     }
-  </style>
-  <style>
+  </style >
+      <style>
     /* Remove default bullets */
-    .tree-view,
-    .tree-nested {
-      list-style-type: none;
-      margin: 0;
-      padding: 0;
-      margin-left: 10px;
+        .tree-view,
+        .tree-nested {
+          list - style - type: none;
+        margin: 0;
+        padding: 0;
+        margin-left: 10px;
     }
 
-    /* Style the items */
-    .tree-item,
-    .files-tree-title {
-      cursor: pointer;
-      user-select: none;
+        /* Style the items */
+        .tree-item,
+        .files-tree-title {
+          cursor: pointer;
+        user-select: none;
       /* Prevent text selection */
     }
 
-    /* Create the caret/arrow with a unicode, and style it */
-    .tree-caret .fa-folder {
-      display: inline-block;
+        /* Create the caret/arrow with a unicode, and style it */
+        .tree-caret .fa-folder {
+          display: inline-block;
     }
 
-    .tree-caret .fa-folder-open {
-      display: none;
+        .tree-caret .fa-folder-open {
+          display: none;
     }
 
-    /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
-    .tree-caret-down .fa-folder {
-      display: none;
+        /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
+        .tree-caret-down .fa-folder {
+          display: none;
     }
 
-    .tree-caret-down .fa-folder-open {
-      display: inline-block;
+        .tree-caret-down .fa-folder-open {
+          display: inline-block;
     }
 
-    /* Hide the nested list */
-    .tree-nested {
-      display: none;
+        /* Hide the nested list */
+        .tree-nested {
+          display: none;
     }
 
-    #op_logo {
-      position: relative;
-      top: 50%;
-      transform: translateY(-50%);
+        #op_logo {
+          position: relative;
+        top: 50%;
+        transform: translateY(-50%);
     }
-  </style>
+      </style>
 
-  {% end %}
+    {% end %}
 
-  {% block js%}
-  <script>
-    var file;
-    function sendFile() {
-      file = $("#file")[0].files[0]
+    {% block js %}
+    <script>
+      var file;
+      function sendFile() {
+        file = $("#file")[0].files[0]
       document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
       let xmlHttpRequest = new XMLHttpRequest();
       let token = getCookie("_xsrf")
@@ -816,13 +818,13 @@
       xmlHttpRequest.setRequestHeader('X-FileName', fileName);
       xmlHttpRequest.addEventListener('load', (event) => {
         if (event.target.responseText == 'success') {
-          console.log('Upload for file', file.name, 'was successful!')
+        console.log('Upload for file', file.name, 'was successful!')
           document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>';
-          document.getElementById("lower_half").style.visibility = "visible";
+      document.getElementById("lower_half").style.visibility = "visible";
         }
-        else {
-          alert('Upload failed with response: ' + event.target.responseText);
-          doUpload = false;
+      else {
+        alert('Upload failed with response: ' + event.target.responseText);
+      doUpload = false;
         }
       }, false);
       xmlHttpRequest.addEventListener('error', (e) => {
@@ -832,60 +834,63 @@
     }
 
 
-    document.getElementById("root_files_button").addEventListener("click", function () {
+      document.getElementById("root_files_button").addEventListener("click", function () {
       if (document.forms["zip"]["server_path"].value != "") {
         if (document.getElementById('root_files_button').classList.contains('clicked')) {
-          document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
-        } else {
-          document.getElementById('root_files_button').classList.add('clicked')
-        }
-        path = document.forms["zip"]["server_path"].value;
-        console.log(document.forms["zip"]["server_path"].value)
-        var token = getCookie("_xsrf");
-        var dialog = bootbox.dialog({
-          message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-          closeButton: false
+        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+      } else {
+        document.getElementById('root_files_button').classList.add('clicked')
+      }
+      path = document.forms["zip"]["server_path"].value;
+      console.log(document.forms["zip"]["server_path"].value)
+      var token = getCookie("_xsrf");
+      var dialog = bootbox.dialog({
+        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+      closeButton: false
         });
-        $.ajax({
-          type: "POST",
-          headers: { 'X-XSRFToken': token },
-          url: '/ajax/unzip_server?id=-1&path=' + path,
+      $.ajax({
+        type: "POST",
+      headers: {'X-XSRFToken': token },
+      url: '/ajax/unzip_server?id=-1&path=' + path,
         });
       } else {
         bootbox.alert("You must input a path before selecting this button");
       }
     });
 
-    document.getElementById("root_upload_button").addEventListener("click", function () {
+      document.getElementById("root_upload_button").addEventListener("click", function () {
       if (file) {
         if (document.getElementById('root_upload_button').classList.contains('clicked')) {
-          document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
-        } else {
-          document.getElementById('root_upload_button').classList.add('clicked')
-        }
-        var token = getCookie("_xsrf");
-        var dialog = bootbox.dialog({
-          message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
-          closeButton: false
+        document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
+      } else {
+        document.getElementById('root_upload_button').classList.add('clicked')
+      }
+      var token = getCookie("_xsrf");
+      var dialog = bootbox.dialog({
+        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
+      closeButton: false
         });
-        $.ajax({
-          type: "POST",
-          headers: { 'X-XSRFToken': token },
-          url: '/ajax/unzip_server?id=-1&file=' + file.name,
+      $.ajax({
+        type: "POST",
+      headers: {'X-XSRFToken': token },
+      url: '/ajax/unzip_server?id=-1&file=' + file.name,
         });
       } else {
         bootbox.alert("You must input a path before selecting this button");
       }
     });
-  </script>
+</script>
 
-  <script>
-    function dropDown(event) {
-      event.target.parentElement.children[1].classList.remove("d-none");
+<script>
+      $(".tree-reset").on("click", function () {
+        location.href = "/server/step1";
+      });
+      function dropDown(event) {
+        event.target.parentElement.children[1].classList.remove("d-none");
       document.getElementById("overlay").classList.remove("d-none");
     }
 
-    function hide(event) {
+      function hide(event) {
       var items = document.getElementsByClassName('menu');
       items.forEach(item => {
         item.classList.add("d-none");
@@ -894,36 +899,36 @@
       document.getElementById("overlay").classList.add("d-none");
     }
 
-    $(document).ready(function () {
-      console.log('ready');
+      $(document).ready(function () {
+        console.log('ready');
       var forms = $('form.server-wizard');
       forms.each(function (i, formEl) {
         var form = $(formEl);
-        var min = form.find('[name=min_memory]');
-        var max = form.find('[name=max_memory]');
-        console.log(form, min, max)
-        min.change(function () {
-          check_sizes(max, min, 'min');
+      var min = form.find('[name=min_memory]');
+      var max = form.find('[name=max_memory]');
+      console.log(form, min, max)
+      min.change(function () {
+        check_sizes(max, min, 'min');
         });
-        max.change(function () {
-          check_sizes(max, min, 'max');
+      max.change(function () {
+        check_sizes(max, min, 'max');
         });
       });
     });
 
-    function wait_msg(importing) {
-      bootbox.alert({
-        title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}',
-        message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}',
-      });
+      function wait_msg(importing) {
+        bootbox.alert({
+          title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}',
+          message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}',
+        });
     }
 
-    function show_file_tree() {
-      $("#dir_select").modal();
+      function show_file_tree() {
+        $("#dir_select").modal();
     }
 
-    function check_sizes(a, b, changed) {
-      max_mem = parseFloat(a.val());
+      function check_sizes(a, b, changed) {
+        max_mem = parseFloat(a.val());
       min_mem = parseFloat(b.val());
       if (max_mem < min_mem && changed === 'min') {
         a.val(min_mem)
@@ -933,7 +938,7 @@
       }
     }
 
-    function getTreeView(path) {
+      function getTreeView(path) {
       //If this value is still hidden we know the user is executing a zip import and not an upload
       if (document.getElementById("lower_half").visibility == "hidden") {
         document.getElementById('zip_submit').disabled = false;
@@ -944,51 +949,51 @@
 
       $.ajax({
         type: "GET",
-        url: '/ajax/get_zip_tree?id=-1&path=' + path,
-        dataType: 'text',
-        success: function (data) {
-          console.log("got response:");
-          console.log(data);
+      url: '/ajax/get_zip_tree?id=-1&path=' + path,
+      dataType: 'text',
+      success: function (data) {
+        console.log("got response:");
+      console.log(data);
 
-          dataArr = data.split('\n');
-          serverDir = dataArr.shift(); // Remove & return first element (server directory)
-          text = dataArr.join('\n');
+      dataArr = data.split('\n');
+      serverDir = dataArr.shift(); // Remove & return first element (server directory)
+      text = dataArr.join('\n');
 
-          try {
-            document.getElementById('main-tree-div').innerHTML += text;
-            document.getElementById('main-tree').parentElement.classList.add("clicked");
+      try {
+        document.getElementById('main-tree-div').innerHTML += text;
+      document.getElementById('main-tree').parentElement.classList.add("clicked");
           } catch {
-            document.getElementById('files-tree').innerHTML = text;
+        document.getElementById('files-tree').innerHTML = text;
           }
 
 
-          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
-          document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
+      document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
+      document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
 
         },
       });
     }
 
-    function getToggleMain(event) {
-      path = event.target.parentElement.getAttribute('data-path');
+      function getToggleMain(event) {
+        path = event.target.parentElement.getAttribute('data-path');
       document.getElementById("files-tree").classList.toggle("d-block");
       document.getElementById(path + "span").classList.toggle("tree-caret-down");
       document.getElementById(path + "span").classList.toggle("tree-caret");
     }
 
 
-    function getDirView(event) {
-      path = event.target.parentElement.getAttribute('data-path');
+      function getDirView(event) {
+        path = event.target.parentElement.getAttribute('data-path');
 
       if (document.getElementById(path).classList.contains('clicked')) {
 
         var toggler = document.getElementById(path + "span");
 
-        if (toggler.classList.contains('files-tree-title')) {
-          document.getElementById(path + "ul").classList.toggle("d-block");
-          document.getElementById(path + "span").classList.toggle("tree-caret-down");
+      if (toggler.classList.contains('files-tree-title')) {
+        document.getElementById(path + "ul").classList.toggle("d-block");
+      document.getElementById(path + "span").classList.toggle("tree-caret-down");
         }
-        return;
+      return;
       } else {
         $.ajax({
           type: "GET",
@@ -1021,53 +1026,56 @@
         });
       }
     }
-    if (webSocket) {
-      webSocket.on('send_temp_path', function (data) {
-        setTimeout(function () {
-          var x = document.querySelector('.bootbox');
-          if (x) {
-            x.remove()
-          }
-          var x = document.querySelector('.modal-backdrop');
-          if (x) {
-            x.remove()
-          }
-          document.getElementById('main-tree-input').setAttribute('value', data.path)
-          document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
-          getTreeView(data.path);
-          show_file_tree();
+      if (webSocket) {
+        webSocket.on('send_temp_path', function (data) {
+          setTimeout(function () {
+            var x = document.querySelector('.bootbox');
+            if (x) {
+              x.remove()
+            }
+            var x = document.querySelector('.modal-backdrop');
+            if (x) {
+              x.remove()
+            }
+            document.getElementById('main-tree-input').setAttribute('value', data.path)
+            document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
+            getTreeView(data.path);
+            show_file_tree();
 
-        }, 5000);
-      });
+            $("#root_files_button").attr("disabled", "disabled");
+            $("#root_upload_button").attr("disabled", "disabled");
+
+          }, 5000);
+        });
     }
 
-    function refreshCache() {
+      function refreshCache() {
       var token = getCookie("_xsrf")
       document.getElementById("refresh-cache").classList.add("fa-spin")
       $.ajax({
         type: "POST",
-        headers: { 'X-XSRFToken': token },
-        url: '/ajax/jar_cache',
-        success: function () {
-          document.getElementById("refresh-cache").classList.remove("fa-sync");
-          document.getElementById("refresh-cache").classList.remove("fa-spin");
-          document.getElementById("refresh-cache").classList.add("fa-check");
+      headers: {'X-XSRFToken': token },
+      url: '/ajax/jar_cache',
+      success: function () {
+        document.getElementById("refresh-cache").classList.remove("fa-sync");
+      document.getElementById("refresh-cache").classList.remove("fa-spin");
+      document.getElementById("refresh-cache").classList.add("fa-check");
 
-          setTimeout(function () {
-            location.reload();
+      setTimeout(function () {
+        location.reload();
           }, 2000);
         },
       });
     }
 
-  </script>
-  <script type="text/javascript">
-    var text = '{% raw data["js_server_types"] %}';
-    var serverTypesLists = JSON.parse(text);
-    /* CountryChange() is called from the onchange event of a select element.
-    * param selectObj - the select object which fired the on change event.
-    */
-    function serverTypeChange(selectObj) {
+</script>
+<script type="text/javascript">
+      var text = '{% raw data["js_server_types"] %}';
+      var serverTypesLists = JSON.parse(text);
+      /* CountryChange() is called from the onchange event of a select element.
+      * param selectObj - the select object which fired the on change event.
+      */
+      function serverTypeChange(selectObj) {
       // get the index of the selected option
       var idx = document.getElementById('server_type').selectedIndex;
       // get the value of the selected option
@@ -1076,9 +1084,9 @@
         var which = document.getElementById('server_type').options[idx].value;
       } catch {
         while (cSelect.options.length > 0) {
-          cSelect.remove(0);
+        cSelect.remove(0);
         }
-        return;
+      return;
       }
       let server_type = which.split('|')[0];
       let server = which.split('|')[1];
@@ -1095,29 +1103,29 @@
       // create new options ordered by ascending
       cList[server].forEach(type => {
         newOption = document.createElement("option");
-        newOption.value = which + "|" + type;  // assumes option string and value are the same
-        newOption.text = type;
-        // add the new option
-        try {
-          cSelect.add(newOption);  // this will fail in DOM browsers but is needed for IE
+      newOption.value = which + "|" + type;  // assumes option string and value are the same
+      newOption.text = type;
+      // add the new option
+      try {
+        cSelect.add(newOption);  // this will fail in DOM browsers but is needed for IE
         }
-        catch (e) {
-          cSelect.appendChild(newOption);
+      catch (e) {
+        cSelect.appendChild(newOption);
         }
       })
     }
 
-    function serverJarChange(selectObj) {
-      let type_select = document.getElementById('server_jar')
+      function serverJarChange(selectObj) {
+        let type_select = document.getElementById('server_jar')
       let tidx = type_select.selectedIndex;
       let val = type_select.options[tidx].value;
       if (val == 'None') {
         var jcSelect = document.getElementById("server_type");
         while (jcSelect.options.length > 0) {
-          jcSelect.remove(0);
+        jcSelect.remove(0);
         }
-        serverTypeChange(selectObj);
-        return;
+      serverTypeChange(selectObj);
+      return;
       }
       // get the index of the selected option
       var jidx = selectObj.selectedIndex;
@@ -1136,17 +1144,17 @@
       // create new options ordered by ascending
       jcList.forEach(type => {
         jnewOption = document.createElement("option");
-        jnewOption.value = jwhich + "|" + type;  // assumes option string and value are the same
-        jnewOption.text = type;
-        // add the new option
-        try {
-          jcSelect.add(jnewOption);  // this will fail in DOM browsers but is needed for IE
+      jnewOption.value = jwhich + "|" + type;  // assumes option string and value are the same
+      jnewOption.text = type;
+      // add the new option
+      try {
+        jcSelect.add(jnewOption);  // this will fail in DOM browsers but is needed for IE
         }
-        catch (e) {
-          jcSelect.appendChild(jnewOption);
+      catch (e) {
+        jcSelect.appendChild(jnewOption);
         }
       })
       serverTypeChange(selectObj);
     }
-  </script>
-  {% end %}
\ No newline at end of file
+</script>
+{% end %}
\ No newline at end of file

From cd0486fe112da5ae181260f41749a7f34855b118 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sun, 2 Oct 2022 21:10:44 +0100
Subject: [PATCH 7/7] Update changelog !472

---
 CHANGELOG.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 537ae25f..488f8be2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,11 @@
 ## --- [4.0.15] - 2022/10/02
 ### New features
 - Base Theme Switching (Dark, Light, Default) 🤩🎨 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/471))
+- Upload Zip functionality for server imports 🏗️🎉 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/472))
 ### Bug fixes
 - Fix traceback on basic schedule with "days" interval ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/469))
 - Fix bad method call with API stdin ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/470))<br>
     *(Thank you ['IWant2Tryhard'](https://github.com/MyNameTsThad) for catching that 🐛)*
-### Tweaks
-TBD
-### Lang
-TBD
 <br><br>
 
 ## --- [4.0.14] - 2022/09/23