Merge branch 'master' into add_sidebar

src/App.vue

@@ -1,14 +1,17 @@
 <template lang="pug">
-  div(class="pages-container")
-    sidebar-component
-    router-view
+  div
+    header-component
+    div(class="pages-container")
+      sidebar-component
+      router-view
 </template>
 
 <script>
+  import HeaderComponent from './components/homePageComponents/HeaderComponent.vue';
   import SidebarComponent from "./components/homePageComponents/SidebarComponent";
   export default {
     name: 'App',
-    components: {SidebarComponent}
+    components: {HeaderComponent, SidebarComponent}
   }
 </script>
 
@@ -18,13 +21,17 @@
   flex-direction: column
   row-gap: 8px
   height: 100%
+  width: 100%
   font-family: Raleway, sans-serif
   font-style: normal
   font-feature-settings: 'pnum' on, 'lnum' on
   -webkit-font-smoothing: antialiased
   -moz-osx-font-smoothing: grayscale
-  background-color: #E9E9F6
+  background-color: var(--bg-lavender-color)
 .pages-container
   display: flex
   flex: auto
+body
+  margin: 0
+  padding: 0
 </style>