refactor client

This commit is contained in:
syuilo 2021-10-24 14:50:00 +09:00
parent 2b4d5b73b9
commit 652588abed
9 changed files with 16 additions and 9 deletions

View file

@ -799,6 +799,7 @@ controllPanel: "コントロールパネル"
manageAccounts: "アカウントを管理" manageAccounts: "アカウントを管理"
makeReactionsPublic: "リアクション一覧を公開する" makeReactionsPublic: "リアクション一覧を公開する"
makeReactionsPublicDescription: "あなたがしたリアクション一覧を誰でも見れるようにします。" makeReactionsPublicDescription: "あなたがしたリアクション一覧を誰でも見れるようにします。"
classic: "クラシック"
_signup: _signup:
almostThere: "ほとんど完了です" almostThere: "ほとんど完了です"

View file

@ -166,7 +166,7 @@ const app = createApp(await (
ui === 'deck' ? import('@client/ui/deck.vue') : ui === 'deck' ? import('@client/ui/deck.vue') :
ui === 'desktop' ? import('@client/ui/desktop.vue') : ui === 'desktop' ? import('@client/ui/desktop.vue') :
ui === 'chat' ? import('@client/ui/chat/index.vue') : ui === 'chat' ? import('@client/ui/chat/index.vue') :
ui === 'default' ? import('@client/ui/default.vue') : ui === 'classic' ? import('@client/ui/classic.vue') :
import('@client/ui/universal.vue') import('@client/ui/universal.vue')
).then(x => x.default)); ).then(x => x.default));

View file

@ -2,6 +2,7 @@ import { computed, ref } from 'vue';
import { search } from '@client/scripts/search'; import { search } from '@client/scripts/search';
import * as os from '@client/os'; import * as os from '@client/os';
import { i18n } from '@client/i18n'; import { i18n } from '@client/i18n';
import { ui } from '@client/config';
import { $i } from './account'; import { $i } from './account';
import { unisonReload } from '@client/scripts/unison-reload'; import { unisonReload } from '@client/scripts/unison-reload';
import { router } from './router'; import { router } from './router';
@ -184,35 +185,40 @@ export const menuDef = {
action: (ev) => { action: (ev) => {
os.popupMenu([{ os.popupMenu([{
text: i18n.locale.default, text: i18n.locale.default,
active: ui === 'default' || ui === null,
action: () => { action: () => {
localStorage.setItem('ui', 'default'); localStorage.setItem('ui', 'default');
unisonReload(); unisonReload();
} }
}, { }, {
text: i18n.locale.deck, text: i18n.locale.deck,
active: ui === 'deck',
action: () => { action: () => {
localStorage.setItem('ui', 'deck'); localStorage.setItem('ui', 'deck');
unisonReload(); unisonReload();
} }
}, { }, {
text: 'pope', text: i18n.locale.classic,
active: ui === 'classic',
action: () => { action: () => {
localStorage.setItem('ui', 'pope'); localStorage.setItem('ui', 'classic');
unisonReload(); unisonReload();
} }
}, { }, {
text: 'Chat (β)', text: 'Chat (β)',
active: ui === 'chat',
action: () => { action: () => {
localStorage.setItem('ui', 'chat'); localStorage.setItem('ui', 'chat');
unisonReload(); unisonReload();
} }
}, { }, /*{
text: i18n.locale.desktop + ' (β)', text: i18n.locale.desktop + ' (β)',
active: ui === 'desktop',
action: () => { action: () => {
localStorage.setItem('ui', 'desktop'); localStorage.setItem('ui', 'desktop');
unisonReload(); unisonReload();
} }
}], ev.currentTarget || ev.target); }*/], ev.currentTarget || ev.target);
}, },
}, },
}; };

View file

@ -64,7 +64,7 @@
import { defineComponent, defineAsyncComponent, markRaw } from 'vue'; import { defineComponent, defineAsyncComponent, markRaw } from 'vue';
import { instanceName } from '@client/config'; import { instanceName } from '@client/config';
import { StickySidebar } from '@client/scripts/sticky-sidebar'; import { StickySidebar } from '@client/scripts/sticky-sidebar';
import XSidebar from './default.sidebar.vue'; import XSidebar from './classic.sidebar.vue';
import XDrawerSidebar from '@client/ui/_common_/sidebar.vue'; import XDrawerSidebar from '@client/ui/_common_/sidebar.vue';
import XCommon from './_common_/common.vue'; import XCommon from './_common_/common.vue';
import * as os from '@client/os'; import * as os from '@client/os';
@ -79,8 +79,8 @@ export default defineComponent({
XCommon, XCommon,
XSidebar, XSidebar,
XDrawerSidebar, XDrawerSidebar,
XHeaderMenu: defineAsyncComponent(() => import('./default.header.vue')), XHeaderMenu: defineAsyncComponent(() => import('./classic.header.vue')),
XWidgets: defineAsyncComponent(() => import('./default.widgets.vue')), XWidgets: defineAsyncComponent(() => import('./classic.widgets.vue')),
}, },
provide() { provide() {

View file

@ -58,7 +58,7 @@ import { instanceName } from '@client/config';
import { StickySidebar } from '@client/scripts/sticky-sidebar'; import { StickySidebar } from '@client/scripts/sticky-sidebar';
import XSidebar from '@client/ui/_common_/sidebar.vue'; import XSidebar from '@client/ui/_common_/sidebar.vue';
import XCommon from './_common_/common.vue'; import XCommon from './_common_/common.vue';
import XSide from './default.side.vue'; import XSide from './classic.side.vue';
import * as os from '@client/os'; import * as os from '@client/os';
import { menuDef } from '@client/menu'; import { menuDef } from '@client/menu';
import * as symbols from '@client/symbols'; import * as symbols from '@client/symbols';