From 1c4b4c6279bda6b28c40f07f33e0c42917c3d6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Tue, 15 Mar 2022 10:39:43 +0100 Subject: [PATCH] - fixed create menu items - reload team folder after update team member --- config/language-translations.php | 2 +- public/mix-manifest.json | 26 ++++---- .../components/FilesView/DesktopToolbar.vue | 42 +++++++++---- resources/js/components/FilesView/Option.vue | 2 +- .../js/components/FilesView/OptionUpload.vue | 5 +- .../Others/CreateUploadRequestPopup.vue | 63 ++++++++++--------- .../components/Teams/EditTeamFolderPopup.vue | 1 + resources/js/views/FileView/Files.vue | 36 +++++------ resources/js/views/FileView/MySharedItems.vue | 11 ---- resources/js/views/FileView/SharedWithMe.vue | 5 +- resources/js/views/FileView/TeamFolders.vue | 48 +++++++------- .../Console/Commands/SetupDevEnvironment.php | 2 +- 12 files changed, 123 insertions(+), 120 deletions(-) diff --git a/config/language-translations.php b/config/language-translations.php index 02eaf49e..930e5836 100644 --- a/config/language-translations.php +++ b/config/language-translations.php @@ -341,7 +341,7 @@ return [ 'context_menu.detail' => 'Detail', 'context_menu.download' => 'Download', 'context_menu.copy' => 'Copy', - 'context_menu.empty_trash' => 'Empty Trash', + 'context_menu.empty_trash' => 'Flush', 'context_menu.log_out' => 'Log Out', 'context_menu.move' => 'Move', 'context_menu.no_options' => 'No Options Available', diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 713f2e5e..c1e10d98 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { "/js/main.js": "/js/main.js", - "/chunks/request.js": "/chunks/request.js?id=2af67d8c5c43f134", - "/chunks/request-upload.js": "/chunks/request-upload.js?id=e0449cbbcda80b90", + "/chunks/request.js": "/chunks/request.js?id=e962b17f1de9db87", + "/chunks/request-upload.js": "/chunks/request-upload.js?id=838bc706adb900ab", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec", "/chunks/status-check.js": "/chunks/status-check.js?id=0bcc38e60d97631d", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=8ce2150648a811b5", @@ -9,13 +9,13 @@ "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=7f6a9af36bfcd706", "/chunks/app-setup.js": "/chunks/app-setup.js?id=0df2494d2269a949", "/chunks/admin-account.js": "/chunks/admin-account.js?id=2d131d1d784c98b9", - "/chunks/shared.js": "/chunks/shared.js?id=f2c192c97391371f", - "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=a6f7ccd14ebd2a9d", + "/chunks/shared.js": "/chunks/shared.js?id=fc95b374dd3eabba", + "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=7bb384461baaf4f2", "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=34e05a8b937a1436", "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=2b7cf12984397d27", "/chunks/not-found.js": "/chunks/not-found.js?id=36763aa314e00327", "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=a3906226272982b1", - "/chunks/admin.js": "/chunks/admin.js?id=5cd297961893d763", + "/chunks/admin.js": "/chunks/admin.js?id=b5c1b1ee97b4f303", "/chunks/dashboard.js": "/chunks/dashboard.js?id=0ba6b75f07f739e2", "/chunks/invoices.js": "/chunks/invoices.js?id=f89964a5a55ace45", "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=62582c26b6288d7d", @@ -57,18 +57,18 @@ "/chunks/sign-up.js": "/chunks/sign-up.js?id=849c274b322f055b", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=3c5ba5865e21da37", "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=8654bf89e7d9685b", - "/chunks/settings.js": "/chunks/settings.js?id=00ec853ab596df83", + "/chunks/settings.js": "/chunks/settings.js?id=b6ce85c1860aa6dc", "/chunks/profile.js": "/chunks/profile.js?id=4ba370c98d374788", "/chunks/settings-password.js": "/chunks/settings-password.js?id=11e766eb42e485cf", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=90ba712f3728443b", "/chunks/billing.js": "/chunks/billing.js?id=f04fe6a3e9fb5c13", - "/chunks/platform.js": "/chunks/platform.js?id=1507ffb767e1051e", - "/chunks/files.js": "/chunks/files.js?id=d565a247722b32cf", - "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=cb4e1ea0d8542f6e", - "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=bb6515223ac84b96", - "/chunks/trash.js": "/chunks/trash.js?id=0194fc6ef35b095a", - "/chunks/team-folders.js": "/chunks/team-folders.js?id=34775c03f776bf7e", - "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=5021255692372515", + "/chunks/platform.js": "/chunks/platform.js?id=232b0afb07ca0258", + "/chunks/files.js": "/chunks/files.js?id=6f7a94e2ce0d29d2", + "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=84e3cbbe6b2225e7", + "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=6f9959c2b460d9e8", + "/chunks/trash.js": "/chunks/trash.js?id=0e983296c0297aee", + "/chunks/team-folders.js": "/chunks/team-folders.js?id=7e8b7a3637b13831", + "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=4671542d649a73a9", "/chunks/invitation.js": "/chunks/invitation.js?id=d9f64dbf0aad8554", "/css/tailwind.css": "/css/tailwind.css", "/css/app.css": "/css/app.css" diff --git a/resources/js/components/FilesView/DesktopToolbar.vue b/resources/js/components/FilesView/DesktopToolbar.vue index a71aebe1..39925bf3 100644 --- a/resources/js/components/FilesView/DesktopToolbar.vue +++ b/resources/js/components/FilesView/DesktopToolbar.vue @@ -13,29 +13,43 @@ /> - - - - + + + @@ -185,7 +199,7 @@ export default { 'user', ]), canEdit() { - if (this.currentTeamFolder && this.user && this.clipboard[0]) { + if (this.currentTeamFolder && this.user) { let member = this.currentTeamFolder.data.relationships.members.data.find( (member) => member.data.id === this.user.data.id ) @@ -201,6 +215,9 @@ export default { isTeamFolderHomepage() { return this.$isThisRoute(this.$route, ['TeamFolders']) && !this.$route.params.id }, + isSharedWithMe() { + return this.$isThisRoute(this.$route, ['SharedWithMe']) + }, isSharedWithMeHomepage() { return this.$isThisRoute(this.$route, ['SharedWithMe']) && !this.$route.params.id }, @@ -211,6 +228,9 @@ export default { return this.$isThisRoute(this.$route, ['Files', 'MySharedItems']) }, canUploadInView() { + return !this.$isThisRoute(this.$route, ['Files', 'RecentUploads', 'Public', 'TeamFolders', 'SharedWithMe']) + }, + canUploadFolderInView() { return !this.$isThisRoute(this.$route, ['Files', 'Public', 'TeamFolders', 'SharedWithMe']) }, canDeleteInView() { diff --git a/resources/js/components/FilesView/Option.vue b/resources/js/components/FilesView/Option.vue index 08847c6d..7c1ff46b 100644 --- a/resources/js/components/FilesView/Option.vue +++ b/resources/js/components/FilesView/Option.vue @@ -1,6 +1,6 @@