Skip to content

Commit 09528cc

Browse files
xidedixxidedix
authored
Merge pull request #132 from coreui/dev-vnext
v.2.0.2
2 parents 67f94d9 + fdff4fb commit 09528cc

File tree

99 files changed

+55475
-140
lines changed

Some content is hidden

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

99 files changed

+55475
-140
lines changed

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
## [CoreUI for Vue.js](./README.md) version `changelog`
22

3+
##### `v2.0.2`
4+
- refactor: extract random() to `shared/utils`
5+
- refactor: extract shuffleArray() to shared/utils
6+
- refactor: Tables pass items as props to Table
7+
- refactor: some views minor cleanup
8+
- tests(e2e): add some more test cases
9+
- tests(unit): add some more test cases and snapshots
10+
- chore: update `@coreui/coreui` to `2.0.20`
11+
- chore: update `chart.js` to `2.7.3`
12+
- chore: update `@vue/cli-plugin-babel` to `3.0.5`
13+
- chore: update `@vue/cli-plugin-e2e-nightwatch` to `3.0.5`
14+
- chore: update `@vue/cli-plugin-eslint` to `3.0.5`
15+
- chore: update `@vue/cli-plugin-unit-jest` to `3.0.5`
16+
- chore: update `@vue/cli-service` to `3.0.5`
17+
- chore: update `node-sass` to `4.9.4`
18+
319
##### `v2.0.1`
420
- refactor(Modals): add spacing
521
- refactor(BrandButtons): add spacing

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -14,13 +14,13 @@
1414
"test:e2e": "vue-cli-service test:e2e"
1515
},
1616
"dependencies": {
17-
"@coreui/coreui": "^2.0.14",
17+
"@coreui/coreui": "^2.0.20",
1818
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
1919
"@coreui/icons": "0.3.0",
2020
"@coreui/vue": "^2.0.2",
2121
"bootstrap": "^4.1.3",
2222
"bootstrap-vue": "^2.0.0-rc.11",
23-
"chart.js": "^2.7.2",
23+
"chart.js": "^2.7.3",
2424
"core-js": "^2.5.7",
2525
"css-vars-ponyfill": "^1.11.1",
2626
"flag-icon-css": "^3.2.0",
@@ -33,17 +33,17 @@
3333
"vue-router": "^3.0.1"
3434
},
3535
"devDependencies": {
36-
"@vue/cli-plugin-babel": "^3.0.4",
37-
"@vue/cli-plugin-e2e-nightwatch": "^3.0.4",
38-
"@vue/cli-plugin-eslint": "^3.0.4",
39-
"@vue/cli-plugin-unit-jest": "^3.0.4",
40-
"@vue/cli-service": "^3.0.4",
36+
"@vue/cli-plugin-babel": "^3.0.5",
37+
"@vue/cli-plugin-e2e-nightwatch": "^3.0.5",
38+
"@vue/cli-plugin-eslint": "^3.0.5",
39+
"@vue/cli-plugin-unit-jest": "^3.0.5",
40+
"@vue/cli-service": "^3.0.5",
4141
"@vue/test-utils": "^1.0.0-beta.25",
4242
"babel-core": "^7.0.0-bridge.0",
4343
"babel-jest": "^23.6.0",
4444
"growl": "^1.10.5",
4545
"https-proxy-agent": "^2.2.1",
46-
"node-sass": "^4.9.3",
46+
"node-sass": "^4.9.4",
4747
"sass-loader": "^7.1.0",
4848
"vue-template-compiler": "^2.5.17"
4949
},

‎src/containers/DefaultContainer.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import DefaultAside from './DefaultAside'
6868
import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt'
6969
7070
export default {
71-
name: 'full',
71+
name: 'DefaultContainer',
7272
components: {
7373
AsideToggler,
7474
AppHeader,

‎src/shared/utils.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export function random (min, max) {
2+
return Math.floor(Math.random() * (max - min + 1) + min)
3+
}
4+
5+
/**
6+
* Randomize array element order in-place.
7+
* Using Durstenfeld shuffle algorithm.
8+
*/
9+
export const shuffleArray = (array) => {
10+
for (let i = array.length - 1; i > 0; i--) {
11+
let j = Math.floor(Math.random() * (i + 1))
12+
let temp = array[i]
13+
array[i] = array[j]
14+
array[j] = temp
15+
}
16+
return array
17+
}

‎src/views/base/Popovers.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
<b-row>
4343
<b-col md="4" class="py-4 text-center"
4444
v-for="placement in placements" :key="placement">
45-
<b-btn :id="'exPopover1-'+placement" variant="primary">
45+
<b-btn :id="`exPopover1-${placement}`" variant="primary">
4646
{{ placement }}
4747
</b-btn>
48-
<b-popover :target="'exPopover1-'+placement"
48+
<b-popover :target="`exPopover1-${placement}`"
4949
:placement="placement"
5050
title="Popover!"
5151
triggers="hover focus"

‎src/views/base/ProgressBars.vue‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,17 @@ export default {
185185
this.counter = Math.random() * this.max
186186
console.log('Change progress to ' +
187187
Math.round(this.counter * 100) / 100)
188+
},
189+
setClock() {
190+
this.timer = setInterval(() => {
191+
this.bars.forEach(bar => {
192+
bar.value = 25 + (Math.random() * 75)
193+
})
194+
}, 2000)
188195
}
189196
},
190197
mounted () {
191-
this.timer = setInterval(() => {
192-
this.bars.forEach(bar => {
193-
bar.value = 25 + (Math.random() * 75)
194-
})
195-
}, 2000)
198+
this.setClock()
196199
},
197200
beforeDestroy () {
198201
clearInterval(this.timer)

‎src/views/base/Switches.vue‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,6 @@ export default {
417417
components: {
418418
cSwitch
419419
},
420-
computed: {
421-
icon (icon) {
422-
return icon
423-
}
424-
},
425420
data: () => {
426421
return {
427422
fields: [

‎src/views/base/Table.vue‎

Lines changed: 30 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,22 @@
11
<template>
22
<b-card :header="caption">
3-
<b-table :hover="hover" :striped="striped" :bordered="bordered" :small="small" :fixed="fixed" responsive="sm" :items="items" :fields="fields" :current-page="currentPage" :per-page="perPage">
3+
<b-table :dark="dark" :hover="hover" :striped="striped" :bordered="bordered" :small="small" :fixed="fixed" responsive="sm" :items="items" :fields="captions" :current-page="currentPage" :per-page="perPage">
44
<template slot="status" slot-scope="data">
55
<b-badge :variant="getBadge(data.item.status)">{{data.item.status}}</b-badge>
66
</template>
77
</b-table>
88
<nav>
9-
<b-pagination :total-rows="getRowCount(items)" :per-page="perPage" v-model="currentPage" prev-text="Prev" next-text="Next" hide-goto-end-buttons/>
9+
<b-pagination :total-rows="totalRows" :per-page="perPage" v-model="currentPage" prev-text="Prev" next-text="Next" hide-goto-end-buttons/>
1010
</nav>
1111
</b-card>
1212
</template>
1313

1414
<script>
15-
/**
16-
* Randomize array element order in-place.
17-
* Using Durstenfeld shuffle algorithm.
18-
*/
19-
const shuffleArray = (array) => {
20-
for (let i = array.length - 1; i > 0; i--) {
21-
let j = Math.floor(Math.random() * (i + 1))
22-
let temp = array[i]
23-
array[i] = array[j]
24-
array[j] = temp
25-
}
26-
return array
27-
}
15+
2816
2917
export default {
3018
name: 'c-table',
19+
inheritAttrs: false,
3120
props: {
3221
caption: {
3322
type: String,
@@ -52,57 +41,46 @@ export default {
5241
fixed: {
5342
type: Boolean,
5443
default: false
44+
},
45+
tableData: {
46+
type: [Array, Function],
47+
default: () => []
48+
},
49+
fields: {
50+
type: [Array, Object],
51+
default: () => []
52+
},
53+
perPage: {
54+
type: Number,
55+
default: 5
56+
},
57+
dark: {
58+
type: Boolean,
59+
default: false
5560
}
5661
},
5762
data: () => {
5863
return {
59-
items: shuffleArray([
60-
{username: 'Samppa Nori', registered: '2012/01/01', role: 'Member', status: 'Active'},
61-
{username: 'Estavan Lykos', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
62-
{username: 'Chetan Mohamed', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
63-
{username: 'Derick Maximinus', registered: '2012/03/01', role: 'Member', status: 'Pending'},
64-
{username: 'Friderik Dávid', registered: '2012/01/21', role: 'Staff', status: 'Active'},
65-
{username: 'Yiorgos Avraamu', registered: '2012/01/01', role: 'Member', status: 'Active'},
66-
{username: 'Avram Tarasios', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
67-
{username: 'Quintin Ed', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
68-
{username: 'Enéas Kwadwo', registered: '2012/03/01', role: 'Member', status: 'Pending'},
69-
{username: 'Agapetus Tadeáš', registered: '2012/01/21', role: 'Staff', status: 'Active'},
70-
{username: 'Carwyn Fachtna', registered: '2012/01/01', role: 'Member', status: 'Active'},
71-
{username: 'Nehemiah Tatius', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
72-
{username: 'Ebbe Gemariah', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
73-
{username: 'Eustorgios Amulius', registered: '2012/03/01', role: 'Member', status: 'Pending'},
74-
{username: 'Leopold Gáspár', registered: '2012/01/21', role: 'Staff', status: 'Active'},
75-
{username: 'Pompeius René', registered: '2012/01/01', role: 'Member', status: 'Active'},
76-
{username: 'Paĉjo Jadon', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
77-
{username: 'Micheal Mercurius', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
78-
{username: 'Ganesha Dubhghall', registered: '2012/03/01', role: 'Member', status: 'Pending'},
79-
{username: 'Hiroto Šimun', registered: '2012/01/21', role: 'Staff', status: 'Active'},
80-
{username: 'Vishnu Serghei', registered: '2012/01/01', role: 'Member', status: 'Active'},
81-
{username: 'Zbyněk Phoibos', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
82-
{username: 'Einar Randall', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
83-
{username: 'Félix Troels', registered: '2012/03/21', role: 'Staff', status: 'Active'},
84-
{username: 'Aulus Agmundr', registered: '2012/01/01', role: 'Member', status: 'Pending'}
85-
]),
86-
fields: [
87-
{key: 'username'},
88-
{key: 'registered'},
89-
{key: 'role'},
90-
{key: 'status'}
91-
],
9264
currentPage: 1,
93-
perPage: 5,
94-
totalRows: 0
9565
}
9666
},
67+
computed: {
68+
items: function() {
69+
const items = this.tableData
70+
return Array.isArray(items) ? items : items()
71+
},
72+
totalRows: function () { return this.getRowCount() },
73+
captions: function() { return this.fields }
74+
},
9775
methods: {
9876
getBadge (status) {
9977
return status === 'Active' ? 'success'
10078
: status === 'Inactive' ? 'secondary'
10179
: status === 'Pending' ? 'warning'
10280
: status === 'Banned' ? 'danger' : 'primary'
10381
},
104-
getRowCount (items) {
105-
return items.length
82+
getRowCount: function () {
83+
return this.items.length
10684
}
10785
}
10886
}

‎src/views/base/Tables.vue‎

Lines changed: 57 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,84 @@
33

44
<b-row>
55
<b-col lg="6">
6-
<c-table caption="<i class='fa fa-align-justify'></i> Simple Table"></c-table>
7-
</b-col><!--/.col-->
6+
<c-table :table-data="items" :fields="fields" caption="<i class='fa fa-align-justify'></i> Simple Table"></c-table>
7+
</b-col>
88

99
<b-col lg="6">
10-
<c-table striped caption="<i class='fa fa-align-justify'></i> Striped Table"></c-table>
11-
</b-col><!--/.col-->
10+
<c-table :table-data="items" striped caption="<i class='fa fa-align-justify'></i> Striped Table"></c-table>
11+
</b-col>
1212
</b-row><!--/.row-->
1313

1414
<b-row>
1515
<b-col lg="6">
16-
<c-table small caption="<i class='fa fa-align-justify'></i> Condensed Table"></c-table>
17-
</b-col><!--/.col-->
16+
<c-table :table-data="items" small caption="<i class='fa fa-align-justify'></i> Condensed Table"></c-table>
17+
</b-col>
1818

1919
<b-col lg="6">
20-
<c-table fixed bordered caption="<i class='fa fa-align-justify'></i> Bordered Table"></c-table>
21-
</b-col><!--/.col-->
22-
</b-row><!--/.row-->
20+
<c-table :table-data="items" fixed bordered caption="<i class='fa fa-align-justify'></i> Bordered Table"></c-table>
21+
</b-col>
22+
</b-row>
2323

2424
<b-row>
2525
<b-col sm="12">
26-
<c-table hover striped bordered small fixed caption="<i class='fa fa-align-justify'></i> Combined All Table"></c-table>
26+
<c-table :table-data="itemsArray" :per-page=10 hover striped bordered small fixed caption="<i class='fa fa-align-justify'></i> Combined All Table"></c-table>
27+
</b-col>
28+
</b-row>
29+
<b-row>
30+
<b-col sm="12">
31+
<c-table dark :table-data="itemsArray" :per-page=10 hover striped bordered small fixed caption="<i class='fa fa-align-justify'></i> Dark Table"></c-table>
2732
</b-col>
2833
</b-row>
2934
</div>
3035

3136
</template>
3237

3338
<script>
39+
import { shuffleArray } from '@/shared/utils'
3440
import cTable from './Table.vue'
3541
42+
const someData = () => shuffleArray([
43+
{username: 'Samppa Nori', registered: '2012/01/01', role: 'Member', status: 'Active', _rowVariant: 'success'},
44+
{username: 'Estavan Lykos', registered: '2012/02/01', role: 'Staff', status: 'Banned', _rowVariant: 'danger'},
45+
{username: 'Chetan Mohamed', registered: '2012/02/01', role: 'Admin', status: 'Inactive', _rowVariant: 'info'},
46+
{username: 'Derick Maximinus', registered: '2012/03/01', role: 'Member', status: 'Pending'},
47+
{username: 'Friderik Dávid', registered: '2012/01/21', role: 'Staff', status: 'Active'},
48+
{username: 'Yiorgos Avraamu', registered: '2012/01/01', role: 'Member', status: 'Active'},
49+
{username: 'Avram Tarasios', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
50+
{username: 'Quintin Ed', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
51+
{username: 'Enéas Kwadwo', registered: '2012/03/01', role: 'Member', status: 'Pending'},
52+
{username: 'Agapetus Tadeáš', registered: '2012/01/21', role: 'Staff', status: 'Active'},
53+
{username: 'Carwyn Fachtna', registered: '2012/01/01', role: 'Member', status: 'Active'},
54+
{username: 'Nehemiah Tatius', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
55+
{username: 'Ebbe Gemariah', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
56+
{username: 'Eustorgios Amulius', registered: '2012/03/01', role: 'Member', status: 'Pending'},
57+
{username: 'Leopold Gáspár', registered: '2012/01/21', role: 'Staff', status: 'Active'},
58+
{username: 'Pompeius René', registered: '2012/01/01', role: 'Member', status: 'Active'},
59+
{username: 'Paĉjo Jadon', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
60+
{username: 'Micheal Mercurius', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
61+
{username: 'Ganesha Dubhghall', registered: '2012/03/01', role: 'Member', status: 'Pending'},
62+
{username: 'Hiroto Šimun', registered: '2012/01/21', role: 'Staff', status: 'Active'},
63+
{username: 'Vishnu Serghei', registered: '2012/01/01', role: 'Member', status: 'Active'},
64+
{username: 'Zbyněk Phoibos', registered: '2012/02/01', role: 'Staff', status: 'Banned'},
65+
{username: 'Einar Randall', registered: '2012/02/01', role: 'Admin', status: 'Inactive'},
66+
{username: 'Félix Troels', registered: '2012/03/21', role: 'Staff', status: 'Active'},
67+
{username: 'Aulus Agmundr', registered: '2012/01/01', role: 'Member', status: 'Pending'}
68+
])
69+
3670
export default {
3771
name: 'tables',
38-
components: {cTable}
72+
components: {cTable},
73+
data: () => {
74+
return {
75+
items: someData,
76+
itemsArray: someData(),
77+
fields: [
78+
{key: 'username', label: 'User', sortable: true},
79+
{key: 'registered'},
80+
{key: 'role'},
81+
{key: 'status', sortable: true}
82+
],
83+
}
84+
}
3985
}
4086
</script>

‎src/views/dashboard/MainChartExample.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
import { Line } from 'vue-chartjs'
33
import { getStyle, hexToRgba } from '@coreui/coreui/dist/js/coreui-utilities'
44
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
5-
6-
function random (min, max) {
7-
return Math.floor(Math.random() * (max - min + 1) + min)
8-
}
5+
import { random } from '@/shared/utils'
96
107
export default {
118
extends: Line,

0 commit comments

Comments
 (0)