Skip to content

Commit f0e3d72

Browse files
woothuwoothu
committed
Chore: push dev to create v3.0.0-alpha version
1 parent b358563 commit f0e3d72

Some content is hidden

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

49 files changed

+7700
-8382
lines changed

‎package.json‎

Lines changed: 4 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": "2.0.1",
3+
"version": "3.0.0-alpha",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -17,7 +17,7 @@
1717
"@coreui/coreui": "^2.1.6",
1818
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
1919
"@coreui/icons": "0.3.0",
20-
"@coreui/vue": "github:coreui/coreui-vue#test",
20+
"@coreui/vue": "github:coreui/coreui-vue#v3-bridge-alpha",
2121
"bootstrap": "^4.1.3",
2222
"bootstrap-vue": "^2.0.0-rc.11",
2323
"chart.js": "^2.7.3",
@@ -29,7 +29,7 @@
2929
"perfect-scrollbar": "^1.4.0",
3030
"simple-line-icons": "^2.4.1",
3131
"tooltip.js": "^1.3.1",
32-
"vue": "^2.5.17",
32+
"vue": "^2.6.6",
3333
"vue-chartjs": "^3.4.0",
3434
"vue-perfect-scrollbar": "^0.1.0",
3535
"vue-router": "^3.0.1"
@@ -47,7 +47,7 @@
4747
"https-proxy-agent": "^2.2.1",
4848
"node-sass": "^4.9.4",
4949
"sass-loader": "^7.1.0",
50-
"vue-template-compiler": "^2.5.17"
50+
"vue-template-compiler": "^2.6.6"
5151
},
5252
"browserslist": [
5353
"> 1%",

‎src/containers/DefaultAside.vue‎

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<template>
2-
<b-tabs>
3-
<b-tab>
2+
<CTabs>
3+
<CTab active>
44
<template slot="title">
5-
<i class='icon-list'></i>
5+
<i class="icon-list"></i>
66
</template>
7-
<b-list-group class="list-group-accent">
8-
<b-list-group-item class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
7+
<CListGroup class="list-group-accent">
8+
<CListGroupItem class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
99
Today
10-
</b-list-group-item>
11-
<b-list-group-item href="#" class="list-group-item-accent-warning list-group-item-divider">
10+
</CListGroupItem>
11+
<CListGroupItem href="#" class="list-group-item-accent-warning list-group-item-divider">
1212
<div class="avatar float-right">
1313
<img class="img-avatar" src="img/avatars/7.jpg" alt="[email protected]">
1414
</div>
@@ -21,21 +21,21 @@
2121
<small class="text-muted">
2222
<i class="icon-location-pin"></i>&nbsp;&nbsp;Palo Alto, CA
2323
</small>
24-
</b-list-group-item>
25-
<b-list-group-item href="#" class="list-group-item-accent-info">
24+
</CListGroupItem>
25+
<CListGroupItem href="#" class="list-group-item-accent-info">
2626
<div class="avatar float-right">
2727
<img class="img-avatar" src="img/avatars/4.jpg" alt="[email protected]">
2828
</div>
2929
<div>Skype with <strong>Megan</strong>
3030
</div>
3131
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp;&nbsp;4 - 5pm</small>
3232
<small class="text-muted"><i class="icon-social-skype"></i>&nbsp;&nbsp;On-line</small>
33-
</b-list-group-item>
33+
</CListGroupItem>
3434
<hr class="transparent mx-3 my-0">
35-
<b-list-group-item class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
35+
<CListGroupItem class="list-group-item-accent-secondary bg-light text-center font-weight-bold text-muted text-uppercase small">
3636
Tomorrow
37-
</b-list-group-item>
38-
<b-list-group-item href="#" class="list-group-item-accent-danger list-group-item-divider">
37+
</CListGroupItem>
38+
<CListGroupItem href="#" class="list-group-item-accent-danger list-group-item-divider">
3939
<div>New UI Project - <strong>deadline</strong>
4040
</div>
4141
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp;&nbsp;10 - 11pm</small>
@@ -57,13 +57,13 @@
5757
<img class="img-avatar" src="img/avatars/6.jpg" alt="[email protected]">
5858
</div>
5959
</div>
60-
</b-list-group-item>
61-
<b-list-group-item href="#" class="list-group-item-accent-success list-group-item-divider">
60+
</CListGroupItem>
61+
<CListGroupItem href="#" class="list-group-item-accent-success list-group-item-divider">
6262
<div><strong>#10 Startups.Garden</strong> Meetup</div>
6363
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp; 1 - 3pm</small>
6464
<small class="text-muted"><i class="icon-location-pin"></i>&nbsp; Palo Alto, CA</small>
65-
</b-list-group-item>
66-
<b-list-group-item href="#" class="list-group-item-accent-primary list-group-item-divider">
65+
</CListGroupItem>
66+
<CListGroupItem href="#" class="list-group-item-accent-primary list-group-item-divider">
6767
<div><strong>Team meeting</strong></div>
6868
<small class="text-muted mr-3"><i class="icon-calendar"></i>&nbsp; 4 - 6pm</small>
6969
<small class="text-muted"><i class="icon-home"></i>&nbsp; creativeLabs HQ</small>
@@ -90,10 +90,10 @@
9090
<img src="img/avatars/8.jpg" class="img-avatar" alt="[email protected]">
9191
</div>
9292
</div>
93-
</b-list-group-item>
94-
</b-list-group>
95-
</b-tab>
96-
<b-tab>
93+
</CListGroupItem>
94+
</CListGroup>
95+
</CTab>
96+
<CTab>
9797
<template slot="title">
9898
<i class='icon-speech'></i>
9999
</template>
@@ -117,7 +117,7 @@
117117
<div class="py-3 pb-5 mr-3 float-left">
118118
<div class="avatar">
119119
<img src="img/avatars/7.jpg" class="img-avatar" alt="[email protected]">
120-
<c-badge variant="danger" class="avatar-status"></c-badge>
120+
<CBadge variant="danger" class="avatar-status"></CBadge>
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="img/avatars/7.jpg" class="img-avatar" alt="[email protected]">
135-
<c-badge variant="info" class="avatar-status"></c-badge>
135+
<CBadge variant="info" class="avatar-status"></CBadge>
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="img/avatars/7.jpg" class="img-avatar" alt="[email protected]">
150-
<c-badge variant="warning" class="avatar-status"></c-badge>
150+
<CBadge variant="warning" class="avatar-status"></CBadge>
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="img/avatars/7.jpg" class="img-avatar" alt="[email protected]">
165-
<c-badge variant="dark" class="avatar-status"></c-badge>
165+
<CBadge variant="dark" class="avatar-status"></CBadge>
166166
</div>
167167
</div>
168168
<div>
@@ -173,8 +173,8 @@
173173
<small class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt...</small>
174174
</div>
175175
</div>
176-
</b-tab>
177-
<b-tab>
176+
</CTab>
177+
<CTab>
178178
<template slot="title">
179179
<i class='icon-settings'></i>
180180
</template>
@@ -183,7 +183,7 @@
183183
<div class="aside-options">
184184
<div class="clearfix mt-4">
185185
<small><b>Option 1</b></small>
186-
<c-switch color="success" label variant="pill" size="sm" class="float-right" checked />
186+
<CSwitch variant="success" label shape="pill" size="sm" class="float-right" checked />
187187
</div>
188188
<div>
189189
<small class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</small>
@@ -192,7 +192,7 @@
192192
<div class="aside-options">
193193
<div class="clearfix mt-3">
194194
<small><b>Option 2</b></small>
195-
<c-switch color="success" label variant="pill" size="sm" class="float-right" />
195+
<CSwitch variant="success" label shape="pill" size="sm" class="float-right" />
196196
</div>
197197
<div>
198198
<small class="text-muted">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</small>
@@ -201,7 +201,7 @@
201201
<div class="aside-options">
202202
<div class="clearfix mt-3">
203203
<small><b>Option 3</b></small>
204-
<c-switch color="success" label variant="pill" size="sm" class="float-right" disabled defaultChecked/>
204+
<CSwitch variant="success" label shape="pill" size="sm" class="float-right" disabled defaultChecked/>
205205
</div>
206206
<div>
207207
<small class="text-muted">Disabled option.</small>
@@ -210,42 +210,38 @@
210210
<div class="aside-options">
211211
<div class="clearfix mt-3">
212212
<small><b>Option 4</b></small>
213-
<c-switch color="success" label variant="pill" size="sm" class="float-right" checked />
213+
<CSwitch variant="success" label shape="pill" size="sm" class="float-right" checked />
214214
</div>
215215
</div>
216216
<hr>
217217
<h6>System Utilization</h6>
218218
<div class="text-uppercase mb-1 mt-4">
219219
<small><b>CPU Usage</b></small>
220220
</div>
221-
<b-progress height={} class="progress-xs" variant="info" :value="25"></b-progress>
221+
<CProgress class="progress-xs" variant="info" :value="25"></CProgress>
222222
<small class="text-muted">348 Processes. 1/4 Cores.</small>
223223
<div class="text-uppercase mb-1 mt-2">
224224
<small><b>Memory Usage</b></small>
225225
</div>
226-
<b-progress height={} class="progress-xs" variant="warning" :value="70"></b-progress>
226+
<CProgress class="progress-xs" variant="warning" :value="70"></CProgress>
227227
<small class="text-muted">11444GB/16384MB</small>
228228
<div class="text-uppercase mb-1 mt-2">
229229
<small><b>SSD 1 Usage</b></small>
230230
</div>
231-
<b-progress height={} class="progress-xs" variant="danger" :value="95"></b-progress>
231+
<CProgress class="progress-xs" variant="danger" :value="95"></CProgress>
232232
<small class="text-muted">243GB/256GB</small>
233233
<div class="text-uppercase mb-1 mt-2">
234234
<small><b>SSD 2 Usage</b></small>
235235
</div>
236-
<b-progress height={} class="progress-xs" variant="success" :value="10"></b-progress>
236+
<CProgress class="progress-xs" variant="success" :value="10"></CProgress>
237237
<small class="text-muted">25GB/256GB</small>
238238
</div>
239-
</b-tab>
240-
</b-tabs>
239+
</CTab>
240+
</CTabs>
241241
</template>
242242

243243
<script>
244-
import { Switch as cSwitch } from '@coreui/vue'
245244
export default {
246245
name: 'DefaultAside',
247-
components: {
248-
cSwitch
249-
}
250246
}
251247
</script>

‎src/containers/DefaultContainer.vue‎

Lines changed: 32 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
<template>
22
<div class="app">
3-
<AppHeader fixed>
4-
<SidebarToggler class="d-lg-none" display="md" mobile />
5-
<b-link class="navbar-brand" to="#">
3+
<CHeader fixed>
4+
<CSidebarToggler class="d-lg-none" display="md" mobile />
5+
<CLink class="navbar-brand" to="#">
66
<img class="navbar-brand-full" src="img/brand/logo.svg" width="89" height="25" alt="CoreUI Logo">
77
<img class="navbar-brand-minimized" src="img/brand/sygnet.svg" width="30" height="30" alt="CoreUI Logo">
8-
</b-link>
9-
<SidebarToggler class="d-md-down-none" display="lg" />
10-
<b-navbar-nav class="d-md-down-none">
11-
<b-nav-item class="px-3" to="/dashboard">Dashboard</b-nav-item>
12-
<b-nav-item class="px-3" to="/users" exact>Users</b-nav-item>
13-
<b-nav-item class="px-3">Settings</b-nav-item>
14-
</b-navbar-nav>
15-
<b-navbar-nav class="ml-auto">
16-
<b-nav-item class="d-md-down-none">
8+
</CLink>
9+
<CSidebarToggler class="d-md-down-none" display="lg" />
10+
<CNavbarNav class="d-md-down-none">
11+
<CNavItem class="px-3" to="/dashboard">Dashboard</CNavItem>
12+
<CNavItem class="px-3" to="/users" exact>Users</CNavItem>
13+
<CNavItem class="px-3">Settings</CNavItem>
14+
</CNavbarNav>
15+
<CNavbarNav class="ml-auto">
16+
<CNavItem class="d-md-down-none">
1717
<i class="icon-bell"></i>
18-
<b-badge pill variant="danger">5</b-badge>
19-
</b-nav-item>
20-
<b-nav-item class="d-md-down-none">
18+
<CBadge pill variant="danger">5</CBadge>
19+
</CNavItem>
20+
<CNavItem class="d-md-down-none">
2121
<i class="icon-list"></i>
22-
</b-nav-item>
23-
<b-nav-item class="d-md-down-none">
22+
</CNavItem>
23+
<CNavItem class="d-md-down-none">
2424
<i class="icon-location-pin"></i>
25-
</b-nav-item>
25+
</CNavItem>
2626
<DefaultHeaderDropdownAccnt/>
27-
</b-navbar-nav>
28-
<AsideToggler class="d-none d-lg-block" />
27+
</CNavbarNav>
28+
<CAsideToggler class="d-none d-lg-block" />
2929
<!--<AsideToggler class="d-lg-none" mobile />-->
30-
</AppHeader>
30+
</CHeader>
3131
<div class="app-body">
32-
<AppSidebar fixed>
33-
<SidebarHeader/>
34-
<SidebarForm/>
35-
<SidebarNav :navItems="computedNav"></SidebarNav>
36-
<SidebarFooter/>
37-
<SidebarMinimizer/>
38-
</AppSidebar>
32+
<CSidebar fixed>
33+
<CSidebarHeader/>
34+
<CSidebarForm/>
35+
<CSidebarNav :navItems="computedNav"></CSidebarNav>
36+
<CSidebarFooter/>
37+
<CSidebarMinimizer/>
38+
</CSidebar>
3939
<main class="main">
4040
<CBreadcrumbRouter/>
4141
<div class="container-fluid">
4242
<router-view></router-view>
4343
</div>
4444
</main>
45-
<AppAside fixed>
45+
<CAside fixed>
4646
<!--aside-->
4747
<DefaultAside/>
48-
</AppAside>
48+
</CAside>
4949
</div>
50-
<TheFooter>
50+
<CFooter>
5151
<!--footer-->
5252
<div>
5353
<a href="https://coreui.io">CoreUI</a>
@@ -57,32 +57,20 @@
5757
<span class="mr-1">Powered by</span>
5858
<a href="https://coreui.io">CoreUI for Vue</a>
5959
</div>
60-
</TheFooter>
60+
</CFooter>
6161
</div>
6262
</template>
6363

6464
<script>
6565
import nav from '@/_nav'
66-
import { Header as AppHeader, SidebarToggler, Sidebar as AppSidebar, SidebarFooter,SidebarNav, SidebarForm, SidebarHeader, SidebarMinimizer, Aside as AppAside, AsideToggler, Footer as TheFooter } from '@coreui/vue'
6766
import DefaultAside from './DefaultAside'
6867
import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt'
6968
7069
export default {
7170
name: 'full',
7271
components: {
73-
AsideToggler,
74-
AppHeader,
75-
AppSidebar,
76-
AppAside,
77-
TheFooter,
7872
DefaultAside,
7973
DefaultHeaderDropdownAccnt,
80-
SidebarForm,
81-
SidebarFooter,
82-
SidebarToggler,
83-
SidebarHeader,
84-
SidebarNav,
85-
SidebarMinimizer
8674
},
8775
data () {
8876
return {

0 commit comments

Comments
 (0)