therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Shpuld Shpuldson 2020-07-14 11:44:06 +03:00
commit cac1418aff
79 changed files with 3206 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/side_drawer/side_drawer.js
View file

@ -1,3 +1,4 @@
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'
@ -50,7 +51,11 @@ const SideDrawer = {
},
timelinesRoute () {
return this.currentUser ? 'friends' : 'public-timeline'
}
},
...mapState({
pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
}),
...mapGetters(['unreadChatCount'])
},
methods: {
toggleDrawer () {