diff --git a/src/_nav.js b/src/_nav.js index 97de52c1..699c522d 100644 --- a/src/_nav.js +++ b/src/_nav.js @@ -32,7 +32,7 @@ export default [ { _name: "CNavGroup", name: "Base", - route: "/base", + to: "/base", icon: "cil-puzzle", children: [ { @@ -122,7 +122,7 @@ export default [ { _name: "CNavGroup", name: "Buttons", - route: "/buttons", + to: "/buttons", icon: "cil-cursor", children: [ { @@ -130,27 +130,22 @@ export default [ name: "Buttons", to: "/buttons/standard-buttons", }, - { - _name: "CNavItem", - name: "Button Dropdowns", - to: "/buttons/dropdowns", - }, { _name: "CNavItem", name: "Button Groups", to: "/buttons/button-groups", }, - // { - // _name: 'CNavItem', - // name: 'Brand Buttons', - // to: '/buttons/brand-buttons' - // } + { + _name: "CNavItem", + name: "Dropdowns", + to: "/buttons/dropdowns", + }, ], }, { _name: "CNavGroup", name: "Forms", - route: "/forms", + to: "/forms", icon: "cil-star", children: [ { @@ -204,7 +199,7 @@ export default [ { _name: "CNavGroup", name: "Icons", - route: "/icons", + to: "/icons", icon: "cil-star", children: [ { @@ -231,7 +226,7 @@ export default [ { _name: "CNavGroup", name: "Notifications", - route: "/notifications", + to: "/notifications", icon: "cil-bell", children: [ { @@ -273,7 +268,7 @@ export default [ // { // _name: 'CNavGroup', // name: 'Pages', - // route: '/pages', + // to: '/pages', // icon: 'cil-star', // children: [ // { diff --git a/src/assets/icons/icons.js b/src/assets/icons/icons.js index aec51e79..05b846c5 100644 --- a/src/assets/icons/icons.js +++ b/src/assets/icons/icons.js @@ -18,9 +18,9 @@ import { cibVimeo, cibCcMastercard, cibCcVisa, - cibStripe, - cibPaypal, - cibGooglePay, + cibCcStripe, + cibCcPaypal, + cibCcApplePay, cibCcAmex } from "@coreui/icons"; import { cifUs, cifBr, cifIn, cifFr, cifEs, cifPl } from "@coreui/icons"; @@ -161,9 +161,9 @@ export const iconsSet = Object.assign( cibVimeo, cibCcMastercard, cibCcVisa, - cibStripe, - cibPaypal, - cibGooglePay, + cibCcStripe, + cibCcPaypal, + cibCcApplePay, cibCcAmex } ); diff --git a/src/components/AppHeaderDropdownAccnt.vue b/src/components/AppHeaderDropdownAccnt.vue index 3e48f315..8be6ac06 100644 --- a/src/components/AppHeaderDropdownAccnt.vue +++ b/src/components/AppHeaderDropdownAccnt.vue @@ -24,7 +24,7 @@ {{ itemsCount }} - Settings + Settings Profile Settings diff --git a/src/components/DocsCallout.vue b/src/components/DocsCallout.vue index 28582a9e..3701a127 100644 --- a/src/components/DocsCallout.vue +++ b/src/components/DocsCallout.vue @@ -29,6 +29,7 @@ export default { default: undefined, required: false, }, + plural: Boolean }, setup(props) { const href = `https://coreui.io/vue/docs/${packageJson.config.coreui_library_short_version}/${props.href}` diff --git a/src/main.js b/src/main.js index 8b094ded..aa95816d 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,8 @@ import store from "./store"; import CoreuiVue from "@coreui/vue"; import { CIcon } from "@coreui/icons-vue"; import { iconsSet as icons } from "@/assets/icons/icons.js"; -import Example from "@/components/Example"; +import DocsCallout from "@/components/DocsCallout"; +import DocsExample from "@/components/DocsExample"; const app = createApp(App); @@ -15,6 +16,7 @@ app.use(router); app.use(CoreuiVue); app.provide('icons', icons); app.component("CIcon", CIcon); -app.component("Example", Example); +app.component("DocsCallout", DocsCallout); +app.component("DocsExample", DocsExample); app.mount("#app"); diff --git a/src/router/index.js b/src/router/index.js index c9d1fdec..fe60a65d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,17 +4,15 @@ import { createRouter, createWebHistory } from "vue-router"; import DefaultLayout from "@/layouts/DefaultLayout"; -// Views - Components -// const Breadcrumbs = () => import("@/views/base/Breadcrumbs"); - const routes = [ { path: "/", name: "Home", component: DefaultLayout, + redirect: "/dashboard", children: [ { - path: "dashboard", + path: "/dashboard", name: "Dashboard", // route level code-splitting // this generates a separate chunk (about.[hash].js) for this route @@ -78,11 +76,6 @@ const routes = [ name: "Collapses", component: () => import("@/views/base/Collapses.vue"), }, - { - path: "/base/forms", - name: "Forms", - component: () => import("@/views/base/Forms.vue"), - }, /* { path: "/base/jumbotrons", @@ -130,11 +123,6 @@ const routes = [ name: "Tables", component: () => import("@/views/base/Tables.vue"), }, - { - path: "/base/tabs", - name: "Tabs", - component: () => import("@/views/base/Tabs.vue"), - }, { path: "/base/tooltips", name: "Tooltips", diff --git a/src/views/base/Accordion.vue b/src/views/base/Accordion.vue index 6d6d629f..6243fa51 100644 --- a/src/views/base/Accordion.vue +++ b/src/views/base/Accordion.vue @@ -1,7 +1,7 @@