Skip to content

Commit 0712ea9

Browse files
mrholekmrholek
committed
Merge branch 'dev'
2 parents a11e5df + 863efa0 commit 0712ea9

Some content is hidden

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

45 files changed

+1004
-1335
lines changed

‎.eslintignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
node_modules/*
2-
./node_modules/**
3-
**/node_modules/**
42
/dist/**
53
.eslintrc.js
6-
/Users/lukaszholeczek/CoreUI/@coreui/icons-vue/**/*
7-
/Users/lukaszholeczek/CoreUI/@coreui/icons-vue/
8-
**/*

‎babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
presets: ['@vue/cli-plugin-babel/preset']
2+
presets: ['@vue/cli-plugin-babel/preset'],
33
}

‎package.json

Lines changed: 3 additions & 4 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.0",
3+
"version": "4.0.1",
44
"description": "CoreUI Free Vue Admin Template",
55
"bugs": {
66
"url": "https://github.com/coreui/coreui-free-vue-admin-template/issues"
@@ -27,7 +27,7 @@
2727
"@coreui/icons": "^2.1.0",
2828
"@coreui/icons-vue": "2.0.0",
2929
"@coreui/utils": "^1.3.1",
30-
"@coreui/vue": "^4.0.0",
30+
"@coreui/vue": "^4.0.1",
3131
"@coreui/vue-chartjs": "2.0.0",
3232
"core-js": "^3.19.0",
3333
"vue": "^3.2.19",
@@ -36,7 +36,7 @@
3636
},
3737
"devDependencies": {
3838
"@vue/cli-plugin-babel": "~4.5.14",
39-
"@vue/cli-plugin-e2e-nightwatch": "~4.5.14",
39+
"@vue/cli-plugin-e2e-cypress": "~4.5.14",
4040
"@vue/cli-plugin-eslint": "~4.5.14",
4141
"@vue/cli-plugin-router": "~4.5.14",
4242
"@vue/cli-plugin-unit-jest": "~4.5.14",
@@ -49,7 +49,6 @@
4949
"eslint": "^7.32.0",
5050
"eslint-plugin-prettier": "^4.0.0",
5151
"eslint-plugin-vue": "^7.20.0",
52-
"geckodriver": "^2.0.4",
5352
"prettier": "^2.4.1",
5453
"sass": "^1.43.3",
5554
"sass-loader": "^10.2.0",

‎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.0
4+
* @version v4.0.1
55
* @link https://coreui.io/vue/
66
* Copyright (c) 2021 creativeLabs Łukasz Holeczek
77
* License (https://coreui.io/pro/license)

‎src/App.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
</template>
44

55
<style lang="scss">
6-
// Import Main styles for this application
7-
@import 'styles/style';
6+
// Import Main styles for this application
7+
@import 'styles/style';
88
</style>
9-

‎src/assets/icons/index.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import {
2222
cibCcStripe,
2323
cibCcPaypal,
2424
cibCcApplePay,
25-
cibCcAmex
26-
} from "@coreui/icons";
27-
import { cifUs, cifBr, cifIn, cifFr, cifEs, cifPl } from "@coreui/icons";
25+
cibCcAmex,
26+
} from '@coreui/icons'
27+
import { cifUs, cifBr, cifIn, cifFr, cifEs, cifPl } from '@coreui/icons'
2828
import {
2929
cilArrowBottom,
3030
cilArrowRight,
@@ -76,8 +76,8 @@ import {
7676
cilUser,
7777
cilUserFemale,
7878
cilUserFollow,
79-
cilXCircle
80-
} from "@coreui/icons";
79+
cilXCircle,
80+
} from '@coreui/icons'
8181

8282
export const iconsSet = Object.assign(
8383
{},
@@ -132,15 +132,15 @@ export const iconsSet = Object.assign(
132132
cilUser,
133133
cilUserFemale,
134134
cilUserFollow,
135-
cilXCircle
135+
cilXCircle,
136136
},
137137
{
138138
cifUs,
139139
cifBr,
140140
cifIn,
141141
cifFr,
142142
cifEs,
143-
cifPl
143+
cifPl,
144144
},
145145
{
146146
cibFacebook,
@@ -166,6 +166,6 @@ export const iconsSet = Object.assign(
166166
cibCcStripe,
167167
cibCcPaypal,
168168
cibCcApplePay,
169-
cibCcAmex
170-
}
171-
);
169+
cibCcAmex,
170+
},
171+
)

‎src/components/AppBreadcrumb.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<CBreadcrumb class="d-md-down-none me-auto mb-0">
33
<CBreadcrumbItem
44
v-for="item in breadcrumbs"
5+
:key="item"
56
:href="item.active ? '' : item.path"
67
:active="item.active"
7-
:key="item"
88
>
99
{{ item.name }}
1010
</CBreadcrumbItem>

‎src/components/AppHeader.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export default {
5555
AppHeaderDropdownAccnt,
5656
},
5757
setup() {
58-
5958
return {
6059
logo,
6160
}

‎src/components/AppSidebar.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
>
1414
<CSidebarBrand>
1515
<CIcon
16-
customClassName="sidebar-brand-full"
16+
custom-class-name="sidebar-brand-full"
1717
:icon="logoNegative"
1818
:height="35"
1919
/>
2020
<CIcon
21-
customClassName="sidebar-brand-narrow"
21+
custom-class-name="sidebar-brand-narrow"
2222
:icon="sygnet"
2323
:height="35"
2424
/>

‎src/components/AppSidebarNav.js

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,45 @@
11
import { defineComponent, h, onMounted, ref, resolveComponent } from 'vue'
22
import { RouterLink, useRoute } from 'vue-router'
33

4-
import { CBadge, CSidebarNav, CNavItem, CNavGroup, CNavTitle } from '@coreui/vue'
4+
import {
5+
CBadge,
6+
CSidebarNav,
7+
CNavItem,
8+
CNavGroup,
9+
CNavTitle,
10+
} from '@coreui/vue'
511
import nav from '@/_nav.js'
612

713
const normalizePath = (path) =>
8-
decodeURI(path)
9-
.replace(/#.*$/, '')
10-
.replace(/(index)?\.(html)$/, '')
14+
decodeURI(path)
15+
.replace(/#.*$/, '')
16+
.replace(/(index)?\.(html)$/, '')
1117

1218
const isActiveLink = (route, link) => {
13-
if (link === undefined) {
14-
return false
15-
}
19+
if (link === undefined) {
20+
return false
21+
}
1622

17-
if (route.hash === link) {
18-
return true
19-
}
23+
if (route.hash === link) {
24+
return true
25+
}
2026

21-
const currentPath = normalizePath(route.path)
22-
const targetPath = normalizePath(link)
27+
const currentPath = normalizePath(route.path)
28+
const targetPath = normalizePath(link)
2329

24-
return currentPath === targetPath
30+
return currentPath === targetPath
2531
}
2632

2733
const isActiveItem = (route, item) => {
28-
if (isActiveLink(route, item.to)) {
29-
return true
30-
}
34+
if (isActiveLink(route, item.to)) {
35+
return true
36+
}
3137

32-
if (item.items) {
33-
return item.items.some((child) => isActiveItem(route, child))
34-
}
38+
if (item.items) {
39+
return item.items.some((child) => isActiveItem(route, child))
40+
}
3541

36-
return false
42+
return false
3743
}
3844

3945
const AppSidebarNav = defineComponent({
@@ -56,7 +62,9 @@ const AppSidebarNav = defineComponent({
5662
return h(
5763
CNavGroup,
5864
{
59-
...firstRender.value && { visible: item.items.some((child) => isActiveItem(route, child))}
65+
...(firstRender.value && {
66+
visible: item.items.some((child) => isActiveItem(route, child)),
67+
}),
6068
},
6169
{
6270
togglerContent: () => [

0 commit comments

Comments
 (0)