From 636a845860d34f0a580f18cf2c6cad519bc21996 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Tue, 22 May 2018 20:52:04 +0200
Subject: [PATCH] refactor: components, containers

---
 CHANGELOG.md                                  |  84 +++--------
 package.json                                  |  53 +++----
 src/components/Aside/Aside.vue                |  48 ------
 src/components/Aside/AsideToggler.vue         |  55 -------
 src/components/Aside/index.js                 |   7 -
 src/components/Breadcrumb/Breadcrumb.vue      |  34 -----
 src/components/Callout/Callout.vue            |  27 ----
 src/components/Footer/Footer.vue              |  41 -----
 src/components/Header/Header.vue              |  35 -----
 src/components/Header/HeaderDropdown.vue      |  33 ----
 src/components/Header/index.js                |   7 -
 src/components/Sidebar/Sidebar.vue            |  25 ----
 src/components/Sidebar/SidebarFooter.vue      |  11 --
 src/components/Sidebar/SidebarForm.vue        |  11 --
 src/components/Sidebar/SidebarHeader.vue      |  11 --
 src/components/Sidebar/SidebarMinimizer.vue   |  17 ---
 src/components/Sidebar/SidebarNav.vue         |  97 ------------
 src/components/Sidebar/SidebarNavDivider.vue  |  26 ----
 src/components/Sidebar/SidebarNavDropdown.vue |  47 ------
 src/components/Sidebar/SidebarNavItem.vue     |  35 -----
 src/components/Sidebar/SidebarNavLabel.vue    |  59 --------
 src/components/Sidebar/SidebarNavLink.vue     |  74 ---------
 src/components/Sidebar/SidebarNavTitle.vue    |  42 ------
 src/components/Sidebar/SidebarToggler.vue     |  55 -------
 src/components/Sidebar/index.js               |  17 ---
 src/components/Switch/Switch.vue              | 110 --------------
 src/components/index.js                       |  32 ----
 .../{FullAside.vue => DafaultAside.vue}       |  22 +--
 .../{Full.vue => DefaultContainer.vue}        |  16 +-
 src/router/index.js                           |   8 +-
 src/views/Dashboard.vue                       |   2 +-
 src/views/dashboard/CalloutChartExample.vue   |   2 +-
 src/views/theme/ColorTheme.vue                |  29 ++++
 src/views/theme/ColorView.vue                 |  46 ++++++
 src/views/theme/Colors.vue                    | 141 +++++++-----------
 35 files changed, 207 insertions(+), 1152 deletions(-)
 delete mode 100644 src/components/Aside/Aside.vue
 delete mode 100644 src/components/Aside/AsideToggler.vue
 delete mode 100644 src/components/Aside/index.js
 delete mode 100644 src/components/Breadcrumb/Breadcrumb.vue
 delete mode 100644 src/components/Callout/Callout.vue
 delete mode 100644 src/components/Footer/Footer.vue
 delete mode 100644 src/components/Header/Header.vue
 delete mode 100644 src/components/Header/HeaderDropdown.vue
 delete mode 100644 src/components/Header/index.js
 delete mode 100644 src/components/Sidebar/Sidebar.vue
 delete mode 100644 src/components/Sidebar/SidebarFooter.vue
 delete mode 100644 src/components/Sidebar/SidebarForm.vue
 delete mode 100644 src/components/Sidebar/SidebarHeader.vue
 delete mode 100644 src/components/Sidebar/SidebarMinimizer.vue
 delete mode 100644 src/components/Sidebar/SidebarNav.vue
 delete mode 100644 src/components/Sidebar/SidebarNavDivider.vue
 delete mode 100644 src/components/Sidebar/SidebarNavDropdown.vue
 delete mode 100644 src/components/Sidebar/SidebarNavItem.vue
 delete mode 100644 src/components/Sidebar/SidebarNavLabel.vue
 delete mode 100644 src/components/Sidebar/SidebarNavLink.vue
 delete mode 100644 src/components/Sidebar/SidebarNavTitle.vue
 delete mode 100644 src/components/Sidebar/SidebarToggler.vue
 delete mode 100644 src/components/Sidebar/index.js
 delete mode 100644 src/components/Switch/Switch.vue
 delete mode 100644 src/components/index.js
 rename src/containers/{FullAside.vue => DafaultAside.vue} (91%)
 rename src/containers/{Full.vue => DefaultContainer.vue} (89%)
 create mode 100644 src/views/theme/ColorTheme.vue
 create mode 100644 src/views/theme/ColorView.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5336633c..39c2dda5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,64 +1,28 @@
 ## [vue](./README.md) version `changelog`
 
-##### `v1.0.10`
-- fix: `className` -> `class`
-- refactor: `<b-input-group-prepend>`
-- refactor: `<b-input-group-append>`
-- refactor: `<b-input-group-text>`
-- refactor: remove `<b-input-group-button>`
-- test: initial `Dashboard` unit test added
-- update: bootstrap-vue to `2.0.0-rc.1`
-- chore: dependencies update
+##### `v2.0.0-alpha.0`
+- refactor: separation of concerns - (CoreUI template vs CoreUI components) prepare to use CoreUI as dependency
+- refactor: project structure change
+- refactor: moved to [vuejs-templates](http://vuejs-templates.github.io/webpack/)
+- chore: moved to [Semantic Versioning](https://semver.org/)
+- refactor: move to [CoreUI-Vue](https://github.com/coreui/coreui-vue) components `v2`
+- refactor: rename containers
+- refactor(Colors): view layout, sub-components
+- refactor(Switches): move to `Switch component v2`
 
-###### `v1.0.9`
-- refactor: Sidebar structure
-- test: initial e2e test added
-- chore: dependencies update
-
-###### `v1.0.8`
-- update: vue to `2.5.13`
-- update: Bootstrap to `4.0.0-beta.3`
-- update: bootstrap-vue to `1.4.0`
-- chore: dependencies update
-- refactor: `<b-table>` use the prop `responsive="sm"` instead of `class="table-responsive-sm"`
-- fix: `Vue warn:` Do not use built-in or reserved HTML elements as component id: (header, aside, footer, table)
-- feature: some Bootstrap4 components added
-- temp tweaks(b4 beta3): `InputGroupAddon` and `InputGroupButton` 
-- refactor(checkboxes, radios, labels): temp tweaks 
-- feat: mobile sidebar link click closes the sidebar [#18](https://github.com/mrholek/CoreUI-Vue/pull/18)
-
-###### `v1.0.6`
-- refactor: raw html to `b-row`, `b-col`, `b-card`, `b-button` components
-- fix: Cards.vue: change `variant="accent-` to `class="card-accent-`
-- refactor: Modal's ok-button variants
-- refactor: forms with validation feedback
-- update: bootstrap-vue to `1.1.0`
-- update: to vue: `2.5.6`
-
-###### `v1.0.5`
-- update: bootstrap-vue to `1.0.x`
-- fix: use `<b-form-radio-group>` instead of `<b-form-radio>`  **[breaking change](https://bootstrap-vue.js.org/docs/components/form-radios)** :fire:
-- refactor: `<b-table>` bootstrap-vue component in `Tables` #24
-- refactor: extract `Table` component from `Tables`
-- refactor: `<b-table>` bootstrap-vue component in `Switches` #24
-- fix: add `table-responsive-sm` class to `Tables` #26
-- refactor: use component `<b-navbar-nav>` instead of deprecated prop `is-nav-bar`
-- fix: `b-progress` `height` property workaround (bootstrap-vue)
-- chore: dependencies update
-
-###### `v1.0.4`
-- refactor: import Bootstrap 4 SCSS files from node_modules
-- fix: callouts styles
-
-###### `v1.0.3`
-- update: Bootstrap version to `4.0.0-beta.2`
-- update: vue-chartjs to `3.0.0` **[breaking change](https://github.com/apertureless/vue-chartjs/releases/tag/v3.0.0)** :fire:
-
-###### `v1.0.2`
-- update: to vue: `^2.5.x`
-- update: bootstrap-vue to `1.0.0-beta.9`
-- refactor: (vue `v2.5.x`) deprecated `<template scope="props">` replace with `<div slot-scope="props">`
-- refactor: `HeaderDropdown` component added to `Header`
-- refactor: `b-badge` component added (bootstrap-vue)
-- chore: `package.json` project dependencies update
+other:  
 
+- feat: app-footer fixed
+- refactor(dashboard): brand-card, progress-group-bars 
+- refactor(social-box-chart-example): props
+- feat(forms): new `<b-form-input type="date">` example added
+- refactor(cards): Card outline, Card accent - title variants added
+- feat: card-header-actions
+- feat(_nav): Navbars example added
+- update: vuejs-templates/webpack to v1.3.1
+- fix: eslint `valid template root`
+- refactor: card header title spacing
+- refactor: btn-brand 
+- test(e2e): update
+- refactor: sidebar
+- refactor: chart examples 
diff --git a/package.json b/package.json
index 4a6b4485..8fc9d565 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@coreui/vue",
+  "name": "@coreui/coreui-free-vue-admin-template",
   "version": "2.0.0-alpha.0",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
@@ -18,9 +18,12 @@
   },
   "dependencies": {
     "@coreui/coreui": "^2.0.1",
+    "@coreui/vue": "^2.0.0-alpha.0",
     "bootstrap": "^4.1.1",
-    "bootstrap-vue": "^2.0.0-rc.9",
+    "bootstrap-vue": "^2.0.0-rc.11",
     "chart.js": "^2.7.2",
+    "core-js": "^2.5.6",
+    "css-vars-ponyfill": "^1.7.2",
     "flag-icon-css": "^3.0.0",
     "font-awesome": "^4.7.0",
     "perfect-scrollbar": "^1.3.0",
@@ -31,30 +34,30 @@
     "vue-router": "^3.0.1"
   },
   "devDependencies": {
-    "autoprefixer": "7.2.5",
-    "babel-core": "^6.26.0",
-    "babel-eslint": "^8.2.2",
+    "autoprefixer": "^8.5.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.3",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "babel-loader": "^7.1.4",
     "babel-plugin-istanbul": "^4.1.6",
     "babel-plugin-syntax-jsx": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-plugin-transform-vue-jsx": "^3.7.0",
-    "babel-preset-env": "^1.6.1",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-stage-2": "^6.24.1",
     "babel-register": "^6.26.0",
     "chai": "^4.1.2",
-    "chalk": "^2.3.2",
-    "chromedriver": "^2.37.0",
-    "copy-webpack-plugin": "^4.3.1",
-    "cross-env": "^5.1.4",
+    "chalk": "^2.4.1",
+    "chromedriver": "^2.38.3",
+    "copy-webpack-plugin": "^4.5.1",
+    "cross-env": "^5.1.5",
     "cross-spawn": "^6.0.5",
     "css-loader": "^0.28.11",
     "eslint": "^4.19.1",
     "eslint-config-standard": "^11.0.0",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^2.0.0",
-    "eslint-plugin-import": "^2.10.0",
+    "eslint-plugin-import": "^2.12.0",
     "eslint-plugin-node": "^6.0.1",
     "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
@@ -64,40 +67,40 @@
     "friendly-errors-webpack-plugin": "^1.7.0",
     "html-webpack-plugin": "^2.30.1",
     "inject-loader": "^3.0.1",
-    "karma": "^2.0.0",
-    "karma-coverage": "^1.1.1",
+    "karma": "^2.0.2",
+    "karma-coverage": "^1.1.2",
     "karma-mocha": "^1.3.0",
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-phantomjs-shim": "^1.5.0",
-    "karma-sinon-chai": "^1.3.3",
+    "karma-sinon-chai": "^1.3.4",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "^0.0.32",
     "karma-webpack": "^2.0.9",
-    "mocha": "^5.0.5",
-    "nightwatch": "0.9.20",
+    "mocha": "^5.2.0",
+    "nightwatch": "^1.0.6",
     "node-notifier": "^5.1.2",
-    "node-sass": "^4.8.3",
+    "node-sass": "^4.9.0",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
-    "ora": "^2.0.0",
+    "ora": "^2.1.0",
     "phantomjs-prebuilt": "^2.1.16",
     "portfinder": "^1.0.13",
     "postcss-import": "^11.1.0",
-    "postcss-loader": "^2.1.3",
+    "postcss-loader": "^2.1.5",
     "postcss-url": "^7.3.2",
     "rimraf": "^2.6.2",
     "sass-loader": "^6.0.7",
-    "selenium-server": "3.11.0",
+    "selenium-server": "^3.12.0",
     "semver": "^5.5.0",
-    "shelljs": "^0.8.1",
+    "shelljs": "^0.8.2",
     "sinon": "^4.5.0",
     "sinon-chai": "^2.14.0",
-    "uglifyjs-webpack-plugin": "^1.1.1",
+    "uglifyjs-webpack-plugin": "^1.2.5",
     "url-loader": "^1.0.1",
     "vue-loader": "^14.2.2",
     "vue-style-loader": "^4.1.0",
     "vue-template-compiler": "^2.5.16",
-    "webpack": "^3.6.0",
-    "webpack-bundle-analyzer": "^2.11.1",
+    "webpack": "^3.12.0",
+    "webpack-bundle-analyzer": "^2.13.0",
     "webpack-dev-server": "^2.11.2",
     "webpack-merge": "^4.1.2"
   },
@@ -108,6 +111,6 @@
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not ie <= 8"
+    "not ie <= 9"
   ]
 }
diff --git a/src/components/Aside/Aside.vue b/src/components/Aside/Aside.vue
deleted file mode 100644
index 95d26426..00000000
--- a/src/components/Aside/Aside.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-  <aside class="aside-menu">
-    <slot>Aside</slot>
-  </aside>
-</template>
-
-<script>
-// import { asideMenuCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
-
-export default {
-  name: 'AppAside',
-  props: {
-    fixed: {
-      type: Boolean,
-      default: false
-    },
-    display: {
-      type: String,
-      default: ''
-    },
-    offCanvas: {
-      type: Boolean,
-      default: true
-    }
-  },
-  mounted: function () {
-    this.isFixed(this.fixed)
-    this.isOffCanvas(this.offCanvas)
-    // this.displayBreakpoint(this.display)
-  },
-  methods: {
-    isFixed (fixed) {
-      fixed ? document.body.classList.add('aside-menu-fixed') : document.body.classList.remove('aside-menu-fixed')
-      return fixed
-    },
-    isOffCanvas (offCanvas) {
-      offCanvas ? document.body.classList.add('aside-menu-off-canvas') : document.body.classList.remove('aside-menu-off-canvas')
-    }
-    // displayBreakpoint (display) {
-    //   let cssClass = asideMenuCssClasses[0]
-    //   if (display && checkBreakpoint(display, validBreakpoints)) {
-    //     cssClass = `aside-menu-${display}-show`
-    //   }
-    //   document.body.classList.add(cssClass)
-    // }
-  }
-}
-</script>
diff --git a/src/components/Aside/AsideToggler.vue b/src/components/Aside/AsideToggler.vue
deleted file mode 100644
index 9558ad77..00000000
--- a/src/components/Aside/AsideToggler.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-  <button
-    :display="display"
-    :mobile="mobile"
-    :class="classList"
-    type="button"
-    @click="asideToggle">
-    <span class="navbar-toggler-icon" />
-  </button>
-</template>
-
-<script>
-import { asideMenuCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
-import toggleClasses from '../../shared/toggle-classes'
-
-export default {
-  name: 'AsideToggler',
-  props: {
-    mobile: {
-      type: Boolean,
-      default: false
-    },
-    display: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    classList () {
-      return [
-        'navbar-toggler'
-        // 'd-none',
-        // 'd-lg-inline-block'
-      ]
-    }
-  },
-  mounted: function () {
-    // this.toggle()
-  },
-  methods: {
-    toggle () {
-      const [display, mobile] = [this.display, this.mobile]
-      let cssClass = asideMenuCssClasses[0]
-      if (!mobile && display && checkBreakpoint(display, validBreakpoints)) {
-        cssClass = `aside-menu-${display}-show`
-      }
-      toggleClasses(cssClass, asideMenuCssClasses)
-    },
-    asideToggle (e) {
-      e.preventDefault()
-      this.toggle()
-    }
-  }
-}
-</script>
diff --git a/src/components/Aside/index.js b/src/components/Aside/index.js
deleted file mode 100644
index 455a29f8..00000000
--- a/src/components/Aside/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Aside from './Aside'
-import AsideToggler from './AsideToggler'
-
-export {
-  Aside,
-  AsideToggler
-}
diff --git a/src/components/Breadcrumb/Breadcrumb.vue b/src/components/Breadcrumb/Breadcrumb.vue
deleted file mode 100644
index 1864b859..00000000
--- a/src/components/Breadcrumb/Breadcrumb.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item" :key="index" v-for="(item, index) in list">
-      <span class="active" v-if="isLast(index)">{{ showName(item) }}</span>
-      <router-link :to="item" v-else>{{ showName(item) }}</router-link>
-    </li>
-  </ol>
-</template>
-
-<script>
-export default {
-  props: {
-    list: {
-      type: Array,
-      required: true,
-      default: () => []
-    }
-  },
-  methods: {
-    isLast (index) {
-      return index === this.list.length - 1
-    },
-    showName (item) {
-      if (item.meta && item.meta.label) {
-        item = item.meta && item.meta.label
-      }
-      if (item.name) {
-        item = item.name
-      }
-      return item
-    }
-  }
-}
-</script>
diff --git a/src/components/Callout/Callout.vue b/src/components/Callout/Callout.vue
deleted file mode 100644
index 452c2364..00000000
--- a/src/components/Callout/Callout.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <div :class="classList">
-    <slot>Callout</slot>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    variant: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    classList () {
-      return [
-        'callout',
-        this.calloutVariant
-      ]
-    },
-    calloutVariant () {
-      return this.variant ? `callout-${this.variant}` : ''
-    }
-  }
-}
-</script>
diff --git a/src/components/Footer/Footer.vue b/src/components/Footer/Footer.vue
deleted file mode 100644
index fdc9280a..00000000
--- a/src/components/Footer/Footer.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <footer :class="classList">
-    <slot>
-      <div>
-        <a href="https://coreui.io">CoreUI</a>
-        <span>&copy; 2018 creativeLabs.</span>
-      </div>
-      <div class="ml-auto">
-        <span>Powered by</span>
-        <a href="https://coreui.io">CoreUI for Vue</a>
-      </div>
-    </slot>
-  </footer>
-</template>
-
-<script>
-export default {
-  name: 'AppFooter',
-  props: {
-    fixed: {
-      type: Boolean,
-      default: false
-    }
-  },
-  mounted: function () {
-    this.isFixed()
-  },
-  computed: {
-    classList () {
-      return [
-        'app-footer'
-      ]
-    }
-  },
-  methods: {
-    isFixed () {
-      this.fixed ? document.body.classList.add('footer-fixed') : document.body.classList.remove('footer-fixed')
-    }
-  }
-}
-</script>
diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue
deleted file mode 100644
index 50f4f37d..00000000
--- a/src/components/Header/Header.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <header
-    :class="classList">
-    <slot>Header</slot>
-  </header>
-</template>
-
-<script>
-export default {
-  name: 'AppHeader',
-  props: {
-    fixed: {
-      type: Boolean,
-      default: false
-    }
-  },
-  computed: {
-    classList () {
-      return [
-        'app-header',
-        'navbar'
-      ]
-    }
-  },
-  mounted: function () {
-    this.isFixed(this.fixed)
-  },
-  methods: {
-    isFixed (fixed) {
-      fixed ? document.body.classList.add('header-fixed') : document.body.classList.remove('header-fixed')
-      return fixed
-    }
-  }
-}
-</script>
diff --git a/src/components/Header/HeaderDropdown.vue b/src/components/Header/HeaderDropdown.vue
deleted file mode 100644
index 665fe2fa..00000000
--- a/src/components/Header/HeaderDropdown.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-  <b-nav-item-dropdown :right="right" :no-caret="noCaret">
-    <template slot="button-content">
-      <slot name="button-content">
-        <img
-          src="static/img/avatars/6.jpg"
-          class="img-avatar"
-          alt="admin@bootstrapmaster.com" />
-      </slot>
-    </template>
-    <slot>
-      <div :style="{ right: 'auto', height: '400px' }">dropdown</div>
-    </slot>
-  </b-nav-item-dropdown>
-</template>
-<script>
-export default {
-  name: 'HeaderDropdown',
-  props: {
-    right: {
-      type: Boolean,
-      default: false
-    },
-    noCaret: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data: () => {
-    return { itemsCount: 42 }
-  }
-}
-</script>
diff --git a/src/components/Header/index.js b/src/components/Header/index.js
deleted file mode 100644
index 7ae539ba..00000000
--- a/src/components/Header/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Header from './Header'
-import HeaderDropdown from './HeaderDropdown'
-
-export {
-  Header,
-  HeaderDropdown
-}
diff --git a/src/components/Sidebar/Sidebar.vue b/src/components/Sidebar/Sidebar.vue
deleted file mode 100644
index 4b3689d3..00000000
--- a/src/components/Sidebar/Sidebar.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div class="sidebar">
-    <slot>Sidebar</slot>
-  </div>
-</template>
-<script>
-export default {
-  name: 'sidebar',
-  props: {
-    fixed: {
-      type: Boolean,
-      default: false
-    }
-  },
-  mounted: function () {
-    this.isFixed()
-  },
-  methods: {
-    isFixed () {
-      this.fixed ? document.body.classList.add('sidebar-fixed') : document.body.classList.remove('sidebar-fixed')
-      return this.fixed
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar/SidebarFooter.vue b/src/components/Sidebar/SidebarFooter.vue
deleted file mode 100644
index 76da4622..00000000
--- a/src/components/Sidebar/SidebarFooter.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint-disable */
-<template>
-  <div></div>
-  <!--<div class="sidebar-footer"></div>-->
-</template>
-
-<script>
-export default {
-  name: 'sidebar-footer'
-}
-</script>
diff --git a/src/components/Sidebar/SidebarForm.vue b/src/components/Sidebar/SidebarForm.vue
deleted file mode 100644
index 49c9ddab..00000000
--- a/src/components/Sidebar/SidebarForm.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint-disable */
-<template>
-  <div></div>
-  <!-- <div class="sidebar-form"></div> -->
-</template>
-<script>
-
-export default {
-  name: 'sidebar-form'
-}
-</script>
diff --git a/src/components/Sidebar/SidebarHeader.vue b/src/components/Sidebar/SidebarHeader.vue
deleted file mode 100644
index 3ede0578..00000000
--- a/src/components/Sidebar/SidebarHeader.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint-disable */
-<template>
-  <div></div>
-  <!-- <div class="sidebar-header"></div> -->
-</template>
-<script>
-
-export default {
-  name: 'sidebar-header'
-}
-</script>
diff --git a/src/components/Sidebar/SidebarMinimizer.vue b/src/components/Sidebar/SidebarMinimizer.vue
deleted file mode 100644
index 89b67b98..00000000
--- a/src/components/Sidebar/SidebarMinimizer.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <button class="sidebar-minimizer" type="button" @click="sidebarMinimize();brandMinimize()"></button>
-</template>
-<script>
-
-export default {
-  name: 'sidebar-minimizer',
-  methods: {
-    sidebarMinimize () {
-      document.body.classList.toggle('sidebar-minimized')
-    },
-    brandMinimize () {
-      document.body.classList.toggle('brand-minimized')
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar/SidebarNav.vue b/src/components/Sidebar/SidebarNav.vue
deleted file mode 100644
index 70c588ec..00000000
--- a/src/components/Sidebar/SidebarNav.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <nav class="sidebar-nav">
-    <VuePerfectScrollbar class="scroll-area" :settings="psSettings" @ps-scroll-y="scrollHandle">
-    <ul class="nav">
-      <template v-for="(item, index) in navItems">
-        <template v-if="item.title">
-          <SidebarNavTitle :key="index" :name="item.name" :classes="item.class" :wrapper="item.wrapper"/>
-        </template>
-        <template v-else-if="item.divider">
-          <SidebarNavDivider :key="index" :classes="item.class"/>
-        </template>
-        <template v-else-if="item.label">
-          <SidebarNavLabel :key="index" :name="item.name" :url="item.url" :icon="item.icon" :label="item.label" :classes="item.class"/>
-        </template>
-        <template v-else>
-          <template v-if="item.children">
-            <!-- First level dropdown -->
-            <SidebarNavDropdown :key="index" :name="item.name" :url="item.url" :icon="item.icon">
-              <template v-for="(childL1, index1) in item.children">
-                <template v-if="childL1.children">
-                  <!-- Second level dropdown -->
-                  <SidebarNavDropdown :key="index1" :name="childL1.name" :url="childL1.url" :icon="childL1.icon">
-                    <li :key="index2" class="nav-item" v-for="(childL2, index2) in childL1.children">
-                      <SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant"/>
-                    </li>
-                  </SidebarNavDropdown>
-                </template>
-                <template v-else>
-                  <SidebarNavItem :key="index1" :classes="item.class">
-                    <SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant"/>
-                  </SidebarNavItem>
-                </template>
-              </template>
-            </SidebarNavDropdown>
-          </template>
-          <template v-else>
-            <SidebarNavItem :key="index" :classes="item.class">
-              <SidebarNavLink :name="item.name" :url="item.url" :icon="item.icon" :badge="item.badge" :variant="item.variant"/>
-            </SidebarNavItem>
-          </template>
-        </template>
-      </template>
-    </ul>
-    <slot></slot>
-    </VuePerfectScrollbar>
-  </nav>
-</template>
-
-<script>
-import SidebarNavDivider from './SidebarNavDivider'
-import SidebarNavDropdown from './SidebarNavDropdown'
-import SidebarNavLink from './SidebarNavLink'
-import SidebarNavTitle from './SidebarNavTitle'
-import SidebarNavItem from './SidebarNavItem'
-import SidebarNavLabel from './SidebarNavLabel'
-import VuePerfectScrollbar from 'vue-perfect-scrollbar'
-
-export default {
-  name: 'SidebarNav',
-  props: {
-    navItems: {
-      type: Array,
-      required: true,
-      default: () => []
-    }
-  },
-  components: {
-    SidebarNavDivider,
-    SidebarNavDropdown,
-    SidebarNavLink,
-    SidebarNavTitle,
-    SidebarNavItem,
-    SidebarNavLabel,
-    VuePerfectScrollbar
-  },
-  data () {
-    return {
-      psSettings: {
-        maxScrollbarLength: 200
-      }
-    }
-  },
-  methods: {
-    scrollHandle (evt) {
-      // console.log(evt)
-    }
-  }
-}
-</script>
-
-<style scoped lang="css">
-  .scroll-area {
-    position: relative;
-    height: 100%;
-    margin: auto;
-  }
-</style>
diff --git a/src/components/Sidebar/SidebarNavDivider.vue b/src/components/Sidebar/SidebarNavDivider.vue
deleted file mode 100644
index ac124f8f..00000000
--- a/src/components/Sidebar/SidebarNavDivider.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <li :class="classList"></li>
-</template>
-
-<script>
-export default {
-  name: 'sidebar-nav-divider',
-  props: {
-    classes: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    classList () {
-      return [
-        'divider',
-        ...this.itemClasses
-      ]
-    },
-    itemClasses () {
-      return this.classes ? this.classes.split(' ') : ''
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar/SidebarNavDropdown.vue b/src/components/Sidebar/SidebarNavDropdown.vue
deleted file mode 100644
index f63cdcee..00000000
--- a/src/components/Sidebar/SidebarNavDropdown.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <router-link tag="li" class="nav-item nav-dropdown" :to="url" disabled>
-    <div class="nav-link nav-dropdown-toggle" @click="handleClick"><i :class="classIcon"></i> {{name}}</div>
-    <ul class="nav-dropdown-items">
-      <slot></slot>
-    </ul>
-  </router-link>
-</template>
-
-<script>
-export default {
-  props: {
-    name: {
-      type: String,
-      default: ''
-    },
-    url: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    classIcon () {
-      return [
-        'nav-icon',
-        this.icon
-      ]
-    }
-  },
-  methods: {
-    handleClick (e) {
-      e.preventDefault()
-      e.target.parentElement.classList.toggle('open')
-    }
-  }
-}
-</script>
-
-<style scoped lang="css">
-  .nav-link {
-    cursor:pointer;
-  }
-</style>
diff --git a/src/components/Sidebar/SidebarNavItem.vue b/src/components/Sidebar/SidebarNavItem.vue
deleted file mode 100644
index 963f7627..00000000
--- a/src/components/Sidebar/SidebarNavItem.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <li :class="classList" @click="hideMobile">
-    <slot></slot>
-  </li>
-</template>
-
-<script>
-export default {
-  name: 'sidebar-nav-item',
-  props: {
-    classes: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    classList () {
-      return [
-        'nav-item',
-        ...this.itemClasses
-      ]
-    },
-    itemClasses () {
-      return this.classes ? this.classes.split(' ') : ''
-    }
-  },
-  methods: {
-    hideMobile () {
-      if (document.body.classList.contains('sidebar-show')) {
-        document.body.classList.toggle('sidebar-show')
-      }
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar/SidebarNavLabel.vue b/src/components/Sidebar/SidebarNavLabel.vue
deleted file mode 100644
index 480f1a16..00000000
--- a/src/components/Sidebar/SidebarNavLabel.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <SidebarNavItem :classes="classList.navItem">
-    <a :class="classList.navLink" :href="url"><i :class="classList.icon"></i> {{name}}</a>
-  </SidebarNavItem>
-</template>
-
-<script>
-import SidebarNavItem from './SidebarNavItem'
-import SidebarNavLink from './SidebarNavLink'
-export default {
-  name: 'sidebar-nav-label',
-  components: {
-    SidebarNavItem,
-    SidebarNavLink
-  },
-  props: {
-    name: {
-      type: String,
-      default: ''
-    },
-    url: {
-      type: String,
-      default: '#'
-    },
-    icon: {
-      type: String,
-      default: 'fa fa-circle'
-    },
-    classes: {
-      type: String,
-      default: ''
-    },
-    label: {
-      type: Object,
-      required: true,
-      default: () => {}
-    }
-  },
-  computed: {
-    classList () {
-      const classes = {
-        navItem: ['hidden-cn', ...this.getClasses(this.classes)].join(' '),
-        navLink: 'nav-label',
-        icon: [
-          this.icon ? this.icon : 'fa fa-circle',
-          this.label.variant ? `text-${this.label.variant}` : '',
-          this.label.class ? this.label.class : ''
-        ].join(' ')
-      }
-      return classes
-    }
-  },
-  methods: {
-    getClasses (classes) {
-      return classes ? classes.split(' ') : []
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar/SidebarNavLink.vue b/src/components/Sidebar/SidebarNavLink.vue
deleted file mode 100644
index 94c1d369..00000000
--- a/src/components/Sidebar/SidebarNavLink.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <div v-if="isExternalLink">
-    <a :href="url" :class="classList">
-      <i :class="classIcon"></i> {{name}}
-      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
-    </a>
-  </div>
-  <div v-else>
-    <router-link :to="url" :class="classList">
-      <i :class="classIcon"></i> {{name}}
-      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
-    </router-link>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'sidebar-nav-link',
-  props: {
-    name: {
-      type: String,
-      default: ''
-    },
-    url: {
-      type: String,
-      default: ''
-    },
-    icon: {
-      type: String,
-      default: ''
-    },
-    badge: {
-      type: Object,
-      default: () => {}
-    },
-    variant: {
-      type: String,
-      default: ''
-    },
-    classes: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    classList () {
-      return [
-        'nav-link',
-        this.linkVariant,
-        ...this.itemClasses
-      ]
-    },
-    classIcon () {
-      return [
-        'nav-icon',
-        this.icon
-      ]
-    },
-    linkVariant () {
-      return this.variant ? `nav-link-${this.variant}` : ''
-    },
-    itemClasses () {
-      return this.classes ? this.classes.split(' ') : []
-    },
-    isExternalLink () {
-      if (this.url.substring(0, 4) === 'http') {
-        return true
-      } else {
-        return false
-      }
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar/SidebarNavTitle.vue b/src/components/Sidebar/SidebarNavTitle.vue
deleted file mode 100644
index 6bac6f56..00000000
--- a/src/components/Sidebar/SidebarNavTitle.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <li :class="classList">
-    <template v-if="wrapper && wrapper.element">
-      <component v-bind:is="wrapper.element" v-bind="wrapper.attributes">
-        {{name}}
-      </component>
-    </template>
-    <template v-else>
-      {{name}}
-    </template>
-  </li>
-</template>
-
-<script>
-export default {
-  props: {
-    name: {
-      type: String,
-      default: ''
-    },
-    classes: {
-      type: String,
-      default: ''
-    },
-    wrapper: {
-      type: Object,
-      default: () => {}
-    }
-  },
-  computed: {
-    classList () {
-      return [
-        'nav-title',
-        ...this.itemClasses
-      ]
-    },
-    itemClasses () {
-      return this.classes ? this.classes.split(' ') : ''
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar/SidebarToggler.vue b/src/components/Sidebar/SidebarToggler.vue
deleted file mode 100644
index 88e93031..00000000
--- a/src/components/Sidebar/SidebarToggler.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-  <button
-    :display="display"
-    :mobile="mobile"
-    :class="classList"
-    type="button"
-    @click="sidebarToggle">
-    <span class="navbar-toggler-icon" />
-  </button>
-</template>
-
-<script>
-import { sidebarCssClasses, validBreakpoints, checkBreakpoint } from '../../shared/classes'
-import toggleClasses from '../../shared/toggle-classes'
-
-export default {
-  name: 'SidebarToggler',
-  props: {
-    mobile: {
-      type: Boolean,
-      default: false
-    },
-    display: {
-      type: String,
-      default: 'lg'
-    }
-  },
-  computed: {
-    classList () {
-      return [
-        'navbar-toggler'
-        // 'd-none',
-        // 'd-lg-inline-block'
-      ]
-    }
-  },
-  mounted: function () {
-    this.toggle()
-  },
-  methods: {
-    toggle () {
-      const [display, mobile] = [this.display, this.mobile]
-      let cssClass = sidebarCssClasses[0]
-      if (!mobile && display && checkBreakpoint(display, validBreakpoints)) {
-        cssClass = `sidebar-${display}-show`
-      }
-      toggleClasses(cssClass, sidebarCssClasses)
-    },
-    sidebarToggle (e) {
-      e.preventDefault()
-      this.toggle()
-    }
-  }
-}
-</script>
diff --git a/src/components/Sidebar/index.js b/src/components/Sidebar/index.js
deleted file mode 100644
index 7c7af98b..00000000
--- a/src/components/Sidebar/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import Sidebar from './Sidebar.vue'
-import SidebarFooter from './SidebarFooter'
-import SidebarForm from './SidebarForm'
-import SidebarHeader from './SidebarHeader'
-import SidebarMinimizer from './SidebarMinimizer'
-import SidebarNav from './SidebarNav'
-import SidebarNavDivider from './SidebarNavDivider'
-import SidebarNavDropdown from './SidebarNavDropdown'
-import SidebarNavItem from './SidebarNavItem'
-import SidebarNavLabel from './SidebarNavLabel'
-import SidebarNavLink from './SidebarNavLink'
-import SidebarNavTitle from './SidebarNavTitle'
-import SidebarToggler from './SidebarToggler'
-
-export {
-  Sidebar, SidebarFooter, SidebarForm, SidebarHeader, SidebarMinimizer, SidebarNav, SidebarNavDivider, SidebarNavItem, SidebarNavDropdown, SidebarNavLabel, SidebarNavLink, SidebarNavTitle, SidebarToggler
-}
diff --git a/src/components/Switch/Switch.vue b/src/components/Switch/Switch.vue
deleted file mode 100644
index aeae41a7..00000000
--- a/src/components/Switch/Switch.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-  <label :class="classList">
-    <input
-      :value="value"
-      :checked="isChecked"
-      :disabled="isDisabled"
-      type="checkbox"
-      class="switch-input"
-      @change="handleChange">
-    <template v-if="isOn">
-      <span
-        :data-on="on"
-        :data-off="off"
-        class="switch-label" />
-    </template>
-    <template v-else>
-      <span class="switch-label" />
-    </template>
-    <span class="switch-handle" />
-  </label>
-</template>
-
-<script>
-export default {
-  model: {
-    prop: 'checked',
-    event: 'change'
-  },
-  props: {
-    value: {
-      type: Boolean,
-      default: true
-    },
-    uncheckedValue: {
-      type: Boolean,
-      default: false
-    },
-    checked: {
-      type: Boolean,
-      default: false
-    },
-    type: {
-      type: String,
-      default: 'default'
-    },
-    variant: {
-      type: String,
-      default: ''
-    },
-    pill: {
-      type: Boolean,
-      default: false
-    },
-    on: {
-      type: String,
-      default: null
-    },
-    off: {
-      type: String,
-      default: null
-    },
-    size: {
-      type: String,
-      default: null
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    }
-
-  },
-  computed: {
-    classList () {
-      return [
-        'switch',
-        this.switchType,
-        this.switchVariant,
-        this.switchPill,
-        this.switchSize
-      ]
-    },
-    switchType () {
-      return this.type ? `switch-${this.type}` : `switch-default`
-    },
-    switchVariant () {
-      return this.variant ? `switch-${this.variant}` : `switch-secondary`
-    },
-    switchPill () {
-      return this.pill ? `switch-pill` : null
-    },
-    switchSize () {
-      return this.size ? `switch-${this.size}` : ''
-    },
-    isChecked () {
-      return this.checked === this.value
-    },
-    isDisabled () {
-      return this.disabled ? true : null
-    },
-    isOn () {
-      return this.on ? true : null
-    }
-  },
-  methods: {
-    handleChange ({ target: { checked } }) {
-      this.$emit('change', checked ? this.value : this.uncheckedValue)
-    }
-  }
-}
-</script>
diff --git a/src/components/index.js b/src/components/index.js
deleted file mode 100644
index 0ca08b7b..00000000
--- a/src/components/index.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Breadcrumb from './Breadcrumb/Breadcrumb'
-import Callout from './Callout/Callout'
-import Footer from './Footer/Footer'
-import Switch from './Switch/Switch'
-
-import { Aside, AsideToggler } from './Aside'
-import { Header, HeaderDropdown } from './Header'
-import { Sidebar, SidebarFooter, SidebarForm, SidebarHeader, SidebarMinimizer, SidebarNav, SidebarNavDivider, SidebarNavItem, SidebarNavDropdown, SidebarNavLabel, SidebarNavLink, SidebarNavTitle, SidebarToggler } from './Sidebar'
-
-export {
-  Aside,
-  AsideToggler,
-  Breadcrumb,
-  Callout,
-  Footer,
-  Header,
-  HeaderDropdown,
-  Sidebar,
-  SidebarFooter,
-  SidebarForm,
-  SidebarHeader,
-  SidebarMinimizer,
-  SidebarNav,
-  SidebarNavDivider,
-  SidebarNavItem,
-  SidebarNavDropdown,
-  SidebarNavLabel,
-  SidebarNavLink,
-  SidebarNavTitle,
-  SidebarToggler,
-  Switch
-}
diff --git a/src/containers/FullAside.vue b/src/containers/DafaultAside.vue
similarity index 91%
rename from src/containers/FullAside.vue
rename to src/containers/DafaultAside.vue
index 32f9b282..52d7dc3d 100644
--- a/src/containers/FullAside.vue
+++ b/src/containers/DafaultAside.vue
@@ -8,7 +8,7 @@
         <b-list-group-item class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
           Today
         </b-list-group-item>
-        <b-list-group-item class="list-group-item list-group-item-accent-warning list-group-item-divider">
+        <b-list-group-item href="#" class="list-group-item-accent-warning list-group-item-divider">
           <div class="avatar float-right">
             <img class="img-avatar" src="static/img/avatars/7.jpg" alt="admin@bootstrapmaster.com">
           </div>
@@ -22,7 +22,7 @@
             <i class="icon-location-pin"></i>&nbsp;&nbsp;Palo Alto, CA
           </small>
         </b-list-group-item>
-        <b-list-group-item class="list-group-item-accent-info">
+        <b-list-group-item href="#" class="list-group-item-accent-info">
           <div class="avatar float-right">
             <img class="img-avatar" src="static/img/avatars/4.jpg" alt="admin@bootstrapmaster.com">
           </div>
@@ -35,7 +35,7 @@
         <b-list-group-item class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
           Tomorrow
         </b-list-group-item>
-        <b-list-group-item class="list-group-item-accent-danger list-group-item-divider">
+        <b-list-group-item href="#" class="list-group-item-accent-danger list-group-item-divider">
           <div>New UI Project - <strong>deadline</strong>
           </div>
           <small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp;&nbsp;10 - 11pm</small>
@@ -58,12 +58,12 @@
             </div>
           </div>
         </b-list-group-item>
-        <b-list-group-item class="list-group-item-accent-success list-group-item-divider">
+        <b-list-group-item href="#" class="list-group-item-accent-success list-group-item-divider">
           <div><strong>#10 Startups.Garden</strong> Meetup</div>
           <small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp; 1 - 3pm</small>
           <small class="text-muted"><i class="icon-location-pin"></i>&nbsp; Palo Alto, CA</small>
         </b-list-group-item>
-        <b-list-group-item class="list-group-item-accent-primary list-group-item-divider">
+        <b-list-group-item href="#" class="list-group-item-accent-primary list-group-item-divider">
           <div><strong>Team meeting</strong></div>
           <small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp; 4 - 6pm</small>
           <small class="text-muted"><i class="icon-home"></i>&nbsp; creativeLabs HQ</small>
@@ -183,7 +183,7 @@
         <div class="aside-options">
           <div class="clearfix mt-4">
             <small><b>Option 1</b></small>
-            <c-switch type="text" variant="success" on="on" off="off" :pill="true" size="sm" class="float-right" :checked="true" />
+            <c-switch color="success" label variant="pill" size="sm" class="float-right" checked />
           </div>
           <div>
             <small class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</small>
@@ -192,7 +192,7 @@
         <div class="aside-options">
           <div class="clearfix mt-3">
             <small><b>Option 2</b></small>
-            <c-switch type="text" variant="success" on="on" off="off" :pill="true" size="sm" class="float-right" />
+            <c-switch color="success" label variant="pill" size="sm" class="float-right" />
           </div>
           <div>
             <small class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</small>
@@ -201,7 +201,7 @@
         <div class="aside-options">
           <div class="clearfix mt-3">
             <small><b>Option 3</b></small>
-            <c-switch type="text" variant="success" on="on" off="off" :pill="true" size="sm" class="float-right" disabled />
+            <c-switch color="success" label variant="pill" size="sm" class="float-right" disabled defaultChecked/>
           </div>
           <div>
             <small class="text-muted">Disabled option.</small>
@@ -210,7 +210,7 @@
         <div class="aside-options">
           <div class="clearfix mt-3">
             <small><b>Option 4</b></small>
-            <c-switch type="text" variant="success" on="on" off="off" :pill="true" size="sm" class="float-right" checked />
+            <c-switch color="success" label variant="pill" size="sm" class="float-right" checked />
           </div>
         </div>
         <hr>
@@ -241,9 +241,9 @@
 </template>
 
 <script>
-import {Switch as cSwitch} from '../components'
+import { Switch as cSwitch } from '@coreui/vue'
 export default {
-  name: 'FullAside',
+  name: 'DafaultAside',
   components: {
     cSwitch
   }
diff --git a/src/containers/Full.vue b/src/containers/DefaultContainer.vue
similarity index 89%
rename from src/containers/Full.vue
rename to src/containers/DefaultContainer.vue
index 3bc75cc9..0f33fe35 100644
--- a/src/containers/Full.vue
+++ b/src/containers/DefaultContainer.vue
@@ -82,19 +82,21 @@
       </main>
       <AppAside fixed>
         <!--aside-->
-        <FullAside/>
+        <DafaultAside/>
       </AppAside>
     </div>
-    <AppFooter fixed>
+    <TheFooter>
       <!--footer-->
-    </AppFooter>
+    </TheFooter>
   </div>
 </template>
 
 <script>
 import nav from '../_nav'
-import { Header as AppHeader, HeaderDropdown as AppHeaderDropdown, SidebarToggler, Sidebar as AppSidebar, SidebarFooter, SidebarForm, SidebarHeader, SidebarMinimizer, SidebarNav, Aside as AppAside, AsideToggler, Footer as AppFooter, Breadcrumb } from '../components/'
-import FullAside from './FullAside'
+import { Header as AppHeader, HeaderDropdown as AppHeaderDropdown, SidebarToggler, Sidebar as AppSidebar, SidebarFooter, SidebarForm, SidebarHeader, SidebarMinimizer, SidebarNav, Aside as AppAside, AsideToggler, Footer as TheFooter, Breadcrumb } from '@coreui/vue'
+// import { Header as AppHeader, HeaderDropdown as AppHeaderDropdown, SidebarToggler, Sidebar as AppSidebar, SidebarFooter, SidebarForm, SidebarHeader, SidebarMinimizer, SidebarNav, Aside as AppAside, AsideToggler, Breadcrumb } from '../components/'
+// import { Footer as TheFooter } from '@coreui/vue'
+import DafaultAside from './DafaultAside'
 
 export default {
   name: 'full',
@@ -104,9 +106,9 @@ export default {
     AppHeaderDropdown,
     AppSidebar,
     AppAside,
-    AppFooter,
+    TheFooter,
     Breadcrumb,
-    FullAside,
+    DafaultAside,
     SidebarForm,
     SidebarFooter,
     SidebarToggler,
diff --git a/src/router/index.js b/src/router/index.js
index 4853a1f3..83347950 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 
 // Containers
-import Full from '@/containers/Full'
+import DefaultContainer from '@/containers/DefaultContainer'
 
 // Views
 import Dashboard from '@/views/Dashboard'
@@ -63,7 +63,7 @@ export default new Router({
       path: '/',
       redirect: '/dashboard',
       name: 'Home',
-      component: Full,
+      component: DefaultContainer,
       children: [
         {
           path: 'dashboard',
@@ -187,7 +187,7 @@ export default new Router({
         },
         {
           path: 'buttons',
-          redirect: '/buttons/buttons',
+          redirect: '/buttons/standard-buttons',
           name: 'Buttons',
           component: {
             render (c) { return c('router-view') }
@@ -195,7 +195,7 @@ export default new Router({
           children: [
             {
               path: 'standard-buttons',
-              name: 'Buttons',
+              name: 'Standard Buttons',
               component: StandardButtons
             },
             {
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index df484496..8b855dec 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -456,7 +456,7 @@ import CardBarChartExample from './dashboard/CardBarChartExample'
 import MainChartExample from './dashboard/MainChartExample'
 import SocialBoxChartExample from './dashboard/SocialBoxChartExample'
 import CalloutChartExample from './dashboard/CalloutChartExample'
-import { Callout } from '../components/'
+import { Callout } from '@coreui/vue'
 
 export default {
   name: 'dashboard',
diff --git a/src/views/dashboard/CalloutChartExample.vue b/src/views/dashboard/CalloutChartExample.vue
index 24092b1e..3b037040 100644
--- a/src/views/dashboard/CalloutChartExample.vue
+++ b/src/views/dashboard/CalloutChartExample.vue
@@ -1,6 +1,6 @@
 <script>
 import { Line } from 'vue-chartjs'
-import { getStyle } from '@coreui/coreui/js/src/utilities'
+import { getStyle } from '@coreui/coreui/dist/js/coreui-utilities'
 
 // const brandPrimary = '#20a8d8'
 // const brandSuccess = '#4dbd74'
diff --git a/src/views/theme/ColorTheme.vue b/src/views/theme/ColorTheme.vue
new file mode 100644
index 00000000..a462f1e0
--- /dev/null
+++ b/src/views/theme/ColorTheme.vue
@@ -0,0 +1,29 @@
+<template>
+  <b-col xl="2" md="4" sm="6" xs="12" class="mb-4">
+    <div :class="[classObj, color]" :style="{ paddingTop: '75%' }"></div>
+    <slot></slot>
+    <color-view/>
+  </b-col>
+</template>
+
+<script>
+import ColorView from './ColorView'
+export default {
+  name: 'ColorTheme',
+  components: { ColorView },
+  props: {
+    classObj: {
+      type: String,
+      default: 'theme-color w-75 rounded mb-3'
+    },
+    color: {
+      type: String,
+      default: 'bg-secondary'
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/theme/ColorView.vue b/src/views/theme/ColorView.vue
new file mode 100644
index 00000000..b63f50c2
--- /dev/null
+++ b/src/views/theme/ColorView.vue
@@ -0,0 +1,46 @@
+<template>
+  <table class="w-100">
+    <tbody>
+    <tr>
+      <td class="text-muted">HEX:</td>
+      <td class="font-weight-bold">{{this.hexColor}}</td>
+    </tr>
+    <tr>
+      <td class="text-muted">RGB:</td>
+      <td class="font-weight-bold">{{this.bgColor}}</td>
+    </tr>
+    </tbody>
+  </table>
+</template>
+
+<script>
+import { rgbToHex } from '@coreui/coreui/dist/js/coreui-utilities'
+export default {
+  name: 'ColorView',
+  data: function () {
+    return {
+      bgColor: 'rgb(255, 255, 255)'
+    }
+  },
+  computed: {
+    hexColor () {
+      return rgbToHex(this.bgColor)
+    }
+  },
+  methods: {
+    setColor () {
+      const elem = this.$parent.$el.children[0]
+      const color = window.getComputedStyle(elem).getPropertyValue('background-color')
+      this.bgColor = color || this.bgColor
+    }
+  },
+  mounted () {
+    console.log('mounted')
+    this.setColor()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/theme/Colors.vue b/src/views/theme/Colors.vue
index b64af7d7..277fce9c 100644
--- a/src/views/theme/Colors.vue
+++ b/src/views/theme/Colors.vue
@@ -1,102 +1,69 @@
 <template>
   <div class="animated fadeIn">
-    <div class="card">
-      <div class="card-header">
+    <b-card header-tag="header">
+      <div slot="header">
         <i class="icon-drop"></i> Theme colors
       </div>
-      <div class="card-body">
-        <div class="row">
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-primary">Primary</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-secondary">Secondary</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-success">Success</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-danger">Danger</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-warning">Warning</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-info">Info</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-light">Light</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-dark">Dark</div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="card">
-      <div class="card-header">
+      <b-card-body>
+        <b-row>
+          <color-theme color="bg-primary">
+            <h6>Brand Primary Color</h6>
+          </color-theme>
+          <color-theme color="bg-secondary"><h6>Brand Secondary Color</h6></color-theme>
+          <color-theme color="bg-success"><h6>Brand Success Color</h6></color-theme>
+          <color-theme color="bg-danger"><h6>Brand Danger Color</h6></color-theme>
+          <color-theme color="bg-warning"><h6>Brand Warning Color</h6></color-theme>
+          <color-theme color="bg-info"><h6>Brand Info Color</h6></color-theme>
+          <color-theme color="bg-light"><h6>Brand Light Color</h6></color-theme>
+          <color-theme color="bg-dark"><h6>Brand Dark Color</h6></color-theme>
+        </b-row>
+      </b-card-body>
+    </b-card>
+    <b-card header-tag="header">
+      <div slot="header">
         <i class="icon-drop"></i> Grays
       </div>
-      <div class="card-body">
-        <div class="row mb-3">
-          <div class="col-md-4">
-            <div class="p-3 bg-gray-100">100</div>
-            <div class="p-3 bg-gray-200">200</div>
-            <div class="p-3 bg-gray-300">300</div>
-            <div class="p-3 bg-gray-400">400</div>
-            <div class="p-3 bg-gray-500">500</div>
-            <div class="p-3 bg-gray-600">600</div>
-            <div class="p-3 bg-gray-700">700</div>
-            <div class="p-3 bg-gray-800">800</div>
-            <div class="p-3 bg-gray-900">900</div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="card">
-      <div class="card-header">
+      <b-card-body>
+        <b-row>
+          <color-theme color="bg-gray-100"><h6>Brand 100 Color</h6></color-theme>
+          <color-theme color="bg-gray-200"><h6>Brand 200 Color</h6></color-theme>
+          <color-theme color="bg-gray-300"><h6>Brand 300 Color</h6></color-theme>
+          <color-theme color="bg-gray-400"><h6>Brand 400 Color</h6></color-theme>
+          <color-theme color="bg-gray-500"><h6>Brand 500 Color</h6></color-theme>
+          <color-theme color="bg-gray-600"><h6>Brand 600 Color</h6></color-theme>
+          <color-theme color="bg-gray-700"><h6>Brand 700 Color</h6></color-theme>
+          <color-theme color="bg-gray-800"><h6>Brand 800 Color</h6></color-theme>
+          <color-theme color="bg-gray-900"><h6>Brand 900 Color</h6></color-theme>
+        </b-row>
+      </b-card-body>
+    </b-card>
+    <b-card header-tag="header">
+      <div slot="header">
         <i class="icon-drop"></i> Additional colors
       </div>
-      <div class="card-body">
-        <div class="row">
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-blue">Blue</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-indigo">Indigo</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-purple">Purple</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-pink">Pink</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-red">Red</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-orange">Orange</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-yellow">Yellow</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-green">Green</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-teal">Teal</div>
-          </div>
-          <div class="col-md-4">
-            <div class="p-3 mb-3 bg-cyan">Cyan</div>
-          </div>
-        </div>
-      </div>
-    </div>
+      <b-card-body>
+        <b-row>
+          <color-theme color="bg-blue"><h6>Brand Blue Color</h6></color-theme>
+          <color-theme color="bg-indigo"><h6>Brand Indigo Color</h6></color-theme>
+          <color-theme color="bg-purple"><h6>Brand Purple Color</h6></color-theme>
+          <color-theme color="bg-pink"><h6>Brand Pink Color</h6></color-theme>
+          <color-theme color="bg-red"><h6>Brand Red Color</h6></color-theme>
+          <color-theme color="bg-orange"><h6>Brand Orange Color</h6></color-theme>
+          <color-theme color="bg-yellow"><h6>Brand Yellow Color</h6></color-theme>
+          <color-theme color="bg-green"><h6>Brand Green Color</h6></color-theme>
+          <color-theme color="bg-teal"><h6>Brand Teal Color</h6></color-theme>
+          <color-theme color="bg-cyan"><h6>Brand Cyan Color</h6></color-theme>
+        </b-row>
+      </b-card-body>
+    </b-card>
   </div>
 </template>
 
 <script>
+import ColorTheme from './ColorTheme'
+
 export default {
-  name: 'colors'
+  name: 'colors',
+  components: { ColorTheme }
 }
 </script>