Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 53c9f1c

Browse filesBrowse files
woothuwoothu
committed
refactor: naming changes
1 parent 951b13e commit 53c9f1c
Copy full SHA for 53c9f1c

File tree

6 files changed

+27
-27
lines changed
Filter options

6 files changed

+27
-27
lines changed

‎src/components/Charts/CSimpleBarChart.vue

Copy file name to clipboardExpand all lines: src/components/Charts/CSimpleBarChart.vue
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script>
22
import { Bar } from 'vue-chartjs'
33
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
4-
import { generatedLabels, generatedBackgroundColor,generatedBorderColor, generatedOptions } from '../../mixins/chartMixins'
4+
import { generatedLabels, generatedColor,generatedBorderColor, generatedOptions } from '../../mixins/chartMixins'
55
66
export default {
77
name: 'CSimpleBarChart',
88
extends: Bar,
9-
mixins: [generatedLabels, generatedBackgroundColor, generatedBorderColor, generatedOptions],
9+
mixins: [generatedLabels, generatedColor, generatedBorderColor, generatedOptions],
1010
props: {
1111
data: {
1212
type: Array,
@@ -24,7 +24,7 @@ export default {
2424
type: String,
2525
default: 'rgba(255,255,255,.55)'
2626
},
27-
backgroundColor:{
27+
color:{
2828
type: String,
2929
default: 'rgba(0,0,0,.2)'
3030
},
@@ -58,7 +58,7 @@ export default {
5858
const dataset = [
5959
{
6060
label: this.label,
61-
backgroundColor: this.generatedBackgroundColor,
61+
backgroundColor: this.generatedColor,
6262
borderColor: this.generatedBorderColor,
6363
data: this.data
6464
}

‎src/components/Charts/CSimpleLineChart.vue

Copy file name to clipboardExpand all lines: src/components/Charts/CSimpleLineChart.vue
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script>
22
import { Line } from 'vue-chartjs'
33
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
4-
import { generatedLabels, generatedBackgroundColor, generatedBorderColor, generatedPointHoverBackgroundColor, generatedOptions } from '../../mixins/chartMixins'
4+
import { generatedLabels, generatedColor, generatedBorderColor, generatedPointHoverColor, generatedOptions } from '../../mixins/chartMixins'
55
66
export default {
77
name: 'CSimpleLineChart',
88
extends: Line,
9-
mixins: [generatedLabels, generatedBackgroundColor, generatedBorderColor, generatedPointHoverBackgroundColor, generatedOptions],
9+
mixins: [generatedLabels, generatedColor, generatedBorderColor, generatedPointHoverColor, generatedOptions],
1010
props: {
1111
data: {
1212
type: Array,
@@ -25,11 +25,11 @@ export default {
2525
default: 'rgba(255,255,255,.55)'
2626
},
2727
labels: Array,
28-
backgroundColor:{
28+
color:{
2929
type: String,
3030
default: 'transparent'
3131
},
32-
pointHoverBackgroundColor:{
32+
pointHoverColor:{
3333
type: String,
3434
default: 'transparent'
3535
},
@@ -72,8 +72,8 @@ export default {
7272
{
7373
label: this.label,
7474
borderColor: this.generatedBorderColor,
75-
backgroundColor: this.generatedBackgroundColor,
76-
pointHoverBackgroundColor: this.generatedPointHoverBackgroundColor,
75+
backgroundColor: this.generatedColor,
76+
pointHoverBackgroundColor: this.generatedPointHoverColor,
7777
data: this.data
7878
}
7979
]

‎src/components/Charts/CSimplePointedChart.vue

Copy file name to clipboardExpand all lines: src/components/Charts/CSimplePointedChart.vue
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script>
22
import { Line } from 'vue-chartjs'
33
import { CustomTooltips } from '@coreui/coreui-plugin-chartjs-custom-tooltips'
4-
import { generatedLabels, generatedBackgroundColor, generatedBorderColor, generatedPointHoverBackgroundColor, generatedOptions } from '../../mixins/chartMixins'
4+
import { generatedLabels, generatedColor, generatedBorderColor, generatedPointHoverColor, generatedOptions } from '../../mixins/chartMixins'
55
66
export default {
77
name: 'CSimplePointedChart',
88
extends: Line,
9-
mixins: [generatedLabels, generatedBackgroundColor, generatedBorderColor, generatedPointHoverBackgroundColor, generatedOptions],
9+
mixins: [generatedLabels, generatedColor, generatedBorderColor, generatedPointHoverColor, generatedOptions],
1010
props: {
1111
data: {
1212
type: Array,
@@ -25,11 +25,11 @@ export default {
2525
default: 'rgba(255,255,255,.55)'
2626
},
2727
labels: Array,
28-
backgroundColor:{
28+
color:{
2929
type: String,
3030
default: 'transparent'
3131
},
32-
pointHoverBackgroundColor:{
32+
pointHoverColor:{
3333
type: String,
3434
default: 'transparent'
3535
},
@@ -88,8 +88,8 @@ export default {
8888
{
8989
label: this.label,
9090
borderColor: this.generatedBorderColor,
91-
backgroundColor: this.generatedBackgroundColor,
92-
pointHoverBackgroundColor: this.generatedPointHoverBackgroundColor,
91+
backgroundColor: this.generatedColor,
92+
pointHoverBackgroundColor: this.generatedPointHoverColor,
9393
data: this.data
9494
}
9595
]

‎src/components/Widgets/CWidget01.vue

Copy file name to clipboardExpand all lines: src/components/Widgets/CWidget01.vue
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="h4 m-0">{{props.header}}</div>
55
<div>{{props.text}}</div>
66
<slot>
7-
<CProgress :variant="!props.inverse ? props.variant : ''"
7+
<CProgress :color="!props.inverse ? props.variant : ''"
88
:value = "props.value"
99
:class="props.inverse ? 'progress-white' : ''"
1010
class="progress-xs my-3 mb-0"/>

‎src/components/Widgets/CWidget05.vue

Copy file name to clipboardExpand all lines: src/components/Widgets/CWidget05.vue
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="h4 mb-0">{{props.header}}</div>
88
<small class="text-muted text-uppercase font-weight-bold">{{props.text}}</small>
99
<slot>
10-
<CProgress :variant="!props.inverse ? props.variant : ''"
10+
<CProgress :color="!props.inverse ? props.variant : ''"
1111
:value="props.value"
1212
:class="props.inverse ? 'progress-white' : ''"
1313
class="progress-xs my-3 mb-0"/>

‎src/mixins/chartMixins.js

Copy file name to clipboardExpand all lines: src/mixins/chartMixins.js
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ const generatedLabels = {
1212
},
1313
},
1414
}
15-
const generatedBackgroundColor = {
15+
const generatedColor = {
1616
computed:{
17-
generatedBackgroundColor(){
18-
return getColor(this.backgroundColor)
17+
generatedColor(){
18+
return getColor(this.color)
1919
},
2020
},
2121
}
@@ -26,12 +26,12 @@ const generatedBorderColor = {
2626
},
2727
},
2828
}
29-
const generatedPointHoverBackgroundColor = {
29+
const generatedPointHoverColor = {
3030
computed:{
31-
generatedPointHoverBackgroundColor () {
32-
if(this.$options.propsData.pointHoverBackgroundColor === undefined)
31+
generatedPointHoverColor () {
32+
if(this.$options.propsData.pointHoverColor === undefined)
3333
return this.generatedBorderColor
34-
return getColor(this.pointHoverBackgroundColor)
34+
return getColor(this.pointHoverColor)
3535
},
3636
},
3737
}
@@ -46,8 +46,8 @@ const generatedOptions = {
4646
}
4747
export{
4848
generatedLabels,
49-
generatedBackgroundColor,
49+
generatedColor,
5050
generatedBorderColor,
51-
generatedPointHoverBackgroundColor,
51+
generatedPointHoverColor,
5252
generatedOptions
5353
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.