solve conflicts

resources/assets/js/components/menu/CustomSidebar.vue

@@ -54,29 +54,27 @@ export default {
             });
     },
     methods: {
+        /**
+         * Toggle Handler, fired on click
+         */
         onToggleClick() {
-      this.$refs.sidebar.$emit("toggle-collapse", this.collapsed);
             this.collapsed = !this.collapsed;
+            this.$refs.sidebar.$emit("toggle-collapse", this.collapsed);
+            this.$emit("onToggleCollapse", this.collapsed);
         },
-    createCounter() {
+        /**
-      let els = document.querySelectorAll("a[href='#/foo']");
+         * Toggle item Handler, fired when a menu item is clicked
-      this.inboxCounter = document.createElement("span");
+         * @param {object} event - click event params
-      this.inboxCounter.setAttribute(
+         * @param {object} item - menu item params
-        "class",
+         * @param {object} node - html node
-        "float-right badge badge-light navBadget"
+         */
-      );
-      this.inboxCounter.innerHTML += "5";
-      if (els && els[0]) {
-        els[0].appendChild(this.inboxCounter);
-      }
-    },
-    onToggleCollapse(collapsed) {
-      console.log(collapsed);
-      this.collapsed = collapsed;
-    },
         onItemClick(event, item, node) {
             this.$emit("OnClickSidebarItem", { item });
         },
+         /**
+         * On resize event handler id the windows is resized 
+         * collase and isMobile proerty will be updated
+         */
         onResize() {
             if (window.innerWidth <= 767) {
                 this.isOnMobile = true;

resources/assets/js/home/Home.vue

@@ -5,7 +5,10 @@
         <router-view />
       </div>
 
-      <CustomSidebar @OnClickSidebarItem="OnClickSidebarItem" />
+      <CustomSidebar
+              @OnClickSidebarItem="OnClickSidebarItem"
+              @onToggleCollapse="onToggleCollapse"
+      />
       <div
         v-if="isOnMobile && !collapsed"
         class="sidebar-overlay"
@@ -15,16 +18,7 @@
       <component v-bind:is="page"></component>
     </div>
   </div>
-</template> onResize() {
+</template> 
-            if (window.innerWidth <= 767) {
-                this.isOnMobile = true;
-                this.collapsed = true;
-            } else {
-                this.isOnMobile = false;
-                this.collapsed = false;
-            }
-        },
-
 <script>
 import CustomSidebar from "./../components/menu/CustomSidebar";
 import MyCases from "./MyCases";
@@ -65,6 +59,14 @@ export default {
                 this.collapsed = false;
             }
         },
+        /**
+         * Toggle sidebar handler
+         * @param {Boolean} collapsed - if sidebar is collapsed true|false
+         *  
+         */
+        onToggleCollapse(collapsed) {
+            this.collapsed = collapsed;
+        }
     },
 };
 </script>
@@ -72,7 +74,7 @@ export default {
 <style lang="scss">
 #home {
   padding-left: 310px;
-  transition: 0.3s ease;
+  transition: 0.3s;
 }
 #home.collapsed {
   padding-left: 50px;