diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 26fda35c..86fa1712 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -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=89340491442f12ba0fc2", + "/chunks/files.js": "/chunks/files.js?id=f932bee23cc859fb0fd3", "/chunks/files~chunks/platform~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared/file-browser.js?id=4711dbca9d83d061561c", "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=74456138b2b60df5cb0d", "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js?id=a831ffd52ccae7b0b983", @@ -113,7 +113,7 @@ "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/platform~chunk~4546fed3.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/platform~chunk~4546fed3.js?id=dcb0f3eb29f9bb036a83", "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings~chunk~4e1df859.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings~chunk~4e1df859.js?id=ce01da2eb15ee1ebede4", "/chunks/files.61f541e551bb6ae551ff.hot-update.js": "/chunks/files.61f541e551bb6ae551ff.hot-update.js", - "/chunks/platform~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared/file-browser.js?id=f615296acb04c58b1941", + "/chunks/platform~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared/file-browser.js?id=1fbc199879f3dc7525db", "/chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=6ba92eab6a45cbab3af5", "/chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js?id=c9e60ce6e02af680eeaa", "/chunks/settings-subscription~chunks/shared/file-browser~chunks/user-subscription.js": "/chunks/settings-subscription~chunks/shared/file-browser~chunks/user-subscription.js?id=439e216b216fc2572483", @@ -279,7 +279,7 @@ "/chunks/files~chunks/recent-uploads~chunks/settings-subscription~chunks/shared/file-browser~chunks/us~e19a6aab.js": "/chunks/files~chunks/recent-uploads~chunks/settings-subscription~chunks/shared/file-browser~chunks/us~e19a6aab.js?id=c6db4e7202b511a9dad2", "/chunks/files~chunks/recent-uploads~chunks/shared/file-browser.js": "/chunks/files~chunks/recent-uploads~chunks/shared/file-browser.js?id=75529efcaced324a5a41", "/chunks/files~chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/single-file.js?id=8edd48ae1858eec149cd", - "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=b589671a092ae4566e60", + "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=31a5e5938c890603eb38", "/vendors~chunks/files~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~~6b78b248.js": "/vendors~chunks/files~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~~6b78b248.js?id=7daa0928ae6797db8131", "/chunks/platform.e2a097025658a9f4a106.hot-update.js": "/chunks/platform.e2a097025658a9f4a106.hot-update.js", "/js/main.9ff7db4e7f0964d55a3a.hot-update.js": "/js/main.9ff7db4e7f0964d55a3a.hot-update.js", @@ -312,9 +312,9 @@ "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~5df0355d.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~5df0355d.js?id=00e9511436f16aa2fb9f", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/s~b80f3c10.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/s~b80f3c10.js?id=b8f5bee79fa82cda17e2", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js?id=2cd2ace8496e54da8138", - "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=fcb7f49258a33d719b5d", + "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=1d444ac680acf19e977b", "/chunks/recent-uploads.e3ff88b07311820bcc70.hot-update.js": "/chunks/recent-uploads.e3ff88b07311820bcc70.hot-update.js", - "/chunks/trash.js": "/chunks/trash.js?id=36f47de5ca4a87f9b913", + "/chunks/trash.js": "/chunks/trash.js?id=f12c3a66766e1356a7fd", "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~57b3f416.js": "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~57b3f416.js?id=97d6f92560813d690f24", "/chunks/platform.5389987c296bbc0f9256.hot-update.js": "/chunks/platform.5389987c296bbc0f9256.hot-update.js", "/chunks/trash.0c591e25c8bd11631179.hot-update.js": "/chunks/trash.0c591e25c8bd11631179.hot-update.js", @@ -455,5 +455,71 @@ "/js/main.2ddc41a4526d6646c798.hot-update.js": "/js/main.2ddc41a4526d6646c798.hot-update.js", "/chunks/admin.2ddc41a4526d6646c798.hot-update.js": "/chunks/admin.2ddc41a4526d6646c798.hot-update.js", "/chunks/user-subscription.2ddc41a4526d6646c798.hot-update.js": "/chunks/user-subscription.2ddc41a4526d6646c798.hot-update.js", - "/js/main.8b4cd1af6a4b3c3449b7.hot-update.js": "/js/main.8b4cd1af6a4b3c3449b7.hot-update.js" + "/js/main.8b4cd1af6a4b3c3449b7.hot-update.js": "/js/main.8b4cd1af6a4b3c3449b7.hot-update.js", + "/js/main.560899059befa1977e96.hot-update.js": "/js/main.560899059befa1977e96.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.cf80cf81a2a63c11a58e.hot-update.js": "/chunks/platform~chunks/shared/file-browser.cf80cf81a2a63c11a58e.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.806586cd3c2bbd9a80b5.hot-update.js": "/chunks/platform~chunks/shared/file-browser.806586cd3c2bbd9a80b5.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.ad72a2d7c70f546894f1.hot-update.js": "/chunks/platform~chunks/shared/file-browser.ad72a2d7c70f546894f1.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.def222c9a885aa689112.hot-update.js": "/chunks/platform~chunks/shared/file-browser.def222c9a885aa689112.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.92609bd43823783d3390.hot-update.js": "/chunks/platform~chunks/shared/file-browser.92609bd43823783d3390.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.83163e345b00609eeff1.hot-update.js": "/chunks/platform~chunks/shared/file-browser.83163e345b00609eeff1.hot-update.js", + "/js/main.2ce2af5e1de990f727d9.hot-update.js": "/js/main.2ce2af5e1de990f727d9.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.0160acbe2a9ddf9892c3.hot-update.js": "/chunks/platform~chunks/shared/file-browser.0160acbe2a9ddf9892c3.hot-update.js", + "/js/main.41409446bdb4c9e41416.hot-update.js": "/js/main.41409446bdb4c9e41416.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.397aab3bf999715d2d8d.hot-update.js": "/chunks/platform~chunks/shared/file-browser.397aab3bf999715d2d8d.hot-update.js", + "/js/main.0b368eac9984da209e42.hot-update.js": "/js/main.0b368eac9984da209e42.hot-update.js", + "/js/main.718e777469f271c5aeea.hot-update.js": "/js/main.718e777469f271c5aeea.hot-update.js", + "/js/main.e8678da0882f65e62970.hot-update.js": "/js/main.e8678da0882f65e62970.hot-update.js", + "/js/main.dce58b80f240e46718fd.hot-update.js": "/js/main.dce58b80f240e46718fd.hot-update.js", + "/js/main.043a76f611fd0794d649.hot-update.js": "/js/main.043a76f611fd0794d649.hot-update.js", + "/js/main.52f89ad008179630c1af.hot-update.js": "/js/main.52f89ad008179630c1af.hot-update.js", + "/chunks/admin~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~47889bb3.js": "/chunks/admin~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~47889bb3.js?id=f0d5ceb6ce4436088221", + "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/my-shared-items~chunks/pages~chunks/plan~6cc25a69.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/my-shared-items~chunks/pages~chunks/plan~6cc25a69.js?id=9f0e849089eb367a2ad4", + "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/my-shared-items~chunks/pages~chunks/plan~9636df4c.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/my-shared-items~chunks/pages~chunks/plan~9636df4c.js?id=d37cdc37510769975ce7", + "/chunks/files.52f89ad008179630c1af.hot-update.js": "/chunks/files.52f89ad008179630c1af.hot-update.js", + "/chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js": "/chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js?id=f52ed10a81a6db2edcf3", + "/chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browse~159e41dc.js": "/chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browse~159e41dc.js?id=6df11796ee1e1b8caef1", + "/chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browse~2792d3ec.js": "/chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browse~2792d3ec.js?id=dc66ded63ce92ee92cf3", + "/chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared/file-browser~54df351a.js": "/chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared/file-browser~54df351a.js?id=daf9edd6f270f4c710a4", + "/chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/single-file~ch~fb6d7628.js": "/chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/single-file~ch~fb6d7628.js?id=87e71fe1631ac336084f", + "/chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js": "/chunks/my-shared-items~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js?id=b2d8ca94735de3c52145", + "/vendors~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/fil~965f9bf9.js": "/vendors~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/fil~965f9bf9.js?id=0429c3b9bde5957ae29d", + "/js/main.c371beb3d426727ede13.hot-update.js": "/js/main.c371beb3d426727ede13.hot-update.js", + "/chunks/admin~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~chunks/trash.js": "/chunks/admin~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~chunks/trash.js?id=57999c6b7268cc4be094", + "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/platform~chunk~7b99393a.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/platform~chunk~7b99393a.js?id=bce14d5abc0cf7f56870", + "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/recent-uploads~f4767b00.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/recent-uploads~f4767b00.js?id=fe63a20b665312bbcbac", + "/chunks/my-shared-items.c371beb3d426727ede13.hot-update.js": "/chunks/my-shared-items.c371beb3d426727ede13.hot-update.js", + "/chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js": "/chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js?id=fd484029b1dd5dc3d82d", + "/chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~chunks/shared/single-~fe01b7c3.js": "/chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~chunks/shared/single-~fe01b7c3.js?id=90aabdd54453af9a13f3", + "/chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~chunks/trash.js": "/chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~chunks/trash.js?id=f4e7a34f6ad337e8a837", + "/chunks/recent-uploads~chunks/settings-subscription~chunks/shared/file-browser~chunks/trash~chunks/us~343ca844.js": "/chunks/recent-uploads~chunks/settings-subscription~chunks/shared/file-browser~chunks/trash~chunks/us~343ca844.js?id=f86a6ff4d41f6b592abf", + "/chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/single-file~chunks/trash.js": "/chunks/recent-uploads~chunks/shared/file-browser~chunks/shared/single-file~chunks/trash.js?id=7404e651ff3ea1bbc7ef", + "/chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js": "/chunks/recent-uploads~chunks/shared/file-browser~chunks/trash.js?id=c1f5d676a14910ad8bee", + "/vendors~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~chunks/shared~378245b4.js": "/vendors~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/shared/file-browser~chunks/shared~378245b4.js?id=24549017ca9d50317801", + "/js/main.9b7e54d1e18d471baf34.hot-update.js": "/js/main.9b7e54d1e18d471baf34.hot-update.js", + "/chunks/admin~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/trash.js": "/chunks/admin~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/trash.js?id=0e9fc89fba11315e6221", + "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/platform~chunk~037775cd.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/platform~chunk~037775cd.js?id=d0b851f78303e5705e8b", + "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings~chunk~a406c960.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/settings~chunk~a406c960.js?id=32094152e96834a16775", + "/chunks/platform~chunks/shared/file-browser~chunks/trash.js": "/chunks/platform~chunks/shared/file-browser~chunks/trash.js?id=d2ccae758453287a3f79", + "/chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file~chunks/trash.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file~chunks/trash.js?id=22f19517d9454db4db56", + "/chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/trash.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/trash.js?id=f347f84e85ee9e4f1a94", + "/chunks/recent-uploads.9b7e54d1e18d471baf34.hot-update.js": "/chunks/recent-uploads.9b7e54d1e18d471baf34.hot-update.js", + "/chunks/settings-subscription~chunks/shared/file-browser~chunks/trash~chunks/user-subscription.js": "/chunks/settings-subscription~chunks/shared/file-browser~chunks/trash~chunks/user-subscription.js?id=54b545aaf6fb794fdefd", + "/chunks/shared/file-browser~chunks/shared/single-file~chunks/trash.js": "/chunks/shared/file-browser~chunks/shared/single-file~chunks/trash.js?id=be63248a56c9bd48ab70", + "/chunks/shared/file-browser~chunks/trash.js": "/chunks/shared/file-browser~chunks/trash.js?id=1fba9f19e37cc5a49e7e", + "/vendors~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file~chunks/trash.js": "/vendors~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file~chunks/trash.js?id=38bf4f7255dbe32e58af", + "/js/main.a5b9c317df2e867d2520.hot-update.js": "/js/main.a5b9c317df2e867d2520.hot-update.js", + "/chunks/trash.a5b9c317df2e867d2520.hot-update.js": "/chunks/trash.a5b9c317df2e867d2520.hot-update.js", + "/js/main.0dba60b37496beaa954e.hot-update.js": "/js/main.0dba60b37496beaa954e.hot-update.js", + "/chunks/files.0dba60b37496beaa954e.hot-update.js": "/chunks/files.0dba60b37496beaa954e.hot-update.js", + "/chunks/my-shared-items.0dba60b37496beaa954e.hot-update.js": "/chunks/my-shared-items.0dba60b37496beaa954e.hot-update.js", + "/chunks/platform~chunks/shared/file-browser.0dba60b37496beaa954e.hot-update.js": "/chunks/platform~chunks/shared/file-browser.0dba60b37496beaa954e.hot-update.js", + "/chunks/platform~chunks/shared~chunks/shared/file-browser.0dba60b37496beaa954e.hot-update.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser.0dba60b37496beaa954e.hot-update.js", + "/chunks/recent-uploads.0dba60b37496beaa954e.hot-update.js": "/chunks/recent-uploads.0dba60b37496beaa954e.hot-update.js", + "/chunks/shared/file-browser.0dba60b37496beaa954e.hot-update.js": "/chunks/shared/file-browser.0dba60b37496beaa954e.hot-update.js", + "/chunks/trash.0dba60b37496beaa954e.hot-update.js": "/chunks/trash.0dba60b37496beaa954e.hot-update.js", + "/chunks/trash.bed6af90c3a9e2126b58.hot-update.js": "/chunks/trash.bed6af90c3a9e2126b58.hot-update.js", + "/chunks/recent-uploads.4c63b1d02554ed9c7f31.hot-update.js": "/chunks/recent-uploads.4c63b1d02554ed9c7f31.hot-update.js", + "/chunks/my-shared-items.778e16dba085a8138fe3.hot-update.js": "/chunks/my-shared-items.778e16dba085a8138fe3.hot-update.js", + "/chunks/files.5efa847b1820145f722c.hot-update.js": "/chunks/files.5efa847b1820145f722c.hot-update.js" } diff --git a/resources/js/components/FilesView/DesktopToolbar.vue b/resources/js/components/FilesView/DesktopToolbar.vue index 894e8fc7..f1e45e33 100644 --- a/resources/js/components/FilesView/DesktopToolbar.vue +++ b/resources/js/components/FilesView/DesktopToolbar.vue @@ -2,13 +2,13 @@
- + {{ directoryName }} - +
@@ -118,7 +118,6 @@ }, computed: { ...mapGetters([ - 'previousLocation', 'isVisibleSidebar', 'FilePreviewType', 'currentFolder', @@ -126,7 +125,7 @@ 'homeDirectory', 'clipboard', ]), - canGoBack() { + isLoadedFolder() { return this.$route.params.id }, hasCapacity() { @@ -140,7 +139,17 @@ return this.$store.getters.user.data.attributes.storage.used <= 100 }, directoryName() { - return 'todo' + if (this.currentFolder) { + return this.currentFolder.name + } else { + return { + 'RecentUploads': this.$t('Recent'), + 'MySharedItems': this.$t('Shared'), + 'Trash': this.$t('Trash'), + 'Public': this.$t('Files'), + 'Files': this.$t('Files'), + }[this.$route.name] + } }, preview() { return this.FilePreviewType === 'list' @@ -200,7 +209,7 @@ }, methods: { goBack() { - if (this.canGoBack) this.$router.back() + if (this.isLoadedFolder) this.$router.back() }, showTeamFolderMenu() { events.$emit('popover:open', 'team-folder') diff --git a/resources/js/routes/routesUser.js b/resources/js/routes/routesUser.js index 4bf94cc4..4aae4d71 100644 --- a/resources/js/routes/routesUser.js +++ b/resources/js/routes/routesUser.js @@ -9,7 +9,7 @@ const routesUser = [ name: 'Files', path: '/platform/files/:id?', component: () => - import(/* webpackChunkName: "chunks/files" */ '../views/FileView/Home/Files'), + import(/* webpackChunkName: "chunks/files" */ '../views/FileView/Files'), meta: { requiresAuth: true }, @@ -18,7 +18,7 @@ const routesUser = [ name: 'RecentUploads', path: '/platform/recent-uploads', component: () => - import(/* webpackChunkName: "chunks/recent-uploads" */ '../views/FileView/RecentUploads/RecentUploads'), + import(/* webpackChunkName: "chunks/recent-uploads" */ '../views/FileView/RecentUploads'), meta: { requiresAuth: true }, @@ -27,7 +27,7 @@ const routesUser = [ name: 'MySharedItems', path: '/platform/my-shared-items', component: () => - import(/* webpackChunkName: "chunks/my-shared-items" */ '../views/FileView/MySharedItems/MySharedItems'), + import(/* webpackChunkName: "chunks/my-shared-items" */ '../views/FileView/MySharedItems'), meta: { requiresAuth: true }, @@ -36,7 +36,7 @@ const routesUser = [ name: 'Trash', path: '/platform/trash/:id?', component: () => - import(/* webpackChunkName: "chunks/trash" */ '../views/FileView/Trash/Trash'), + import(/* webpackChunkName: "chunks/trash" */ '../views/FileView/Trash'), meta: { requiresAuth: true }, diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js index 77d9d4f7..9eef0e14 100644 --- a/resources/js/store/modules/fileBrowser.js +++ b/resources/js/store/modules/fileBrowser.js @@ -21,7 +21,8 @@ const actions = { axios .get(`${getters.api}/browse/folders/${id}/${getters.sorting.URI}`) .then(response => { - commit('LOADING_STATE', {loading: false, data: response.data}) + commit('LOADING_STATE', {loading: false, data: response.data.content}) + commit('SET_CURRENT_FOLDER', response.data.folder) events.$emit('scrollTop') }) @@ -50,6 +51,8 @@ const actions = { .get(getters.api + '/browse/latest') .then(response => { commit('LOADING_STATE', {loading: false, data: response.data}) + commit('SET_CURRENT_FOLDER', undefined) + events.$emit('scrollTop') }) .catch(() => Vue.prototype.$isSomethingWrong()) @@ -61,6 +64,7 @@ const actions = { .get(getters.api + '/browse/share' + getters.sorting.URI) .then(response => { commit('LOADING_STATE', {loading: false, data: response.data}) + commit('SET_CURRENT_FOLDER', undefined) events.$emit('scrollTop') }) @@ -72,7 +76,8 @@ const actions = { axios .get(`${getters.api}/browse/trash/${id}/${getters.sorting.URI}`) .then(response => { - commit('LOADING_STATE', {loading: false, data: response.data}) + commit('LOADING_STATE', {loading: false, data: response.data.content}) + commit('SET_CURRENT_FOLDER', response.data.folder) events.$emit('scrollTop') }) @@ -112,6 +117,9 @@ const mutations = { state.entries = payload.data state.isLoading = payload.loading }, + SET_CURRENT_FOLDER(state, folder) { + state.currentFolder = folder + }, UPDATE_FOLDER_TREE(state, tree) { state.navigation = tree }, diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js index ca046836..75257a65 100644 --- a/resources/js/store/modules/fileFunctions.js +++ b/resources/js/store/modules/fileFunctions.js @@ -7,11 +7,11 @@ import Vue from 'vue' const defaultState = { processingPopup: undefined, - fileQueue: [], - filesInQueueTotal: 0, - filesInQueueUploaded: 0, isProcessingFile: false, - uploadingProgress: 0 + filesInQueueUploaded: 0, + filesInQueueTotal: 0, + uploadingProgress: 0, + fileQueue: [], } const actions = { @@ -84,9 +84,13 @@ const actions = { ? `/api/editor/create-folder/${router.currentRoute.params.token}` : '/api/create-folder' + let parent_id = getters.currentFolder + ? getters.currentFolder.id + : undefined + axios .post(route, { - parent_id: getters.currentFolder.id, + parent_id: parent_id, name: folder.name, icon: folder.icon }) @@ -100,9 +104,10 @@ const actions = { events.$emit('newFolder:focus', response.data.id) }, 10) - if (getters.currentFolder.location !== 'public') + if (! Vue.prototype.$isThisRoute(router, ['Public'])) dispatch('getAppData') - if (getters.currentFolder.location === 'public') + + if (Vue.prototype.$isThisRoute(router, ['Public'])) dispatch('getFolderTree') }) diff --git a/resources/js/views/FileView/Home/Files.vue b/resources/js/views/FileView/Files.vue similarity index 99% rename from resources/js/views/FileView/Home/Files.vue rename to resources/js/views/FileView/Files.vue index b12fa083..96c2e447 100644 --- a/resources/js/views/FileView/Home/Files.vue +++ b/resources/js/views/FileView/Files.vue @@ -55,7 +55,7 @@ import OptionGroup from '/resources/js/components/FilesView/OptionGroup' import Option from '/resources/js/components/FilesView/Option' import { mapGetters } from 'vuex' - import {events} from "../../../bus"; + import {events} from "../../bus"; export default { name: 'Files', diff --git a/resources/js/views/FileView/MySharedItems/MySharedItems.vue b/resources/js/views/FileView/MySharedItems.vue similarity index 99% rename from resources/js/views/FileView/MySharedItems/MySharedItems.vue rename to resources/js/views/FileView/MySharedItems.vue index 2e3923b6..4ddae34e 100644 --- a/resources/js/views/FileView/MySharedItems/MySharedItems.vue +++ b/resources/js/views/FileView/MySharedItems.vue @@ -47,7 +47,7 @@ import OptionGroup from '/resources/js/components/FilesView/OptionGroup' import Option from '/resources/js/components/FilesView/Option' import { mapGetters } from 'vuex' - import {events} from "../../../bus"; + import {events} from "../../bus"; export default { name: 'MySharedItems', diff --git a/resources/js/views/FileView/RecentUploads/RecentUploads.vue b/resources/js/views/FileView/RecentUploads.vue similarity index 98% rename from resources/js/views/FileView/RecentUploads/RecentUploads.vue rename to resources/js/views/FileView/RecentUploads.vue index 5b0c0eb0..d54d440c 100644 --- a/resources/js/views/FileView/RecentUploads/RecentUploads.vue +++ b/resources/js/views/FileView/RecentUploads.vue @@ -42,7 +42,7 @@ import OptionGroup from '/resources/js/components/FilesView/OptionGroup' import Option from '/resources/js/components/FilesView/Option' import { mapGetters } from 'vuex' - import {events} from "../../../bus"; + import {events} from "../../bus"; export default { name: 'RecentUploads', diff --git a/resources/js/views/FileView/Trash/Trash.vue b/resources/js/views/FileView/Trash.vue similarity index 98% rename from resources/js/views/FileView/Trash/Trash.vue rename to resources/js/views/FileView/Trash.vue index 74e89667..e94a6643 100644 --- a/resources/js/views/FileView/Trash/Trash.vue +++ b/resources/js/views/FileView/Trash.vue @@ -46,7 +46,7 @@ import OptionGroup from '/resources/js/components/FilesView/OptionGroup' import Option from '/resources/js/components/FilesView/Option' import { mapGetters } from 'vuex' - import {events} from "../../../bus"; + import {events} from "../../bus"; export default { name: 'Trash', diff --git a/src/Domain/Browsing/Controllers/BrowseFolderContentController.php b/src/Domain/Browsing/Controllers/BrowseFolderContentController.php index d966c75f..82c5f053 100644 --- a/src/Domain/Browsing/Controllers/BrowseFolderContentController.php +++ b/src/Domain/Browsing/Controllers/BrowseFolderContentController.php @@ -12,9 +12,11 @@ class BrowseFolderContentController public function __invoke( Request $request, string $id, - ): Collection { + ): array { $root_id = $id === 'undefined' ? null : $id; + $requestedFolder = $root_id ? Folder::findOrFail($root_id) : null; + // 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) @@ -29,7 +31,9 @@ class BrowseFolderContentController ->get(); // Collect folders and files to single array - return collect([$folders, $files]) - ->collapse(); + return [ + 'content' => collect([$folders, $files])->collapse(), + 'folder' => $requestedFolder, + ]; } } diff --git a/src/Domain/Browsing/Controllers/BrowseTrashContentController.php b/src/Domain/Browsing/Controllers/BrowseTrashContentController.php index 96c4cc21..4716708e 100644 --- a/src/Domain/Browsing/Controllers/BrowseTrashContentController.php +++ b/src/Domain/Browsing/Controllers/BrowseTrashContentController.php @@ -3,15 +3,15 @@ namespace Domain\Browsing\Controllers; use Domain\Files\Models\File; use Domain\Folders\Models\Folder; -use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; class BrowseTrashContentController { - public function __invoke(string $id): Collection + public function __invoke(string $id): array { $user_id = Auth::id(); $root_id = $id === 'undefined' ? null : $id; + $requestedFolder = $root_id ? Folder::withTrashed()->findOrFail($root_id) : null; if ($root_id) { @@ -29,8 +29,10 @@ class BrowseTrashContentController ->get(); // Collect folders and files to single array - return collect([$folders, $files]) - ->collapse(); + return [ + 'content' => collect([$folders, $files])->collapse(), + 'folder' => $requestedFolder, + ]; } // Get folders and files @@ -58,7 +60,9 @@ class BrowseTrashContentController ->get(); // Collect folders and files to single array - return collect([$folders, $files_trashed]) - ->collapse(); + return [ + 'content' => collect([$folders, $files_trashed])->collapse(), + 'folder' => $requestedFolder, + ]; } } diff --git a/src/Domain/Folders/Models/Folder.php b/src/Domain/Folders/Models/Folder.php index 082b482c..fa16ffe8 100644 --- a/src/Domain/Folders/Models/Folder.php +++ b/src/Domain/Folders/Models/Folder.php @@ -19,6 +19,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; * @method static whereUserId(int|string|null $id) * @method static find(mixed $id) * @method static where(string $string, string $user_id) + * @method static findOrFail(string $root_id) * @property string id * @property string user_id * @property string parent_id