From 5d228fb0f32aca9337c8b8a9ea9544f28d981f34 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Thu, 13 Mar 2025 17:39:53 +0900 Subject: enhance(frontend): re-organize settings page --- locales/index.d.ts | 4 + locales/ja-JP.yml | 1 + .../frontend/src/pages/settings/accessibility.vue | 51 ++ .../frontend/src/pages/settings/appearance.vue | 325 ----------- packages/frontend/src/pages/settings/index.vue | 5 - .../frontend/src/pages/settings/preferences.vue | 624 ++++++++++++++------- packages/frontend/src/router/definition.ts | 4 - .../src/utility/autogen/settings-search-index.ts | 411 +++++++------- 8 files changed, 674 insertions(+), 751 deletions(-) delete mode 100644 packages/frontend/src/pages/settings/appearance.vue diff --git a/locales/index.d.ts b/locales/index.d.ts index b814bb70e1..f579aadb5d 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5342,6 +5342,10 @@ export interface Locale extends ILocale { * 絵文字パレット */ "emojiPalette": string; + /** + * 投稿フォーム + */ + "postForm": string; "_emojiPalette": { /** * パレット diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b51a839715..2151a06611 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1331,6 +1331,7 @@ preferenceSyncConflictChoiceDevice: "デバイスの設定値" preferenceSyncConflictChoiceCancel: "同期の有効化をキャンセル" paste: "ペースト" emojiPalette: "絵文字パレット" +postForm: "投稿フォーム" _emojiPalette: palettes: "パレット" diff --git a/packages/frontend/src/pages/settings/accessibility.vue b/packages/frontend/src/pages/settings/accessibility.vue index 3dbb039a17..f7b1e7d2a0 100644 --- a/packages/frontend/src/pages/settings/accessibility.vue +++ b/packages/frontend/src/pages/settings/accessibility.vue @@ -60,6 +60,17 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + + + + + + + + @@ -70,6 +81,22 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + + + + + + + + + + + + + @@ -84,6 +111,8 @@ import { i18n } from '@/i18n.js'; import { definePage } from '@/page.js'; import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue'; import MkFeatureBanner from '@/components/MkFeatureBanner.vue'; +import { miLocalStorage } from '@/local-storage.js'; +import MkRadios from '@/components/MkRadios.vue'; const reduceAnimation = prefer.model('animation', v => !v, v => !v); const animatedMfm = prefer.model('animatedMfm'); @@ -92,10 +121,32 @@ const keepScreenOn = prefer.model('keepScreenOn'); const enableHorizontalSwipe = prefer.model('enableHorizontalSwipe'); const useNativeUiForVideoAudioPlayer = prefer.model('useNativeUiForVideoAudioPlayer'); const contextMenu = prefer.model('contextMenu'); +const menuStyle = prefer.model('menuStyle'); + +const fontSize = ref(miLocalStorage.getItem('fontSize')); +const useSystemFont = ref(miLocalStorage.getItem('useSystemFont') != null); + +watch(fontSize, () => { + if (fontSize.value == null) { + miLocalStorage.removeItem('fontSize'); + } else { + miLocalStorage.setItem('fontSize', fontSize.value); + } +}); + +watch(useSystemFont, () => { + if (useSystemFont.value) { + miLocalStorage.setItem('useSystemFont', 't'); + } else { + miLocalStorage.removeItem('useSystemFont'); + } +}); watch([ keepScreenOn, contextMenu, + fontSize, + useSystemFont, ], async () => { await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true }); }); diff --git a/packages/frontend/src/pages/settings/appearance.vue b/packages/frontend/src/pages/settings/appearance.vue deleted file mode 100644 index 3fda5bc4c8..0000000000 --- a/packages/frontend/src/pages/settings/appearance.vue +++ /dev/null @@ -1,325 +0,0 @@ - - - - - diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue index debcd4bd3e..3b7c44fbfe 100644 --- a/packages/frontend/src/pages/settings/index.vue +++ b/packages/frontend/src/pages/settings/index.vue @@ -118,11 +118,6 @@ const menuDef = computed(() => [{ text: i18n.ts.emojiPalette, to: '/settings/emoji-palette', active: currentPage.value?.route.name === 'emoji-palette', - }, { - icon: 'ti ti-device-desktop', - text: i18n.ts.appearance, - to: '/settings/appearance', - active: currentPage.value?.route.name === 'appearance', }, { icon: 'ti ti-music', text: i18n.ts.sounds, diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue index 374477c510..b9a596067c 100644 --- a/packages/frontend/src/pages/settings/preferences.vue +++ b/packages/frontend/src/pages/settings/preferences.vue @@ -10,121 +10,174 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._settings.preferencesBanner }} - - - - - - - + + + - - - - - - - - - +
+ + + + + + + - -
- - - - - - - + + + + + + + + + - - - - - - - - - - - - - {{ i18n.ts.add }} - {{ i18n.ts.remove }} - - - - - - - - - - -
- - - -
- - - - - - - +
+ + + + + + + - - - - - - - - - -
- - - - - - - - - - - {{ i18n.ts._visibility.disableFederation }} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + +
+ + + + + + + + {{ i18n.ts.add }} + {{ i18n.ts.remove }} - - -
- + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + - +
- - - - - - - - - @@ -157,6 +210,14 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + + + + + @@ -164,93 +225,199 @@ SPDX-License-Identifier: AGPL-3.0-only + + + + + + + +
-
- - - - - + + + + + + + + + + -
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + - - - + + +
- - - - + + + + - - - - + + + + - - - - + + + + +
- - - - - - - + + + + + + + + - - - - - - - +
+ + + + + + + + + + + {{ i18n.ts._visibility.disableFederation }} + +
+ + + +
+ + - - - - + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ i18n.ts._notification.checkNotificationBehavior }} +
+ + + + + + + +
+
+ + + + - - - - + + + + - - - - + + + + @@ -276,47 +443,6 @@ SPDX-License-Identifier: AGPL-3.0-only - - - - -
- {{ i18n.ts.reloadRequiredToApplySettings }} - -
- {{ i18n.ts.enableAll }} - {{ i18n.ts.disableAll }} -
-
- - {{ i18n.ts._dataSaver._media.title }} - - - - {{ i18n.ts._dataSaver._avatar.title }} - - - - {{ i18n.ts._dataSaver._urlPreview.title }} - - - - {{ i18n.ts._dataSaver._code.title }} - - -
-
- - -
- - - - - - - -
@@ -347,18 +473,47 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ + + + + + + +
+ {{ i18n.ts.reloadRequiredToApplySettings }} - {{ i18n.ts.navbar }} - {{ i18n.ts.statusbar }} +
+ {{ i18n.ts.enableAll }} + {{ i18n.ts.disableAll }} +
+
+ + {{ i18n.ts._dataSaver._media.title }} + + + + {{ i18n.ts._dataSaver._avatar.title }} + + + + {{ i18n.ts._dataSaver._urlPreview.title }} + + + + {{ i18n.ts._dataSaver._code.title }} + + +
- + - -
- {{ i18n.ts.deck }} -
- + {{ i18n.ts.navbar }} + {{ i18n.ts.statusbar }} + {{ i18n.ts.deck }} + {{ i18n.ts.customCss }}
@@ -366,6 +521,7 @@ SPDX-License-Identifier: AGPL-3.0-only