From 459f944243e59f9683a1fb41f906904943badf74 Mon Sep 17 00:00:00 2001 From: Natty Date: Thu, 29 Feb 2024 02:13:21 +0100 Subject: [PATCH] Renamed the notification settings component to Mag --- ...nSettingWindow.vue => MagNotificationSettingsWindow.vue} | 0 .../frontend/client/src/pages/settings/notifications.vue | 5 +++-- .../frontend/client/src/ui/deck/notifications-column.vue | 6 +++--- fe_calckey/frontend/client/src/widgets/notifications.vue | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) rename fe_calckey/frontend/client/src/components/{MkNotificationSettingWindow.vue => MagNotificationSettingsWindow.vue} (100%) diff --git a/fe_calckey/frontend/client/src/components/MkNotificationSettingWindow.vue b/fe_calckey/frontend/client/src/components/MagNotificationSettingsWindow.vue similarity index 100% rename from fe_calckey/frontend/client/src/components/MkNotificationSettingWindow.vue rename to fe_calckey/frontend/client/src/components/MagNotificationSettingsWindow.vue diff --git a/fe_calckey/frontend/client/src/pages/settings/notifications.vue b/fe_calckey/frontend/client/src/pages/settings/notifications.vue index 74439fa..90f255e 100644 --- a/fe_calckey/frontend/client/src/pages/settings/notifications.vue +++ b/fe_calckey/frontend/client/src/pages/settings/notifications.vue @@ -54,6 +54,7 @@ import { $i } from "@/account"; import { i18n } from "@/i18n"; import { definePageMetadata } from "@/scripts/page-metadata"; import MkPushNotificationAllowButton from "@/components/MkPushNotificationAllowButton.vue"; +import MagNotificationSettingsWindow from "@/components/MagNotificationSettingsWindow.vue"; import { magLegacyNotificationType, magNotificationType, @@ -89,9 +90,9 @@ function configure() { ) .includes(x) ); - os.popup( + os.popup( defineAsyncComponent( - () => import("@/components/MkNotificationSettingWindow.vue") + () => import("@/components/MagNotificationSettingsWindow.vue") ), { includingTypes, diff --git a/fe_calckey/frontend/client/src/ui/deck/notifications-column.vue b/fe_calckey/frontend/client/src/ui/deck/notifications-column.vue index 16ebd32..7538e5e 100644 --- a/fe_calckey/frontend/client/src/ui/deck/notifications-column.vue +++ b/fe_calckey/frontend/client/src/ui/deck/notifications-column.vue @@ -22,7 +22,7 @@ import { updateColumn } from "./deck-store"; import XNotifications from "@/components/MagNotifications.vue"; import * as os from "@/os"; import { i18n } from "@/i18n"; -import MkNotificationSettingWindow from "@/components/MkNotificationSettingWindow.vue"; +import MagNotificationSettingsWindow from "@/components/MagNotificationSettingsWindow.vue"; import { types } from "magnetar-common"; const props = defineProps<{ @@ -39,9 +39,9 @@ const includingTypes = ref( ); function func(): void { - os.popup( + os.popup( defineAsyncComponent( - () => import("@/components/MkNotificationSettingWindow.vue") + () => import("@/components/MagNotificationSettingsWindow.vue") ), { includingTypes: props.column.includingTypes, diff --git a/fe_calckey/frontend/client/src/widgets/notifications.vue b/fe_calckey/frontend/client/src/widgets/notifications.vue index 8e331e3..41f0320 100644 --- a/fe_calckey/frontend/client/src/widgets/notifications.vue +++ b/fe_calckey/frontend/client/src/widgets/notifications.vue @@ -32,10 +32,10 @@ import { useWidgetPropsManager, Widget, WidgetComponentExpose } from "./widget"; import { GetFormResultType } from "@/scripts/form"; import MkContainer from "@/components/MkContainer.vue"; import XNotifications from "@/components/MagNotifications.vue"; -import MkNotificationSettingWindow from "@/components/MkNotificationSettingWindow.vue"; import * as os from "@/os"; import { i18n } from "@/i18n"; import { types } from "magnetar-common"; +import MagNotificationSettingsWindow from "@/components/MagNotificationSettingsWindow.vue"; const name = "notifications"; @@ -72,8 +72,8 @@ const { widgetProps, configure, save } = useWidgetPropsManager( const configureNotification = () => { os.popup( - defineAsyncComponent( - () => import("@/components/MkNotificationSettingWindow.vue") + defineAsyncComponent( + () => import("@/components/MagNotificationSettingsWindow.vue") ), { includingTypes: