From 1c1e50dbdafe61d98e81d42575c96b4c8329aca5 Mon Sep 17 00:00:00 2001 From: Brendan Date: Sat, 9 Dec 2023 14:41:26 +0000 Subject: [PATCH 01/53] Rearrange defineComponent to remove warnings --- frontend/pages/admin/site-settings.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/pages/admin/site-settings.vue b/frontend/pages/admin/site-settings.vue index 433674c69da6..0c71d6c3e11b 100644 --- a/frontend/pages/admin/site-settings.vue +++ b/frontend/pages/admin/site-settings.vue @@ -216,6 +216,7 @@ interface CheckApp extends CheckAppConfig { } export default defineComponent({ + components: { AppLoader }, layout: "admin", setup() { // ========================================================== @@ -465,8 +466,7 @@ export default defineComponent({ return { title: this.$t("settings.site-settings") as string, }; - }, - components: { AppLoader } + } }); From 7aac82bff36e20887a66586b8dc434d26e1c1fb1 Mon Sep 17 00:00:00 2001 From: boc-the-git <3479092+boc-the-git@users.noreply.github.com> Date: Mon, 11 Dec 2023 03:56:22 +1100 Subject: [PATCH 02/53] fix: Add 'loading' message to settings page (#2806) * Add 'loading' message to settings page * Fix loading message in site settings page * Refactor code to use AppLoader --- frontend/lang/messages/en-US.json | 1 + frontend/pages/admin/site-settings.vue | 605 ++++++++++++------------- 2 files changed, 289 insertions(+), 317 deletions(-) diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json index 07b577d6f700..dc817971e663 100644 --- a/frontend/lang/messages/en-US.json +++ b/frontend/lang/messages/en-US.json @@ -114,6 +114,7 @@ "json": "JSON", "keyword": "Keyword", "link-copied": "Link Copied", + "loading": "Loading", "loading-events": "Loading Events", "loading-recipe": "Loading recipe...", "loading-ocr-data": "Loading OCR data...", diff --git a/frontend/pages/admin/site-settings.vue b/frontend/pages/admin/site-settings.vue index c4d64ad93b9f..433674c69da6 100644 --- a/frontend/pages/admin/site-settings.vue +++ b/frontend/pages/admin/site-settings.vue @@ -130,40 +130,47 @@
- {{ $t('data-pages.data-management-description') }} -