Skip to content

Commit cbeebb7

Browse files
woothuwoothu
committed
refactor: minor refactors, fixes, code clean and snapshots update
1 parent 6c91472 commit cbeebb7

39 files changed

+3248
-2542
lines changed

‎src/assets/icons/icons.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import {
4343
cilCheck,
4444
cilChevronBottom,
4545
cilChevronTop,
46-
// cilCircleCheck,
46+
cilCheckCircle,
4747
cilCommentSquare,
4848
cilCursor,
4949
cilDrop,
@@ -63,6 +63,7 @@ import {
6363
cilLockLocked,
6464
cilMagnifyingGlass,
6565
cilMoon,
66+
cilOptions,
6667
cilPencil,
6768
cilPeople,
6869
cilPuzzle,
@@ -93,7 +94,7 @@ export const iconsSet = Object.assign(
9394
cilCheck,
9495
cilChevronBottom,
9596
cilChevronTop,
96-
// cilCircleCheck,
97+
cilCheckCircle,
9798
cilCommentSquare,
9899
cilCursor,
99100
cilDrop,
@@ -113,6 +114,7 @@ export const iconsSet = Object.assign(
113114
cilLockLocked,
114115
cilMagnifyingGlass,
115116
cilMoon,
117+
cilOptions,
116118
cilPencil,
117119
cilPeople,
118120
cilPuzzle,

‎src/views/Dashboard.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
<CIcon name="cil-globe-alt" class="progress-group-icon"/>
301301
<span class="title">Organic Search</span>
302302
<span class="ml-auto font-weight-bold">
303-
191,235<span class="text-muted small">(56%)</span>
303+
191,235 <span class="text-muted small">(56%)</span>
304304
</span>
305305
</div>
306306
<div class="progress-group-bars">

‎src/views/base/Forms.vue‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
</CForm>
246246
</CCardBody>
247247
<CCardFooter>
248-
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
248+
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
249249
<CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
250250
</CCardFooter>
251251
</CCard>
@@ -276,7 +276,7 @@
276276
</CForm>
277277
</CCardBody>
278278
<CCardFooter>
279-
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
279+
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
280280
<CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
281281
</CCardFooter>
282282
</CCard>
@@ -307,7 +307,7 @@
307307
</CForm>
308308
</CCardBody>
309309
<CCardFooter>
310-
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
310+
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
311311
<CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
312312
</CCardFooter>
313313
</CCard>
@@ -337,7 +337,7 @@
337337
/>
338338
</CCardBody>
339339
<CCardFooter>
340-
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
340+
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
341341
<CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
342342
</CCardFooter>
343343
</CForm>
@@ -427,7 +427,7 @@
427427
/>
428428
</CCardBody>
429429
<CCardFooter>
430-
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-circle-check"/> Submit</CButton>
430+
<CButton type="submit" size="sm" color="primary"><CIcon name="cil-check-circle"/> Submit</CButton>
431431
<CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
432432
</CCardFooter>
433433
</CCard>
@@ -506,7 +506,7 @@
506506
</CInput>
507507
</CCardBody>
508508
<CCardFooter>
509-
<CButton type="submit" size="sm" color="success"><CIcon name="cil-circle-check"/> Submit</CButton>
509+
<CButton type="submit" size="sm" color="success"><CIcon name="cil-check-circle"/> Submit</CButton>
510510
<CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
511511
</CCardFooter>
512512
</CCard>
@@ -539,15 +539,15 @@
539539
autocomplete="email"
540540
>
541541
<template #prepend>
542-
<CButton color="primary"><CIcon name="cil-facebook" height="14"/></CButton>
542+
<CButton color="primary"><CIcon name="cib-facebook" height="14"/></CButton>
543543
</template>
544544
<template #append>
545-
<CButton color="primary"><CIcon name="cil-twitter" height="14"/></CButton>
545+
<CButton color="primary"><CIcon name="cib-twitter" height="14"/></CButton>
546546
</template>
547547
</CInput>
548548
</CCardBody>
549549
<CCardFooter>
550-
<CButton type="submit" size="sm" color="success"><CIcon name="cil-circle-check"/> Submit</CButton>
550+
<CButton type="submit" size="sm" color="success"><CIcon name="cil-check-circle"/> Submit</CButton>
551551
<CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
552552
</CCardFooter>
553553
</CCard>
@@ -620,7 +620,7 @@
620620
</CInput>
621621
</CCardBody>
622622
<CCardFooter>
623-
<CButton type="submit" size="sm" color="success"><CIcon name="cil-circle-check"/> Submit</CButton>
623+
<CButton type="submit" size="sm" color="success"><CIcon name="cil-check-circle"/> Submit</CButton>
624624
<CButton type="reset" size="sm" color="danger"><CIcon name="cil-ban"/> Reset</CButton>
625625
</CCardFooter>
626626
</CCard>

‎src/views/buttons/ButtonGroups.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@
8080
<CDropdown right text="Menu" color="success">
8181
<CDropdownItem>Item 1</CDropdownItem>
8282
<CDropdownItem>Item 2</CDropdownItem>
83-
<CDropdownDivider></CDropdownDivider>
83+
<CDropdownDivider/>
8484
<CDropdownItem>Item 3</CDropdownItem>
8585
</CDropdown>
8686
<CButton color="secondary" class="d-sm-down-none">Button 3</CButton>
8787
<CDropdown right split text="Split Menu" color="info">
8888
<CDropdownItem>Item 1</CDropdownItem>
8989
<CDropdownItem>Item 2</CDropdownItem>
90-
<CDropdownDivider></CDropdownDivider>
90+
<CDropdownDivider/>
9191
<CDropdownItem>Item 3</CDropdownItem>
9292
</CDropdown>
9393
</CButtonGroup>

‎src/views/buttons/Dropdowns.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<CDropdownItem>First Action</CDropdownItem>
2828
<CDropdownItem>Second Action</CDropdownItem>
2929
<CDropdownItem>Third Action</CDropdownItem>
30-
<CDropdownDivider></CDropdownDivider>
30+
<CDropdownDivider/>
3131
<CDropdownItem>Something else here...</CDropdownItem>
3232
<CDropdownItem disabled>Disabled action</CDropdownItem>
3333
</CDropdown>
@@ -48,7 +48,7 @@
4848
>
4949
<CDropdownItem>First item</CDropdownItem>
5050
<CDropdownItem>Second item</CDropdownItem>
51-
<CDropdownDivider></CDropdownDivider>
51+
<CDropdownDivider/>
5252
<CDropdownItem>Separated Item</CDropdownItem>
5353
</CDropdown>
5454
</div>
@@ -242,7 +242,7 @@
242242
<CDropdownItem>Add</CDropdownItem>
243243
<CDropdownItem>Delete</CDropdownItem>
244244
</div>
245-
<CDropdownDivider></CDropdownDivider>
245+
<CDropdownDivider/>
246246
<CDropdownItem>
247247
Something <strong>not</strong> associated with user
248248
</CDropdownItem>

‎tests/unit/containers/__snapshots__/TheContainer.spec.js.snap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ exports[`TheContainer.vue renders correctly 1`] = `
1919
>
2020
<ccontainer-stub
2121
fluid="true"
22+
tag="div"
2223
>
2324
<router-view-stub
2425
name="fade"

‎tests/unit/containers/__snapshots__/TheHeader.spec.js.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ exports[`TheHeader.vue renders correctly 1`] = `
2424
alt="CoreUI Logo"
2525
class="mx-auto d-lg-none"
2626
height="46"
27-
src="img/brand/coreui-base.svg"
28-
width="97"
27+
src="img/brand/coreui-vue-logo.svg"
28+
width="190"
2929
/>
3030
3131
<cheadernav-stub

‎tests/unit/views/__snapshots__/Dashboard.spec.js.snap‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ exports[`Dashboard.vue renders correctly 1`] = `
88
<ccardbody-stub>
99
<crow-stub
1010
gutters="true"
11+
tag="div"
1112
>
1213
<ccol-stub
1314
sm="5"
@@ -106,6 +107,7 @@ exports[`Dashboard.vue renders correctly 1`] = `
106107
<crow-stub
107108
class="text-center"
108109
gutters="true"
110+
tag="div"
109111
>
110112
<ccol-stub
111113
class="mb-sm-2 mb-0"
@@ -238,6 +240,7 @@ exports[`Dashboard.vue renders correctly 1`] = `
238240
239241
<crow-stub
240242
gutters="true"
243+
tag="div"
241244
>
242245
<ccol-stub
243246
md="12"
@@ -253,6 +256,7 @@ exports[`Dashboard.vue renders correctly 1`] = `
253256
<ccardbody-stub>
254257
<crow-stub
255258
gutters="true"
259+
tag="div"
256260
>
257261
<ccol-stub
258262
lg="6"
@@ -261,6 +265,7 @@ exports[`Dashboard.vue renders correctly 1`] = `
261265
>
262266
<crow-stub
263267
gutters="true"
268+
tag="div"
264269
>
265270
<ccol-stub
266271
sm="6"
@@ -613,6 +618,7 @@ exports[`Dashboard.vue renders correctly 1`] = `
613618
>
614619
<crow-stub
615620
gutters="true"
621+
tag="div"
616622
>
617623
<ccol-stub
618624
sm="6"
@@ -761,7 +767,7 @@ exports[`Dashboard.vue renders correctly 1`] = `
761767
class="ml-auto font-weight-bold"
762768
>
763769
764-
191,235
770+
191,235
765771
<span
766772
class="text-muted small"
767773
>

‎tests/unit/views/base/__snapshots__/Breadcrumbs.spec.js.snap‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ exports[`Breadcrumbs.vue renders correctly 1`] = `
1717
class="c-icon"
1818
viewBox="0 0 64 64"
1919
xmlns="http://www.w3.org/2000/svg"
20-
/>
20+
>
21+
<title>
22+
cilJustifyCenter
23+
</title>
24+
undefined
25+
</svg>
2126
<strong>
2227
Bootstrap Breadcrumb
2328
</strong>

0 commit comments

Comments
 (0)