Skip to content

Commit 7a8847b

Browse files
xidedixxidedix
authored
Merge pull request #91 from coreui/dev-header-dropdown
v2.0.0-beta.2
2 parents d1e66e1 + b09e275 commit 7a8847b

File tree

5 files changed

+71
-52
lines changed

5 files changed

+71
-52
lines changed

‎CHANGELOG.md

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

3+
##### `v2.0.0-beta.2`
4+
- refactor: `HeaderDropdown` with new slots `header` and `dropdown` *breaking change*
5+
- chore: update `@coreui/vue` to `2.0.0-beta.1`
6+
- chore: dependencies update
7+
38
##### `v2.0.0-beta.1`
49
- chore: update `@coreui/vue` to `2.0.0-beta.0`
510

‎package.json

Lines changed: 3 additions & 3 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.0-beta.1",
3+
"version": "2.0.0-beta.2",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -20,7 +20,7 @@
2020
"@coreui/coreui": "^2.0.1",
2121
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
2222
"@coreui/icons": "^0.2.0",
23-
"@coreui/vue": "^2.0.0-beta.0",
23+
"@coreui/vue": "^2.0.0-beta.1",
2424
"bootstrap": "^4.1.1",
2525
"bootstrap-vue": "^2.0.0-rc.11",
2626
"chart.js": "^2.7.2",
@@ -36,7 +36,7 @@
3636
"vue-router": "^3.0.1"
3737
},
3838
"devDependencies": {
39-
"autoprefixer": "^8.5.1",
39+
"autoprefixer": "^8.6.0",
4040
"babel-core": "^6.26.3",
4141
"babel-eslint": "^8.2.3",
4242
"babel-helper-vue-jsx-merge-props": "^2.0.3",

‎src/containers/DafaultAside.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<div class="py-3 pb-5 mr-3 float-left">
118118
<div class="avatar">
119119
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
120-
<b-badge variant="success" class="avatar-status"></b-badge>
120+
<b-badge variant="danger" class="avatar-status"></b-badge>
121121
</div>
122122
</div>
123123
<div>
@@ -132,7 +132,7 @@
132132
<div class="py-3 pb-5 mr-3 float-left">
133133
<div class="avatar">
134134
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
135-
<b-badge variant="success" class="avatar-status"></b-badge>
135+
<b-badge variant="info" class="avatar-status"></b-badge>
136136
</div>
137137
</div>
138138
<div>
@@ -147,7 +147,7 @@
147147
<div class="py-3 pb-5 mr-3 float-left">
148148
<div class="avatar">
149149
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
150-
<b-badge variant="success" class="avatar-status"></b-badge>
150+
<b-badge variant="warning" class="avatar-status"></b-badge>
151151
</div>
152152
</div>
153153
<div>
@@ -162,7 +162,7 @@
162162
<div class="py-3 pb-5 mr-3 float-left">
163163
<div class="avatar">
164164
<img src="static/img/avatars/7.jpg" class="img-avatar" alt="admin@bootstrapmaster.com">
165-
<b-badge variant="success" class="avatar-status"></b-badge>
165+
<b-badge variant="dark" class="avatar-status"></b-badge>
166166
</div>
167167
</div>
168168
<div>

‎src/containers/DefaultContainer.vue

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,45 +23,7 @@
2323
<b-nav-item class="d-md-down-none">
2424
<i class="icon-location-pin"></i>
2525
</b-nav-item>
26-
<AppHeaderDropdown right no-caret>
27-
<div>
28-
<template slot="button-content">
29-
<img
30-
src="static/img/avatars/6.jpg"
31-
class="img-avatar"
32-
alt="admin@bootstrapmaster.com" />
33-
</template>
34-
<b-dropdown-header tag="div" class="text-center"><strong>Account</strong></b-dropdown-header>
35-
<b-dropdown-item><i class="fa fa-bell-o" /> Updates
36-
<b-badge variant="info">{{ itemsCount }}</b-badge>
37-
</b-dropdown-item>
38-
<b-dropdown-item><i class="fa fa-envelope-o" /> Messages
39-
<b-badge variant="success">{{ itemsCount }}</b-badge>
40-
</b-dropdown-item>
41-
<b-dropdown-item><i class="fa fa-tasks" /> Tasks
42-
<b-badge variant="danger">{{ itemsCount }}</b-badge>
43-
</b-dropdown-item>
44-
<b-dropdown-item><i class="fa fa-comments" /> Comments
45-
<b-badge variant="warning">{{ itemsCount }}</b-badge>
46-
</b-dropdown-item>
47-
<b-dropdown-header
48-
tag="div"
49-
class="text-center">
50-
<strong>Settings</strong>
51-
</b-dropdown-header>
52-
<b-dropdown-item><i class="fa fa-user" /> Profile</b-dropdown-item>
53-
<b-dropdown-item><i class="fa fa-wrench" /> Settings</b-dropdown-item>
54-
<b-dropdown-item><i class="fa fa-usd" /> Payments
55-
<b-badge variant="secondary">{{ itemsCount }}</b-badge>
56-
</b-dropdown-item>
57-
<b-dropdown-item><i class="fa fa-file" /> Projects
58-
<b-badge variant="primary">{{ itemsCount }}</b-badge>
59-
</b-dropdown-item>
60-
<b-dropdown-divider />
61-
<b-dropdown-item><i class="fa fa-shield" /> Lock Account</b-dropdown-item>
62-
<b-dropdown-item><i class="fa fa-lock" /> Logout</b-dropdown-item>
63-
</div>
64-
</AppHeaderDropdown>
26+
<DefaultHeaderDropdownAccnt/>
6527
</b-navbar-nav>
6628
<AsideToggler class="d-none d-lg-block" />
6729
<!--<AsideToggler class="d-lg-none" mobile />-->
@@ -93,22 +55,21 @@
9355

9456
<script>
9557
import nav from '../_nav'
96-
import { Header as AppHeader, HeaderDropdown as AppHeaderDropdown, SidebarToggler, Sidebar as AppSidebar, SidebarFooter, SidebarForm, SidebarHeader, SidebarMinimizer, SidebarNav, Aside as AppAside, AsideToggler, Footer as TheFooter, Breadcrumb } from '@coreui/vue'
97-
// import { Header as AppHeader, HeaderDropdown as AppHeaderDropdown, SidebarToggler, Sidebar as AppSidebar, SidebarFooter, SidebarForm, SidebarHeader, SidebarMinimizer, SidebarNav, Aside as AppAside, AsideToggler, Breadcrumb } from '../components/'
98-
// import { Footer as TheFooter } from '@coreui/vue'
58+
import { Header as AppHeader, SidebarToggler, Sidebar as AppSidebar, SidebarFooter, SidebarForm, SidebarHeader, SidebarMinimizer, SidebarNav, Aside as AppAside, AsideToggler, Footer as TheFooter, Breadcrumb } from '@coreui/vue'
9959
import DafaultAside from './DafaultAside'
60+
import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt'
10061
10162
export default {
10263
name: 'full',
10364
components: {
10465
AsideToggler,
10566
AppHeader,
106-
AppHeaderDropdown,
10767
AppSidebar,
10868
AppAside,
10969
TheFooter,
11070
Breadcrumb,
11171
DafaultAside,
72+
DefaultHeaderDropdownAccnt,
11273
SidebarForm,
11374
SidebarFooter,
11475
SidebarToggler,
@@ -118,8 +79,7 @@ export default {
11879
},
11980
data () {
12081
return {
121-
nav: nav.items,
122-
itemsCount: 42
82+
nav: nav.items
12383
}
12484
},
12585
computed: {

‎src/containers/DefaultHeaderDropdownAccnt.vue

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<template>
2+
<AppHeaderDropdown right no-caret>
3+
<template slot="header">
4+
<img
5+
src="static/img/avatars/6.jpg"
6+
class="img-avatar"
7+
alt="admin@bootstrapmaster.com" />
8+
</template>\
9+
<template slot="dropdown">
10+
<b-dropdown-header tag="div" class="text-center"><strong>Account</strong></b-dropdown-header>
11+
<b-dropdown-item><i class="fa fa-bell-o" /> Updates
12+
<b-badge variant="info">{{ itemsCount }}</b-badge>
13+
</b-dropdown-item>
14+
<b-dropdown-item><i class="fa fa-envelope-o" /> Messages
15+
<b-badge variant="success">{{ itemsCount }}</b-badge>
16+
</b-dropdown-item>
17+
<b-dropdown-item><i class="fa fa-tasks" /> Tasks
18+
<b-badge variant="danger">{{ itemsCount }}</b-badge>
19+
</b-dropdown-item>
20+
<b-dropdown-item><i class="fa fa-comments" /> Comments
21+
<b-badge variant="warning">{{ itemsCount }}</b-badge>
22+
</b-dropdown-item>
23+
<b-dropdown-header
24+
tag="div"
25+
class="text-center">
26+
<strong>Settings</strong>
27+
</b-dropdown-header>
28+
<b-dropdown-item><i class="fa fa-user" /> Profile</b-dropdown-item>
29+
<b-dropdown-item><i class="fa fa-wrench" /> Settings</b-dropdown-item>
30+
<b-dropdown-item><i class="fa fa-usd" /> Payments
31+
<b-badge variant="secondary">{{ itemsCount }}</b-badge>
32+
</b-dropdown-item>
33+
<b-dropdown-item><i class="fa fa-file" /> Projects
34+
<b-badge variant="primary">{{ itemsCount }}</b-badge>
35+
</b-dropdown-item>
36+
<b-dropdown-divider />
37+
<b-dropdown-item><i class="fa fa-shield" /> Lock Account</b-dropdown-item>
38+
<b-dropdown-item><i class="fa fa-lock" /> Logout</b-dropdown-item>
39+
</template>
40+
</AppHeaderDropdown>
41+
</template>
42+
43+
<script>
44+
import { HeaderDropdown as AppHeaderDropdown } from '@coreui/vue'
45+
export default {
46+
name: 'DefaultHeaderDropdownAccnt',
47+
components: {
48+
AppHeaderDropdown
49+
},
50+
data: () => {
51+
return { itemsCount: 42 }
52+
}
53+
}
54+
</script>

0 commit comments

Comments
 (0)