Skip to content

Commit 50aae8d

Browse files
mrholekmrholek
committed
Merge branch 'dev'
2 parents cfd1a98 + 3e816ce commit 50aae8d

File tree

12 files changed

+3509
-5939
lines changed

12 files changed

+3509
-5939
lines changed

‎.eslintrc.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ module.exports = {
44
node: true,
55
},
66
extends: [
7-
'plugin:vue/vue3-recommended',
7+
'plugin:vue/vue3-essential',
88
'eslint:recommended',
9-
'@vue/prettier',
9+
'plugin:prettier/recommended',
1010
],
1111
parserOptions: {
12-
parser: 'babel-eslint',
12+
parser: '@babel/eslint-parser',
1313
},
1414
rules: {
1515
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
1616
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
17+
'vue/multi-word-component-names': 'off',
1718
},
1819
overrides: [
1920
{

‎jest.config.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
module.exports = {
22
preset: '@vue/cli-plugin-unit-jest',
3-
transform: {
4-
'^.+\\.vue$': 'vue-jest',
5-
},
63
}

‎jsconfig.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"compilerOptions": {
3+
"target": "es5",
4+
"module": "esnext",
5+
"baseUrl": "./",
6+
"moduleResolution": "node",
7+
"paths": {
8+
"@/*": [
9+
"src/*"
10+
]
11+
},
12+
"lib": [
13+
"esnext",
14+
"dom",
15+
"dom.iterable",
16+
"scripthost"
17+
]
18+
}
19+
}

‎package.json‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "4.0.1",
3+
"version": "4.1.0",
44
"description": "CoreUI Free Vue Admin Template",
55
"bugs": {
66
"url": "https://github.com/coreui/coreui-free-vue-admin-template/issues"
@@ -19,39 +19,42 @@
1919
"test:unit": "vue-cli-service test:unit"
2020
},
2121
"config": {
22-
"coreui_library_short_version": "4.0"
22+
"coreui_library_short_version": "4.1"
2323
},
2424
"dependencies": {
2525
"@coreui/chartjs": "^3.0.0",
26-
"@coreui/coreui": "^4.0.5",
26+
"@coreui/coreui": "^4.1.0",
2727
"@coreui/icons": "^2.1.0",
2828
"@coreui/icons-vue": "2.0.0",
2929
"@coreui/utils": "^1.3.1",
30-
"@coreui/vue": "^4.0.1",
30+
"@coreui/vue": "^4.1.0",
3131
"@coreui/vue-chartjs": "2.0.0",
3232
"core-js": "^3.19.0",
33-
"vue": "^3.2.19",
34-
"vue-router": "^4.0.0-0",
35-
"vuex": "^4.0.0-0"
33+
"vue": "^3.2.23",
34+
"vue-router": "^4.0.12",
35+
"vuex": "^4.0.2"
3636
},
3737
"devDependencies": {
38-
"@vue/cli-plugin-babel": "~4.5.14",
39-
"@vue/cli-plugin-e2e-cypress": "~4.5.14",
40-
"@vue/cli-plugin-eslint": "~4.5.14",
41-
"@vue/cli-plugin-router": "~4.5.14",
42-
"@vue/cli-plugin-unit-jest": "~4.5.14",
43-
"@vue/cli-plugin-vuex": "~4.5.14",
44-
"@vue/cli-service": "~4.5.14",
45-
"@vue/compiler-sfc": "^3.2.20",
46-
"@vue/eslint-config-prettier": "^6.0.0",
38+
"@babel/core": "^7.12.16",
39+
"@babel/eslint-parser": "^7.12.16",
40+
"@vue/cli-plugin-babel": "~5.0.0-rc.1",
41+
"@vue/cli-plugin-e2e-cypress": "~5.0.0-rc.1",
42+
"@vue/cli-plugin-eslint": "~5.0.0-rc.1",
43+
"@vue/cli-plugin-router": "~5.0.0-rc.1",
44+
"@vue/cli-plugin-unit-jest": "~5.0.0-rc.1",
45+
"@vue/cli-plugin-vuex": "~5.0.0-rc.1",
46+
"@vue/cli-service": "~5.0.0-rc.1",
4747
"@vue/test-utils": "^2.0.0-0",
48-
"babel-eslint": "^10.1.0",
48+
"@vue/vue3-jest": "^27.0.0-alpha.1",
49+
"babel-jest": "^27.0.6",
50+
"cypress": "^8.7.0",
4951
"eslint": "^7.32.0",
52+
"eslint-config-prettier": "^8.3.0",
5053
"eslint-plugin-prettier": "^4.0.0",
51-
"eslint-plugin-vue": "^7.20.0",
54+
"eslint-plugin-vue": "^8.0.3",
55+
"jest": "^27.0.5",
5256
"prettier": "^2.4.1",
53-
"sass": "^1.43.3",
54-
"sass-loader": "^10.2.0",
55-
"vue-jest": "^5.0.0-0"
57+
"sass": "^1.32.7",
58+
"sass-loader": "^12.0.0"
5659
}
5760
}

‎public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<!--
33
* CoreUI Vue.js Admin Template
4-
* @version v4.0.1
4+
* @version v4.1.0
55
* @link https://coreui.io/vue/
66
* Copyright (c) 2021 creativeLabs Łukasz Holeczek
77
* License (https://coreui.io/pro/license)

‎src/_nav.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,16 @@ export default [
7070
name: 'Navs & Tabs',
7171
to: '/base/navs',
7272
},
73-
7473
{
7574
component: 'CNavItem',
7675
name: 'Paginations',
7776
to: '/base/paginations',
7877
},
78+
{
79+
component: 'CNavItem',
80+
name: 'Placeholders',
81+
to: '/base/placeholders',
82+
},
7983
{
8084
component: 'CNavItem',
8185
name: 'Popovers',

‎src/router/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ const routes = [
8484
name: 'Paginations',
8585
component: () => import('@/views/base/Paginations.vue'),
8686
},
87+
{
88+
path: '/base/placeholders',
89+
name: 'Placeholders',
90+
component: () => import('@/views/base/Placeholders.vue'),
91+
},
8792
{
8893
path: '/base/popovers',
8994
name: 'Popovers',

‎src/views/Dashboard.vue‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,15 @@
100100
<CRow>
101101
<CCol :sm="6">
102102
<div
103-
class="
104-
border-start border-start-4 border-start-info
105-
py-1
106-
px-3
107-
mb-3
108-
"
103+
class="border-start border-start-4 border-start-info py-1 px-3 mb-3"
109104
>
110105
<div class="text-medium-emphasis small">New Clients</div>
111106
<div class="fs-5 fw-semibold">9,123</div>
112107
</div>
113108
</CCol>
114109
<CCol :sm="6">
115110
<div
116-
class="
117-
border-start border-start-4 border-start-danger
118-
py-1
119-
px-3
120-
mb-3
121-
"
111+
class="border-start border-start-4 border-start-danger py-1 px-3 mb-3"
122112
>
123113
<div class="text-medium-emphasis small">
124114
Recurring Clients
@@ -148,25 +138,15 @@
148138
<CRow>
149139
<CCol :sm="6">
150140
<div
151-
class="
152-
border-start border-start-4 border-start-warning
153-
py-1
154-
px-3
155-
mb-3
156-
"
141+
class="border-start border-start-4 border-start-warning py-1 px-3 mb-3"
157142
>
158143
<div class="text-medium-emphasis small">Pageviews</div>
159144
<div class="fs-5 fw-semibold">78,623</div>
160145
</div>
161146
</CCol>
162147
<CCol :sm="6">
163148
<div
164-
class="
165-
border-start border-start-4 border-start-success
166-
py-1
167-
px-3
168-
mb-3
169-
"
149+
class="border-start border-start-4 border-start-success py-1 px-3 mb-3"
170150
>
171151
<div class="text-medium-emphasis small">Organic</div>
172152
<div class="fs-5 fw-semibold">49,123</div>

‎src/views/base/Collapses.vue‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,39 @@
3232
</DocsExample>
3333
</CCardBody>
3434
</CCard>
35+
<CCard class="mb-4">
36+
<CCardHeader>
37+
<strong>Vue Collapse</strong> <small> Horizontal</small>
38+
</CCardHeader>
39+
<CCardBody>
40+
<p class="text-medium-emphasis small">
41+
The collapse plugin also supports horizontal collapsing. Add the
42+
<code>horizontal</code> property to transition the
43+
<code>width</code> instead of <code>height</code> and set a
44+
<code>width</code> on the immediate child element.
45+
</p>
46+
<DocsExample href="components/collapse.html#horizontal">
47+
<CButton
48+
class="mb-3"
49+
color="primary"
50+
aria-expanded="{visible}"
51+
aria-controls="collapseWidthExample"
52+
@click="visibleHorizontal = !visibleHorizontal"
53+
>Button</CButton
54+
>
55+
<div style="min-height: 120px">
56+
<CCollapse horizontal :visible="visibleHorizontal">
57+
<CCard style="width: 300px">
58+
<CCardBody>
59+
This is some placeholder content for a horizontal collapse.
60+
It's hidden by default and shown when triggered.
61+
</CCardBody>
62+
</CCard>
63+
</CCollapse>
64+
</div>
65+
</DocsExample>
66+
</CCardBody>
67+
</CCard>
3568
<CCard class="mb-4">
3669
<CCardHeader>
3770
<strong>Vue Collapse</strong> <small> multi target</small>
@@ -100,10 +133,12 @@ export default {
100133
const visible = ref(false)
101134
const visibleA = ref(false)
102135
const visibleB = ref(false)
136+
const visibleHorizontal = ref(false)
103137
return {
104138
visible,
105139
visibleA,
106140
visibleB,
141+
visibleHorizontal,
107142
}
108143
},
109144
}

0 commit comments

Comments
 (0)