refactor: cleanup

Author: xidedix

src/components/Breadcrumb/Breadcrumb.vue

@@ -16,18 +16,18 @@ export default {
       default: () => []
     }
   },
+  computed: {
+    routeRecords: function () {
+      return this.list.filter((route) => route.name || route.meta.label)
+    }
+  },
   methods: {
     getName (item) {
       return item.meta && item.meta.label ? item.meta.label : item.name || null
     },
     isLast (index) {
       return index === this.list.length - 1
     }
-  },
-  computed: {
-    routeRecords: function () {
-      return this.list.filter((route) => route.name || route.meta.label)
-    }
   }
 }
 </script>

src/components/Footer/Footer.vue

@@ -13,16 +13,16 @@ export default {
       default: false
     }
   },
-  mounted: function () {
-    this.isFixed()
-  },
   computed: {
     classList () {
       return [
         'app-footer'
       ]
     }
   },
+  mounted: function () {
+    this.isFixed()
+  },
   methods: {
     isFixed () {
       this.fixed ? document.body.classList.add('footer-fixed') : document.body.classList.remove('footer-fixed')

src/components/Sidebar/SidebarNav.vue

@@ -57,13 +57,6 @@ import VuePerfectScrollbar from 'vue-perfect-scrollbar'
 
 export default {
   name: 'SidebarNav',
-  props: {
-    navItems: {
-      type: Array,
-      required: true,
-      default: () => []
-    }
-  },
   components: {
     SidebarNavDivider,
     SidebarNavDropdown,
@@ -73,6 +66,13 @@ export default {
     SidebarNavLabel,
     VuePerfectScrollbar
   },
+  props: {
+    navItems: {
+      type: Array,
+      required: true,
+      default: () => []
+    }
+  },
   data () {
     return {}
   },

src/components/Sidebar/SidebarNavDivider.vue

@@ -7,7 +7,7 @@ export default {
   name: 'sidebar-nav-divider',
   props: {
     classes: {
-      type: String,
+      type: [String, Array, Object],
       default: ''
     }
   },
@@ -19,7 +19,8 @@ export default {
       ]
     },
     itemClasses () {
-      return this.classes ? this.classes.split(' ') : ''
+      const classes = this.classes
+      return !classes ? [] : typeof classes === 'string' || classes instanceof String ? classes.split(' ') : Array.isArray(classes) ? classes : Object.keys(classes).filter(i=>classes[i])
     }
   }
 }

src/components/Switch/Switch.vue

@@ -7,11 +7,11 @@
       :required="required"
       :name="name"
       :value="value"
-      @change="handleChange"
       class="switch-input form-check-input"
       type="checkbox"
       true-value="value"
       false-value="uncheckedValue"
+      @change="handleChange"
     >
     <template v-if="label">
       <span
@@ -32,11 +32,6 @@ export default {
     prop: 'modelChecked',
     event: 'change'
   },
-  data: function () {
-    return {
-      checkedData: this.isChecked ? this.value : this.uncheckedValue
-    }
-  },
   props: {
     id: {
       type: String,
@@ -108,6 +103,11 @@ export default {
       default: 'Off'
     }
   },
+  data: function () {
+    return {
+      checkedData: this.isChecked ? this.value : this.uncheckedValue
+    }
+  },
   computed: {
     classList () {
       return [
@@ -126,6 +126,9 @@ export default {
       return this.modelChecked === this.value
     }
   },
+  mounted() {
+    this.toggle(this.defaultChecked || this.checked || this.isChecked);
+  },
   methods: {
     handleChange (event) {
       this.toggle(event.target.checked);
@@ -135,8 +138,5 @@ export default {
       this.$emit('change', this.checkedData);
     }
   },
-  mounted() {
-    this.toggle(this.defaultChecked || this.checked || this.isChecked);
-  },
 }
 </script>

src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap

@@ -12,6 +12,7 @@ exports[`SidebarNavLabel.vue renders correctly 1`] = `
       class="fa fa-circle text-info "
     />
      
+  
   </a>
 </li>
 `;