From 5c85a575ee9874427b57a4666b30f9d57caa95cd Mon Sep 17 00:00:00 2001
From: Scott R <86810816+xithical@users.noreply.github.com>
Date: Fri, 13 Aug 2021 19:45:15 -0500
Subject: [PATCH 01/16] Improving backup efficiency with shutil

Removed the old backup code that created a zip on a file-by-file basis and replaced it with make_archive from shutil to just zip the whole directory
---
 app/classes/shared/helpers.py | 11 +----------
 app/classes/shared/server.py  |  5 ++++-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 8ee0de64..0091a647 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -553,13 +553,4 @@ class Helpers:
         
         return json.loads(content)
 
-    @staticmethod
-    def zip_directory(file, path, compression=zipfile.ZIP_LZMA):
-        with zipfile.ZipFile(file, 'w', compression) as zf:
-            for root, dirs, files in os.walk(path):
-                for file in files:
-                    zf.write(os.path.join(root, file),
-                               os.path.relpath(os.path.join(root, file), 
-                                               os.path.join(path, '..')))
-
-helper = Helpers()
+helper = Helpers()
\ No newline at end of file
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index ab6f6372..2fb6a004 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -10,6 +10,8 @@ import threading
 import schedule
 import logging.config
 import zipfile
+import shutil
+import zlib
 
 
 from app.classes.shared.helpers import helper
@@ -324,7 +326,8 @@ class Server:
         try:
             backup_filename = "{}/{}.zip".format(conf['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'))
             logger.info("Creating backup of server '{}' (ID#{}) at '{}'".format(self.settings['server_name'], self.server_id, backup_filename))
-            helper.zip_directory(backup_filename, self.server_path)
+            # helper.zip_directory(backup_filename, self.server_path)
+            shutil.make_archive(backup_filename, zip, self.server_path)
             backup_list = self.list_backups()
             if len(self.list_backups()) > conf["max_backups"]:
                 oldfile = backup_list[0]

From 4757ac05735145543d77c90b5bcbc65de45d8677 Mon Sep 17 00:00:00 2001
From: xithical <86810816+xithical@users.noreply.github.com>
Date: Fri, 13 Aug 2021 22:06:22 -0500
Subject: [PATCH 02/16] Repaired backup zipper and old backup removals

*Fixed zip arg, should be in quotes
*Set while statement to constantly check for and remove old backups
*Repaired old backup removal not pulling correct path
---
 app/classes/shared/server.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 2fb6a004..e08e9843 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -324,15 +324,15 @@ class Server:
         logger.info("Starting server {} (ID {}) backup".format(self.name, self.server_id))
         conf = db_helper.get_backup_config(self.server_id)
         try:
-            backup_filename = "{}/{}.zip".format(conf['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'))
+            backup_filename = "{}/{}".format(conf['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'))
             logger.info("Creating backup of server '{}' (ID#{}) at '{}'".format(self.settings['server_name'], self.server_id, backup_filename))
-            # helper.zip_directory(backup_filename, self.server_path)
-            shutil.make_archive(backup_filename, zip, self.server_path)
-            backup_list = self.list_backups()
-            if len(self.list_backups()) > conf["max_backups"]:
+            shutil.make_archive(backup_filename, 'zip', self.server_path)
+            while len(self.list_backups()) > conf["max_backups"]:
+                backup_list = self.list_backups()
                 oldfile = backup_list[0]
-                logger.info("Removing old backup '{}'".format(oldfile))
-                os.remove(oldfile)
+                oldfile_path = "{}/{}".format(conf['backup_path'], oldfile['path'])
+                logger.info("Removing old backup '{}'".format(oldfile['path']))
+                os.remove(oldfile_path)
         except:
             logger.exception("Failed to create backup of server {} (ID {})".format(self.name, self.server_id))
 

From 096a38ae5435380e55a21bbcf41f59c50c332dc4 Mon Sep 17 00:00:00 2001
From: Scott R <86810816+xithical@users.noreply.github.com>
Date: Fri, 13 Aug 2021 23:28:41 -0500
Subject: [PATCH 03/16] Redoing shutil zip after merging new DB things

Merged from Pretzel for DB change things and needed to readd code for shutil for zipping
---
 app/classes/shared/helpers.py |  8 --------
 app/classes/shared/server.py  | 12 ++++++------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 5d124d32..7242fda0 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -555,14 +555,6 @@ class Helpers:
         return json.loads(content)
 
     @staticmethod
-    def zip_directory(file, path, compression=zipfile.ZIP_LZMA):
-        with zipfile.ZipFile(file, 'w', compression) as zf:
-            for root, dirs, files in os.walk(path):
-                for file in files:
-                    zf.write(os.path.join(root, file),
-                               os.path.relpath(os.path.join(root, file), 
-                                               os.path.join(path, '..')))
-    @staticmethod
     def copy_files(source, dest):
         if os.path.isfile(source):
             shutil.copyfile(source, dest)
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 2266b256..28292b98 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -11,6 +11,8 @@ import schedule
 import logging.config
 import zipfile
 from threading import Thread
+import shutil
+import zlib
 
 
 from app.classes.shared.helpers import helper
@@ -366,15 +368,13 @@ class Server:
         try:
             backup_filename = "{}/{}.zip".format(self.settings['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'))
             logger.info("Creating backup of server '{}' (ID#{}) at '{}'".format(self.settings['server_name'], self.server_id, backup_filename))
-            helper.zip_directory(backup_filename, self.server_path)
+            shutil.make_archive(backup_filename, 'zip', self.server_path)
             while len(self.list_backups()) > conf["max_backups"]:
                 backup_list = self.list_backups()
                 oldfile = backup_list[0]
-                backup_path = self.settings['backup_path']
-                old_file_name = oldfile['path']
-                back_old_file = os.path.join(backup_path, old_file_name)
-                logger.info("Removing old backup '{}'".format(oldfile))
-                os.remove(back_old_file)
+                oldfile_path = "{}/{}".format(conf['backup_path'], oldfile['path'])
+                logger.info("Removing old backup '{}'".format(oldfile['path']))
+                os.remove(oldfile_path)
             self.is_backingup = False
             logger.info("Backup of server: {} completed".format(self.name))
             return

From 5b8764cb45dd9a17dd80f639098f228d19771fd3 Mon Sep 17 00:00:00 2001
From: Scott R <86810816+xithical@users.noreply.github.com>
Date: Sat, 14 Aug 2021 00:00:09 -0500
Subject: [PATCH 04/16] Removed extra .zip

Unnecessary .zip in backup filename generation in server.py, nuked it
---
 app/classes/shared/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 28292b98..e4261b16 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -366,7 +366,7 @@ class Server:
         self.is_backingup = True
         conf = db_helper.get_backup_config(self.server_id)
         try:
-            backup_filename = "{}/{}.zip".format(self.settings['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'))
+            backup_filename = "{}/{}".format(self.settings['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'))
             logger.info("Creating backup of server '{}' (ID#{}) at '{}'".format(self.settings['server_name'], self.server_id, backup_filename))
             shutil.make_archive(backup_filename, 'zip', self.server_path)
             while len(self.list_backups()) > conf["max_backups"]:

From 689e4abb518579df1e639990f2d2b3f06eb128aa Mon Sep 17 00:00:00 2001
From: Scott R <86810816+xithical@users.noreply.github.com>
Date: Sat, 14 Aug 2021 00:07:24 -0500
Subject: [PATCH 05/16] Oops! All backups are gone... but not anymore!

While loop automatically removed all old backups greater than the max backups threshold... including if it was set to 0. Set a test for the while loop to make sure max backups is greater than 0 before deletey delete
---
 app/classes/shared/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index e4261b16..f28546c6 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -369,7 +369,7 @@ class Server:
             backup_filename = "{}/{}".format(self.settings['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'))
             logger.info("Creating backup of server '{}' (ID#{}) at '{}'".format(self.settings['server_name'], self.server_id, backup_filename))
             shutil.make_archive(backup_filename, 'zip', self.server_path)
-            while len(self.list_backups()) > conf["max_backups"]:
+            while len(self.list_backups()) > conf["max_backups"] and conf["max_backups"] > 0:
                 backup_list = self.list_backups()
                 oldfile = backup_list[0]
                 oldfile_path = "{}/{}".format(conf['backup_path'], oldfile['path'])

From 00422f24cdcd4e90339e19eed399d0e44f9bded4 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Wed, 18 Aug 2021 18:50:53 -0400
Subject: [PATCH 06/16] Moved delete server to ajax call instead of a task.

---
 app/classes/shared/tasks.py                   | 10 ------
 app/classes/web/ajax_handler.py               | 12 +++++++
 .../templates/panel/server_config.html        | 33 +++++++++++++++++--
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 572918db..91d8ff0b 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -113,16 +113,6 @@ class TasksManager:
 
                 elif command == "update_executable":
                     svr.jar_update()
-                elif command == "delete_server":
-                    logger.info(
-                        "Removing server from panel for server: {}".format(c['server_id']['server_name']))
-                    self.controller.remove_server(c['server_id']['server_id'], False)
-
-                elif command == "delete_server_files":
-                    logger.info(
-                        "Removing server and all associated files for server: {}".format(c['server_id']['server_name']))
-                    self.controller.remove_server(c['server_id']['server_id'], True)
-
                 db_helper.mark_command_complete(c.get('command_id', None))
 
             time.sleep(1)
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index bca9397e..c84983ad 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -229,6 +229,18 @@ class AjaxHandler(BaseHandler):
             # os.rmdir(dir_path)     # Would only remove empty directories
             shutil.rmtree(dir_path)  # Removes also when there are contents
 
+        elif page == "delete_server":
+            server_id = self.get_argument('id', None)
+            logger.info(
+                "Removing server from panel for server: {}".format(db_helper.get_server_friendly_name(server_id)))
+            self.controller.remove_server(server_id, False)
+
+        elif page == "delete_server_files":
+            server_id = self.get_argument('id', None)
+            logger.info(
+                "Removing server and all associated files for server: {}".format(db_helper.get_server_friendly_name(server_id)))
+            self.controller.remove_server(server_id, True)
+
     @tornado.web.authenticated
     def put(self, page):
         if page == "save_file":
diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html
index 501e4d96..a4195bc7 100644
--- a/app/frontend/templates/panel/server_config.html
+++ b/app/frontend/templates/panel/server_config.html
@@ -203,6 +203,35 @@
 
     });
 
+        function deleteServerE(callback) {
+      var token = getCookie("_xsrf")
+      $.ajax({
+        type: "DELETE",
+        headers: {'X-XSRFToken': token},
+        url: '/ajax/delete_server?id={{ data['server_stats']['server_id']['server_id'] }}',
+        data: {
+        },
+        success: function(data){
+          console.log("got response:");
+          console.log(data);
+        },
+      });
+    }
+        function deleteServerFilesE(path, callback) {
+      var token = getCookie("_xsrf")
+      $.ajax({
+        type: "DELETE",
+        headers: {'X-XSRFToken': token},
+        url: '/ajax/delete_server_files?id={{ data['server_stats']['server_id']['server_id'] }}',
+        data: {
+        },
+        success: function(data){
+          console.log("got response:");
+          console.log(data);
+        },
+      });
+    }
+
 let server_id = '{{ data['server_stats']['server_id']['server_id'] }}';
 
       function send_command (server_id, command){
@@ -249,7 +278,7 @@ let server_id = '{{ data['server_stats']['server_id']['server_id'] }}';
           },
           callback: function(result) {
             if (!result){
-                send_command(server_id, 'delete_server');
+                deleteServerE()
                 setTimeout(function(){ window.location = '/panel/dashboard'; }, 5000);
                 bootbox.dialog({
                 backdrop: true,
@@ -260,7 +289,7 @@ let server_id = '{{ data['server_stats']['server_id']['server_id'] }}';
 
              return;}
              else{
-                send_command(server_id, 'delete_server_files');
+                deleteServerFilesE();
                                  setTimeout(function(){ window.location = '/panel/dashboard'; }, 5000);
                 bootbox.dialog({
                 backdrop: true,

From 90d59faf5b271ec18ce8f152f890aaa781bc3846 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 19 Aug 2021 16:50:18 -0400
Subject: [PATCH 07/16] This is broken right now. Trying to add unzip function

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 app/classes/shared/helpers.py                 |  35 +++++++++++
 app/classes/shared/server.py                  |   1 +
 app/classes/web/ajax_handler.py               |  59 +++++++++++++++++-
 .../templates/panel/server_files.html         |  41 ++++++++++++
 5 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a2f64789cddbefe1f8e91efcfafbb526e0b8bc19
GIT binary patch
literal 6148
zcmeHK!AiqG5S_JE6GiMn(Bodb^-!_3co0I>gEt|f2bG%8qJf%(Cbej+<TKPS(l79L
zoY@^kTkBE9?!e5O-JRKG9%MHI0HV=rtpSt(z(OS~&Y}52Xq|LKrg)}^C}@u)_B)Y}
zqbENei8d340mHywV}QQh0(cNZ?Ds!@znvgSE0q^9RVYr+%v!c>*$eimdlB{B)JuCw
z!|NW?Xx~dOeD)8bsPpc7{$bGWH%m*~QJ8u`*zT(2pw-5ZlcOMPMg2z93tNfW$JGn!
zpk`?~%hor`vR2(3lx0@0SIV-wzA+fs*7EAw*529W^-Xp=xVzVM3cP)kEHb{q13FyY
zmD>$FQFx9s6g>+Gw4n=E$|fIbfA-_wt$iiSs<j#xT>HLwDh_3A@sGGTROS!~D&Lq%
zWq`jLYkpD*Fm)RS3<F~sp!-3h5;}~zMs;<dQ7r%>{YEH3pLz+(k&F&wt`S#Igib}&
zse)S!q0@0*a-74MYt-o=xcLx#vfvIysMB$Oslq`x8jUp!7zREwP|(8?z5l!8`~S~L
zW@H#J4E!qwL~+O6X<$kGwvH4>Z>>Z<LnWcOT%$@s!_TpD=qX-7Rf21h97KmP*N8JH
P=0`x$V2oklM;UkpZo`zN

literal 0
HcmV?d00001

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 5469bd06..beab8043 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -2,6 +2,7 @@ import os
 import re
 import sys
 import json
+import tempfile
 import time
 import uuid
 import string
@@ -258,6 +259,40 @@ class Helpers:
             logger.critical("Unable to write to {} - Error: {}".format(path, e))
             return False
 
+    def unzipFile(self, zip_path):
+        new_dir_list = zip_path.split('/')
+        new_dir = ''
+        for i in range(len(new_dir_list)-1):
+            if i == 0:
+                new_dir += new_dir_list[i]
+            else:
+                new_dir += '/'+new_dir_list[i]
+
+        if helper.check_file_perms(zip_path):
+            helper.ensure_dir_exists(new_dir)
+            tempDir = tempfile.mkdtemp()
+            with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+                zip_ref.extractall(tempDir)
+                for item in os.listdir(tempDir):
+                    print(item)
+                test = zip_ref.filelist[1].filename
+                print(test)
+                path_list = test.split('/')
+                root_path = path_list[0]
+                if len(path_list) > 1:
+                    for i in range(len(path_list) - 2):
+                        root_path = os.path.join(root_path, path_list[i + 1])
+
+                full_root_path = os.path.join(tempDir, root_path)
+
+                for item in os.listdir(full_root_path):
+                    try:
+                        shutil.move(os.path.join(full_root_path, item), os.path.join(new_dir, item))
+                    except Exception as ex:
+                        logger.error('ERROR IN ZIP IMPORT: {}'.format(ex))
+        else:
+            return "false"
+
     def ensure_logging_setup(self):
         log_file = os.path.join(os.path.curdir, 'logs', 'commander.log')
         session_log_file = os.path.join(os.path.curdir, 'logs', 'session.log')
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index e9a9f1c4..6baa8713 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -503,6 +503,7 @@ class Server:
 
         while db_helper.get_server_stats_by_id(self.server_id)['updating']:
             if downloaded and not self.is_backingup:
+                print("Backup Status: " + str(self.is_backingup))
                 logger.info("Executable updated successfully. Starting Server")
 
                 db_helper.set_update(self.server_id, False)
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index c84983ad..d236186e 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -1,5 +1,8 @@
 import json
 import logging
+import tempfile
+import zipfile
+
 import tornado.web
 import tornado.escape
 import bleach
@@ -183,10 +186,64 @@ class AjaxHandler(BaseHandler):
                 logger.warning("Invalid path in create_dir ajax call ({})".format(dir_path))
                 console.warning("Invalid path in create_dir ajax call ({})".format(dir_path))
                 return
-
             # Create the directory
             os.mkdir(dir_path)
 
+        elif page == "upload_files":
+            server_id = self.get_argument('id', None)
+            path = self.get_argument('path', None)
+            unzip = self.get_argument('unzip', None)
+
+            if helper.in_path(db_helper.get_server_data_by_id(server_id)['path'], path):
+                try:
+                    files = self.request.files['files']
+                    for file in files:
+                        if file['filename'].split('.') is not None:
+                            self._upload_file(file['body'], path, file['filename'], unzip)
+                        else:
+                            logger.error("Directory Detected. Skipping")
+                    self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
+                except Exception as e:
+                    print(e)
+                    self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
+            else:
+                logger.error("Invalid directory requested. Canceling upload")
+
+        elif page == 'unzip_file':
+            print("in unzip file")
+            path = self.get_argument('path', None)
+            helper.unzipFile(path)
+
+    def _upload_file(self, file_data, file_path, file_name, unzip):
+        error = ""
+
+        file_full_path = os.path.join(file_path, file_name)
+        if os.path.exists(file_full_path):
+            error = "A file with this name already exists."
+
+        if not helper.check_writeable(file_path):
+            error = "Unwritable Path"
+
+        if error != "":
+            logger.error("Unable to save uploaded file due to: {}".format(error))
+            return False
+
+        output_file = open(file_full_path, 'wb')
+        output_file.write(file_data)
+        logger.info('Saving File: {}'.format(file_full_path))
+        uploading = True
+        while uploading:
+            try:
+                new_output = open(file_full_path, 'wb')
+                new_output.close()
+                uploading = False
+            except:
+                print("file is still uploading")
+        if unzip == "True":
+            helper.unzipFile(file_full_path)
+        print("DONE")
+        return True
+
     @tornado.web.authenticated
     def delete(self, page):
         if page == "del_file":
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index fe8501f9..10f97718 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -81,6 +81,8 @@
                     <a onclick="renameItemE(event)" href="javascript:void(0)" id="renameItem" href="#">{{ translate('serverFiles', 'rename') }}</a>
                     <a onclick="deleteFileE(event)" href="javascript:void(0)" id="deleteFile" href="#">{{ translate('serverFiles', 'delete') }}</a>
                     <a onclick="deleteDirE(event)" href="javascript:void(0)" id="deleteDir" href="#">{{ translate('serverFiles', 'delete') }}</a>
+                    <a onclick="uploadFilesE(event)" href="javascript:void(0)" id="upload" href="#">Upload Files</a>
+                    <a onclick="unzipFilesE(event)" href="javascript:void(0)" id="unzip" href="#">Unzip</a>
                   </div>
 
                 </div>
@@ -519,6 +521,39 @@
       });
     }
 
+        function unZip(path, callback) {
+      var token = getCookie("_xsrf")
+      $.ajax({
+        type: "POST",
+        headers: {'X-XSRFToken': token},
+        url: '/ajax/unzip_file?id={{ data['server_stats']['server_id']['server_id'] }}',
+        data: {
+          path: path
+        },
+      });
+    }
+
+    function uploadFilesE(e){
+    path = event.target.parentElement.getAttribute('data-path');
+    server_id = {{ data['server_stats']['server_id']['server_id'] }};
+  var uploadHtml = '<form enctype="multipart/form-data" action="/ajax/upload_files?id=' + server_id +'&path='+ path +'"method="post">{% raw xsrf_form_html() %}<div class="form-group"><label for="files">Upload A File Here</label><input id="files" type="file" name="files" class="form-control-file" multiple></div><input id="unzip" type = checkbox value="1" checked> Would you like us Unzip directories? </input><br><br><input id="upload_file" type="submit"value="Upload File" class="btn btn-success hidden"/></form>';
+
+  bootbox.dialog({
+      message: uploadHtml,
+      title: "Upload Files To "+path,
+  });
+
+  var fileList = document.getElementById("upload");
+  fileList.addEventListener("change", function (e) {
+      var list = "";
+      for (var i = 0; i < this.files.length; i++) {
+          list += "<div class='col-xs-12 file-list'>"+this.files[i].name+"</div>";
+      }
+
+      $("#fileList").text(list);
+  }, false);
+}
+
     function getTreeView() {
       $.ajax({
         type: "GET",
@@ -572,6 +607,7 @@
           $('#createFile').toggle(isDir);
           $('#createDir').toggle(isDir);
           $('#deleteDir').toggle(isDir);
+          $('#upload').toggle(isDir);
 
           var isFile = event.target.classList.contains('tree-file');
           $('#deleteFile').toggle(isFile);
@@ -583,6 +619,7 @@
             $('#renameItem').hide();
             $('#deleteDir').hide();
             $('#deleteFile').hide();
+            $('#upload').show();
           }
 
 
@@ -636,6 +673,10 @@
         });
       })
     }
+        function unzipFilesE(event) {
+        path = event.target.parentElement.getAttribute('data-path');
+      unZip(path)
+    }
 
     function deleteFileE(event) {
       path = event.target.parentElement.getAttribute('data-path');

From e08df4d369ee1fa577adfb861d9efad65c63afdf Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 19 Aug 2021 23:36:25 -0400
Subject: [PATCH 08/16] Completed file uploading. Need to fix listing when
 right clicking. Unzip is shown at all times. Added unzip function to helpers
 and is called through ajax for unzipping files to current directory.

---
 app/classes/shared/controller.py              |  5 +-
 app/classes/shared/helpers.py                 | 18 +++---
 app/classes/web/ajax_handler.py               | 31 ++++------
 .../templates/panel/server_files.html         | 58 ++++++++++++++-----
 4 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/app/classes/shared/controller.py b/app/classes/shared/controller.py
index 26d0411f..a11e6fa5 100644
--- a/app/classes/shared/controller.py
+++ b/app/classes/shared/controller.py
@@ -286,7 +286,10 @@ class Controller:
             tempDir = tempfile.mkdtemp()
             with zipfile.ZipFile(zip_path, 'r') as zip_ref:
                 zip_ref.extractall(tempDir)
-                test = zip_ref.filelist[1].filename
+                for i in range(len(zip_ref.filelist)):
+                    if len(zip_ref.filelist) > 1 or not zip_ref.filelist[i].filename.endswith('/'):
+                        test = zip_ref.filelist[i].filename
+                        break
                 path_list = test.split('/')
                 root_path = path_list[0]
                 if len(path_list) > 1:
diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index beab8043..19e6504c 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -268,15 +268,16 @@ class Helpers:
             else:
                 new_dir += '/'+new_dir_list[i]
 
-        if helper.check_file_perms(zip_path):
+        if helper.check_file_perms(zip_path) and os.path.isfile(zip_path):
             helper.ensure_dir_exists(new_dir)
             tempDir = tempfile.mkdtemp()
-            with zipfile.ZipFile(zip_path, 'r') as zip_ref:
-                zip_ref.extractall(tempDir)
-                for item in os.listdir(tempDir):
-                    print(item)
-                test = zip_ref.filelist[1].filename
-                print(test)
+            try:
+                with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+                    zip_ref.extractall(tempDir)
+                for i in range(len(zip_ref.filelist)):
+                    if len(zip_ref.filelist) > 1 or not zip_ref.filelist[i].filename.endswith('/'):
+                        test = zip_ref.filelist[i].filename
+                        break
                 path_list = test.split('/')
                 root_path = path_list[0]
                 if len(path_list) > 1:
@@ -290,8 +291,11 @@ class Helpers:
                         shutil.move(os.path.join(full_root_path, item), os.path.join(new_dir, item))
                     except Exception as ex:
                         logger.error('ERROR IN ZIP IMPORT: {}'.format(ex))
+            except Exception as ex:
+                print(ex)
         else:
             return "false"
+        return
 
     def ensure_logging_setup(self):
         log_file = os.path.join(os.path.curdir, 'logs', 'commander.log')
diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index d236186e..877c4ae3 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -189,32 +189,34 @@ class AjaxHandler(BaseHandler):
             # Create the directory
             os.mkdir(dir_path)
 
+        elif page == "unzip_file":
+            server_id = self.get_argument('id', None)
+            path = self.get_argument('path', None)
+            helper.unzipFile(path)
+            self.render_page("/panel/server_detail?id={}&subpage=files".format(server_id))
+            return
+
+
         elif page == "upload_files":
             server_id = self.get_argument('id', None)
             path = self.get_argument('path', None)
-            unzip = self.get_argument('unzip', None)
 
             if helper.in_path(db_helper.get_server_data_by_id(server_id)['path'], path):
                 try:
                     files = self.request.files['files']
                     for file in files:
                         if file['filename'].split('.') is not None:
-                            self._upload_file(file['body'], path, file['filename'], unzip)
+                            self._upload_file(file['body'], path, file['filename'])
                         else:
                             logger.error("Directory Detected. Skipping")
                     self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
                 except Exception as e:
-                    print(e)
                     self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
             else:
                 logger.error("Invalid directory requested. Canceling upload")
+            return
 
-        elif page == 'unzip_file':
-            print("in unzip file")
-            path = self.get_argument('path', None)
-            helper.unzipFile(path)
-
-    def _upload_file(self, file_data, file_path, file_name, unzip):
+    def _upload_file(self, file_data, file_path, file_name):
         error = ""
 
         file_full_path = os.path.join(file_path, file_name)
@@ -231,17 +233,6 @@ class AjaxHandler(BaseHandler):
         output_file = open(file_full_path, 'wb')
         output_file.write(file_data)
         logger.info('Saving File: {}'.format(file_full_path))
-        uploading = True
-        while uploading:
-            try:
-                new_output = open(file_full_path, 'wb')
-                new_output.close()
-                uploading = False
-            except:
-                print("file is still uploading")
-        if unzip == "True":
-            helper.unzipFile(file_full_path)
-        print("DONE")
         return True
 
     @tornado.web.authenticated
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 10f97718..810207c3 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -531,27 +531,59 @@
           path: path
         },
       });
+      location.href="/
+    }
+    function uploadFilesE(event){
+    path = event.target.parentElement.getAttribute('data-path');
+    console.log("PATH: " + path);
+      $(function () {
+    server_id = {{ data['server_stats']['server_id']['server_id'] }};
+  var uploadHtml = "<div>" +
+      '<form id="upload_file" enctype="multipart/form-data" action="/ajax/upload_files?id=' + server_id +'&path='+ path +'"method="post">{% raw xsrf_form_html() %}'+"<label class='upload-area' style='width:100%;text-align:center;' for='files'>" +
+          "<input id='files' name='files' type='file' style='display:none;' multiple='true'>" +
+          "<i class='fa fa-cloud-upload fa-3x'></i>" +
+          "<br />" +
+          "Click Here To Upload" +
+      "</label></form>" +
+      "<br />" +
+      "<ul style='margin-left:5px !important;' id='fileList'></ul>" +
+  "</div><div class='clearfix'></div>";
+
+  bootbox.dialog({
+      message: uploadHtml,
+      title: "File Upload",
+      buttons: {
+          success: {
+              label: "Upload",
+              className: "btn-default",
+              callback: function () {
+                  $('#upload_file').submit(); //.trigger('submit');
+              }
+          }
+      }
+  });
+
+  var fileList = document.getElementById("files");
+  fileList.addEventListener("change", function (e) {
+      var list = "";
+      for (var i = 0; i < this.files.length; i++) {
+          list += "<li class='col-xs-12 file-list'>" + this.files[i].name + "</li>"
+      }
+
+      document.getElementById("fileList").innerHTML = list;
+  }, false);
+});
     }
 
-    function uploadFilesE(e){
+
+    function uploadFiles(e){
     path = event.target.parentElement.getAttribute('data-path');
     server_id = {{ data['server_stats']['server_id']['server_id'] }};
-  var uploadHtml = '<form enctype="multipart/form-data" action="/ajax/upload_files?id=' + server_id +'&path='+ path +'"method="post">{% raw xsrf_form_html() %}<div class="form-group"><label for="files">Upload A File Here</label><input id="files" type="file" name="files" class="form-control-file" multiple></div><input id="unzip" type = checkbox value="1" checked> Would you like us Unzip directories? </input><br><br><input id="upload_file" type="submit"value="Upload File" class="btn btn-success hidden"/></form>';
-
+  var uploadHtml = '<form enctype="multipart/form-data" action="/ajax/upload_files?id=' + server_id +'&path='+ path +'"method="post">{% raw xsrf_form_html() %}<div class="form-group">'+"<label class='upload-area' style='width:100%;text-align:center;' for='fupload'>" +'<input id="files" type="file" name="files" multiple>' +"<i class='fa fa-cloud-upload fa-3x'></i>" +"<br />" +"Upload Files Here" +"</label>" +"<br />" +"<span style='margin-left:5px !important;' id='fileList'></span>"+'</div><br><br><input id="upload_file" type="submit"value="Upload File" class="btn btn-success hidden"/></form>';
   bootbox.dialog({
       message: uploadHtml,
       title: "Upload Files To "+path,
   });
-
-  var fileList = document.getElementById("upload");
-  fileList.addEventListener("change", function (e) {
-      var list = "";
-      for (var i = 0; i < this.files.length; i++) {
-          list += "<div class='col-xs-12 file-list'>"+this.files[i].name+"</div>";
-      }
-
-      $("#fileList").text(list);
-  }, false);
 }
 
     function getTreeView() {

From f539f9e0954da66ed33a028e6ec7b09e62aaf3fb Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 19 Aug 2021 23:50:24 -0400
Subject: [PATCH 09/16] I leaned on my keyboard just before the last commit.
 Fixed the things

---
 app/classes/web/ajax_handler.py                | 2 +-
 app/frontend/templates/panel/server_files.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index 877c4ae3..cbf7c9e6 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -193,7 +193,7 @@ class AjaxHandler(BaseHandler):
             server_id = self.get_argument('id', None)
             path = self.get_argument('path', None)
             helper.unzipFile(path)
-            self.render_page("/panel/server_detail?id={}&subpage=files".format(server_id))
+            self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
             return
 
 
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 810207c3..54eca51b 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -531,7 +531,7 @@
           path: path
         },
       });
-      location.href="/
+      window.location.href = "/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=files"
     }
     function uploadFilesE(event){
     path = event.target.parentElement.getAttribute('data-path');

From bd51742b947c834569e6cc41d420f20c20dff5dd Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 20 Aug 2021 13:46:01 -0400
Subject: [PATCH 10/16] Added better context menu

---
 app/frontend/static/assets/css/crafty.css     | 58 +++++++++++-
 .../static/assets/css/shared/style.css        | 56 ++++++------
 .../templates/panel/server_files.html         | 90 +++++++++++--------
 3 files changed, 135 insertions(+), 69 deletions(-)

diff --git a/app/frontend/static/assets/css/crafty.css b/app/frontend/static/assets/css/crafty.css
index ea94ad5c..c0812602 100644
--- a/app/frontend/static/assets/css/crafty.css
+++ b/app/frontend/static/assets/css/crafty.css
@@ -79,4 +79,60 @@ body { background-color: var(--dark) !important; /* Firefox */ }
 
 .actions_serverlist > a > i {
   cursor: pointer;
-}
\ No newline at end of file
+}
+                  /* The Overlay (background) */
+                  .overlay {
+                    /* Height & width depends on how you want to reveal the overlay (see JS below) */
+                    height: 0;
+                    width: 100vw;
+                    position: fixed; /* Stay in place */
+                    z-index: 1031; /* Sit on top */
+                    left: 0;
+                    top: 0;
+                    background-color: rgb(0,0,0); /* Black fallback color */
+                    background-color: rgba(0,0,0, 0.9); /* Black w/opacity */
+                    overflow-x: hidden; /* Disable horizontal scroll */
+                    transition: 0.5s; /* 0.5 second transition effect to slide in or slide down the overlay (height or width, depending on reveal) */
+                  }
+
+                  /* Position the content inside the overlay */
+                  .overlay-content {
+                    position: relative;
+                    top: 25%; /* 25% from the top */
+                    width: 100%; /* 100% width */
+                    text-align: center; /* Centered text/links */
+                    margin-top: 30px; /* 30px top margin to avoid conflict with the close button on smaller screens */
+                  }
+
+                  /* The navigation links inside the overlay */
+                  .overlay a {
+                    padding: 8px;
+                    text-decoration: none;
+                    font-size: 36px;
+                    color: #818181;
+                    display: block; /* Display block instead of inline */
+                    transition: 0.3s; /* Transition effects on hover (color) */
+                  }
+
+                  /* When you mouse over the navigation links, change their color */
+                  .overlay a:hover, .overlay a:focus {
+                    color: #f1f1f1;
+                  }
+
+                  /* Position the close button (top right corner) */
+                  .overlay .closebtn {
+                    position: absolute;
+                    top: 20px;
+                    right: 45px;
+                    font-size: 60px;
+                  }
+
+                  /* When the height of the screen is less than 450 pixels, change the font-size of the links and position the close button again, so they don't overlap */
+                  @media screen and (max-height: 450px) {
+                    .overlay a {font-size: 20px}
+                    .overlay .closebtn {
+                      font-size: 40px;
+                      top: 15px;
+                      right: 35px;
+                    }
+                  }
\ No newline at end of file
diff --git a/app/frontend/static/assets/css/shared/style.css b/app/frontend/static/assets/css/shared/style.css
index a7093450..35a40ab2 100755
--- a/app/frontend/static/assets/css/shared/style.css
+++ b/app/frontend/static/assets/css/shared/style.css
@@ -16188,41 +16188,35 @@ body.avgrund-active {
     border-radius: 2px; }
 
 /* Context Menu */
-.context-menu-icon:before {
-  color: #000;
-  font: normal normal normal 15px/1 "Material Design Icons"; }
+    .context-menu {
+        position: absolute;
+        text-align: center;
+        background: lightgray;
+        border: 1px solid black;
+        display: none;
+    }
 
-.context-menu-icon.context-menu-icon-cut:before {
-  content: '\F190'; }
+    .context-menu ul {
+        padding: 0px;
+        margin: 0px;
+        min-width: 150px;
+        list-style: none;
+    }
 
-.context-menu-icon.context-menu-icon-edit:before {
-  content: '\F3EF'; }
+    .context-menu ul li {
+        padding-bottom: 7px;
+        padding-top: 7px;
+        border: 1px solid black;
+    }
 
-.context-menu-icon.context-menu-icon-copy:before {
-  content: '\F18F'; }
-
-.context-menu-icon.context-menu-icon-paste:before {
-  content: '\F613'; }
-
-.context-menu-icon.context-menu-icon-delete:before {
-  content: '\F6CB'; }
-
-.context-menu-icon.context-menu-icon-quit:before {
-  content: '\F156'; }
-
-.context-menu-list {
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  border: 1px solid #dee2e6; }
-  .context-menu-list .context-menu-item span {
-    color: #000;
-    font-size: 0.75rem;
-    font-family: "roboto", sans-serif; }
-  .context-menu-list .context-menu-item.context-menu-hover {
-    background: #000; }
-    .context-menu-list .context-menu-item.context-menu-hover span {
-      color: #fff; }
+    .context-menu ul li a {
+        text-decoration: none;
+        color: black;
+    }
 
+    .context-menu ul li:hover {
+        background: darkgray;
+    }
 /* Clockpicker */
 .clockpicker-popover {
   background-color: #dee2e6; }
diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 54eca51b..959b3004 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -72,7 +72,6 @@
                 <div id="files-tree-nav" class="overlay">
 
                   <!-- Button to close the overlay navigation -->
-                  <a href="javascript:void(0)" class="closebtn" onclick="document.getElementById('files-tree-nav').style.height = '0%';">&times;</a>
 
                   <!-- Overlay content -->
                   <div id="files-tree-nav-content" class="overlay-content">
@@ -83,55 +82,65 @@
                     <a onclick="deleteDirE(event)" href="javascript:void(0)" id="deleteDir" href="#">{{ translate('serverFiles', 'delete') }}</a>
                     <a onclick="uploadFilesE(event)" href="javascript:void(0)" id="upload" href="#">Upload Files</a>
                     <a onclick="unzipFilesE(event)" href="javascript:void(0)" id="unzip" href="#">Unzip</a>
+                    <a href="javascript:void(0)" class="closebtn" style="color: red;" onclick="document.getElementById('files-tree-nav').style.display = 'none';">Close</a>
                   </div>
 
                 </div>
                 <style>
                   /* The Overlay (background) */
                   .overlay {
-                    /* Height & width depends on how you want to reveal the overlay (see JS below) */
-                    height: 0;
-                    width: 100vw;
-                    position: fixed; /* Stay in place */
-                    z-index: 1031; /* Sit on top */
-                    left: 0;
-                    top: 0;
-                    background-color: rgb(0,0,0); /* Black fallback color */
-                    background-color: rgba(0,0,0, 0.9); /* Black w/opacity */
-                    overflow-x: hidden; /* Disable horizontal scroll */
-                    transition: 0.5s; /* 0.5 second transition effect to slide in or slide down the overlay (height or width, depending on reveal) */
+                  display: none;
+                  flex-direction: column;
+                  background-color: #fff;
+                  border-radius: 10px;
+                  box-shadow: 0 10px 20px rgb(64 64 64 / 5%);
+                  padding: 10px 0;
+                  z-index: 10000;
+                  overflow: scroll;
+
                   }
 
                   /* Position the content inside the overlay */
                   .overlay-content {
-                    position: relative;
-                    top: 25%; /* 25% from the top */
-                    width: 100%; /* 100% width */
-                    text-align: center; /* Centered text/links */
-                    margin-top: 30px; /* 30px top margin to avoid conflict with the close button on smaller screens */
+                  overflow: scroll;
+                   display: flex;
+                    flex-direction: column;
+                    background-color: #fff;
+                    border-radius: 10px;
+                    box-shadow: 0 10px 20px rgb(64 64 64 / 5%);
+                    padding: 10px 0;
                   }
 
                   /* The navigation links inside the overlay */
                   .overlay a {
-                    padding: 8px;
-                    text-decoration: none;
-                    font-size: 36px;
-                    color: #818181;
-                    display: block; /* Display block instead of inline */
-                    transition: 0.3s; /* Transition effects on hover (color) */
+                      font: inherit;
+                      border: 0;
+                      padding: 10px 30px 10px 15px;
+                      width: 100%;
+                      display: flex;
+                      align-items: center;
+                      position: relative;
+                      text-decoration: unset;
+                      color: #000;
+                      font-weight: 500;
+                      transition: 0.5s linear;
+                      -webkit-transition: 0.5s linear;
+                      -moz-transition: 0.5s linear;
+                      -ms-transition: 0.5s linear;
+                      -o-transition: 0.5s linear;
                   }
 
                   /* When you mouse over the navigation links, change their color */
                   .overlay a:hover, .overlay a:focus {
-                    color: #f1f1f1;
+                     background:#f1f3f7;
+                      color: #4b00ff;
                   }
 
                   /* Position the close button (top right corner) */
-                  .overlay .closebtn {
-                    position: absolute;
-                    top: 20px;
-                    right: 45px;
-                    font-size: 60px;
+                  .overlay .closebtn .closebtn:hover {
+                    background-color: red;
+                    color: red;
+                    z-index: 10000;
                   }
 
                   /* When the height of the screen is less than 450 pixels, change the font-size of the links and position the close button again, so they don't overlap */
@@ -653,15 +662,22 @@
             $('#deleteFile').hide();
             $('#upload').show();
           }
+                      if(event.target.textContent.endsWith('.zip')){
+             $('#unzip').show();
+             console.log(event.target.textContent)
+            }else{
+            $('#unzip').hide();}
+
 
 
           document.getElementById('files-tree-nav-content')
             .setAttribute('data-path', ctxmenuPath);
-
           document.getElementById('files-tree-nav-content')
             .setAttribute('data-name', ctxmenuName);
-
-          document.getElementById("files-tree-nav").style.height = "100%";
+          document.getElementById("files-tree-nav").style.display = "flex";
+          document.getElementById("files-tree-nav").style.position = "fixed";
+          document.getElementById("files-tree-nav").style.top = event.clientY + 'px';
+          document.getElementById("files-tree-nav").style.left = event.clientX + 'px';
         })
       }
     }
@@ -675,7 +691,7 @@
 
         createFile(path, result, function () {
           getTreeView()
-          document.getElementById('files-tree-nav').style.height = '0%';
+          document.getElementById('files-tree-nav').style.display = 'none';
         });
       })
     }
@@ -688,7 +704,7 @@
 
         createDir(path, result, function () {
           getTreeView()
-          document.getElementById('files-tree-nav').style.height = '0%';
+          document.getElementById('files-tree-nav').style.display = 'none';
         });
       })
     }
@@ -701,7 +717,7 @@
 
         renameItem(path, result, function () {
           getTreeView()
-          document.getElementById('files-tree-nav').style.height = '0%';
+          document.getElementById('files-tree-nav').style.display = 'none';
         });
       })
     }
@@ -732,7 +748,7 @@
             if (!result) return;
             deleteFile(path, function () {
               getTreeView()
-              document.getElementById('files-tree-nav').style.height = '0%';
+              document.getElementById('files-tree-nav').style.display = 'none';
             });
           }
       });
@@ -760,7 +776,7 @@
             if (!result) return;
             deleteDir(path, function () {
               getTreeView()
-              document.getElementById('files-tree-nav').style.height = '0%';
+              document.getElementById('files-tree-nav').style.display = 'none';
             });
           }
       });

From 6e59bbd524fc7f6f81c444f5d9b7854c3101e88c Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 20 Aug 2021 14:58:52 -0400
Subject: [PATCH 11/16] Fixed context menu. Added feature for off-clicking.

---
 .../templates/panel/server_files.html         | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index 959b3004..b135b527 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -668,6 +668,9 @@
             }else{
             $('#unzip').hide();}
 
+        var clientX = event.clientX;
+        var clientY = event.clientY;
+
 
 
           document.getElementById('files-tree-nav-content')
@@ -676,12 +679,27 @@
             .setAttribute('data-name', ctxmenuName);
           document.getElementById("files-tree-nav").style.display = "flex";
           document.getElementById("files-tree-nav").style.position = "fixed";
-          document.getElementById("files-tree-nav").style.top = event.clientY + 'px';
-          document.getElementById("files-tree-nav").style.left = event.clientX + 'px';
+          domRect = document.getElementById("files-tree-nav").getBoundingClientRect();
+          sum = (clientY+domRect['height']) - window.innerHeight
+          if(domRect['height']+clientY > window.innerHeight){
+            clientY = clientY - sum
+          }
+          document.getElementById("files-tree-nav").style.top = clientY + 'px';
+          document.getElementById("files-tree-nav").style.left =  clientX + 'px';
+          console.log(domRect)
+          console.log(window.innerHeight)
         })
       }
     }
 
+    document.addEventListener('click', function(e){
+  let inside = (e.target.closest('#files-tree-nav'));
+  if(!inside){
+    let contextMenu = document.getElementById('files-tree-nav');
+    contextMenu.setAttribute('style', 'display:none');
+  }
+});
+
 
     function createFileE(event) {
       bootbox.prompt("{% raw translate('serverFiles', 'createFileQuestion') %}", function(result) {

From af3ab28ee843d7cdbadfabda52e80265a97198dc Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 20 Aug 2021 15:15:17 -0400
Subject: [PATCH 12/16] Fixed context menu css dupe

---
 app/frontend/static/assets/css/crafty.css | 56 -----------------------
 1 file changed, 56 deletions(-)

diff --git a/app/frontend/static/assets/css/crafty.css b/app/frontend/static/assets/css/crafty.css
index c0812602..892bd52f 100644
--- a/app/frontend/static/assets/css/crafty.css
+++ b/app/frontend/static/assets/css/crafty.css
@@ -80,59 +80,3 @@ body { background-color: var(--dark) !important; /* Firefox */ }
 .actions_serverlist > a > i {
   cursor: pointer;
 }
-                  /* The Overlay (background) */
-                  .overlay {
-                    /* Height & width depends on how you want to reveal the overlay (see JS below) */
-                    height: 0;
-                    width: 100vw;
-                    position: fixed; /* Stay in place */
-                    z-index: 1031; /* Sit on top */
-                    left: 0;
-                    top: 0;
-                    background-color: rgb(0,0,0); /* Black fallback color */
-                    background-color: rgba(0,0,0, 0.9); /* Black w/opacity */
-                    overflow-x: hidden; /* Disable horizontal scroll */
-                    transition: 0.5s; /* 0.5 second transition effect to slide in or slide down the overlay (height or width, depending on reveal) */
-                  }
-
-                  /* Position the content inside the overlay */
-                  .overlay-content {
-                    position: relative;
-                    top: 25%; /* 25% from the top */
-                    width: 100%; /* 100% width */
-                    text-align: center; /* Centered text/links */
-                    margin-top: 30px; /* 30px top margin to avoid conflict with the close button on smaller screens */
-                  }
-
-                  /* The navigation links inside the overlay */
-                  .overlay a {
-                    padding: 8px;
-                    text-decoration: none;
-                    font-size: 36px;
-                    color: #818181;
-                    display: block; /* Display block instead of inline */
-                    transition: 0.3s; /* Transition effects on hover (color) */
-                  }
-
-                  /* When you mouse over the navigation links, change their color */
-                  .overlay a:hover, .overlay a:focus {
-                    color: #f1f1f1;
-                  }
-
-                  /* Position the close button (top right corner) */
-                  .overlay .closebtn {
-                    position: absolute;
-                    top: 20px;
-                    right: 45px;
-                    font-size: 60px;
-                  }
-
-                  /* When the height of the screen is less than 450 pixels, change the font-size of the links and position the close button again, so they don't overlap */
-                  @media screen and (max-height: 450px) {
-                    .overlay a {font-size: 20px}
-                    .overlay .closebtn {
-                      font-size: 40px;
-                      top: 15px;
-                      right: 35px;
-                    }
-                  }
\ No newline at end of file

From 1bc8acb1c55b58ff10fb118357d4e8e15723b633 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 20 Aug 2021 15:18:55 -0400
Subject: [PATCH 13/16] FIxed scrollbars on overlay

---
 app/frontend/templates/panel/server_files.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/frontend/templates/panel/server_files.html b/app/frontend/templates/panel/server_files.html
index b135b527..3f39c794 100644
--- a/app/frontend/templates/panel/server_files.html
+++ b/app/frontend/templates/panel/server_files.html
@@ -99,10 +99,18 @@
                   overflow: scroll;
 
                   }
+                  .overlay::-webkit-scrollbar {
+                      display: none;
+                  }
+
+                  /* Hide scrollbar for IE, Edge and Firefox */
+                  .overlay {
+                    -ms-overflow-style: none;  /* IE and Edge */
+                    scrollbar-width: none;  /* Firefox */
+                  }
 
                   /* Position the content inside the overlay */
                   .overlay-content {
-                  overflow: scroll;
                    display: flex;
                     flex-direction: column;
                     background-color: #fff;

From 77a6d260a163d2dbdb22f060d98fa359787d26ef Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Fri, 20 Aug 2021 15:41:22 -0400
Subject: [PATCH 14/16] Made it so a new thread is spawned for uploads.

Need to add file checking so system doesn't crash when a user tries to upload a dmg or a .mov
---
 app/classes/web/ajax_handler.py | 34 ++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/classes/web/ajax_handler.py b/app/classes/web/ajax_handler.py
index cbf7c9e6..f051c956 100644
--- a/app/classes/web/ajax_handler.py
+++ b/app/classes/web/ajax_handler.py
@@ -1,6 +1,7 @@
 import json
 import logging
 import tempfile
+import threading
 import zipfile
 
 import tornado.web
@@ -196,25 +197,28 @@ class AjaxHandler(BaseHandler):
             self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
             return
 
-
         elif page == "upload_files":
             server_id = self.get_argument('id', None)
             path = self.get_argument('path', None)
+            files = self.request.files['files']
+            upload_thread = threading.Thread(target=self.do_upload, daemon=True, name=files[0]['filename'],
+                                             args=(server_id, path, files))
+            upload_thread.start()
+            self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
 
-            if helper.in_path(db_helper.get_server_data_by_id(server_id)['path'], path):
-                try:
-                    files = self.request.files['files']
-                    for file in files:
-                        if file['filename'].split('.') is not None:
-                            self._upload_file(file['body'], path, file['filename'])
-                        else:
-                            logger.error("Directory Detected. Skipping")
-                    self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
-                except Exception as e:
-                    self.redirect("/panel/server_detail?id={}&subpage=files".format(server_id))
-            else:
-                logger.error("Invalid directory requested. Canceling upload")
-            return
+    def do_upload(self, server_id, path, files):
+        if helper.in_path(db_helper.get_server_data_by_id(server_id)['path'], path):
+            try:
+                for file in files:
+                    if file['filename'].split('.') is not None:
+                        self._upload_file(file['body'], path, file['filename'])
+                    else:
+                        logger.error("Directory Detected. Skipping")
+            except Exception as e:
+                logger.error("Error while uploading files: {}".format(e))
+        else:
+            logger.error("Invalid directory requested. Canceling upload")
+        return
 
     def _upload_file(self, file_data, file_path, file_name):
         error = ""

From 89f6a98dc924e6663fa05416947b9ffa9683ff29 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 21 Aug 2021 10:07:43 -0400
Subject: [PATCH 15/16] Took out ability to assign specific users to specific
 servers. All role based now.

---
 app/classes/web/panel_handler.py                  | 10 ----------
 app/frontend/templates/panel/panel_edit_user.html |  6 ++----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index bbe9ef7d..4889fe61 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -324,17 +324,9 @@ class PanelHandler(BaseHandler):
 
         elif page == "edit_user":
             user_id = self.get_argument('id', None)
-            user_servers = db_helper.get_authorized_servers(user_id)
             role_servers = db_helper.get_authorized_servers_from_roles(user_id)
             page_role_servers = []
             servers = set()
-            for server in user_servers:
-                flag = False
-                for rserver in role_servers:
-                    if rserver['server_id'] == server['server_id']:
-                        flag = True
-                if not flag:
-                    servers.add(server['server_id'])
             for server in role_servers:
                 page_role_servers.append(server['server_id'])
             page_data['new_user'] = False
@@ -638,7 +630,6 @@ class PanelHandler(BaseHandler):
                 "enabled": enabled,
                 "regen_api": regen_api,
                 "roles": roles,
-                "servers": servers,
             }
             db_helper.update_user(user_id, user_data=user_data)
 
@@ -694,7 +685,6 @@ class PanelHandler(BaseHandler):
             user_id = db_helper.add_user(username, password=password0, enabled=enabled)
             user_data = {
                 "roles": roles,
-                "servers": servers,
             }
             db_helper.update_user(user_id, user_data)
 
diff --git a/app/frontend/templates/panel/panel_edit_user.html b/app/frontend/templates/panel/panel_edit_user.html
index 3b273461..c9a7ff33 100644
--- a/app/frontend/templates/panel/panel_edit_user.html
+++ b/app/frontend/templates/panel/panel_edit_user.html
@@ -121,12 +121,10 @@
                               <tr>
                                 <td>{{ server['server_name'] }}</td>
                                 <td>
-                                  {% if server['server_id'] in data['servers'] %}
-                                    <input type="checkbox" class="form-check-input" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" checked="" value="1">
-                                    {% elif server['server_id'] in data['role-servers'] %}
+                                  {% if server['server_id'] in data['role-servers'] %}
                                     <input type="checkbox" class="form-check-input" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" checked="" value="" disabled>
                                   {% else %}
-                                    <input type="checkbox" class="form-check-input" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" value="1">
+                                    <input type="checkbox" class="form-check-input" id="server_{{ server['server_id'] }}_access" name="server_{{ server['server_id'] }}_access" value="1" disabled>
                                   {% end %}
                                 </td>
                               </tr>

From 1150c98fafd628e68a1902a30aa9d3bf23f84b16 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 21 Aug 2021 10:30:37 -0400
Subject: [PATCH 16/16] Made it so server is added to all user roles when
 created.

---
 app/classes/shared/models.py      | 12 +++++++++---
 app/classes/web/server_handler.py |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/classes/shared/models.py b/app/classes/shared/models.py
index 3b8b81eb..2d97402b 100644
--- a/app/classes/shared/models.py
+++ b/app/classes/shared/models.py
@@ -318,7 +318,6 @@ class db_shortcuts:
     def get_all_authorized_servers(user_id):
         user_servers = User_Servers.select().where(User_Servers.user_id == user_id)
         user_roles = User_Roles.select().where(User_Roles.user_id == user_id)
-        server_data = []
         roles_list = []
         role_server = []
         server_data = []
@@ -416,6 +415,13 @@ class db_shortcuts:
             roles_list.append(db_helper.get_role(r.role_id)['role_name'])
         return roles_list
 
+    @staticmethod
+    def get_user_roles_id(user_id):
+        roles_list = []
+        roles = User_Roles.select().where(User_Roles.user_id == user_id)
+        for r in roles:
+            roles_list.append(db_helper.get_role(r.role_id)['role_id'])
+        return roles_list
 
     @staticmethod
     def get_authorized_servers_stats_from_roles(user_id):
@@ -553,8 +559,8 @@ class db_shortcuts:
         return user
 
     @staticmethod
-    def add_user_server(server_id, user_id):
-        servers = User_Servers.insert({User_Servers.server_id: server_id, User_Servers.user_id: user_id}).execute()
+    def add_role_server(server_id, role_id):
+        servers = Role_Servers.insert({Role_Servers.server_id: server_id, Role_Servers.role_id: role_id}).execute()
         return servers
 
 
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 1f7dea57..45b00b5f 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -195,8 +195,10 @@ class ServerHandler(BaseHandler):
                     return
                 server_type, server_version = server_parts
                 # todo: add server type check here and call the correct server add functions if not a jar
+                role_ids = db_helper.get_user_roles_id(exec_user_id)
                 new_server_id = self.controller.create_jar_server(server_type, server_version, server_name, min_mem, max_mem, port)
-                db_helper.add_user_server(new_server_id, exec_user_id)
+                for role in role_ids:
+                    db_helper.add_role_server(new_server_id, role)
                 db_helper.add_to_audit_log(exec_user_data['user_id'],
                                            "created a {} {} server named \"{}\"".format(server_version, str(server_type).capitalize(), server_name), # Example: Admin created a 1.16.5 Bukkit server named "survival"
                                            new_server_id,