diff --git a/src/main.js b/src/main.js index adf4a7c28..3b7cec98f 100644 --- a/src/main.js +++ b/src/main.js @@ -17,7 +17,7 @@ import Viewer from './views/Viewer.vue'; const routes = [ { path: '/', redirect: '/home' }, - { path: '/home/:appId?/:currentPath*', component: Home }, + { path: '/home/:appId?/:cwd*', component: Home }, { path: '/viewer/:appId/:filePath*', component: Viewer }, { path: '/login', component: Login }, ]; diff --git a/src/views/Home.vue b/src/views/Home.vue index d46d921b3..2b81c72b2 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -44,7 +44,6 @@ import Menu from 'primevue/menu'; import { useConfirm } from 'primevue/useconfirm'; import { utils, DirectoryView, TopBar, BottomBar, MainLayout, FileUploader } from 'pankow'; -console.log(utils) import PreviewPanel from '../components/PreviewPanel.vue'; import { createDirectoryModel } from '../models/DirectoryModel.js'; @@ -130,9 +129,9 @@ export default { }; }, watch: { - cwd(newcwd, oldcwd) { + cwd(newCwd, oldCwd) { if (this.activeApp) this.$router.push(`/home/${this.activeApp.id}${this.cwd}`); - this.loadcwd(); + this.loadCwd(); } }, methods: { @@ -143,7 +142,7 @@ export default { this.$refs.uploadMenu.toggle(event); }, onUploadFinished() { - this.loadcwd(); + this.loadCwd(); }, onAppChange(event) { this.$router.push(`/home/${event.value}`); @@ -160,12 +159,11 @@ export default { icon: 'pi pi-exclamation-triangle', accept: async () => { for (let item of this.selectedItems) { - console.log('Delete', item) const [error] = await safe(superagent.del(utils.injectFilePathInUrl(`${BASE_URL}/api/v1/apps/${this.selectedAppId}/files/$PATH`, this.cwd, item.name)).query({ access_token: this.accessToken })); if (error) console.error(`Failed to delete file ${item.name}`, error); } - await this.loadcwd(); + await this.loadCwd(); this.$confirm.close(); } }); @@ -185,7 +183,7 @@ export default { if (item.type === 'directory') this.cwd = sanitize(this.cwd + '/' + item.name); else this.$router.push(`/viewer/${this.activeApp.id}${sanitize(this.cwd + '/' + item.name)}`); }, - async loadcwd() { + async loadCwd() { const items = await this.directoryModel.listFiles(this.cwd); // convert to format DirectoryView currently wants @@ -218,7 +216,7 @@ export default { if (!this.activeApp) return console.error('Unable to find app', appId); this.directoryModel = createDirectoryModel(BASE_URL, localStorage.accessToken, appId); - this.loadcwd(); + this.loadCwd(); } }, async mounted() { diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue index f4a6cfd79..c1ee885b8 100644 --- a/src/views/Viewer.vue +++ b/src/views/Viewer.vue @@ -4,9 +4,7 @@