From 464a238f91fcdc8a53ffd8353311cc938f229721 Mon Sep 17 00:00:00 2001 From: Fornax Date: Tue, 26 Apr 2022 15:23:57 +0200 Subject: [PATCH] Use centralized loading indicator --- svelte/src/admin_panel/AbuseReporters.svelte | 17 +- svelte/src/admin_panel/AbuseReports.svelte | 16 +- svelte/src/admin_panel/IPBans.svelte | 16 +- svelte/src/admin_panel/Subscriptions.svelte | 20 +- svelte/src/file_viewer/FileViewer.svelte | 17 +- svelte/src/filesystem/Filesystem.svelte | 10 +- svelte/src/user_buckets/UserBuckets.svelte | 18 +- svelte/src/user_home/APIKeys.svelte | 16 +- svelte/src/user_home/AccountSettings.svelte | 190 ------------------ svelte/src/user_home/ActivityLog.svelte | 16 +- svelte/src/user_home/ConnectApp.svelte | 17 +- svelte/src/user_home/Router.svelte | 10 + svelte/src/user_home/SharingSettings.svelte | 197 +++++++++++++++++++ svelte/src/user_home/Subscription.svelte | 27 +-- svelte/src/user_home/Transactions.svelte | 17 +- svelte/src/util/LoadingIndicator.svelte | 22 +++ webcontroller/web_controller.go | 1 + 17 files changed, 258 insertions(+), 369 deletions(-) create mode 100644 svelte/src/user_home/SharingSettings.svelte create mode 100644 svelte/src/util/LoadingIndicator.svelte diff --git a/svelte/src/admin_panel/AbuseReporters.svelte b/svelte/src/admin_panel/AbuseReporters.svelte index 9731226..a0faea0 100644 --- a/svelte/src/admin_panel/AbuseReporters.svelte +++ b/svelte/src/admin_panel/AbuseReporters.svelte @@ -1,7 +1,6 @@ -{#if loading} -
- -
-{/if} +
@@ -201,14 +196,6 @@ onMount(get_reporters);
diff --git a/svelte/src/file_viewer/FileViewer.svelte b/svelte/src/file_viewer/FileViewer.svelte index 6543eff..78d3f3f 100644 --- a/svelte/src/file_viewer/FileViewer.svelte +++ b/svelte/src/file_viewer/FileViewer.svelte @@ -17,10 +17,10 @@ import AdLeaderboard from "./AdLeaderboard.svelte"; import AdSkyscraper from "./AdSkyscraper.svelte"; import Sharebar from "./Sharebar.svelte"; import GalleryView from "./GalleryView.svelte"; -import Spinner from "../util/Spinner.svelte"; import Downloader from "./Downloader.svelte"; import CustomBanner from "./CustomBanner.svelte"; import UkraineModal from "./UkraineModal.svelte"; +import LoadingIndicator from "../util/LoadingIndicator.svelte"; let loading = true let embedded = false @@ -366,11 +366,7 @@ const keyboard_event = evt => { - {#if loading} -
- -
- {/if} +
diff --git a/svelte/src/user_home/APIKeys.svelte b/svelte/src/user_home/APIKeys.svelte index 6f3e86b..c68fb20 100644 --- a/svelte/src/user_home/APIKeys.svelte +++ b/svelte/src/user_home/APIKeys.svelte @@ -1,6 +1,6 @@ -{#if loading} -
- -
-{/if} +
{#if !loaded} @@ -164,14 +160,6 @@ const logout = async (key) => { diff --git a/svelte/src/user_home/ActivityLog.svelte b/svelte/src/user_home/ActivityLog.svelte index 3ab4d57..1e661fe 100644 --- a/svelte/src/user_home/ActivityLog.svelte +++ b/svelte/src/user_home/ActivityLog.svelte @@ -1,7 +1,7 @@ -{#if loading} -
- -
-{/if} +

Account activity log

@@ -134,14 +130,6 @@ onMount(() => {
diff --git a/svelte/src/user_home/Subscription.svelte b/svelte/src/user_home/Subscription.svelte index 611199e..c1714ba 100644 --- a/svelte/src/user_home/Subscription.svelte +++ b/svelte/src/user_home/Subscription.svelte @@ -1,9 +1,9 @@ -{#if loading} -
- -
-{/if} + +

Manage subscription

{#if window.user.subscription.type !== "patreon"} @@ -237,15 +234,6 @@ onMount(load_tranfer_used)
diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go index 20dd057..9291e5e 100644 --- a/webcontroller/web_controller.go +++ b/webcontroller/web_controller.go @@ -181,6 +181,7 @@ func New( {GET, "user" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true})}, {GET, "user/home" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true})}, {GET, "user/settings" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true})}, + {GET, "user/sharing" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true})}, {GET, "user/api_keys" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true})}, {GET, "user/activity" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true})}, {GET, "user/connect_app" /* */, wc.serveTemplate("user_home", handlerOpts{Auth: true})},