Bug/breadcrumps (epicmaxco#327)

tiant11 · Sep 14, 2018 · 74a6650 · 74a6650
1 parent f4ee0dc
commit 74a6650
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 150 deletions.
diff --git a/src/components/admin/app-breadcrumbs/AppBreadcrumbs.vue b/src/components/admin/app-breadcrumbs/AppBreadcrumbs.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="row">
     <div class="col-md-12">
-      <vuestic-breadcrumbs :breadcrumbs="breadcrumbs" :current-path="currentRoute"/>
+      <vuestic-widget class="no-padding no-v-padding">
+        <vuestic-breadcrumbs :breadcrumbs="breadcrumbs" :current-path="currentRoute"/>
+      </vuestic-widget>
     </div>
   </div>
 </template>

diff --git a/src/components/admin/app-breadcrumbs/Breadcrumbs.js b/src/components/admin/app-breadcrumbs/Breadcrumbs.js
@@ -1,62 +1,62 @@
 export default {
   root: {
-    path: '/',
+    name: '/',
     displayName: 'Home'
   },
   routes: [
     {
-      path: 'dashboard',
+      name: 'dashboard',
       displayName: 'menu.dashboard'
     },
     {
-      path: 'statistics',
+      name: 'statistics',
       displayName: 'menu.statistics',
       disabled: true,
       children: [
         {
-          path: 'charts',
+          name: 'charts',
           displayName: 'menu.charts',
         },
         {
-          path: 'progress-bars',
+          name: 'progress-bars',
           displayName: 'menu.progressBars'
         },
       ]
     },
     {
-      path: 'forms',
+      name: 'forms',
       displayName: 'menu.forms',
       disabled: true,
       children: [
         {
-          path: 'form-elements',
+          name: 'form-elements',
           displayName: 'menu.formElements'
         },
         {
-          path: 'form-wizards',
+          name: 'form-wizards',
           displayName: 'menu.formWizards'
         },
         {
-          path: 'medium-editor',
+          name: 'medium-editor',
           displayName: 'menu.mediumEditor'
         }
       ]
     },
     {
-      path: 'tables',
+      name: 'tables',
       displayName: 'menu.tables'
     },
     {
-      path: 'ui',
+      name: 'ui',
       displayName: 'menu.uiElements',
       disabled: true,
       children: [
         {
-          path: 'typography',
+          name: 'typography',
           displayName: 'menu.typography'
         },
         {
-          path: 'buttons',
+          name: 'buttons',
           displayName: 'menu.buttons'
         },
         {
@@ -68,81 +68,87 @@ export default {
           displayName: 'menu.colorPickers'
         },
         {
-          path: 'notifications',
+          name: 'notifications',
           displayName: 'menu.notifications'
         },
         {
-          path: 'icons',
-          displayName: 'menu.icons'
+          name: 'icon-sets',
+          displayName: 'menu.icons',
+          children: [
+            {
+              displayName: 'concrete',
+              name: 'icon-set',
+            },
+          ]
         },
         {
-          path: 'spinners',
+          name: 'spinners',
           displayName: 'menu.spinners',
         },
         {
-          path: 'grid',
+          name: 'grid',
           displayName: 'menu.grid',
         },
         {
-          path: 'modals',
+          name: 'modals',
           displayName: 'menu.modals'
         },
         {
-          path: 'file-upload',
+          name: 'file-upload',
           displayName: 'menu.fileUpload'
         },
         {
-          path: 'tags',
+          name: 'tags',
           displayName: 'menu.tags'
         },
         {
-          path: 'cards',
+          name: 'cards',
           displayName: 'menu.cards'
         },
         {
-          path: 'tree-view',
+          name: 'tree-view',
           displayName: 'menu.treeView'
         }
       ]
     },
     {
-      path: 'extra',
+      name: 'extra',
       displayName: 'menu.extra'
     },
     {
-      path: 'maps',
+      name: 'maps',
       displayName: 'menu.maps',
       disabled: true,
       children: [
         {
-          path: 'google-maps',
+          name: 'google-maps',
           displayName: 'Google Maps'
         },
         {
-          path: 'yandex-maps',
+          name: 'yandex-maps',
           displayName: 'Yandex Maps'
         },
         {
-          path: 'leaflet-maps',
+          name: 'leaflet-maps',
           displayName: 'Leaflet Maps',
         },
         {
-          path: 'bubble-maps',
+          name: 'bubble-maps',
           displayName: 'Bubble Maps',
         },
         {
-          path: 'line-maps',
+          name: 'line-maps',
           displayName: 'Line Maps'
         }
       ]
     },
     {
-      path: 'pages',
+      name: 'pages',
       displayName: 'menu.pages',
       disabled: true,
       children: [
         {
-          path: '404-pages',
+          name: '404-pages',
           displayName: '404 Pages'
         }
       ]

diff --git a/src/components/ui/collapse/Collapse.vue b/src/components/ui/collapse/Collapse.vue
@@ -134,13 +134,13 @@
 </template>
 
 <script>
-  import VuesticCollapse from '../../../vuestic-theme/vuestic-components/vuestic-collapse/VuesticCollapse'
-  import VuesticAccordion from '../../../vuestic-theme/vuestic-components/vuestic-collapse/VuesticAccordion'
+import VuesticCollapse from '../../../vuestic-theme/vuestic-components/vuestic-collapse/VuesticCollapse'
+import VuesticAccordion from '../../../vuestic-theme/vuestic-components/vuestic-collapse/VuesticAccordion'
 
-  export default {
-    name: 'cards',
-    components: { VuesticCollapse, VuesticAccordion }
-  }
+export default {
+  name: 'cards',
+  components: { VuesticCollapse, VuesticAccordion }
+}
 </script>
 
 <style lang="scss">

diff --git a/src/router/index.js b/src/router/index.js
@@ -85,6 +85,7 @@ export default new Router({
           default: true,
         },
         {
+          name: 'statistics',
           path: 'statistics',
           component: EmptyParentComponent,
           children: [
@@ -97,14 +98,11 @@ export default new Router({
               name: 'progress-bars',
               path: 'progress-bars',
               component: lazyLoading('statistics/progress-bars/ProgressBars'),
-            },
-            {
-              path: '',
-              redirect: { name: 'charts' },
-            },
+            }
           ],
         },
         {
+          name: 'forms',
           path: 'forms',
           component: EmptyParentComponent,
           children: [
@@ -116,17 +114,13 @@ export default new Router({
             {
               name: 'form-wizards',
               path: 'form-wizards',
-              component: lazyLoading('forms/form-wizard/FormWizard'),
+              component: lazyLoading('forms/form-wizard/FormWizard')
             },
             {
               name: 'medium-editor',
               path: 'medium-editor',
               component: lazyLoading('forms/medium-editor/MediumEditor'),
-            },
-            {
-              path: '',
-              redirect: { name: 'form-elements' },
-            },
+            }
           ],
         },
         {
@@ -135,6 +129,7 @@ export default new Router({
           component: lazyLoading('tables/Table'),
         },
         {
+          name: 'ui',
           path: 'ui',
           component: EmptyParentComponent,
           children: [
@@ -163,11 +158,12 @@ export default new Router({
               component: lazyLoading('ui/icons/Icons'),
               children: [
                 {
-                  name: 'icons',
+                  name: 'icon-sets',
                   path: '', // Default route
                   component: lazyLoading('ui/icons/SetsList'),
                 },
                 {
+                  name: 'icon-set',
                   path: ':name',
                   component: lazyLoading('ui/icons/Set'),
                   props: true,
@@ -213,11 +209,7 @@ export default new Router({
               name: 'collapse',
               path: 'collapse',
               component: lazyLoading('ui/collapse/Collapse')
-            },
-            {
-              path: '',
-              redirect: { name: 'typography' },
-            },
+            }
           ],
         },
         {
@@ -226,6 +218,7 @@ export default new Router({
           component: lazyLoading('extra/Extra'),
         },
         {
+          name: 'maps',
           path: 'maps',
           component: EmptyParentComponent,
           children: [
@@ -253,14 +246,11 @@ export default new Router({
               name: 'line-maps',
               path: 'line-maps',
               component: lazyLoading('maps/line-maps/LineMapsPage'),
-            },
-            {
-              path: '',
-              redirect: { name: 'google-maps' },
-            },
+            }
           ],
         },
         {
+          name: 'pages',
           path: 'pages',
           component: EmptyParentComponent,
           children: [