From 54167ae3667a436e8f64554ef0f3fe410646d00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 2 Nov 2021 08:13:09 +0100
Subject: [PATCH] Move item popup refactoring

---
 public/mix-manifest.json                      | 110 ++++++-
 resources/js/App.vue                          |   2 +-
 .../js/components/Others/MoveItemPopup.vue    |   2 +-
 .../components/Others/Popup/PopupContent.vue  |   7 -
 resources/js/components/Others/TreeMenu.vue   | 274 +++++++-----------
 .../Controllers/NavigationTreeController.php  |   5 +
 .../Controllers/NavigationTreeController.php  |   1 +
 7 files changed, 225 insertions(+), 176 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index f1734f90..37ab9cd0 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -12,7 +12,7 @@
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=510e6c1b1017a73a40a6",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=90270d0c5aeb5c50dacf",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=892ef3945a5b63ccd634",
-    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=14818f04811188b965c8",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a6f5b98059fd0ff8bbbb",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6177253e847903d63adc",
     "/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=aa284736dda7647d5c9e",
     "/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=6bd4516589f23ec25ae6",
@@ -59,7 +59,7 @@
     "/chunks/plans.js": "/chunks/plans.js?id=6fca685daa45f22e4c8f",
     "/chunks/platform.js": "/chunks/platform.js?id=d009f81f708134f5775b",
     "/chunks/platform~chunks/settings-subscription~chunks/shared~chunks/user-subscription.js": "/chunks/platform~chunks/settings-subscription~chunks/shared~chunks/user-subscription.js?id=8656b69a97cace919251",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=b4b2fd73bdfecb32c067",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=9c167550b3caf2cedc6b",
     "/chunks/profile.js": "/chunks/profile.js?id=0638997b77c6f1246062",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=58edfb3a35062e1ba4e0",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
@@ -898,5 +898,109 @@
     "/chunks/platform.89eee88d81717926097a.hot-update.js": "/chunks/platform.89eee88d81717926097a.hot-update.js",
     "/chunks/platform.66880990d6c0c46fc754.hot-update.js": "/chunks/platform.66880990d6c0c46fc754.hot-update.js",
     "/chunks/platform.d8f080138fcba05877d6.hot-update.js": "/chunks/platform.d8f080138fcba05877d6.hot-update.js",
-    "/chunks/platform.cb3dfe89b682241d18d7.hot-update.js": "/chunks/platform.cb3dfe89b682241d18d7.hot-update.js"
+    "/chunks/platform.cb3dfe89b682241d18d7.hot-update.js": "/chunks/platform.cb3dfe89b682241d18d7.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.86af6886f4cfc63579f5.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.86af6886f4cfc63579f5.hot-update.js",
+    "/chunks/platform~chunks/shared.2f15da52d0804359dde4.hot-update.js": "/chunks/platform~chunks/shared.2f15da52d0804359dde4.hot-update.js",
+    "/chunks/platform~chunks/shared.8d77d021c52a1abab3be.hot-update.js": "/chunks/platform~chunks/shared.8d77d021c52a1abab3be.hot-update.js",
+    "/chunks/platform~chunks/shared.571983b0b61f3f4c212d.hot-update.js": "/chunks/platform~chunks/shared.571983b0b61f3f4c212d.hot-update.js",
+    "/chunks/platform~chunks/shared.d64900af31f268859ea3.hot-update.js": "/chunks/platform~chunks/shared.d64900af31f268859ea3.hot-update.js",
+    "/chunks/platform~chunks/shared.8d075bad4b244a46ac71.hot-update.js": "/chunks/platform~chunks/shared.8d075bad4b244a46ac71.hot-update.js",
+    "/chunks/platform~chunks/shared.5d8aae5f8fe18f20bddb.hot-update.js": "/chunks/platform~chunks/shared.5d8aae5f8fe18f20bddb.hot-update.js",
+    "/chunks/platform~chunks/shared.ceb4a9c591cd7d830ccc.hot-update.js": "/chunks/platform~chunks/shared.ceb4a9c591cd7d830ccc.hot-update.js",
+    "/chunks/platform~chunks/shared.9998bb3a710ce6e4129d.hot-update.js": "/chunks/platform~chunks/shared.9998bb3a710ce6e4129d.hot-update.js",
+    "/chunks/platform~chunks/shared.d1b73d2e21059313b888.hot-update.js": "/chunks/platform~chunks/shared.d1b73d2e21059313b888.hot-update.js",
+    "/chunks/platform~chunks/shared.aee3d424a1853c37f6cf.hot-update.js": "/chunks/platform~chunks/shared.aee3d424a1853c37f6cf.hot-update.js",
+    "/chunks/platform~chunks/shared.4aa0f9460e14f25a0c47.hot-update.js": "/chunks/platform~chunks/shared.4aa0f9460e14f25a0c47.hot-update.js",
+    "/chunks/platform~chunks/shared.f72c52d46c9450b450bf.hot-update.js": "/chunks/platform~chunks/shared.f72c52d46c9450b450bf.hot-update.js",
+    "/chunks/platform~chunks/shared.2c19e89135d878c3353a.hot-update.js": "/chunks/platform~chunks/shared.2c19e89135d878c3353a.hot-update.js",
+    "/chunks/platform~chunks/shared.b3136f0117ae9d32f04e.hot-update.js": "/chunks/platform~chunks/shared.b3136f0117ae9d32f04e.hot-update.js",
+    "/chunks/platform~chunks/shared.9070d2c40a47f796f71c.hot-update.js": "/chunks/platform~chunks/shared.9070d2c40a47f796f71c.hot-update.js",
+    "/chunks/platform~chunks/shared.63939038820302610ea5.hot-update.js": "/chunks/platform~chunks/shared.63939038820302610ea5.hot-update.js",
+    "/chunks/platform~chunks/shared.c5b752a35d1e4fcfe2b0.hot-update.js": "/chunks/platform~chunks/shared.c5b752a35d1e4fcfe2b0.hot-update.js",
+    "/chunks/platform~chunks/shared.7194da0d1ea0163464e1.hot-update.js": "/chunks/platform~chunks/shared.7194da0d1ea0163464e1.hot-update.js",
+    "/chunks/platform~chunks/shared.a74a1f7154fbfb9b14d5.hot-update.js": "/chunks/platform~chunks/shared.a74a1f7154fbfb9b14d5.hot-update.js",
+    "/chunks/platform~chunks/shared.52f1f69554413ee77527.hot-update.js": "/chunks/platform~chunks/shared.52f1f69554413ee77527.hot-update.js",
+    "/chunks/platform~chunks/shared.bd8a2ffd0012df33ab91.hot-update.js": "/chunks/platform~chunks/shared.bd8a2ffd0012df33ab91.hot-update.js",
+    "/chunks/platform~chunks/shared.6f3ebe71e4fca2170bb3.hot-update.js": "/chunks/platform~chunks/shared.6f3ebe71e4fca2170bb3.hot-update.js",
+    "/chunks/platform~chunks/shared.cc7ad119710a7faf9d9e.hot-update.js": "/chunks/platform~chunks/shared.cc7ad119710a7faf9d9e.hot-update.js",
+    "/chunks/platform~chunks/shared.13288a40cba178c0f369.hot-update.js": "/chunks/platform~chunks/shared.13288a40cba178c0f369.hot-update.js",
+    "/chunks/platform~chunks/shared.5f1a254737efb032954a.hot-update.js": "/chunks/platform~chunks/shared.5f1a254737efb032954a.hot-update.js",
+    "/chunks/platform~chunks/shared.3854dd9f67829697f7e5.hot-update.js": "/chunks/platform~chunks/shared.3854dd9f67829697f7e5.hot-update.js",
+    "/chunks/platform~chunks/shared.2b433750b672f3543dc9.hot-update.js": "/chunks/platform~chunks/shared.2b433750b672f3543dc9.hot-update.js",
+    "/chunks/platform~chunks/shared.3c0575ea6a20d79bd445.hot-update.js": "/chunks/platform~chunks/shared.3c0575ea6a20d79bd445.hot-update.js",
+    "/chunks/platform~chunks/shared.a2cde56db21c1a209c66.hot-update.js": "/chunks/platform~chunks/shared.a2cde56db21c1a209c66.hot-update.js",
+    "/chunks/platform~chunks/shared.0a2f9a5240ffc76f1000.hot-update.js": "/chunks/platform~chunks/shared.0a2f9a5240ffc76f1000.hot-update.js",
+    "/chunks/platform~chunks/shared.01b7a452a4906266a745.hot-update.js": "/chunks/platform~chunks/shared.01b7a452a4906266a745.hot-update.js",
+    "/chunks/platform~chunks/shared.c6f34444885254390d68.hot-update.js": "/chunks/platform~chunks/shared.c6f34444885254390d68.hot-update.js",
+    "/chunks/platform~chunks/shared.acb58cb448bc5891074a.hot-update.js": "/chunks/platform~chunks/shared.acb58cb448bc5891074a.hot-update.js",
+    "/chunks/platform~chunks/shared.cfde1cb3003b07be60bf.hot-update.js": "/chunks/platform~chunks/shared.cfde1cb3003b07be60bf.hot-update.js",
+    "/chunks/platform~chunks/shared.4959f64429d030340245.hot-update.js": "/chunks/platform~chunks/shared.4959f64429d030340245.hot-update.js",
+    "/chunks/platform~chunks/shared.4e3b70392d155d36244f.hot-update.js": "/chunks/platform~chunks/shared.4e3b70392d155d36244f.hot-update.js",
+    "/chunks/platform~chunks/shared.267aed7a3649d9cff2d5.hot-update.js": "/chunks/platform~chunks/shared.267aed7a3649d9cff2d5.hot-update.js",
+    "/chunks/platform~chunks/shared.a9c6a97ac8bedfad539c.hot-update.js": "/chunks/platform~chunks/shared.a9c6a97ac8bedfad539c.hot-update.js",
+    "/chunks/platform~chunks/shared.a2980141de30d765bb17.hot-update.js": "/chunks/platform~chunks/shared.a2980141de30d765bb17.hot-update.js",
+    "/chunks/platform~chunks/shared.d738dd21e6a9c34984bc.hot-update.js": "/chunks/platform~chunks/shared.d738dd21e6a9c34984bc.hot-update.js",
+    "/chunks/platform~chunks/shared.1474a0b762a88a61b159.hot-update.js": "/chunks/platform~chunks/shared.1474a0b762a88a61b159.hot-update.js",
+    "/chunks/platform~chunks/shared.6698909b2cf3266e4d1d.hot-update.js": "/chunks/platform~chunks/shared.6698909b2cf3266e4d1d.hot-update.js",
+    "/chunks/platform~chunks/shared.0720fa9ad329dfaf89c7.hot-update.js": "/chunks/platform~chunks/shared.0720fa9ad329dfaf89c7.hot-update.js",
+    "/chunks/platform~chunks/shared.e0c8796d787a857d0c2b.hot-update.js": "/chunks/platform~chunks/shared.e0c8796d787a857d0c2b.hot-update.js",
+    "/chunks/platform~chunks/shared.907d6a2d4b113d3c804c.hot-update.js": "/chunks/platform~chunks/shared.907d6a2d4b113d3c804c.hot-update.js",
+    "/chunks/platform~chunks/shared.dffd3e2cf531b2ffad7d.hot-update.js": "/chunks/platform~chunks/shared.dffd3e2cf531b2ffad7d.hot-update.js",
+    "/chunks/platform~chunks/shared.e6e99f5b483ce6abe8c5.hot-update.js": "/chunks/platform~chunks/shared.e6e99f5b483ce6abe8c5.hot-update.js",
+    "/chunks/platform~chunks/shared.f09533a9dd41f0d13a95.hot-update.js": "/chunks/platform~chunks/shared.f09533a9dd41f0d13a95.hot-update.js",
+    "/chunks/platform~chunks/shared.867618bcc2a715a5c4cc.hot-update.js": "/chunks/platform~chunks/shared.867618bcc2a715a5c4cc.hot-update.js",
+    "/chunks/platform~chunks/shared.d22d472a105e5ee404f7.hot-update.js": "/chunks/platform~chunks/shared.d22d472a105e5ee404f7.hot-update.js",
+    "/chunks/platform~chunks/shared.3a4c81b5134e36fa070b.hot-update.js": "/chunks/platform~chunks/shared.3a4c81b5134e36fa070b.hot-update.js",
+    "/chunks/platform~chunks/shared.dcbbaade008fb3713773.hot-update.js": "/chunks/platform~chunks/shared.dcbbaade008fb3713773.hot-update.js",
+    "/chunks/platform~chunks/shared.ee70a93cdfc64df56b62.hot-update.js": "/chunks/platform~chunks/shared.ee70a93cdfc64df56b62.hot-update.js",
+    "/chunks/platform~chunks/shared.13d2aebbafea0bb43d43.hot-update.js": "/chunks/platform~chunks/shared.13d2aebbafea0bb43d43.hot-update.js",
+    "/chunks/platform~chunks/shared.d9b68fbd28c01eb416c4.hot-update.js": "/chunks/platform~chunks/shared.d9b68fbd28c01eb416c4.hot-update.js",
+    "/chunks/platform~chunks/shared.b4bfdcc913cb5dce4126.hot-update.js": "/chunks/platform~chunks/shared.b4bfdcc913cb5dce4126.hot-update.js",
+    "/chunks/platform~chunks/shared.d9a735270ed5c037c060.hot-update.js": "/chunks/platform~chunks/shared.d9a735270ed5c037c060.hot-update.js",
+    "/chunks/platform~chunks/shared.471c41f35dfb3e4c2cee.hot-update.js": "/chunks/platform~chunks/shared.471c41f35dfb3e4c2cee.hot-update.js",
+    "/chunks/platform~chunks/shared.9c1eebe9dced7d017ebe.hot-update.js": "/chunks/platform~chunks/shared.9c1eebe9dced7d017ebe.hot-update.js",
+    "/chunks/platform~chunks/shared.e361280c51b4e8bb8f1d.hot-update.js": "/chunks/platform~chunks/shared.e361280c51b4e8bb8f1d.hot-update.js",
+    "/chunks/platform~chunks/shared.f1b8f840e18b91cd43dc.hot-update.js": "/chunks/platform~chunks/shared.f1b8f840e18b91cd43dc.hot-update.js",
+    "/js/main.6712e6b05611a54ccfec.hot-update.js": "/js/main.6712e6b05611a54ccfec.hot-update.js",
+    "/chunks/platform~chunks/shared.2ea4f54033ca3fd1bbfc.hot-update.js": "/chunks/platform~chunks/shared.2ea4f54033ca3fd1bbfc.hot-update.js",
+    "/chunks/platform~chunks/shared.b97d410a54f82e16474d.hot-update.js": "/chunks/platform~chunks/shared.b97d410a54f82e16474d.hot-update.js",
+    "/chunks/platform~chunks/shared.3d732bd6584aae686188.hot-update.js": "/chunks/platform~chunks/shared.3d732bd6584aae686188.hot-update.js",
+    "/chunks/platform~chunks/shared.ee2a43c1b79b53298f7c.hot-update.js": "/chunks/platform~chunks/shared.ee2a43c1b79b53298f7c.hot-update.js",
+    "/chunks/platform~chunks/shared.1aa5a9524628b698137e.hot-update.js": "/chunks/platform~chunks/shared.1aa5a9524628b698137e.hot-update.js",
+    "/chunks/platform~chunks/shared.8496d545ea67e400c957.hot-update.js": "/chunks/platform~chunks/shared.8496d545ea67e400c957.hot-update.js",
+    "/chunks/platform~chunks/shared.5bbf59db2ad356f5a7d1.hot-update.js": "/chunks/platform~chunks/shared.5bbf59db2ad356f5a7d1.hot-update.js",
+    "/chunks/platform~chunks/shared.e87a4085a6a5b015392c.hot-update.js": "/chunks/platform~chunks/shared.e87a4085a6a5b015392c.hot-update.js",
+    "/chunks/platform~chunks/shared.be2f48f52e93c8d84f17.hot-update.js": "/chunks/platform~chunks/shared.be2f48f52e93c8d84f17.hot-update.js",
+    "/chunks/platform~chunks/shared.413f61712210fe63d074.hot-update.js": "/chunks/platform~chunks/shared.413f61712210fe63d074.hot-update.js",
+    "/chunks/platform~chunks/shared.4067b17b2d6338d0dc69.hot-update.js": "/chunks/platform~chunks/shared.4067b17b2d6338d0dc69.hot-update.js",
+    "/chunks/platform~chunks/shared.46347ccb5fa131b8a5a8.hot-update.js": "/chunks/platform~chunks/shared.46347ccb5fa131b8a5a8.hot-update.js",
+    "/chunks/platform~chunks/shared.da985fb7b91c35ad2f39.hot-update.js": "/chunks/platform~chunks/shared.da985fb7b91c35ad2f39.hot-update.js",
+    "/chunks/platform~chunks/shared.e6c794efb05adb371408.hot-update.js": "/chunks/platform~chunks/shared.e6c794efb05adb371408.hot-update.js",
+    "/chunks/platform~chunks/shared.dfc2c983ee18a9783ba1.hot-update.js": "/chunks/platform~chunks/shared.dfc2c983ee18a9783ba1.hot-update.js",
+    "/chunks/platform~chunks/shared.4f9dc9d72ef3637db26b.hot-update.js": "/chunks/platform~chunks/shared.4f9dc9d72ef3637db26b.hot-update.js",
+    "/chunks/platform~chunks/shared.5ba757d4b09d5fc3bbb6.hot-update.js": "/chunks/platform~chunks/shared.5ba757d4b09d5fc3bbb6.hot-update.js",
+    "/chunks/platform~chunks/shared.762de4a3ef26b1dab786.hot-update.js": "/chunks/platform~chunks/shared.762de4a3ef26b1dab786.hot-update.js",
+    "/chunks/platform~chunks/shared.d31698e48bb148048e4c.hot-update.js": "/chunks/platform~chunks/shared.d31698e48bb148048e4c.hot-update.js",
+    "/chunks/platform~chunks/shared.a1bfb13b303b7c43715b.hot-update.js": "/chunks/platform~chunks/shared.a1bfb13b303b7c43715b.hot-update.js",
+    "/chunks/platform~chunks/shared.bab12c1d1a2dbf69ab55.hot-update.js": "/chunks/platform~chunks/shared.bab12c1d1a2dbf69ab55.hot-update.js",
+    "/chunks/platform~chunks/shared.b7f42d8f96dc7c1baee4.hot-update.js": "/chunks/platform~chunks/shared.b7f42d8f96dc7c1baee4.hot-update.js",
+    "/chunks/platform~chunks/shared.634f92835f4730728b1e.hot-update.js": "/chunks/platform~chunks/shared.634f92835f4730728b1e.hot-update.js",
+    "/chunks/platform~chunks/shared.7caa32173183cb877739.hot-update.js": "/chunks/platform~chunks/shared.7caa32173183cb877739.hot-update.js",
+    "/chunks/platform~chunks/shared.12ff297f9c97505bf4d5.hot-update.js": "/chunks/platform~chunks/shared.12ff297f9c97505bf4d5.hot-update.js",
+    "/chunks/platform~chunks/shared.1ced9a57a9a41b0ddbb4.hot-update.js": "/chunks/platform~chunks/shared.1ced9a57a9a41b0ddbb4.hot-update.js",
+    "/chunks/platform~chunks/shared.a29818adcdac7c57f85c.hot-update.js": "/chunks/platform~chunks/shared.a29818adcdac7c57f85c.hot-update.js",
+    "/chunks/platform~chunks/shared.8b3f5376d9d23bc530fe.hot-update.js": "/chunks/platform~chunks/shared.8b3f5376d9d23bc530fe.hot-update.js",
+    "/chunks/platform~chunks/shared.0ac5e724e419721000f4.hot-update.js": "/chunks/platform~chunks/shared.0ac5e724e419721000f4.hot-update.js",
+    "/chunks/platform~chunks/shared.d775880acae96b222f5d.hot-update.js": "/chunks/platform~chunks/shared.d775880acae96b222f5d.hot-update.js",
+    "/chunks/platform~chunks/shared.1bfb9853167c53037ca8.hot-update.js": "/chunks/platform~chunks/shared.1bfb9853167c53037ca8.hot-update.js",
+    "/chunks/platform~chunks/shared.80831e0f24421ecc6342.hot-update.js": "/chunks/platform~chunks/shared.80831e0f24421ecc6342.hot-update.js",
+    "/chunks/platform~chunks/shared.1ea65bf02f1109d90af2.hot-update.js": "/chunks/platform~chunks/shared.1ea65bf02f1109d90af2.hot-update.js",
+    "/chunks/platform~chunks/shared.7fd4fe21cd37596e9730.hot-update.js": "/chunks/platform~chunks/shared.7fd4fe21cd37596e9730.hot-update.js",
+    "/chunks/platform~chunks/shared.c7b3b98ff8f4d4495e35.hot-update.js": "/chunks/platform~chunks/shared.c7b3b98ff8f4d4495e35.hot-update.js",
+    "/chunks/platform~chunks/shared.cec5908c0a2b24bb6eb5.hot-update.js": "/chunks/platform~chunks/shared.cec5908c0a2b24bb6eb5.hot-update.js",
+    "/chunks/platform~chunks/shared.fa2797466a134ac890b0.hot-update.js": "/chunks/platform~chunks/shared.fa2797466a134ac890b0.hot-update.js",
+    "/chunks/platform~chunks/shared.8aee55b07466fc3f18e0.hot-update.js": "/chunks/platform~chunks/shared.8aee55b07466fc3f18e0.hot-update.js",
+    "/chunks/platform~chunks/shared.d23e9f624849fa650d4b.hot-update.js": "/chunks/platform~chunks/shared.d23e9f624849fa650d4b.hot-update.js",
+    "/chunks/platform~chunks/shared.05ce076e0c252e01ee7d.hot-update.js": "/chunks/platform~chunks/shared.05ce076e0c252e01ee7d.hot-update.js",
+    "/chunks/platform~chunks/shared.37a6ff3baa418af5e457.hot-update.js": "/chunks/platform~chunks/shared.37a6ff3baa418af5e457.hot-update.js"
 }
diff --git a/resources/js/App.vue b/resources/js/App.vue
index 53f163dc..e1d0fd5d 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -150,7 +150,7 @@ export default {
 }
 
 .vue-feather {
-	path, circle, line, rect {
+	path, circle, line, rect, polyline {
 		color: inherit;
 	}
 }
diff --git a/resources/js/components/Others/MoveItemPopup.vue b/resources/js/components/Others/MoveItemPopup.vue
index a9227928..c6612ae7 100644
--- a/resources/js/components/Others/MoveItemPopup.vue
+++ b/resources/js/components/Others/MoveItemPopup.vue
@@ -4,7 +4,7 @@
         <PopupHeader :title="$t('popup_move_item.title')" icon="move" />
 
 		<!--Content-->
-        <PopupContent type="height-limited" v-if="pickedItem">
+        <PopupContent v-if="pickedItem" class="sm:overflow-y-auto md:pb-0 sm:max-h-96 h-full pb-6">
 
             <!--Show Spinner when loading folders-->
             <Spinner v-if="isLoadingTree" />
diff --git a/resources/js/components/Others/Popup/PopupContent.vue b/resources/js/components/Others/Popup/PopupContent.vue
index 9ac6e067..0528d0eb 100644
--- a/resources/js/components/Others/Popup/PopupContent.vue
+++ b/resources/js/components/Others/Popup/PopupContent.vue
@@ -17,13 +17,6 @@
     @import '/resources/sass/vuefilemanager/_variables';
     @import '/resources/sass/vuefilemanager/_mixins';
 
-    .popup-content {
-        &.height-limited {
-            height: 400px;
-            overflow-y: auto;
-        }
-    }
-
     @media only screen and (max-width: 690px) {
         .popup-content {
             top: 57px;
diff --git a/resources/js/components/Others/TreeMenu.vue b/resources/js/components/Others/TreeMenu.vue
index dd6f4f9c..587c2c3b 100644
--- a/resources/js/components/Others/TreeMenu.vue
+++ b/resources/js/components/Others/TreeMenu.vue
@@ -1,188 +1,134 @@
 <template>
-    <!--Folder Icon-->
-    <div class="folder-item-wrapper" :class="{'is-inactive': disabledById && disabledById.data.id === nodes.id || !disableId}">
+    <div :class="{'opacity-50 pointer-events-none': disabledById && disabledById.data.id === nodes.id || !disableId, 'mb-2.5': isRootDepth}">
 
-        <div @click="getFolder" :class="{'is-selected': isSelected, 'is-disabled-item': nodes.location === 'team-folders' || nodes.location === 'shared-with-me'}" :style="indent" class="folder-item text-theme dark-text-theme flex">
-            <chevron-right-icon @click.stop="showTree" :class="{'is-opened': isVisible, 'is-visible': nodes.folders.length !== 0}" size="17" class="icon-arrow"/>
+        <div
+			:class="{'is-disabled-item': false}"
+			:style="indent"
+			class="relative flex items-center select-none py-2 px-1.5 cursor-pointer relative whitespace-nowrap transition-all duration-150"
+		>
+			<!--Arrow icon-->
+			<span @click.stop="showTree" class="p-2 -m-2">
+				<chevron-right-icon
+					:class="{'transform rotate-90': isVisible, 'text-theme dark-text-theme': isSelectedItem, 'opacity-100': nodes.folders.length !== 0}"
+					class="vue-feather transition-all duration-300 mr-2 opacity-0"
+					size="17"
+				/>
+			</span>
 
-            <hard-drive-icon v-if="nodes.location === 'files'" size="17" class="icon text-theme dark-text-theme"/>
-            <users-icon v-if="nodes.location === 'team-folders'" size="17" class="icon text-theme dark-text-theme"/>
-            <user-plus-icon v-if="nodes.location === 'shared-with-me'" size="17" class="icon text-theme dark-text-theme"/>
-            <folder-icon v-if="! nodes.location" size="17" class="icon text-theme dark-text-theme"/>
-            <span class="label">{{ nodes.name }}</span>
+			<!--Item icon-->
+            <hard-drive-icon v-if="nodes.location === 'files'" size="17" class="icon vue-feather" :class="{'text-theme dark-text-theme': isSelectedItem}" />
+            <users-icon v-if="nodes.location === 'team-folders'" size="17" class="icon vue-feather" :class="{'text-theme dark-text-theme': isSelectedItem}" />
+            <user-plus-icon v-if="nodes.location === 'shared-with-me'" size="17" class="icon vue-feather" :class="{'text-theme dark-text-theme': isSelectedItem}" />
+            <folder-icon v-if="! nodes.location" size="17" class="icon vue-feather" :class="{'text-theme dark-text-theme': isSelectedItem}" />
+
+			<!--Item label-->
+			<b
+				@click="getFolder"
+				class="text-sm font-bold whitespace-nowrap overflow-x-hidden overflow-ellipsis inline-block ml-3 transition-all duration-150"
+				:class="{'text-theme': isSelectedItem}"
+			>
+				{{ nodes.name }}
+			</b>
         </div>
 
-        <TreeMenu :disabled-by-id="disabledById" :depth="depth + 1" v-if="isVisible" :nodes="item" v-for="item in nodes.folders" :key="item.id" />
+		<!--Children-->
+        <TreeMenu
+			:disabled-by-id="disabledById"
+			:depth="depth + 1"
+			v-if="isVisible"
+			:nodes="item"
+			v-for="item in nodes.folders"
+			:key="item.id"
+		/>
     </div>
 </template>
 
 <script>
     import TreeMenu from '/resources/js/components/Others/TreeMenu'
-    import {FolderIcon, ChevronRightIcon, HardDriveIcon, UsersIcon, UserPlusIcon} from 'vue-feather-icons'
-    import {events} from '/resources/js/bus'
-    import {mapGetters} from 'vuex'
+	import {FolderIcon, ChevronRightIcon, HardDriveIcon, UsersIcon, UserPlusIcon} from 'vue-feather-icons'
+	import {events} from '/resources/js/bus'
+	import {mapGetters} from 'vuex'
 
-    export default {
-        name: 'TreeMenu',
-        props: [
+	export default {
+		name: 'TreeMenu',
+		props: [
 			'disabledById',
-            'nodes',
+			'nodes',
 			'depth',
-        ],
-        components: {
-            ChevronRightIcon,
-            HardDriveIcon,
+		],
+		components: {
+			ChevronRightIcon,
+			HardDriveIcon,
 			UserPlusIcon,
-            FolderIcon,
+			FolderIcon,
 			UsersIcon,
-            TreeMenu,
-        },
-        computed: {
-            ...mapGetters([
+			TreeMenu,
+		},
+		computed: {
+			...mapGetters([
 				'clipboard'
 			]),
-            indent() {
-                return { paddingLeft: this.depth * 20 + 'px' }
-            },
-            disableId() {
-                let canBeShow = true
+			indent() {
+				return {paddingLeft: this.depth * 20 + 'px'}
+			},
+			disableId() {
+				let canBeShow = true
 
-                if(this.clipboard.includes(this.disabledById)){
-                    this.clipboard.map(item => {
-                        if(item.data.id === this.nodes.id) {
-                            canBeShow = false
-                        }
-                    })
-                }
-                return canBeShow
-            }
-        },
-        data() {
-            return {
-                isVisible: false,
-                isSelected: false,
-                isInactive: false
-            }
-        },
-        methods: {
-            getFolder() {
-                events.$emit('show-folder-item', this.nodes)
-                events.$emit('pick-folder', this.nodes)
-            },
-            showTree() {
-                this.isVisible = ! this.isVisible
-            }
-        },
-        mounted() {
+				if (this.clipboard.includes(this.disabledById)) {
+					this.clipboard.map(item => {
+						if (item.data.id === this.nodes.id) {
+							canBeShow = false
+						}
+					})
+				}
+				return canBeShow
+			},
+			isRootDepth() {
+				return this.depth === 1
+			},
+			isSelectedItem() {
+				return this.isSelected && this.nodes.isMovable || this.isSelected && !this.isRootDepth
+			}
+		},
+		data() {
+			return {
+				isVisible: false,
+				isSelected: false,
+				isInactive: false
+			}
+		},
+		methods: {
+			getFolder() {
+				if ((this.isRootDepth && this.nodes.isMovable) || !this.isRootDepth) {
+					events.$emit('show-folder-item', this.nodes)
+					events.$emit('pick-folder', this.nodes)
+				}
+			},
+			showTree() {
+				this.isVisible = !this.isVisible
+			}
+		},
+		mounted() {
 
-            // Show first location
-            if (this.depth === 1)
-                this.isVisible = true
+			// Show first location
+			if (this.depth === 1 && this.nodes.isOpen)
+				this.isVisible = true
 
-            // Select clicked folder
-            events.$on('pick-folder', node => {
-                this.isSelected = false
+			// Select clicked folder
+			events.$on('pick-folder', node => {
+				this.isSelected = false
 
-                if (this.nodes.id === node.id)
-                    this.isSelected = true
-            })
+				if (this.nodes.id === node.id)
+					this.isSelected = true
+			})
 
-            // Select clicked folder
-            events.$on('show-folder-item', node => {
-                this.isSelected = false
+			// Select clicked folder
+			events.$on('show-folder-item', node => {
+				this.isSelected = false
 
-                if (this.nodes.id === node.id)
-                    this.isSelected = true
-            })
-        }
-    }
+				if (this.nodes.id === node.id)
+					this.isSelected = true
+			})
+		}
+	}
 </script>
-
-<style lang="scss" scoped>
-    @import '/resources/sass/vuefilemanager/_variables';
-    @import '/resources/sass/vuefilemanager/_mixins';
-
-    .is-inactive,
-	.is-disabled-item {
-        opacity: 0.5;
-        pointer-events: none;
-    }
-
-    .folder-item {
-        user-select: none;
-        padding: 8px 23px;
-        @include transition(150ms);
-        cursor: pointer;
-        position: relative;
-        white-space: nowrap;
-
-        .icon {
-            line-height: 0;
-            width: 15px;
-            margin-right: 9px;
-            vertical-align: middle;
-            margin-top: -1px;
-
-            path, line, polyline, rect, circle {
-                @include transition(150ms);
-            }
-        }
-
-        .icon-arrow {
-            @include transition(300ms);
-            margin-right: 4px;
-            vertical-align: middle;
-            opacity: 0;
-
-            &.is-visible {
-                opacity: 1;
-            }
-
-            &.is-opened {
-                @include transform(rotate(90deg));
-            }
-        }
-
-        .label {
-            @include transition(150ms);
-            @include font-size(13);
-            font-weight: 700;
-            vertical-align: middle;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            display: inline-block;
-            color: $text;
-        }
-
-        &:hover,
-        &.is-selected {
-
-            .icon {
-                path, line, polyline, rect, circle {
-                    color: inherit !important;
-                }
-            }
-
-            .label {
-                color: inherit !important;
-            }
-        }
-    }
-
-    // Dark mode
-    .dark {
-
-        .folder-item {
-
-            .label {
-                color: $dark_mode_text_primary;
-            }
-
-            .is-selected .label {
-                color: inherit !important;
-            }
-        }
-    }
-
-</style>
diff --git a/src/Domain/Folders/Controllers/NavigationTreeController.php b/src/Domain/Folders/Controllers/NavigationTreeController.php
index 6a2ef414..8ae1a79b 100644
--- a/src/Domain/Folders/Controllers/NavigationTreeController.php
+++ b/src/Domain/Folders/Controllers/NavigationTreeController.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Domain\Folders\Controllers;
 
 use Domain\Folders\Models\Folder;
@@ -28,6 +29,7 @@ class NavigationTreeController
         // Get signed user folder which are shared with him
         $sharedFolderIds = DB::table('team_folder_members')
             ->where('user_id', Auth::id())
+            ->whereIn('permission', ['can-edit', 'can-view'])
             ->pluck('parent_id');
 
         $sharedWithMeFolders = Folder::with('folders:id,parent_id,id,name,team_folder')
@@ -41,18 +43,21 @@ class NavigationTreeController
                 'name'      => 'Files',
                 'folders'   => $folders,
                 'isMovable' => true,
+                'isOpen'    => true,
             ],
             [
                 'location'  => 'team-folders',
                 'name'      => 'Team Folders',
                 'folders'   => $teamFolders,
                 'isMovable' => false,
+                'isOpen'    => false,
             ],
             [
                 'location'  => 'shared-with-me',
                 'name'      => 'Shared With Me',
                 'folders'   => $sharedWithMeFolders,
                 'isMovable' => false,
+                'isOpen'    => false,
             ],
         ];
     }
diff --git a/src/Domain/Teams/Controllers/NavigationTreeController.php b/src/Domain/Teams/Controllers/NavigationTreeController.php
index 4181192a..264bb4bd 100644
--- a/src/Domain/Teams/Controllers/NavigationTreeController.php
+++ b/src/Domain/Teams/Controllers/NavigationTreeController.php
@@ -24,6 +24,7 @@ class NavigationTreeController
                 'name'      => $teamFolder->name,
                 'folders'   => $folders,
                 'isMovable' => true,
+                'isOpen'    => true,
             ],
         ];
     }