diff --git a/package.json b/package.json index 5aa6474e..684ac813 100644 --- a/package.json +++ b/package.json @@ -14,19 +14,21 @@ "test:e2e": "vue-cli-service test:e2e" }, "dependencies": { - "@coreui/coreui": "^2.0.20", + "@coreui/coreui": "^2.1.6", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.3.0", - "@coreui/vue": "github:coreui/coreui-vue#vue_cli3", + "@coreui/vue": "github:coreui/coreui-vue#woothu", "bootstrap": "^4.1.3", "bootstrap-vue": "^2.0.0-rc.11", "chart.js": "^2.7.3", "core-js": "^2.5.7", "css-vars-ponyfill": "^1.11.1", + "element-resize-detector": "^1.2.0", "flag-icon-css": "^3.2.0", "font-awesome": "^4.7.0", "perfect-scrollbar": "^1.4.0", "simple-line-icons": "^2.4.1", + "tooltip.js": "^1.3.1", "vue": "^2.5.17", "vue-chartjs": "^3.4.0", "vue-perfect-scrollbar": "^0.1.0", diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue index 4eac3b06..b01d8f80 100644 --- a/src/containers/DefaultContainer.vue +++ b/src/containers/DefaultContainer.vue @@ -32,7 +32,7 @@ - + @@ -88,6 +88,11 @@ export default { return { nav: nav.items } + }, + computed: { + computedNav () { + return this.nav.filter((item) => item.name !== 'Dashboard') + } } } diff --git a/src/containers/DefaultHeaderDropdownAccnt.vue b/src/containers/DefaultHeaderDropdownAccnt.vue index a56b3d17..32bbd12e 100644 --- a/src/containers/DefaultHeaderDropdownAccnt.vue +++ b/src/containers/DefaultHeaderDropdownAccnt.vue @@ -1,48 +1,58 @@ diff --git a/src/views/base/Breadcrumbs.vue b/src/views/base/Breadcrumbs.vue index aea7acea..f4df774e 100644 --- a/src/views/base/Breadcrumbs.vue +++ b/src/views/base/Breadcrumbs.vue @@ -17,7 +17,7 @@ - + diff --git a/src/views/base/CLink.js b/src/views/base/CLink.js deleted file mode 100644 index 90fdf3db..00000000 --- a/src/views/base/CLink.js +++ /dev/null @@ -1,170 +0,0 @@ -import { mergeData } from 'vue-functional-data-merge' - -/** - * The Link component is used in many other BV components. - * As such, sharing its props makes supporting all its features easier. - * However, some components need to modify the defaults for their own purpose. - * Prefer sharing a fresh copy of the props to ensure mutations - * do not affect other component references to the props. - * - * https://github.com/vuejs/vue-router/blob/dev/src/components/link.js - * @return {{}} - */ -export function propsFactory () { - return { - href: { - type: String, - default: null - }, - rel: { - type: String, - default: null - }, - target: { - type: String, - default: '_self' - }, - active: { - type: Boolean, - default: false - }, - activeClass: { - type: String, - default: 'active' - }, - append: { - type: Boolean, - default: false - }, - disabled: { - type: Boolean, - default: false - }, - event: { - type: [String, Array], - default: 'click' - }, - exact: { - type: Boolean, - default: false - }, - exactActiveClass: { - type: String, - default: 'active' - }, - replace: { - type: Boolean, - default: false - }, - routerTag: { - type: String, - default: 'a' - }, - to: { - type: [String, Object], - default: null - } - } -} - -export const props = propsFactory() - - -function computeTag (props, parent) { - return Boolean(parent.$router) && props.to && !props.disabled ? 'router-link' : 'a' -} - -/*eslint no-unused-vars: ["error", {"args": "none"}]*/ -function computeHref ({ disabled, href, to }, tag) { - // We've already checked the parent.$router in computeTag, - // so router-link means live router. - // When deferring to Vue Router's router-link, - // don't use the href attr at all. - // Must return undefined for router-link to populate href. - if (tag === 'router-link') return void 0 - // If href explicitly provided - if (href) return href - // Reconstruct href when `to` used, but no router - if (to) { - // Fallback to `to` prop (if `to` is a string) - if (typeof to === 'string') return to - // Fallback to `to.path` prop (if `to` is an object) - if (typeof to === 'object' && typeof to.path === 'string') return to.path - } - // If nothing is provided use '#' - return '#' -} - -function computeRel ({ target, rel }) { - if (target === '_blank' && rel === null) { - return 'noopener' - } - return rel || null -} - -function clickHandlerFactory ({ disabled, tag, href, suppliedHandler, parent }) { - const isRouterLink = tag === 'router-link' - - return function onClick (e) { - if (disabled && e instanceof Event) { - // Stop event from bubbling up. - e.stopPropagation() - // Kill the event loop attached to this specific EventTarget. - e.stopImmediatePropagation() - } else { - parent.$root.$emit('clicked::link', e) - - if (isRouterLink && e.target.__vue__) { - e.target.__vue__.$emit('click', e) - } - if (typeof suppliedHandler === 'function') { - suppliedHandler(...arguments) - } - } - - if ((!isRouterLink && href === '#') || disabled) { - // Stop scroll-to-top behavior or navigation. - e.preventDefault() - } - } -} - -export default { - functional: true, - name: 'CLink', - props: propsFactory(), - render (h, { props, data, parent, children }) { - const tag = computeTag(props, parent) - const rel = computeRel(props) - const href = computeHref(props, tag) - const eventType = tag === 'router-link' ? 'nativeOn' : 'on' - const suppliedHandler = (data[eventType] || {}).click - const handlers = { click: clickHandlerFactory({ tag, href, disabled: props.disabled, suppliedHandler, parent }) } - - const componentData = mergeData(data, { - class: [ - props.active ? (props.exact ? props.exactActiveClass : props.activeClass) : null, - { disabled: props.disabled } - ], - attrs: { - rel, - href, - target: props.target, - tabindex: props.disabled ? '-1' : (data.attrs ? data.attrs.tabindex : null), - 'aria-disabled': (tag === 'a' && props.disabled) ? 'true' : null - }, - props: Object.assign(props, { tag: props.routerTag }) - }) - - // If href prop exists on router-link (even undefined or null) it fails working on SSR - if (!componentData.attrs.href) { - delete componentData.attrs.href - } - - // We want to overwrite any click handler since our callback - // will invoke the supplied handler if !props.disabled - componentData[eventType] = Object.assign(componentData[eventType] || {}, handlers) - - return h(tag, componentData, children) - } -} diff --git a/src/views/base/CNavItemDropdown.vue b/src/views/base/CNavItemDropdown.vue deleted file mode 100644 index 388064be..00000000 --- a/src/views/base/CNavItemDropdown.vue +++ /dev/null @@ -1,90 +0,0 @@ - - diff --git a/src/views/base/CSwitch.vue b/src/views/base/CSwitch.vue deleted file mode 100644 index 357378dd..00000000 --- a/src/views/base/CSwitch.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - diff --git a/src/views/base/Cards.vue b/src/views/base/Cards.vue index 27af0f39..4c9f5d31 100644 --- a/src/views/base/Cards.vue +++ b/src/views/base/Cards.vue @@ -1,21 +1,94 @@ - diff --git a/src/views/base/ListGroups.vue b/src/views/base/ListGroups.vue index e8a037f5..b9bd5d03 100644 --- a/src/views/base/ListGroups.vue +++ b/src/views/base/ListGroups.vue @@ -1,6 +1,18 @@ - + --> @@ -165,12 +165,12 @@ diff --git a/src/views/base/Navs.vue b/src/views/base/Navs.vue index 3d902c9f..37270549 100644 --- a/src/views/base/Navs.vue +++ b/src/views/base/Navs.vue @@ -13,12 +13,12 @@
- - Active - Link - Another Link - Disabled - + + Active + Link + Another Link + Disabled +
Bootstrap Navs tab style
- - Active - Link - Another Link - Disabled - + + + + Active +
hehe
+ + + Link + + + + Another Link +
hehe3
+ + Disabled + + +
+ + -
+
Bootstrap Navs pill style
-
- - Active - Link - Another Link - Disabled - +
+ + Active + Link + Another Link + Disabled +
Bootstrap Navs fill tabs
- - Active - Link - Link with a long name - Disabled - + + Active + Link + Link with a long name + Disabled +
Bootstrap Navs justified tabs
- - Active - Link - Link with a long name - Disabled - + + Active + Link + Link with a long name + Disabled +
Bootstrap Navs dropdown support
- - Active - Link - - one - two - - three - - + + Active + Link + + Dropdown + one + two + + three + +
Bootstrap Navs vertical variation
- - Active - Link - Another Link - Disabled - + + Active + Link + Another Link + Disabled +
@@ -120,8 +141,24 @@ - diff --git a/src/views/base/Paginations.vue b/src/views/base/Paginations.vue index fadafd93..12308c02 100644 --- a/src/views/base/Paginations.vue +++ b/src/views/base/Paginations.vue @@ -13,6 +13,19 @@
+
CPagination
+ +
+
Default
@@ -82,18 +95,27 @@ - diff --git a/src/views/base/Switches.vue b/src/views/base/Switches.vue index 7f273a33..9aca6c68 100644 --- a/src/views/base/Switches.vue +++ b/src/views/base/Switches.vue @@ -7,7 +7,7 @@ --> - +
Radio switches @@ -15,7 +15,7 @@ NEW
- + @@ -47,6 +47,14 @@ trueValue="yes" falseValue="no" /> +
- + + + + + + + + + + {{item.status}} + + + + + + {{index + 1}} - {{item}} + + + + + + + + + + + + + {{item.status}} + + + + + + + + - + - + - + - + - + + +
diff --git a/src/views/base/Tooltips.vue b/src/views/base/Tooltips.vue index cf3ff84d..8c13d3e8 100644 --- a/src/views/base/Tooltips.vue +++ b/src/views/base/Tooltips.vue @@ -89,7 +89,8 @@ + footer-tag="footer" + id="boundary">
Tooltips enable disable events
@@ -111,18 +112,57 @@
+ + test +

+ button +


+ + + + + - diff --git a/src/views/buttons/ButtonGroups.vue b/src/views/buttons/ButtonGroups.vue index ffff12cb..fe7cf15c 100644 --- a/src/views/buttons/ButtonGroups.vue +++ b/src/views/buttons/ButtonGroups.vue @@ -15,13 +15,69 @@
- - One - Two - Three - Four - Five - + sdjk + sdjk + + sdjk + sdjk + + sdjk + + sdjk +

+ sdjk + sdjk + sdjk + + sdjk + +

+ + + + + Active + Link + + one + two + + three + + + + Active + Link + + + + + + One + Two + Three + Four + Five + + + One + Two + Three + Four + Five + +

Success @@ -34,6 +90,43 @@
+ + admin@bootstrapmaster.com + + Account + Updates + {{ itemsCount }} + + Messages + {{ itemsCount }} + + Tasks + {{ itemsCount }} + + Comments + {{ itemsCount }} + + + Settings + + Profile + Settings + Payments + {{ itemsCount }} + + Projects + {{ itemsCount }} + + + Lock Account + Logout + diff --git a/src/views/notifications/Alerts.vue b/src/views/notifications/Alerts.vue index 0fb82b9f..37d53035 100644 --- a/src/views/notifications/Alerts.vue +++ b/src/views/notifications/Alerts.vue @@ -115,7 +115,8 @@ dismissible fade :show="showDismissibleAlert" - @dismissed="showDismissibleAlert=false"> + @dismissed="showDismissibleAlert=false" + > Dismissible Alert! diff --git a/src/views/notifications/Modals.vue b/src/views/notifications/Modals.vue index 1a910aa6..7a338188 100644 --- a/src/views/notifications/Modals.vue +++ b/src/views/notifications/Modals.vue @@ -13,6 +13,8 @@ Launch warning modal Launch danger modal Launch info modal + CModal + @@ -84,13 +86,53 @@ cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + + Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + +
+ n +
+
+ + +
+