Skip to content

Commit 7253a90

Browse files
woothuwoothu
committed
Chore: Merge branch 'dev' into v3-alpha to create v3.0.0-alpha.1 version
2 parents f0e3d72 + eddfdfd commit 7253a90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2859
-2987
lines changed

‎babel.config.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
module.exports = {
22
presets: [
3-
['@vue/app', {
4-
polyfills: [
5-
'es6.promise', // already default included now
6-
'es6.array.iterator', // already default included now
7-
'es6.symbol',
8-
'es6.object.assign'
9-
]
3+
[ "@vue/app", {
4+
"useBuiltIns": 'entry'
105
}]
116
]
127
}

‎package.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "3.0.0-alpha",
3+
"version": "3.0.0-alpha.1",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
77
"copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
88
"license": "MIT",
99
"scripts": {
1010
"serve": "vue-cli-service serve",
11-
"build": "vue-cli-service build",
11+
"build": "vue-cli-service build --modern",
1212
"lint": "vue-cli-service lint",
1313
"test:unit": "vue-cli-service test:unit",
1414
"test:e2e": "vue-cli-service test:e2e"
@@ -19,10 +19,10 @@
1919
"@coreui/icons": "0.3.0",
2020
"@coreui/vue": "github:coreui/coreui-vue#v3-bridge-alpha",
2121
"bootstrap": "^4.1.3",
22-
"bootstrap-vue": "^2.0.0-rc.11",
2322
"chart.js": "^2.7.3",
2423
"core-js": "^2.5.7",
2524
"css-vars-ponyfill": "^1.11.1",
25+
"current-script-polyfill": "^1.0.0",
2626
"element-resize-detector": "^1.2.0",
2727
"flag-icon-css": "^3.2.0",
2828
"font-awesome": "^4.7.0",
@@ -41,7 +41,10 @@
4141
"@vue/cli-plugin-unit-jest": "^3.0.5",
4242
"@vue/cli-service": "^3.0.5",
4343
"@vue/test-utils": "^1.0.0-beta.25",
44-
"babel-core": "^7.0.0-bridge.0",
44+
"babel-core": "^6.26.3",
45+
"babel-plugin-dynamic-import-node": "^2.2.0",
46+
"babel-plugin-module-resolver": "^3.1.2",
47+
"babel-preset-vue-app": "^2.0.0",
4548
"babel-jest": "^23.6.0",
4649
"growl": "^1.10.5",
4750
"https-proxy-agent": "^2.2.1",

‎src/containers/DefaultContainer.vue

+33-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@
3232
<CSidebar fixed>
3333
<CSidebarHeader/>
3434
<CSidebarForm/>
35-
<CSidebarNav :navItems="computedNav"></CSidebarNav>
35+
<!-- <CSidebarNav :navItems="computedNav"/> -->
36+
<nav class="sidebar-nav">
37+
<VuePerfectScrollbar class="scroll-area" :settings="psSettings"
38+
@ps-scroll-y="scrollHandle">
39+
<CSidebarNavItems :items="computedNav"/>
40+
</VuePerfectScrollbar>
41+
</nav>
3642
<CSidebarFooter/>
3743
<CSidebarMinimizer/>
3844
</CSidebar>
@@ -65,12 +71,14 @@
6571
import nav from '@/_nav'
6672
import DefaultAside from './DefaultAside'
6773
import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt'
74+
import VuePerfectScrollbar from 'vue-perfect-scrollbar'
6875
6976
export default {
7077
name: 'full',
7178
components: {
7279
DefaultAside,
7380
DefaultHeaderDropdownAccnt,
81+
VuePerfectScrollbar
7482
},
7583
data () {
7684
return {
@@ -80,7 +88,31 @@ export default {
8088
computed: {
8189
computedNav () {
8290
return this.nav.filter((item) => item.name !== 'Dashboard')
91+
},
92+
psSettings: () => {
93+
// ToDo: find better rtl fix
94+
return {
95+
maxScrollbarLength: 200,
96+
minScrollbarLength: 40,
97+
suppressScrollX: getComputedStyle(document.querySelector('html')).direction !== 'rtl',
98+
wheelPropagation: false,
99+
interceptRailY: styles => ({ ...styles, height: 0 })
100+
}
101+
}
102+
},
103+
methods: {
104+
/*eslint no-unused-vars: ["error", { "argsIgnorePattern": "evt" }]*/
105+
scrollHandle (evt) {
106+
// console.log(evt)
83107
}
84108
}
85109
}
86110
</script>
111+
112+
<style scoped lang="css">
113+
.scroll-area {
114+
position: absolute;
115+
height: 100%;
116+
margin: auto;
117+
}
118+
</style>

‎src/containers/DefaultHeaderDropdownAccnt.vue

+42-22
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,64 @@
11
<template>
2-
<CDropdown right
3-
nav
4-
no-caret
5-
no-popper
6-
addMenuClasses="dropdown-menu-right"
2+
<CDropdown
3+
right
4+
nav
5+
noCaret
6+
noPopper
7+
addMenuClasses="dropdown-menu-right"
78
>
8-
<img slot="buttonContent"
9-
src="img/avatars/6.jpg"
10-
class="img-avatar"
11-
alt="[email protected]"
12-
/>
13-
<CDropdownHeader tag="div" class="text-center"><strong>Account</strong></CDropdownHeader>
14-
<CDropdownItem><i class="fa fa-bell-o" /> Updates
9+
<template #buttonContent>
10+
<img
11+
src="img/avatars/6.jpg"
12+
class="img-avatar"
13+
alt="[email protected]"
14+
/>
15+
</template>
16+
<CDropdownHeader tag="div" class="text-center">
17+
<strong>Account</strong>
18+
</CDropdownHeader>
19+
<CDropdownItem>
20+
<i class="fa fa-bell-o" /> Updates
1521
<CBadge variant="info" additionalClasses="hehe">{{ itemsCount }}</CBadge>
1622
</CDropdownItem>
17-
<CDropdownItem><i class="fa fa-envelope-o" /> Messages
23+
<CDropdownItem>
24+
<i class="fa fa-envelope-o" /> Messages
1825
<CBadge variant="success">{{ itemsCount }}</CBadge>
1926
</CDropdownItem>
20-
<CDropdownItem><i class="fa fa-tasks" /> Tasks
27+
<CDropdownItem>
28+
<i class="fa fa-tasks" /> Tasks
2129
<CBadge variant="danger">{{ itemsCount }}</CBadge>
2230
</CDropdownItem>
23-
<CDropdownItem><i class="fa fa-comments" /> Comments
31+
<CDropdownItem>
32+
<i class="fa fa-comments" /> Comments
2433
<CBadge variant="warning">{{ itemsCount }}</CBadge>
2534
</CDropdownItem>
2635
<CDropdownHeader
2736
tag="div"
28-
class="text-center">
37+
class="text-center"
38+
>
2939
<strong>Settings</strong>
3040
</CDropdownHeader>
31-
<CDropdownItem><i class="fa fa-user" /> Profile</CDropdownItem>
32-
<CDropdownItem><i class="fa fa-wrench" /> Settings</CDropdownItem>
33-
<CDropdownItem><i class="fa fa-usd" /> Payments
41+
<CDropdownItem>
42+
<i class="fa fa-user" /> Profile
43+
</CDropdownItem>
44+
<CDropdownItem>
45+
<i class="fa fa-wrench" /> Settings
46+
</CDropdownItem>
47+
<CDropdownItem>
48+
<i class="fa fa-usd" /> Payments
3449
<CBadge variant="secondary">{{ itemsCount }}</CBadge>
3550
</CDropdownItem>
36-
<CDropdownItem><i class="fa fa-file" /> Projects
51+
<CDropdownItem>
52+
<i class="fa fa-file" /> Projects
3753
<CBadge variant="primary">{{ itemsCount }}</CBadge>
3854
</CDropdownItem>
3955
<CDropdownDivider/>
40-
<CDropdownItem><i class="fa fa-shield" /> Lock Account</CDropdownItem>
41-
<CDropdownItem><i class="fa fa-lock" /> Logout</CDropdownItem>
56+
<CDropdownItem>
57+
<i class="fa fa-shield" /> Lock Account
58+
</CDropdownItem>
59+
<CDropdownItem>
60+
<i class="fa fa-lock" /> Logout
61+
</CDropdownItem>
4262
</CDropdown>
4363
</template>
4464

‎src/main.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
// The Vue build version to load with the `import` command
22
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
3+
34
import 'core-js/es6/promise'
45
import 'core-js/es6/string'
56
import 'core-js/es7/array'
7+
import '@babel/polyfill'
68

79
// import cssVars from 'css-vars-ponyfill'
810
import Vue from 'vue'
9-
import BootstrapVue from 'bootstrap-vue'
1011
import App from './App'
1112
import router from './router'
1213
//Import built package
13-
import CoreuiVue from '@coreui/vue/src'
14+
import CoreuiVue from '@coreui/vue'
1415

1516
Vue.config.performance = true
1617
// todo
1718
// cssVars()
18-
Vue.use(BootstrapVue)
1919
Vue.use(CoreuiVue)
2020

2121

‎src/views/Charts.vue

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
<template>
22
<div class="animated fadeIn">
33
<CCardGroup columns class="card-columns">
4-
<CCard header="Line Chart">
4+
<CCard header="Line Chart" bodyWrapper>
55
<LineExample/>
66
</CCard>
7-
<CCard header="Bar Chart">
7+
<CCard header="Bar Chart" bodyWrapper>
88
<BarExample/>
99
</CCard>
10-
<CCard header="Doughnut Chart">
10+
<CCard header="Doughnut Chart" bodyWrapper>
1111
<DoughnutExample/>
1212
</CCard>
13-
<CCard header="Radar Chart">
13+
<CCard header="Radar Chart" bodyWrapper>
1414
<RadarExample/>
1515
</CCard>
16-
<CCard header="Pie Chart">
16+
<CCard header="Pie Chart" bodyWrapper>
1717
<PieExample/>
1818
</CCard>
19-
<CCard header="Polar Area Chart">
19+
<CCard header="Polar Area Chart" bodyWrapper>
2020
<PolarAreaExample/>
2121
</CCard>
22-
<CCard header="Simple line chart">
22+
<CCard header="Simple line chart" bodyWrapper>
2323
<CSimpleLineChart style="height:80px" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]'
2424
label='Sales' borderColor='success'/>
2525
</CCard>
26-
<CCard header="Simple pointed chart">
26+
<CCard header="Simple pointed chart" bodyWrapper>
2727
<CSimplePointedChart class='px-3' :data='[65, 59, 84, 84, 51, 55, 40]'
2828
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
2929
style='height:80px' label='Members' pointHoverColor='warning' borderColor='warning'/>
3030
</CCard>
31-
<CCard header="Simple bar chart">
31+
<CCard header="Simple bar chart" bodyWrapper>
3232
<CSimpleBarChart style="height:80px" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]'
3333
label='Sales' color='danger'/>
3434
</CCard>

0 commit comments

Comments
 (0)