From d92bb50a03260efcaa1b5955d6a63ae05c4886d4 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sun, 7 Feb 2021 09:19:28 +0100
Subject: [PATCH 1/3] upload progressbar UI

---
 resources/js/App.vue                          |  7 +++-
 .../components/FilesView/UploadProgress.vue   | 21 +++++++----
 resources/js/helpers.js                       | 37 +++++++++++--------
 resources/js/store/modules/fileFunctions.js   |  9 ++++-
 4 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/resources/js/App.vue b/resources/js/App.vue
index 2d9f9233..379dafe6 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -110,7 +110,7 @@ export default {
     },
     computed: {
         ...mapGetters([
-            'isLogged', 'isGuest', 'config'
+            'isLogged', 'isGuest', 'config', 'filesQueue'
         ]),
         isGuestLayout() {
             return (includes([
@@ -139,6 +139,11 @@ export default {
             )
         }
     },
+    watch: {
+        filesQueue() {
+            //this.$handleUploading()
+        }
+    },
     data() {
         return {
             isScaledDown: false
diff --git a/resources/js/components/FilesView/UploadProgress.vue b/resources/js/components/FilesView/UploadProgress.vue
index 76134eb1..6d7367d4 100644
--- a/resources/js/components/FilesView/UploadProgress.vue
+++ b/resources/js/components/FilesView/UploadProgress.vue
@@ -1,20 +1,26 @@
 <template>
     <transition name="info-panel">
-        <div v-if="uploadingFilesCount" class="upload-progress">
+        <div v-if="filesQueue.length > 0" class="upload-progress">
             <div class="progress-title">
+
+                <!--Is processing-->
 				<span v-if="isProcessingFile">
                     <refresh-cw-icon size="12" class="sync-alt"></refresh-cw-icon>
                     {{ $t('uploading.processing_file') }}
                 </span>
-				<span v-if="!isProcessingFile && uploadingFilesCount.total === 1">
-                    {{ $t('uploading.progress_single_upload', {progress: uploadingFileProgress}) }}
+
+                <!--Single file upload-->
+				<span v-if="!isProcessingFile && filesQueue.length === 1">
+                    {{ $t('uploading.progress_single_upload', {progress: 80}) }}
                 </span>
-				<span v-if="!isProcessingFile && uploadingFilesCount.total > 1">
-                    {{ $t('uploading.progress', {current:uploadingFilesCount.current, total: uploadingFilesCount.total, progress: uploadingFileProgress}) }}
+
+                <!--Multi file upload-->
+				<span v-if="!isProcessingFile && filesQueue.length > 1">
+                    {{ $t('uploading.progress', {current:'x', total: filesQueue.length, progress: 80}) }}
                 </span>
             </div>
             <div class="progress-wrapper">
-                <ProgressBar :progress="uploadingFileProgress" />
+                <ProgressBar :progress="80" />
                 <span @click="cancelUpload" :title="$t('uploading.cancel')" class="cancel-icon">
                     <x-icon size="16" @click="cancelUpload"></x-icon>
                 </span>
@@ -38,9 +44,8 @@
         },
         computed: {
             ...mapGetters([
-                'uploadingFileProgress',
-                'uploadingFilesCount',
                 'isProcessingFile',
+                'filesQueue',
             ])
         },
         methods: {
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 4d38c13e..02a44d5c 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -76,19 +76,20 @@ const Helpers = {
             this.$store.dispatch('createFolder', folderName)
         }
 
-        Vue.prototype.$handleUploading = async function (files, parent_id) {
+        Vue.prototype.$handleUploading = async function () {
 
+        	//let files = this.$store.getters.filesQueue
             let fileBuffer = []
 
             // Append the file list to fileBuffer array
-            Array.prototype.push.apply(fileBuffer, files);
+            Array.prototype.push.apply(fileBuffer, this.$store.getters.filesQueue);
 
             let fileSucceed = 0
 
             // Update files count in progressbar
             store.commit('UPDATE_FILE_COUNT_PROGRESS', {
                 current: fileSucceed,
-                total: files.length
+                total: this.$store.getters.filesQueue.length
             })
 
             // Reset upload progress to 0
@@ -96,21 +97,20 @@ const Helpers = {
 
             // Get parent id
             let parentFolder = this.$store.getters.currentFolder ? this.$store.getters.currentFolder.unique_id : 0
-            let rootFolder = parent_id ? parent_id : parentFolder
 
             // Upload files
             do {
-                let file = fileBuffer.shift(),
+                let onQueue = fileBuffer.shift(),
                     chunks = []
 
                 // Calculate ceils
                 let size = this.$store.getters.config.chunkSize,
-                    chunksCeil = Math.ceil(file.size / size);
+                    chunksCeil = Math.ceil(onQueue.file.size / size);
 
                 // Create chunks
                 for (let i = 0; i < chunksCeil; i++) {
-                    chunks.push(file.slice(
-                        i * size, Math.min(i * size + size, file.size), file.type
+                    chunks.push(onQueue.file.slice(
+                        i * size, Math.min(i * size + size, onQueue.file.size), onQueue.file.type
                     ));
                 }
 
@@ -118,7 +118,7 @@ const Helpers = {
                 let formData = new FormData(),
                     uploadedSize = 0,
                     isNotGeneralError = true,
-                    striped_name = file.name.replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
+                    striped_name = onQueue.file.name.replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
                     filename = Array(16).fill(0).map(x => Math.random().toString(36).charAt(2)).join('') + '-' + striped_name + '.part'
 
                 do {
@@ -128,14 +128,14 @@ const Helpers = {
 
                     // Set form data
                     formData.set('file', chunk, filename);
-                    formData.set('parent_id', rootFolder)
+                    formData.set('parent_id', onQueue.parent_id)
                     formData.set('is_last', isLast);
 
                     // Upload chunks
                     do {
                         await store.dispatch('uploadFiles', {
                             form: formData,
-                            fileSize: file.size,
+                            fileSize: onQueue.file.size,
                             totalUploadedSize: uploadedSize
                         }).then(() => {
                             uploadedSize = uploadedSize + chunk.size
@@ -165,7 +165,7 @@ const Helpers = {
                 // Progress file log
                 store.commit('UPDATE_FILE_COUNT_PROGRESS', {
                     current: fileSucceed,
-                    total: files.length
+                    total: this.$store.getters.filesQueue.length
                 })
 
             } while (fileBuffer.length !== 0)
@@ -187,10 +187,17 @@ const Helpers = {
             // Prevent submit empty files
             if (event.dataTransfer.items.length == 0) return
 
-            // Get files
-            let files = [...event.dataTransfer.items].map(item => item.getAsFile());
+            // Push files to queue
+            [...event.dataTransfer.items].map(item => {
+				this.$store.commit('ADD_FILES_TO_QUEUE', {
+					parent_id: parent_id,
+					file: item.getAsFile(),
+				})
+			});
 
-            this.$handleUploading(files, parent_id)
+            if (! this.$store.getters.uploadingFilesCount) {
+				this.$handleUploading()
+			}
         }
 
         Vue.prototype.$downloadFile = function (url, filename) {
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index 731b3a0f..d52221e3 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -7,6 +7,7 @@ import Vue from 'vue'
 
 const defaultState = {
 	processingPopup: undefined,
+	filesQueue: [],
 }
 
 const actions = {
@@ -197,6 +198,8 @@ const actions = {
 					if (response.data.folder_id == getters.currentFolder.unique_id)
 						commit('ADD_NEW_ITEMS', response.data)
 
+					// TODO: handle new uploads if exist
+
 					resolve(response)
 				})
 				.catch(error => {
@@ -384,11 +387,15 @@ const actions = {
 const mutations = {
 	PROCESSING_POPUP(state, status) {
 		state.processingPopup = status
+	},
+	ADD_FILES_TO_QUEUE(state, file) {
+		state.filesQueue.push(file)
 	}
 }
 
 const getters = {
-	processingPopup: state => state.processingPopup
+	processingPopup: state => state.processingPopup,
+	filesQueue: state => state.filesQueue,
 }
 
 export default {

From b8790a964b32a18454b5911f489296a56c356f62 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sun, 21 Feb 2021 19:56:03 +0100
Subject: [PATCH 2/3] - uploading via files queue

---
 public/mix-manifest.json                      | 243 ++++++------------
 .../components/FilesView/DesktopToolbar.vue   |  37 +--
 .../js/components/FilesView/FileBrowser.vue   |   4 +-
 .../components/FilesView/UploadProgress.vue   |  10 +-
 resources/js/helpers.js                       | 164 +++++-------
 resources/js/store/modules/fileBrowser.js     |  15 --
 resources/js/store/modules/fileFunctions.js   | 142 +++++-----
 7 files changed, 244 insertions(+), 371 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index d2b0a32f..70a3c09c 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -29,7 +29,7 @@
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=374911110bca4e1b3f91",
     "/chunks/files.js": "/chunks/files.js?id=d47d2964ef535ad5754c",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=e285e842f58178d681c4",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=01cf689e830ec7689e39",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=637281f8b08d57c4fb47",
     "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=539a5b88c5f32511449e",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=f430110273d76b28906f",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=94c75dac20c4ccf7bde0",
@@ -57,7 +57,7 @@
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=99b4f321902fe6b0eb23",
     "/chunks/shared-files.js": "/chunks/shared-files.js?id=1860b9031f41ed46d0e0",
     "/chunks/shared-page.js": "/chunks/shared-page.js?id=da4c97784a340b3080c9",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=ce7bb181aaa816f073b4",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=6b961e6324b09384dfd0",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=a46f57a34f8f862a24a8",
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=080bade1ed512f512591",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=5b2f00a9e19520adc31e",
@@ -75,172 +75,75 @@
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=2c5f4cdd17574255ea05",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=d6683735de17fd8c55c8",
     "/chunks/users.js": "/chunks/users.js?id=f2359ae7c0c166001c33",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.614b1493ffadf230cdd2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.614b1493ffadf230cdd2.hot-update.js",
-    "/js/main.d3670b47d0db25c35c55.hot-update.js": "/js/main.d3670b47d0db25c35c55.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.d3670b47d0db25c35c55.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d3670b47d0db25c35c55.hot-update.js",
-    "/js/main.d61f1831b01e3b1792ee.hot-update.js": "/js/main.d61f1831b01e3b1792ee.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.d61f1831b01e3b1792ee.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d61f1831b01e3b1792ee.hot-update.js",
-    "/js/main.f6d59d58a4c2e1f65aee.hot-update.js": "/js/main.f6d59d58a4c2e1f65aee.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.f6d59d58a4c2e1f65aee.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f6d59d58a4c2e1f65aee.hot-update.js",
-    "/js/main.e7177283a484e04ed335.hot-update.js": "/js/main.e7177283a484e04ed335.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.e7177283a484e04ed335.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e7177283a484e04ed335.hot-update.js",
-    "/js/main.c52a8d04954efdd1a2e4.hot-update.js": "/js/main.c52a8d04954efdd1a2e4.hot-update.js",
-    "/js/main.ddac316e237e9720922e.hot-update.js": "/js/main.ddac316e237e9720922e.hot-update.js",
-    "/js/main.6628150606812c691b38.hot-update.js": "/js/main.6628150606812c691b38.hot-update.js",
-    "/chunks/files.190c1bd03889ea5d8e99.hot-update.js": "/chunks/files.190c1bd03889ea5d8e99.hot-update.js",
-    "/js/main.d0fed622232160d2ad33.hot-update.js": "/js/main.d0fed622232160d2ad33.hot-update.js",
-    "/js/main.6d9791ca87b898efd56a.hot-update.js": "/js/main.6d9791ca87b898efd56a.hot-update.js",
-    "/js/main.0b7b3ff4fb5c2ea6a38d.hot-update.js": "/js/main.0b7b3ff4fb5c2ea6a38d.hot-update.js",
-    "/js/main.293f98da6d9a31ab68b9.hot-update.js": "/js/main.293f98da6d9a31ab68b9.hot-update.js",
-    "/js/main.12ff2ec58ecbdeb4de38.hot-update.js": "/js/main.12ff2ec58ecbdeb4de38.hot-update.js",
-    "/js/main.75da29272eb9e78355d4.hot-update.js": "/js/main.75da29272eb9e78355d4.hot-update.js",
-    "/js/main.22defd1d9a3399837c18.hot-update.js": "/js/main.22defd1d9a3399837c18.hot-update.js",
-    "/js/main.4b5676c0fd52023a7dfa.hot-update.js": "/js/main.4b5676c0fd52023a7dfa.hot-update.js",
-    "/js/main.d0d21587b2404aafb4bd.hot-update.js": "/js/main.d0d21587b2404aafb4bd.hot-update.js",
-    "/js/main.b6817993947858facf9c.hot-update.js": "/js/main.b6817993947858facf9c.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.40817e7af190742ee58a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.40817e7af190742ee58a.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.af71ef318e4da61a299a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.af71ef318e4da61a299a.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.d6b1cede24a04409c6b4.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d6b1cede24a04409c6b4.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.de6e7f00c8a38a02760e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.de6e7f00c8a38a02760e.hot-update.js",
-    "/js/main.12bb05a0b08e2a8e384a.hot-update.js": "/js/main.12bb05a0b08e2a8e384a.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.e277659f5d9f3c27caca.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e277659f5d9f3c27caca.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.e44b54d5c4dcc42f59a2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e44b54d5c4dcc42f59a2.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.7a0e24bf294c4a233f0e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7a0e24bf294c4a233f0e.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.9943ccf364b0051d2406.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9943ccf364b0051d2406.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.4eb42e033ec4efbfd859.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4eb42e033ec4efbfd859.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.caea22ef47f2ebb91b57.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.caea22ef47f2ebb91b57.hot-update.js",
-    "/js/main.7889a399f6ba9142da70.hot-update.js": "/js/main.7889a399f6ba9142da70.hot-update.js",
-    "/js/main.6a217251cf9fad3e3359.hot-update.js": "/js/main.6a217251cf9fad3e3359.hot-update.js",
-    "/js/main.38ecf46e083ea1cc2502.hot-update.js": "/js/main.38ecf46e083ea1cc2502.hot-update.js",
-    "/js/main.e0dcebe9a9597e4b4739.hot-update.js": "/js/main.e0dcebe9a9597e4b4739.hot-update.js",
-    "/js/main.a918b51a359e95c005d6.hot-update.js": "/js/main.a918b51a359e95c005d6.hot-update.js",
-    "/js/main.1161d4a1925dd8893adc.hot-update.js": "/js/main.1161d4a1925dd8893adc.hot-update.js",
-    "/js/main.0077366e1fd2c1141b66.hot-update.js": "/js/main.0077366e1fd2c1141b66.hot-update.js",
-    "/js/main.640f1d702792c6eee0e7.hot-update.js": "/js/main.640f1d702792c6eee0e7.hot-update.js",
-    "/js/main.937bbe5e2daf45585edd.hot-update.js": "/js/main.937bbe5e2daf45585edd.hot-update.js",
-    "/js/main.96ccc6257167aff9e18e.hot-update.js": "/js/main.96ccc6257167aff9e18e.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.b9c4c9a6a735aabe9471.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b9c4c9a6a735aabe9471.hot-update.js",
-    "/js/main.e26893a5b3b8d40d775a.hot-update.js": "/js/main.e26893a5b3b8d40d775a.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.6c02c8718abe7a151915.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6c02c8718abe7a151915.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.e47bcdf4130377d130e4.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e47bcdf4130377d130e4.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.0909f1a9f0b7cc5dd464.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0909f1a9f0b7cc5dd464.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.1c4bc24c84a56a610aa6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.1c4bc24c84a56a610aa6.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.38556b0525a8793c9fd0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.38556b0525a8793c9fd0.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.0ab2ea2a112c5cecb87b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0ab2ea2a112c5cecb87b.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.66eb7ef0feb2c9abe790.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.66eb7ef0feb2c9abe790.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.2dd9ff94be456732c739.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2dd9ff94be456732c739.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.4602bfb0eb24780573e4.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4602bfb0eb24780573e4.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.e381e2f1f70e824733b8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e381e2f1f70e824733b8.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.1f968195c93aa981ecbc.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.1f968195c93aa981ecbc.hot-update.js",
-    "/js/main.b901e3337fcdfec9efa8.hot-update.js": "/js/main.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/dashboard.b901e3337fcdfec9efa8.hot-update.js": "/chunks/dashboard.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-methods~chunks/users.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-methods~chunks/users.js?id=eb8e72c1606d2c8f5957",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.b901e3337fcdfec9efa8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/invoices.b901e3337fcdfec9efa8.hot-update.js": "/chunks/invoices.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/pages.b901e3337fcdfec9efa8.hot-update.js": "/chunks/pages.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/plans.b901e3337fcdfec9efa8.hot-update.js": "/chunks/plans.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/settings-payment-methods.b901e3337fcdfec9efa8.hot-update.js": "/chunks/settings-payment-methods.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/settings-subscription.b901e3337fcdfec9efa8.hot-update.js": "/chunks/settings-subscription.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/settings-subscription~chunks/user-subscription.js": "/chunks/settings-subscription~chunks/user-subscription.js?id=2985df368beab2a4901a",
-    "/chunks/user-subscription.b901e3337fcdfec9efa8.hot-update.js": "/chunks/user-subscription.b901e3337fcdfec9efa8.hot-update.js",
-    "/chunks/users.b901e3337fcdfec9efa8.hot-update.js": "/chunks/users.b901e3337fcdfec9efa8.hot-update.js",
-    "/js/main.989a3ce47f04a0dd2b1d.hot-update.js": "/js/main.989a3ce47f04a0dd2b1d.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.989a3ce47f04a0dd2b1d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.989a3ce47f04a0dd2b1d.hot-update.js",
-    "/chunks/shared-page.989a3ce47f04a0dd2b1d.hot-update.js": "/chunks/shared-page.989a3ce47f04a0dd2b1d.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.699556b45ac6d44ed357.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.699556b45ac6d44ed357.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.b08548ea9fdeb05b5639.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b08548ea9fdeb05b5639.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.9b334934ecabf0cd1bd5.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9b334934ecabf0cd1bd5.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.af2f99325485b9265574.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.af2f99325485b9265574.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.4a6fd71914ff2563b15d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4a6fd71914ff2563b15d.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.f8b25e88b73ba719b432.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f8b25e88b73ba719b432.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.093a19f7462a64b80f01.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.093a19f7462a64b80f01.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.4fe737ed714fc9155520.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4fe737ed714fc9155520.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.67741713aacbdfa3112a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.67741713aacbdfa3112a.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.2c18af3f91704749465b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2c18af3f91704749465b.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.ce490cb7c755a1b82c3e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ce490cb7c755a1b82c3e.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.7695fd0bec1345962d6a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7695fd0bec1345962d6a.hot-update.js",
-    "/js/main.16b2e74c125b19f62b62.hot-update.js": "/js/main.16b2e74c125b19f62b62.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.b196cfce21ba03825921.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b196cfce21ba03825921.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.a615f1987a9337c76225.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a615f1987a9337c76225.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.a2257876a94e876d7523.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a2257876a94e876d7523.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.8a7ce5f1b8414c449b19.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8a7ce5f1b8414c449b19.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.1d725a0f7b004b2a2857.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.1d725a0f7b004b2a2857.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.2a16a058df0e06bace24.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2a16a058df0e06bace24.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.a3b0b499d14f5ca204e0.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a3b0b499d14f5ca204e0.hot-update.js",
-    "/js/main.a0e00e3f52cecbbad487.hot-update.js": "/js/main.a0e00e3f52cecbbad487.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.7eaeded1723f994dab03.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7eaeded1723f994dab03.hot-update.js",
-    "/js/main.e08e8bd3ceb9ea202dce.hot-update.js": "/js/main.e08e8bd3ceb9ea202dce.hot-update.js",
-    "/js/main.94863451379dafcaf44e.hot-update.js": "/js/main.94863451379dafcaf44e.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.67e1b4b040cb0d0ffa54.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.67e1b4b040cb0d0ffa54.hot-update.js",
-    "/js/main.de67804f7b815889c2a5.hot-update.js": "/js/main.de67804f7b815889c2a5.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.b0bf290717fc5bd602d6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b0bf290717fc5bd602d6.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.2d3aa7ebb3e98370170e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2d3aa7ebb3e98370170e.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.68d0deb02b1f02c1756f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.68d0deb02b1f02c1756f.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.37c22e96dd487db73208.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.37c22e96dd487db73208.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.94af827cd8ac2033a0bd.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.94af827cd8ac2033a0bd.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.afd7be1534bbba90e79c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.afd7be1534bbba90e79c.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.05f777c9acb3b687dbf5.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.05f777c9acb3b687dbf5.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.14072b4dfd9a1cf501aa.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.14072b4dfd9a1cf501aa.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.10ed3865b98f413630a7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.10ed3865b98f413630a7.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.085ac5d8cd57734e0874.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.085ac5d8cd57734e0874.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.52e3dff8ba8eb85c964c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.52e3dff8ba8eb85c964c.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.602c5bbdc1a8f0811b49.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.602c5bbdc1a8f0811b49.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.5df3e830d624e62bd3eb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5df3e830d624e62bd3eb.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.bab90de94c3eab91e030.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.bab90de94c3eab91e030.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.5bec5c2d3e28d579ac13.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5bec5c2d3e28d579ac13.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.6816ff38859bf046c26c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6816ff38859bf046c26c.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.873f61d420404fcce752.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.873f61d420404fcce752.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.e6fc1a20422968684e38.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e6fc1a20422968684e38.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.cfc23676410070c8bebe.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.cfc23676410070c8bebe.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.a748e0639f004dadb156.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a748e0639f004dadb156.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.8288a322376ee286fb05.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8288a322376ee286fb05.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.d92c99106dc581af6fd4.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d92c99106dc581af6fd4.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.f6b976e57b3181c7fda6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f6b976e57b3181c7fda6.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.d9f71b155fd7b420cf11.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d9f71b155fd7b420cf11.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.85812e4b93ae0b8e825f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.85812e4b93ae0b8e825f.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.950c164fe8486785bb5c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.950c164fe8486785bb5c.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.c1c8cbf4e927b258bfcb.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c1c8cbf4e927b258bfcb.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.6ef3d9330d639c6ad431.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6ef3d9330d639c6ad431.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.0de926c8951f7889cd03.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0de926c8951f7889cd03.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.9e9e2ac0b0f73a9f5e00.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9e9e2ac0b0f73a9f5e00.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.5ce64c809a357f55f185.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5ce64c809a357f55f185.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.892eb2235e7e28854d1c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.892eb2235e7e28854d1c.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.5b38ee4b84b522d39640.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.5b38ee4b84b522d39640.hot-update.js",
-    "/js/main.b37197fd10955aff7f84.hot-update.js": "/js/main.b37197fd10955aff7f84.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.dc92eff4b7872758aaed.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.dc92eff4b7872758aaed.hot-update.js",
-    "/js/main.355f7460026ad998445c.hot-update.js": "/js/main.355f7460026ad998445c.hot-update.js",
-    "/js/main.63a6a80ed5c86dc9456b.hot-update.js": "/js/main.63a6a80ed5c86dc9456b.hot-update.js",
-    "/js/main.36c10f2c2f6871a56c4b.hot-update.js": "/js/main.36c10f2c2f6871a56c4b.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.7f30327f2abec0ef296d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7f30327f2abec0ef296d.hot-update.js",
-    "/js/main.b3a819d03a65b6f95ced.hot-update.js": "/js/main.b3a819d03a65b6f95ced.hot-update.js",
-    "/js/main.05e5646f09de4bd2ebe2.hot-update.js": "/js/main.05e5646f09de4bd2ebe2.hot-update.js",
-    "/js/main.5fc399ff7f798870206e.hot-update.js": "/js/main.5fc399ff7f798870206e.hot-update.js",
-    "/js/main.25c9f8b5d972b3cf0229.hot-update.js": "/js/main.25c9f8b5d972b3cf0229.hot-update.js",
-    "/js/main.a65e821d71ee02ebb2a8.hot-update.js": "/js/main.a65e821d71ee02ebb2a8.hot-update.js",
-    "/js/main.294d743034735bc7990f.hot-update.js": "/js/main.294d743034735bc7990f.hot-update.js",
-    "/js/main.d42bb2212a05765aee0f.hot-update.js": "/js/main.d42bb2212a05765aee0f.hot-update.js",
-    "/js/main.e90bf528066db0ca7d5a.hot-update.js": "/js/main.e90bf528066db0ca7d5a.hot-update.js",
-    "/js/main.07f659cdd57620e3776e.hot-update.js": "/js/main.07f659cdd57620e3776e.hot-update.js",
-    "/js/main.b955da5b051e7d76a711.hot-update.js": "/js/main.b955da5b051e7d76a711.hot-update.js",
-    "/js/main.d873f5043afc36073635.hot-update.js": "/js/main.d873f5043afc36073635.hot-update.js",
-    "/js/main.3a573a79b1f785118414.hot-update.js": "/js/main.3a573a79b1f785118414.hot-update.js",
-    "/js/main.e473b8f1cd607ca82f86.hot-update.js": "/js/main.e473b8f1cd607ca82f86.hot-update.js",
-    "/js/main.12e94a89a6aef8b987ad.hot-update.js": "/js/main.12e94a89a6aef8b987ad.hot-update.js",
-    "/js/main.a6f6fbe9808f9b579e0a.hot-update.js": "/js/main.a6f6fbe9808f9b579e0a.hot-update.js",
-    "/js/main.d4a8de3d2b31a33d2fe4.hot-update.js": "/js/main.d4a8de3d2b31a33d2fe4.hot-update.js",
-    "/js/main.5cf4f878073ae16fb9bc.hot-update.js": "/js/main.5cf4f878073ae16fb9bc.hot-update.js",
-    "/js/main.3a21b7442086e1fa731a.hot-update.js": "/js/main.3a21b7442086e1fa731a.hot-update.js",
-    "/js/main.511b1674a391251ddb05.hot-update.js": "/js/main.511b1674a391251ddb05.hot-update.js",
-    "/js/main.1c2038fbb962ab1fe336.hot-update.js": "/js/main.1c2038fbb962ab1fe336.hot-update.js",
-    "/js/main.71a6159109492d678336.hot-update.js": "/js/main.71a6159109492d678336.hot-update.js",
-    "/js/main.7eb82b1e65a1aec227e8.hot-update.js": "/js/main.7eb82b1e65a1aec227e8.hot-update.js",
-    "/js/main.caa278e3024b8c8bc420.hot-update.js": "/js/main.caa278e3024b8c8bc420.hot-update.js",
-    "/js/main.cf94a347ab18c5e6fecc.hot-update.js": "/js/main.cf94a347ab18c5e6fecc.hot-update.js",
-    "/js/main.57af83211f9907f6d6af.hot-update.js": "/js/main.57af83211f9907f6d6af.hot-update.js",
-    "/js/main.fc5f03917939f1f9fbbe.hot-update.js": "/js/main.fc5f03917939f1f9fbbe.hot-update.js",
-    "/js/main.125b507542c6bc70c889.hot-update.js": "/js/main.125b507542c6bc70c889.hot-update.js",
-    "/js/main.cfdd8278cecec03cb3ae.hot-update.js": "/js/main.cfdd8278cecec03cb3ae.hot-update.js",
-    "/js/main.ecb6b6d35aa54b42f2b7.hot-update.js": "/js/main.ecb6b6d35aa54b42f2b7.hot-update.js",
-    "/js/main.45ef69696396043fb929.hot-update.js": "/js/main.45ef69696396043fb929.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.3afbbf3ea2d1258b9649.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3afbbf3ea2d1258b9649.hot-update.js"
+    "/chunks/files~chunks/shared-files~chunks/shared-page.21596ac653625c53ad23.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.21596ac653625c53ad23.hot-update.js",
+    "/js/main.b07a2dc4ba5ddd6ae8df.hot-update.js": "/js/main.b07a2dc4ba5ddd6ae8df.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.2ffaaa3c673654bfb9e6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2ffaaa3c673654bfb9e6.hot-update.js",
+    "/js/main.eec03a5d344758619370.hot-update.js": "/js/main.eec03a5d344758619370.hot-update.js",
+    "/js/main.00e4e4612c7fac79ad93.hot-update.js": "/js/main.00e4e4612c7fac79ad93.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.2d01e46c2fe3686f802f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2d01e46c2fe3686f802f.hot-update.js",
+    "/js/main.90ab9481b2b91597c075.hot-update.js": "/js/main.90ab9481b2b91597c075.hot-update.js",
+    "/js/main.389208e28bf4c09cdc54.hot-update.js": "/js/main.389208e28bf4c09cdc54.hot-update.js",
+    "/js/main.656865c343269700dabf.hot-update.js": "/js/main.656865c343269700dabf.hot-update.js",
+    "/js/main.d0e2cf07267ffad35cfc.hot-update.js": "/js/main.d0e2cf07267ffad35cfc.hot-update.js",
+    "/js/main.743a8cdaf7a7c66e4515.hot-update.js": "/js/main.743a8cdaf7a7c66e4515.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.743a8cdaf7a7c66e4515.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.743a8cdaf7a7c66e4515.hot-update.js",
+    "/js/main.b0f0ca037a7ab4718dc8.hot-update.js": "/js/main.b0f0ca037a7ab4718dc8.hot-update.js",
+    "/js/main.45a557c01f9ece5f582b.hot-update.js": "/js/main.45a557c01f9ece5f582b.hot-update.js",
+    "/js/main.8cc9b19f20a558a3e8fa.hot-update.js": "/js/main.8cc9b19f20a558a3e8fa.hot-update.js",
+    "/js/main.8e3cf4b773061ae97d39.hot-update.js": "/js/main.8e3cf4b773061ae97d39.hot-update.js",
+    "/js/main.f0a945ede041681263f1.hot-update.js": "/js/main.f0a945ede041681263f1.hot-update.js",
+    "/js/main.c71e7975be557973766f.hot-update.js": "/js/main.c71e7975be557973766f.hot-update.js",
+    "/js/main.33e6b8ab24ef49496ec3.hot-update.js": "/js/main.33e6b8ab24ef49496ec3.hot-update.js",
+    "/js/main.cf7e3825116f1410c2f9.hot-update.js": "/js/main.cf7e3825116f1410c2f9.hot-update.js",
+    "/js/main.a69a160913611ae57da4.hot-update.js": "/js/main.a69a160913611ae57da4.hot-update.js",
+    "/js/main.88776cf5e677d2ce3635.hot-update.js": "/js/main.88776cf5e677d2ce3635.hot-update.js",
+    "/js/main.b955b0416797a3380d54.hot-update.js": "/js/main.b955b0416797a3380d54.hot-update.js",
+    "/js/main.a921dfb8a755fd8a6e29.hot-update.js": "/js/main.a921dfb8a755fd8a6e29.hot-update.js",
+    "/js/main.5a050d90cb312b4c8da8.hot-update.js": "/js/main.5a050d90cb312b4c8da8.hot-update.js",
+    "/js/main.0bdf4fbb91e6f1b6d993.hot-update.js": "/js/main.0bdf4fbb91e6f1b6d993.hot-update.js",
+    "/js/main.5bd6c93294999209ff1a.hot-update.js": "/js/main.5bd6c93294999209ff1a.hot-update.js",
+    "/js/main.01020a080137378144eb.hot-update.js": "/js/main.01020a080137378144eb.hot-update.js",
+    "/js/main.32c6a8f4be08c83a6898.hot-update.js": "/js/main.32c6a8f4be08c83a6898.hot-update.js",
+    "/js/main.e10014a04e58db91d075.hot-update.js": "/js/main.e10014a04e58db91d075.hot-update.js",
+    "/js/main.d906aa3d53429ce1da68.hot-update.js": "/js/main.d906aa3d53429ce1da68.hot-update.js",
+    "/js/main.be1f5635fa922d840783.hot-update.js": "/js/main.be1f5635fa922d840783.hot-update.js",
+    "/js/main.7ecd64cf37a2d973bc2d.hot-update.js": "/js/main.7ecd64cf37a2d973bc2d.hot-update.js",
+    "/js/main.20c6196ab327f183d544.hot-update.js": "/js/main.20c6196ab327f183d544.hot-update.js",
+    "/js/main.6bf1577af8b37620d3bf.hot-update.js": "/js/main.6bf1577af8b37620d3bf.hot-update.js",
+    "/js/main.868a62150e5434f91084.hot-update.js": "/js/main.868a62150e5434f91084.hot-update.js",
+    "/js/main.38515a75ca60a50d4864.hot-update.js": "/js/main.38515a75ca60a50d4864.hot-update.js",
+    "/js/main.e9faffb8b27a21c21c14.hot-update.js": "/js/main.e9faffb8b27a21c21c14.hot-update.js",
+    "/js/main.718c5ddfc4ff946da3ec.hot-update.js": "/js/main.718c5ddfc4ff946da3ec.hot-update.js",
+    "/js/main.91a44d1c2a9dfc30b367.hot-update.js": "/js/main.91a44d1c2a9dfc30b367.hot-update.js",
+    "/js/main.572d7f72d55d5a392715.hot-update.js": "/js/main.572d7f72d55d5a392715.hot-update.js",
+    "/js/main.4e46642c3f70a59521a2.hot-update.js": "/js/main.4e46642c3f70a59521a2.hot-update.js",
+    "/js/main.73feba56670e33d591ec.hot-update.js": "/js/main.73feba56670e33d591ec.hot-update.js",
+    "/js/main.ea5ff9b1d47e701e950e.hot-update.js": "/js/main.ea5ff9b1d47e701e950e.hot-update.js",
+    "/js/main.b58a8058a2f70a3c600b.hot-update.js": "/js/main.b58a8058a2f70a3c600b.hot-update.js",
+    "/js/main.13c98b8676aff2108a98.hot-update.js": "/js/main.13c98b8676aff2108a98.hot-update.js",
+    "/js/main.5f712998cb16baa63f7d.hot-update.js": "/js/main.5f712998cb16baa63f7d.hot-update.js",
+    "/js/main.749397f6dbfa957d3973.hot-update.js": "/js/main.749397f6dbfa957d3973.hot-update.js",
+    "/js/main.2398919ed5d91b81ac38.hot-update.js": "/js/main.2398919ed5d91b81ac38.hot-update.js",
+    "/js/main.71bdefb2b0bff99b0e3c.hot-update.js": "/js/main.71bdefb2b0bff99b0e3c.hot-update.js",
+    "/js/main.bb658aab751f90185e1a.hot-update.js": "/js/main.bb658aab751f90185e1a.hot-update.js",
+    "/js/main.8cae8a32defa01a0bd60.hot-update.js": "/js/main.8cae8a32defa01a0bd60.hot-update.js",
+    "/js/main.41e8e59c014d804db68c.hot-update.js": "/js/main.41e8e59c014d804db68c.hot-update.js",
+    "/js/main.7af795837161a68e9043.hot-update.js": "/js/main.7af795837161a68e9043.hot-update.js",
+    "/js/main.37f9308a4a85156219ce.hot-update.js": "/js/main.37f9308a4a85156219ce.hot-update.js",
+    "/js/main.9c7bb5439fccd809a3b5.hot-update.js": "/js/main.9c7bb5439fccd809a3b5.hot-update.js",
+    "/js/main.3b165bd752e10b3b4b8e.hot-update.js": "/js/main.3b165bd752e10b3b4b8e.hot-update.js",
+    "/js/main.047ed8cdb917cd0b23ed.hot-update.js": "/js/main.047ed8cdb917cd0b23ed.hot-update.js",
+    "/js/main.55e954110735add5f219.hot-update.js": "/js/main.55e954110735add5f219.hot-update.js",
+    "/js/main.bf69279f4bf272330a16.hot-update.js": "/js/main.bf69279f4bf272330a16.hot-update.js",
+    "/js/main.16e511166c5cf92869c3.hot-update.js": "/js/main.16e511166c5cf92869c3.hot-update.js",
+    "/js/main.1d44b164f0f366a0a67f.hot-update.js": "/js/main.1d44b164f0f366a0a67f.hot-update.js",
+    "/js/main.f01ea7ae675174c853a0.hot-update.js": "/js/main.f01ea7ae675174c853a0.hot-update.js",
+    "/js/main.19c67bb1e23b39f3e54a.hot-update.js": "/js/main.19c67bb1e23b39f3e54a.hot-update.js",
+    "/js/main.9cf915d8ec759a0dcbef.hot-update.js": "/js/main.9cf915d8ec759a0dcbef.hot-update.js",
+    "/js/main.d0d8d502b461a8771390.hot-update.js": "/js/main.d0d8d502b461a8771390.hot-update.js",
+    "/js/main.6ee30daeb1dced66463c.hot-update.js": "/js/main.6ee30daeb1dced66463c.hot-update.js",
+    "/js/main.3814b33b0e21c17cc0ff.hot-update.js": "/js/main.3814b33b0e21c17cc0ff.hot-update.js",
+    "/js/main.a7218b5f56bf8cd75f83.hot-update.js": "/js/main.a7218b5f56bf8cd75f83.hot-update.js",
+    "/js/main.e159d14089070a0412e1.hot-update.js": "/js/main.e159d14089070a0412e1.hot-update.js",
+    "/js/main.7705eb891272f8dbb31e.hot-update.js": "/js/main.7705eb891272f8dbb31e.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/DesktopToolbar.vue b/resources/js/components/FilesView/DesktopToolbar.vue
index 9d9ac3d2..61fcf0fd 100644
--- a/resources/js/components/FilesView/DesktopToolbar.vue
+++ b/resources/js/components/FilesView/DesktopToolbar.vue
@@ -112,7 +112,7 @@ export default {
                 'shared',
                 'public'
             ]
-            return !this.$isThisLocation(locations) || this.fileInfoDetail.length === 0 
+            return !this.$isThisLocation(locations) || this.fileInfoDetail.length === 0
         },
         canUploadInView() {
             return !this.$isThisLocation(['base', 'public'])
@@ -125,7 +125,7 @@ export default {
                 'shared',
                 'public'
             ]
-            return !this.$isThisLocation(locations) || this.fileInfoDetail.length === 0 
+            return !this.$isThisLocation(locations) || this.fileInfoDetail.length === 0
 
         },
         canShareInView() {
@@ -137,7 +137,7 @@ export default {
                 'public'
             ]
 
-            return !this.$isThisLocation(locations) || this.fileInfoDetail.length > 1 || this.fileInfoDetail.length === 0 
+            return !this.$isThisLocation(locations) || this.fileInfoDetail.length > 1 || this.fileInfoDetail.length === 0
         }
     },
     data() {
@@ -183,14 +183,14 @@ export default {
             events.$emit('folder:actions', this.currentFolder)
         },
         deleteItem() {
-            if(this.fileInfoDetail.length > 0)
+            if (this.fileInfoDetail.length > 0)
                 this.$store.dispatch('deleteItem')
         },
         createFolder() {
             this.$store.dispatch('createFolder', this.$t('popup_create_folder.folder_default_name'))
         },
         moveItem() {
-            if(this.fileInfoDetail.length > 0)
+            if (this.fileInfoDetail.length > 0)
                 events.$emit('popup:open', { name: 'move', item: this.fileInfoDetail })
         },
         shareItem() {
@@ -215,9 +215,9 @@ export default {
         //     this.sortingAndPreview = state
         // })
 
-         events.$on('unClick', () => {
-                this.sortingAndPreview = false
-            })
+        events.$on('unClick', () => {
+            this.sortingAndPreview = false
+        })
     }
 }
 </script>
@@ -225,15 +225,18 @@ export default {
 <style scoped lang="scss">
 @import "@assets/vue-file-manager/_variables";
 @import "@assets/vue-file-manager/_mixins";
-.preview-sorting { 
+
+.preview-sorting {
     /deep/ .label {
         color: $text !important;
     }
+
     /deep/ .preview-sorting {
-            path, line, polyline, rect, circle {
-                stroke: $text !important;
-            }
+        path, line, polyline, rect, circle {
+            stroke: $text !important;
+        }
     }
+
     &:hover {
         /deep/ .preview-sorting {
             path, line, polyline, rect, circle {
@@ -358,6 +361,7 @@ export default {
 
             &.preview-sorting {
                 background: $light_background;
+
                 /deep/ .preview-sorting {
                     path, line, polyline, rect, circle {
                         stroke: $theme !important;
@@ -423,14 +427,15 @@ export default {
             background: $dark_mode_foreground !important;
         }
     }
-    .preview-sorting { 
+    .preview-sorting {
         /deep/ .label {
             color: $text !important;
         }
+
         /deep/ .preview-sorting {
-                path, line, polyline, rect, circle {
-                    stroke: $dark_mode_text_primary !important;
-                }
+            path, line, polyline, rect, circle {
+                stroke: $dark_mode_text_primary !important;
+            }
         }
     }
 }
diff --git a/resources/js/components/FilesView/FileBrowser.vue b/resources/js/components/FilesView/FileBrowser.vue
index 9fd86232..7ce003cf 100644
--- a/resources/js/components/FilesView/FileBrowser.vue
+++ b/resources/js/components/FilesView/FileBrowser.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="file-content" id="file-content-id" :class="{ 'is-offset': uploadingFilesCount, 'is-dragging': isDragging }"
+    <div class="file-content" id="file-content-id" :class="{ 'is-offset': filesQueue > 0, 'is-dragging': isDragging }"
          @dragover.prevent
          @drop.stop.prevent="dropUpload($event)"
          @dragover="dragEnter"
@@ -119,7 +119,7 @@
         },
         computed: {
             ...mapGetters([
-                'uploadingFilesCount',
+                'filesQueue',
                 'fileInfoVisible',
                 'fileInfoDetail',
                 'currentFolder',
diff --git a/resources/js/components/FilesView/UploadProgress.vue b/resources/js/components/FilesView/UploadProgress.vue
index 6d7367d4..0c92f783 100644
--- a/resources/js/components/FilesView/UploadProgress.vue
+++ b/resources/js/components/FilesView/UploadProgress.vue
@@ -1,6 +1,7 @@
 <template>
     <transition name="info-panel">
-        <div v-if="filesQueue.length > 0" class="upload-progress">
+        <!--<div v-if="filesQueue.length > 0" class="upload-progress">-->
+        <div class="upload-progress">
             <div class="progress-title">
 
                 <!--Is processing-->
@@ -11,16 +12,16 @@
 
                 <!--Single file upload-->
 				<span v-if="!isProcessingFile && filesQueue.length === 1">
-                    {{ $t('uploading.progress_single_upload', {progress: 80}) }}
+                    {{ $t('uploading.progress_single_upload', {progress: uploadingProgress}) }}
                 </span>
 
                 <!--Multi file upload-->
 				<span v-if="!isProcessingFile && filesQueue.length > 1">
-                    {{ $t('uploading.progress', {current:'x', total: filesQueue.length, progress: 80}) }}
+                    {{ $t('uploading.progress', {current:'x', total: filesQueue.length, progress: uploadingProgress}) }}
                 </span>
             </div>
             <div class="progress-wrapper">
-                <ProgressBar :progress="80" />
+                <ProgressBar :progress="uploadingProgress" />
                 <span @click="cancelUpload" :title="$t('uploading.cancel')" class="cancel-icon">
                     <x-icon size="16" @click="cancelUpload"></x-icon>
                 </span>
@@ -44,6 +45,7 @@
         },
         computed: {
             ...mapGetters([
+                'uploadingProgress',
                 'isProcessingFile',
                 'filesQueue',
             ])
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 02a44d5c..2918e6a5 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -76,103 +76,6 @@ const Helpers = {
             this.$store.dispatch('createFolder', folderName)
         }
 
-        Vue.prototype.$handleUploading = async function () {
-
-        	//let files = this.$store.getters.filesQueue
-            let fileBuffer = []
-
-            // Append the file list to fileBuffer array
-            Array.prototype.push.apply(fileBuffer, this.$store.getters.filesQueue);
-
-            let fileSucceed = 0
-
-            // Update files count in progressbar
-            store.commit('UPDATE_FILE_COUNT_PROGRESS', {
-                current: fileSucceed,
-                total: this.$store.getters.filesQueue.length
-            })
-
-            // Reset upload progress to 0
-            store.commit('UPLOADING_FILE_PROGRESS', 0)
-
-            // Get parent id
-            let parentFolder = this.$store.getters.currentFolder ? this.$store.getters.currentFolder.unique_id : 0
-
-            // Upload files
-            do {
-                let onQueue = fileBuffer.shift(),
-                    chunks = []
-
-                // Calculate ceils
-                let size = this.$store.getters.config.chunkSize,
-                    chunksCeil = Math.ceil(onQueue.file.size / size);
-
-                // Create chunks
-                for (let i = 0; i < chunksCeil; i++) {
-                    chunks.push(onQueue.file.slice(
-                        i * size, Math.min(i * size + size, onQueue.file.size), onQueue.file.type
-                    ));
-                }
-
-                // Set Data
-                let formData = new FormData(),
-                    uploadedSize = 0,
-                    isNotGeneralError = true,
-                    striped_name = onQueue.file.name.replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
-                    filename = Array(16).fill(0).map(x => Math.random().toString(36).charAt(2)).join('') + '-' + striped_name + '.part'
-
-                do {
-                    let isLast = chunks.length === 1,
-                        chunk = chunks.shift(),
-                        attempts = 0
-
-                    // Set form data
-                    formData.set('file', chunk, filename);
-                    formData.set('parent_id', onQueue.parent_id)
-                    formData.set('is_last', isLast);
-
-                    // Upload chunks
-                    do {
-                        await store.dispatch('uploadFiles', {
-                            form: formData,
-                            fileSize: onQueue.file.size,
-                            totalUploadedSize: uploadedSize
-                        }).then(() => {
-                            uploadedSize = uploadedSize + chunk.size
-                        }).catch((error) => {
-
-                            // Count attempts
-                            attempts++
-
-                            // Break uploading proccess
-                            if (error.response.status === 500)
-                                isNotGeneralError = false
-
-                            //Break if mimetype of file is in blacklist
-                            if(error.response.status === 415)
-                                isNotGeneralError = false
-
-                            // Show Error
-                            if (attempts === 3)
-                                this.$isSomethingWrong()
-                        })
-                    } while (isNotGeneralError && attempts !== 0 && attempts !== 3)
-
-                } while (isNotGeneralError && chunks.length !== 0)
-
-                fileSucceed++
-
-                // Progress file log
-                store.commit('UPDATE_FILE_COUNT_PROGRESS', {
-                    current: fileSucceed,
-                    total: this.$store.getters.filesQueue.length
-                })
-
-            } while (fileBuffer.length !== 0)
-
-            store.commit('UPDATE_FILE_COUNT_PROGRESS', undefined)
-        }
-
         Vue.prototype.$uploadFiles = async function (files) {
 
             if (files.length == 0) return
@@ -185,7 +88,7 @@ const Helpers = {
         Vue.prototype.$uploadExternalFiles = async function (event, parent_id) {
 
             // Prevent submit empty files
-            if (event.dataTransfer.items.length == 0) return
+            if (event.dataTransfer.items.length === 0) return
 
             // Push files to queue
             [...event.dataTransfer.items].map(item => {
@@ -195,11 +98,70 @@ const Helpers = {
 				})
 			});
 
-            if (! this.$store.getters.uploadingFilesCount) {
-				this.$handleUploading()
+            if (! this.$store.getters.uploadingProgress > 0) {
+				this.$handleUploading(
+					this.$store.getters.filesQueue.shift()
+				)
 			}
         }
 
+		Vue.prototype.$handleUploading = async function (item) {
+
+			// Create ceil
+			let size = 128000000, // todo: chunksize doriesit
+				chunksCeil = Math.ceil(item.file.size / size),
+				chunks = []
+
+			// Create chunks
+			for (let i = 0; i < chunksCeil; i++) {
+				chunks.push(item.file.slice(
+					i * size, Math.min(i * size + size, item.file.size), item.file.type
+				));
+			}
+
+			// Set Data
+			let formData = new FormData(),
+				uploadedSize = 0,
+				isNotGeneralError = true,
+				striped_name = item.file.name.replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
+				filename = Array(16).fill(0).map(x => Math.random().toString(36).charAt(2)).join('') + '-' + striped_name + '.part'
+
+			do {
+				let isLast = chunks.length === 1,
+					chunk = chunks.shift(),
+					attempts = 0
+
+				// Set form data
+				formData.set('file', chunk, filename);
+				formData.set('parent_id', item.parent_id)
+				formData.set('is_last', isLast);
+
+				// Upload chunks
+				do {
+					await store.dispatch('uploadFiles', {
+						form: formData,
+						fileSize: item.file.size,
+						totalUploadedSize: uploadedSize
+					}).then(() => {
+						uploadedSize = uploadedSize + chunk.size
+					}).catch((error) => {
+
+						// Count attempts
+						attempts++
+
+						// Show Error
+						if (attempts === 3)
+							this.$isSomethingWrong()
+
+						// Break uploading process
+						if ([500, 415].includes(error.response.status))
+							isNotGeneralError = false
+					})
+				} while (isNotGeneralError && attempts !== 0 && attempts !== 3)
+
+			} while (isNotGeneralError && chunks.length !== 0)
+		}
+
         Vue.prototype.$downloadFile = function (url, filename) {
             var anchor = document.createElement('a')
 
@@ -288,6 +250,7 @@ const Helpers = {
 				message: i18n.t('popup_error.message')
 			})
 		}
+
 		Vue.prototype.$checkFileMimetype = function(files) {
 			let validated = true
 			let mimetypesBlacklist = store.getters.config.mimetypesBlacklist
@@ -352,6 +315,7 @@ const Helpers = {
 			// Get data of Navigator tree
 			this.$store.dispatch('getFolderTree')
 		}
+
 		Vue.prototype.$checkOS = function() {
 			// Handle styled scrollbar for Windows
 			if (navigator.userAgent.indexOf('Windows') != -1) {
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index 35af192d..5a9d773f 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -5,11 +5,8 @@ import router from '@/router'
 import i18n from '@/i18n/index'
 
 const defaultState = {
-    uploadingFilesCount: undefined,
     fileInfoDetail: [],
     currentFolder: undefined,
-    uploadingFileProgress: 0,
-    isProcessingFile: false,
     navigation: undefined,
     isSearching: false,
     browseHistory: [],
@@ -264,12 +261,6 @@ const mutations = {
     CHANGE_SEARCHING_STATE(state, searchState) {
         state.isSearching = searchState
     },
-    UPLOADING_FILE_PROGRESS(state, percentage) {
-        state.uploadingFileProgress = percentage
-    },
-    UPDATE_FILE_COUNT_PROGRESS(state, data) {
-        state.uploadingFilesCount = data
-    },
     UPDATE_SHARED_ITEM(state, data) {
         state.data.find(item => {
             if (item.unique_id == data.item_id) item.shared = data
@@ -292,15 +283,9 @@ const mutations = {
     STORE_CURRENT_FOLDER(state, folder) {
         state.currentFolder = folder
     },
-    PROCESSING_FILE(state, status) {
-        state.isProcessingFile = status
-    }
 }
 
 const getters = {
-    uploadingFileProgress: state => state.uploadingFileProgress,
-    uploadingFilesCount: state => state.uploadingFilesCount,
-    isProcessingFile: state => state.isProcessingFile,
     fileInfoDetail: state => state.fileInfoDetail,
     currentFolder: state => state.currentFolder,
     browseHistory: state => state.browseHistory,
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index d52221e3..efbb8af2 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -4,18 +4,22 @@ import { events } from '@/bus'
 import { last } from 'lodash'
 import axios from 'axios'
 import Vue from 'vue'
+import store from '../index'
 
 const defaultState = {
 	processingPopup: undefined,
 	filesQueue: [],
+
+	isProcessingFile: false,
+	uploadingProgress: 0
 }
 
 const actions = {
-	downloadFolder: ({commit, getters}, folder) => {
+	downloadFolder: ({ commit, getters }, folder) => {
 
 		commit('PROCESSING_POPUP', {
 			title: i18n.t('popup_zipping.title'),
-			message: i18n.t('popup_zipping.message'),
+			message: i18n.t('popup_zipping.message')
 		})
 
 		// Get route
@@ -24,15 +28,15 @@ const actions = {
 			: '/api/zip-folder/' + folder.unique_id
 
 		axios.get(route)
-		.then(response => {
-			Vue.prototype.$downloadFile(response.data.url, response.data.name)
-		})
-		.catch(() => {
-			Vue.prototype.$isSomethingWrong()
-		})
-		.finally(() => {
-			commit('PROCESSING_POPUP', undefined)
-		})
+			.then(response => {
+				Vue.prototype.$downloadFile(response.data.url, response.data.name)
+			})
+			.catch(() => {
+				Vue.prototype.$isSomethingWrong()
+			})
+			.finally(() => {
+				commit('PROCESSING_POPUP', undefined)
+			})
 
 	},
 	downloadFiles: ({ commit, getters }) => {
@@ -124,7 +128,7 @@ const actions = {
 				//Set focus on new folder name
 				setTimeout(() => {
 					events.$emit('newFolder:focus', response.data.unique_id)
-				}, 10);
+				}, 10)
 
 				if (getters.currentFolder.location !== 'public')
 					dispatch('getAppData')
@@ -170,9 +174,9 @@ const actions = {
 				? '/api/upload/public/' + router.currentRoute.params.token
 				: '/api/upload'
 
-			// Create cancel token for axios cancelation
-			const CancelToken = axios.CancelToken
-			const source = CancelToken.source()
+			// Create cancel token for axios cancellation
+			const CancelToken = axios.CancelToken,
+				source = CancelToken.source()
 
 			axios
 				.post(route, form, {
@@ -181,63 +185,63 @@ const actions = {
 						'Content-Type': 'application/octet-stream'
 					},
 					onUploadProgress: event => {
-
 						var percentCompleted = Math.floor(((totalUploadedSize + event.loaded) / fileSize) * 100)
 
 						commit('UPLOADING_FILE_PROGRESS', percentCompleted >= 100 ? 100 : percentCompleted)
 
-						if (percentCompleted >= 100) {
+						// Set processing file
+						if (percentCompleted >= 100)
 							commit('PROCESSING_FILE', true)
-						}
 					}
 				})
 				.then(response => {
+					resolve(response)
+
 					commit('PROCESSING_FILE', false)
 
 					// Check if user is in uploading folder, if yes, than show new file
-					if (response.data.folder_id == getters.currentFolder.unique_id)
+					if (response.data.folder_id == getters.currentFolder.unique_id) {
+
+						// Add uploaded item into view
 						commit('ADD_NEW_ITEMS', response.data)
 
-					// TODO: handle new uploads if exist
-
-					resolve(response)
-				})
-				.catch(error => {
-					commit('PROCESSING_FILE', false)
-
-					reject(error)
-
-					switch (error.response.status) {
-						case 423:
-							events.$emit('alert:open', {
-								emoji: '😬😬😬',
-								title: i18n.t('popup_exceed_limit.title'),
-								message: i18n.t('popup_exceed_limit.message')
-							})
-							break
-						case 415:
-							events.$emit('alert:open', {
-								emoji: '😬😬😬',
-								title: i18n.t('popup_mimetypes_blacklist.title'),
-								message: i18n.t('popup_mimetypes_blacklist.message')
-							})
-							break
-						case 413:
-							events.$emit('alert:open', {
-								emoji: '😟😟😟',
-								title: i18n.t('popup_paylod_error.title'),
-								message: i18n.t('popup_paylod_error.message')
-							})
-							break
-						default:
-							events.$emit('alert:open', {
-								title: i18n.t('popup_error.title'),
-								message: i18n.t('popup_error.message')
-							})
-							break
+						// Reset file progress
+						commit('UPLOADING_FILE_PROGRESS', 0)
 					}
 
-					// Reset uploader
+					// TODO: handle new uploads if exist
+					if (getters.filesQueue.length > 0) {
+						Vue.prototype.$handleUploading(getters.filesQueue[0])
+						commit('SHIFT_FILE_FROM_QUEUE')
+						// todo: doriesit uploading ffile statistiky na frontende
+					}
+
+				})
+				.catch(error => {
+					reject(error)
+
+					let messages = {
+						'423': {
+							title: i18n.t('popup_exceed_limit.title'),
+							message: i18n.t('popup_exceed_limit.message')
+						},
+						'415': {
+							title: i18n.t('popup_mimetypes_blacklist.title'),
+							message: i18n.t('popup_mimetypes_blacklist.message')
+						},
+						'413': {
+							title: i18n.t('popup_paylod_error.title'),
+							message: i18n.t('popup_paylod_error.message')
+						}
+					}
+
+					events.$emit('alert:open', {
+						emoji: '😬😬😬',
+						title: messages[error.response.status]['title'],
+						message: messages[error.response.status]['message']
+					})
+
+					commit('PROCESSING_FILE', false)
 					commit('UPDATE_FILE_COUNT_PROGRESS', undefined)
 				})
 
@@ -260,28 +264,27 @@ const actions = {
 		// If coming no selected item dont get items to restore from fileInfoDetail
 		if (!item)
 			items = getters.fileInfoDetail
-	
+
 		// Check if file can be restored to home directory
 		if (getters.currentFolder.location === 'trash')
 			restoreToHome = true
 
 		items.forEach(data => itemToRestore.push({
 			'type': data.type,
-			'unique_id': data.unique_id,
+			'unique_id': data.unique_id
 		}))
 
 		// Remove file preview
 		commit('CLEAR_FILEINFO_DETAIL')
 
 		axios
-			.post(getters.api + '/restore-items' ,{
+			.post(getters.api + '/restore-items', {
 				to_home: restoreToHome,
-				data: itemToRestore,
+				data: itemToRestore
 			})
 			.then(
-
 				// Remove file
-				items.forEach( data => commit('REMOVE_ITEM', data.unique_id) )
+				items.forEach(data => commit('REMOVE_ITEM', data.unique_id))
 			)
 			.catch(() => Vue.prototype.$isSomethingWrong())
 	},
@@ -390,12 +393,23 @@ const mutations = {
 	},
 	ADD_FILES_TO_QUEUE(state, file) {
 		state.filesQueue.push(file)
+	},
+	SHIFT_FILE_FROM_QUEUE(state) {
+		state.filesQueue.shift()
+	},
+	PROCESSING_FILE(state, status) {
+		state.isProcessingFile = status
+	},
+	UPLOADING_FILE_PROGRESS(state, percentage) {
+		state.uploadingProgress = percentage
 	}
 }
 
 const getters = {
+	uploadingProgress: state => state.uploadingProgress,
+	isProcessingFile: state => state.isProcessingFile,
 	processingPopup: state => state.processingPopup,
-	filesQueue: state => state.filesQueue,
+	filesQueue: state => state.filesQueue
 }
 
 export default {

From 56b7f30d472d26d64216c5d7984390322be59506 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Thu, 25 Feb 2021 15:22:16 +0100
Subject: [PATCH 3/3] - uploading fix

---
 public/mix-manifest.json                      | 137 +++++++++---------
 resources/js/App.vue                          |   7 +-
 .../js/components/FilesView/FileBrowser.vue   |   4 +-
 .../components/FilesView/UploadProgress.vue   |  16 +-
 resources/js/helpers.js                       |  34 +++--
 resources/js/store/modules/fileFunctions.js   |  47 ++++--
 6 files changed, 133 insertions(+), 112 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 70a3c09c..005b7f40 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -29,7 +29,7 @@
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=374911110bca4e1b3f91",
     "/chunks/files.js": "/chunks/files.js?id=d47d2964ef535ad5754c",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=e285e842f58178d681c4",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=637281f8b08d57c4fb47",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=cad83f4858c7bd58947f",
     "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=539a5b88c5f32511449e",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=f430110273d76b28906f",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=94c75dac20c4ccf7bde0",
@@ -75,75 +75,68 @@
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=2c5f4cdd17574255ea05",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=d6683735de17fd8c55c8",
     "/chunks/users.js": "/chunks/users.js?id=f2359ae7c0c166001c33",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.21596ac653625c53ad23.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.21596ac653625c53ad23.hot-update.js",
-    "/js/main.b07a2dc4ba5ddd6ae8df.hot-update.js": "/js/main.b07a2dc4ba5ddd6ae8df.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.2ffaaa3c673654bfb9e6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2ffaaa3c673654bfb9e6.hot-update.js",
-    "/js/main.eec03a5d344758619370.hot-update.js": "/js/main.eec03a5d344758619370.hot-update.js",
-    "/js/main.00e4e4612c7fac79ad93.hot-update.js": "/js/main.00e4e4612c7fac79ad93.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.2d01e46c2fe3686f802f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2d01e46c2fe3686f802f.hot-update.js",
-    "/js/main.90ab9481b2b91597c075.hot-update.js": "/js/main.90ab9481b2b91597c075.hot-update.js",
-    "/js/main.389208e28bf4c09cdc54.hot-update.js": "/js/main.389208e28bf4c09cdc54.hot-update.js",
-    "/js/main.656865c343269700dabf.hot-update.js": "/js/main.656865c343269700dabf.hot-update.js",
-    "/js/main.d0e2cf07267ffad35cfc.hot-update.js": "/js/main.d0e2cf07267ffad35cfc.hot-update.js",
-    "/js/main.743a8cdaf7a7c66e4515.hot-update.js": "/js/main.743a8cdaf7a7c66e4515.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.743a8cdaf7a7c66e4515.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.743a8cdaf7a7c66e4515.hot-update.js",
-    "/js/main.b0f0ca037a7ab4718dc8.hot-update.js": "/js/main.b0f0ca037a7ab4718dc8.hot-update.js",
-    "/js/main.45a557c01f9ece5f582b.hot-update.js": "/js/main.45a557c01f9ece5f582b.hot-update.js",
-    "/js/main.8cc9b19f20a558a3e8fa.hot-update.js": "/js/main.8cc9b19f20a558a3e8fa.hot-update.js",
-    "/js/main.8e3cf4b773061ae97d39.hot-update.js": "/js/main.8e3cf4b773061ae97d39.hot-update.js",
-    "/js/main.f0a945ede041681263f1.hot-update.js": "/js/main.f0a945ede041681263f1.hot-update.js",
-    "/js/main.c71e7975be557973766f.hot-update.js": "/js/main.c71e7975be557973766f.hot-update.js",
-    "/js/main.33e6b8ab24ef49496ec3.hot-update.js": "/js/main.33e6b8ab24ef49496ec3.hot-update.js",
-    "/js/main.cf7e3825116f1410c2f9.hot-update.js": "/js/main.cf7e3825116f1410c2f9.hot-update.js",
-    "/js/main.a69a160913611ae57da4.hot-update.js": "/js/main.a69a160913611ae57da4.hot-update.js",
-    "/js/main.88776cf5e677d2ce3635.hot-update.js": "/js/main.88776cf5e677d2ce3635.hot-update.js",
-    "/js/main.b955b0416797a3380d54.hot-update.js": "/js/main.b955b0416797a3380d54.hot-update.js",
-    "/js/main.a921dfb8a755fd8a6e29.hot-update.js": "/js/main.a921dfb8a755fd8a6e29.hot-update.js",
-    "/js/main.5a050d90cb312b4c8da8.hot-update.js": "/js/main.5a050d90cb312b4c8da8.hot-update.js",
-    "/js/main.0bdf4fbb91e6f1b6d993.hot-update.js": "/js/main.0bdf4fbb91e6f1b6d993.hot-update.js",
-    "/js/main.5bd6c93294999209ff1a.hot-update.js": "/js/main.5bd6c93294999209ff1a.hot-update.js",
-    "/js/main.01020a080137378144eb.hot-update.js": "/js/main.01020a080137378144eb.hot-update.js",
-    "/js/main.32c6a8f4be08c83a6898.hot-update.js": "/js/main.32c6a8f4be08c83a6898.hot-update.js",
-    "/js/main.e10014a04e58db91d075.hot-update.js": "/js/main.e10014a04e58db91d075.hot-update.js",
-    "/js/main.d906aa3d53429ce1da68.hot-update.js": "/js/main.d906aa3d53429ce1da68.hot-update.js",
-    "/js/main.be1f5635fa922d840783.hot-update.js": "/js/main.be1f5635fa922d840783.hot-update.js",
-    "/js/main.7ecd64cf37a2d973bc2d.hot-update.js": "/js/main.7ecd64cf37a2d973bc2d.hot-update.js",
-    "/js/main.20c6196ab327f183d544.hot-update.js": "/js/main.20c6196ab327f183d544.hot-update.js",
-    "/js/main.6bf1577af8b37620d3bf.hot-update.js": "/js/main.6bf1577af8b37620d3bf.hot-update.js",
-    "/js/main.868a62150e5434f91084.hot-update.js": "/js/main.868a62150e5434f91084.hot-update.js",
-    "/js/main.38515a75ca60a50d4864.hot-update.js": "/js/main.38515a75ca60a50d4864.hot-update.js",
-    "/js/main.e9faffb8b27a21c21c14.hot-update.js": "/js/main.e9faffb8b27a21c21c14.hot-update.js",
-    "/js/main.718c5ddfc4ff946da3ec.hot-update.js": "/js/main.718c5ddfc4ff946da3ec.hot-update.js",
-    "/js/main.91a44d1c2a9dfc30b367.hot-update.js": "/js/main.91a44d1c2a9dfc30b367.hot-update.js",
-    "/js/main.572d7f72d55d5a392715.hot-update.js": "/js/main.572d7f72d55d5a392715.hot-update.js",
-    "/js/main.4e46642c3f70a59521a2.hot-update.js": "/js/main.4e46642c3f70a59521a2.hot-update.js",
-    "/js/main.73feba56670e33d591ec.hot-update.js": "/js/main.73feba56670e33d591ec.hot-update.js",
-    "/js/main.ea5ff9b1d47e701e950e.hot-update.js": "/js/main.ea5ff9b1d47e701e950e.hot-update.js",
-    "/js/main.b58a8058a2f70a3c600b.hot-update.js": "/js/main.b58a8058a2f70a3c600b.hot-update.js",
-    "/js/main.13c98b8676aff2108a98.hot-update.js": "/js/main.13c98b8676aff2108a98.hot-update.js",
-    "/js/main.5f712998cb16baa63f7d.hot-update.js": "/js/main.5f712998cb16baa63f7d.hot-update.js",
-    "/js/main.749397f6dbfa957d3973.hot-update.js": "/js/main.749397f6dbfa957d3973.hot-update.js",
-    "/js/main.2398919ed5d91b81ac38.hot-update.js": "/js/main.2398919ed5d91b81ac38.hot-update.js",
-    "/js/main.71bdefb2b0bff99b0e3c.hot-update.js": "/js/main.71bdefb2b0bff99b0e3c.hot-update.js",
-    "/js/main.bb658aab751f90185e1a.hot-update.js": "/js/main.bb658aab751f90185e1a.hot-update.js",
-    "/js/main.8cae8a32defa01a0bd60.hot-update.js": "/js/main.8cae8a32defa01a0bd60.hot-update.js",
-    "/js/main.41e8e59c014d804db68c.hot-update.js": "/js/main.41e8e59c014d804db68c.hot-update.js",
-    "/js/main.7af795837161a68e9043.hot-update.js": "/js/main.7af795837161a68e9043.hot-update.js",
-    "/js/main.37f9308a4a85156219ce.hot-update.js": "/js/main.37f9308a4a85156219ce.hot-update.js",
-    "/js/main.9c7bb5439fccd809a3b5.hot-update.js": "/js/main.9c7bb5439fccd809a3b5.hot-update.js",
-    "/js/main.3b165bd752e10b3b4b8e.hot-update.js": "/js/main.3b165bd752e10b3b4b8e.hot-update.js",
-    "/js/main.047ed8cdb917cd0b23ed.hot-update.js": "/js/main.047ed8cdb917cd0b23ed.hot-update.js",
-    "/js/main.55e954110735add5f219.hot-update.js": "/js/main.55e954110735add5f219.hot-update.js",
-    "/js/main.bf69279f4bf272330a16.hot-update.js": "/js/main.bf69279f4bf272330a16.hot-update.js",
-    "/js/main.16e511166c5cf92869c3.hot-update.js": "/js/main.16e511166c5cf92869c3.hot-update.js",
-    "/js/main.1d44b164f0f366a0a67f.hot-update.js": "/js/main.1d44b164f0f366a0a67f.hot-update.js",
-    "/js/main.f01ea7ae675174c853a0.hot-update.js": "/js/main.f01ea7ae675174c853a0.hot-update.js",
-    "/js/main.19c67bb1e23b39f3e54a.hot-update.js": "/js/main.19c67bb1e23b39f3e54a.hot-update.js",
-    "/js/main.9cf915d8ec759a0dcbef.hot-update.js": "/js/main.9cf915d8ec759a0dcbef.hot-update.js",
-    "/js/main.d0d8d502b461a8771390.hot-update.js": "/js/main.d0d8d502b461a8771390.hot-update.js",
-    "/js/main.6ee30daeb1dced66463c.hot-update.js": "/js/main.6ee30daeb1dced66463c.hot-update.js",
-    "/js/main.3814b33b0e21c17cc0ff.hot-update.js": "/js/main.3814b33b0e21c17cc0ff.hot-update.js",
-    "/js/main.a7218b5f56bf8cd75f83.hot-update.js": "/js/main.a7218b5f56bf8cd75f83.hot-update.js",
-    "/js/main.e159d14089070a0412e1.hot-update.js": "/js/main.e159d14089070a0412e1.hot-update.js",
-    "/js/main.7705eb891272f8dbb31e.hot-update.js": "/js/main.7705eb891272f8dbb31e.hot-update.js"
+    "/chunks/files~chunks/shared-files~chunks/shared-page.0458929e5f56e46ba6bc.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0458929e5f56e46ba6bc.hot-update.js",
+    "/js/main.0ab3c15907f3ceb1f58a.hot-update.js": "/js/main.0ab3c15907f3ceb1f58a.hot-update.js",
+    "/js/main.39fe4c147a896dd94f73.hot-update.js": "/js/main.39fe4c147a896dd94f73.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.39fe4c147a896dd94f73.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.39fe4c147a896dd94f73.hot-update.js",
+    "/js/main.72d4b6097ba1aee7702f.hot-update.js": "/js/main.72d4b6097ba1aee7702f.hot-update.js",
+    "/js/main.8bc79cfa0e1b127c70b4.hot-update.js": "/js/main.8bc79cfa0e1b127c70b4.hot-update.js",
+    "/js/main.86e6e147e6815c6341f4.hot-update.js": "/js/main.86e6e147e6815c6341f4.hot-update.js",
+    "/js/main.9917c2781cf90a643c0c.hot-update.js": "/js/main.9917c2781cf90a643c0c.hot-update.js",
+    "/js/main.e54790c6be90d0da82ab.hot-update.js": "/js/main.e54790c6be90d0da82ab.hot-update.js",
+    "/js/main.177bef9fd128d7904d4c.hot-update.js": "/js/main.177bef9fd128d7904d4c.hot-update.js",
+    "/js/main.39f1391d6c7bc8753b61.hot-update.js": "/js/main.39f1391d6c7bc8753b61.hot-update.js",
+    "/js/main.a474d1267263c391f11c.hot-update.js": "/js/main.a474d1267263c391f11c.hot-update.js",
+    "/js/main.5992ebc1ccca9dcd2515.hot-update.js": "/js/main.5992ebc1ccca9dcd2515.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.765cb344c9206ad77d63.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.765cb344c9206ad77d63.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.45a69d24844455588132.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.45a69d24844455588132.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.8c6fec530e4d85facfe5.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8c6fec530e4d85facfe5.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.09ed4dbda1926d9c9138.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.09ed4dbda1926d9c9138.hot-update.js",
+    "/js/main.c3d516fb34d55b243c46.hot-update.js": "/js/main.c3d516fb34d55b243c46.hot-update.js",
+    "/js/main.f73825d78cfa4c55560d.hot-update.js": "/js/main.f73825d78cfa4c55560d.hot-update.js",
+    "/js/main.4a894940580f6ef3f5a4.hot-update.js": "/js/main.4a894940580f6ef3f5a4.hot-update.js",
+    "/js/main.36a44250869248cb5d3d.hot-update.js": "/js/main.36a44250869248cb5d3d.hot-update.js",
+    "/js/main.016fc66db3fccf7ab02c.hot-update.js": "/js/main.016fc66db3fccf7ab02c.hot-update.js",
+    "/js/main.dc53484466da1bbba22a.hot-update.js": "/js/main.dc53484466da1bbba22a.hot-update.js",
+    "/js/main.033d0158ff270ada6285.hot-update.js": "/js/main.033d0158ff270ada6285.hot-update.js",
+    "/js/main.b26ebf37b5a249326821.hot-update.js": "/js/main.b26ebf37b5a249326821.hot-update.js",
+    "/js/main.5c8b7c0759a6283400d5.hot-update.js": "/js/main.5c8b7c0759a6283400d5.hot-update.js",
+    "/js/main.c561521c779c3840e531.hot-update.js": "/js/main.c561521c779c3840e531.hot-update.js",
+    "/js/main.495d35cbdc423d374217.hot-update.js": "/js/main.495d35cbdc423d374217.hot-update.js",
+    "/js/main.94e9fdd79f335631b7ba.hot-update.js": "/js/main.94e9fdd79f335631b7ba.hot-update.js",
+    "/js/main.073f7877a365b2467042.hot-update.js": "/js/main.073f7877a365b2467042.hot-update.js",
+    "/js/main.863d41cb0e0b4fd6e6db.hot-update.js": "/js/main.863d41cb0e0b4fd6e6db.hot-update.js",
+    "/js/main.352b732435806ada420c.hot-update.js": "/js/main.352b732435806ada420c.hot-update.js",
+    "/js/main.02ee25607333aa87f887.hot-update.js": "/js/main.02ee25607333aa87f887.hot-update.js",
+    "/js/main.a67208a338397c9d4368.hot-update.js": "/js/main.a67208a338397c9d4368.hot-update.js",
+    "/js/main.8287972a430a1adbe3a5.hot-update.js": "/js/main.8287972a430a1adbe3a5.hot-update.js",
+    "/js/main.05a4059d5b2a45fbb1c3.hot-update.js": "/js/main.05a4059d5b2a45fbb1c3.hot-update.js",
+    "/js/main.aded789163fc1c5828f0.hot-update.js": "/js/main.aded789163fc1c5828f0.hot-update.js",
+    "/js/main.e5b6fb32f9165760a2f4.hot-update.js": "/js/main.e5b6fb32f9165760a2f4.hot-update.js",
+    "/js/main.8c94a83163875565b848.hot-update.js": "/js/main.8c94a83163875565b848.hot-update.js",
+    "/js/main.92f276131542382e134a.hot-update.js": "/js/main.92f276131542382e134a.hot-update.js",
+    "/js/main.038f80423c64be7d20e7.hot-update.js": "/js/main.038f80423c64be7d20e7.hot-update.js",
+    "/js/main.4f61b2d165f54996a4c0.hot-update.js": "/js/main.4f61b2d165f54996a4c0.hot-update.js",
+    "/js/main.2eed9a33045dcfc21af5.hot-update.js": "/js/main.2eed9a33045dcfc21af5.hot-update.js",
+    "/js/main.9f2524a070f062f1ead0.hot-update.js": "/js/main.9f2524a070f062f1ead0.hot-update.js",
+    "/js/main.406fdbaba18e7a37ba45.hot-update.js": "/js/main.406fdbaba18e7a37ba45.hot-update.js",
+    "/js/main.f25d381b827756ef0e12.hot-update.js": "/js/main.f25d381b827756ef0e12.hot-update.js",
+    "/js/main.94ae6ca3738e05eefef6.hot-update.js": "/js/main.94ae6ca3738e05eefef6.hot-update.js",
+    "/js/main.7b6f30c359e5251ef6d0.hot-update.js": "/js/main.7b6f30c359e5251ef6d0.hot-update.js",
+    "/js/main.3b168005fcda150e8be6.hot-update.js": "/js/main.3b168005fcda150e8be6.hot-update.js",
+    "/js/main.5056cf0f408a65bf5886.hot-update.js": "/js/main.5056cf0f408a65bf5886.hot-update.js",
+    "/js/main.52a5ba1b2eeec4590524.hot-update.js": "/js/main.52a5ba1b2eeec4590524.hot-update.js",
+    "/js/main.6267aee84a2872e91ef4.hot-update.js": "/js/main.6267aee84a2872e91ef4.hot-update.js",
+    "/js/main.b084c53c51bec69abeb6.hot-update.js": "/js/main.b084c53c51bec69abeb6.hot-update.js",
+    "/js/main.623f75384a87ac3e3a52.hot-update.js": "/js/main.623f75384a87ac3e3a52.hot-update.js",
+    "/js/main.c313645e367745eeaf57.hot-update.js": "/js/main.c313645e367745eeaf57.hot-update.js",
+    "/js/main.cedeaa5b3e87a48f176b.hot-update.js": "/js/main.cedeaa5b3e87a48f176b.hot-update.js",
+    "/js/main.6d3c1b7afb75eb61811a.hot-update.js": "/js/main.6d3c1b7afb75eb61811a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.6d3c1b7afb75eb61811a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6d3c1b7afb75eb61811a.hot-update.js",
+    "/js/main.d62a09962ca82ce76f5d.hot-update.js": "/js/main.d62a09962ca82ce76f5d.hot-update.js",
+    "/js/main.349517a0be904b874323.hot-update.js": "/js/main.349517a0be904b874323.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.165d58c3d6ad8e7f90b9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.165d58c3d6ad8e7f90b9.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.3f69a06a9ff09361e597.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.3f69a06a9ff09361e597.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.9952a80137ce68c50024.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9952a80137ce68c50024.hot-update.js",
+    "/js/main.6693b3a582b9a2696b9f.hot-update.js": "/js/main.6693b3a582b9a2696b9f.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 379dafe6..2b64871f 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -110,7 +110,7 @@ export default {
     },
     computed: {
         ...mapGetters([
-            'isLogged', 'isGuest', 'config', 'filesQueue'
+            'isLogged', 'isGuest', 'config', 'fileQueue'
         ]),
         isGuestLayout() {
             return (includes([
@@ -139,11 +139,6 @@ export default {
             )
         }
     },
-    watch: {
-        filesQueue() {
-            //this.$handleUploading()
-        }
-    },
     data() {
         return {
             isScaledDown: false
diff --git a/resources/js/components/FilesView/FileBrowser.vue b/resources/js/components/FilesView/FileBrowser.vue
index 7ce003cf..6e5c1cc8 100644
--- a/resources/js/components/FilesView/FileBrowser.vue
+++ b/resources/js/components/FilesView/FileBrowser.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="file-content" id="file-content-id" :class="{ 'is-offset': filesQueue > 0, 'is-dragging': isDragging }"
+    <div class="file-content" id="file-content-id" :class="{ 'is-offset': filesInQueueTotal > 0, 'is-dragging': isDragging }"
          @dragover.prevent
          @drop.stop.prevent="dropUpload($event)"
          @dragover="dragEnter"
@@ -119,7 +119,7 @@
         },
         computed: {
             ...mapGetters([
-                'filesQueue',
+                'filesInQueueTotal',
                 'fileInfoVisible',
                 'fileInfoDetail',
                 'currentFolder',
diff --git a/resources/js/components/FilesView/UploadProgress.vue b/resources/js/components/FilesView/UploadProgress.vue
index 0c92f783..76a7172d 100644
--- a/resources/js/components/FilesView/UploadProgress.vue
+++ b/resources/js/components/FilesView/UploadProgress.vue
@@ -1,7 +1,6 @@
 <template>
     <transition name="info-panel">
-        <!--<div v-if="filesQueue.length > 0" class="upload-progress">-->
-        <div class="upload-progress">
+        <div v-if="fileQueue.length > 0" class="upload-progress">
             <div class="progress-title">
 
                 <!--Is processing-->
@@ -10,14 +9,9 @@
                     {{ $t('uploading.processing_file') }}
                 </span>
 
-                <!--Single file upload-->
-				<span v-if="!isProcessingFile && filesQueue.length === 1">
-                    {{ $t('uploading.progress_single_upload', {progress: uploadingProgress}) }}
-                </span>
-
                 <!--Multi file upload-->
-				<span v-if="!isProcessingFile && filesQueue.length > 1">
-                    {{ $t('uploading.progress', {current:'x', total: filesQueue.length, progress: uploadingProgress}) }}
+				<span v-if="!isProcessingFile && fileQueue.length > 0">
+                    {{ $t('uploading.progress', {current:filesInQueueUploaded, total: filesInQueueTotal, progress: uploadingProgress}) }}
                 </span>
             </div>
             <div class="progress-wrapper">
@@ -45,9 +39,11 @@
         },
         computed: {
             ...mapGetters([
+                'filesInQueueUploaded',
+                'filesInQueueTotal',
                 'uploadingProgress',
                 'isProcessingFile',
-                'filesQueue',
+                'fileQueue',
             ])
         },
         methods: {
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 2918e6a5..dcd49b5d 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -78,11 +78,24 @@ const Helpers = {
 
         Vue.prototype.$uploadFiles = async function (files) {
 
-            if (files.length == 0) return
+           if (files.length == 0) return
 
            if (!this.$checkFileMimetype(files) || !this.$checkUploadLimit(files)) return
-           
-            this.$handleUploading(files, undefined)
+
+			// Push items to file queue
+			[...files].map(item => {
+				this.$store.commit('ADD_FILES_TO_QUEUE', {
+					parent_id: store.getters.currentFolder.unique_id,
+					file: item,
+				})
+			});
+
+			// Start uploading if uploading process isn't running
+			if (this.$store.getters.filesInQueueTotal == 0)
+				this.$handleUploading(store.getters.fileQueue[0])
+
+			// Increase total files in upload bar
+			this.$store.commit('INCREASE_FILES_IN_QUEUES_TOTAL', files.length)
         }
 
         Vue.prototype.$uploadExternalFiles = async function (event, parent_id) {
@@ -90,7 +103,7 @@ const Helpers = {
             // Prevent submit empty files
             if (event.dataTransfer.items.length === 0) return
 
-            // Push files to queue
+			// Push items to file queue
             [...event.dataTransfer.items].map(item => {
 				this.$store.commit('ADD_FILES_TO_QUEUE', {
 					parent_id: parent_id,
@@ -98,17 +111,18 @@ const Helpers = {
 				})
 			});
 
-            if (! this.$store.getters.uploadingProgress > 0) {
-				this.$handleUploading(
-					this.$store.getters.filesQueue.shift()
-				)
-			}
+            // Start uploading if uploading process isn't running
+            if (this.$store.getters.filesInQueueTotal == 0)
+				this.$handleUploading(this.$store.getters.fileQueue[0])
+
+			// Increase total files in upload bar
+			this.$store.commit('INCREASE_FILES_IN_QUEUES_TOTAL', [...event.dataTransfer.items].length)
         }
 
 		Vue.prototype.$handleUploading = async function (item) {
 
 			// Create ceil
-			let size = 128000000, // todo: chunksize doriesit
+			let size = store.getters.config.chunkSize,
 				chunksCeil = Math.ceil(item.file.size / size),
 				chunks = []
 
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index efbb8af2..2156435b 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -8,7 +8,9 @@ import store from '../index'
 
 const defaultState = {
 	processingPopup: undefined,
-	filesQueue: [],
+	fileQueue: [],
+	filesInQueueTotal: 0,
+	filesInQueueUploaded: 0,
 
 	isProcessingFile: false,
 	uploadingProgress: 0
@@ -199,6 +201,9 @@ const actions = {
 
 					commit('PROCESSING_FILE', false)
 
+					// Remove first file from file queue
+					commit('SHIFT_FROM_FILE_QUEUE')
+
 					// Check if user is in uploading folder, if yes, than show new file
 					if (response.data.folder_id == getters.currentFolder.unique_id) {
 
@@ -207,15 +212,20 @@ const actions = {
 
 						// Reset file progress
 						commit('UPLOADING_FILE_PROGRESS', 0)
+
+						// Increase count in files in queue uploaded for 1
+						commit('INCREASE_FILES_IN_QUEUE_UPLOADED')
 					}
 
-					// TODO: handle new uploads if exist
-					if (getters.filesQueue.length > 0) {
-						Vue.prototype.$handleUploading(getters.filesQueue[0])
-						commit('SHIFT_FILE_FROM_QUEUE')
-						// todo: doriesit uploading ffile statistiky na frontende
+					// Start uploading next file if file queue is not empty
+					if (getters.fileQueue.length) {
+						Vue.prototype.$handleUploading(getters.fileQueue[0])
 					}
 
+					// Reset upload process
+					if (! getters.fileQueue.length)
+						commit('CLEAR_UPLOAD_PROGRESS')
+
 				})
 				.catch(error => {
 					reject(error)
@@ -242,7 +252,7 @@ const actions = {
 					})
 
 					commit('PROCESSING_FILE', false)
-					commit('UPDATE_FILE_COUNT_PROGRESS', undefined)
+					commit('CLEAR_UPLOAD_PROGRESS')
 				})
 
 			// Cancel the upload request
@@ -251,7 +261,7 @@ const actions = {
 
 				// Hide upload progress bar
 				commit('PROCESSING_FILE', false)
-				commit('UPDATE_FILE_COUNT_PROGRESS', undefined)
+				commit('CLEAR_UPLOAD_PROGRESS')
 			})
 		})
 	},
@@ -392,24 +402,37 @@ const mutations = {
 		state.processingPopup = status
 	},
 	ADD_FILES_TO_QUEUE(state, file) {
-		state.filesQueue.push(file)
+		state.fileQueue.push(file)
 	},
-	SHIFT_FILE_FROM_QUEUE(state) {
-		state.filesQueue.shift()
+	SHIFT_FROM_FILE_QUEUE(state) {
+		state.fileQueue.shift()
 	},
 	PROCESSING_FILE(state, status) {
 		state.isProcessingFile = status
 	},
 	UPLOADING_FILE_PROGRESS(state, percentage) {
 		state.uploadingProgress = percentage
+	},
+	INCREASE_FILES_IN_QUEUES_TOTAL(state, count) {
+		state.filesInQueueTotal += count
+	},
+	INCREASE_FILES_IN_QUEUE_UPLOADED(state) {
+		state.filesInQueueUploaded++
+	},
+	CLEAR_UPLOAD_PROGRESS(state) {
+		state.filesInQueueUploaded = 0
+		state.filesInQueueTotal = 0
+		state.fileQueue = []
 	}
 }
 
 const getters = {
+	filesInQueueUploaded: state => state.filesInQueueUploaded,
+	filesInQueueTotal: state => state.filesInQueueTotal,
 	uploadingProgress: state => state.uploadingProgress,
 	isProcessingFile: state => state.isProcessingFile,
 	processingPopup: state => state.processingPopup,
-	filesQueue: state => state.filesQueue
+	fileQueue: state => state.fileQueue
 }
 
 export default {