diff --git a/database/factories/TeamFolderInvitationFactory.php b/database/factories/TeamFolderInvitationFactory.php deleted file mode 100644 index e9c7a69f..00000000 --- a/database/factories/TeamFolderInvitationFactory.php +++ /dev/null @@ -1,33 +0,0 @@ - $this->faker->uuid, - 'parent_id' => $this->faker->uuid, - 'inviter_id' => $this->faker->uuid, - 'email' => $this->faker->email, - 'permission' => $this->faker->randomElement(['can-edit', 'can-view']), - 'status' => $this->faker->randomElement(['pending', 'accepted', 'rejected']), - ]; - } -} diff --git a/database/factories/TeamFolderMemberFactory.php b/database/factories/TeamFolderMemberFactory.php deleted file mode 100644 index 001c002a..00000000 --- a/database/factories/TeamFolderMemberFactory.php +++ /dev/null @@ -1,30 +0,0 @@ - $this->faker->uuid, - 'user_id' => $this->faker->uuid, - 'permission' => $this->faker->randomElement(['can-edit', 'can-view', 'owner']), - ]; - } -} diff --git a/database/factories/UploadRequestFactory.php b/database/factories/UploadRequestFactory.php deleted file mode 100644 index d38ee8f7..00000000 --- a/database/factories/UploadRequestFactory.php +++ /dev/null @@ -1,37 +0,0 @@ - $this->faker->uuid, - 'user_id' => $this->faker->uuid, - 'folder_id' => $this->faker->uuid, - 'email' => $this->faker->email, - 'name' => $this->faker->name, - 'notes' => $this->faker->realText(80), - 'status' => $this->faker->randomElement( - ['active', 'filled', 'expired'] - ), - 'created_at' => $this->faker->dateTimeBetween('-1 months'), - ]; - } -} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 5856125a..3b280928 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,75 +1,46 @@ { "/js/main.js": "/js/main.js", - "/chunks/request.js": "/chunks/request.js?id=6b84fefd11208314", - "/chunks/request-upload.js": "/chunks/request-upload.js?id=a57ea65eceba1b87", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec", "/chunks/status-check.js": "/chunks/status-check.js?id=9239a586761b912d", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=ba76b9a8adbfdc0b", "/chunks/database.js": "/chunks/database.js?id=5113b0d4284f764f", "/chunks/environment.js": "/chunks/environment.js?id=17210c2b24cf3f13", "/chunks/app-setup.js": "/chunks/app-setup.js?id=cbe7bfed06400736", - "/chunks/admin-account.js": "/chunks/admin-account.js?id=78d257775f5fc485", - "/chunks/shared.js": "/chunks/shared.js?id=17463f7ccbd82a29", - "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=e418615ad9b55450", - "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=b64f21aef7584446", + "/chunks/admin-account.js": "/chunks/admin-account.js?id=1a3a4dea0db7c232", + "/chunks/shared.js": "/chunks/shared.js?id=bceb993df04359d9", + "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=7867c9667578452a", + "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=6f8fd6c000e90430", "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=b5519d193bce2339", "/chunks/not-found.js": "/chunks/not-found.js?id=d31bd699138cf828", "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=26798085f527d955", - "/chunks/admin.js": "/chunks/admin.js?id=517fdb275cc1fa5b", - "/chunks/dashboard.js": "/chunks/dashboard.js?id=380940bb78feba70", - "/chunks/invoices.js": "/chunks/invoices.js?id=799928609f57ca10", - "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=a0c4f59d0ec4aee0", - "/chunks/pages.js": "/chunks/pages.js?id=d385a3969fd87fcd", - "/chunks/page-edit.js": "/chunks/page-edit.js?id=0bdc8a5935fd2197", - "/chunks/plans.js": "/chunks/plans.js?id=4bfe7fedc1cb720d", + "/chunks/admin.js": "/chunks/admin.js?id=0bcbf57228fa5d09", + "/chunks/dashboard.js": "/chunks/dashboard.js?id=8431153cdc5663fc", "/chunks/users.js": "/chunks/users.js?id=e1dc04b0e402dd27", "/chunks/user-create.js": "/chunks/user-create.js?id=40254ae98547761e", - "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=18f9d1ab17996507", - "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=40e9f287b5258a40", "/chunks/user.js": "/chunks/user.js?id=052364b014015a4d", "/chunks/user-detail.js": "/chunks/user-detail.js?id=fc5475489f0cec6a", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=a9e1ccc028fc989d", - "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=797d77ff2b1c08cc", + "/chunks/user-storage.js": "/chunks/user-storage.js?id=cd17c66dc9a7bf78", "/chunks/user-password.js": "/chunks/user-password.js?id=900ae71c3d4199ea", "/chunks/user-delete.js": "/chunks/user-delete.js?id=a3091617207684e5", - "/chunks/plan.js": "/chunks/plan.js?id=3e7b0b34c2247e6c", - "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=36d925def6a82cb2", - "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=df990f928a77c355", - "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=630deb1fc4e17ed9", - "/chunks/payments.js": "/chunks/payments.js?id=d59a2a18b680d65c", - "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=27d6c1b58dbd1e6c", - "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=450162f937b7b2fd", "/chunks/app-settings.js": "/chunks/app-settings.js?id=4ff5c1e5bbb0aed8", "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=8ba3feb2cc81a2c3", - "/chunks/app-index.js": "/chunks/app-index.js?id=0c50096e8de09288", "/chunks/app-environment.js": "/chunks/app-environment.js?id=d5fbb0ea9249ce7f", - "/chunks/app-others.js": "/chunks/app-others.js?id=82cec4d0d2fab089", - "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=f79027ce1f1f4c4b", - "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=c7e7dc2975317062", + "/chunks/app-others.js": "/chunks/app-others.js?id=cd03b2c76baae7df", "/chunks/app-server.js": "/chunks/app-server.js?id=ff66d34e90ff98a0", "/chunks/app-language.js": "/chunks/app-language.js?id=041070825d222906", - "/chunks/homepage.js": "/chunks/homepage.js?id=73f93c1932ffc158", - "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=9553d7a2912cb901", - "/chunks/contact-us.js": "/chunks/contact-us.js?id=ea99d85aa3500595", - "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=c26cb144101e7c79", "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=170d814982e1c475", - "/chunks/sign-in.js": "/chunks/sign-in.js?id=f87a4dd837cbe607", - "/chunks/sign-up.js": "/chunks/sign-up.js?id=3d7559511768cd0e", + "/chunks/sign-in.js": "/chunks/sign-in.js?id=2f17cf87141126c8", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=27cda9364b6593d8", "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=2f0401ee2fc148c4", - "/chunks/settings.js": "/chunks/settings.js?id=e40960367c00597f", + "/chunks/settings.js": "/chunks/settings.js?id=3b8e3ced294dc6b2", "/chunks/profile.js": "/chunks/profile.js?id=5f1e6f1817817716", "/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=092e324aad54656b", - "/chunks/billing.js": "/chunks/billing.js?id=115c25478cee576d", - "/chunks/platform.js": "/chunks/platform.js?id=2add0f27d00ef117", - "/chunks/files.js": "/chunks/files.js?id=bee14c7818d47129", - "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=91632ef82ff2959c", - "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=3bf3fb855fd65a7d", - "/chunks/trash.js": "/chunks/trash.js?id=55241ed4bb60c8dd", - "/chunks/team-folders.js": "/chunks/team-folders.js?id=8c6e3f91c2bd3bdb", - "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=470178ec3b181fce", - "/chunks/invitation.js": "/chunks/invitation.js?id=424b2783d9785a09", + "/chunks/platform.js": "/chunks/platform.js?id=9dfb7ec9acf3fade", + "/chunks/files.js": "/chunks/files.js?id=05a249346211c989", + "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=ca1063798b010a2d", + "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=0a95a97a1640dc8f", + "/chunks/trash.js": "/chunks/trash.js?id=241392bce92e4e7a", "/css/tailwind.css": "/css/tailwind.css", "/css/app.css": "/css/app.css" } diff --git a/resources/js/App.vue b/resources/js/App.vue index d713c315..1d0ca40c 100644 --- a/resources/js/App.vue +++ b/resources/js/App.vue @@ -70,8 +70,6 @@ export default { closeOverlays() { events.$emit('popup:close') events.$emit('popover:close') - - this.$store.commit('CLOSE_NOTIFICATION_CENTER') }, spotlightListener(e) { if (e.key === 'k' && e.metaKey || e.key === 'k' && e.ctrlKey) { diff --git a/resources/js/components/Dashboard/Widgets/WidgetLatestRegistrations.vue b/resources/js/components/Dashboard/Widgets/WidgetLatestRegistrations.vue index 33338e21..48012b04 100644 --- a/resources/js/components/Dashboard/Widgets/WidgetLatestRegistrations.vue +++ b/resources/js/components/Dashboard/Widgets/WidgetLatestRegistrations.vue @@ -7,11 +7,7 @@ class="mt-6 overflow-x-auto" > @@ -257,97 +102,36 @@ export default { computed: { ...mapGetters(['config']), columns() { - return { - metered: [ - { - label: this.$t('user'), - field: 'email', - sortable: true, - }, - { - label: this.$t('role'), - field: 'role', - sortable: true, - }, - { - label: this.$t('storage_used'), - sortable: false, - }, - { - label: this.$t('billing_est.'), - sortable: false, - }, - { - label: this.$t('created_at'), - field: 'created_at', - sortable: true, - }, - { - label: this.$t('action'), - sortable: false, - }, - ], - fixed: [ - { - label: this.$t('user'), - field: 'email', - sortable: true, - }, - { - label: this.$t('role'), - field: 'role', - sortable: true, - }, - { - label: this.$t('storage_used'), - sortable: false, - }, - { - label: this.$t('max_storage'), - sortable: false, - hidden: !this.config.storageLimit, - }, - { - label: this.$t('created_at'), - field: 'created_at', - sortable: true, - }, - { - label: this.$t('action'), - sortable: false, - }, - ], - none: [ - { - label: this.$t('user'), - field: 'email', - sortable: true, - }, - { - label: this.$t('role'), - field: 'role', - sortable: true, - }, - { - label: this.$t('storage_used'), - sortable: false, - }, - { - label: this.$t('max_storage'), - sortable: false, - hidden: !this.config.storageLimit, - }, - { - label: this.$t('created_at'), - field: 'created_at', - sortable: true, - }, - { - label: this.$t('action'), - sortable: false, - }, - ], - }[this.config.subscriptionType] + return [ + { + label: this.$t('user'), + field: 'email', + sortable: true, + }, + { + label: this.$t('role'), + field: 'role', + sortable: true, + }, + { + label: this.$t('storage_used'), + sortable: false, + }, + { + label: this.$t('max_storage'), + sortable: false, + hidden: !this.config.storageLimit, + }, + { + label: this.$t('created_at'), + field: 'created_at', + sortable: true, + }, + { + label: this.$t('action'), + sortable: false, + }, + ] }, }, data() { diff --git a/resources/js/components/Icons/FolderIcon.vue b/resources/js/components/Icons/FolderIcon.vue index 40d2aae4..2640cd60 100644 --- a/resources/js/components/Icons/FolderIcon.vue +++ b/resources/js/components/Icons/FolderIcon.vue @@ -1,6 +1,6 @@ diff --git a/resources/js/components/Layout/Toolbars/DesktopSharepageToolbar.vue b/resources/js/components/Layout/Toolbars/DesktopSharepageToolbar.vue index 1acbbf55..8e460539 100644 --- a/resources/js/components/Layout/Toolbars/DesktopSharepageToolbar.vue +++ b/resources/js/components/Layout/Toolbars/DesktopSharepageToolbar.vue @@ -12,22 +12,17 @@ :action="$t('create_something')" /> - + + + + - - - @@ -111,7 +106,7 @@ export default { Option, }, computed: { - ...mapGetters(['isVisibleNavigationBars', 'currentTeamFolder', 'currentFolder', 'sharedDetail', 'clipboard']), + ...mapGetters(['isVisibleNavigationBars', 'currentFolder', 'sharedDetail', 'clipboard']), canEdit() { return this.sharedDetail && this.sharedDetail.data.attributes.permission === 'editor' }, diff --git a/resources/js/components/Layout/Toolbars/DesktopToolbar.vue b/resources/js/components/Layout/Toolbars/DesktopToolbar.vue index 8bcc6123..eccef08a 100644 --- a/resources/js/components/Layout/Toolbars/DesktopToolbar.vue +++ b/resources/js/components/Layout/Toolbars/DesktopToolbar.vue @@ -13,7 +13,7 @@ /> + + - - @@ -79,12 +63,6 @@ export default { goToTrash() { this.$router.push({ name: 'Trash' }) }, - goToTeamFolders() { - this.$router.push({ name: 'TeamFolders' }) - }, - goToSharedWithMe() { - this.$router.push({ name: 'SharedWithMe' }) - }, }, } diff --git a/resources/js/components/Popups/MoveItemPopup.vue b/resources/js/components/Popups/MoveItemPopup.vue index e5276dbd..b81df39f 100644 --- a/resources/js/components/Popups/MoveItemPopup.vue +++ b/resources/js/components/Popups/MoveItemPopup.vue @@ -126,15 +126,9 @@ export default { this.isLoadingTree = true // Get folder tree and hide spinner - if (this.$isThisRoute(this.$route, ['SharedWithMe'])) { - this.$store.dispatch('getTeamFolderTree').then(() => { - this.isLoadingTree = false - }) - } else { - this.$store.dispatch('getFolderTree').then(() => { - this.isLoadingTree = false - }) - } + this.$store.dispatch('getFolderTree').then(() => { + this.isLoadingTree = false + }) // Store picked item if (!this.clipboard.includes(args.item[0])) { diff --git a/resources/js/components/UI/Entries/ItemGrid.vue b/resources/js/components/UI/Entries/ItemGrid.vue index d283a0be..a993d2ff 100644 --- a/resources/js/components/UI/Entries/ItemGrid.vue +++ b/resources/js/components/UI/Entries/ItemGrid.vue @@ -33,15 +33,6 @@ v-if="isFile || isVideo || isAudio || (isImage && !entry.data.attributes.thumbnail)" class="relative mx-auto w-24" > - - -
- - - import(/* webpackChunkName: "chunks/sign-in" */ '../views/Auth/SignIn'), meta: { requiresAuth: false, diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js index 8121efa7..055b9a80 100644 --- a/resources/js/store/modules/userAuth.js +++ b/resources/js/store/modules/userAuth.js @@ -45,7 +45,7 @@ const actions = { commit('DESTROY_DATA') commit('SET_AUTHORIZED', false) - router.push({name: 'Homepage'}) + router.push({name: 'SignIn'}) }) }, addToFavourites: (context, folder) => { diff --git a/resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue b/resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue index f94aad30..af0c7497 100644 --- a/resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue +++ b/resources/js/views/Admin/Settings/AppSettingsTabs/Others.vue @@ -70,7 +70,7 @@ /> - + - - - - + +
+ + {{ $t('user_box_storage.title') }} + + + + +
+ + + {{ $t('change_capacity') }} + +
+ + + +
+
@@ -55,52 +101,6 @@ -
- - -
- - {{ $t('user_box_storage.title') }} - - - - -
- - - {{ $t('change_capacity') }} - -
- - -
diff --git a/resources/js/views/Auth/SignIn.vue b/resources/js/views/Auth/SignIn.vue index 6d832bf5..0b05b58c 100644 --- a/resources/js/views/Auth/SignIn.vue +++ b/resources/js/views/Auth/SignIn.vue @@ -37,13 +37,6 @@ :disabled="isLoading" /> - - - {{ $t('page_login.registration_text') }} - - {{ $t('page_login.registration_button') }} - - diff --git a/resources/js/views/FileView/Files.vue b/resources/js/views/FileView/Files.vue index 087ce2f7..f67b24ca 100644 --- a/resources/js/views/FileView/Files.vue +++ b/resources/js/views/FileView/Files.vue @@ -19,7 +19,7 @@ - + - - - + + + - - - diff --git a/resources/js/views/SetupWizard/AdminAccount.vue b/resources/js/views/SetupWizard/AdminAccount.vue index ccd85bac..d27e8843 100644 --- a/resources/js/views/SetupWizard/AdminAccount.vue +++ b/resources/js/views/SetupWizard/AdminAccount.vue @@ -180,7 +180,7 @@ export default { }) .then((response) => { // Go to sign page - window.location = '/sign-in' + window.location = '/' }) .catch((error) => { if (error.response.status === 500) { diff --git a/src/App/Users/Actions/CreateNewUserAction.php b/src/App/Users/Actions/CreateNewUserAction.php index c54a4896..0258f866 100644 --- a/src/App/Users/Actions/CreateNewUserAction.php +++ b/src/App/Users/Actions/CreateNewUserAction.php @@ -5,10 +5,6 @@ use App\Users\Models\User; use App\Users\DTO\CreateUserData; use App\Http\Controllers\Controller; use Illuminate\Auth\Events\Registered; -use Domain\Teams\Models\TeamFolderMember; -use Domain\Teams\Models\TeamFolderInvitation; -use VueFileManager\Subscription\Domain\Plans\Models\Plan; -use VueFileManager\Subscription\Domain\Plans\Exceptions\MeteredBillingPlanDoesntExist; class CreateNewUserAction extends Controller { diff --git a/src/Domain/Folders/Resources/FolderResource.php b/src/Domain/Folders/Resources/FolderResource.php index be2970f3..c8ee899d 100644 --- a/src/Domain/Folders/Resources/FolderResource.php +++ b/src/Domain/Folders/Resources/FolderResource.php @@ -19,7 +19,6 @@ class FolderResource extends JsonResource 'color' => $this->color, 'emoji' => $this->emoji, 'filesize' => $this->filesize, - 'isTeamFolder' => false, 'items' => $this->items, 'trashed_items' => $this->trashed_items, 'created_at' => set_time_by_user_timezone($this->user, $this->created_at),