Skip to content

Commit 1c7b133

Browse files
woothuwoothu
committed
refacor: update dashboard to coreui-vue changes
1 parent cb5f6ec commit 1c7b133

Some content is hidden

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

42 files changed

+549
-4034
lines changed

‎src/containers/TheHeader.vue‎

Lines changed: 24 additions & 6 deletions
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+
<i class="cui-bell"></i>
42+
</CHeaderNavLink>
2943
</CHeaderNavItem>
3044
<CHeaderNavItem class="d-md-down-none mx-2">
31-
<i class="cui-list"></i>
45+
<CHeaderNavLink>
46+
<i class="cui-list"></i>
47+
</CHeaderNavLink>
3248
</CHeaderNavItem>
3349
<CHeaderNavItem class="d-md-down-none mx-2">
34-
<i class="cui-envelope-open"></i>
50+
<CHeaderNavLink>
51+
<i class="cui-envelope-open"></i>
52+
</CHeaderNavLink>
3553
</CHeaderNavItem>
3654
<TheHeaderDropdownAccnt/>
3755
</CHeaderNav>

‎src/containers/TheHeaderDropdownAccnt.vue‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
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>

‎src/views/Dashboard.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@
238238
</div>
239239
<div class="legend text-center">
240240
<small>
241-
<sup><CBadge pill color="info">&nbsp;</CBadge></sup>
241+
<sup><CBadge shape="pill" color="info">&nbsp;</CBadge></sup>
242242
New clients
243243
&nbsp;&nbsp;
244-
<sup><CBadge pill color="danger">&nbsp;</CBadge></sup>
244+
<sup><CBadge shape="pill" color="danger">&nbsp;</CBadge></sup>
245245
Recurring clients
246246
</small>
247247
</div>
@@ -310,7 +310,7 @@
310310
<div class="progress-group">
311311
<div class="progress-group-header">
312312
<CIcon
313-
name="socialFacebook"
313+
name="facebook"
314314
height="17"
315315
class="progress-group-icon"
316316
/>
@@ -330,7 +330,7 @@
330330
<div class="progress-group">
331331
<div class="progress-group-header">
332332
<CIcon
333-
name="socialTwitter"
333+
name="twitter"
334334
height="17"
335335
class="progress-group-icon"
336336
/>
@@ -350,7 +350,7 @@
350350
<div class="progress-group">
351351
<div class="progress-group-header">
352352
<CIcon
353-
name="socialLinkedin"
353+
name="linkedin"
354354
height="17"
355355
class="progress-group-icon"
356356
/>
@@ -376,7 +376,7 @@
376376
</CCol>
377377
</CRow>
378378
<br/>
379-
<CTable
379+
<CDataTable
380380
class="mb-0 table-outline"
381381
hover
382382
:items="tableItems"
@@ -441,7 +441,7 @@
441441
<div class="small text-muted">Last login</div>
442442
<strong>{{item.activity}}</strong>
443443
</td>
444-
</CTable>
444+
</CDataTable>
445445
</CCard>
446446
</CCol>
447447
</CRow>

‎src/views/base/Cards.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<CCard>
6565
<CCardHeader>
6666
Card with label
67-
<CBadge pill color="danger" class="float-right">42</CBadge>
67+
<CBadge shape="pill" color="danger" class="float-right">42</CBadge>
6868
</CCardHeader>
6969
<CCardBody>
7070
{{loremIpsum}}

‎src/views/base/Carousels.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
height="400px"
2525
>
2626
<CCarouselItem
27-
captionHeader="First Slide"
28-
image="https://lorempixel.com/1024/480/technics/2/"
29-
captionText="Nulla vitae elit libero, a pharetra augue mollis interdum."
27+
captionHeader="First Slide"
28+
image="https://picsum.photos/1024/480/?image=52"
29+
captionText="Nulla vitae elit libero, a pharetra augue mollis interdum."
3030
/>
3131
<CCarouselItem
32-
captionHeader="Blank page"
33-
:image="{ blankColor: 'grey' }"
34-
captionText="Nulla vitae elit libero, a pharetra augue mollis interdum."
32+
captionHeader="Blank page"
33+
:image="{ placeholderColor: 'grey' }"
34+
captionText="Nulla vitae elit libero, a pharetra augue mollis interdum."
3535
/>
3636
<CCarouselItem
37-
image="https://lorempixel.com/1024/480/technics/8/"
37+
image="https://picsum.photos/1024/480/?image=54"
3838
/>
3939
</CCarousel>
4040
</CCardBody>

‎src/views/base/Forms.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@
190190
</CCol>
191191
<CCol sm="9" :class="key % 2 === 1 ? 'form-inline' : ''">
192192
<CInputCheckbox
193-
v-for="option in options"
194-
:key="option"
193+
v-for="(option, optionIndex) in options"
194+
:key="key + option"
195195
:label="option"
196196
:value="option"
197197
:custom="key > 1"
198198
:name="`Option 1${key}`"
199-
:checked="Math.random() > 0.6"
199+
:checked="optionIndex === key"
200200
:inline="key % 2 === 1"
201201
/>
202202
</CCol>
@@ -210,7 +210,7 @@
210210
<CCol sm="9" :class="key % 2 === 1 ? 'form-inline' : ''">
211211
<CInputRadio
212212
v-for="(option, optionIndex) in options"
213-
:key="option"
213+
:key="key + option"
214214
:label="option"
215215
type="radio"
216216
:value="option"

‎src/views/base/Jumbotrons.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<CCardBody>
2121
<CJumbotron>
2222
<h1 class="display-3">Bootstrap 4</h1>
23-
<p class="lead">Bootstrap 4 Components for Vue.js 2</p>
23+
<p class="lead">Bootstrap 4 Components for Vue.js 2.6+</p>
2424
<p>For more information visit website</p>
2525
<CButton color="primary" href="#">More Info</CButton>
2626
</CJumbotron>

‎src/views/base/ListGroups.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,19 @@
113113
class="d-flex justify-content-between align-items-center"
114114
>
115115
Cras justo odio
116-
<CBadge color="primary" pill>14</CBadge>
116+
<CBadge color="primary" shape="pill">14</CBadge>
117117
</CListGroupItem>
118118
<CListGroupItem
119119
class="d-flex justify-content-between align-items-center"
120120
>
121121
Dapibus ac facilisis in
122-
<CBadge color="primary" pill>2</CBadge>
122+
<CBadge color="primary" shape="pill">2</CBadge>
123123
</CListGroupItem>
124124
<CListGroupItem
125125
class="d-flex justify-content-between align-items-center"
126126
>
127127
Morbi leo risus
128-
<CBadge color="primary" pill>1</CBadge>
128+
<CBadge color="primary" shape="pill">1</CBadge>
129129
</CListGroupItem>
130130
</CListGroup>
131131
</CCardBody>

‎src/views/base/Navs.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<small>tab style</small>
5252
</CCardHeader>
5353
<CCardBody>
54-
<CNav tabs>
54+
<CNav variant="tabs">
5555
<CNavItem active>
5656
Active
5757
</CNavItem>
@@ -72,7 +72,7 @@
7272
<small>pill style</small>
7373
</CCardHeader>
7474
<CCardBody>
75-
<CNav pills>
75+
<CNav variant="pills">
7676
<CNavItem active>Active</CNavItem>
7777
<CNavItem>Link</CNavItem>
7878
<CNavItem>Another Link</CNavItem>
@@ -87,7 +87,7 @@
8787
<small>fill tabs</small>
8888
</CCardHeader>
8989
<CCardBody>
90-
<CNav fill tabs>
90+
<CNav fill variant="tabs">
9191
<CNavItem active>Active</CNavItem>
9292
<CNavItem>Link</CNavItem>
9393
<CNavItem>Link with a long name </CNavItem>
@@ -102,7 +102,7 @@
102102
<small>justified tabs</small>
103103
</CCardHeader>
104104
<CCardBody>
105-
<CNav justified tabs>
105+
<CNav justified variant="tabs">
106106
<CNavItem active>Active</CNavItem>
107107
<CNavItem>Link</CNavItem>
108108
<CNavItem>Link with a long name </CNavItem>

0 commit comments

Comments
 (0)