diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-07-17 08:11:17 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-07-17 08:11:17 +0900 |
| commit | be595ebd628fcdce93fc8e55a6fc7f2796c41c16 (patch) | |
| tree | d38f8d573a7c92b736bf24a049503f03c2309af9 /packages/frontend | |
| parent | 13.14.0-beta.4 (diff) | |
| download | sharkey-be595ebd628fcdce93fc8e55a6fc7f2796c41c16.tar.gz sharkey-be595ebd628fcdce93fc8e55a6fc7f2796c41c16.tar.bz2 sharkey-be595ebd628fcdce93fc8e55a6fc7f2796c41c16.zip | |
enhance(client): Deckで非ルートページにアクセスした際に簡易UIで表示しない設定を追加
Diffstat (limited to 'packages/frontend')
| -rw-r--r-- | packages/frontend/src/boot/main-boot.ts | 3 | ||||
| -rw-r--r-- | packages/frontend/src/pages/settings/deck.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/ui/deck/deck-store.ts | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts index d2db5e98be..0a351cd6e3 100644 --- a/packages/frontend/src/boot/main-boot.ts +++ b/packages/frontend/src/boot/main-boot.ts @@ -13,10 +13,11 @@ import { miLocalStorage } from '@/local-storage'; import { claimAchievement, claimedAchievements } from '@/scripts/achievements'; import { mainRouter } from '@/router'; import { initializeSw } from '@/scripts/initialize-sw'; +import { deckStore } from '@/ui/deck/deck-store'; export async function mainBoot() { const { isClientUpdated } = await common(() => createApp( - new URLSearchParams(window.location.search).has('zen') || (ui === 'deck' && location.pathname !== '/') ? defineAsyncComponent(() => import('@/ui/zen.vue')) : + new URLSearchParams(window.location.search).has('zen') || (ui === 'deck' && deckStore.state.useSimpleUiForNonRootPages && location.pathname !== '/') ? defineAsyncComponent(() => import('@/ui/zen.vue')) : !$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) : ui === 'deck' ? defineAsyncComponent(() => import('@/ui/deck.vue')) : ui === 'classic' ? defineAsyncComponent(() => import('@/ui/classic.vue')) : diff --git a/packages/frontend/src/pages/settings/deck.vue b/packages/frontend/src/pages/settings/deck.vue index bc0179b3aa..481959fd08 100644 --- a/packages/frontend/src/pages/settings/deck.vue +++ b/packages/frontend/src/pages/settings/deck.vue @@ -1,5 +1,7 @@ <template> <div class="_gaps_m"> + <MkSwitch v-model="useSimpleUiForNonRootPages">{{ i18n.ts._deck.useSimpleUiForNonRootPages }}</MkSwitch> + <MkSwitch v-model="navWindow">{{ i18n.ts.defaultNavigationBehaviour }}: {{ i18n.ts.openInWindow }}</MkSwitch> <MkSwitch v-model="alwaysShowMainColumn">{{ i18n.ts._deck.alwaysShowMainColumn }}</MkSwitch> @@ -21,6 +23,7 @@ import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; const navWindow = computed(deckStore.makeGetterSetter('navWindow')); +const useSimpleUiForNonRootPages = computed(deckStore.makeGetterSetter('useSimpleUiForNonRootPages')); const alwaysShowMainColumn = computed(deckStore.makeGetterSetter('alwaysShowMainColumn')); const columnAlign = computed(deckStore.makeGetterSetter('columnAlign')); diff --git a/packages/frontend/src/ui/deck/deck-store.ts b/packages/frontend/src/ui/deck/deck-store.ts index a6784e9849..4601207858 100644 --- a/packages/frontend/src/ui/deck/deck-store.ts +++ b/packages/frontend/src/ui/deck/deck-store.ts @@ -52,6 +52,10 @@ export const deckStore = markRaw(new Storage('deck', { where: 'deviceAccount', default: true, }, + useSimpleUiForNonRootPages: { + where: 'deviceAccount', + default: true, + }, })); export const loadDeck = async () => { |