Chore: Merge branch 'dev' into v3-alpha to create v3.0.0-alpha.1 version

coreui · Mar 5, 2019 · 7253a90 · 7253a90
2 parents f0e3d72 + eddfdfd
commit 7253a90
Show file tree

Hide file tree

Showing 41 changed files with 2,859 additions and 2,987 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -1,12 +1,7 @@
 module.exports = {
   presets: [
-    ['@vue/app', {
-      polyfills: [
-        'es6.promise', // already default included now
-        'es6.array.iterator', // already default included now
-        'es6.symbol',
-        'es6.object.assign'
-      ]
+    [ "@vue/app", {
+      "useBuiltIns": 'entry'
     }]
   ]
 }
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@coreui/coreui-free-vue-admin-template",
-  "version": "3.0.0-alpha",
+  "version": "3.0.0-alpha.1",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "http://coreui.io",
   "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
   "license": "MIT",
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "build": "vue-cli-service build --modern",
     "lint": "vue-cli-service lint",
     "test:unit": "vue-cli-service test:unit",
     "test:e2e": "vue-cli-service test:e2e"
@@ -19,10 +19,10 @@
     "@coreui/icons": "0.3.0",
     "@coreui/vue": "github:coreui/coreui-vue#v3-bridge-alpha",
     "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",
+    "current-script-polyfill": "^1.0.0",
     "element-resize-detector": "^1.2.0",
     "flag-icon-css": "^3.2.0",
     "font-awesome": "^4.7.0",
@@ -41,7 +41,10 @@
     "@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-core": "^6.26.3",
+    "babel-plugin-dynamic-import-node": "^2.2.0",
+    "babel-plugin-module-resolver": "^3.1.2",
+    "babel-preset-vue-app": "^2.0.0",
     "babel-jest": "^23.6.0",
     "growl": "^1.10.5",
     "https-proxy-agent": "^2.2.1",

diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue
@@ -32,7 +32,13 @@
       <CSidebar fixed>
         <CSidebarHeader/>
         <CSidebarForm/>
-        <CSidebarNav :navItems="computedNav"></CSidebarNav>
+        <!-- <CSidebarNav :navItems="computedNav"/> -->
+        <nav class="sidebar-nav">
+          <VuePerfectScrollbar class="scroll-area" :settings="psSettings"
+                               @ps-scroll-y="scrollHandle">
+              <CSidebarNavItems :items="computedNav"/>
+          </VuePerfectScrollbar>
+        </nav>
         <CSidebarFooter/>
         <CSidebarMinimizer/>
       </CSidebar>
@@ -65,12 +71,14 @@
 import nav from '@/_nav'
 import DefaultAside from './DefaultAside'
 import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt'
+import VuePerfectScrollbar from 'vue-perfect-scrollbar'
 
 export default {
   name: 'full',
   components: {
     DefaultAside,
     DefaultHeaderDropdownAccnt,
+    VuePerfectScrollbar
   },
   data () {
     return {
@@ -80,7 +88,31 @@ export default {
   computed: {
     computedNav () {
       return this.nav.filter((item) => item.name !== 'Dashboard')
+    },
+    psSettings: () => {
+      // ToDo: find better rtl fix
+      return {
+        maxScrollbarLength: 200,
+        minScrollbarLength: 40,
+        suppressScrollX: getComputedStyle(document.querySelector('html')).direction !== 'rtl',
+        wheelPropagation: false,
+        interceptRailY: styles => ({ ...styles, height: 0 })
+      }
+    }
+  },
+  methods: {
+    /*eslint no-unused-vars: ["error", { "argsIgnorePattern": "evt" }]*/
+    scrollHandle (evt) {
+      // console.log(evt)
     }
   }
 }
 </script>
+
+<style scoped lang="css">
+  .scroll-area {
+    position: absolute;
+    height: 100%;
+    margin: auto;
+  }
+</style>
diff --git a/src/containers/DefaultHeaderDropdownAccnt.vue b/src/containers/DefaultHeaderDropdownAccnt.vue
@@ -1,44 +1,64 @@
 <template>
-  <CDropdown right
-             nav
-             no-caret
-             no-popper
-             addMenuClasses="dropdown-menu-right"
+  <CDropdown
+    right
+    nav
+    noCaret
+    noPopper
+    addMenuClasses="dropdown-menu-right"
   >
-    <img slot="buttonContent"
-         src="img/avatars/6.jpg"
-         class="img-avatar"
-         alt="admin@bootstrapmaster.com"
-    />
-    <CDropdownHeader tag="div"  class="text-center"><strong>Account</strong></CDropdownHeader>
-    <CDropdownItem><i class="fa fa-bell-o" /> Updates
+    <template #buttonContent>
+      <img
+        src="img/avatars/6.jpg"
+        class="img-avatar"
+        alt="admin@bootstrapmaster.com"
+      />
+    </template>
+    <CDropdownHeader tag="div" class="text-center">
+      <strong>Account</strong>
+    </CDropdownHeader>
+    <CDropdownItem>
+      <i class="fa fa-bell-o" /> Updates
       <CBadge variant="info" additionalClasses="hehe">{{ itemsCount }}</CBadge>
     </CDropdownItem>
-    <CDropdownItem><i class="fa fa-envelope-o" /> Messages
+    <CDropdownItem>
+      <i class="fa fa-envelope-o" /> Messages
       <CBadge variant="success">{{ itemsCount }}</CBadge>
     </CDropdownItem>
-    <CDropdownItem><i class="fa fa-tasks" /> Tasks
+    <CDropdownItem>
+      <i class="fa fa-tasks" /> Tasks
       <CBadge variant="danger">{{ itemsCount }}</CBadge>
     </CDropdownItem>
-    <CDropdownItem><i class="fa fa-comments" /> Comments
+    <CDropdownItem>
+      <i class="fa fa-comments" /> Comments
       <CBadge variant="warning">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownHeader
       tag="div"
-      class="text-center">
+      class="text-center"
+    >
       <strong>Settings</strong>
     </CDropdownHeader>
-    <CDropdownItem><i class="fa fa-user" /> Profile</CDropdownItem>
-    <CDropdownItem><i class="fa fa-wrench" /> Settings</CDropdownItem>
-    <CDropdownItem><i class="fa fa-usd" /> Payments
+    <CDropdownItem>
+      <i class="fa fa-user" /> Profile
+    </CDropdownItem>
+    <CDropdownItem>
+      <i class="fa fa-wrench" /> Settings
+    </CDropdownItem>
+    <CDropdownItem>
+      <i class="fa fa-usd" /> Payments
       <CBadge variant="secondary">{{ itemsCount }}</CBadge>
     </CDropdownItem>
-    <CDropdownItem><i class="fa fa-file" /> Projects
+    <CDropdownItem>
+      <i class="fa fa-file" /> Projects
       <CBadge variant="primary">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownDivider/>
-    <CDropdownItem><i class="fa fa-shield" /> Lock Account</CDropdownItem>
-    <CDropdownItem><i class="fa fa-lock" /> Logout</CDropdownItem>
+    <CDropdownItem>
+      <i class="fa fa-shield" /> Lock Account
+    </CDropdownItem>
+    <CDropdownItem>
+      <i class="fa fa-lock" /> Logout
+    </CDropdownItem>
   </CDropdown>
 </template>
 

diff --git a/src/main.js b/src/main.js
@@ -1,21 +1,21 @@
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+
 import 'core-js/es6/promise'
 import 'core-js/es6/string'
 import 'core-js/es7/array'
+import '@babel/polyfill'
 
 // import cssVars from 'css-vars-ponyfill'
 import Vue from 'vue'
-import BootstrapVue from 'bootstrap-vue'
 import App from './App'
 import router from './router'
 //Import built package
-import CoreuiVue from '@coreui/vue/src'
+import CoreuiVue from '@coreui/vue'
 
 Vue.config.performance = true
 // todo
 // cssVars()
-Vue.use(BootstrapVue)
 Vue.use(CoreuiVue)
 
 

diff --git a/src/views/Charts.vue b/src/views/Charts.vue
@@ -1,34 +1,34 @@
 <template>
   <div class="animated fadeIn">
     <CCardGroup columns class="card-columns">
-      <CCard header="Line Chart">
+      <CCard header="Line Chart" bodyWrapper>
         <LineExample/>
       </CCard>
-      <CCard header="Bar Chart">
+      <CCard header="Bar Chart" bodyWrapper>
         <BarExample/>
       </CCard>
-      <CCard header="Doughnut Chart">
+      <CCard header="Doughnut Chart" bodyWrapper>
         <DoughnutExample/>
       </CCard>
-      <CCard header="Radar Chart">
+      <CCard header="Radar Chart" bodyWrapper>
         <RadarExample/>
       </CCard>
-      <CCard header="Pie Chart">
+      <CCard header="Pie Chart" bodyWrapper>
         <PieExample/>
       </CCard>
-      <CCard header="Polar Area Chart">
+      <CCard header="Polar Area Chart" bodyWrapper>
         <PolarAreaExample/>
       </CCard>
-      <CCard header="Simple line chart">
+      <CCard header="Simple line chart" bodyWrapper>
         <CSimpleLineChart style="height:80px" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]'
                      label='Sales' borderColor='success'/>
       </CCard>
-      <CCard header="Simple pointed chart">
+      <CCard header="Simple pointed chart" bodyWrapper>
         <CSimplePointedChart class='px-3' :data='[65, 59, 84, 84, 51, 55, 40]'
                      :labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
                      style='height:80px' label='Members' pointHoverColor='warning' borderColor='warning'/>
       </CCard>
-      <CCard header="Simple bar chart">
+      <CCard header="Simple bar chart" bodyWrapper>
         <CSimpleBarChart style="height:80px" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]'
                     label='Sales' color='danger'/>
       </CCard>