From 74b325afc52ea37a60c230bbaf5143dc7fe57da8 Mon Sep 17 00:00:00 2001 From: woothu <32914662+woothu@users.noreply.github.com> Date: Fri, 23 Nov 2018 15:26:30 +0100 Subject: [PATCH] refactor: refactoring template --- .eslintrc.js | 2 +- babel.config.js | 11 +- package.json | 18 +- src/containers/DefaultAside.vue | 10 +- src/containers/DefaultContainer.vue | 13 +- src/containers/DefaultHeaderDropdownAccnt.vue | 74 ++- src/main.js | 11 +- src/mixins/charts/chartMixins.js | 53 -- src/views/Charts.vue | 39 +- src/views/Dashboard.vue | 117 ++-- src/views/Widgets.vue | 350 ++++++------ src/views/base/Breadcrumbs.vue | 39 +- src/views/base/CLink.js | 170 ++++++ src/views/base/CNavItemDropdown.vue | 90 ++++ src/views/base/CSwitch.vue | 116 ++++ src/views/base/Navbars.vue | 28 +- src/views/base/ProgressBars.vue | 13 +- src/views/base/Switches.vue | 502 ++++++++++-------- src/views/base/Tables.vue | 2 +- src/views/buttons/Dropdowns.vue | 2 +- src/views/charts/BarExample.vue | 2 +- src/views/charts/DoughnutExample.vue | 2 +- src/views/charts/LineExample.vue | 2 +- src/views/charts/PieExample.vue | 2 +- src/views/charts/PolarAreaExample.vue | 2 +- src/views/charts/RadarExample.vue | 2 +- src/views/dashboard/BarChart1.vue | 75 --- src/views/dashboard/CalloutChartExample.vue | 2 +- src/views/dashboard/CardBarChartExample.vue | 2 +- src/views/dashboard/CardLine1ChartExample.vue | 2 +- src/views/dashboard/CardLine2ChartExample.vue | 2 +- src/views/dashboard/CardLine3ChartExample.vue | 2 +- src/views/dashboard/LineChart1.vue | 89 ---- src/views/dashboard/LineChart2.vue | 105 ---- src/views/dashboard/MainChartExample.vue | 2 +- src/views/dashboard/SocialBoxChartExample.vue | 3 +- src/views/notifications/Alerts.vue | 91 ++-- src/views/notifications/CAlert.js | 120 +++++ src/views/notifications/CButtonClose.js | 17 + src/views/widgets/Widget01.md | 17 - src/views/widgets/Widget01.vue | 49 -- src/views/widgets/Widget02.md | 14 - src/views/widgets/Widget02.vue | 40 -- src/views/widgets/Widget03.md | 11 - src/views/widgets/Widget03.vue | 29 - src/views/widgets/Widget04.md | 15 - src/views/widgets/Widget04.vue | 48 -- src/views/widgets/Widget05.md | 15 - src/views/widgets/Widget05.vue | 51 -- src/views/widgets/Widget06.md | 21 - src/views/widgets/Widget06.vue | 39 -- src/views/widgets/Widget07.md | 19 - src/views/widgets/Widget07.vue | 49 -- src/views/widgets/Widget08.md | 19 - src/views/widgets/Widget08.vue | 31 -- tests/unit/Plugin.spec.js | 38 ++ tests/unit/widgets/Widget01.spec.js | 37 -- tests/unit/widgets/Widget02.spec.js | 26 - tests/unit/widgets/Widget03.spec.js | 24 - tests/unit/widgets/Widget04.spec.js | 24 - tests/unit/widgets/Widget05.spec.js | 36 -- tests/unit/widgets/Widget06.spec.js | 23 - tests/unit/widgets/Widget07.spec.js | 18 - tests/unit/widgets/Widget08.spec.js | 18 - 64 files changed, 1261 insertions(+), 1634 deletions(-) delete mode 100644 src/mixins/charts/chartMixins.js create mode 100644 src/views/base/CLink.js create mode 100644 src/views/base/CNavItemDropdown.vue create mode 100644 src/views/base/CSwitch.vue delete mode 100644 src/views/dashboard/BarChart1.vue delete mode 100644 src/views/dashboard/LineChart1.vue delete mode 100644 src/views/dashboard/LineChart2.vue create mode 100644 src/views/notifications/CAlert.js create mode 100644 src/views/notifications/CButtonClose.js delete mode 100644 src/views/widgets/Widget01.md delete mode 100644 src/views/widgets/Widget01.vue delete mode 100644 src/views/widgets/Widget02.md delete mode 100644 src/views/widgets/Widget02.vue delete mode 100644 src/views/widgets/Widget03.md delete mode 100644 src/views/widgets/Widget03.vue delete mode 100644 src/views/widgets/Widget04.md delete mode 100644 src/views/widgets/Widget04.vue delete mode 100644 src/views/widgets/Widget05.md delete mode 100644 src/views/widgets/Widget05.vue delete mode 100644 src/views/widgets/Widget06.md delete mode 100644 src/views/widgets/Widget06.vue delete mode 100644 src/views/widgets/Widget07.md delete mode 100644 src/views/widgets/Widget07.vue delete mode 100644 src/views/widgets/Widget08.md delete mode 100644 src/views/widgets/Widget08.vue create mode 100644 tests/unit/Plugin.spec.js delete mode 100644 tests/unit/widgets/Widget01.spec.js delete mode 100644 tests/unit/widgets/Widget02.spec.js delete mode 100644 tests/unit/widgets/Widget03.spec.js delete mode 100644 tests/unit/widgets/Widget04.spec.js delete mode 100644 tests/unit/widgets/Widget05.spec.js delete mode 100644 tests/unit/widgets/Widget06.spec.js delete mode 100644 tests/unit/widgets/Widget07.spec.js delete mode 100644 tests/unit/widgets/Widget08.spec.js diff --git a/.eslintrc.js b/.eslintrc.js index 20034fd2..1c6179f3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -14,4 +14,4 @@ module.exports = { parserOptions: { parser: 'babel-eslint' } -} \ No newline at end of file +} diff --git a/babel.config.js b/babel.config.js index b89d655b..9fb4a004 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,12 @@ module.exports = { presets: [ - '@vue/app' + ['@vue/app', { + polyfills: [ + 'es6.promise', // already default included now + 'es6.array.iterator', // already default included now + 'es6.symbol', + 'es6.object.assign' + ] + }] ] -} \ No newline at end of file +} diff --git a/package.json b/package.json index 3070256a..5aa6474e 100644 --- a/package.json +++ b/package.json @@ -14,13 +14,13 @@ "test:e2e": "vue-cli-service test:e2e" }, "dependencies": { - "@coreui/coreui": "^2.0.14", + "@coreui/coreui": "^2.0.20", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.3.0", - "@coreui/vue": "^2.0.2", + "@coreui/vue": "github:coreui/coreui-vue#vue_cli3", "bootstrap": "^4.1.3", "bootstrap-vue": "^2.0.0-rc.11", - "chart.js": "^2.7.2", + "chart.js": "^2.7.3", "core-js": "^2.5.7", "css-vars-ponyfill": "^1.11.1", "flag-icon-css": "^3.2.0", @@ -33,17 +33,17 @@ "vue-router": "^3.0.1" }, "devDependencies": { - "@vue/cli-plugin-babel": "^3.0.4", - "@vue/cli-plugin-e2e-nightwatch": "^3.0.4", - "@vue/cli-plugin-eslint": "^3.0.4", - "@vue/cli-plugin-unit-jest": "^3.0.4", - "@vue/cli-service": "^3.0.4", + "@vue/cli-plugin-babel": "^3.0.5", + "@vue/cli-plugin-e2e-nightwatch": "^3.0.5", + "@vue/cli-plugin-eslint": "^3.0.5", + "@vue/cli-plugin-unit-jest": "^3.0.5", + "@vue/cli-service": "^3.0.5", "@vue/test-utils": "^1.0.0-beta.25", "babel-core": "^7.0.0-bridge.0", "babel-jest": "^23.6.0", "growl": "^1.10.5", "https-proxy-agent": "^2.2.1", - "node-sass": "^4.9.3", + "node-sass": "^4.9.4", "sass-loader": "^7.1.0", "vue-template-compiler": "^2.5.17" }, diff --git a/src/containers/DefaultAside.vue b/src/containers/DefaultAside.vue index b8b781f9..b60ead63 100644 --- a/src/containers/DefaultAside.vue +++ b/src/containers/DefaultAside.vue @@ -102,7 +102,7 @@
admin@bootstrapmaster.com - +
@@ -117,7 +117,7 @@
admin@bootstrapmaster.com - +
@@ -132,7 +132,7 @@
admin@bootstrapmaster.com - +
@@ -147,7 +147,7 @@
admin@bootstrapmaster.com - +
@@ -162,7 +162,7 @@
admin@bootstrapmaster.com - +
diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue index 3579dfb0..4eac3b06 100644 --- a/src/containers/DefaultContainer.vue +++ b/src/containers/DefaultContainer.vue @@ -37,7 +37,7 @@
- +
@@ -63,7 +63,7 @@ diff --git a/src/containers/DefaultHeaderDropdownAccnt.vue b/src/containers/DefaultHeaderDropdownAccnt.vue index ecd5e3cc..a56b3d17 100644 --- a/src/containers/DefaultHeaderDropdownAccnt.vue +++ b/src/containers/DefaultHeaderDropdownAccnt.vue @@ -1,54 +1,50 @@