From b2101b324360fd1f45e234c048ab081abfb5b2d5 Mon Sep 17 00:00:00 2001 From: Fornax Date: Tue, 21 Mar 2023 19:09:14 +0100 Subject: [PATCH] Add file upload widget to file manager --- res/template/file_viewer_svelte.html | 1 + res/template/user_file_manager.html | 1 + svelte/src/home_page/UploadWidget.svelte | 2 +- .../src/user_file_manager/FileManager.svelte | 28 ++- .../src/util/upload_widget/DropUpload.svelte | 53 ++++++ svelte/src/util/upload_widget/UploadFunc.js | 68 +++++++ .../util/upload_widget/UploadProgress.svelte | 66 +++++++ .../util/upload_widget/UploadWidget.svelte | 170 ++++++++++++++++++ 8 files changed, 381 insertions(+), 8 deletions(-) create mode 100644 svelte/src/util/upload_widget/DropUpload.svelte create mode 100644 svelte/src/util/upload_widget/UploadFunc.js create mode 100644 svelte/src/util/upload_widget/UploadProgress.svelte create mode 100644 svelte/src/util/upload_widget/UploadWidget.svelte diff --git a/res/template/file_viewer_svelte.html b/res/template/file_viewer_svelte.html index 3788b97..7235b45 100644 --- a/res/template/file_viewer_svelte.html +++ b/res/template/file_viewer_svelte.html @@ -26,6 +26,7 @@ window.api_endpoint = '{{.APIEndpoint}}'; window.viewer_data = {{.Other}}; window.user_authenticated = {{.Authenticated}}; + window.user = {{.User}}; diff --git a/res/template/user_file_manager.html b/res/template/user_file_manager.html index 7f0790e..fe9d77c 100644 --- a/res/template/user_file_manager.html +++ b/res/template/user_file_manager.html @@ -5,6 +5,7 @@ diff --git a/svelte/src/home_page/UploadWidget.svelte b/svelte/src/home_page/UploadWidget.svelte index a32e626..81892eb 100644 --- a/svelte/src/home_page/UploadWidget.svelte +++ b/svelte/src/home_page/UploadWidget.svelte @@ -331,7 +331,7 @@ const keydown = (e) => { on:keydown={keydown} on:beforeunload={leave_confirmation} /> - + {#if window.user.username !== "" && window.user.storage_space_used/window.user.subscription.storage_space > 0.5} diff --git a/svelte/src/user_file_manager/FileManager.svelte b/svelte/src/user_file_manager/FileManager.svelte index dcbbcf7..034a811 100644 --- a/svelte/src/user_file_manager/FileManager.svelte +++ b/svelte/src/user_file_manager/FileManager.svelte @@ -3,6 +3,7 @@ import { onMount } from "svelte"; import { formatDataVolume } from "../util/Formatting.svelte"; import Modal from "../util/Modal.svelte"; import Spinner from "../util/Spinner.svelte"; +import UploadWidget from "../util/upload_widget/UploadWidget.svelte"; import DirectoryElement from "./DirectoryElement.svelte" let loading = true @@ -12,6 +13,7 @@ let directoryElement let downloadFrame let help_modal let help_modal_visible = false +let upload_widget let getUserFiles = () => { loading = true @@ -251,28 +253,40 @@ onMount(() => { initialized = true hashChange() }) - + +
{#if selecting}