From 6433e8ac1e6f48380ea1bce2ab17a39e90d30616 Mon Sep 17 00:00:00 2001 From: woothu <32914662+woothu@users.noreply.github.com> Date: Wed, 6 Feb 2019 17:44:58 +0100 Subject: [PATCH 1/8] chore: Enable linking to coreui-vue in develop. --- package.json | 2 +- src/main.js | 9 +++++++-- vue.config.js | 8 +++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 684ac813..f633a989 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "@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#woothu", "bootstrap": "^4.1.3", "bootstrap-vue": "^2.0.0-rc.11", + "@coreui/vue": "../coreui-vue", "chart.js": "^2.7.3", "core-js": "^2.5.7", "css-vars-ponyfill": "^1.11.1", diff --git a/src/main.js b/src/main.js index 04eeec82..4f70c29c 100644 --- a/src/main.js +++ b/src/main.js @@ -9,14 +9,19 @@ import Vue from 'vue' import BootstrapVue from 'bootstrap-vue' import App from './App' import router from './router' -import CoreuiVue from '@coreui/vue' + + + +//only for development with link +import CoreuiVueLink from '@coreui/vue/src' +// import CoreuiVue from '@coreui/vue' Vue.config.performance = true // todo // cssVars() Vue.use(BootstrapVue) -Vue.use(CoreuiVue) +Vue.use(CoreuiVueLink) /* eslint-disable no-new */ diff --git a/vue.config.js b/vue.config.js index 1eaa50ca..b86b15e8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,4 +1,10 @@ module.exports = { lintOnSave: false, - runtimeCompiler: true + runtimeCompiler: true, + configureWebpack: { + //Necessary to run npm link https://webpack.js.org/configuration/resolve/#resolve-symlinks + resolve: { + symlinks: false + } + } } From 2057ba6b5c01012b687c02e729b35f4a721304ad Mon Sep 17 00:00:00 2001 From: woothu <32914662+woothu@users.noreply.github.com> Date: Mon, 18 Feb 2019 17:27:13 +0100 Subject: [PATCH 2/8] feat: Bootstrap Vue components changed to Coreui-Vue components --- package.json | 6 +- src/containers/DefaultAside.vue | 78 +- src/containers/DefaultContainer.vue | 76 +- src/containers/DefaultHeaderDropdownAccnt.vue | 78 +- src/views/Charts.vue | 58 +- src/views/Dashboard.vue | 465 +- src/views/Widgets.vue | 556 ++- src/views/base/Breadcrumbs.vue | 38 +- src/views/base/Cards.vue | 397 +- src/views/base/Carousels.vue | 22 +- src/views/base/Collapses.vue | 225 +- src/views/base/Forms.vue | 1741 ++++---- src/views/base/Jumbotrons.vue | 69 +- src/views/base/ListGroups.vue | 206 +- src/views/base/Navbars.vue | 283 +- src/views/base/Navs.vue | 241 +- src/views/base/Paginations.vue | 89 +- src/views/base/Popovers.vue | 215 +- src/views/base/ProgressBars.vue | 184 +- src/views/base/Switches.vue | 778 ++-- src/views/base/Table.vue | 121 +- src/views/base/Tables.vue | 175 +- src/views/base/Tabs.vue | 177 +- src/views/base/Tooltips.vue | 226 +- src/views/buttons/BrandButtons.vue | 496 +-- src/views/buttons/ButtonGroups.vue | 404 +- src/views/buttons/Dropdowns.vue | 402 +- src/views/buttons/StandardButtons.vue | 1264 +++--- src/views/charts/BarExample.vue | 2 +- src/views/icons/CoreUIIcons.vue | 418 +- src/views/icons/Flags.vue | 1016 ++--- src/views/icons/FontAwesome.vue | 3768 ++++++++--------- src/views/icons/SimpleLineIcons.vue | 748 ++-- src/views/notifications/Alerts.vue | 90 +- src/views/notifications/Badges.vue | 110 +- src/views/notifications/CAlert.js | 120 - src/views/notifications/CButtonClose.js | 17 - src/views/notifications/Modals.vue | 135 +- src/views/pages/Login.vue | 81 +- src/views/pages/Page404.vue | 28 +- src/views/pages/Page500.vue | 28 +- src/views/pages/Register.vue | 101 +- src/views/theme/ColorTheme.vue | 7 +- src/views/theme/Colors.vue | 105 +- src/views/users/User.vue | 49 +- src/views/users/Users.vue | 81 +- src/views/users/UsersData.js | 2 +- 47 files changed, 7670 insertions(+), 8306 deletions(-) delete mode 100644 src/views/notifications/CAlert.js delete mode 100644 src/views/notifications/CButtonClose.js diff --git a/package.json b/package.json index f633a989..4b2b3338 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ "@coreui/coreui": "^2.1.6", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.3.0", + "@coreui/vue": "../coreui-vue", "bootstrap": "^4.1.3", "bootstrap-vue": "^2.0.0-rc.11", - "@coreui/vue": "../coreui-vue", "chart.js": "^2.7.3", "core-js": "^2.5.7", "css-vars-ponyfill": "^1.11.1", @@ -29,7 +29,7 @@ "perfect-scrollbar": "^1.4.0", "simple-line-icons": "^2.4.1", "tooltip.js": "^1.3.1", - "vue": "^2.5.17", + "vue": "^2.6.6", "vue-chartjs": "^3.4.0", "vue-perfect-scrollbar": "^0.1.0", "vue-router": "^3.0.1" @@ -47,7 +47,7 @@ "https-proxy-agent": "^2.2.1", "node-sass": "^4.9.4", "sass-loader": "^7.1.0", - "vue-template-compiler": "^2.5.17" + "vue-template-compiler": "^2.6.6" }, "browserslist": [ "> 1%", diff --git a/src/containers/DefaultAside.vue b/src/containers/DefaultAside.vue index b60ead63..6c93c8ba 100644 --- a/src/containers/DefaultAside.vue +++ b/src/containers/DefaultAside.vue @@ -1,14 +1,14 @@ diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue index b01d8f80..c65a18eb 100644 --- a/src/containers/DefaultContainer.vue +++ b/src/containers/DefaultContainer.vue @@ -1,53 +1,53 @@ diff --git a/src/views/base/Breadcrumbs.vue b/src/views/base/Breadcrumbs.vue index f4df774e..964c8a87 100644 --- a/src/views/base/Breadcrumbs.vue +++ b/src/views/base/Breadcrumbs.vue @@ -1,42 +1,34 @@ diff --git a/src/views/base/Navs.vue b/src/views/base/Navs.vue index 37270549..db6715a7 100644 --- a/src/views/base/Navs.vue +++ b/src/views/base/Navs.vue @@ -1,164 +1,153 @@ diff --git a/src/views/base/Paginations.vue b/src/views/base/Paginations.vue index 12308c02..c72eefa3 100644 --- a/src/views/base/Paginations.vue +++ b/src/views/base/Paginations.vue @@ -1,121 +1,70 @@ diff --git a/src/views/base/Popovers.vue b/src/views/base/Popovers.vue index 17db010e..9ed1ef58 100644 --- a/src/views/base/Popovers.vue +++ b/src/views/base/Popovers.vue @@ -1,178 +1,178 @@ @@ -183,12 +183,13 @@ export default { data () { return { placements: [ - 'topright', 'top', 'topleft', - 'bottomright', 'bottom', 'bottomleft', - 'righttop', 'right', 'lefttop', - 'rightbottom', 'left', 'leftbottom' + 'top-start', 'top', 'top-end', + 'bottom-start', 'bottom', 'bottom-end', + 'right-start', 'right', 'right-end', + 'left-start', 'left', 'left-end' ], - show: false + show: false, + counter: 0 } }, methods: { diff --git a/src/views/base/ProgressBars.vue b/src/views/base/ProgressBars.vue index f5ad395c..72330647 100644 --- a/src/views/base/ProgressBars.vue +++ b/src/views/base/ProgressBars.vue @@ -1,155 +1,139 @@ diff --git a/src/views/base/Switches.vue b/src/views/base/Switches.vue index 9aca6c68..a16d6aa4 100644 --- a/src/views/base/Switches.vue +++ b/src/views/base/Switches.vue @@ -5,16 +5,16 @@

myFlag2: {{myFlag2}}

--> - - - -
+ + + +
Radio switches - {{radio}} - NEW + {{radio}} + NEW
-
+ - - - - - - -
+ + + + + + + Switch default - {{checker}} -
+ {{checker}} + - - - - -
+ + + + + Switch pills -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + 3d Switch -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + 3d Switch disabled -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + 3d Switch outline="alt" -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + 3d Switch label -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + 3d Switch outline="alt" -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + 3d Switch outline="alt" -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch outline -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch outline shape="pill" -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch outline="alt" -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch outline="alt" shape="pill" -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label shape="pill" -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - - - + + + + + + + + + + + + - - -
+ + + Switch label -
- - - - - - - - - - shape - - - -
+ + + + + + + + + + + shape + + + + Switch label shape="pill" -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + Switch label outline -
- - - - - - - - - - - + + + + + + + + + + + + - - -
+ + + Sizes -
- - -