Skip to content

Commit f020186

Browse files
woothuwoothu
committed
chore: 3.0.0-beta.0 release: update dependencies
1 parent c4a941d commit f020186

File tree

101 files changed

+19148
-26394
lines changed

Some content is hidden

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

101 files changed

+19148
-26394
lines changed

‎package-lock.json

+362-97
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "3.0.0-alpha.6",
3+
"version": "3.0.0-beta.0",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -14,10 +14,10 @@
1414
"test:e2e": "vue-cli-service test:e2e"
1515
},
1616
"dependencies": {
17-
"@coreui/coreui": "3.0.0-beta.0",
18-
"@coreui/coreui-chartjs": "coreui/coreui-chartjs#v2",
19-
"@coreui/icons": "coreui/coreui-icons#v1-alpha",
20-
"@coreui/vue": "coreui/coreui-vue#3.0.0-alpha.6",
17+
"@coreui/coreui": "3.0.0-beta.3",
18+
"@coreui/coreui-vue-chartjs": "1.0.0-alpha.2",
19+
"@coreui/icons": "1.0.0-beta.3",
20+
"@coreui/vue": "3.0.0-beta.0",
2121
"vue": "^2.6.10",
2222
"vue-router": "^3.1.3"
2323
},
@@ -28,13 +28,13 @@
2828
"@vue/cli-plugin-unit-jest": "^4.0.5",
2929
"@vue/cli-service": "^4.0.5",
3030
"@vue/test-utils": "^1.0.0-beta.29",
31-
"@babel/core": "7.6.4",
31+
"@babel/core": "7.7.2",
3232
"babel-eslint": "^10.0.3",
3333
"babel-jest": "^24.9.0",
34-
"core-js": "^3.3.4",
35-
"chromedriver": "^77.0.0",
36-
"eslint": "^6.5.1",
37-
"eslint-plugin-vue": "^5.2.3",
34+
"core-js": "^3.4.1",
35+
"chromedriver": "^78.0.1",
36+
"eslint": "^6.6.0",
37+
"eslint-plugin-vue": "^6.0.1",
3838
"node-sass": "^4.13.0",
3939
"sass-loader": "^8.0.0",
4040
"vue-template-compiler": "^2.6.10"

‎src/App.vue

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ export default {
99
</script>
1010

1111
<style lang="scss">
12-
// CoreUI Icons Set
13-
@import '~@coreui/icons/css/coreui-icons.min.css';
1412
// Import Main styles for this application
1513
@import 'assets/scss/style';
1614
</style>

‎src/assets/icons/icons.js

+154-41
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,161 @@
11
import {
2-
facebook,
3-
twitter,
4-
linkedin,
5-
flickr,
6-
tumblr,
7-
xing,
8-
github,
9-
stackOverflow,
10-
youtube,
11-
dribbble,
12-
instagram,
13-
pinterest,
14-
vk,
15-
yahoo,
16-
behance,
17-
reddit,
18-
vimeo,
19-
ccMastercard, ccVisa, stripe, paypal, googleWallet, ccAmex
20-
} from '@coreui/icons/brands'
21-
import { US, BR, IN, FR, ES, PL } from '@coreui/icons/flags'
22-
import { iconSet } from '@coreui/icons'
2+
cibFacebook,
3+
cibTwitter,
4+
cibLinkedin,
5+
cibFlickr,
6+
cibTumblr,
7+
cibXing,
8+
cibGithub,
9+
cibStackOverflow,
10+
cibYoutube,
11+
cibDribbble,
12+
cibInstagram,
13+
cibPinterest,
14+
cibVk,
15+
cibYahoo,
16+
cibBehance,
17+
cibReddit,
18+
cibVimeo,
19+
cibCcMastercard,
20+
cibCcVisa,
21+
cibStripe,
22+
cibPaypal,
23+
cibGooglePay,
24+
cibCcAmex
25+
} from '@coreui/icons'
26+
import {
27+
cifUs,
28+
cifBr,
29+
cifIn,
30+
cifFr,
31+
cifEs,
32+
cifPl
33+
} from '@coreui/icons'
34+
import {
35+
cilArrowRight,
36+
cilBan,
37+
cilBasket,
38+
cilBell,
39+
cilCalculator,
40+
cilCalendar,
41+
cilCloudDownload,
42+
cilChartPie,
43+
cilCheck,
44+
cilChevronBottom,
45+
cilChevronTop,
46+
// cilCircleCheck,
47+
cilCommentSquare,
48+
cilCursor,
49+
cilDrop,
50+
cilDollar,
51+
cilEnvelopeClosed,
52+
cilEnvelopeOpen,
53+
cilEuro,
54+
cilGlobeAlt,
55+
cilFile,
56+
cilJustifyCenter,
57+
cilLaptop,
58+
cilLayers,
59+
cilLightbulb,
60+
cilList,
61+
cilLocationPin,
62+
cilLockLocked,
63+
cilMagnifyingGlass,
64+
cilMoon,
65+
cilPencil,
66+
cilPeople,
67+
cilPuzzle,
68+
cilSettings,
69+
cilShieldAlt,
70+
cilSpeech,
71+
cilSpeedometer,
72+
cilStar,
73+
cilTask,
74+
cilUser,
75+
cilUserFemale,
76+
cilUserFollow,
77+
cilXCircle
78+
79+
} from '@coreui/icons'
2380

2481
export const iconsSet = Object.assign(
2582
{},
26-
iconSet,
27-
{ US, BR, IN, FR, ES, PL },
2883
{
29-
facebook,
30-
twitter,
31-
linkedin,
32-
flickr,
33-
tumblr,
34-
xing,
35-
github,
36-
stackOverflow,
37-
youtube,
38-
dribbble,
39-
instagram,
40-
pinterest,
41-
vk,
42-
yahoo,
43-
behance,
44-
reddit,
45-
vimeo,
46-
ccMastercard, ccVisa, stripe, paypal, googleWallet, ccAmex
84+
cilArrowRight,
85+
cilBan,
86+
cilBasket,
87+
cilBell,
88+
cilCalculator,
89+
cilCalendar,
90+
cilCloudDownload,
91+
cilChartPie,
92+
cilCheck,
93+
cilChevronBottom,
94+
cilChevronTop,
95+
// cilCircleCheck,
96+
cilCommentSquare,
97+
cilCursor,
98+
cilDrop,
99+
cilDollar,
100+
cilEnvelopeClosed,
101+
cilEnvelopeOpen,
102+
cilEuro,
103+
cilGlobeAlt,
104+
cilFile,
105+
cilJustifyCenter,
106+
cilLaptop,
107+
cilLayers,
108+
cilLightbulb,
109+
cilList,
110+
cilLocationPin,
111+
cilLockLocked,
112+
cilMagnifyingGlass,
113+
cilMoon,
114+
cilPencil,
115+
cilPeople,
116+
cilPuzzle,
117+
cilSettings,
118+
cilShieldAlt,
119+
cilSpeech,
120+
cilSpeedometer,
121+
cilStar,
122+
cilTask,
123+
cilUser,
124+
cilUserFemale,
125+
cilUserFollow,
126+
cilXCircle
127+
},
128+
{
129+
cifUs,
130+
cifBr,
131+
cifIn,
132+
cifFr,
133+
cifEs,
134+
cifPl
135+
},
136+
{
137+
cibFacebook,
138+
cibTwitter,
139+
cibLinkedin,
140+
cibFlickr,
141+
cibTumblr,
142+
cibXing,
143+
cibGithub,
144+
cibStackOverflow,
145+
cibYoutube,
146+
cibDribbble,
147+
cibInstagram,
148+
cibPinterest,
149+
cibVk,
150+
cibYahoo,
151+
cibBehance,
152+
cibReddit,
153+
cibVimeo,
154+
cibCcMastercard,
155+
cibCcVisa,
156+
cibStripe,
157+
cibPaypal,
158+
cibGooglePay,
159+
cibCcAmex
47160
}
48161
)

‎src/assets/scss/style.scss

-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,5 @@
44
// Import styles
55
@import "~@coreui/coreui/scss/coreui";
66

7-
// Import custom tooltips styles
8-
@import "~@coreui/coreui-chartjs/custom-tooltips/dist/css/coreui-chartjs.css";
9-
107
// If you want to add something do it here
118
@import "custom";

‎src/containers/TheHeader.vue

+24-6
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,37 @@
1919
:wrappedInLink="{ href: 'https://coreui.io', target: '_blank'}"
2020
/>
2121
<CHeaderNav class="d-md-down-none mr-auto">
22-
<CHeaderNavItem class="px-3" to="/dashboard">Dashboard</CHeaderNavItem>
23-
<CHeaderNavItem class="px-3" to="/users" exact>Users</CHeaderNavItem>
24-
<CHeaderNavItem class="px-3">Settings</CHeaderNavItem>
22+
<CHeaderNavItem class="px-3" to="/dashboard">
23+
<CHeaderNavLink>
24+
Dashboard
25+
</CHeaderNavLink>
26+
</CHeaderNavItem>
27+
<CHeaderNavItem class="px-3" to="/users" exact>
28+
<CHeaderNavLink>
29+
Users
30+
</CHeaderNavLink>
31+
</CHeaderNavItem>
32+
<CHeaderNavItem class="px-3">
33+
<CHeaderNavLink>
34+
Settings
35+
</CHeaderNavLink>
36+
</CHeaderNavItem>
2537
</CHeaderNav>
2638
<CHeaderNav class="mr-4">
2739
<CHeaderNavItem class="d-md-down-none mx-2">
28-
<i class="cui-bell"></i>
40+
<CHeaderNavLink>
41+
<CIcon name="cil-bell"/>
42+
</CHeaderNavLink>
2943
</CHeaderNavItem>
3044
<CHeaderNavItem class="d-md-down-none mx-2">
31-
<i class="cui-list"></i>
45+
<CHeaderNavLink>
46+
<CIcon name="cil-list"/>
47+
</CHeaderNavLink>
3248
</CHeaderNavItem>
3349
<CHeaderNavItem class="d-md-down-none mx-2">
34-
<i class="cui-envelope-open"></i>
50+
<CHeaderNavLink>
51+
<CIcon name="cil-envelope-open"/>
52+
</CHeaderNavLink>
3553
</CHeaderNavItem>
3654
<TheHeaderDropdownAccnt/>
3755
</CHeaderNav>

‎src/containers/TheHeaderDropdownAccnt.vue

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
11
<template>
22
<CDropdown
3-
nav
4-
no-caret
3+
inNav
54
class="c-header-nav-items"
65
placement="bottom-end"
76
add-menu-classes="pt-0"
87
>
98
<template #toggler>
10-
<CHeaderNavItem only-link>
9+
<CHeaderNavLink>
1110
<div class="c-avatar">
1211
<img
1312
src="img/avatars/6.jpg"
1413
class="c-avatar-img "
1514
/>
1615
</div>
17-
</CHeaderNavItem>
16+
</CHeaderNavLink>
1817
</template>
1918
<CDropdownHeader tag="div" class="text-center" color="light">
2019
<strong>Account</strong>
2120
</CDropdownHeader>
2221
<CDropdownItem>
23-
<i class="cui-bell mr-2"/> Updates
22+
<CIcon name="cil-bell"/> Updates
2423
<CBadge color="info" class="ml-auto">{{ itemsCount }}</CBadge>
2524
</CDropdownItem>
2625
<CDropdownItem>
27-
<i class="cui-envelope-open mr-2" /> Messages
26+
<CIcon name="cil-envelope-open" /> Messages
2827
<CBadge color="success" class="ml-auto">{{ itemsCount }}</CBadge>
2928
</CDropdownItem>
3029
<CDropdownItem>
31-
<i class="cui-task mr-2" /> Tasks
30+
<CIcon name="cil-task" /> Tasks
3231
<CBadge color="danger" class="ml-auto">{{ itemsCount }}</CBadge>
3332
</CDropdownItem>
3433
<CDropdownItem>
35-
<i class="cui-comment-square mr-2" /> Comments
34+
<CIcon name="cil-comment-square" /> Comments
3635
<CBadge color="warning" class="ml-auto">{{ itemsCount }}</CBadge>
3736
</CDropdownItem>
3837
<CDropdownHeader
@@ -43,25 +42,25 @@
4342
<strong>Settings</strong>
4443
</CDropdownHeader>
4544
<CDropdownItem>
46-
<i class="cui-user mr-2" /> Profile
45+
<CIcon name="cil-user" /> Profile
4746
</CDropdownItem>
4847
<CDropdownItem>
49-
<i class="cui-wrench mr-2" /> Settings
48+
<CIcon name="cil-settings" /> Settings
5049
</CDropdownItem>
5150
<CDropdownItem>
52-
<i class="cui-dollar mr-2" /> Payments
51+
<CIcon name="cil-dollar" /> Payments
5352
<CBadge color="secondary" class="ml-auto">{{ itemsCount }}</CBadge>
5453
</CDropdownItem>
5554
<CDropdownItem>
56-
<i class="cui-file mr-2" /> Projects
55+
<CIcon name="cil-file" /> Projects
5756
<CBadge color="primary" class="ml-auto">{{ itemsCount }}</CBadge>
5857
</CDropdownItem>
5958
<CDropdownDivider/>
6059
<CDropdownItem>
61-
<i class="cui-shield mr-2" /> Lock Account
60+
<CIcon name="cil-shield-alt" /> Lock Account
6261
</CDropdownItem>
6362
<CDropdownItem>
64-
<i class="cui-lock-locked mr-2" /> Logout
63+
<CIcon name="cil-lock-locked" /> Logout
6564
</CDropdownItem>
6665
</CDropdown>
6766
</template>
@@ -76,3 +75,9 @@ export default {
7675
}
7776
}
7877
</script>
78+
79+
<style scoped>
80+
.c-icon {
81+
margin-right: 0.3rem;
82+
}
83+
</style>

0 commit comments

Comments
 (0)