aboutsummaryrefslogtreecommitdiff
path: root/src/components/side_drawer
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2022-08-23 22:10:21 +0300
committerHenry Jameson <me@hjkos.com>2022-08-23 22:10:21 +0300
commit666015c9fa2aaafbb602c449a1a2f7529f9bfb1b (patch)
tree11af0f5479cc893ebe70504e8901444051a669ce /src/components/side_drawer
parentcd7380efe74b791c042c2d7af307dadbc3acd99f (diff)
fix mobile side drawer causing issues
Diffstat (limited to 'src/components/side_drawer')
-rw-r--r--src/components/side_drawer/side_drawer.js11
-rw-r--r--src/components/side_drawer/side_drawer.vue2
2 files changed, 10 insertions, 3 deletions
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index cbfd6b7d..d5dabb72 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -2,6 +2,7 @@ import { mapState, mapGetters } from 'vuex'
import UserCard from '../user_card/user_card.vue'
import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
import GestureService from '../../services/gesture_service/gesture_service'
+import { USERNAME_ROUTES } from 'src/components/navigation/navigation.js'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
faSignInAlt,
@@ -82,10 +83,16 @@ const SideDrawer = {
return this.$store.state.instance.federating
},
timelinesRoute () {
+ let name
if (this.$store.state.interface.lastTimeline) {
- return this.$store.state.interface.lastTimeline
+ name = this.$store.state.interface.lastTimeline
+ }
+ name = this.currentUser ? 'friends' : 'public-timeline'
+ if (USERNAME_ROUTES.has(name)) {
+ return { name, params: { username: this.currentUser.screen_name }}
+ } else {
+ return { name }
}
- 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 5223fdfa..cbeafdd2 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -47,7 +47,7 @@
v-if="currentUser || !privateMode"
@click="toggleDrawer"
>
- <router-link :to="{ name: timelinesRoute }">
+ <router-link :to="timelinesRoute">
<FAIcon
fixed-width
class="fa-scale-110 fa-old-padding"