From a0e8e353d23372332cf50df9b59b99a944f7371d Mon Sep 17 00:00:00 2001 From: Pascal Wengerter Date: Tue, 29 Mar 2022 09:28:05 +0200 Subject: [PATCH] Rebase&refactor --- packages/web-app-files/package.json | 8 +- packages/web-app-files/src/App.vue | 7 +- .../src/components/AppBar/CreateAndUpload.vue | 166 ++++++-- .../src/components/AppBar/Upload/FileDrop.vue | 129 ------ .../components/AppBar/Upload/FileUpload.vue | 25 +- .../components/AppBar/Upload/FolderUpload.vue | 22 +- packages/web-app-files/src/mixins.js | 403 ------------------ packages/web-app-files/src/store/actions.js | 16 +- packages/web-app-files/src/store/getters.js | 3 - packages/web-app-files/src/store/mutations.js | 48 --- packages/web-app-files/src/store/state.js | 1 - .../web-app-files/src/views/FilesDrop.vue | 23 +- packages/web-runtime/src/defaults/vue.js | 2 - packages/web-runtime/src/plugins/upload.js | 65 --- yarn.lock | 170 +++++++- 15 files changed, 299 insertions(+), 789 deletions(-) delete mode 100644 packages/web-app-files/src/components/AppBar/Upload/FileDrop.vue delete mode 100644 packages/web-runtime/src/plugins/upload.js diff --git a/packages/web-app-files/package.json b/packages/web-app-files/package.json index efc2da258ab..7d8f915ae98 100644 --- a/packages/web-app-files/package.json +++ b/packages/web-app-files/package.json @@ -4,7 +4,11 @@ "description": "ownCloud web files", "license": "AGPL-3.0", "dependencies": { - "copy-to-clipboard": "^3.3.1", - "vue2-dropzone": "^3.6.0" + "@uppy/core": "^2.1.4", + "@uppy/drop-target": "^1.1.1", + "@uppy/status-bar": "^2.1.2", + "@uppy/tus": "^2.1.2", + "@uppy/xhr-upload": "^2.0.7", + "copy-to-clipboard": "^3.3.1" } } diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue index 013ce80a55b..0fcac4a356d 100644 --- a/packages/web-app-files/src/App.vue +++ b/packages/web-app-files/src/App.vue @@ -22,7 +22,7 @@ - - diff --git a/packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue b/packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue index 3303719fdf9..a9e8eb7796d 100644 --- a/packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue +++ b/packages/web-app-files/src/components/AppBar/Upload/FileUpload.vue @@ -7,41 +7,18 @@