nanka iroiro
This commit is contained in:
parent
f4bd147299
commit
b3818d9c48
@ -5,14 +5,13 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { inject } from 'vue';
|
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
import copyToClipboard from '@/scripts/copy-to-clipboard';
|
import copyToClipboard from '@/scripts/copy-to-clipboard';
|
||||||
import { router } from '@/router';
|
import { router } from '@/router';
|
||||||
import { url } from '@/config';
|
import { url } from '@/config';
|
||||||
import { popout as popout_ } from '@/scripts/popout';
|
import { popout as popout_ } from '@/scripts/popout';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { defaultStore } from '@/store';
|
import { MisskeyNavigator } from '@/scripts/navigate';
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
const props = withDefaults(defineProps<{
|
||||||
to: string;
|
to: string;
|
||||||
@ -23,9 +22,7 @@ const props = withDefaults(defineProps<{
|
|||||||
behavior: null,
|
behavior: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
type Navigate = (path: string, record?: boolean) => void;
|
const mkNav = new MisskeyNavigator();
|
||||||
const navHook = inject<null | Navigate>('navHook', null);
|
|
||||||
const sideViewHook = inject<null | Navigate>('sideViewHook', null);
|
|
||||||
|
|
||||||
const active = $computed(() => {
|
const active = $computed(() => {
|
||||||
if (props.activeClass == null) return false;
|
if (props.activeClass == null) return false;
|
||||||
@ -48,11 +45,11 @@ function onContextmenu(ev) {
|
|||||||
action: () => {
|
action: () => {
|
||||||
os.pageWindow(props.to);
|
os.pageWindow(props.to);
|
||||||
}
|
}
|
||||||
}, sideViewHook ? {
|
}, mkNav.sideViewHook ? {
|
||||||
icon: 'fas fa-columns',
|
icon: 'fas fa-columns',
|
||||||
text: i18n.ts.openInSideView,
|
text: i18n.ts.openInSideView,
|
||||||
action: () => {
|
action: () => {
|
||||||
sideViewHook(props.to);
|
if (mkNav.sideViewHook) mkNav.sideViewHook(props.to);
|
||||||
}
|
}
|
||||||
} : undefined, {
|
} : undefined, {
|
||||||
icon: 'fas fa-expand-alt',
|
icon: 'fas fa-expand-alt',
|
||||||
@ -101,18 +98,6 @@ function nav() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (navHook) {
|
mkNav.push(props.to);
|
||||||
navHook(props.to);
|
|
||||||
} else {
|
|
||||||
if (defaultStore.state.defaultSideView && sideViewHook && props.to !== '/') {
|
|
||||||
return sideViewHook(props.to);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (router.currentRoute.value.path === props.to) {
|
|
||||||
window.scroll({ top: 0, behavior: 'smooth' });
|
|
||||||
} else {
|
|
||||||
router.push(props.to);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -9,15 +9,15 @@
|
|||||||
<div v-if="childInfo" class="subtitle">{{ childInfo.title }}</div>
|
<div v-if="childInfo" class="subtitle">{{ childInfo.title }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="body">
|
<div class="body">
|
||||||
<div v-if="!narrow || page == null" class="nav">
|
<div v-if="!narrow || initialPage == null" class="nav">
|
||||||
<div class="baaadecd">
|
<div class="baaadecd">
|
||||||
<MkInfo v-if="emailNotConfigured" warn class="info">{{ $ts.emailNotConfiguredWarning }} <MkA to="/settings/email" class="_link">{{ $ts.configure }}</MkA></MkInfo>
|
<MkInfo v-if="emailNotConfigured" warn class="info">{{ $ts.emailNotConfiguredWarning }} <MkA to="/settings/email" class="_link">{{ $ts.configure }}</MkA></MkInfo>
|
||||||
<MkSuperMenu :def="menuDef" :grid="page == null"></MkSuperMenu>
|
<MkSuperMenu :def="menuDef" :grid="initialPage == null"></MkSuperMenu>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="!(narrow && page == null)" class="main">
|
<div v-if="!(narrow && initialPage == null)" class="main">
|
||||||
<div class="bkzroven">
|
<div class="bkzroven">
|
||||||
<component :is="component" :ref="el => pageChanged(el)" :key="page" v-bind="pageProps"/>
|
<component :is="component" :ref="el => pageChanged(el)" :key="initialPage" v-bind="pageProps"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -36,6 +36,7 @@ import { unisonReload } from '@/scripts/unison-reload';
|
|||||||
import * as symbols from '@/symbols';
|
import * as symbols from '@/symbols';
|
||||||
import { instance } from '@/instance';
|
import { instance } from '@/instance';
|
||||||
import { $i } from '@/account';
|
import { $i } from '@/account';
|
||||||
|
import { MisskeyNavigator } from '@/scripts/navigate';
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
initialPage?: string
|
initialPage?: string
|
||||||
@ -48,11 +49,11 @@ const indexInfo = {
|
|||||||
hideHeader: true,
|
hideHeader: true,
|
||||||
};
|
};
|
||||||
const INFO = ref(indexInfo);
|
const INFO = ref(indexInfo);
|
||||||
const page = ref(props.initialPage);
|
|
||||||
const view = ref(null);
|
|
||||||
const el = ref<HTMLElement | null>(null);
|
const el = ref<HTMLElement | null>(null);
|
||||||
const childInfo = ref(null);
|
const childInfo = ref(null);
|
||||||
|
|
||||||
|
const nav = new MisskeyNavigator();
|
||||||
|
|
||||||
const narrow = ref(false);
|
const narrow = ref(false);
|
||||||
const NARROW_THRESHOLD = 600;
|
const NARROW_THRESHOLD = 600;
|
||||||
|
|
||||||
@ -67,42 +68,42 @@ const menuDef = computed(() => [{
|
|||||||
icon: 'fas fa-user',
|
icon: 'fas fa-user',
|
||||||
text: i18n.ts.profile,
|
text: i18n.ts.profile,
|
||||||
to: '/settings/profile',
|
to: '/settings/profile',
|
||||||
active: page.value === 'profile',
|
active: props.initialPage === 'profile',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-lock-open',
|
icon: 'fas fa-lock-open',
|
||||||
text: i18n.ts.privacy,
|
text: i18n.ts.privacy,
|
||||||
to: '/settings/privacy',
|
to: '/settings/privacy',
|
||||||
active: page.value === 'privacy',
|
active: props.initialPage === 'privacy',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-laugh',
|
icon: 'fas fa-laugh',
|
||||||
text: i18n.ts.reaction,
|
text: i18n.ts.reaction,
|
||||||
to: '/settings/reaction',
|
to: '/settings/reaction',
|
||||||
active: page.value === 'reaction',
|
active: props.initialPage === 'reaction',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-cloud',
|
icon: 'fas fa-cloud',
|
||||||
text: i18n.ts.drive,
|
text: i18n.ts.drive,
|
||||||
to: '/settings/drive',
|
to: '/settings/drive',
|
||||||
active: page.value === 'drive',
|
active: props.initialPage === 'drive',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-bell',
|
icon: 'fas fa-bell',
|
||||||
text: i18n.ts.notifications,
|
text: i18n.ts.notifications,
|
||||||
to: '/settings/notifications',
|
to: '/settings/notifications',
|
||||||
active: page.value === 'notifications',
|
active: props.initialPage === 'notifications',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-envelope',
|
icon: 'fas fa-envelope',
|
||||||
text: i18n.ts.email,
|
text: i18n.ts.email,
|
||||||
to: '/settings/email',
|
to: '/settings/email',
|
||||||
active: page.value === 'email',
|
active: props.initialPage === 'email',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-share-alt',
|
icon: 'fas fa-share-alt',
|
||||||
text: i18n.ts.integration,
|
text: i18n.ts.integration,
|
||||||
to: '/settings/integration',
|
to: '/settings/integration',
|
||||||
active: page.value === 'integration',
|
active: props.initialPage === 'integration',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-lock',
|
icon: 'fas fa-lock',
|
||||||
text: i18n.ts.security,
|
text: i18n.ts.security,
|
||||||
to: '/settings/security',
|
to: '/settings/security',
|
||||||
active: page.value === 'security',
|
active: props.initialPage === 'security',
|
||||||
}],
|
}],
|
||||||
}, {
|
}, {
|
||||||
title: i18n.ts.clientSettings,
|
title: i18n.ts.clientSettings,
|
||||||
@ -110,27 +111,27 @@ const menuDef = computed(() => [{
|
|||||||
icon: 'fas fa-cogs',
|
icon: 'fas fa-cogs',
|
||||||
text: i18n.ts.general,
|
text: i18n.ts.general,
|
||||||
to: '/settings/general',
|
to: '/settings/general',
|
||||||
active: page.value === 'general',
|
active: props.initialPage === 'general',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-palette',
|
icon: 'fas fa-palette',
|
||||||
text: i18n.ts.theme,
|
text: i18n.ts.theme,
|
||||||
to: '/settings/theme',
|
to: '/settings/theme',
|
||||||
active: page.value === 'theme',
|
active: props.initialPage === 'theme',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-list-ul',
|
icon: 'fas fa-list-ul',
|
||||||
text: i18n.ts.menu,
|
text: i18n.ts.menu,
|
||||||
to: '/settings/menu',
|
to: '/settings/menu',
|
||||||
active: page.value === 'menu',
|
active: props.initialPage === 'menu',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-music',
|
icon: 'fas fa-music',
|
||||||
text: i18n.ts.sounds,
|
text: i18n.ts.sounds,
|
||||||
to: '/settings/sounds',
|
to: '/settings/sounds',
|
||||||
active: page.value === 'sounds',
|
active: props.initialPage === 'sounds',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-plug',
|
icon: 'fas fa-plug',
|
||||||
text: i18n.ts.plugins,
|
text: i18n.ts.plugins,
|
||||||
to: '/settings/plugin',
|
to: '/settings/plugin',
|
||||||
active: page.value === 'plugin',
|
active: props.initialPage === 'plugin',
|
||||||
}],
|
}],
|
||||||
}, {
|
}, {
|
||||||
title: i18n.ts.otherSettings,
|
title: i18n.ts.otherSettings,
|
||||||
@ -138,37 +139,37 @@ const menuDef = computed(() => [{
|
|||||||
icon: 'fas fa-boxes',
|
icon: 'fas fa-boxes',
|
||||||
text: i18n.ts.importAndExport,
|
text: i18n.ts.importAndExport,
|
||||||
to: '/settings/import-export',
|
to: '/settings/import-export',
|
||||||
active: page.value === 'import-export',
|
active: props.initialPage === 'import-export',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-volume-mute',
|
icon: 'fas fa-volume-mute',
|
||||||
text: i18n.ts.instanceMute,
|
text: i18n.ts.instanceMute,
|
||||||
to: '/settings/instance-mute',
|
to: '/settings/instance-mute',
|
||||||
active: page.value === 'instance-mute',
|
active: props.initialPage === 'instance-mute',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-ban',
|
icon: 'fas fa-ban',
|
||||||
text: i18n.ts.muteAndBlock,
|
text: i18n.ts.muteAndBlock,
|
||||||
to: '/settings/mute-block',
|
to: '/settings/mute-block',
|
||||||
active: page.value === 'mute-block',
|
active: props.initialPage === 'mute-block',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-comment-slash',
|
icon: 'fas fa-comment-slash',
|
||||||
text: i18n.ts.wordMute,
|
text: i18n.ts.wordMute,
|
||||||
to: '/settings/word-mute',
|
to: '/settings/word-mute',
|
||||||
active: page.value === 'word-mute',
|
active: props.initialPage === 'word-mute',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-key',
|
icon: 'fas fa-key',
|
||||||
text: 'API',
|
text: 'API',
|
||||||
to: '/settings/api',
|
to: '/settings/api',
|
||||||
active: page.value === 'api',
|
active: props.initialPage === 'api',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-bolt',
|
icon: 'fas fa-bolt',
|
||||||
text: 'Webhook',
|
text: 'Webhook',
|
||||||
to: '/settings/webhook',
|
to: '/settings/webhook',
|
||||||
active: page.value === 'webhook',
|
active: props.initialPage === 'webhook',
|
||||||
}, {
|
}, {
|
||||||
icon: 'fas fa-ellipsis-h',
|
icon: 'fas fa-ellipsis-h',
|
||||||
text: i18n.ts.other,
|
text: i18n.ts.other,
|
||||||
to: '/settings/other',
|
to: '/settings/other',
|
||||||
active: page.value === 'other',
|
active: props.initialPage === 'other',
|
||||||
}],
|
}],
|
||||||
}, {
|
}, {
|
||||||
items: [{
|
items: [{
|
||||||
@ -193,8 +194,8 @@ const menuDef = computed(() => [{
|
|||||||
|
|
||||||
const pageProps = ref({});
|
const pageProps = ref({});
|
||||||
const component = computed(() => {
|
const component = computed(() => {
|
||||||
if (page.value == null) return null;
|
if (props.initialPage == null) return null;
|
||||||
switch (page.value) {
|
switch (props.initialPage) {
|
||||||
case 'accounts': return defineAsyncComponent(() => import('./accounts.vue'));
|
case 'accounts': return defineAsyncComponent(() => import('./accounts.vue'));
|
||||||
case 'profile': return defineAsyncComponent(() => import('./profile.vue'));
|
case 'profile': return defineAsyncComponent(() => import('./profile.vue'));
|
||||||
case 'privacy': return defineAsyncComponent(() => import('./privacy.vue'));
|
case 'privacy': return defineAsyncComponent(() => import('./privacy.vue'));
|
||||||
@ -241,21 +242,26 @@ watch(component, () => {
|
|||||||
|
|
||||||
watch(() => props.initialPage, () => {
|
watch(() => props.initialPage, () => {
|
||||||
if (props.initialPage == null && !narrow.value) {
|
if (props.initialPage == null && !narrow.value) {
|
||||||
page.value = 'profile';
|
nav.push('/settings/profile');
|
||||||
} else {
|
} else {
|
||||||
page.value = props.initialPage;
|
|
||||||
if (props.initialPage == null) {
|
if (props.initialPage == null) {
|
||||||
INFO.value = indexInfo;
|
INFO.value = indexInfo;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
watch(narrow, () => {
|
||||||
|
if (!narrow.value && props.initialPage == null) {
|
||||||
|
nav.push('/settings/profile');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
ro.observe(el.value);
|
ro.observe(el.value);
|
||||||
|
|
||||||
narrow.value = el.value.offsetWidth < NARROW_THRESHOLD;
|
narrow.value = el.value.offsetWidth < NARROW_THRESHOLD;
|
||||||
if (!narrow.value) {
|
if (!narrow.value && props.initialPage == null) {
|
||||||
page.value = props.initialPage || 'profile';
|
nav.push('/settings/profile');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
34
packages/client/src/scripts/navigate.ts
Normal file
34
packages/client/src/scripts/navigate.ts
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
import { inject } from 'vue';
|
||||||
|
import { router } from '@/router';
|
||||||
|
import { defaultStore } from '@/store';
|
||||||
|
|
||||||
|
export type Navigate = (path: string, record?: boolean) => void;
|
||||||
|
|
||||||
|
export class MisskeyNavigator {
|
||||||
|
public readonly navHook: Navigate | null = null;
|
||||||
|
public readonly sideViewHook: Navigate | null = null;
|
||||||
|
|
||||||
|
// It should be constructed during vue creating in order for inject function to work
|
||||||
|
constructor() {
|
||||||
|
this.navHook = inject<null | Navigate>('navHook', null);
|
||||||
|
this.sideViewHook = inject<null | Navigate>('sideViewHook', null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use this method instead of router.push()
|
||||||
|
public push(path: string, record = true) {
|
||||||
|
if (this.navHook) {
|
||||||
|
this.navHook(path, record);
|
||||||
|
} else {
|
||||||
|
if (defaultStore.state.defaultSideView && this.sideViewHook && path !== '/') {
|
||||||
|
return this.sideViewHook(path, record);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (router.currentRoute.value.path === path) {
|
||||||
|
window.scroll({ top: 0, behavior: 'smooth' });
|
||||||
|
} else {
|
||||||
|
if (record) router.push(path);
|
||||||
|
else router.replace(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user