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

8
src/components/nav_panel/nav_panel.js
View file

@ -1,5 +1,5 @@
import { mapState } from 'vuex'
import { timelineNames } from '../timeline_menu/timeline_menu.js'
import { mapState, mapGetters } from 'vuex'
const NavPanel = {
created () {
@ -18,8 +18,10 @@ const NavPanel = {
currentUser: state => state.users.currentUser,
followRequestCount: state => state.api.followRequests.length,
privateMode: state => state.instance.private,
federating: state => state.instance.federating
})
federating: state => state.instance.federating,
pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
}),
...mapGetters(['unreadChatCount'])
}
}