Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into add/edit-status

1 files changed, 15 insertions, 4 deletions

diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 37bcb409..abeff6bf 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -1,4 +1,5 @@
 import TimelineMenuContent from '../timeline_menu/timeline_menu_content.vue'
+import ListsMenuContent from '../lists_menu/lists_menu_content.vue'
 import { mapState, mapGetters } from 'vuex'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -12,7 +13,8 @@ import {
   faComments,
   faBell,
   faInfoCircle,
-  faStream
+  faStream,
+  faList
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -25,7 +27,8 @@ library.add(
   faComments,
   faBell,
   faInfoCircle,
-  faStream
+  faStream,
+  faList
 )
 
 const NavPanel = {
@@ -35,19 +38,27 @@ const NavPanel = {
     }
   },
   components: {
-    TimelineMenuContent
+    TimelineMenuContent,
+    ListsMenuContent
   },
   data () {
     return {
-      showTimelines: false
+      showTimelines: false,
+      showLists: false
     }
   },
   methods: {
     toggleTimelines () {
       this.showTimelines = !this.showTimelines
+    },
+    toggleLists () {
+      this.showLists = !this.showLists
     }
   },
   computed: {
+    listsNavigation () {
+      return this.$store.getters.mergedConfig.listsNavigation
+    },
     ...mapState({
       currentUser: state => state.users.currentUser,
       followRequestCount: state => state.api.followRequests.length,