diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 4a0b7c79..713f2e5e 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,75 +1,75 @@ { "/js/main.js": "/js/main.js", - "/chunks/request.js": "/chunks/request.js?id=eb7839bf98d51a89", - "/chunks/request-upload.js": "/chunks/request-upload.js?id=276f65cd6b5ea820", - "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=3c2fc454c3fce8d2", - "/chunks/status-check.js": "/chunks/status-check.js?id=883a6d827b3a33ab", - "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=d9811e4a45a873e7", - "/chunks/database.js": "/chunks/database.js?id=91cbfea9fce46de8", - "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=4355a418b292c1c7", - "/chunks/app-setup.js": "/chunks/app-setup.js?id=8a9a62dd9fc953cc", - "/chunks/admin-account.js": "/chunks/admin-account.js?id=205b419d198f8fdc", - "/chunks/shared.js": "/chunks/shared.js?id=2c7217cdf666439f", - "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=77426cc44e618823", - "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=a0e3467219aa86d9", - "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=b5f3d082a586c619", - "/chunks/not-found.js": "/chunks/not-found.js?id=913fb0f40976e1a8", - "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=250d923cb7001cf2", - "/chunks/admin.js": "/chunks/admin.js?id=7bc87b77a7b6c548", - "/chunks/dashboard.js": "/chunks/dashboard.js?id=0980027cae155915", - "/chunks/invoices.js": "/chunks/invoices.js?id=1344281edac589dd", - "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5eb4e2a4cdd4cee7", - "/chunks/pages.js": "/chunks/pages.js?id=41dd38fa40aed8de", - "/chunks/page-edit.js": "/chunks/page-edit.js?id=4f54f01640f91ea4", - "/chunks/plans.js": "/chunks/plans.js?id=dd4507f0ac4e8355", - "/chunks/users.js": "/chunks/users.js?id=85e64bb0dde749ae", - "/chunks/user-create.js": "/chunks/user-create.js?id=94cb6de3fa97532f", - "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=233b503c533785b6", - "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=545c00fed7a4afc6", - "/chunks/user.js": "/chunks/user.js?id=be6451917a05f8bb", - "/chunks/user-detail.js": "/chunks/user-detail.js?id=d24d758ff91cabaa", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=f975fec0bf4fc7e0", - "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=1c86ce0edbb859df", - "/chunks/user-password.js": "/chunks/user-password.js?id=204e36cbf11279ab", - "/chunks/user-delete.js": "/chunks/user-delete.js?id=bbf64bfbcc6eb5f9", - "/chunks/plan.js": "/chunks/plan.js?id=2444730c1a0a42fc", - "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=f38b09679bd4aee8", - "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=887502be9ee6ef81", - "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=f11556bf815870ba", - "/chunks/payments.js": "/chunks/payments.js?id=5ea275fedd8d638a", - "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=d81a724698921629", - "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=3ce158149a48ae6b", - "/chunks/app-settings.js": "/chunks/app-settings.js?id=b0ca7cdad56e46fd", - "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=ef490b0cab8308f1", - "/chunks/app-index.js": "/chunks/app-index.js?id=2be003c6977e905c", - "/chunks/app-environment.js": "/chunks/app-environment.js?id=819c23db13c00210", - "/chunks/app-others.js": "/chunks/app-others.js?id=2d437d95f3823ded", - "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=8b0999957ba0a5fc", - "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=30a7d6424225bcd0", - "/chunks/app-server.js": "/chunks/app-server.js?id=442ad4f53cfa9acf", - "/chunks/app-language.js": "/chunks/app-language.js?id=b2db52bfd512e402", - "/chunks/homepage.js": "/chunks/homepage.js?id=3babb68ac329a2e4", - "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=a20e623585f77df6", - "/chunks/contact-us.js": "/chunks/contact-us.js?id=e99f7a5acb98eb08", - "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=5228b9bf9ceec486", - "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=35e61510310ad1b4", - "/chunks/sign-in.js": "/chunks/sign-in.js?id=a16e70643a831be0", - "/chunks/sign-up.js": "/chunks/sign-up.js?id=cf84811cb369d980", - "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=48c8a5f422239bde", - "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f196d33db637620f", - "/chunks/settings.js": "/chunks/settings.js?id=ad9456ab3d76c9c5", - "/chunks/profile.js": "/chunks/profile.js?id=6f41d5db05622afd", - "/chunks/settings-password.js": "/chunks/settings-password.js?id=5aed9d38b48443d7", - "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0a158de7fef68126", - "/chunks/billing.js": "/chunks/billing.js?id=e0068be5f76f4e11", - "/chunks/platform.js": "/chunks/platform.js?id=40f8fd4edd34c8d7", - "/chunks/files.js": "/chunks/files.js?id=a304b7da15555635", - "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=cee04fcc2d9d8bd4", - "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=edebc85cc4d08895", - "/chunks/trash.js": "/chunks/trash.js?id=a5c6ac5d48febeb3", - "/chunks/team-folders.js": "/chunks/team-folders.js?id=0e54ea203cc46345", - "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=dbfc1d39758a994f", - "/chunks/invitation.js": "/chunks/invitation.js?id=82c68bb809caa64b", + "/chunks/request.js": "/chunks/request.js?id=2af67d8c5c43f134", + "/chunks/request-upload.js": "/chunks/request-upload.js?id=e0449cbbcda80b90", + "/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", + "/chunks/database.js": "/chunks/database.js?id=2abed3c6d692416a", + "/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/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/dashboard.js": "/chunks/dashboard.js?id=0ba6b75f07f739e2", + "/chunks/invoices.js": "/chunks/invoices.js?id=f89964a5a55ace45", + "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=62582c26b6288d7d", + "/chunks/pages.js": "/chunks/pages.js?id=d7219aff1586ef7a", + "/chunks/page-edit.js": "/chunks/page-edit.js?id=a329cda46342b4cf", + "/chunks/plans.js": "/chunks/plans.js?id=704f996bd6e6c651", + "/chunks/users.js": "/chunks/users.js?id=f3c592b251f7d183", + "/chunks/user-create.js": "/chunks/user-create.js?id=1f16a20ef51b3217", + "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=793e8f43eb5d9c13", + "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=e33392f21fa044d9", + "/chunks/user.js": "/chunks/user.js?id=7e567c0cb7f641d6", + "/chunks/user-detail.js": "/chunks/user-detail.js?id=a09c26113827d1d5", + "/chunks/user-storage.js": "/chunks/user-storage.js?id=6437079d1b7db03a", + "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=0acc28aa56454710", + "/chunks/user-password.js": "/chunks/user-password.js?id=9e00dc08b4d46b30", + "/chunks/user-delete.js": "/chunks/user-delete.js?id=73d823437e4a414a", + "/chunks/plan.js": "/chunks/plan.js?id=37a04161ac1973ad", + "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=2cc70b67d00bbda1", + "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=6739dd41ab5749ff", + "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e56fd84d4718e2f3", + "/chunks/payments.js": "/chunks/payments.js?id=2a6dba57de536b0d", + "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=8ff91573838e18e0", + "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=730f776273bc9f09", + "/chunks/app-settings.js": "/chunks/app-settings.js?id=ac94675bfea2ac48", + "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=7801199064bd834b", + "/chunks/app-index.js": "/chunks/app-index.js?id=80eed2df9c7ef155", + "/chunks/app-environment.js": "/chunks/app-environment.js?id=5be816eb94bd9a78", + "/chunks/app-others.js": "/chunks/app-others.js?id=33040c1f2fbb9b63", + "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=80ab5897c46993b5", + "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=5ce9441ee0eadd98", + "/chunks/app-server.js": "/chunks/app-server.js?id=b33faa1138402046", + "/chunks/app-language.js": "/chunks/app-language.js?id=c1b828a7724a7a5c", + "/chunks/homepage.js": "/chunks/homepage.js?id=9894f8229fc1373e", + "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=f8c67b2a376ff03e", + "/chunks/contact-us.js": "/chunks/contact-us.js?id=6812adfb9e719126", + "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=261b02aed36069be", + "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=fe054c1e34d7863b", + "/chunks/sign-in.js": "/chunks/sign-in.js?id=c556d810c572f596", + "/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/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/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/FilePreview/FilePreviewMedia.vue b/resources/js/components/FilePreview/FilePreviewMedia.vue index 9c69f256..9dd5f5bd 100644 --- a/resources/js/components/FilePreview/FilePreviewMedia.vue +++ b/resources/js/components/FilePreview/FilePreviewMedia.vue @@ -97,29 +97,9 @@ export default { } }, watch: { - files() { - if (this.files.length === 0) events.$emit('file-preview-wrapper:hide') - }, - currentFile() { - if (this.clipboard[0]) { - this.$store.commit('CLIPBOARD_CLEAR') - this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.currentFile) - } - }, - clipboard() { - if (!this.clipboard[0]) { - this.currentIndex -= 1 - - this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.currentFile) - - this.files = [] - } - }, - data(newValue, oldValue) { - if (newValue !== oldValue) { - this.files = [] - } - }, + currentIndex() { + this.$store.commit('CLIPBOARD_REPLACE', this.currentFile) + }, }, methods: { checkGroupInView: _.debounce(function () { @@ -186,11 +166,24 @@ export default { } }, }, - created() { + mounted() { events.$on('file-preview:next', () => this.next()) events.$on('file-preview:prev', () => this.prev()) this.getFilesForView() + + events.$on('file:deleted', id => { + this.files = this.files.filter(item => item.data.id !== id) + + if (this.files.length === 0) { + events.$emit('file-preview:hide') + } else { + this.$store.commit('CLIPBOARD_REPLACE', this.currentFile) + } + }) }, + destroyed() { + events.$off('file:deleted') + } } diff --git a/resources/js/components/FilesView/ItemHandler.vue b/resources/js/components/FilesView/ItemHandler.vue index 0aa60bb4..f563dd9d 100644 --- a/resources/js/components/FilesView/ItemHandler.vue +++ b/resources/js/components/FilesView/ItemHandler.vue @@ -124,7 +124,7 @@ export default { if ((e.ctrlKey || e.metaKey) && !e.shiftKey) { // Click + Ctrl if (this.clipboard.some((item) => item.data.id === this.item.data.id)) { - this.$store.commit('REMOVE_ITEM_FROM_CLIPBOARD', this.item) + this.$store.commit('REMOVE_ITEM_FROM_CLIPBOARD', this.item.data.id) } else { this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.item) } @@ -171,7 +171,7 @@ export default { if (this.isMultiSelectMode && this.$isMobile()) { if (this.clipboard.some((item) => item.data.id === this.item.data.id)) { - this.$store.commit('REMOVE_ITEM_FROM_CLIPBOARD', this.item) + this.$store.commit('REMOVE_ITEM_FROM_CLIPBOARD', this.item.data.id) } else { this.$store.commit('ADD_ITEM_TO_CLIPBOARD', this.item) } diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js index 3c669f09..487dfe6e 100644 --- a/resources/js/store/modules/fileBrowser.js +++ b/resources/js/store/modules/fileBrowser.js @@ -178,12 +178,15 @@ const mutations = { if (el.data.id && el.data.id === id) el.data.attributes.items++ }) }, - REMOVE_ITEM_FROM_CLIPBOARD(state, item) { - state.clipboard = state.clipboard.filter((element) => element.data.id !== item.data.id) + REMOVE_ITEM_FROM_CLIPBOARD(state, id) { + state.clipboard = state.clipboard.filter((element) => element.data.id !== id) }, ADD_ALL_ITEMS_TO_CLIPBOARD(state) { state.clipboard = state.entries }, + CLIPBOARD_REPLACE(state, item) { + state.clipboard = [item] + }, ADD_ITEM_TO_CLIPBOARD(state, item) { let selectedItem = state.entries.find((el) => el.data.id === item.data.id) diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js index 5ca7f7d4..05aadecf 100644 --- a/resources/js/store/modules/fileFunctions.js +++ b/resources/js/store/modules/fileFunctions.js @@ -311,6 +311,8 @@ const actions = { // Remove file commit('REMOVE_ITEM', data.data.id) + commit('REMOVE_ITEM_FROM_CLIPBOARD', data.data.id) + events.$emit('file:deleted', data.data.id) // Remove item from sidebar if (! ['Public', 'RequestUpload'].includes(router.currentRoute.name)) { @@ -318,11 +320,6 @@ const actions = { } }) - // Remove file preview - if (!noSelectedItem) { - commit('CLIPBOARD_CLEAR') - } - // Get route let route = { RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/remove`, diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php index f4ac9826..18054032 100644 --- a/src/App/Console/Commands/SetupDevEnvironment.php +++ b/src/App/Console/Commands/SetupDevEnvironment.php @@ -121,7 +121,7 @@ class SetupDevEnvironment extends Command 'notifiable_type' => 'App\Users\Models\User', 'notifiable_id' => $howdy->id, 'data' => json_encode([ - 'type' => 'team-invitation', + 'category' => 'team-invitation', 'title' => 'New Team Invitation', 'description' => 'Jane Doe invite you to join into Team Folder.', 'action' => [ @@ -160,7 +160,7 @@ class SetupDevEnvironment extends Command 'notifiable_type' => 'App\Users\Models\User', 'notifiable_id' => $howdy->id, 'data' => json_encode([ - 'type' => 'file-request', + 'category' => 'file-request', 'title' => 'File Request Filled', 'description' => "Your file request for 'Shared Folder' folder was filled successfully.", 'action' => [ diff --git a/webpack.mix.js b/webpack.mix.js index 14c468f9..5fa9da97 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -25,10 +25,10 @@ mix chunkFilename: '[name].js?id=[chunkhash]', } }) - /*.options({ + .options({ hmrOptions: { host: '192.168.1.112', port: '8080' }, - })*/ + }) .disableNotifications();