From a72a672aaf64bc83d544a5bafc215337631ffea6 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sat, 21 Nov 2020 10:33:27 +0100
Subject: [PATCH 1/8] Added navigator to shared page with folders when you have
 multiple folders within for better user experience Title name of favourite
 folder overflowed sidebar when you have long title Share button in image
 preview appear when you are in shared public folder

---
 .../FileBrowser/BrowseController.php          |  17 -
 public/mix-manifest.json                      | 301 ++++++++++--------
 .../FilesView/FilePreviewNavigationPanel.vue  |  12 +-
 resources/js/store/modules/fileBrowser.js     |   8 -
 resources/js/store/modules/fileFunctions.js   |  18 +-
 resources/js/views/Shared/SharedPage.vue      |  95 ++++--
 resources/sass/app.scss                       |   4 +
 routes/api.php                                |   1 -
 8 files changed, 269 insertions(+), 187 deletions(-)

diff --git a/app/Http/Controllers/FileBrowser/BrowseController.php b/app/Http/Controllers/FileBrowser/BrowseController.php
index 0772825b..3b173a27 100644
--- a/app/Http/Controllers/FileBrowser/BrowseController.php
+++ b/app/Http/Controllers/FileBrowser/BrowseController.php
@@ -205,21 +205,4 @@ class BrowseController extends Controller
         // Collect folders and files to single array
         return collect([$searched_folders, $searched_files])->collapse();
     }
-
-    /**
-     * Get file record
-     *
-     * @param $unique_id
-     * @return mixed
-     */
-    public function file_detail($unique_id)
-    {
-        // Get user id
-        $user_id = Auth::id();
-
-        return FileManagerFile::with(['shared:token,id,item_id,permission,protected,expire_in'])
-            ->where('user_id', $user_id)
-            ->where('unique_id', $unique_id)
-            ->firstOrFail();
-    }
 }
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0450c4a5..902ef18b 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,130 +1,179 @@
 {
     "/js/main.js": "/js/main.js",
     "/css/app.css": "/css/app.css",
-    "/chunks/admin.js": "/chunks/admin.js?id=ed4125d0b85c16ac0a46",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=9a87235c637bee9478da",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=10f4f9a88eaec9accb46",
-    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~3b77a26e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~3b77a26e.js?id=1d8e3709b30ab1351939",
-    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js?id=e39b0d32b4e27b4ddb2e",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=2fcf9b6a8bcdcf0bf877",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=165778ddf33905044afb",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=1b3de45007aa131c3179",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=75a610ff95b22e4e015c",
-    "/chunks/app-billings.js": "/chunks/app-billings.js?id=b8e6ca52592de6c0d2a8",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=5e231b4d6cf0a4d1acb9",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=b8c778343ab04e9c2f79",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=39709ad63bc65e256571",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=ab77360a958f97f95c6c",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=cff243a66e4b037e5e84",
-    "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js?id=c325e693fad5c2a99154",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=28d36bc80131ca10d57c",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=eb2a4264665b217b752b",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=f13ecb6e4405aa7e06d2",
-    "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=8b11e9c64262b9275963",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=abb47a424c09ace77d79",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=050d76471e69594623a4",
-    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=ffd2f414666d7cc80b9d",
-    "/chunks/database.js": "/chunks/database.js?id=416a5164bdc53c97ea34",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=464c8e70974d492ce7f6",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=405847df44edd86e301a",
-    "/chunks/files.js": "/chunks/files.js?id=2d162960903ddec11553",
-    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=6cafd70cb9e5ae25f02a",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=4e72422c20acc07456e6",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=aba8c662fbc234892216",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=ecceaa6cdf5768826b36",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=248503ac5967fe8370f9",
-    "/chunks/landing-page.js": "/chunks/landing-page.js?id=4c3176cc7c1ad3e6f9b7",
-    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=a28320bdc00aeb85409e",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=0607b8e16d6678e0b463",
-    "/chunks/pages.js": "/chunks/pages.js?id=83f334c575a48c1b0cc6",
-    "/chunks/plan.js": "/chunks/plan.js?id=ed865758447ff7e3f2b5",
-    "/chunks/plan-create.js": "/chunks/plan-create.js?id=f4199916eddc63fb1720",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=2a50cca120ca589f5626",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=4a691e84a65d9a779d60",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8c85b14979d3fb6c54a3",
-    "/chunks/plans.js": "/chunks/plans.js?id=f2ddb594ff1b2812c248",
-    "/chunks/profile.js": "/chunks/profile.js?id=df174ba95616670c8edb",
-    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=62c97619d35198767014",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=1452fb6ed1aa01e4045a",
-    "/chunks/settings.js": "/chunks/settings.js?id=d2c4a870b96c2556ab2d",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=40d5eed52256ea23edbe",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=bc110f5ee1a5b984fda2",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=e318f7536b185dbe6b54",
-    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=9be1d0aa0169eb57e78f",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=22e7978fe8a5cb488e52",
-    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=367c9478591c7a4a2889",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=7da589bd335deefd5f65",
-    "/chunks/shared-files.js": "/chunks/shared-files.js?id=50538c88a0471fe4db6f",
-    "/chunks/shared-page.js": "/chunks/shared-page.js?id=24a459b0b73b0991e207",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=703fbd23d18816590337",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=cedca52c29abfb3c58f1",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=9dec4c59d5a32fb9b855",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=f80e2f130d531fe997f0",
-    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=6fa5a96e068657f3768e",
-    "/chunks/trash.js": "/chunks/trash.js?id=0692fcb444bd4115dbe3",
-    "/chunks/upgrade.js": "/chunks/upgrade.js?id=05471b1721b98285ef2b",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=48886957769dffee24bf",
-    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=38b120b33fa78fcb7fa0",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=dd2df21f21ff1291c4dc",
-    "/chunks/user.js": "/chunks/user.js?id=d7eca242e8e982ddbae4",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=fc1f1811516801a2bb87",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=c840c8ded1acc6335f05",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=ef7920c403b69c391543",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=97d041044c0eee8f8b4b",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=b036eeaa5ef8e798f6dd",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=a99910f95c3e39caa78b",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=e8ea1e67f9ac0a835ed0",
-    "/chunks/users.js": "/chunks/users.js?id=cdba7af8fb0cd8e64c40",
-    "/chunks/files.714998938066a2321d6a.hot-update.js": "/chunks/files.714998938066a2321d6a.hot-update.js",
-    "/chunks/files.60eb046f4a1a6c202c55.hot-update.js": "/chunks/files.60eb046f4a1a6c202c55.hot-update.js",
-    "/chunks/files.7fdeb696aa4bed8f19de.hot-update.js": "/chunks/files.7fdeb696aa4bed8f19de.hot-update.js",
-    "/chunks/files.b2938bf5a1bd4060083a.hot-update.js": "/chunks/files.b2938bf5a1bd4060083a.hot-update.js",
-    "/chunks/files.8f60f48f3d093aa99eb4.hot-update.js": "/chunks/files.8f60f48f3d093aa99eb4.hot-update.js",
-    "/chunks/files.7ed16adadf0572bbb9c5.hot-update.js": "/chunks/files.7ed16adadf0572bbb9c5.hot-update.js",
-    "/chunks/files.7b75e2b42ad4d4c9f91e.hot-update.js": "/chunks/files.7b75e2b42ad4d4c9f91e.hot-update.js",
-    "/chunks/files.fd675a976f14fdaace03.hot-update.js": "/chunks/files.fd675a976f14fdaace03.hot-update.js",
-    "/chunks/files.982ab03f0a0254ba8f45.hot-update.js": "/chunks/files.982ab03f0a0254ba8f45.hot-update.js",
-    "/chunks/files.4458a0a295466f44abd7.hot-update.js": "/chunks/files.4458a0a295466f44abd7.hot-update.js",
-    "/chunks/files.554b28cc5fada61962f8.hot-update.js": "/chunks/files.554b28cc5fada61962f8.hot-update.js",
-    "/chunks/files.48b60c1642d609002311.hot-update.js": "/chunks/files.48b60c1642d609002311.hot-update.js",
-    "/chunks/files.e99bf422cb068c92284f.hot-update.js": "/chunks/files.e99bf422cb068c92284f.hot-update.js",
-    "/chunks/files.c11703d2b53e55fcf007.hot-update.js": "/chunks/files.c11703d2b53e55fcf007.hot-update.js",
-    "/chunks/files.c8e8a976ff2dff3f0641.hot-update.js": "/chunks/files.c8e8a976ff2dff3f0641.hot-update.js",
-    "/chunks/files.6f4b3065df89afbd103b.hot-update.js": "/chunks/files.6f4b3065df89afbd103b.hot-update.js",
-    "/chunks/files.d7db5f7991bb774eef03.hot-update.js": "/chunks/files.d7db5f7991bb774eef03.hot-update.js",
-    "/chunks/files.626a2a2eb02181f64d2a.hot-update.js": "/chunks/files.626a2a2eb02181f64d2a.hot-update.js",
-    "/chunks/files.e1214cf94c07e3639f27.hot-update.js": "/chunks/files.e1214cf94c07e3639f27.hot-update.js",
-    "/chunks/files.630b64c8c69d724208f7.hot-update.js": "/chunks/files.630b64c8c69d724208f7.hot-update.js",
-    "/chunks/files.95f3da8f311ad657c9d1.hot-update.js": "/chunks/files.95f3da8f311ad657c9d1.hot-update.js",
-    "/chunks/files.619d7f534b93897facde.hot-update.js": "/chunks/files.619d7f534b93897facde.hot-update.js",
-    "/chunks/files.35a4d628dffd37f253bc.hot-update.js": "/chunks/files.35a4d628dffd37f253bc.hot-update.js",
-    "/chunks/files.ce9553d82fb1fda6e2e9.hot-update.js": "/chunks/files.ce9553d82fb1fda6e2e9.hot-update.js",
-    "/chunks/files.a39fdc4318e92c023609.hot-update.js": "/chunks/files.a39fdc4318e92c023609.hot-update.js",
-    "/chunks/files.8a2c99114c50b7521355.hot-update.js": "/chunks/files.8a2c99114c50b7521355.hot-update.js",
-    "/chunks/files.3867e89249b4bfb9f547.hot-update.js": "/chunks/files.3867e89249b4bfb9f547.hot-update.js",
-    "/chunks/files.daa03c7cb15b7a6dd0ad.hot-update.js": "/chunks/files.daa03c7cb15b7a6dd0ad.hot-update.js",
-    "/chunks/files.c30f881608ff354918b2.hot-update.js": "/chunks/files.c30f881608ff354918b2.hot-update.js",
-    "/chunks/files.f3c874fb14bf3460697c.hot-update.js": "/chunks/files.f3c874fb14bf3460697c.hot-update.js",
-    "/chunks/files.737862853174ce1e11c1.hot-update.js": "/chunks/files.737862853174ce1e11c1.hot-update.js",
-    "/chunks/files.704475025e033b2e6cb4.hot-update.js": "/chunks/files.704475025e033b2e6cb4.hot-update.js",
-    "/chunks/files.9202c89939570a22ebe9.hot-update.js": "/chunks/files.9202c89939570a22ebe9.hot-update.js",
-    "/chunks/files.2dad5b52bdb08312a195.hot-update.js": "/chunks/files.2dad5b52bdb08312a195.hot-update.js",
-    "/chunks/files.ad6390cad01a851024ba.hot-update.js": "/chunks/files.ad6390cad01a851024ba.hot-update.js",
-    "/chunks/files.0fe96aa3cf88c4dad880.hot-update.js": "/chunks/files.0fe96aa3cf88c4dad880.hot-update.js",
-    "/chunks/files.a7aef636159b3db9e096.hot-update.js": "/chunks/files.a7aef636159b3db9e096.hot-update.js",
-    "/chunks/files.83b3e9445cf85e4d2e23.hot-update.js": "/chunks/files.83b3e9445cf85e4d2e23.hot-update.js",
-    "/chunks/files.920cb523e56b9c951e4e.hot-update.js": "/chunks/files.920cb523e56b9c951e4e.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f357a2647ab1b743293f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.f357a2647ab1b743293f.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.cee1ccc30596a6782e23.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.cee1ccc30596a6782e23.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e11292d5f2fc27b48459.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e11292d5f2fc27b48459.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.47938fbb519b1236d212.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.47938fbb519b1236d212.hot-update.js",
-    "/chunks/files.745653f9c181560ad982.hot-update.js": "/chunks/files.745653f9c181560ad982.hot-update.js",
-    "/chunks/files.f1b53bfaafa441199e99.hot-update.js": "/chunks/files.f1b53bfaafa441199e99.hot-update.js",
-    "/js/main.7008e73204e087dc5684.hot-update.js": "/js/main.7008e73204e087dc5684.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.540cc212a6ffd91f7a8b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.540cc212a6ffd91f7a8b.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.c88f76c4b7bb73d3ab50.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.c88f76c4b7bb73d3ab50.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.673fc125bc6c0154d453.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.673fc125bc6c0154d453.hot-update.js",
-    "/js/main.5676c74fd7fab45827fd.hot-update.js": "/js/main.5676c74fd7fab45827fd.hot-update.js",
-    "/chunks/files.b6cd1945c2de9a6461d9.hot-update.js": "/chunks/files.b6cd1945c2de9a6461d9.hot-update.js",
-    "/js/main.541844d93d4d8469353e.hot-update.js": "/js/main.541844d93d4d8469353e.hot-update.js"
+    "/chunks/admin.js": "/chunks/admin.js?id=5807ec412746448047f9",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=0962d9d0301abf802d07",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=ac72621206dad357a4a5",
+    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=a9bee156de75062a1925",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js?id=0b4966a15f5749046c2e",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=03e587de7dd10fba3ead",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=fd3c7242b5c765b469e4",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=660a37dc97cd5fe64367",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js?id=9df028786df5d3279ab9",
+    "/chunks/app-billings.js": "/chunks/app-billings.js?id=2b87899e656ed382d260",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=2e5a1b525d335367cfc1",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=05747ca2c86a1daea9cd",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=55e1ec30bdca87c1adef",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=796c7c2cfb9c6c39c8a7",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=b85ce942737e25c37b8a",
+    "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js?id=52561e7bfe3acdf4a314",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=468cf3dc8e7ade2a719b",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=140842143b5feea74676",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=99939ac2d71b6c7a559b",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=96ac1ede73f3fc9afa37",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=278eef02eace89698f20",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=c4f067ad6a1d0d7326f2",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=d7795f20187163939276",
+    "/chunks/database.js": "/chunks/database.js?id=a6f7e8d1696493c60072",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=f56517bee181ef89921f",
+    "/chunks/files.js": "/chunks/files.js?id=52fcc78719bcc5537509",
+    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=335030ccf561b022c47f",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=d345ab220fcc39b4d4e1",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=06fc72f0d9a057bb8f18",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=fe3a39bf87ae2a2f5a64",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=30bbcaf349ff65a0270b",
+    "/chunks/landing-page.js": "/chunks/landing-page.js?id=6b6f6550c810c8f42157",
+    "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=6666b81edc5ff6f60e82",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=f7e24a5841604313332a",
+    "/chunks/pages.js": "/chunks/pages.js?id=00581ea5208a366ecbb9",
+    "/chunks/plan.js": "/chunks/plan.js?id=cc041fb9c2cb9ad8f0ff",
+    "/chunks/plan-create.js": "/chunks/plan-create.js?id=a66d8ae3a6edd08b755b",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=0732885b6e0839afe66e",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=445ca1affcefaf37cbfc",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8372954a6c160302859d",
+    "/chunks/plans.js": "/chunks/plans.js?id=a6b986e1adbe8dff8b7d",
+    "/chunks/profile.js": "/chunks/profile.js?id=b91a5757f57bdaee120d",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=11ccc9d93afce5289210",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=0780a474db4e26ec0389",
+    "/chunks/settings.js": "/chunks/settings.js?id=e25743714c8adafa4d2c",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=25225a758b04d6d48617",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=c7499d2d79bf9620dfa5",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=015ead5623aee1a543cf",
+    "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=7c45369792974d83352e",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=013b6f15f907caaecd1e",
+    "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=6172a89afe3b27cb76cd",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=99b4f321902fe6b0eb23",
+    "/chunks/shared-files.js": "/chunks/shared-files.js?id=a1262ec81010fb16f1e8",
+    "/chunks/shared-page.js": "/chunks/shared-page.js?id=8dfe757b4ccdf4bbe241",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=ddb0ae9561462e691ce3",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=be89f6dcf7372d23668f",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=63c4118231cfa758568a",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=c980f249fc2160857d83",
+    "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=00c4ca867ef06d26531f",
+    "/chunks/trash.js": "/chunks/trash.js?id=23a7513cb5cf933ac4ae",
+    "/chunks/upgrade.js": "/chunks/upgrade.js?id=162c5e25074368ca36d1",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=638ac716c4995894563c",
+    "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e912e466f43f90392e50",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=ecc3c773b7c8ff422cf7",
+    "/chunks/user.js": "/chunks/user.js?id=1e0f9c8cab76e5ef871f",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=fb808e071ab049b55490",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=9c7eb4dab2be288cb884",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=43545e2d110b40a47756",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=b05dcb7e7ad2f4959e52",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=57fe622e9a03e834d6fa",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=76465e9a36a2ab78eff3",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=e9528debb38dc1654cef",
+    "/chunks/users.js": "/chunks/users.js?id=3634f95ec3dbc714fc6a",
+    "/js/main.e0bf0f4d5387d0833543.hot-update.js": "/js/main.e0bf0f4d5387d0833543.hot-update.js",
+    "/chunks/files.e0bf0f4d5387d0833543.hot-update.js": "/chunks/files.e0bf0f4d5387d0833543.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e0bf0f4d5387d0833543.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.e0bf0f4d5387d0833543.hot-update.js",
+    "/js/main.c937bc1651f8a41c9a55.hot-update.js": "/js/main.c937bc1651f8a41c9a55.hot-update.js",
+    "/js/main.0b0cfd0ed32509d57c06.hot-update.js": "/js/main.0b0cfd0ed32509d57c06.hot-update.js",
+    "/js/main.05dff8900f20df215ccf.hot-update.js": "/js/main.05dff8900f20df215ccf.hot-update.js",
+    "/js/main.b0ebfe73d306a164babd.hot-update.js": "/js/main.b0ebfe73d306a164babd.hot-update.js",
+    "/js/main.4514cd68fb8bd02bc653.hot-update.js": "/js/main.4514cd68fb8bd02bc653.hot-update.js",
+    "/js/main.4af936ce89bc57f38f56.hot-update.js": "/js/main.4af936ce89bc57f38f56.hot-update.js",
+    "/js/main.0f515f2b0b29354fa68d.hot-update.js": "/js/main.0f515f2b0b29354fa68d.hot-update.js",
+    "/js/main.340a43fc23305763f39b.hot-update.js": "/js/main.340a43fc23305763f39b.hot-update.js",
+    "/js/main.81ef5511ca08b2682bd4.hot-update.js": "/js/main.81ef5511ca08b2682bd4.hot-update.js",
+    "/js/main.c50b5eed7e1256937c75.hot-update.js": "/js/main.c50b5eed7e1256937c75.hot-update.js",
+    "/js/main.e3bcfa2674db848b282b.hot-update.js": "/js/main.e3bcfa2674db848b282b.hot-update.js",
+    "/js/main.44d7861eef73c96b5d85.hot-update.js": "/js/main.44d7861eef73c96b5d85.hot-update.js",
+    "/js/main.21a82d6bce398fccf058.hot-update.js": "/js/main.21a82d6bce398fccf058.hot-update.js",
+    "/chunks/shared-page.e4f0caff1720d07ba080.hot-update.js": "/chunks/shared-page.e4f0caff1720d07ba080.hot-update.js",
+    "/chunks/shared-page.9b1830821f8717afebaa.hot-update.js": "/chunks/shared-page.9b1830821f8717afebaa.hot-update.js",
+    "/js/main.7b75b4b680b643b95eb3.hot-update.js": "/js/main.7b75b4b680b643b95eb3.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=05c548cd0ec1eeedd2e7",
+    "/chunks/shared-page.7b75b4b680b643b95eb3.hot-update.js": "/chunks/shared-page.7b75b4b680b643b95eb3.hot-update.js",
+    "/chunks/shared-page.be90af0a73c63bf01bde.hot-update.js": "/chunks/shared-page.be90af0a73c63bf01bde.hot-update.js",
+    "/chunks/shared-page.aa52ff5bdcdc54809c51.hot-update.js": "/chunks/shared-page.aa52ff5bdcdc54809c51.hot-update.js",
+    "/chunks/shared-page.ba3dad8617f524a7e966.hot-update.js": "/chunks/shared-page.ba3dad8617f524a7e966.hot-update.js",
+    "/chunks/shared-page.d5f69e25ab81635828a7.hot-update.js": "/chunks/shared-page.d5f69e25ab81635828a7.hot-update.js",
+    "/chunks/shared-page.5f5ad5da6520a3667e87.hot-update.js": "/chunks/shared-page.5f5ad5da6520a3667e87.hot-update.js",
+    "/chunks/shared-page.1b98a451ba368074d4a3.hot-update.js": "/chunks/shared-page.1b98a451ba368074d4a3.hot-update.js",
+    "/chunks/shared-page.ce5ec13b5cf0b33a2b73.hot-update.js": "/chunks/shared-page.ce5ec13b5cf0b33a2b73.hot-update.js",
+    "/js/main.e5d1cd32fad8ce607619.hot-update.js": "/js/main.e5d1cd32fad8ce607619.hot-update.js",
+    "/chunks/files.e5d1cd32fad8ce607619.hot-update.js": "/chunks/files.e5d1cd32fad8ce607619.hot-update.js",
+    "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=c779b44283fd9f6244cf",
+    "/chunks/shared-page.e5d1cd32fad8ce607619.hot-update.js": "/chunks/shared-page.e5d1cd32fad8ce607619.hot-update.js",
+    "/chunks/shared-page.4dc76f0921ffd7ee586e.hot-update.js": "/chunks/shared-page.4dc76f0921ffd7ee586e.hot-update.js",
+    "/chunks/shared-page.fc610beef47f6aeef9c1.hot-update.js": "/chunks/shared-page.fc610beef47f6aeef9c1.hot-update.js",
+    "/chunks/shared-page.9f0d2059bc2579889007.hot-update.js": "/chunks/shared-page.9f0d2059bc2579889007.hot-update.js",
+    "/chunks/shared-page.1e4303849b25170a39fe.hot-update.js": "/chunks/shared-page.1e4303849b25170a39fe.hot-update.js",
+    "/chunks/shared-page.c5d6e23ba4493b57e53b.hot-update.js": "/chunks/shared-page.c5d6e23ba4493b57e53b.hot-update.js",
+    "/chunks/shared-page.daff694175b61fa07627.hot-update.js": "/chunks/shared-page.daff694175b61fa07627.hot-update.js",
+    "/chunks/shared-page.3d9bdf182149c4236a05.hot-update.js": "/chunks/shared-page.3d9bdf182149c4236a05.hot-update.js",
+    "/chunks/shared-page.510eb221a21ca94e612d.hot-update.js": "/chunks/shared-page.510eb221a21ca94e612d.hot-update.js",
+    "/chunks/shared-page.11afb237a27dc973ef8f.hot-update.js": "/chunks/shared-page.11afb237a27dc973ef8f.hot-update.js",
+    "/chunks/shared-page.dcede24aeac93230ea35.hot-update.js": "/chunks/shared-page.dcede24aeac93230ea35.hot-update.js",
+    "/chunks/shared-page.fbcc9f2688a5d579b82a.hot-update.js": "/chunks/shared-page.fbcc9f2688a5d579b82a.hot-update.js",
+    "/chunks/shared-page.733b84debdb113129058.hot-update.js": "/chunks/shared-page.733b84debdb113129058.hot-update.js",
+    "/chunks/shared-page.03374aa4a0023538283c.hot-update.js": "/chunks/shared-page.03374aa4a0023538283c.hot-update.js",
+    "/chunks/shared-page.42b784ae57372664f191.hot-update.js": "/chunks/shared-page.42b784ae57372664f191.hot-update.js",
+    "/chunks/shared-page.8af2a8ea5e8c88f6ba92.hot-update.js": "/chunks/shared-page.8af2a8ea5e8c88f6ba92.hot-update.js",
+    "/chunks/shared-page.d9fb13fe1e208d798240.hot-update.js": "/chunks/shared-page.d9fb13fe1e208d798240.hot-update.js",
+    "/chunks/shared-page.c4ccb4e53511c3113dc8.hot-update.js": "/chunks/shared-page.c4ccb4e53511c3113dc8.hot-update.js",
+    "/chunks/shared-page.8f9fe627275cef8470d3.hot-update.js": "/chunks/shared-page.8f9fe627275cef8470d3.hot-update.js",
+    "/chunks/shared-page.8d714de0d86654485986.hot-update.js": "/chunks/shared-page.8d714de0d86654485986.hot-update.js",
+    "/chunks/shared-page.1961e46b55cb10c87483.hot-update.js": "/chunks/shared-page.1961e46b55cb10c87483.hot-update.js",
+    "/chunks/shared-page.9b7a42eba1f039590606.hot-update.js": "/chunks/shared-page.9b7a42eba1f039590606.hot-update.js",
+    "/chunks/shared-page.e1de6f61563c9578cbb3.hot-update.js": "/chunks/shared-page.e1de6f61563c9578cbb3.hot-update.js",
+    "/chunks/shared-page.532b36ed218cd523f116.hot-update.js": "/chunks/shared-page.532b36ed218cd523f116.hot-update.js",
+    "/chunks/shared-page.074501277539f576d3e1.hot-update.js": "/chunks/shared-page.074501277539f576d3e1.hot-update.js",
+    "/js/main.4b9eaa6f248ce1ee578d.hot-update.js": "/js/main.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/admin-account.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/admin-account.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~3b77a26e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~3b77a26e.js?id=9d0492e22b95d6abbb43",
+    "/chunks/app-setup.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/app-setup.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/billings-detail.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/billings-detail.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/create-new-password.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/create-new-password.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/database.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/database.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/environment-setup.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/environment-setup.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/files.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/files.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/trash~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/trash~chunks/user-subscription.js?id=24fbba2b9fd63699405c",
+    "/chunks/files~chunks/shared-files~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/trash.js?id=d1e7ff1551dd34dbcdc1",
+    "/chunks/forgotten-password.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/forgotten-password.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/installation-disclaimer.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/installation-disclaimer.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/not-found-shared.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/not-found-shared.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/purchase-code.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/purchase-code.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/shared-files.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/shared-files.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/shared-page.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/shared-page.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/sign-in.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/sign-in.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/sign-up.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/sign-up.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/stripe-credentials.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/stripe-credentials.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/subscription-plans.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/subscription-plans.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/subscription-service.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/subscription-service.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/trash.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/trash.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/chunks/upgrade.4b9eaa6f248ce1ee578d.hot-update.js": "/chunks/upgrade.4b9eaa6f248ce1ee578d.hot-update.js",
+    "/js/main.9c71e540e179fbcadff5.hot-update.js": "/js/main.9c71e540e179fbcadff5.hot-update.js",
+    "/chunks/files.9c71e540e179fbcadff5.hot-update.js": "/chunks/files.9c71e540e179fbcadff5.hot-update.js",
+    "/chunks/shared-page.9c71e540e179fbcadff5.hot-update.js": "/chunks/shared-page.9c71e540e179fbcadff5.hot-update.js",
+    "/chunks/shared-page.f45eb08b5287d0605a39.hot-update.js": "/chunks/shared-page.f45eb08b5287d0605a39.hot-update.js",
+    "/chunks/shared-page.260bb19085222289d9b3.hot-update.js": "/chunks/shared-page.260bb19085222289d9b3.hot-update.js",
+    "/chunks/shared-page.a62a9e6338abf3eed7f2.hot-update.js": "/chunks/shared-page.a62a9e6338abf3eed7f2.hot-update.js",
+    "/chunks/shared-page.54b3af030c5355da27e3.hot-update.js": "/chunks/shared-page.54b3af030c5355da27e3.hot-update.js",
+    "/chunks/shared-page.e3bf33aa54dfbba7de4e.hot-update.js": "/chunks/shared-page.e3bf33aa54dfbba7de4e.hot-update.js",
+    "/chunks/shared-page.f37089f8dd1262ea1a35.hot-update.js": "/chunks/shared-page.f37089f8dd1262ea1a35.hot-update.js",
+    "/chunks/shared-page.b842d05fbe3004584c7e.hot-update.js": "/chunks/shared-page.b842d05fbe3004584c7e.hot-update.js",
+    "/chunks/shared-page.672cfc16cc96758e938b.hot-update.js": "/chunks/shared-page.672cfc16cc96758e938b.hot-update.js",
+    "/chunks/shared-page.e504eb81d3268165c003.hot-update.js": "/chunks/shared-page.e504eb81d3268165c003.hot-update.js",
+    "/js/main.0a87a34223a61895e8ec.hot-update.js": "/js/main.0a87a34223a61895e8ec.hot-update.js",
+    "/chunks/shared-page.0a87a34223a61895e8ec.hot-update.js": "/chunks/shared-page.0a87a34223a61895e8ec.hot-update.js",
+    "/js/main.5f9ac4fd9fd64a72fc98.hot-update.js": "/js/main.5f9ac4fd9fd64a72fc98.hot-update.js",
+    "/js/main.814508864fef88c4e0bc.hot-update.js": "/js/main.814508864fef88c4e0bc.hot-update.js",
+    "/js/main.0498a10b8ef99cf80cc2.hot-update.js": "/js/main.0498a10b8ef99cf80cc2.hot-update.js",
+    "/js/main.6536d44aac6ab07eb98e.hot-update.js": "/js/main.6536d44aac6ab07eb98e.hot-update.js",
+    "/js/main.026222a7f70064478e87.hot-update.js": "/js/main.026222a7f70064478e87.hot-update.js",
+    "/js/main.7b3fe8ed3bcf19d613bb.hot-update.js": "/js/main.7b3fe8ed3bcf19d613bb.hot-update.js",
+    "/js/main.295cfe0bdda42969294f.hot-update.js": "/js/main.295cfe0bdda42969294f.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/FilePreviewNavigationPanel.vue b/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
index 7c2c5103..31f78c5c 100644
--- a/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
+++ b/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
@@ -3,7 +3,7 @@
 		<div class="name-wrapper">
 			<x-icon @click="closeFullPreview" size="22" class="icon-close"></x-icon>
 			<div class="name-count-wrapper">
-				<p class="title">{{ formatedName }}</p>
+				<p class="title">{{ formattedName }}</p>
 				<span class="file-count"> ({{ showingImageIndex + ' ' + $t('pronouns.of') + ' ' + filteredFiles.length }}) </span>
 			</div>
 			<span id="fast-preview-menu" class="fast-menu-icon" @click="menuOpen" v-if="$checkPermission(['master', 'editor'])">
@@ -17,7 +17,7 @@
 		<div class="navigation-icons">
 			<div class="navigation-tool-wrapper">
 				<ToolbarButton source="download" class="mobile-hide" @click.native="downloadItem" :action="$t('actions.download')" />
-				<ToolbarButton source="share" class="mobile-hide" :class="{ 'is-inactive': canShareInView }" :action="$t('actions.share')" @click.native="shareItem" />
+				<ToolbarButton v-if="canShowShareView" :class="{ 'is-inactive': canShareInView }" @click.native="shareItem" source="share" class="mobile-hide" :action="$t('actions.share')" />
 				<ToolbarButton v-if="this.fileInfoDetail[0].type === 'image'" source="print" :action="$t('actions.print')" @click.native="printMethod()" />
 			</div>
 		</div>
@@ -54,8 +54,7 @@ export default {
 			})
 			return activeIndex
 		},
-
-		formatedName() {
+		formattedName() {
 			//Name length handling
 			let name = this.fileInfoDetail[0].name
 			let windowWidth = window.innerWidth
@@ -75,8 +74,11 @@ export default {
 				})
 			}
 		},
+        canShowShareView() {
+			return this.$isThisLocation(['base', 'participant_uploads', 'latest', 'shared'])
+        },
 		canShareInView() {
-			return !this.$isThisLocation(['base', 'participant_uploads', 'latest', 'shared', 'public'])
+			return ! this.$isThisLocation(['base', 'participant_uploads', 'latest', 'shared'])
 		}
 	},
 	data() {
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index 119f7c91..c9270ed4 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -172,14 +172,6 @@ const actions = {
             })
             .catch(() => isSomethingWrong())
     },
-    getFileDetail: ({commit, getters}, file) => {
-        axios
-            .get(getters.api + '/file-detail/' + file.unique_id)
-            .then(response => {
-                commit('LOAD_FILEINFO_DETAIL', response.data)
-            })
-            .catch(() => isSomethingWrong())
-    },
     getFolderTree: ({commit, getters}) => {
 
         return new Promise((resolve, reject) => {
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index 2de6889a..86e495a7 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -68,9 +68,11 @@ const actions = {
 
                 events.$emit('scrollTop')
 
-                if ( getters.currentFolder.location !== 'public' ) {
+                if ( getters.currentFolder.location !== 'public' )
                     dispatch('getAppData')
-                }
+                if ( getters.currentFolder.location === 'public')
+                    dispatch('getFolderTree')
+
             })
             .catch(() => isSomethingWrong())
     },
@@ -96,6 +98,8 @@ const actions = {
 
                 if (data.type === 'folder' && getters.currentFolder.location !== 'public')
                     dispatch('getAppData')
+                if (data.type === 'folder' && getters.currentFolder.location === 'public')
+                    dispatch('getFolderTree')
             })
             .catch(() => isSomethingWrong())
     },
@@ -262,11 +266,15 @@ const actions = {
                                 dispatch('getFolder', [{folder: last(getters.browseHistory), back: true, init: false}])
                             }
                         }
-
-                        if ( getters.currentFolder.location !== 'public' )
-                            dispatch('getAppData')
                     }
                 })
+
+                if ( getters.currentFolder.location !== 'public' )
+                    dispatch('getAppData')
+
+                if ( getters.currentFolder.location === 'public')
+                    dispatch('getFolderTree')
+
             })
             .catch(() => isSomethingWrong())
     },
diff --git a/resources/js/views/Shared/SharedPage.vue b/resources/js/views/Shared/SharedPage.vue
index fffc9410..b8d6c2d3 100644
--- a/resources/js/views/Shared/SharedPage.vue
+++ b/resources/js/views/Shared/SharedPage.vue
@@ -41,37 +41,60 @@
             </AuthContent>
         </div>
 
-        <!--File browser-->
-        <div v-if="currentPage === 'page-files'" id="files-view">
-            <div id="single-file" v-if="sharedDetail.type === 'file'">
-                <div class="single-file-wrapper">
-                    <FileItemGrid v-if="sharedFile" :data="sharedFile" :context-menu="false"/>
+        <!--Single file page-->
+        <div id="single-file" v-if="sharedDetail.type === 'file' && currentPage === 'page-files'">
+            <div class="single-file-wrapper">
+                <FileItemGrid v-if="sharedFile" :data="sharedFile" :context-menu="false"/>
 
-                    <ButtonBase @click.native="download" class="download-button" button-style="theme">
-                        {{ $t('page_shared.download_file') }}
-                    </ButtonBase>
-                </div>
-            </div>
-            <div v-if="sharedDetail.type === 'folder'" @contextmenu.prevent.capture="contextMenu($event, undefined)" @click="fileViewClick">
-
-                <!--Context menu-->
-                <ContextMenu/>
-
-                <!--Desktop Toolbar-->
-                <DesktopToolbar/>
-
-                <!--File browser-->
-                <FileBrowser/>
+                <ButtonBase @click.native="download" class="download-button" button-style="theme">
+                    {{ $t('page_shared.download_file') }}
+                </ButtonBase>
             </div>
         </div>
+
+        <!--Items view page-->
+        <div id="viewport" v-if="sharedDetail.type === 'folder' && currentPage === 'page-files'" @contextmenu.prevent.capture="contextMenu($event, undefined)" @click="fileViewClick">
+
+                <ContentSidebar v-if="navigationTree && navigationTree.length > 1">
+                    <ContentGroup :title="$t('sidebar.locations_title')">
+                        <div class="menu-list-wrapper vertical">
+                            <a class="menu-list-item link" @click="goHome">
+                                <div class="icon">
+                                    <home-icon size="17"></home-icon>
+                                </div>
+                                <div class="label">
+                                    {{ $t('sidebar.home') }}
+                                </div>
+                            </a>
+                        </div>
+                    </ContentGroup>
+                    <ContentGroup :title="$t('sidebar.navigator_title')">
+                        <TreeMenuNavigator class="folder-tree" :depth="0" :nodes="items" v-for="items in navigationTree" :key="items.unique_id"/>
+                    </ContentGroup>
+                </ContentSidebar>
+
+                <div id="files-view">
+                    <!--Context menu-->
+                    <ContextMenu/>
+
+                    <!--Desktop Toolbar-->
+                    <DesktopToolbar/>
+
+                    <!--File browser-->
+                    <FileBrowser/>
+                </div>
+            </div>
     </div>
 </template>
 
 <script>
     import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
+    import TreeMenuNavigator from '@/components/Others/TreeMenuNavigator'
+    import FileFullPreview from '@/components/FilesView/FileFullPreview'
     import DesktopToolbar from '@/components/FilesView/DesktopToolbar'
-    import FileFullPreview from "@/components/FilesView/FileFullPreview";
+    import ContentSidebar from '@/components/Sidebar/ContentSidebar'
     import FileItemGrid from '@/components/FilesView/FileItemGrid'
+    import ContentGroup from '@/components/Sidebar/ContentGroup'
     import FileBrowser from '@/components/FilesView/FileBrowser'
     import ContextMenu from '@/components/FilesView/ContextMenu'
     import ButtonBase from '@/components/FilesView/ButtonBase'
@@ -86,21 +109,28 @@
     import {mapGetters} from 'vuex'
     import {events} from '@/bus'
     import axios from 'axios'
+    import {
+        HomeIcon,
+    } from 'vue-feather-icons'
 
     export default {
         name: 'SharedPage',
         components: {
             ValidationProvider,
             ValidationObserver,
+            TreeMenuNavigator,
             FileFullPreview,
             DesktopToolbar,
+            ContentSidebar,
             FileItemGrid,
+            ContentGroup,
             AuthContent,
             FileBrowser,
             ContextMenu,
             AuthButton,
             MobileMenu,
             ButtonBase,
+            HomeIcon,
             MoveItem,
             required,
             Vignette,
@@ -108,7 +138,15 @@
             Alert,
         },
         computed: {
-            ...mapGetters(['config', 'sharedDetail', 'sharedFile']),
+            ...mapGetters([
+                'config',
+                'sharedDetail',
+                'sharedFile',
+                'navigation'
+            ]),
+            navigationTree() {
+                return this.navigation ? this.navigation[0].folders : undefined
+            }
         },
         data() {
             return {
@@ -116,10 +154,14 @@
                 password: '',
                 isLoading: false,
                 isPageLoading: true,
-                currentPage: undefined
+                currentPage: undefined,
+                homeDirectory: undefined,
             }
         },
         methods: {
+            goHome() {
+                this.$store.dispatch('browseShared', [{folder: this.homeDirectory, back: false, init: true}])
+            },
             async authenticateProtected() {
 
                 // Validate fields
@@ -163,14 +205,17 @@
                 // Show folder
                 if (this.sharedDetail.type === 'folder') {
 
-                    let homeDirectory = {
+                    this.homeDirectory = {
                         unique_id: this.sharedDetail.item_id,
                         name: this.$t('locations.home'),
                         location: 'public',
                     }
 
+                    // Get folder tree
+                    this.$store.dispatch('getFolderTree')
+
                     // Load folder
-                    this.$store.dispatch('browseShared', [{folder: homeDirectory, back: false, init: true}])
+                    this.goHome()
                 }
 
                 // Get file
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 745e2563..70e2af8c 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -209,6 +209,10 @@
       .menu-list-item {
         padding: 8px 23px;
 
+        .label {
+          max-width: 140px;
+        }
+
         .icon {
           margin-right: 5px;
           width: 20px;
diff --git a/routes/api.php b/routes/api.php
index 8990e6f3..5041b254 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -99,7 +99,6 @@ Route::group(['middleware' => ['auth:api', 'auth.master', 'scope:master']], func
 
     // Browse
     Route::get('/participant-uploads', 'FileBrowser\BrowseController@participant_uploads');
-    Route::get('/file-detail/{unique_id}', 'FileBrowser\BrowseController@file_detail');
     Route::get('/navigation', 'FileBrowser\BrowseController@navigation_tree');
     Route::get('/folders/{unique_id}', 'FileBrowser\BrowseController@folder');
     Route::get('/shared-all', 'FileBrowser\BrowseController@shared');

From f863537190967e868a798e33fda4ab73fbf86a83 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sat, 21 Nov 2020 17:14:56 +0100
Subject: [PATCH 2/8] Integrated rename popup

---
 public/mix-manifest.json                      |  61 ++++++++-
 resources/js/App.vue                          |   5 +
 .../js/components/FilesView/ContextMenu.vue   |  55 ++++----
 .../js/components/FilesView/MobileMenu.vue    |  20 +--
 .../components/Others/Popup/PopupHeader.vue   |   4 +-
 resources/js/components/Others/RenameItem.vue | 129 ++++++++++++++++++
 resources/js/i18n/lang/cn.json                |   4 +-
 resources/js/i18n/lang/en.json                |   4 +-
 resources/js/i18n/lang/sk.json                |   4 +-
 resources/js/views/FilePages/Files.vue        |   1 +
 resources/js/views/Shared/SharedPage.vue      |  40 +++++-
 11 files changed, 269 insertions(+), 58 deletions(-)
 create mode 100644 resources/js/components/Others/RenameItem.vue

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 902ef18b..f83d5556 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -27,9 +27,9 @@
     "/chunks/database.js": "/chunks/database.js?id=a6f7e8d1696493c60072",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=f56517bee181ef89921f",
-    "/chunks/files.js": "/chunks/files.js?id=52fcc78719bcc5537509",
+    "/chunks/files.js": "/chunks/files.js?id=e3c6ea1a30b677daea6f",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=335030ccf561b022c47f",
-    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=d345ab220fcc39b4d4e1",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=fe3fac648fc629b4dd8e",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=06fc72f0d9a057bb8f18",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=fe3a39bf87ae2a2f5a64",
     "/chunks/invoices.js": "/chunks/invoices.js?id=30bbcaf349ff65a0270b",
@@ -55,7 +55,7 @@
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=6172a89afe3b27cb76cd",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=99b4f321902fe6b0eb23",
     "/chunks/shared-files.js": "/chunks/shared-files.js?id=a1262ec81010fb16f1e8",
-    "/chunks/shared-page.js": "/chunks/shared-page.js?id=8dfe757b4ccdf4bbe241",
+    "/chunks/shared-page.js": "/chunks/shared-page.js?id=12a2c4d491940272159b",
     "/chunks/sign-in.js": "/chunks/sign-in.js?id=ddb0ae9561462e691ce3",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=be89f6dcf7372d23668f",
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=63c4118231cfa758568a",
@@ -175,5 +175,58 @@
     "/js/main.6536d44aac6ab07eb98e.hot-update.js": "/js/main.6536d44aac6ab07eb98e.hot-update.js",
     "/js/main.026222a7f70064478e87.hot-update.js": "/js/main.026222a7f70064478e87.hot-update.js",
     "/js/main.7b3fe8ed3bcf19d613bb.hot-update.js": "/js/main.7b3fe8ed3bcf19d613bb.hot-update.js",
-    "/js/main.295cfe0bdda42969294f.hot-update.js": "/js/main.295cfe0bdda42969294f.hot-update.js"
+    "/js/main.295cfe0bdda42969294f.hot-update.js": "/js/main.295cfe0bdda42969294f.hot-update.js",
+    "/chunks/shared-page.ce7a7f06cb2ccc502cab.hot-update.js": "/chunks/shared-page.ce7a7f06cb2ccc502cab.hot-update.js",
+    "/chunks/files.dce81e3ba61531fc316d.hot-update.js": "/chunks/files.dce81e3ba61531fc316d.hot-update.js",
+    "/chunks/shared-page.dce81e3ba61531fc316d.hot-update.js": "/chunks/shared-page.dce81e3ba61531fc316d.hot-update.js",
+    "/chunks/shared-page.36576c6e9ffa0c413472.hot-update.js": "/chunks/shared-page.36576c6e9ffa0c413472.hot-update.js",
+    "/chunks/shared-page.36fc08d913a707b4ca84.hot-update.js": "/chunks/shared-page.36fc08d913a707b4ca84.hot-update.js",
+    "/chunks/shared-page.1072e16a07a6a7450f77.hot-update.js": "/chunks/shared-page.1072e16a07a6a7450f77.hot-update.js",
+    "/chunks/shared-page.ad503d19980a760315b8.hot-update.js": "/chunks/shared-page.ad503d19980a760315b8.hot-update.js",
+    "/chunks/shared-page.51fb9b41c2a24944e261.hot-update.js": "/chunks/shared-page.51fb9b41c2a24944e261.hot-update.js",
+    "/js/main.dba0cbb000b00cbf2aa9.hot-update.js": "/js/main.dba0cbb000b00cbf2aa9.hot-update.js",
+    "/js/main.ffec6f2854480b7fce05.hot-update.js": "/js/main.ffec6f2854480b7fce05.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.43777e51472f17e59401.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.43777e51472f17e59401.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.c0d69bf97c69edbc69f8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.c0d69bf97c69edbc69f8.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.702dd06c4143449aabaa.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.702dd06c4143449aabaa.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6e058c9bf43a48e04335.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.6e058c9bf43a48e04335.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.546aacb945674dcc97fa.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.546aacb945674dcc97fa.hot-update.js",
+    "/js/main.0b0bb6325efedcce87c8.hot-update.js": "/js/main.0b0bb6325efedcce87c8.hot-update.js",
+    "/js/main.a2c31e95d09224ce978f.hot-update.js": "/js/main.a2c31e95d09224ce978f.hot-update.js",
+    "/js/main.77f61443a542361ce712.hot-update.js": "/js/main.77f61443a542361ce712.hot-update.js",
+    "/js/main.56a9ad2eccaed3b32788.hot-update.js": "/js/main.56a9ad2eccaed3b32788.hot-update.js",
+    "/js/main.522e0b72e965b21d282d.hot-update.js": "/js/main.522e0b72e965b21d282d.hot-update.js",
+    "/js/main.317fd94b7d93220a4426.hot-update.js": "/js/main.317fd94b7d93220a4426.hot-update.js",
+    "/js/main.d80ab0b7369ef5eb4ca9.hot-update.js": "/js/main.d80ab0b7369ef5eb4ca9.hot-update.js",
+    "/js/main.cdec973619d2769e5030.hot-update.js": "/js/main.cdec973619d2769e5030.hot-update.js",
+    "/js/main.e65a9bb99bd94535fd1e.hot-update.js": "/js/main.e65a9bb99bd94535fd1e.hot-update.js",
+    "/js/main.bb5c0d0c89a9f90efa6a.hot-update.js": "/js/main.bb5c0d0c89a9f90efa6a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.2468f92bbfd70593a52a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.2468f92bbfd70593a52a.hot-update.js",
+    "/js/main.4a6b5485cda66662adf4.hot-update.js": "/js/main.4a6b5485cda66662adf4.hot-update.js",
+    "/js/main.cf87559a4b1814df3137.hot-update.js": "/js/main.cf87559a4b1814df3137.hot-update.js",
+    "/js/main.c1251372f151ebf4fc88.hot-update.js": "/js/main.c1251372f151ebf4fc88.hot-update.js",
+    "/js/main.167d349e835030519fa1.hot-update.js": "/js/main.167d349e835030519fa1.hot-update.js",
+    "/js/main.9747d9cbfbd0e2e6844a.hot-update.js": "/js/main.9747d9cbfbd0e2e6844a.hot-update.js",
+    "/js/main.c8c07b40e5347403205f.hot-update.js": "/js/main.c8c07b40e5347403205f.hot-update.js",
+    "/js/main.adcc6923c3c40b516033.hot-update.js": "/js/main.adcc6923c3c40b516033.hot-update.js",
+    "/js/main.786e04bb61a741de6f8a.hot-update.js": "/js/main.786e04bb61a741de6f8a.hot-update.js",
+    "/js/main.16c72f9f1c5efcc43e10.hot-update.js": "/js/main.16c72f9f1c5efcc43e10.hot-update.js",
+    "/js/main.b9605399b515b6a49942.hot-update.js": "/js/main.b9605399b515b6a49942.hot-update.js",
+    "/js/main.458e636eb80a7f566c69.hot-update.js": "/js/main.458e636eb80a7f566c69.hot-update.js",
+    "/js/main.b61145b946c1fe26d62d.hot-update.js": "/js/main.b61145b946c1fe26d62d.hot-update.js",
+    "/js/main.7170c1e42e25e7fb4152.hot-update.js": "/js/main.7170c1e42e25e7fb4152.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.7170c1e42e25e7fb4152.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.7170c1e42e25e7fb4152.hot-update.js",
+    "/js/main.4c08be8ed7a82c1d4869.hot-update.js": "/js/main.4c08be8ed7a82c1d4869.hot-update.js",
+    "/js/main.d40f0e922729609f7376.hot-update.js": "/js/main.d40f0e922729609f7376.hot-update.js",
+    "/js/main.b326c6fdedae6d3cdae8.hot-update.js": "/js/main.b326c6fdedae6d3cdae8.hot-update.js",
+    "/js/main.4fbb94382a8aa1bb7c93.hot-update.js": "/js/main.4fbb94382a8aa1bb7c93.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.3d7c28fe519c04f20937.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.3d7c28fe519c04f20937.hot-update.js",
+    "/js/main.ef1264b01d98967dd243.hot-update.js": "/js/main.ef1264b01d98967dd243.hot-update.js",
+    "/js/main.adb6bce7c8c57d9886e0.hot-update.js": "/js/main.adb6bce7c8c57d9886e0.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.31bfc07787a406c900c3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.31bfc07787a406c900c3.hot-update.js",
+    "/chunks/shared-page.19257945cfcc3590213e.hot-update.js": "/chunks/shared-page.19257945cfcc3590213e.hot-update.js",
+    "/js/main.a7e0ee0912b0c6965dfb.hot-update.js": "/js/main.a7e0ee0912b0c6965dfb.hot-update.js",
+    "/js/main.d9b86a7675569dbff5b0.hot-update.js": "/js/main.d9b86a7675569dbff5b0.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b466240212bb08f60c81.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b466240212bb08f60c81.hot-update.js",
+    "/js/main.0144cb83b62ec5df33ec.hot-update.js": "/js/main.0144cb83b62ec5df33ec.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 38f0b66c..90ebef08 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -19,6 +19,9 @@
             <ShareCreate/>
             <ShareEdit/>
 
+            <!--Rename folder or file item-->
+            <RenameItem/>
+
             <!--Move item setup-->
             <MoveItem/>
 
@@ -54,6 +57,7 @@
     import MobileMenu from '@/components/FilesView/MobileMenu'
     import ShareCreate from '@/components/Others/ShareCreate'
     import Confirm from '@/components/Others/Popup/Confirm'
+    import RenameItem from '@/components/Others/RenameItem'
     import ShareEdit from '@/components/Others/ShareEdit'
     import MoveItem from '@/components/Others/MoveItem'
     import Vignette from '@/components/Others/Vignette'
@@ -71,6 +75,7 @@
             FileFullPreview,
             ToastrWrapper,
             ShareCreate,
+            RenameItem,
             MobileMenu,
             ShareEdit,
             MoveItem,
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index 7298ee7d..dcd0ec3e 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -96,7 +96,7 @@
 
         <!--ContextMenu for Base location with MASTER permission-->
         <div v-if="$isThisLocation(['shared']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
-            <ul class="menu-option-group" v-if="item && isFolder &&  multiSelectContextMenu">
+            <ul class="menu-option-group" v-if="item && isFolder && multiSelectContextMenu">
                 <li class="menu-option" @click="addToFavourites">
                     <div class="icon">
                         <star-icon size="17"></star-icon>
@@ -111,6 +111,14 @@
                 </li>
             </ul>
             <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="renameItem">
+                    <div class="icon">
+                        <edit2-icon size="17"></edit2-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.rename') }}
+                    </div>
+                </li>
                 <li class="menu-option" @click="shareItem" v-if="multiSelectContextMenu">
                     <div class="icon">
                         <link-icon size="17"></link-icon>
@@ -132,7 +140,7 @@
                     </div>
                 </li>
             </ul>
-            <ul class="menu-option-group" v-if="item &&  multiSelectContextMenu">
+            <ul class="menu-option-group" v-if="item && multiSelectContextMenu">
                 <li class="menu-option" @click="ItemDetail" v-if="item">
                     <div class="icon">
                         <eye-icon size="17"></eye-icon>
@@ -180,6 +188,14 @@
                 </li>
             </ul>
             <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="renameItem">
+                    <div class="icon">
+                        <edit2-icon size="17"></edit2-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.rename') }}
+                    </div>
+                </li>
                 <li class="menu-option" @click="moveItem">
                     <div class="icon">
                         <corner-down-right-icon size="17"></corner-down-right-icon>
@@ -242,6 +258,14 @@
                 </li>
             </ul>
             <ul class="menu-option-group" v-if="item">
+                <li class="menu-option" @click="renameItem">
+                    <div class="icon">
+                        <edit2-icon size="17"></edit2-icon>
+                    </div>
+                    <div class="text-label">
+                        {{ $t('context_menu.rename') }}
+                    </div>
+                </li>
                 <li class="menu-option" @click="moveItem">
                     <div class="icon">
                         <corner-down-right-icon size="17"></corner-down-right-icon>
@@ -381,33 +405,17 @@ export default {
 
     methods: {
         renameItem() {
-            let itemName = prompt(this.$t('popup_rename.title'), this.item.name)
-
-            if (itemName && itemName !== '') {
-                let item = {
-                    unique_id: this.item.unique_id,
-                    type: this.item.type,
-                    name: itemName
-                }
-
-                this.$store.dispatch('renameItem', item)
-
-                // Change item name if is mobile device or prompted
-                if (this.$isMobile()) {
-                    events.$emit('change:name', item)
-                }
-            }
+            events.$emit('popup:open', { name: 'rename-item', item: this.item })
         },
         moveItem() {
-            // Open move item popup
             events.$emit('popup:open', { name: 'move', item: [this.item] })
         },
         shareItem() {
             if (this.item.shared) {
-                // Open share item popup
+                // Open edit share popup
                 events.$emit('popup:open', { name: 'share-edit', item: this.item })
             } else {
-                // Open share item popup
+                // Open create share popup
                 events.$emit('popup:open', { name: 'share-create', item: this.item })
             }
         },
@@ -432,10 +440,7 @@ export default {
         },
         downloadItem() {
             // Download file
-            this.$downloadFile(
-                this.item.file_url,
-                this.item.name + '.' + this.item.mimetype
-            )
+            this.$downloadFile(this.item.file_url, this.item.name + '.' + this.item.mimetype)
         },
         ItemDetail() {
             // Dispatch load file info detail
diff --git a/resources/js/components/FilesView/MobileMenu.vue b/resources/js/components/FilesView/MobileMenu.vue
index 05e31bcb..4da8bb77 100644
--- a/resources/js/components/FilesView/MobileMenu.vue
+++ b/resources/js/components/FilesView/MobileMenu.vue
@@ -442,25 +442,7 @@ export default {
       }
     },
     renameItem() {
-      let itemName = prompt(
-        this.$t("popup_rename.title"),
-        this.fileInfoDetail[0].name
-      );
-
-      if (itemName && itemName !== "") {
-        let item = {
-          unique_id: this.fileInfoDetail[0].unique_id,
-          type: this.fileInfoDetail[0].type,
-          name: itemName,
-        };
-
-        this.$store.dispatch("renameItem", item);
-
-        // Change item name if is mobile device or prompted
-        if (this.$isMobile()) {
-          events.$emit("change:name", item);
-        }
-      }
+        events.$emit('popup:open', { name: 'rename-item', item: this.fileInfoDetail[0] })
     },
     closeAndResetContextMenu() {
       //If emit to show menu coming from MediaFullPreview dont reset data
diff --git a/resources/js/components/Others/Popup/PopupHeader.vue b/resources/js/components/Others/Popup/PopupHeader.vue
index c4910c12..e38881c6 100644
--- a/resources/js/components/Others/Popup/PopupHeader.vue
+++ b/resources/js/components/Others/Popup/PopupHeader.vue
@@ -3,6 +3,7 @@
         <div class="icon">
             <corner-down-right-icon v-if="icon === 'move'" size="15" class="title-icon"></corner-down-right-icon>
             <link-icon v-if="icon === 'share'" size="17" class="title-icon"></link-icon>
+            <edit2-icon v-if="icon === 'edit'" size="17" class="title-icon"></edit2-icon>
         </div>
         <div class="label">
             <h1 class="title">{{ title }}</h1>
@@ -12,7 +13,7 @@
 </template>
 
 <script>
-    import {CornerDownRightIcon, LinkIcon, XIcon} from 'vue-feather-icons'
+    import {CornerDownRightIcon, LinkIcon, XIcon, Edit2Icon} from 'vue-feather-icons'
     import {events} from '@/bus'
 
     export default {
@@ -22,6 +23,7 @@
         ],
         components: {
             CornerDownRightIcon,
+            Edit2Icon,
             LinkIcon,
             XIcon,
         },
diff --git a/resources/js/components/Others/RenameItem.vue b/resources/js/components/Others/RenameItem.vue
new file mode 100644
index 00000000..ab834df4
--- /dev/null
+++ b/resources/js/components/Others/RenameItem.vue
@@ -0,0 +1,129 @@
+<template>
+    <PopupWrapper name="rename-item">
+        <!--Title-->
+        <PopupHeader :title="$t('popup_rename.title', {item: itemTypeTitle})" icon="edit" />
+
+        <!--Content-->
+        <PopupContent>
+
+            <!--Item Thumbnail-->
+            <ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata"/>
+
+            <!--Form to set sharing-->
+            <ValidationObserver @submit.prevent="changeName" ref="renameForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+
+                <!--Set password-->
+                <ValidationProvider tag="div" mode="passive" class="input-wrapper password" name="Password" rules="required" v-slot="{ errors }">
+                    <label class="input-label">{{ $t('popup_rename.label') }}:</label>
+                    <input v-model="pickedItem.name" :class="{'is-error': errors[0]}" type="text" :placeholder="$t('popup_rename.placeholder')">
+                    <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+                </ValidationProvider>
+            </ValidationObserver>
+        </PopupContent>
+
+        <!--Actions-->
+        <PopupActions>
+            <ButtonBase
+                    class="popup-button"
+                    @click.native="$closePopup()"
+                    button-style="secondary"
+            >{{ $t('popup_move_item.cancel') }}
+            </ButtonBase>
+            <ButtonBase
+                    class="popup-button"
+                    @click.native="changeName"
+                    button-style="theme"
+            >{{ $t('popup_share_edit.save') }}
+            </ButtonBase>
+        </PopupActions>
+    </PopupWrapper>
+</template>
+
+<script>
+    import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
+    import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
+    import PopupActions from '@/components/Others/Popup/PopupActions'
+    import PopupContent from '@/components/Others/Popup/PopupContent'
+    import PopupHeader from '@/components/Others/Popup/PopupHeader'
+    import ThumbnailItem from '@/components/Others/ThumbnailItem'
+    import ActionButton from '@/components/Others/ActionButton'
+    import ButtonBase from '@/components/FilesView/ButtonBase'
+    import {required} from 'vee-validate/dist/rules'
+    import {events} from '@/bus'
+    import axios from 'axios'
+
+    export default {
+        name: 'RenameItem',
+        components: {
+            ValidationProvider,
+            ValidationObserver,
+            ThumbnailItem,
+            ActionButton,
+            PopupWrapper,
+            PopupActions,
+            PopupContent,
+            PopupHeader,
+            ButtonBase,
+            required,
+        },
+        computed: {
+            itemTypeTitle() {
+                return this.pickedItem && this.pickedItem.type === 'folder' ? this.$t('types.folder') : this.$t('types.file')
+            },
+        },
+        data() {
+            return {
+                pickedItem: undefined,
+            }
+        },
+        methods: {
+            changeName() {
+                if (this.pickedItem.name && this.pickedItem.name !== '') {
+
+                    let item = {
+                        unique_id: this.pickedItem.unique_id,
+                        type: this.pickedItem.type,
+                        name: this.pickedItem.name
+                    }
+
+                    // Rename item request
+                    this.$store.dispatch('renameItem', item)
+
+                    // Rename item in view
+                    events.$emit('change:name', item)
+
+                    this.$closePopup()
+                }
+            },
+        },
+        mounted() {
+
+            // Show popup
+            events.$on('popup:open', args => {
+
+                if (args.name !== 'rename-item') return
+
+                // Store picked item
+                this.pickedItem = args.item
+            })
+
+            // Close popup
+            events.$on('popup:close', () => {
+
+                // Restore data
+                setTimeout(() => {
+                    //
+                }, 150)
+            })
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    @import "@assets/vue-file-manager/_inapp-forms.scss";
+    @import '@assets/vue-file-manager/_forms';
+
+    .item-thumbnail {
+        margin-bottom: 20px;
+    }
+</style>
diff --git a/resources/js/i18n/lang/cn.json b/resources/js/i18n/lang/cn.json
index 6ea11a9e..ec9f289b 100644
--- a/resources/js/i18n/lang/cn.json
+++ b/resources/js/i18n/lang/cn.json
@@ -548,7 +548,9 @@
 		"title": "File is too large"
 	},
 	"popup_rename": {
-		"title": "修改文件/夹名称"
+		"title": "Rename Your {item}",
+		"label": "Edit Name",
+		"placeholder": "Type your title"
 	},
 	"popup_set_card": {
 		"message": "您的卡将被设置为默认卡，并且在以后的结算中始终会收取费用。",
diff --git a/resources/js/i18n/lang/en.json b/resources/js/i18n/lang/en.json
index e80b6ab4..7e7a0ecf 100644
--- a/resources/js/i18n/lang/en.json
+++ b/resources/js/i18n/lang/en.json
@@ -550,7 +550,9 @@
 		"title": "File is too large"
 	},
 	"popup_rename": {
-		"title": "Change your item name"
+		"title": "Rename Your {item}",
+		"label": "Edit Name",
+		"placeholder": "Type your title"
 	},
 	"popup_set_card": {
 		"message": "Your card will be set as default and will be always charged for the next billings.",
diff --git a/resources/js/i18n/lang/sk.json b/resources/js/i18n/lang/sk.json
index f28807f5..601d4565 100644
--- a/resources/js/i18n/lang/sk.json
+++ b/resources/js/i18n/lang/sk.json
@@ -550,7 +550,9 @@
 		"title": "Súbor je príliš veľký"
 	},
 	"popup_rename": {
-		"title": "Zmeňte názov položky"
+		"title": "Zmeňte názov {item}",
+		"label": "Zmeniť názov",
+		"placeholder": "Napíš názov..."
 	},
 	"popup_set_card": {
 		"message": "Vaša karta bude nastavená ako predvolená a bude vám z nej vždy stiahnutá čiastka za nasledujúce obdobie fakturácie.",
diff --git a/resources/js/views/FilePages/Files.vue b/resources/js/views/FilePages/Files.vue
index 99924833..1e035340 100644
--- a/resources/js/views/FilePages/Files.vue
+++ b/resources/js/views/FilePages/Files.vue
@@ -3,6 +3,7 @@
 
         <ContentSidebar>
 
+            <!--Empty storage warning-->
             <ContentGroup v-if="config.storageLimit && storage.used > 95">
                 <UpgradeSidebarBanner />
             </ContentGroup>
diff --git a/resources/js/views/Shared/SharedPage.vue b/resources/js/views/Shared/SharedPage.vue
index b8d6c2d3..f30b24d0 100644
--- a/resources/js/views/Shared/SharedPage.vue
+++ b/resources/js/views/Shared/SharedPage.vue
@@ -9,6 +9,9 @@
         <!--Move item setup-->
         <MoveItem />
 
+        <!--Rename folder or file item-->
+        <RenameItem/>
+
         <!--Mobile Menu-->
         <MobileMenu/>
 
@@ -19,7 +22,7 @@
         <Vignette/>
 
         <!--Password verification-->
-        <div v-if="currentPage === 'page-password'" id="password-view">
+        <div v-if="isPagePasswordVerification" id="password-view">
 
             <!--Verify share link by password-->
             <AuthContent class="center" name="password" :visible="true">
@@ -42,7 +45,7 @@
         </div>
 
         <!--Single file page-->
-        <div id="single-file" v-if="sharedDetail.type === 'file' && currentPage === 'page-files'">
+        <div v-if="sharedDetail.type === 'file' && isPageFiles" id="single-file">
             <div class="single-file-wrapper">
                 <FileItemGrid v-if="sharedFile" :data="sharedFile" :context-menu="false"/>
 
@@ -52,10 +55,15 @@
             </div>
         </div>
 
-        <!--Items view page-->
-        <div id="viewport" v-if="sharedDetail.type === 'folder' && currentPage === 'page-files'" @contextmenu.prevent.capture="contextMenu($event, undefined)" @click="fileViewClick">
+        <!--Multiple items view page-->
+        <div v-if="sharedDetail.type === 'folder' && isPageFiles"
+             @contextmenu.prevent.capture="contextMenu($event, undefined)"
+             @click="fileViewClick"
+             id="viewport">
 
-                <ContentSidebar v-if="navigationTree && navigationTree.length > 1">
+                <ContentSidebar v-if="navigationTree">
+
+                    <!--Locations-->
                     <ContentGroup :title="$t('sidebar.locations_title')">
                         <div class="menu-list-wrapper vertical">
                             <a class="menu-list-item link" @click="goHome">
@@ -68,7 +76,12 @@
                             </a>
                         </div>
                     </ContentGroup>
-                    <ContentGroup :title="$t('sidebar.navigator_title')">
+
+                    <!--Navigator-->
+                    <ContentGroup :title="$t('sidebar.navigator_title')" class="navigator">
+                        <span class="empty-note navigator" v-if="navigationTree.length == 0">
+                            {{ $t('sidebar.folders_empty') }}
+                        </span>
                         <TreeMenuNavigator class="folder-tree" :depth="0" :nodes="items" v-for="items in navigationTree" :key="items.unique_id"/>
                     </ContentGroup>
                 </ContentSidebar>
@@ -100,6 +113,7 @@
     import ButtonBase from '@/components/FilesView/ButtonBase'
     import MobileMenu from '@/components/FilesView/MobileMenu'
     import AuthContent from '@/components/Auth/AuthContent'
+    import RenameItem from '@/components/Others/RenameItem'
     import AuthButton from '@/components/Auth/AuthButton'
     import Spinner from '@/components/FilesView/Spinner'
     import MoveItem from '@/components/Others/MoveItem'
@@ -130,6 +144,7 @@
             AuthButton,
             MobileMenu,
             ButtonBase,
+            RenameItem,
             HomeIcon,
             MoveItem,
             required,
@@ -146,6 +161,12 @@
             ]),
             navigationTree() {
                 return this.navigation ? this.navigation[0].folders : undefined
+            },
+            isPageFiles() {
+                return this.currentPage === 'page-files'
+            },
+            isPagePasswordVerification() {
+                return this.currentPage === 'page-password'
             }
         },
         data() {
@@ -333,4 +354,11 @@
         }
     }
 
+    .empty-note {
+
+        &.navigator {
+            padding: 5px 25px 10px;
+        }
+    }
+
 </style>

From b38333bb64fb1424c31629812d0d2bf93eb625df Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sat, 21 Nov 2020 18:02:46 +0100
Subject: [PATCH 3/8] Trash moved to file page

---
 public/mix-manifest.json                    | 35 ++++++++++++--
 resources/js/components/Sidebar/MenuBar.vue | 12 ++---
 resources/js/i18n/lang/cn.json              |  9 ++--
 resources/js/i18n/lang/en.json              |  9 ++--
 resources/js/i18n/lang/sk.json              |  9 ++--
 resources/js/router.js                      |  9 ----
 resources/js/store/modules/fileFunctions.js |  6 ---
 resources/js/views/FilePages/Files.vue      | 14 ++++++
 resources/js/views/FilePages/Trash.vue      | 51 ---------------------
 resources/sass/app.scss                     | 16 +++++++
 10 files changed, 77 insertions(+), 93 deletions(-)
 delete mode 100644 resources/js/views/FilePages/Trash.vue

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index f83d5556..2380fc80 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -27,7 +27,7 @@
     "/chunks/database.js": "/chunks/database.js?id=a6f7e8d1696493c60072",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=f56517bee181ef89921f",
-    "/chunks/files.js": "/chunks/files.js?id=e3c6ea1a30b677daea6f",
+    "/chunks/files.js": "/chunks/files.js?id=ab5e91e9877f2478d323",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=335030ccf561b022c47f",
     "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=fe3fac648fc629b4dd8e",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=06fc72f0d9a057bb8f18",
@@ -61,7 +61,7 @@
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=63c4118231cfa758568a",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=c980f249fc2160857d83",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=00c4ca867ef06d26531f",
-    "/chunks/trash.js": "/chunks/trash.js?id=23a7513cb5cf933ac4ae",
+    "/chunks/trash.js": "/chunks/trash.js?id=858de1ee82d7211430ae",
     "/chunks/upgrade.js": "/chunks/upgrade.js?id=162c5e25074368ca36d1",
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=638ac716c4995894563c",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e912e466f43f90392e50",
@@ -228,5 +228,34 @@
     "/js/main.a7e0ee0912b0c6965dfb.hot-update.js": "/js/main.a7e0ee0912b0c6965dfb.hot-update.js",
     "/js/main.d9b86a7675569dbff5b0.hot-update.js": "/js/main.d9b86a7675569dbff5b0.hot-update.js",
     "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b466240212bb08f60c81.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.b466240212bb08f60c81.hot-update.js",
-    "/js/main.0144cb83b62ec5df33ec.hot-update.js": "/js/main.0144cb83b62ec5df33ec.hot-update.js"
+    "/js/main.0144cb83b62ec5df33ec.hot-update.js": "/js/main.0144cb83b62ec5df33ec.hot-update.js",
+    "/chunks/files.7c1ab1d6aa243a75662c.hot-update.js": "/chunks/files.7c1ab1d6aa243a75662c.hot-update.js",
+    "/chunks/files.35421ebd1f54be7c94ca.hot-update.js": "/chunks/files.35421ebd1f54be7c94ca.hot-update.js",
+    "/chunks/files.e07ed5471a8429c2fb33.hot-update.js": "/chunks/files.e07ed5471a8429c2fb33.hot-update.js",
+    "/chunks/files.27da7912e4499b5a8854.hot-update.js": "/chunks/files.27da7912e4499b5a8854.hot-update.js",
+    "/chunks/files.be6162bf354ed5fd5a3b.hot-update.js": "/chunks/files.be6162bf354ed5fd5a3b.hot-update.js",
+    "/chunks/files.acf14af7dab5ad3cc755.hot-update.js": "/chunks/files.acf14af7dab5ad3cc755.hot-update.js",
+    "/js/main.9efef46a124f1f10205b.hot-update.js": "/js/main.9efef46a124f1f10205b.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=e2ca36edc63a7302336d",
+    "/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=45fda8f6cfee1ae1289f",
+    "/chunks/trash.9efef46a124f1f10205b.hot-update.js": "/chunks/trash.9efef46a124f1f10205b.hot-update.js",
+    "/js/main.21d38cf664bf36a3218d.hot-update.js": "/js/main.21d38cf664bf36a3218d.hot-update.js",
+    "/js/main.c0bd185ce5cf6d0f42fe.hot-update.js": "/js/main.c0bd185ce5cf6d0f42fe.hot-update.js",
+    "/js/main.2b4f0d55d74d9376dc97.hot-update.js": "/js/main.2b4f0d55d74d9376dc97.hot-update.js",
+    "/js/main.a83317b5c21fd312880d.hot-update.js": "/js/main.a83317b5c21fd312880d.hot-update.js",
+    "/js/main.eb444d340edc27fb4306.hot-update.js": "/js/main.eb444d340edc27fb4306.hot-update.js",
+    "/js/main.92a0c47caf92d5513e27.hot-update.js": "/js/main.92a0c47caf92d5513e27.hot-update.js",
+    "/chunks/files.0a44809aa04c98dc77f0.hot-update.js": "/chunks/files.0a44809aa04c98dc77f0.hot-update.js",
+    "/js/main.610ae15e30ce0bad02e3.hot-update.js": "/js/main.610ae15e30ce0bad02e3.hot-update.js",
+    "/js/main.f1feddde73f2d92b644f.hot-update.js": "/js/main.f1feddde73f2d92b644f.hot-update.js",
+    "/js/main.ccf2331964e8ad03311f.hot-update.js": "/js/main.ccf2331964e8ad03311f.hot-update.js",
+    "/js/main.1e3f69887fecaf4a3b38.hot-update.js": "/js/main.1e3f69887fecaf4a3b38.hot-update.js",
+    "/chunks/files.d02b0e6f0915db18a034.hot-update.js": "/chunks/files.d02b0e6f0915db18a034.hot-update.js",
+    "/chunks/files.4a15f2423fd82ae2afcd.hot-update.js": "/chunks/files.4a15f2423fd82ae2afcd.hot-update.js",
+    "/js/main.95d913389693387ea34d.hot-update.js": "/js/main.95d913389693387ea34d.hot-update.js",
+    "/js/main.3295b76e0199daee33ab.hot-update.js": "/js/main.3295b76e0199daee33ab.hot-update.js",
+    "/js/main.5cadc640fd72e10023d0.hot-update.js": "/js/main.5cadc640fd72e10023d0.hot-update.js",
+    "/js/main.c19b586ae30be0c51c01.hot-update.js": "/js/main.c19b586ae30be0c51c01.hot-update.js",
+    "/js/main.c65cb1734de918f616d0.hot-update.js": "/js/main.c65cb1734de918f616d0.hot-update.js"
 }
diff --git a/resources/js/components/Sidebar/MenuBar.vue b/resources/js/components/Sidebar/MenuBar.vue
index 8e7fe432..00674c8d 100644
--- a/resources/js/components/Sidebar/MenuBar.vue
+++ b/resources/js/components/Sidebar/MenuBar.vue
@@ -20,19 +20,13 @@
                 </div>
             </router-link>
 
-            <router-link :to="{name: 'Trash'}" :title="$t('locations.trash')" class="icon-navigation-item trash">
-                <div class="button-icon">
-                    <trash-2-icon size="19"></trash-2-icon>
-                </div>
-            </router-link>
-
-            <router-link :to="{name: 'Profile'}" :class="{'is-active': isUserProfileRoute}" class="icon-navigation-item settings">
+            <router-link :to="{name: 'Profile'}" :class="{'is-active': isUserProfileRoute}" :title="$t('locations.profile')" class="icon-navigation-item settings">
                 <div class="button-icon">
                     <user-icon size="19"></user-icon>
                 </div>
             </router-link>
 
-            <router-link v-if="user.data.attributes.role === 'admin'" :to="{name: 'Dashboard'}" :class="{'is-active': $isThisRoute($route, adminRoutes)}" class="icon-navigation-item users">
+            <router-link v-if="user.data.attributes.role === 'admin'" :to="{name: 'Dashboard'}" :class="{'is-active': $isThisRoute($route, adminRoutes)}" :title="$t('locations.settings')" class="icon-navigation-item users">
                 <div class="button-icon">
                     <settings-icon size="19"></settings-icon>
                 </div>
@@ -41,7 +35,7 @@
 
         <!--User avatar & Logout-->
         <ul class="icon-navigation logout">
-            <li @click="$store.dispatch('logOut')" class="icon-navigation-item">
+            <li @click="$store.dispatch('logOut')" :title="$t('locations.logout')" class="icon-navigation-item">
                 <div class="button-icon">
                     <power-icon size="19"></power-icon>
                 </div>
diff --git a/resources/js/i18n/lang/cn.json b/resources/js/i18n/lang/cn.json
index ec9f289b..21d09088 100644
--- a/resources/js/i18n/lang/cn.json
+++ b/resources/js/i18n/lang/cn.json
@@ -357,7 +357,10 @@
 	"locations": {
 		"home": "首页",
 		"shared": "已分享",
-		"trash": "垃圾箱"
+		"trash": "垃圾箱",
+		"profile": "Profile",
+		"settings": "Settings",
+		"logout": "Log Out"
 	},
 	"menu": {
 		"admin": "Admin",
@@ -580,10 +583,6 @@
 		"message": "您的订阅已重新激活，并且将按原始计费周期计费。",
 		"title": "订阅已取消"
 	},
-	"popup_trashed": {
-		"message": "现在，您的垃圾箱已经被完全清空。",
-		"title": "您的垃圾箱已清空！"
-	},
 	"preview_type": {
 		"grid": "方块",
 		"list": "列表"
diff --git a/resources/js/i18n/lang/en.json b/resources/js/i18n/lang/en.json
index 7e7a0ecf..3c4320e0 100644
--- a/resources/js/i18n/lang/en.json
+++ b/resources/js/i18n/lang/en.json
@@ -359,7 +359,10 @@
 	"locations": {
 		"home": "Home",
 		"shared": "Shared",
-		"trash": "Trash"
+		"trash": "Trash",
+		"profile": "Profile",
+		"settings": "Settings",
+		"logout": "Log Out"
 	},
 	"menu": {
 		"admin": "Administration",
@@ -582,10 +585,6 @@
 		"message": "Your subscription was re-activated, and they will be billed on the original billing cycle.",
 		"title": "Subscription Was Resumed"
 	},
-	"popup_trashed": {
-		"message": "So now, you have clear and empty trash.",
-		"title": "Your trash was erased!"
-	},
 	"preview_type": {
 		"grid": "Grid",
 		"list": "List"
diff --git a/resources/js/i18n/lang/sk.json b/resources/js/i18n/lang/sk.json
index 601d4565..b492510d 100644
--- a/resources/js/i18n/lang/sk.json
+++ b/resources/js/i18n/lang/sk.json
@@ -359,7 +359,10 @@
 	"locations": {
 		"home": "Domov",
 		"shared": "Zdieľané",
-		"trash": "Kôš"
+		"trash": "Kôš",
+		"profile": "Profil",
+		"settings": "Nastavenia",
+		"logout": "Odhlásiť sa"
 	},
 	"menu": {
 		"admin": "Administrácia",
@@ -582,10 +585,6 @@
 		"message": "Váš odber bol znova aktivovaný a budú vám účtované poplatky podľa pôvodného fakturačného cyklu.",
 		"title": "Predplatné bolo obnovené"
 	},
-	"popup_trashed": {
-		"message": "Od teraz máte prázdny a čistý kôš",
-		"title": "Váš kôš bol vymazaný!"
-	},
 	"preview_type": {
 		"grid": "Mriežka",
 		"list": "List"
diff --git a/resources/js/router.js b/resources/js/router.js
index 23c86ba0..e9f282f8 100644
--- a/resources/js/router.js
+++ b/resources/js/router.js
@@ -382,15 +382,6 @@ const routesUser = [
             requiresAuth: true
         },
     },
-    {
-        name: 'Trash',
-        path: '/trash',
-        component: () =>
-            import(/* webpackChunkName: "chunks/trash" */ './views/FilePages/Trash'),
-        meta: {
-            requiresAuth: true
-        },
-    },
     {
         name: 'Settings',
         path: '/settings',
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index 86e495a7..a1f8a873 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -293,12 +293,6 @@ const actions = {
 
                 // Remove file preview
                 commit('CLEAR_FILEINFO_DETAIL')
-
-                // Show success message
-                events.$emit('success:open', {
-                    title: i18n.t('popup_trashed.title'),
-                    message: i18n.t('popup_trashed.message'),
-                })
             })
             .catch(() => isSomethingWrong())
     },
diff --git a/resources/js/views/FilePages/Files.vue b/resources/js/views/FilePages/Files.vue
index 1e035340..0908b7f4 100644
--- a/resources/js/views/FilePages/Files.vue
+++ b/resources/js/views/FilePages/Files.vue
@@ -28,6 +28,15 @@
                             {{ $t('sidebar.latest') }}
                         </div>
                     </a>
+                    <a class="menu-list-item link trash" :class="{'is-active-trash': $isThisLocation(['trash', 'trash-root'])}"
+                       @click="getTrash">
+                        <div class="icon">
+                            <trash2-icon size="17"></trash2-icon>
+                        </div>
+                        <div class="label">
+                            {{ $t('locations.trash') }}
+                        </div>
+                    </a>
                 </div>
             </ContentGroup>
 
@@ -85,6 +94,7 @@
     import {
         UploadCloudIcon,
         FolderIcon,
+        Trash2Icon,
         HomeIcon,
         XIcon,
     } from 'vue-feather-icons'
@@ -99,6 +109,7 @@
             UploadCloudIcon,
             ContentGroup,
             FolderIcon,
+            Trash2Icon,
             HomeIcon,
             XIcon,
         },
@@ -121,6 +132,9 @@
             }
         },
         methods: {
+            getTrash() {
+                this.$store.dispatch('getTrash')
+            },
             getLatest() {
                 this.$store.dispatch('getLatest')
             },
diff --git a/resources/js/views/FilePages/Trash.vue b/resources/js/views/FilePages/Trash.vue
deleted file mode 100644
index ba1050da..00000000
--- a/resources/js/views/FilePages/Trash.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-    <section id="viewport">
-        <ContentSidebar>
-
-            <!--Tools-->
-            <ContentGroup :title="$t('sidebar.tools_title')" class="navigator">
-                <div class="menu-list-wrapper vertical">
-                    <div class="menu-list-item link" @click="emptyTrash()">
-                        <div class="icon">
-                            <trash-icon size="17"></trash-icon>
-                        </div>
-                        <div class="label">
-                            {{ $t('context_menu.empty_trash') }}
-                        </div>
-                    </div>
-                </div>
-            </ContentGroup>
-        </ContentSidebar>
-        <ContentFileView/>
-    </section>
-</template>
-
-<script>
-    import ContentFileView from '@/components/Others/ContentFileView'
-    import ContentSidebar from '@/components/Sidebar/ContentSidebar'
-    import ContentGroup from '@/components/Sidebar/ContentGroup'
-    import {
-        TrashIcon,
-    } from 'vue-feather-icons'
-
-    export default {
-        name: 'FilesView',
-        components: {
-            ContentFileView,
-            ContentSidebar,
-            ContentGroup,
-            TrashIcon,
-        },
-        methods: {
-            emptyTrash() {
-                this.$store.dispatch('emptyTrash')
-            },
-        },
-        created() {
-            this.$store.dispatch('getTrash')
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-</style>
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 70e2af8c..72479787 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -130,6 +130,22 @@
       display: flex;
       align-items: center;
 
+      &.trash {
+
+        &.is-active-trash,
+        &:hover {
+          svg {
+            path, line, polyline, rect, circle, ellipse {
+              stroke: $danger;
+            }
+          }
+
+          .label {
+            color: $danger;
+          }
+        }
+      }
+
       &.is-active,
       &.router-link-exact-active,
       &:hover {

From d76ff07bf475d47065a70137f82cb9a43e7edcd5 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sat, 21 Nov 2020 19:56:51 +0100
Subject: [PATCH 4/8] Ability to collapse navigator or favourites widget in
 File page

---
 public/mix-manifest.json                      | 88 +++++++++++++++++-
 .../js/components/Sidebar/ContentGroup.vue    | 92 ++++++++++++++++++-
 resources/js/views/Admin/Dashboard.vue        |  2 +-
 resources/js/views/FilePages/Files.vue        |  4 +-
 resources/sass/vue-file-manager/_mixins.scss  |  2 +-
 .../sass/vue-file-manager/_variables.scss     |  2 +-
 6 files changed, 177 insertions(+), 13 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 2380fc80..44430b73 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -22,12 +22,12 @@
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=99939ac2d71b6c7a559b",
     "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js?id=96ac1ede73f3fc9afa37",
     "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=278eef02eace89698f20",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=c4f067ad6a1d0d7326f2",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=67d8b906c2200d7ddeb0",
     "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js?id=d7795f20187163939276",
     "/chunks/database.js": "/chunks/database.js?id=a6f7e8d1696493c60072",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=f56517bee181ef89921f",
-    "/chunks/files.js": "/chunks/files.js?id=ab5e91e9877f2478d323",
+    "/chunks/files.js": "/chunks/files.js?id=a1e640bd620ede3e81f2",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=335030ccf561b022c47f",
     "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=fe3fac648fc629b4dd8e",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=06fc72f0d9a057bb8f18",
@@ -236,7 +236,7 @@
     "/chunks/files.be6162bf354ed5fd5a3b.hot-update.js": "/chunks/files.be6162bf354ed5fd5a3b.hot-update.js",
     "/chunks/files.acf14af7dab5ad3cc755.hot-update.js": "/chunks/files.acf14af7dab5ad3cc755.hot-update.js",
     "/js/main.9efef46a124f1f10205b.hot-update.js": "/js/main.9efef46a124f1f10205b.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=e2ca36edc63a7302336d",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=312acc0ff7daa010eea5",
     "/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=45fda8f6cfee1ae1289f",
     "/chunks/trash.9efef46a124f1f10205b.hot-update.js": "/chunks/trash.9efef46a124f1f10205b.hot-update.js",
@@ -257,5 +257,85 @@
     "/js/main.3295b76e0199daee33ab.hot-update.js": "/js/main.3295b76e0199daee33ab.hot-update.js",
     "/js/main.5cadc640fd72e10023d0.hot-update.js": "/js/main.5cadc640fd72e10023d0.hot-update.js",
     "/js/main.c19b586ae30be0c51c01.hot-update.js": "/js/main.c19b586ae30be0c51c01.hot-update.js",
-    "/js/main.c65cb1734de918f616d0.hot-update.js": "/js/main.c65cb1734de918f616d0.hot-update.js"
+    "/js/main.c65cb1734de918f616d0.hot-update.js": "/js/main.c65cb1734de918f616d0.hot-update.js",
+    "/chunks/dashboard.9383ad981e3de11984b6.hot-update.js": "/chunks/dashboard.9383ad981e3de11984b6.hot-update.js",
+    "/js/main.350b31e72e933d7c9b64.hot-update.js": "/js/main.350b31e72e933d7c9b64.hot-update.js",
+    "/chunks/dashboard.350b31e72e933d7c9b64.hot-update.js": "/chunks/dashboard.350b31e72e933d7c9b64.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.bb291f5c1836b48e37d1.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.bb291f5c1836b48e37d1.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.23825be84f9f37ebbb27.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.23825be84f9f37ebbb27.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.1e9b32a73deb837c16e1.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.1e9b32a73deb837c16e1.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.bab14b8689e63384797e.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.bab14b8689e63384797e.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.24d1c6a3437840c4a99a.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.24d1c6a3437840c4a99a.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.1eae1443c5f741d66104.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.1eae1443c5f741d66104.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e3dcd99540fdc15586a5.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e3dcd99540fdc15586a5.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.53305a686c43bed173bd.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.53305a686c43bed173bd.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.6c0ac52465d980bee687.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.6c0ac52465d980bee687.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.98e8c9ac21e84c588fce.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.98e8c9ac21e84c588fce.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9df43953478d1e99a1b6.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9df43953478d1e99a1b6.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5d1d9a07b668d4574dc5.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5d1d9a07b668d4574dc5.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.69fb42f46bf2a608f21d.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.69fb42f46bf2a608f21d.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5a127ffebb6c7240f9c4.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5a127ffebb6c7240f9c4.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.410810c8d1281b1d238b.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.410810c8d1281b1d238b.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.19703f1e0d5d5d1a4dee.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.19703f1e0d5d5d1a4dee.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.03a89f9385d279a28781.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.03a89f9385d279a28781.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.8d0d0050500bc50caf97.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.8d0d0050500bc50caf97.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.65bf7a5b5c3fa46557f4.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.65bf7a5b5c3fa46557f4.hot-update.js",
+    "/chunks/files.7c3fcb869808c4f49452.hot-update.js": "/chunks/files.7c3fcb869808c4f49452.hot-update.js",
+    "/chunks/files.9df7d191f68581ac792c.hot-update.js": "/chunks/files.9df7d191f68581ac792c.hot-update.js",
+    "/chunks/files.bc0230f12cf60fe81a35.hot-update.js": "/chunks/files.bc0230f12cf60fe81a35.hot-update.js",
+    "/chunks/files.c13776757d39eb4d4d07.hot-update.js": "/chunks/files.c13776757d39eb4d4d07.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.d329e08bdb4e146d6e35.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.d329e08bdb4e146d6e35.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5dce4a338894f20ece7a.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5dce4a338894f20ece7a.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.c13163e405f863de2291.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.c13163e405f863de2291.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a3b0c6764fdddf045a0c.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a3b0c6764fdddf045a0c.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.bcf1948fc17991ca9b86.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.bcf1948fc17991ca9b86.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.85a2a57eea471ad698cf.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.85a2a57eea471ad698cf.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.f8889d5bd3f96390dc6e.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.f8889d5bd3f96390dc6e.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.031f440a64a85969858b.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.031f440a64a85969858b.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.63aa9da5c1805935d5c6.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.63aa9da5c1805935d5c6.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.96f927ef84e078fbf42e.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.96f927ef84e078fbf42e.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e996f490eea6c998cd73.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e996f490eea6c998cd73.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.02f99705f565b5ef8cc4.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.02f99705f565b5ef8cc4.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.56a9acea2c5839291dee.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.56a9acea2c5839291dee.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.81fafcff6dfd0d8f9602.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.81fafcff6dfd0d8f9602.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.da65ee71804a117fe4d2.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.da65ee71804a117fe4d2.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.1026f8df7e09164b7105.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.1026f8df7e09164b7105.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.d7e95c1895023a2b282f.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.d7e95c1895023a2b282f.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.dd2893ef746d22d62da3.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.dd2893ef746d22d62da3.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.b0267b6d65e6e8154fef.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.b0267b6d65e6e8154fef.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e2a1b3d0bc8c63bf4c72.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.e2a1b3d0bc8c63bf4c72.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.65503f6abae1b8831b7f.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.65503f6abae1b8831b7f.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a7170db6c984c8f73959.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a7170db6c984c8f73959.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.624c31d816c25bc0c69a.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.624c31d816c25bc0c69a.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.6a9c123c669b230ea43c.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.6a9c123c669b230ea43c.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a5c43b6718519870d893.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a5c43b6718519870d893.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.ee3efbc9bdcb69d08c17.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.ee3efbc9bdcb69d08c17.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.4052890e4a1a59ded900.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.4052890e4a1a59ded900.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.3374c2094e1470086591.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.3374c2094e1470086591.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.82c9a814511c90cd683c.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.82c9a814511c90cd683c.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5d76b4eae7508943139d.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5d76b4eae7508943139d.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.389a27b87053c829c2c0.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.389a27b87053c829c2c0.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.35e9298086066b559d14.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.35e9298086066b559d14.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.8e98cb2dd2ce6cdc55fd.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.8e98cb2dd2ce6cdc55fd.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.ea3923b8c4b7a21dd9ef.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.ea3923b8c4b7a21dd9ef.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.3d9a24c53f16f0252440.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.3d9a24c53f16f0252440.hot-update.js",
+    "/chunks/files.b0c35ffe05405fdea435.hot-update.js": "/chunks/files.b0c35ffe05405fdea435.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.8d5bc9e03fac80edbfbc.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.8d5bc9e03fac80edbfbc.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.bfcf00dd031a438b1cc3.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.bfcf00dd031a438b1cc3.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.dfa7d961fc7dba0494df.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.dfa7d961fc7dba0494df.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.45d4853a37b2e92eef2c.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.45d4853a37b2e92eef2c.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5eec8c2f3b9ae3a51134.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.5eec8c2f3b9ae3a51134.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.df80b32159f7cbeaf74a.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.df80b32159f7cbeaf74a.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a5984cfed4ab79b95855.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a5984cfed4ab79b95855.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a0386a412528a4b5a855.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.a0386a412528a4b5a855.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.1ab4a1bb5331b0fbf1c5.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.1ab4a1bb5331b0fbf1c5.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.28d14288acff27471ad2.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.28d14288acff27471ad2.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9f7b0a73c3234b59a786.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9f7b0a73c3234b59a786.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.0a962e403d777982ca5e.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.0a962e403d777982ca5e.hot-update.js",
+    "/js/main.bab4d686dd70c851500b.hot-update.js": "/js/main.bab4d686dd70c851500b.hot-update.js",
+    "/js/main.26f863e21b3af6bfdfae.hot-update.js": "/js/main.26f863e21b3af6bfdfae.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9b7034220da5b2d0fbd4.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9b7034220da5b2d0fbd4.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.ced21ac245b8f838be4f.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.ced21ac245b8f838be4f.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.49302d27c1461e4472a3.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.49302d27c1461e4472a3.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9364c98c9779f86aac32.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9364c98c9779f86aac32.hot-update.js"
 }
diff --git a/resources/js/components/Sidebar/ContentGroup.vue b/resources/js/components/Sidebar/ContentGroup.vue
index 3595bb86..3e71a455 100644
--- a/resources/js/components/Sidebar/ContentGroup.vue
+++ b/resources/js/components/Sidebar/ContentGroup.vue
@@ -1,25 +1,109 @@
 <template>
-    <div class="content-group">
-        <TextLabel>{{ title }}</TextLabel>
-        <slot></slot>
+    <div class="content-group" :class="{'is-collapsed': ! isVisible, 'collapsable': canCollapse}">
+
+        <div class="group-title" @click="hideGroup">
+            <TextLabel class="title">{{ title }}</TextLabel>
+            <chevron-up-icon v-if="canCollapseWrapper" size="12" class="icon" />
+        </div>
+
+        <transition name="list">
+            <div class="wrapper" v-show="isVisible">
+                <slot></slot>
+            </div>
+        </transition>
     </div>
 </template>
 
 <script>
     import TextLabel from '@/components/Others/TextLabel'
+    import { ChevronUpIcon } from 'vue-feather-icons'
 
     export default {
         name: 'ContentGroup',
-        props: ['title'],
+        props: ['title', 'canCollapse', 'slug'],
         components: {
+            ChevronUpIcon,
             TextLabel,
+        },
+        data() {
+            return {
+                isVisible: true,
+                canCollapseWrapper: false
+            }
+        },
+        methods: {
+            hideGroup() {
+                if (! this.canCollapseWrapper)
+                    return
+
+                this.isVisible = !this.isVisible
+                localStorage.setItem('panel-group-' + this.slug, this.isVisible)
+            }
+        },
+        created() {
+
+            if (this.canCollapse) {
+
+                let savedVisibility = localStorage.getItem('panel-group-' + this.slug)
+
+                this.isVisible = savedVisibility ? !!JSON.parse(String(savedVisibility).toLowerCase()) : true
+                this.canCollapseWrapper = true
+            }
         }
     }
 </script>
 
 <style scoped lang="scss">
+    @import '@assets/vue-file-manager/_mixins';
 
     .content-group {
         margin-bottom: 30px;
+        transition: all 300ms;
+
+        .group-title {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 5px;
+
+            .title {
+                margin-bottom: 0;
+            }
+
+            .icon {
+                margin-right: 19px;
+                opacity: 0.25;
+                @include transition;
+            }
+        }
+
+        &.collapsable {
+            .group-title {
+                cursor: pointer;
+            }
+        }
+
+        &.is-collapsed {
+            margin-bottom: 15px;
+
+            .icon {
+                @include transform(rotate(180deg));
+            }
+
+        }
+    }
+
+    .list-enter,
+    .list-leave-to {
+        visibility: hidden;
+        height: 0;
+        margin: 0;
+        padding: 0;
+        opacity: 0;
+    }
+
+    .list-enter-active,
+    .list-leave-active {
+        transition: all 300ms;
     }
 </style>
diff --git a/resources/js/views/Admin/Dashboard.vue b/resources/js/views/Admin/Dashboard.vue
index e5b40a70..f3872f40 100644
--- a/resources/js/views/Admin/Dashboard.vue
+++ b/resources/js/views/Admin/Dashboard.vue
@@ -160,7 +160,7 @@
         }
 
         &.widgets-coll-3 {
-            grid-template-columns: repeat(auto-fill, 33%);
+            grid-template-columns: repeat(auto-fill, 33.3%);
         }
 
         .widget {
diff --git a/resources/js/views/FilePages/Files.vue b/resources/js/views/FilePages/Files.vue
index 0908b7f4..71ee9fec 100644
--- a/resources/js/views/FilePages/Files.vue
+++ b/resources/js/views/FilePages/Files.vue
@@ -41,7 +41,7 @@
             </ContentGroup>
 
             <!--Navigator-->
-            <ContentGroup :title="$t('sidebar.navigator_title')" class="navigator">
+            <ContentGroup :title="$t('sidebar.navigator_title')" slug="navigator" :can-collapse="true" class="navigator">
                 <span class="empty-note navigator" v-if="tree.length == 0">
                     {{ $t('sidebar.folders_empty') }}
                 </span>
@@ -50,7 +50,7 @@
             </ContentGroup>
 
             <!--Favourites-->
-            <ContentGroup :title="$t('sidebar.favourites')">
+            <ContentGroup :title="$t('sidebar.favourites')" slug="favourites" :can-collapse="true">
 
                 <div class="menu-list-wrapper vertical favourites"
                      :class="{ 'is-dragenter': area }"
diff --git a/resources/sass/vue-file-manager/_mixins.scss b/resources/sass/vue-file-manager/_mixins.scss
index 2fd90916..da016ff4 100755
--- a/resources/sass/vue-file-manager/_mixins.scss
+++ b/resources/sass/vue-file-manager/_mixins.scss
@@ -27,7 +27,7 @@
 @mixin widget-card {
   padding: 20px;
   border-radius: 8px;
-  box-shadow: 0 3px 15px 2px hsla(220, 36%, 16%, 0.05);
+  box-shadow: 0 5px 10px -6px rgba(26, 36, 55, 0.15);
   background: white;
 }
 
diff --git a/resources/sass/vue-file-manager/_variables.scss b/resources/sass/vue-file-manager/_variables.scss
index a78598ff..858d2f16 100755
--- a/resources/sass/vue-file-manager/_variables.scss
+++ b/resources/sass/vue-file-manager/_variables.scss
@@ -19,7 +19,7 @@ $shadow: 0 7px 25px 1px rgba(0, 0, 0, 0.12);
 
 $light_mode_input_background: hsla(210, 10%, 98%, 1);
 $light_mode_popup_shadow: 0 15px 50px 10px rgba(26,38,74,0.12);
-$light_mode_vignette: rgba(9, 8, 12, 0.35);
+$light_mode_vignette: rgba(255, 255, 255, 0.7);
 
 // Dark Mode
 $dark_mode_vignette: rgba(0, 0, 0, 0.3);

From 4e5afa4747d36e7df9809428ac12c4a39cfa3165 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sun, 22 Nov 2020 08:56:53 +0100
Subject: [PATCH 5/8] Ability to remove uploaded logo and get back to text logo

---
 public/mix-manifest.json                      | 43 ++++++++++++++++++-
 .../js/components/Others/Forms/ImageInput.vue | 35 ++++++++++++++-
 2 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 44430b73..c6356717 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -3,7 +3,7 @@
     "/css/app.css": "/css/app.css",
     "/chunks/admin.js": "/chunks/admin.js?id=5807ec412746448047f9",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=0962d9d0301abf802d07",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=ac72621206dad357a4a5",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=1ad1b7b56512338223eb",
     "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=a9bee156de75062a1925",
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js?id=0b4966a15f5749046c2e",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=03e587de7dd10fba3ead",
@@ -337,5 +337,44 @@
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9b7034220da5b2d0fbd4.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9b7034220da5b2d0fbd4.hot-update.js",
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.ced21ac245b8f838be4f.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.ced21ac245b8f838be4f.hot-update.js",
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.49302d27c1461e4472a3.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.49302d27c1461e4472a3.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9364c98c9779f86aac32.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9364c98c9779f86aac32.hot-update.js"
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9364c98c9779f86aac32.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.9364c98c9779f86aac32.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.81d7d7bd6e90b3a1015d.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.81d7d7bd6e90b3a1015d.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.ac7a0f312c57fbe0dd7f.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.ac7a0f312c57fbe0dd7f.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.4fcb717b4d48528aa8a6.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.4fcb717b4d48528aa8a6.hot-update.js",
+    "/js/main.4f9b9105fc6c67bbaec3.hot-update.js": "/js/main.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/admin-account.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/admin-account.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/app-appearance.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/app-appearance.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/app-billings.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/app-billings.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/app-email.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/app-email.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/app-index.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/app-index.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/app-others.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/app-others.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/app-payments.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/app-payments.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/app-setup.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/app-setup.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/plan-create.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/plan-create.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/upgrade.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/upgrade.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/chunks/user-create.4f9b9105fc6c67bbaec3.hot-update.js": "/chunks/user-create.4f9b9105fc6c67bbaec3.hot-update.js",
+    "/js/main.daa48c89da268138ad3c.hot-update.js": "/js/main.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/admin-account.daa48c89da268138ad3c.hot-update.js": "/chunks/admin-account.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/app-appearance.daa48c89da268138ad3c.hot-update.js": "/chunks/app-appearance.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/app-billings.daa48c89da268138ad3c.hot-update.js": "/chunks/app-billings.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/app-email.daa48c89da268138ad3c.hot-update.js": "/chunks/app-email.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/app-index.daa48c89da268138ad3c.hot-update.js": "/chunks/app-index.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/app-others.daa48c89da268138ad3c.hot-update.js": "/chunks/app-others.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/app-payments.daa48c89da268138ad3c.hot-update.js": "/chunks/app-payments.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/app-setup.daa48c89da268138ad3c.hot-update.js": "/chunks/app-setup.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/plan-create.daa48c89da268138ad3c.hot-update.js": "/chunks/plan-create.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/upgrade.daa48c89da268138ad3c.hot-update.js": "/chunks/upgrade.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/user-create.daa48c89da268138ad3c.hot-update.js": "/chunks/user-create.daa48c89da268138ad3c.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.1a8c47ae9b022b7af7d3.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.1a8c47ae9b022b7af7d3.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.066f133616eb175f4af6.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.066f133616eb175f4af6.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.d73f99d210e1ea66a239.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.d73f99d210e1ea66a239.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.b63e2aba7a8a6d43cb05.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.b63e2aba7a8a6d43cb05.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.fbfc1f4d8e97870aa4ce.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.fbfc1f4d8e97870aa4ce.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.520a4f6bbc336aec6cb3.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.520a4f6bbc336aec6cb3.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.98f6ef3f513877a49b89.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.98f6ef3f513877a49b89.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.2f081d124d6011885163.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.2f081d124d6011885163.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.4e4f285fde330b6b2e84.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.4e4f285fde330b6b2e84.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.2f298e484efb4f71881b.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.2f298e484efb4f71881b.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.327ed92ac0a93c729277.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.327ed92ac0a93c729277.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.cfbff61e7d8187da97fe.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.cfbff61e7d8187da97fe.hot-update.js"
 }
diff --git a/resources/js/components/Others/Forms/ImageInput.vue b/resources/js/components/Others/Forms/ImageInput.vue
index 46bb995f..683ffa8c 100644
--- a/resources/js/components/Others/Forms/ImageInput.vue
+++ b/resources/js/components/Others/Forms/ImageInput.vue
@@ -1,5 +1,9 @@
 <template>
     <div class="dropzone" :class="{ 'is-error': error }">
+        <div v-if="imagePreview" @click="resetImage" class="reset-image">
+            <x-icon size="14" class="close-icon"></x-icon>
+        </div>
+
         <input
                 ref="file"
                 type="file"
@@ -26,7 +30,7 @@
 </template>
 
 <script>
-    import ImageIcon from "vue-feather-icons/icons/ImageIcon";
+    import { XIcon, ImageIcon } from 'vue-feather-icons'
 
     export default {
         name: 'ImageInput',
@@ -35,6 +39,7 @@
         ],
         components: {
             ImageIcon,
+            XIcon,
         },
         data() {
             return {
@@ -47,6 +52,10 @@
             },
         },
         methods: {
+            resetImage() {
+                this.imagePreview = undefined
+                this.$emit('input', undefined)
+            },
             showImagePreview(event) {
                 const imgPath = event.target.files[0].name,
                     extn = imgPath
@@ -152,6 +161,30 @@
                 @include font-size(12);
             }
         }
+
+        .reset-image {
+            z-index: 2;
+            background: white;
+            border-radius: 50px;
+            display: block;
+            position: absolute;
+            right: 0;
+            top: 0;
+            cursor: pointer;
+            @include transform(translateY(-50%) translateX(50%));
+            padding: 0px 4px;
+            box-shadow: 0 1px 5px rgba(0, 0, 0, 0.12);
+
+            .close-icon {
+                vertical-align: middle;
+
+                line {
+                    path {
+                        fill: $text;
+                    }
+                }
+            }
+        }
     }
 
     @media (prefers-color-scheme: dark) {

From 16ab540298c2f79c599274b8c1cde13b48cd19a3 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sun, 22 Nov 2020 09:42:44 +0100
Subject: [PATCH 6/8] Ability to cancel uploading progress via x button

---
 public/mix-manifest.json                      | 44 ++++++++++++++++++-
 .../components/FilesView/UploadProgress.vue   | 42 +++++++++++++++++-
 resources/js/i18n/lang/en.json                |  1 +
 resources/js/store/modules/fileFunctions.js   | 14 ++++++
 4 files changed, 97 insertions(+), 4 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index c6356717..11375e83 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -238,7 +238,7 @@
     "/js/main.9efef46a124f1f10205b.hot-update.js": "/js/main.9efef46a124f1f10205b.hot-update.js",
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=312acc0ff7daa010eea5",
     "/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=45fda8f6cfee1ae1289f",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=b0d373762dad7e5a5cd8",
     "/chunks/trash.9efef46a124f1f10205b.hot-update.js": "/chunks/trash.9efef46a124f1f10205b.hot-update.js",
     "/js/main.21d38cf664bf36a3218d.hot-update.js": "/js/main.21d38cf664bf36a3218d.hot-update.js",
     "/js/main.c0bd185ce5cf6d0f42fe.hot-update.js": "/js/main.c0bd185ce5cf6d0f42fe.hot-update.js",
@@ -376,5 +376,45 @@
     "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.4e4f285fde330b6b2e84.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.4e4f285fde330b6b2e84.hot-update.js",
     "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.2f298e484efb4f71881b.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.2f298e484efb4f71881b.hot-update.js",
     "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.327ed92ac0a93c729277.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.327ed92ac0a93c729277.hot-update.js",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.cfbff61e7d8187da97fe.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.cfbff61e7d8187da97fe.hot-update.js"
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.cfbff61e7d8187da97fe.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.cfbff61e7d8187da97fe.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.063c9d809091d3b03b45.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.063c9d809091d3b03b45.hot-update.js",
+    "/js/main.2af15268139f3d5d425f.hot-update.js": "/js/main.2af15268139f3d5d425f.hot-update.js",
+    "/js/main.db1864c7590a00714661.hot-update.js": "/js/main.db1864c7590a00714661.hot-update.js",
+    "/js/main.f5f7470d0670c89820e3.hot-update.js": "/js/main.f5f7470d0670c89820e3.hot-update.js",
+    "/js/main.83046dba7c63ca517003.hot-update.js": "/js/main.83046dba7c63ca517003.hot-update.js",
+    "/js/main.345da81b6c99a3b79210.hot-update.js": "/js/main.345da81b6c99a3b79210.hot-update.js",
+    "/js/main.a92f6480bbfdb6e900db.hot-update.js": "/js/main.a92f6480bbfdb6e900db.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.cd0ef3ed334a58702ae6.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.cd0ef3ed334a58702ae6.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.b3861f85fbbfb6f55cea.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.b3861f85fbbfb6f55cea.hot-update.js",
+    "/js/main.13edb39bd81dba07a0ad.hot-update.js": "/js/main.13edb39bd81dba07a0ad.hot-update.js",
+    "/js/main.48cf14ab14d33c1ec24d.hot-update.js": "/js/main.48cf14ab14d33c1ec24d.hot-update.js",
+    "/js/main.31c63042f789a579a8fa.hot-update.js": "/js/main.31c63042f789a579a8fa.hot-update.js",
+    "/js/main.2a2a1e169611a088aa15.hot-update.js": "/js/main.2a2a1e169611a088aa15.hot-update.js",
+    "/js/main.b01f1175c75a766502ee.hot-update.js": "/js/main.b01f1175c75a766502ee.hot-update.js",
+    "/js/main.6a640aac55404f4a2da4.hot-update.js": "/js/main.6a640aac55404f4a2da4.hot-update.js",
+    "/js/main.efc9f431508297a1a7e0.hot-update.js": "/js/main.efc9f431508297a1a7e0.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.b9e1ee112eb86b424eb8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.b9e1ee112eb86b424eb8.hot-update.js",
+    "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.14021c0c526b3d22ac47.hot-update.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.14021c0c526b3d22ac47.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.673ddbb6cc962608a577.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.673ddbb6cc962608a577.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.762c5199de568ddbc51c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.762c5199de568ddbc51c.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.010685490b34aa7511d2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.010685490b34aa7511d2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.14b091496fe713067a26.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.14b091496fe713067a26.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.730f25c6b4c3573f5aae.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.730f25c6b4c3573f5aae.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.1150dfef325f8a1712b2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.1150dfef325f8a1712b2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.c2e90702d176aa4e5fc3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c2e90702d176aa4e5fc3.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.6ba206a8eba893de2c2e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.6ba206a8eba893de2c2e.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.2978dd05123b6b997585.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2978dd05123b6b997585.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.39e3a50f8b68ae76af6a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.39e3a50f8b68ae76af6a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.85f73134067faaf88a09.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.85f73134067faaf88a09.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.0934bc224d82cedee342.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0934bc224d82cedee342.hot-update.js",
+    "/js/main.65f3d231619d974c1c58.hot-update.js": "/js/main.65f3d231619d974c1c58.hot-update.js",
+    "/js/main.743fc37782fbc6a41fee.hot-update.js": "/js/main.743fc37782fbc6a41fee.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.07df1e15d744d9098d9a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.07df1e15d744d9098d9a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.4063b94b73194d4c79c5.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.4063b94b73194d4c79c5.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.ff2ba845e5569e90d21a.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ff2ba845e5569e90d21a.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.24116956c947ca91e9b3.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.24116956c947ca91e9b3.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.fe9b991e1ab48bde8d57.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fe9b991e1ab48bde8d57.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.e7d96bedcda24ff8514b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e7d96bedcda24ff8514b.hot-update.js",
+    "/js/main.ca7473ea28decc85cc35.hot-update.js": "/js/main.ca7473ea28decc85cc35.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.32ad32f00c2b1b602349.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.32ad32f00c2b1b602349.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/UploadProgress.vue b/resources/js/components/FilesView/UploadProgress.vue
index 07ea0c48..76134eb1 100644
--- a/resources/js/components/FilesView/UploadProgress.vue
+++ b/resources/js/components/FilesView/UploadProgress.vue
@@ -13,21 +13,28 @@
                     {{ $t('uploading.progress', {current:uploadingFilesCount.current, total: uploadingFilesCount.total, progress: uploadingFileProgress}) }}
                 </span>
             </div>
-            <ProgressBar :progress="uploadingFileProgress" />
+            <div class="progress-wrapper">
+                <ProgressBar :progress="uploadingFileProgress" />
+                <span @click="cancelUpload" :title="$t('uploading.cancel')" class="cancel-icon">
+                    <x-icon size="16" @click="cancelUpload"></x-icon>
+                </span>
+            </div>
         </div>
     </transition>
 </template>
 
 <script>
     import ProgressBar from '@/components/FilesView/ProgressBar'
-    import { RefreshCwIcon } from 'vue-feather-icons'
+    import { RefreshCwIcon, XIcon } from 'vue-feather-icons'
     import {mapGetters} from 'vuex'
+    import {events} from '@/bus'
 
     export default {
         name: 'UploadProgress',
         components: {
             RefreshCwIcon,
             ProgressBar,
+            XIcon,
         },
         computed: {
             ...mapGetters([
@@ -35,6 +42,11 @@
                 'uploadingFilesCount',
                 'isProcessingFile',
             ])
+        },
+        methods: {
+            cancelUpload() {
+                events.$emit('cancel-upload')
+            }
         }
     }
 </script>
@@ -78,6 +90,22 @@
         position: relative;
         z-index: 1;
 
+        .progress-wrapper {
+            display: flex;
+
+            .cancel-icon {
+                cursor: pointer;
+                padding: 0 13px;
+
+                &:hover {
+
+                    line {
+                        stroke: $theme;
+                    }
+                }
+            }
+        }
+
         .progress-title {
             font-weight: 700;
             text-align: center;
@@ -88,6 +116,16 @@
         }
     }
 
+    @media only screen and (max-width: 690px) {
+
+        .upload-progress {
+
+            .progress-wrapper .cancel-icon {
+                padding: 0 9px;
+            }
+        }
+    }
+
     @media (prefers-color-scheme: dark) {
         .progress-bar {
             background: $dark_mode_foreground;
diff --git a/resources/js/i18n/lang/en.json b/resources/js/i18n/lang/en.json
index 3c4320e0..982a5995 100644
--- a/resources/js/i18n/lang/en.json
+++ b/resources/js/i18n/lang/en.json
@@ -720,6 +720,7 @@
 		"href": "Please confirm your payment."
 	},
 	"uploading": {
+		"cancel": "Cancel Uploading",
 		"processing_file": "Processing File...",
 		"progress_single_upload": "Uploading File {progress}%",
 		"progress": "Uploading File {progress}% - {current}/{total}"
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index a1f8a873..a5aac190 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -111,8 +111,13 @@ 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();
+
             axios
                 .post(route, form, {
+                    cancelToken: source.token,
                     headers: {
                         'Content-Type': 'application/octet-stream'
                     },
@@ -174,6 +179,15 @@ const actions = {
                     // Reset uploader
                     commit('UPDATE_FILE_COUNT_PROGRESS', undefined)
                 })
+
+            // Cancel the upload request
+            events.$on('cancel-upload', () => {
+                source.cancel();
+
+                // Hide upload progress bar
+                commit('PROCESSING_FILE', false)
+                commit('UPDATE_FILE_COUNT_PROGRESS', undefined)
+            })
         })
     },
     restoreItem: ({commit, getters}, item) => {

From 16586270698489738574d2f528121f86d6fb6af4 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sun, 22 Nov 2020 09:44:50 +0100
Subject: [PATCH 7/8] updated language files

---
 resources/js/i18n/lang/cn.json | 1 +
 resources/js/i18n/lang/sk.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/resources/js/i18n/lang/cn.json b/resources/js/i18n/lang/cn.json
index 21d09088..bddb76d1 100644
--- a/resources/js/i18n/lang/cn.json
+++ b/resources/js/i18n/lang/cn.json
@@ -718,6 +718,7 @@
 		"href": "Please confirm your payment."
 	},
 	"uploading": {
+		"cancel": "Cancel Uploading",
 		"processing_file": "Processing File...",
 		"progress_single_upload": "上传文件 {progress}%",
 		"progress": "上传文件 {progress}% - {current}/{total}"
diff --git a/resources/js/i18n/lang/sk.json b/resources/js/i18n/lang/sk.json
index b492510d..116c61c7 100644
--- a/resources/js/i18n/lang/sk.json
+++ b/resources/js/i18n/lang/sk.json
@@ -720,6 +720,7 @@
 		"href": "Prosím potvrďte Vašu platbu."
 	},
 	"uploading": {
+		"cancel": "Zrušiť nahrávanie",
 		"processing_file": "Spracuvávam súbor...",
 		"progress_single_upload": "Nahrávam súbor {progress}%",
 		"progress": "Nahrávam súbory {progress}% - {current}/{total}"

From fefc10afb8f57677cf8c79e347f2cc0ad01f3b68 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sun, 22 Nov 2020 10:30:06 +0100
Subject: [PATCH 8/8] Prevent browser 'Go Back' when you undesirably trying to
 go to previous page after sign in to your account

---
 public/mix-manifest.json               | 15 +++++++++++++--
 resources/js/views/FilePages/Files.vue | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 11375e83..7564cc21 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -27,7 +27,7 @@
     "/chunks/database.js": "/chunks/database.js?id=a6f7e8d1696493c60072",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1d8ee4bfbcde69c97021",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=f56517bee181ef89921f",
-    "/chunks/files.js": "/chunks/files.js?id=a1e640bd620ede3e81f2",
+    "/chunks/files.js": "/chunks/files.js?id=3ef8a3af6ad6fd8d0966",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js?id=335030ccf561b022c47f",
     "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js?id=fe3fac648fc629b4dd8e",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=06fc72f0d9a057bb8f18",
@@ -416,5 +416,16 @@
     "/chunks/files~chunks/shared-files~chunks/shared-page.fe9b991e1ab48bde8d57.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fe9b991e1ab48bde8d57.hot-update.js",
     "/chunks/files~chunks/shared-files~chunks/shared-page.e7d96bedcda24ff8514b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e7d96bedcda24ff8514b.hot-update.js",
     "/js/main.ca7473ea28decc85cc35.hot-update.js": "/js/main.ca7473ea28decc85cc35.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.32ad32f00c2b1b602349.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.32ad32f00c2b1b602349.hot-update.js"
+    "/chunks/files~chunks/shared-files~chunks/shared-page.32ad32f00c2b1b602349.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.32ad32f00c2b1b602349.hot-update.js",
+    "/js/main.8297a57d4ae329d1d170.hot-update.js": "/js/main.8297a57d4ae329d1d170.hot-update.js",
+    "/chunks/files.6193090dc64c27815c3f.hot-update.js": "/chunks/files.6193090dc64c27815c3f.hot-update.js",
+    "/chunks/files.97f91865c94512463ad3.hot-update.js": "/chunks/files.97f91865c94512463ad3.hot-update.js",
+    "/chunks/files.2bd195954f091ec3be91.hot-update.js": "/chunks/files.2bd195954f091ec3be91.hot-update.js",
+    "/chunks/files.8c43e689c382348f2c6d.hot-update.js": "/chunks/files.8c43e689c382348f2c6d.hot-update.js",
+    "/chunks/files.04621b7f1f9b7f35ecd3.hot-update.js": "/chunks/files.04621b7f1f9b7f35ecd3.hot-update.js",
+    "/chunks/files.34a58c8e02bc07b2e07b.hot-update.js": "/chunks/files.34a58c8e02bc07b2e07b.hot-update.js",
+    "/chunks/files.212f7334fd1aeb5ffc1c.hot-update.js": "/chunks/files.212f7334fd1aeb5ffc1c.hot-update.js",
+    "/chunks/files.18a508fca4c59dd96946.hot-update.js": "/chunks/files.18a508fca4c59dd96946.hot-update.js",
+    "/chunks/files.165f17c8b3bc022887da.hot-update.js": "/chunks/files.165f17c8b3bc022887da.hot-update.js",
+    "/chunks/files.0773bcde7a1f49b4c4c4.hot-update.js": "/chunks/files.0773bcde7a1f49b4c4c4.hot-update.js"
 }
diff --git a/resources/js/views/FilePages/Files.vue b/resources/js/views/FilePages/Files.vue
index 71ee9fec..ea834fc6 100644
--- a/resources/js/views/FilePages/Files.vue
+++ b/resources/js/views/FilePages/Files.vue
@@ -188,7 +188,21 @@
 
             // Listen for dragstart folder items
             events.$on('dragstart', (item) => this.draggedItem = item)
-        }
+        },
+        beforeRouteLeave(to, from, next) {
+            // Inquire user about his willing to step back to sign in page
+            if (to.name === 'SignIn') {
+                const answer = window.confirm('Do you really want to leave?')
+
+                if (answer) {
+                    next()
+                } else {
+                    next(false)
+                }
+            } else {
+                next()
+            }
+        },
     }
 </script>