From 9a41b9b7d79e16b683464b1cfd9cbe50ef046d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?= Date: Fri, 13 Jan 2023 01:52:52 +0800 Subject: [PATCH] feat(settings): respect settings from server (#1013) --- components/account/AccountPostsFollowers.vue | 4 +- components/nav/NavBottomMoreMenu.vue | 2 + components/nav/NavFooter.vue | 2 + components/settings/SettingsColorMode.vue | 2 +- components/settings/SettingsFontSize.vue | 9 ++-- components/settings/SettingsLanguage.vue | 7 +-- components/status/StatusActions.vue | 10 ++-- components/status/StatusActionsMore.vue | 1 + components/status/StatusCard.vue | 1 + composables/command.ts | 1 + composables/injections.ts | 6 +-- composables/settings/definition.ts | 46 ++++++++++++++++ composables/settings/featureFlags.ts | 36 ------------- composables/settings/index.ts | 26 +-------- composables/settings/storage.ts | 53 ++++++++++++++++++ composables/settings/wellness.ts | 36 ------------- composables/users.ts | 8 +-- constants/index.ts | 2 +- constants/symbols.ts | 5 +- layouts/default.vue | 3 +- pages/settings/preferences/index.vue | 8 +-- pages/settings/wellness/index.vue | 8 +-- plugins/setup-font-size.ts | 28 +++++----- plugins/setup-i18n.ts | 56 +++++++++++++------- tests/language.test.ts | 18 +++++++ types/index.ts | 3 -- utils/language.ts | 16 ++++++ 27 files changed, 230 insertions(+), 167 deletions(-) create mode 100644 composables/settings/definition.ts delete mode 100644 composables/settings/featureFlags.ts create mode 100644 composables/settings/storage.ts delete mode 100644 composables/settings/wellness.ts create mode 100644 tests/language.test.ts create mode 100644 utils/language.ts diff --git a/components/account/AccountPostsFollowers.vue b/components/account/AccountPostsFollowers.vue index f2e1cbcc..98dcd4c2 100644 --- a/components/account/AccountPostsFollowers.vue +++ b/components/account/AccountPostsFollowers.vue @@ -4,6 +4,8 @@ import type { mastodon } from 'masto' defineProps<{ account: mastodon.v1.Account }>() + +const userSettings = useUserSettings() () const colorMode = useColorMode() +const userSettings = useUserSettings() + function toggleVisible() { modelValue = !modelValue } diff --git a/components/nav/NavFooter.vue b/components/nav/NavFooter.vue index ebe7f9b9..ed8fb042 100644 --- a/components/nav/NavFooter.vue +++ b/components/nav/NavFooter.vue @@ -2,6 +2,8 @@ const buildInfo = useRuntimeConfig().public.buildInfo const timeAgoOptions = useTimeAgoOptions() +const userSettings = useUserSettings() + const buildTimeDate = new Date(buildInfo.time) const buildTimeAgo = useTimeAgo(buildTimeDate, timeAgoOptions) diff --git a/components/settings/SettingsColorMode.vue b/components/settings/SettingsColorMode.vue index 2a0f5b72..86649723 100644 --- a/components/settings/SettingsColorMode.vue +++ b/components/settings/SettingsColorMode.vue @@ -1,5 +1,5 @@