Skip to content

Commit da02129

Browse files
woothuwoothu
committed
feat: Initial commit of v3-alpha
1 parent 74b325a commit da02129

22 files changed

+1005
-670
lines changed

‎package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@
1414
"test:e2e": "vue-cli-service test:e2e"
1515
},
1616
"dependencies": {
17-
"@coreui/coreui": "^2.0.20",
17+
"@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#vue_cli3",
20+
"@coreui/vue": "github:coreui/coreui-vue#woothu",
2121
"bootstrap": "^4.1.3",
2222
"bootstrap-vue": "^2.0.0-rc.11",
2323
"chart.js": "^2.7.3",
2424
"core-js": "^2.5.7",
2525
"css-vars-ponyfill": "^1.11.1",
26+
"element-resize-detector": "^1.2.0",
2627
"flag-icon-css": "^3.2.0",
2728
"font-awesome": "^4.7.0",
2829
"perfect-scrollbar": "^1.4.0",
2930
"simple-line-icons": "^2.4.1",
31+
"tooltip.js": "^1.3.1",
3032
"vue": "^2.5.17",
3133
"vue-chartjs": "^3.4.0",
3234
"vue-perfect-scrollbar": "^0.1.0",

‎src/containers/DefaultContainer.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<AppSidebar fixed>
3333
<SidebarHeader/>
3434
<SidebarForm/>
35-
<SidebarNav :navItems="nav"></SidebarNav>
35+
<SidebarNav :navItems="computedNav"></SidebarNav>
3636
<SidebarFooter/>
3737
<SidebarMinimizer/>
3838
</AppSidebar>
@@ -88,6 +88,11 @@ export default {
8888
return {
8989
nav: nav.items
9090
}
91+
},
92+
computed: {
93+
computedNav () {
94+
return this.nav.filter((item) => item.name !== 'Dashboard')
95+
}
9196
}
9297
}
9398
</script>

‎src/containers/DefaultHeaderDropdownAccnt.vue

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,58 @@
11
<template>
2-
<c-nav-item-dropdown no-caret right>
3-
<template slot="button-content">
4-
<img
5-
src="img/avatars/6.jpg"
6-
class="img-avatar"
7-
alt="admin@bootstrapmaster.com" />
8-
</template>
9-
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
2+
<CDropdown right class="nav-item" toggleClasses="nav-link" menuClasses="hehe">
3+
<img slot="button"
4+
src="img/avatars/6.jpg"
5+
class="img-avatar"
6+
alt="admin@bootstrapmaster.com"
7+
/>
8+
9+
<c-dropdown-header tag="div" class="text-center"><strong>Account</strong></c-dropdown-header>
10+
<c-dropdown-item><i class="fa fa-bell-o" /> Updates
1211
<c-badge variant="info" additionalClasses="hehe">{{ itemsCount }}</c-badge>
13-
</b-dropdown-item>
14-
<b-dropdown-item><i class="fa fa-envelope-o" /> Messages
12+
</c-dropdown-item>
13+
<c-dropdown-item><i class="fa fa-envelope-o" /> Messages
1514
<c-badge variant="success">{{ itemsCount }}</c-badge>
16-
</b-dropdown-item>
17-
<b-dropdown-item><i class="fa fa-tasks" /> Tasks
15+
</c-dropdown-item>
16+
<c-dropdown-item><i class="fa fa-tasks" /> Tasks
1817
<c-badge variant="danger">{{ itemsCount }}</c-badge>
19-
</b-dropdown-item>
20-
<b-dropdown-item><i class="fa fa-comments" /> Comments
18+
</c-dropdown-item>
19+
<c-dropdown-item><i class="fa fa-comments" /> Comments
2120
<c-badge variant="warning">{{ itemsCount }}</c-badge>
22-
</b-dropdown-item>
23-
<b-dropdown-header
21+
</c-dropdown-item>
22+
<c-dropdown-header
2423
tag="div"
2524
class="text-center">
2625
<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
26+
</c-dropdown-header>
27+
<c-dropdown-item><i class="fa fa-user" /> Profile</c-dropdown-item>
28+
<c-dropdown-item><i class="fa fa-wrench" /> Settings</c-dropdown-item>
29+
<c-dropdown-item><i class="fa fa-usd" /> Payments
3130
<c-badge variant="secondary">{{ itemsCount }}</c-badge>
32-
</b-dropdown-item>
33-
<b-dropdown-item><i class="fa fa-file" /> Projects
31+
</c-dropdown-item>
32+
<c-dropdown-item><i class="fa fa-file" /> Projects
3433
<c-badge variant="primary">{{ itemsCount }}</c-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-
</c-nav-item-dropdown>
34+
</c-dropdown-item>
35+
<CDropdownDivider/>
36+
<c-dropdown-item><i class="fa fa-shield" /> Lock Account</c-dropdown-item>
37+
<c-dropdown-item><i class="fa fa-lock" /> Logout</c-dropdown-item>
38+
</CDropdown>
4039
</template>
4140

4241
<script>
42+
// import CDropdown from './CDropdown'
43+
// import CDropdownHeader from './CDropdownHeader'
44+
// import CDropdownDivider from './CDropdownDivider'
45+
// import CDropdownItem from './CDropdownItem'
46+
4347
4448
export default {
4549
name: 'DefaultHeaderDropdownAccnt',
50+
// components: {
51+
// CDropdown,
52+
// CDropdownHeader,
53+
// CDropdownDivider,
54+
// CDropdownItem
55+
// },
4656
data: () => {
4757
return { itemsCount: 42 }
4858
},

‎src/views/Dashboard.vue

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
<div class="animated fadeIn">
33
<b-row>
44
<b-col sm="6" lg="3">
5-
<c-widget06 cardClasses="bg-primary" header="9.823" text="Members online">
6-
<b-dropdown slot='dropdown' class="float-right" variant="transparent p-0" right>
5+
<c-widget06 header="9.823" text="Members online">
6+
<template slot='dropdown'>
7+
<b-dropdown class="float-right" variant="transparent p-0" right>
78
<template slot="button-content">
89
<i class="icon-settings"></i>
910
</template>
@@ -12,33 +13,35 @@
1213
<b-dropdown-item>Something else here...</b-dropdown-item>
1314
<b-dropdown-item disabled>Disabled action</b-dropdown-item>
1415
</b-dropdown>
15-
<c-simple-pointed-chart class='px-3' :data='[65, 59, 84, 84, 51, 55, 40]'
16-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
17-
style='height:70px' label='Members' pointHoverColor='primary'/>
18-
16+
</template>
17+
<c-simple-pointed-chart class='px-3' :data='[65, 59, 84, 84, 51, 55, 40]'
18+
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
19+
style='height:70px' label='Members' pointHoverColor='primary'/>
1920
</c-widget06>
2021
</b-col>
2122
<b-col sm="6" lg="3">
22-
<c-widget06 cardClasses="bg-info" header="9.823" text="Members online">
23-
<template slot='dropdown'>
24-
<b-dropdown class="float-right" variant="transparent p-0" right no-caret>
25-
<template slot="button-content">
26-
<i class="icon-location-pin"></i>
27-
</template>
28-
<b-dropdown-item>Action</b-dropdown-item>
29-
<b-dropdown-item>Another action</b-dropdown-item>
30-
<b-dropdown-item>Something else here...</b-dropdown-item>
31-
<b-dropdown-item disabled>Disabled action</b-dropdown-item>
32-
</b-dropdown>
33-
</template>
34-
<c-simple-pointed-chart class='px-3' :data='[1, 18, 9, 17, 34, 22, 11]'
35-
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
36-
style='height:70px' label='Members' :options='{elements: {line: {tension: 0.00001}}}'
37-
pointHoverColor='info'/>
23+
<c-widget06 variant="info" header="9.823" text="Members online">
24+
<b-dropdown slot="dropdown" class="float-right" variant="transparent p-0" right no-caret>
25+
<i slot="button-content"
26+
class="icon-location-pin"
27+
></i>
28+
<b-dropdown-item>Action</b-dropdown-item>
29+
<b-dropdown-item>Another action</b-dropdown-item>
30+
<b-dropdown-item>Something else here...</b-dropdown-item>
31+
<b-dropdown-item disabled>Disabled action</b-dropdown-item>
32+
</b-dropdown>
33+
<CSimplePointedChart class="px-3"
34+
:data="[1, 18, 9, 17, 34, 22, 11]"
35+
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
36+
style="height:70px"
37+
label="Members"
38+
:options="{elements: {line: {tension: 0.00001}}}"
39+
pointHoverColor="info"
40+
/>
3841
</c-widget06>
3942
</b-col>
4043
<b-col sm="6" lg="3">
41-
<c-widget06 cardClasses="bg-warning" header="9.823" text="Members online">
44+
<c-widget06 variant="warning" header="9.823" text="Members online">
4245
<template slot='dropdown'>
4346
<b-dropdown class="float-right" variant="transparent p-0" right>
4447
<template slot="button-content">
@@ -50,15 +53,15 @@
5053
<b-dropdown-item disabled>Disabled action</b-dropdown-item>
5154
</b-dropdown>
5255
</template>
53-
<c-simple-line-chart :data='[78, 81, 80, 45, 34, 12, 40]'
56+
<c-simple-line-chart chartId="c-widget06_3" :data='[78, 81, 80, 45, 34, 12, 40]'
5457
:labels="['January', 'February', 'March', 'April', 'May', 'June', 'July']"
5558
style='height:70px' color ='rgba(255,255,255,.2)' label='Members'
5659
:options="{elements: {line: {borderWidth: 2.5}}}" pointHoverColor='warning'/>
5760
</c-widget06>
5861
</b-col>
5962
<b-col sm="6" lg="3">
60-
<c-widget06 cardClasses="bg-danger" header="9.823" text="Members online">
61-
<template slot='dropdown'>
63+
<c-widget06 variant="danger" header="9.823" text="Members online">
64+
<template slot="dropdown">
6265
<b-dropdown class="float-right" variant="transparent p-0" right>
6366
<template slot="button-content">
6467
<i class="icon-settings"></i>
@@ -69,11 +72,12 @@
6972
<b-dropdown-item disabled>Disabled action</b-dropdown-item>
7073
</b-dropdown>
7174
</template>
72-
<c-simple-bar-chart :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]'
75+
<c-simple-bar-chart chartId="CWidget06_4" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]'
7376
label='Members' color='rgb(250, 152, 152)' style='height:70px' />
7477
</c-widget06>
7578
</b-col>
7679
</b-row>
80+
7781
<b-card>
7882
<b-row>
7983
<b-col sm="5">

‎src/views/Widgets.vue

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<b-row>
44
<b-col sm="6" lg="3">
55
<c-widget01 header="89.9%" text="Lorem ipsum..." footer="Lorem ipsum dolor sit amet enim.">
6-
<CProgress variant="success" :value="25" class="progress-xs my-3 mb-0"/>
6+
<CProgress color="success" :value="25" class="progress-xs my-3 mb-0"/>
77
</c-widget01>
88
</b-col>
99
<b-col sm="6" lg="3">
@@ -201,7 +201,7 @@
201201
</b-row>
202202
<b-row>
203203
<b-col sm="6" lg="3">
204-
<c-widget06 cardClasses="bg-primary" header="9.823" text="Members online">
204+
<c-widget06 header="9.823" text="Members online">
205205
<template slot='dropdown'>
206206
<b-dropdown class="float-right" variant="transparent p-0" right>
207207
<template slot="button-content">
@@ -219,7 +219,7 @@
219219
</c-widget06>
220220
</b-col>
221221
<b-col sm="6" lg="3">
222-
<c-widget06 cardClasses="bg-info" header="9.823" text="Members online">
222+
<c-widget06 variant="info" header="9.823" text="Members online">
223223
<b-dropdown slot="dropdown" class="float-right" variant="transparent p-0" right no-caret>
224224
<i slot="button-content"
225225
class="icon-location-pin"
@@ -240,7 +240,7 @@
240240
</c-widget06>
241241
</b-col>
242242
<b-col sm="6" lg="3">
243-
<c-widget06 cardClasses="bg-warning" header="9.823" text="Members online">
243+
<c-widget06 variant="warning" header="9.823" text="Members online">
244244
<template slot='dropdown'>
245245
<b-dropdown class="float-right" variant="transparent p-0" right>
246246
<template slot="button-content">
@@ -259,7 +259,7 @@
259259
</c-widget06>
260260
</b-col>
261261
<b-col sm="6" lg="3">
262-
<c-widget06 cardClasses="bg-danger" header="9.823" text="Members online">
262+
<c-widget06 variant="danger" header="9.823" text="Members online">
263263
<template slot="dropdown">
264264
<b-dropdown class="float-right" variant="transparent p-0" right>
265265
<template slot="button-content">
@@ -287,19 +287,19 @@
287287
</c-widget07>
288288
</b-col>
289289
<b-col sm="6" lg="3">
290-
<c-widget07 cardClasses='bg-success' rightHeader='SALE' rightFooter='Today 6:43 AM' leftHeader='$1.890,65' leftFooter='+432,50 (15,78%)'>
290+
<c-widget07 variant='success' rightHeader='SALE' rightFooter='Today 6:43 AM' leftHeader='$1.890,65' leftFooter='+432,50 (15,78%)'>
291291
<c-simple-line-chart style="height:40px" chartId="c-widget07_line2" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]' label='Sales'/>
292292
<c-simple-bar-chart style="height:40px" chartId="c-widget07_bar2" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]' label='Sales'/>
293293
</c-widget07>
294294
</b-col>
295295
<b-col sm="6" lg="3">
296-
<c-widget07 cardClasses='bg-danger' rightHeader='SALE' rightFooter='Today 6:43 AM' leftHeader='$1.890,65' leftFooter='+432,50 (15,78%)'>
296+
<c-widget07 variant='danger' rightHeader='SALE' rightFooter='Today 6:43 AM' leftHeader='$1.890,65' leftFooter='+432,50 (15,78%)'>
297297
<c-simple-line-chart style="height:40px" chartId="c-widget07_line3" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]' label='Sales'/>
298298
<c-simple-bar-chart style="height:40px" chartId="c-widget07_bar3" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]' label='Sales'/>
299299
</c-widget07>
300300
</b-col>
301301
<b-col sm="6" lg="3">
302-
<c-widget07 cardClasses='bg-warning' rightHeader='SALE' rightFooter='Today 6:43 AM' leftHeader='$1.890,65' leftFooter='+432,50 (15,78%)'>
302+
<c-widget07 variant='warning' rightHeader='SALE' rightFooter='Today 6:43 AM' leftHeader='$1.890,65' leftFooter='+432,50 (15,78%)'>
303303
<c-simple-line-chart style="height:40px" chartId="c-widget07_line4" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]' label='Sales'/>
304304
<c-simple-bar-chart style="height:40px" chartId="c-widget07_bar4" :data='[10, 22, 34, 46, 58, 70, 46, 23, 45, 78, 34, 12]' label='Sales'/>
305305
</c-widget07>
@@ -350,7 +350,11 @@
350350
</template>
351351

352352
<script>
353+
// import CWidget06 from './CWidget06'
353354
export default {
354-
name: 'Widgets'
355+
name: 'Widgets',
356+
// components: {
357+
// CWidget06
358+
// }
355359
}
356360
</script>

‎src/views/base/Breadcrumbs.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<CBreadcrumb :items="items"/>
1818
<CBreadcrumb :items="items2"/>
1919
<CBreadcrumb :items="items3"/>
20-
<Breadcrumb :list="items3"/>
20+
<!-- <Breadcrumb :list="items3"/> -->
2121

2222
</b-card>
2323
</b-col>

0 commit comments

Comments
 (0)