From 0b30cf48bd73b49bd4416f28eb80b06152bf9382 Mon Sep 17 00:00:00 2001 From: Alexandre_BRAVO Date: Fri, 29 Nov 2024 14:51:04 +0100 Subject: [PATCH 1/2] navigation dans favoris et correction edition dans sous dossiers --- src/components/FileTable.vue | 22 ++++++++++++++++++---- src/output.css | 24 ++++++------------------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/components/FileTable.vue b/src/components/FileTable.vue index 9de2967..ae21c12 100644 --- a/src/components/FileTable.vue +++ b/src/components/FileTable.vue @@ -254,7 +254,7 @@ export default { try { const client = getClient(); let directoryItems; - if (this.currentTab === 'default'){ + if (this.currentTab === 'default' || (this.currentTab === 'favorites' && this.current_dir !== '/')){ directoryItems = await client.getDirectoryContents(this.root_path + this.current_dir); } else if(this.currentTab === 'favorites'){ @@ -264,6 +264,7 @@ export default { this.files = directoryItems.map(file => ({ basename: file.basename, + filename:file.filename, size: file.size, href: client.getFileDownloadLink(file.filename), type: file.type @@ -313,7 +314,19 @@ export default { async handleClickElem(file) { if (this.isTransfering) return; if (file.type === 'directory') { - this.current_dir = this.current_dir === '/' ? '/' + file.basename : this.current_dir + '/' + file.basename; + if(this.currentTab === 'default'){ + this.current_dir = this.current_dir === '/' ? '/' + file.basename : this.current_dir + '/' + file.basename; + } + else{ + let path = file.filename; + let pathSplited = path.split('/'); + let result = pathSplited.slice(3); + let dir = ''; + result.forEach(element => { + dir += '/' + element + }); + this.current_dir = dir; + } this.breadcrumbParts = this.getBreadcrumbParts() await this.fetchFiles(); } else { @@ -596,9 +609,10 @@ export default { if (names.initialFileName !== names.newFileName) { const client = getClient() try { - const oldName = this.root_path + this.current_dir + names.initialFileName; - const newName = this.root_path + this.current_dir + names.newFileName; + const oldName = this.root_path + this.current_dir + '/' + names.initialFileName; + const newName = this.root_path + this.current_dir + '/' + names.newFileName; let alreadyExists = await this.elemtAlreadyExists(newName); + console.log(names) if (!alreadyExists) { await client.moveFile(oldName, newName); } diff --git a/src/output.css b/src/output.css index 80e2ee6..6a07c90 100644 --- a/src/output.css +++ b/src/output.css @@ -675,10 +675,6 @@ video { width: 16.666667%; } -.w-2\/6 { - width: 33.333333%; -} - .w-24 { width: 6rem; } @@ -695,6 +691,10 @@ video { width: 12rem; } +.w-5\/6 { + width: 83.333333%; +} + .w-6 { width: 1.5rem; } @@ -711,10 +711,6 @@ video { width: 100%; } -.w-5\/6 { - width: 83.333333%; -} - .max-w-64 { max-width: 16rem; } @@ -737,22 +733,14 @@ video { animation: spin 1s linear infinite; } -.cursor-not-allowed { - cursor: not-allowed; +.\!cursor-no-drop { + cursor: no-drop !important; } .cursor-pointer { cursor: pointer; } -.cursor-no-drop { - cursor: no-drop; -} - -.\!cursor-no-drop { - cursor: no-drop !important; -} - .flex-row { flex-direction: row; } From 48e5280a576a823a7705e19d407a15c3ee8bed27 Mon Sep 17 00:00:00 2001 From: Alexandre_BRAVO Date: Fri, 29 Nov 2024 14:53:38 +0100 Subject: [PATCH 2/2] navigation dans favoris et correction edition dans sous dossiers --- src/components/FileTable.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/FileTable.vue b/src/components/FileTable.vue index 0cd26ea..b3a173c 100644 --- a/src/components/FileTable.vue +++ b/src/components/FileTable.vue @@ -612,7 +612,6 @@ export default { const oldName = this.root_path + this.current_dir + '/' + names.initialFileName; const newName = this.root_path + this.current_dir + '/' + names.newFileName; let alreadyExists = await this.elemtAlreadyExists(newName); - console.log(names) if (!alreadyExists) { await client.moveFile(oldName, newName); }