From 986809247a291af6937a98cfe44f42fc99ce2a48 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Tue, 2 Jun 2020 16:38:14 +0200
Subject: [PATCH] Add sidebar component to layouts

---
 client/src/App.vue                   | 4 +---
 client/src/layouts/BlankLayout.vue   | 7 ++++++-
 client/src/layouts/DefaultLayout.vue | 7 +++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/src/App.vue b/client/src/App.vue
index b6fe73f8..5c2867a8 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -10,7 +10,7 @@
       :is="showModal"
       v-if="showModal"/>
     <component :is="layout"/>
-    <mobile-navigation v-if="showMobileNavigation"/>
+
   </div>
 </template>
 
@@ -21,7 +21,6 @@
   import FullScreenLayout from '@/layouts/FullScreenLayout';
   import PublicLayout from '@/layouts/PublicLayout';
   import Modal from '@/components/Modal';
-  import MobileNavigation from '@/components/book-navigation/MobileNavigation';
   import NewContentBlockWizard from '@/components/content-block-form/NewContentBlockWizard';
   import EditContentBlockWizard from '@/components/content-block-form/EditContentBlockWizard';
   import NewRoomEntryWizard from '@/components/rooms/room-entries/NewRoomEntryWizard';
@@ -49,7 +48,6 @@
       FullScreenLayout,
       PublicLayout,
       Modal,
-      MobileNavigation,
       NewContentBlockWizard,
       EditContentBlockWizard,
       NewRoomEntryWizard,
diff --git a/client/src/layouts/BlankLayout.vue b/client/src/layouts/BlankLayout.vue
index a050d6f9..b819cf6a 100644
--- a/client/src/layouts/BlankLayout.vue
+++ b/client/src/layouts/BlankLayout.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="blank-layout">
     <profile-sidebar/>
+    <navigation-sidebar/>
     <router-view/>
   </div>
 </template>
@@ -16,8 +17,12 @@
 
 <script>
   import ProfileSidebar from '@/components/profile/ProfileSidebar';
+  import NavigationSidebar from '@/components/book-navigation/NavigationSidebar';
 
   export default {
-    components: {ProfileSidebar},
+    components: {
+      ProfileSidebar,
+      NavigationSidebar
+    },
   }
 </script>
diff --git a/client/src/layouts/DefaultLayout.vue b/client/src/layouts/DefaultLayout.vue
index 2400094a..fc3a7e9f 100644
--- a/client/src/layouts/DefaultLayout.vue
+++ b/client/src/layouts/DefaultLayout.vue
@@ -2,13 +2,10 @@
   <div
     :class="specialContainerClass"
     class="container skillbox layout">
+    <navigation-sidebar/>
     <profile-sidebar/>
     <header-bar class="header layout__header"/>
 
-    <mobile-header
-      class="header layout__header layout__header--mobile"
-    />
-
     <router-view class="layout__content"/>
     <default-footer class="layout__footer"/>
   </div>
@@ -19,12 +16,14 @@
   import MobileHeader from '@/components/MobileHeader';
   import ProfileSidebar from '@/components/profile/ProfileSidebar';
   import DefaultFooter from '@/layouts/DefaultFooter';
+  import NavigationSidebar from '@/components/book-navigation/NavigationSidebar';
 
   export default {
     components: {
       HeaderBar,
       MobileHeader,
       ProfileSidebar,
+      NavigationSidebar,
       DefaultFooter
     },