This commit is contained in:
syuilo 2020-11-03 17:13:21 +09:00
parent 055e9f21b7
commit 40b27e8ad8

View File

@ -11,14 +11,11 @@
<transition name="nav"> <transition name="nav">
<nav class="nav" :class="{ iconOnly, hidden }" v-show="showing"> <nav class="nav" :class="{ iconOnly, hidden }" v-show="showing">
<div> <div>
<button class="item _button account" @click="openAccountMenu" v-if="$store.getters.isSignedIn"> <button class="item _button account" @click="openAccountMenu">
<MkAvatar :user="$store.state.i" class="avatar"/><MkAcct class="text" :user="$store.state.i"/> <MkAvatar :user="$store.state.i" class="avatar"/><MkAcct class="text" :user="$store.state.i"/>
</button> </button>
<button class="item _button index active" @click="top()" v-if="$route.name === 'index'">
<Fa :icon="faHome" fixed-width/><span class="text">{{ $store.getters.isSignedIn ? $t('timeline') : $t('home') }}</span>
</button>
<MkA class="item index" active-class="active" to="/" exact v-else> <MkA class="item index" active-class="active" to="/" exact v-else>
<Fa :icon="faHome" fixed-width/><span class="text">{{ $store.getters.isSignedIn ? $t('timeline') : $t('home') }}</span> <Fa :icon="faHome" fixed-width/><span class="text">{{ $t('timeline') }}</span>
</MkA> </MkA>
<template v-for="item in menu"> <template v-for="item in menu">
<div v-if="item === '-'" class="divider"></div> <div v-if="item === '-'" class="divider"></div>
@ -28,7 +25,7 @@
</component> </component>
</template> </template>
<div class="divider"></div> <div class="divider"></div>
<button class="item _button" :class="{ active: $route.path === '/instance' || $route.path.startsWith('/instance/') }" v-if="$store.getters.isSignedIn && ($store.state.i.isAdmin || $store.state.i.isModerator)" @click="oepnInstanceMenu"> <button class="item _button" :class="{ active: $route.path === '/instance' || $route.path.startsWith('/instance/') }" v-if="$store.state.i.isAdmin || $store.state.i.isModerator" @click="oepnInstanceMenu">
<Fa :icon="faServer" fixed-width/><span class="text">{{ $t('instance') }}</span> <Fa :icon="faServer" fixed-width/><span class="text">{{ $t('instance') }}</span>
</button> </button>
<button class="item _button" @click="more"> <button class="item _button" @click="more">
@ -74,7 +71,6 @@ export default defineComponent({
}, },
otherNavItemIndicated(): boolean { otherNavItemIndicated(): boolean {
if (!this.$store.getters.isSignedIn) return false;
for (const def in this.menuDef) { for (const def in this.menuDef) {
if (this.menu.includes(def)) continue; if (this.menu.includes(def)) continue;
if (this.menuDef[def].indicated) return true; if (this.menuDef[def].indicated) return true;
@ -120,10 +116,6 @@ export default defineComponent({
this.showing = true; this.showing = true;
}, },
top() {
window.scroll({ top: 0, behavior: 'smooth' });
},
search() { search() {
if (this.searching) return; if (this.searching) return;