diff options
Diffstat (limited to 'src/components/side_drawer')
| -rw-r--r-- | src/components/side_drawer/side_drawer.js | 3 | ||||
| -rw-r--r-- | src/components/side_drawer/side_drawer.vue | 46 |
2 files changed, 23 insertions, 26 deletions
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index 3a9e9e8f..e13c66db 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -49,6 +49,9 @@ const SideDrawer = { federating () { return this.$store.state.instance.federating }, + timelinesRoute () { + return this.currentUser ? 'friends' : 'public-timeline' + }, ...mapState({ pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable }), diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index 4fdb3d13..4a4e7610 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -40,12 +40,17 @@ </router-link> </li> <li - v-if="currentUser && pleromaChatMessagesAvailable" + v-if="currentUser || !privateMode" @click="toggleDrawer" > - <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }"> - <i class="button-icon icon-mail-alt" /> {{ $t("nav.dms") }} + <router-link :to="{ name: timelinesRoute }"> + <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }} </router-link> + </li> + <li + v-if="currentUser && pleromaChatMessagesAvailable" + @click="toggleDrawer" + > <router-link :to="{ name: 'chats', params: { username: currentUser.screen_name } }" style="position: relative" @@ -59,34 +64,15 @@ </span> </router-link> </li> - <li - v-if="currentUser" - @click="toggleDrawer" - > + </ul> + <ul v-if="currentUser"> + <li @click="toggleDrawer"> <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }"> <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }} </router-link> </li> - </ul> - <ul> <li - v-if="currentUser" - @click="toggleDrawer" - > - <router-link :to="{ name: 'friends' }"> - <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }} - </router-link> - </li> - <li - v-if="currentUser" - @click="toggleDrawer" - > - <router-link :to="{ name: 'bookmarks'}"> - <i class="button-icon icon-bookmark" /> {{ $t("nav.bookmarks") }} - </router-link> - </li> - <li - v-if="currentUser && currentUser.locked" + v-if="currentUser.locked" @click="toggleDrawer" > <router-link to="/friend-requests"> @@ -100,6 +86,13 @@ </router-link> </li> <li +<<<<<<< HEAD + v-if="chat" + @click="toggleDrawer" + > + <router-link :to="{ name: 'chat' }"> + <i class="button-icon icon-chat" /> {{ $t("nav.chat") }} +======= v-if="currentUser || !privateMode" @click="toggleDrawer" > @@ -113,6 +106,7 @@ > <router-link to="/main/all"> <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }} +>>>>>>> develop </router-link> </li> </ul> |