nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-05 18:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

team folders page

Browse Source
This commit is contained in:
Peter Papp
2021-08-26 12:20:36 +02:00
parent 7020720392
commit bee7352b28
21 changed files with 620 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/factories/FolderFactory.php
View File

@@ -25,7 +25,7 @@ class FolderFactory extends Factory
'id' => $this->faker->uuid,
'user_id' => $this->faker->uuid,
'name' => $this->faker->word,
'team_folder' => $this->faker->boolean(),
'team_folder' => false,
'author' => $this->faker->randomElement(
['user', 'member', 'visitor']
),

96
public/mix-manifest.json
View File

@@ -9,7 +9,7 @@
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~738b0c2f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~738b0c2f.js?id=8013b71e5d41ca2752b8",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~e44242d2.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~e44242d2.js?id=517790f13bf7daccdfe6",
"/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=0e511f0ceaac7257bf25",
"/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=2fe563914632c7cbd7a9",
"/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=cbccd295e834a952bc78",
"/chunks/admin~chunks/platform~chunks/settings~chunks/shared/file-browser.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared/file-browser.js?id=8d039f8ca0a670b99cca",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=5f8d3e698c1fd5b9b5a5",
"/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=055d17c4463d3ef30218",
@@ -36,7 +36,7 @@
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1e02112873d0b86eb1ac",
"/chunks/email-verified.js": "/chunks/email-verified.js?id=dc4aa33310fc98be6749",
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a547f8b4e9a83935a777",
"/chunks/files.js": "/chunks/files.js?id=7f75ce6379e3f7d5fbe9",
"/chunks/files.js": "/chunks/files.js?id=782c17049fb6b68a3337",
"/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~d426c4eb.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~d426c4eb.js?id=c6ab649e67651e0b9f18",
"/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~9a5728b1.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~9a5728b1.js?id=4f10f893c25e398f40bc",
"/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~aaaa339d.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~aaaa339d.js?id=593b877c4ab874ceccfe",
@@ -59,8 +59,8 @@
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=17469545c5b6a16c3bbf",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=0dd0a5efe0e3cb511c48",
"/chunks/plans.js": "/chunks/plans.js?id=5a3c28288952fcad96e5",
"/chunks/platform.js": "/chunks/platform.js?id=00aad462a215e1d31166",
"/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=5b1f86a4cb32fc3bb186",
"/chunks/platform.js": "/chunks/platform.js?id=f79041b0d1ecf91bcb16",
"/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=f31d4791b344030703e0",
"/chunks/platform~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared/file-browser.js?id=b142ad8801528b166787",
"/chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=6ba92eab6a45cbab3af5",
"/chunks/profile.js": "/chunks/profile.js?id=658aa03af778cc2cc100",
@@ -528,5 +528,91 @@
"/chunks/shared/files.4618b7b0d57385b7f2da.hot-update.js": "/chunks/shared/files.4618b7b0d57385b7f2da.hot-update.js",
"/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.46500898f3858d352390.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.46500898f3858d352390.hot-update.js",
"/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.c52a778b1010e0dd091a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.c52a778b1010e0dd091a.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings.2789d840701137f131b1.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.2789d840701137f131b1.hot-update.js"
"/chunks/admin~chunks/platform~chunks/settings.2789d840701137f131b1.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.2789d840701137f131b1.hot-update.js",
"/chunks/platform~chunks/shared.28aa7c8585c56edd190e.hot-update.js": "/chunks/platform~chunks/shared.28aa7c8585c56edd190e.hot-update.js",
"/chunks/platform.ada3ba4b5ecaa0eef8ce.hot-update.js": "/chunks/platform.ada3ba4b5ecaa0eef8ce.hot-update.js",
"/chunks/platform.e9e5ba99ad043a697866.hot-update.js": "/chunks/platform.e9e5ba99ad043a697866.hot-update.js",
"/chunks/platform.ce600f3a70da4e695186.hot-update.js": "/chunks/platform.ce600f3a70da4e695186.hot-update.js",
"/chunks/platform.6cbc4542aabc7ad6d351.hot-update.js": "/chunks/platform.6cbc4542aabc7ad6d351.hot-update.js",
"/chunks/platform.ddb2325516f9bcd1adcd.hot-update.js": "/chunks/platform.ddb2325516f9bcd1adcd.hot-update.js",
"/chunks/platform.342f50bc49adbf8ed74c.hot-update.js": "/chunks/platform.342f50bc49adbf8ed74c.hot-update.js",
"/chunks/platform.87cb2c288351475b611b.hot-update.js": "/chunks/platform.87cb2c288351475b611b.hot-update.js",
"/chunks/platform.400844e7718efa16aaa5.hot-update.js": "/chunks/platform.400844e7718efa16aaa5.hot-update.js",
"/chunks/platform.6f86df1bfb3014cf7ae3.hot-update.js": "/chunks/platform.6f86df1bfb3014cf7ae3.hot-update.js",
"/chunks/platform.80a86821a9f9b0fc5e22.hot-update.js": "/chunks/platform.80a86821a9f9b0fc5e22.hot-update.js",
"/chunks/platform.1f441f9048e6e6504eeb.hot-update.js": "/chunks/platform.1f441f9048e6e6504eeb.hot-update.js",
"/js/main.7f3e997ca37391d9041f.hot-update.js": "/js/main.7f3e997ca37391d9041f.hot-update.js",
"/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~6fce3876.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~6fce3876.js?id=3dc49e837aec52b13e76",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.js?id=1ddfc4037fd22e1d1ec7",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.js?id=472611f69313ee74d4d7",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~f312a84e.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~f312a84e.js?id=004c11df35e63517608d",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~432c06d3.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~432c06d3.js?id=fc6a6da4bf975191e38e",
"/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks~ad7e36b9.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks~ad7e36b9.js?id=1071fb25e6a201145c1a",
"/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~b068369d.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~b068369d.js?id=7906cf5e691a1f3e472a",
"/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~ab58556a.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~ab58556a.js?id=afa7d2dd8e1cc9c5947c",
"/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~f04cfcbc.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~f04cfcbc.js?id=258de30a5518a04e03b5",
"/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/team-folders~ch~ba7d6097.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/team-folders~ch~ba7d6097.js?id=2ef7b7c75f3f4f445216",
"/chunks/files~chunks/shared/files~chunks/team-folders.js": "/chunks/files~chunks/shared/files~chunks/team-folders.js?id=ed4e72b9cb1946e582c8",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=9fcb3a94c6627b168d0a",
"/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~3c02639c.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~3c02639c.js?id=e31953d811b86273037b",
"/chunks/team-folders.a9d3db5ba16e4109033c.hot-update.js": "/chunks/team-folders.a9d3db5ba16e4109033c.hot-update.js",
"/js/main.35ff6622df9d809bb747.hot-update.js": "/js/main.35ff6622df9d809bb747.hot-update.js",
"/js/main.473a78e993e103cd8ca7.hot-update.js": "/js/main.473a78e993e103cd8ca7.hot-update.js",
"/js/main.504c5da8051076699faa.hot-update.js": "/js/main.504c5da8051076699faa.hot-update.js",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.1a2ead4fedd6aa86957a.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.1a2ead4fedd6aa86957a.hot-update.js",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.c6392cf64191a248431a.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.c6392cf64191a248431a.hot-update.js",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.8284b2b4fe279364592d.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.8284b2b4fe279364592d.hot-update.js",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.27f145ce844bd2e8e510.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~26d67489.27f145ce844bd2e8e510.hot-update.js",
"/chunks/platform~chunks/shared.77fa211e19d12c7fb66e.hot-update.js": "/chunks/platform~chunks/shared.77fa211e19d12c7fb66e.hot-update.js",
"/chunks/platform~chunks/shared.904793813d5197f806fb.hot-update.js": "/chunks/platform~chunks/shared.904793813d5197f806fb.hot-update.js",
"/chunks/platform~chunks/shared.cd663426e58049cc4768.hot-update.js": "/chunks/platform~chunks/shared.cd663426e58049cc4768.hot-update.js",
"/chunks/platform~chunks/shared.259a52b382274b524994.hot-update.js": "/chunks/platform~chunks/shared.259a52b382274b524994.hot-update.js",
"/chunks/platform~chunks/shared.15f73fbfb2ce5daa32d3.hot-update.js": "/chunks/platform~chunks/shared.15f73fbfb2ce5daa32d3.hot-update.js",
"/chunks/platform~chunks/shared.72eb417af8a6e84603dc.hot-update.js": "/chunks/platform~chunks/shared.72eb417af8a6e84603dc.hot-update.js",
"/chunks/platform~chunks/shared.7b76d6aedc99146bf4e9.hot-update.js": "/chunks/platform~chunks/shared.7b76d6aedc99146bf4e9.hot-update.js",
"/chunks/platform~chunks/shared.4e27c2902762e992b796.hot-update.js": "/chunks/platform~chunks/shared.4e27c2902762e992b796.hot-update.js",
"/chunks/platform~chunks/shared.73b0d46e3e7b1deb1fa1.hot-update.js": "/chunks/platform~chunks/shared.73b0d46e3e7b1deb1fa1.hot-update.js",
"/chunks/platform~chunks/shared.91c4697f21a0fa63a045.hot-update.js": "/chunks/platform~chunks/shared.91c4697f21a0fa63a045.hot-update.js",
"/chunks/platform~chunks/shared.bc5500cd3490365cb8c7.hot-update.js": "/chunks/platform~chunks/shared.bc5500cd3490365cb8c7.hot-update.js",
"/chunks/platform~chunks/shared.757db34c4e28e87ba413.hot-update.js": "/chunks/platform~chunks/shared.757db34c4e28e87ba413.hot-update.js",
"/chunks/files.2d2c042e59a02db22e08.hot-update.js": "/chunks/files.2d2c042e59a02db22e08.hot-update.js",
"/chunks/platform.a23d85d0d3ea26f92390.hot-update.js": "/chunks/platform.a23d85d0d3ea26f92390.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings~chunks/shared.6c1c30b3239224f7e91d.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.6c1c30b3239224f7e91d.hot-update.js",
"/chunks/platform.f2bc95687748a18d0daf.hot-update.js": "/chunks/platform.f2bc95687748a18d0daf.hot-update.js",
"/chunks/platform~chunks/shared.8d3c64f4b3b8b4b021d4.hot-update.js": "/chunks/platform~chunks/shared.8d3c64f4b3b8b4b021d4.hot-update.js",
"/chunks/platform~chunks/shared.f5c9d8934f684b0366cf.hot-update.js": "/chunks/platform~chunks/shared.f5c9d8934f684b0366cf.hot-update.js",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.c7080a5402539b7e25e9.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~d04310d2.c7080a5402539b7e25e9.hot-update.js",
"/chunks/team-folders.f216915afc49b197fc96.hot-update.js": "/chunks/team-folders.f216915afc49b197fc96.hot-update.js",
"/chunks/platform.740b85d9a2ccbd63d034.hot-update.js": "/chunks/platform.740b85d9a2ccbd63d034.hot-update.js",
"/chunks/platform.b5897c711784f23562b4.hot-update.js": "/chunks/platform.b5897c711784f23562b4.hot-update.js",
"/chunks/platform.64786c52c9eddf5fd846.hot-update.js": "/chunks/platform.64786c52c9eddf5fd846.hot-update.js",
"/js/main.527da5a4348ff8163437.hot-update.js": "/js/main.527da5a4348ff8163437.hot-update.js",
"/chunks/platform.527da5a4348ff8163437.hot-update.js": "/chunks/platform.527da5a4348ff8163437.hot-update.js",
"/chunks/team-folders.b76d9d35e06740b57e4d.hot-update.js": "/chunks/team-folders.b76d9d35e06740b57e4d.hot-update.js",
"/chunks/team-folders.0202e869009d8e084afd.hot-update.js": "/chunks/team-folders.0202e869009d8e084afd.hot-update.js",
"/chunks/platform.f5782ad69121c5449fed.hot-update.js": "/chunks/platform.f5782ad69121c5449fed.hot-update.js",
"/chunks/platform.7eda93be5c56c9868c22.hot-update.js": "/chunks/platform.7eda93be5c56c9868c22.hot-update.js",
"/chunks/platform.5d5177475492159754ed.hot-update.js": "/chunks/platform.5d5177475492159754ed.hot-update.js",
"/chunks/platform.954328e0484a1b2930fc.hot-update.js": "/chunks/platform.954328e0484a1b2930fc.hot-update.js",
"/chunks/platform.f682b42e914cd9c21c47.hot-update.js": "/chunks/platform.f682b42e914cd9c21c47.hot-update.js",
"/js/main.10d1afef9db1938825c4.hot-update.js": "/js/main.10d1afef9db1938825c4.hot-update.js",
"/js/main.d15f940c15a1c50d1414.hot-update.js": "/js/main.d15f940c15a1c50d1414.hot-update.js",
"/chunks/platform.0af284af51d4da44e492.hot-update.js": "/chunks/platform.0af284af51d4da44e492.hot-update.js",
"/chunks/platform.9addab8b98e415983916.hot-update.js": "/chunks/platform.9addab8b98e415983916.hot-update.js",
"/chunks/platform.520800f77d90d42f9705.hot-update.js": "/chunks/platform.520800f77d90d42f9705.hot-update.js",
"/chunks/platform.2687b09aa1060628943f.hot-update.js": "/chunks/platform.2687b09aa1060628943f.hot-update.js",
"/chunks/platform.46867c5fb7c4f9af68d1.hot-update.js": "/chunks/platform.46867c5fb7c4f9af68d1.hot-update.js",
"/chunks/platform.01eea14dae44cc2656fc.hot-update.js": "/chunks/platform.01eea14dae44cc2656fc.hot-update.js",
"/chunks/platform.3630178467dc9a8479b9.hot-update.js": "/chunks/platform.3630178467dc9a8479b9.hot-update.js",
"/chunks/platform.08b8429836cb1094e1dc.hot-update.js": "/chunks/platform.08b8429836cb1094e1dc.hot-update.js",
"/chunks/platform.1163cde6e86891fd7754.hot-update.js": "/chunks/platform.1163cde6e86891fd7754.hot-update.js",
"/chunks/platform.c51fdbac98921760eae2.hot-update.js": "/chunks/platform.c51fdbac98921760eae2.hot-update.js",
"/chunks/platform.08e561932dc35fd77618.hot-update.js": "/chunks/platform.08e561932dc35fd77618.hot-update.js",
"/chunks/platform.25f95466a4d216433ca1.hot-update.js": "/chunks/platform.25f95466a4d216433ca1.hot-update.js",
"/chunks/platform.a7f7266dc219aa2fc873.hot-update.js": "/chunks/platform.a7f7266dc219aa2fc873.hot-update.js",
"/chunks/platform.139c761716720278fcac.hot-update.js": "/chunks/platform.139c761716720278fcac.hot-update.js",
"/chunks/platform.74aadb3eabe898628f66.hot-update.js": "/chunks/platform.74aadb3eabe898628f66.hot-update.js",
"/chunks/platform.0f739327c96ee4c1ec4f.hot-update.js": "/chunks/platform.0f739327c96ee4c1ec4f.hot-update.js",
"/chunks/platform.0c681d4fd16b01ad1e8e.hot-update.js": "/chunks/platform.0c681d4fd16b01ad1e8e.hot-update.js",
"/chunks/platform.f4282e8b484d47959cd2.hot-update.js": "/chunks/platform.f4282e8b484d47959cd2.hot-update.js"
}

12
resources/js/components/FilesView/DesktopToolbar.vue
View File

@@ -16,9 +16,9 @@
<ToolbarWrapper>
<!--Search bar-->
<ToolbarGroup v-if="false" style="margin-left: 0">
<!-- <ToolbarGroup style="margin-left: 0">
<SearchBar />
</ToolbarGroup>
</ToolbarGroup>-->
<!--Creating controls-->
<ToolbarGroup v-if="$checkPermission(['master', 'editor'])">
@@ -40,7 +40,7 @@
<ToolbarGroup v-if="$checkPermission(['master', 'editor']) && ! $isMobile() && !$isThisRoute($route, ['Public'])">
<!--Team Folder Icon-->
<PopoverWrapper>
<PopoverWrapper v-if="$isThisRoute($route, ['TeamFolders'])">
<TeamMembersPreview @click.stop.native="showTeamFolderMenu" count="3+" :members="members" class="team-preview" />
<PopoverItem name="team-folder" side="left">
<TeamFolderPreview />
@@ -51,7 +51,7 @@
</PopoverItem>
</PopoverWrapper>
<ToolbarButton v-if="false" @click.native="$createTeamFolder" source="user-plus" :action="$t('actions.convert_into_team_folder')" />
<ToolbarButton v-if="canShowConvertToTeamFolder" @click.native="$updateTeamFolder(clipboard[0])" :class="{'is-inactive': ! canCreateTeamFolderInView }" source="user-plus" :action="$t('actions.convert_into_team_folder')" />
<ToolbarButton @click.native="$shareFileOrFolder(clipboard[0])" :class="{'is-inactive': canShareInView }" source="share" :action="$t('actions.share')" />
</ToolbarGroup>
@@ -151,6 +151,7 @@
'Trash': this.$t('Trash'),
'Public': this.$t('Files'),
'Files': this.$t('Files'),
'TeamFolders': this.$t('Team Folders'),
}[this.$route.name]
}
},
@@ -172,6 +173,9 @@
]
return !this.$isThisRoute(this.$route, routes) || this.clipboard.length === 0
},
canShowConvertToTeamFolder() {
return this.$isThisRoute(this.$route, ['Files', 'MySharedItems'])
},
canUploadInView() {
return ! this.$isThisRoute(this.$route, ['Files', 'Public'])
},

4
resources/js/components/FilesView/FileItemList.vue
View File

@@ -228,6 +228,8 @@ export default {
this.$router.push({name: 'Trash', params: {id: this.item.id}})
} else if (route === 'Files') {
this.$router.push({name: 'Files', params: {id: this.item.id}})
} else if (route === 'TeamFolders') {
this.$router.push({name: 'TeamFolders', params: {id: this.item.id}})
}
} else {
@@ -269,6 +271,8 @@ export default {
this.$router.push({name: 'Trash', params: {id: this.item.id}})
} else if (route === 'Files') {
this.$router.push({name: 'Files', params: {id: this.item.id}})
} else if (route === 'TeamFolders') {
this.$router.push({name: 'TeamFolders', params: {id: this.item.id}})
}
}
},

10
resources/js/components/FilesView/FolderIcon.vue
View File

@@ -7,7 +7,7 @@
/>
<FontAwesomeIcon
v-if="!emoji"
:class="[{ 'is-deleted': isDeleted },{'default-color' : ! color && ! isDeleted}, 'folder-icon' ]"
:class="[{'is-deleted':isDeleted},{'is-team':item.team_folder},{'default-color': ! color && ! isDeleted}, 'folder-icon' ]"
:style="{fill: color}"
icon="folder"
/>
@@ -95,6 +95,14 @@
fill: $dark_background;
}
}
&.is-team {
path {
fill: transparent;
stroke-width: 20px;
stroke: inherit;
}
}
}
.dark-mode {

4
resources/js/components/Others/Popup/PopupHeader.vue
View File

@@ -6,6 +6,7 @@
<edit2-icon v-if="icon === 'edit'" size="17" class="title-icon text-theme dark-text-theme" />
<key-icon v-if="icon === 'key'" size="17" class="title-icon text-theme dark-text-theme" />
<users-icon v-if="icon === 'users'" size="17" class="title-icon text-theme dark-text-theme" />
<user-plus-icon v-if="icon === 'user-plus'" size="17" class="title-icon text-theme dark-text-theme" />
</div>
<div class="label">
<h1 class="title">{{ title }}</h1>
@@ -15,7 +16,7 @@
</template>
<script>
import {KeyIcon, CornerDownRightIcon, LinkIcon, XIcon, Edit2Icon, ShareIcon, UsersIcon} from 'vue-feather-icons'
import {KeyIcon, UserPlusIcon, CornerDownRightIcon, LinkIcon, XIcon, Edit2Icon, ShareIcon, UsersIcon} from 'vue-feather-icons'
import {events} from '/resources/js/bus'
export default {
@@ -25,6 +26,7 @@
],
components: {
CornerDownRightIcon,
UserPlusIcon,
UsersIcon,
ShareIcon,
Edit2Icon,

6
resources/js/components/Teams/Components/PermissionToggleButton.vue
View File

@@ -44,7 +44,11 @@
}
},
created() {
this.permission = this.item.permission
if (this.item.pivot) {
this.permission = this.item.pivot.permission
} else {
this.permission = this.item.permission
}
}
}
</script>

9
resources/js/components/Teams/Components/TeamMemberList.vue → resources/js/components/Teams/Components/TeamList.vue
View File

@@ -6,11 +6,11 @@
</div>
<div class="member-preview">
<div class="avatar">
<img :src="member.avatar">
<img :src="member.settings ? member.settings.avatar : '/assets/images/default-avatar.png'">
</div>
<div class="info">
<b class="name">{{ member.name ? member.name : member.email }}</b>
<span v-if="member.name" class="email">{{ member.email }}</span>
<b class="name">{{ member.settings ? member.settings.name : member.email }}</b>
<span v-if="member.settings" class="email">{{ member.email }}</span>
</div>
</div>
<div class="action">
@@ -28,7 +28,7 @@
import {XIcon} from 'vue-feather-icons'
export default {
name: "TeamMemberList",
name: "TeamList",
props: [
'value',
],
@@ -67,7 +67,6 @@
@import '/resources/sass/vuefilemanager/_forms';
.member-list {
margin-bottom: 20px;
max-height: 270px;
overflow-y: scroll;
}

66
resources/js/components/Teams/CreateTeamFolderPopup.vue
View File

@@ -2,7 +2,7 @@
<PopupWrapper name="create-team-folder">
<!--Title-->
<PopupHeader :title="popupTitle" icon="users" />
<PopupHeader :title="popupTitle" icon="user-plus" />
<!--Content-->
<PopupContent>
@@ -31,7 +31,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Members" rules="required" v-slot="{ errors }">
<label class="input-label">{{ $t('Your Members') }}:</label>
<span v-if="errors[0]" class="error-message" style="margin-top: -5px">{{ $t('Please add at least one member.') }}</span>
<TeamMemberList v-model="members" />
<TeamList v-model="invitations" />
</ValidationProvider>
<InfoBox v-if="! isNewFolderTeamCreation" style="margin-bottom: 0">
@@ -69,7 +69,7 @@
import PopupHeader from '/resources/js/components/Others/Popup/PopupHeader'
import ThumbnailItem from '/resources/js/components/Others/ThumbnailItem'
import ButtonBase from '/resources/js/components/FilesView/ButtonBase'
import TeamMemberList from "./Components/TeamMemberList";
import TeamList from "./Components/TeamList";
import {required} from 'vee-validate/dist/rules'
import InfoBox from "../Others/Forms/InfoBox";
import {events} from '/resources/js/bus'
@@ -80,7 +80,7 @@
components: {
ValidationProvider,
ValidationObserver,
TeamMemberList,
TeamList,
ThumbnailItem,
PopupWrapper,
PopupActions,
@@ -92,7 +92,7 @@
},
computed: {
popupTitle() {
return this.item ? this.$t('Move into a Team Folder') : this.$t('Create Team Folder')
return this.item ? this.$t('Convert as Team Folder') : this.$t('Create Team Folder')
},
popupSubmit() {
return this.item ? this.$t('Move & Invite Members') : this.$t('Create Team Folder')
@@ -103,29 +103,7 @@
},
data() {
return {
members: [
{
id: 1,
name: 'Jane Doe',
email: 'jane@doe.com',
avatar: '/temp/avatar-01.png',
permission: 'can-edit',
},
{
id: 2,
name: 'Emma Willis',
email: 'dawn_mcglynn@adams.tv',
avatar: '/temp/avatar-02.png',
permission: 'can-view',
},
{
id: 3,
name: 'Barry Erickson',
email: 'ulatid@jabo.edu',
avatar: '/temp/avatar-03.png',
permission: 'can-view-and-download',
},
],
invitations: [],
item: undefined,
name: undefined,
email: undefined,
@@ -140,21 +118,37 @@
this.isLoading = true
let route = this.name ? `/api/teams` : `/api/teams/${this.item.id}`
let route = this.name
? `/api/teams/folders`
: `/api/teams/convert/${this.item.id}`
let payload = this.name
? {
name: this.name,
invitations: this.invitations,
}
: {
invitations: this.invitations,
}
axios
.post(route, {
name: this.name,
members: this.members,
})
.post(route, payload)
.then(response => {
// todo: push to team folder
//this.$router.push({name: 'TeamFolders', params: {id: response.data.id}})
if (! this.$isThisRoute(this.$route, ['TeamFolders']))
this.$router.push({name: 'TeamFolders'})
this.$store.dispatch('getAppData')
})
.catch(() => this.$isSomethingWrong())
.finally(() => {
this.isLoading = false
this.name = undefined
this.members = undefined
this.invitations = undefined
this.$closePopup()
})
},
addMember() {
@@ -168,7 +162,7 @@
this.$refs.teamFolderForm.reset()
this.members.push({
this.invitations.push({
email: this.email,
avatar: '/assets/images/default-avatar.png',
permission: 'can-edit',
@@ -191,7 +185,7 @@
this.email = undefined
this.name = undefined
this.item = undefined
this.members = []
this.invitations = []
}, 150)
})
}

176
resources/js/components/Teams/EditTeamFolderPopup.vue Normal file
View File

@@ -0,0 +1,176 @@
<template>
<PopupWrapper name="update-team-folder">
<!--Title-->
<PopupHeader :title="$t('Edit Team Folder')" icon="user-plus" />
<!--Content-->
<PopupContent>
<!--Item Thumbnail-->
<ThumbnailItem class="item-thumbnail" :item="item" info="metadata" />
<!--Form to set team folder-->
<ValidationObserver @submit.prevent="updateTeamFolder" ref="teamFolderForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
<!--Add Member-->
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Email" v-slot="{ errors }">
<label class="input-label">{{ $t('Add Member') }}:</label>
<input @keypress.enter.stop.prevent="addMember" v-model="email" :class="{'is-error': errors[0]}" type="email" class="focus-border-theme" :placeholder="$t('Type member email...')">
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
<!--Member list-->
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Members" rules="required" v-slot="{ errors }">
<label class="input-label">{{ $t('Your Members') }}:</label>
<span v-if="errors[0]" class="error-message" style="margin-top: -5px">{{ $t('Please add at least one member.') }}</span>
<TeamList v-model="members" />
<TeamList v-model="invitations" />
</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="updateTeamFolder"
button-style="theme"
:loading="isLoading"
:disabled="isLoading"
>{{ $t('Update Team Folder') }}
</ButtonBase>
</PopupActions>
</PopupWrapper>
</template>
<script>
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
import PopupWrapper from '/resources/js/components/Others/Popup/PopupWrapper'
import PopupActions from '/resources/js/components/Others/Popup/PopupActions'
import PopupContent from '/resources/js/components/Others/Popup/PopupContent'
import PopupHeader from '/resources/js/components/Others/Popup/PopupHeader'
import ThumbnailItem from '/resources/js/components/Others/ThumbnailItem'
import ButtonBase from '/resources/js/components/FilesView/ButtonBase'
import TeamList from "./Components/TeamList";
import {required} from 'vee-validate/dist/rules'
import InfoBox from "../Others/Forms/InfoBox";
import {events} from '/resources/js/bus'
import axios from "axios";
export default {
name: 'UpdateTeamFolderPopup',
components: {
ValidationProvider,
ValidationObserver,
TeamList,
ThumbnailItem,
PopupWrapper,
PopupActions,
PopupContent,
PopupHeader,
ButtonBase,
required,
InfoBox,
},
computed: {
//
},
data() {
return {
invitations: [],
members: [],
item: undefined,
name: undefined,
email: undefined,
isLoading: false,
}
},
methods: {
async updateTeamFolder() {
const isValid = await this.$refs.teamFolderForm.validate()
if (!isValid) return
this.isLoading = true
axios
.patch(`/api/teams/folders/${this.item.id}`, {
members: this.members,
invitations: this.invitations,
})
.then(response => {
// todo: update view
this.$store.dispatch('getAppData')
})
.catch(() => this.$isSomethingWrong())
.finally(() => {
this.isLoading = false
this.name = undefined
this.invitations = undefined
this.$closePopup()
})
},
addMember() {
let email = this.email.match(/^[^\s@]+@[^\s@]+\.[^\s@]+$/)[0]
if (! email) {
this.$refs.teamFolderForm.setErrors({
'Email': this.$t("You have to type valid email")
});
}
this.$refs.teamFolderForm.reset()
this.invitations.push({
email: this.email,
avatar: '/assets/images/default-avatar.png',
permission: 'can-edit',
})
this.email = undefined
}
},
mounted() {
events.$on('popup:open', args => {
if (args.name !== 'update-team-folder') return
console.log(args.item);
if (args.item) {
this.item = args.item
this.members = args.item.team_members
this.invitations = args.item.team_invitations
}
})
events.$on('popup:close', () => {
setTimeout(() => {
this.email = undefined
this.name = undefined
this.item = undefined
this.invitations = []
this.members = []
}, 150)
})
}
}
</script>
<style scoped lang="scss">
@import "resources/sass/vuefilemanager/_inapp-forms.scss";
@import '/resources/sass/vuefilemanager/_forms';
.item-thumbnail {
margin-bottom: 20px;
}
</style>

6
resources/js/helpers/itemHelpers.js vendored
View File

@@ -1,8 +1,4 @@
import {events} from "../bus";
import {debounce, isArray} from "lodash";
import axios from "axios";
import i18n from "../i18n";
import store from "../store";
const itemHelpers = {
install(Vue) {
@@ -54,7 +50,7 @@ const itemHelpers = {
}
Vue.prototype.$updateTeamFolder = function (entry) {
events.$emit('popup:open', {name: 'create-team-folder', item: [entry]})
events.$emit('popup:open', {name: 'update-team-folder', item: entry})
}
Vue.prototype.$removeFavourite = function (folder) {

4
resources/js/routes/routesFile.js vendored
View File

@@ -43,9 +43,9 @@ const routesFile = [
},
{
name: 'TeamFolders',
path: '/platform/team-folder/:id?',
path: '/platform/team-folders/:id?',
component: () =>
import(/* webpackChunkName: "chunks/team-folders" */ '../views/FileView/Trash'),
import(/* webpackChunkName: "chunks/team-folders" */ '../views/FileView/TeamFolders'),
meta: {
requiresAuth: true
},

29
resources/js/store/modules/fileBrowser.js vendored
View File

@@ -43,6 +43,35 @@ const actions = {
}
})
},
getTeamFolder: ({commit, getters}, id) => {
commit('LOADING_STATE', {loading: true, data: []})
axios
.get(`${getters.api}/teams/folders/${id}/${getters.sorting.URI}`)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data.content})
commit('SET_CURRENT_FOLDER', response.data.folder)
events.$emit('scrollTop')
})
.catch(error => {
// Redirect if unauthenticated
if ([401, 403].includes(error.response.status)) {
commit('SET_AUTHORIZED', false)
router.push({name: 'SignIn'})
} else {
// Show error message
events.$emit('alert:open', {
title: i18n.t('popup_error.title'),
message: i18n.t('popup_error.message'),
})
}
})
},
getRecentUploads: ({commit, getters}) => {
commit('LOADING_STATE', {loading: true, data: []})

2
resources/js/views/FileView/Files.vue
View File

@@ -54,7 +54,7 @@
</OptionGroup>
<OptionGroup>
<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="users" />
<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="user-plus" />
</OptionGroup>
<OptionGroup>
<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />

216
resources/js/views/FileView/TeamFolders.vue Normal file
View File

@@ -0,0 +1,216 @@
<template>
<div>
<MobileContextMenu>
<OptionGroup v-if="item && isFolder">
<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
<OptionGroup v-if="item">
<Option @click.native="$renameFileOrFolder(item)" :title="$t('context_menu.rename')" icon="rename" />
<Option @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
</OptionGroup>
<OptionGroup v-if="item">
<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="users" />
</OptionGroup>
<OptionGroup v-if="item">
<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
</OptionGroup>
</MobileContextMenu>
<MobileCreateMenu>
<OptionGroup>
<OptionUpload :class="{'is-inactive': !hasCapacity }" :title="$t('actions.upload')" is-hover-disabled="true" />
</OptionGroup>
<OptionGroup>
<Option @click.stop.native="$createTeamFolder" :title="$t('Create Team Folder')" icon="users" is-hover-disabled="true" />
<Option @click.stop.native="createFolder" :title="$t('actions.create_folder')" icon="folder-plus" is-hover-disabled="true" />
</OptionGroup>
</MobileCreateMenu>
<MobileMultiSelectToolbar>
<ToolbarButton @click.native="$moveFileOrFolder(clipboard)" class="action-btn" source="move" :action="$t('actions.move')" :class="{'is-inactive' : clipboard.length < 1}" />
<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive' : clipboard.length < 1}" :action="$t('actions.delete')" />
<ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
</MobileMultiSelectToolbar>
<ContextMenu>
<template v-slot:empty-select>
<OptionGroup>
<Option @click.native="$createTeamFolder" :title="$t('Create Team Folder')" icon="users" />
</OptionGroup>
</template>
<template v-slot:single-select v-if="item">
<OptionGroup v-if="isFolder">
<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
<OptionGroup>
<Option @click.native="$renameFileOrFolder(item)" :title="$t('context_menu.rename')" icon="rename" />
<Option @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
</OptionGroup>
<OptionGroup>
<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Edit Team Members')" icon="users" />
</OptionGroup>
<OptionGroup>
<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />
<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
</OptionGroup>
</template>
<template v-slot:multiple-select v-if="item">
<OptionGroup v-if="!hasFile">
<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
<OptionGroup>
<Option @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
</OptionGroup>
<OptionGroup>
<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
</OptionGroup>
</template>
</ContextMenu>
<FileBrowser>
<template v-slot:file-actions-mobile>
<MobileActionButton @click.native="$openSpotlight" icon="search">
{{ $t('actions.search') }}
</MobileActionButton>
<MobileActionButton @click.native="$showLocations" icon="filter">
{{ filterLocationTitle }}
</MobileActionButton>
<MobileActionButton @click.native="$createItems" v-if="$checkPermission(['master', 'editor'])" icon="cloud-plus">
{{ $t('mobile.create') }}
</MobileActionButton>
<MobileActionButton @click.native="$enableMultiSelectMode" icon="check-square">
{{ $t('context_menu.select') }}
</MobileActionButton>
<MobileActionButton @click.native="$showViewOptions" icon="preview-sorting">
{{ $t('preview_sorting.preview_sorting_button') }}
</MobileActionButton>
</template>
<template v-slot:empty-file-page>
<h1 class="title">
{{ $t('empty_page.title') }}
</h1>
<p class="description">
{{ $t('empty_page.description') }}
</p>
<ButtonUpload button-style="theme">
{{ $t('empty_page.call_to_action') }}
</ButtonUpload>
</template>
</FileBrowser>
</div>
</template>
<script>
import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
import MobileMultiSelectToolbar from "/resources/js/components/FilesView/MobileMultiSelectToolbar"
import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
import MobileContextMenu from "/resources/js/components/FilesView/MobileContextMenu"
import MobileCreateMenu from '/resources/js/components/FilesView/MobileCreateMenu'
import ButtonUpload from '/resources/js/components/FilesView/ButtonUpload'
import ToolbarButton from '/resources/js/components/FilesView/ToolbarButton'
import OptionUpload from '/resources/js/components/FilesView/OptionUpload'
import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
import Option from '/resources/js/components/FilesView/Option'
import { mapGetters } from 'vuex'
import {events} from "../../bus";
export default {
name: 'TeamFolders',
components: {
MobileActionButtonUpload,
MobileMultiSelectToolbar,
MobileActionButton,
MobileContextMenu,
MobileCreateMenu,
ToolbarButton,
ButtonUpload,
OptionUpload,
OptionGroup,
FileBrowser,
ContextMenu,
Option,
},
computed: {
...mapGetters([
'clipboard',
'config',
'user',
]),
hasCapacity() {
// Check if storage limitation is set
if (!this.config.storageLimit) return true
// Check if user has storage
return this.user && this.user.data.attributes.storage.used <= 100
},
isFolder() {
return this.item && this.item.type === 'folder'
},
isInFavourites() {
return this.favourites.find((el) => el.id === this.item.id)
},
hasFile() {
return this.clipboard.find(item => item.type !== 'folder')
},
favourites() {
return this.user.data.relationships.favourites.data.attributes.folders
},
filterLocationTitle() {
return {
'RecentUploads': this.$t('Recent'),
'MySharedItems': this.$t('Shared'),
'Trash': this.$t('Trash'),
'Public': this.$t('Files'),
'Files': this.$t('Files'),
}[this.$route.name]
}
},
data() {
return {
item: undefined,
}
},
methods: {
addToFavourites() {
// Check if folder is in favourites and then add/remove from favourites
if (
this.favourites &&
!this.favourites.find(el => el.id === this.item.id)
) {
// Add to favourite folder that is not selected
if (!this.clipboard.includes(this.item)) {
this.$store.dispatch('addToFavourites', this.item)
}
// Add to favourites all selected folders
if (this.clipboard.includes(this.item)) {
this.$store.dispatch('addToFavourites', null)
}
} else {
this.$store.dispatch('removeFromFavourites', this.item)
}
},
createFolder() {
events.$emit('popup:open', {name: 'create-folder'})
},
},
created() {
this.$store.dispatch('getTeamFolder', this.$route.params.id)
events.$on('context-menu:show', (event, item) => this.item = item)
events.$on('mobile-context-menu:show', item => this.item = item)
}
}
</script>

3
resources/js/views/Platform.vue
View File

@@ -10,6 +10,7 @@
<ConfirmPopup />
<CreateTeamFolderPopup />
<EditTeamFolderPopup />
<ShareCreatePopup />
<ShareEditPopup />
@@ -49,6 +50,7 @@
import ShareCreatePopup from '/resources/js/components/Others/ShareCreatePopup'
import DesktopToolbar from '/resources/js/components/FilesView/DesktopToolbar'
import CreateTeamFolderPopup from "../components/Teams/CreateTeamFolderPopup"
import EditTeamFolderPopup from "../components/Teams/EditTeamFolderPopup"
import ConfirmPopup from '/resources/js/components/Others/Popup/ConfirmPopup'
import RenameItemPopup from '/resources/js/components/Others/RenameItemPopup'
import ShareEditPopup from '/resources/js/components/Others/ShareEditPopup'
@@ -64,6 +66,7 @@
components: {
CreateTeamFolderPopup,
PanelNavigationFiles,
EditTeamFolderPopup,
CreateFolderPopup,
FileSortingMobile,
SidebarNavigation,

5
resources/views/vuefilemanager/others/color-template.blade.php
View File

@@ -9,7 +9,10 @@
{{-- Single option --}}
.svg-color-theme {fill: {{ $color }}}
.svg-color-theme {
fill: {{ $color }};
stroke: {{ $color }};
}
.svg-stroke-theme {stroke: {{ $color }}}
.hover-svg-stroke-theme:hover {stroke: {{ $color }}}

4
src/App/Users/Models/User.php
View File

@@ -125,7 +125,8 @@ class User extends Authenticatable implements MustVerifyEmail
public function getFolderTreeAttribute(): Collection
{
return Folder::with(['folders.shared', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('parent_id', null)
->where('parent_id')
->where('team_folder', false)
->where('user_id', $this->id)
->sortable()
->get();
@@ -145,6 +146,7 @@ class User extends Authenticatable implements MustVerifyEmail
public function favouriteFolders(): BelongsToMany
{
return $this->belongsToMany(Folder::class, 'favourite_folder', 'user_id', 'folder_id', 'id', 'id')
->where('team_folder', false)
->with('shared:token,id,item_id,permission,is_protected,expire_in');
}

1
src/Domain/Browsing/Controllers/BrowseFolderController.php
View File

@@ -19,6 +19,7 @@ class BrowseFolderController
// Get folders and files
$folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('parent_id', $root_id)
->where('team_folder', false)
->where('user_id', Auth::id())
->sortable()
->get();

17
src/Domain/Folders/Controllers/NavigationFolderTreeController.php
View File

@@ -9,17 +9,28 @@ class NavigationFolderTreeController
public function __invoke(): array
{
$folders = Folder::with('folders:id,parent_id,id,name')
->where('parent_id', null)
->where('parent_id')
->where('team_folder', false)
->where('user_id', Auth::id())
->sortable()
->get(['id', 'parent_id', 'id', 'name']);
$teamFolders = Folder::with('folders:id,parent_id,id,name')
->where('parent_id')
->where('team_folder', true)
->where('user_id', Auth::id())
->sortable()
->get(['id', 'parent_id', 'id', 'name']);
return [
[
'name' => __t('home'),
'location' => 'base',
'name' => 'Files',
'folders' => $folders,
],
[
'name' => 'Team Folders',
'folders' => $teamFolders,
],
];
}
}

21
src/Domain/Teams/Controllers/TeamFoldersController.php
View File

@@ -14,6 +14,7 @@ use Domain\Teams\DTO\CreateTeamFolderData;
use Domain\Teams\Actions\UpdateMembersAction;
use Domain\Teams\Actions\UpdateInvitationsAction;
use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
use Str;
class TeamFoldersController extends Controller
{
@@ -27,19 +28,27 @@ class TeamFoldersController extends Controller
$isHomepage = $id === 'undefined';
$rootId = $id === 'undefined' ? null : $id;
$requestedFolder = $rootId ? Folder::findOrFail($rootId) : null;
$files = [];
$folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
$folders = Folder::with([
'teamMembers',
'teamInvitations',
'parent:id,name',
'shared:token,id,item_id,permission,is_protected,expire_in'
])
->where('parent_id', $rootId)
->where('team_folder', $isHomepage)
->where('user_id', Auth::id())
->sortable()
->get();
$files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('folder_id', $rootId)
->where('user_id', Auth::id())
->sortable()
->get();
if (Str::isUuid($id)) {
$files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
->where('folder_id', $rootId)
->where('user_id', Auth::id())
->sortable()
->get();
}
// Collect folders and files to single array
return [