Skip to content

Commit d1647a5

Browse files
committed
refactor: add custom tooltips
1 parent c166bf1 commit d1647a5

File tree

4 files changed

+147
-289
lines changed

4 files changed

+147
-289
lines changed

src/app/views/dashboard/dashboard.component.html

Lines changed: 38 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ <h4 class="mb-0">9.823</h4>
1818
<p>Members online</p>
1919
</div>
2020
<div class="chart-wrapper px-3" style="height:70px;">
21-
<canvas baseChart class="chart"
21+
<canvas id="cardChart1" baseChart class="chart"
2222
[datasets]="lineChart1Data"
2323
[labels]="lineChart1Labels"
2424
[options]="lineChart1Options"
2525
[colors]="lineChart1Colours"
2626
[legend]="lineChart1Legend"
27-
[chartType]="lineChart1Type"
28-
(chartHover)="chartHovered($event)"
29-
(chartClick)="chartClicked($event)"></canvas>
27+
[chartType]="lineChart1Type"></canvas>
3028
</div>
3129
</div>
3230
</div><!--/.col-->
@@ -40,15 +38,13 @@ <h4 class="mb-0">9.823</h4>
4038
<p>Members online</p>
4139
</div>
4240
<div class="chart-wrapper px-3" style="height:70px;">
43-
<canvas baseChart class="chart"
41+
<canvas id="cardChart2" baseChart class="chart"
4442
[datasets]="lineChart2Data"
4543
[labels]="lineChart2Labels"
4644
[options]="lineChart2Options"
4745
[colors]="lineChart2Colours"
4846
[legend]="lineChart2Legend"
49-
[chartType]="lineChart2Type"
50-
(chartHover)="chartHovered($event)"
51-
(chartClick)="chartClicked($event)"></canvas>
47+
[chartType]="lineChart2Type"></canvas>
5248
</div>
5349
</div>
5450
</div><!--/.col-->
@@ -69,15 +65,13 @@ <h4 class="mb-0">9.823</h4>
6965
<p>Members online</p>
7066
</div>
7167
<div class="chart-wrapper" style="height:70px;">
72-
<canvas baseChart class="chart"
68+
<canvas id="cardChart3" baseChart class="chart"
7369
[datasets]="lineChart3Data"
7470
[labels]="lineChart3Labels"
7571
[options]="lineChart3Options"
7672
[colors]="lineChart3Colours"
7773
[legend]="lineChart3Legend"
78-
[chartType]="lineChart3Type"
79-
(chartHover)="chartHovered($event)"
80-
(chartClick)="chartClicked($event)"></canvas>
74+
[chartType]="lineChart3Type"></canvas>
8175
</div>
8276
</div>
8377
</div><!--/.col-->
@@ -98,15 +92,13 @@ <h4 class="mb-0">9.823</h4>
9892
<p>Members online</p>
9993
</div>
10094
<div class="chart-wrapper px-3" style="height:70px;">
101-
<canvas baseChart class="chart"
95+
<canvas id="cardChart4" baseChart class="chart"
10296
[datasets]="barChart1Data"
10397
[labels]="barChart1Labels"
10498
[options]="barChart1Options"
10599
[colors]="barChart1Colours"
106100
[legend]="barChart1Legend"
107-
[chartType]="barChart1Type"
108-
(chartHover)="chartHovered($event)"
109-
(chartClick)="chartClicked($event)"></canvas>
101+
[chartType]="barChart1Type"></canvas>
110102
</div>
111103
</div>
112104
</div><!--/.col-->
@@ -128,15 +120,13 @@ <h4 class="card-title mb-0">Traffic</h4>
128120
</div><!--/.col-->
129121
</div><!--/.row-->
130122
<div class="chart-wrapper" style="height:300px;margin-top:40px;">
131-
<canvas baseChart class="chart"
123+
<canvas id="mainChart" baseChart class="chart"
132124
[datasets]="mainChartData"
133125
[labels]="mainChartLabels"
134126
[options]="mainChartOptions"
135127
[colors]="mainChartColours"
136128
[legend]="mainChartLegend"
137-
[chartType]="mainChartType"
138-
(chartHover)="chartHovered($event)"
139-
(chartClick)="chartClicked($event)"></canvas>
129+
[chartType]="mainChartType"></canvas>
140130
</div>
141131
</div>
142132
<div class="card-footer">
@@ -186,15 +176,13 @@ <h4 class="card-title mb-0">Traffic</h4>
186176
<div class="brand-card-header bg-facebook">
187177
<i class="fa fa-facebook"></i>
188178
<div class="chart-wrapper">
189-
<canvas baseChart class="chart"
190-
[datasets]="socialChartData1"
191-
[labels]="socialChartLabels"
192-
[options]="socialChartOptions"
193-
[colors]="socialChartColours"
194-
[legend]="socialChartLegend"
195-
[chartType]="socialChartType"
196-
(chartHover)="chartHovered($event)"
197-
(chartClick)="chartClicked($event)"></canvas>
179+
<canvas id="brandBox1" baseChart class="chart"
180+
[datasets]="brandBoxChartData1"
181+
[labels]="brandBoxChartLabels"
182+
[options]="brandBoxChartOptions"
183+
[colors]="brandBoxChartColours"
184+
[legend]="brandBoxChartLegend"
185+
[chartType]="brandBoxChartType"></canvas>
198186
</div>
199187
</div>
200188
<div class="brand-card-body">
@@ -214,15 +202,13 @@ <h4 class="card-title mb-0">Traffic</h4>
214202
<div class="brand-card-header bg-twitter">
215203
<i class="fa fa-twitter"></i>
216204
<div class="chart-wrapper">
217-
<canvas baseChart class="chart"
218-
[datasets]="socialChartData2"
219-
[labels]="socialChartLabels"
220-
[options]="socialChartOptions"
221-
[colors]="socialChartColours"
222-
[legend]="socialChartLegend"
223-
[chartType]="socialChartType"
224-
(chartHover)="chartHovered($event)"
225-
(chartClick)="chartClicked($event)"></canvas>
205+
<canvas id="brandBox2" baseChart class="chart"
206+
[datasets]="brandBoxChartData2"
207+
[labels]="brandBoxChartLabels"
208+
[options]="brandBoxChartOptions"
209+
[colors]="brandBoxChartColours"
210+
[legend]="brandBoxChartLegend"
211+
[chartType]="brandBoxChartType"></canvas>
226212
</div>
227213
</div>
228214
<div class="brand-card-body">
@@ -242,15 +228,13 @@ <h4 class="card-title mb-0">Traffic</h4>
242228
<div class="brand-card-header bg-linkedin">
243229
<i class="fa fa-linkedin"></i>
244230
<div class="chart-wrapper">
245-
<canvas baseChart class="chart"
246-
[datasets]="socialChartData3"
247-
[labels]="socialChartLabels"
248-
[options]="socialChartOptions"
249-
[colors]="socialChartColours"
250-
[legend]="socialChartLegend"
251-
[chartType]="socialChartType"
252-
(chartHover)="chartHovered($event)"
253-
(chartClick)="chartClicked($event)"></canvas>
231+
<canvas id="brandBox3" baseChart class="chart"
232+
[datasets]="brandBoxChartData3"
233+
[labels]="brandBoxChartLabels"
234+
[options]="brandBoxChartOptions"
235+
[colors]="brandBoxChartColours"
236+
[legend]="brandBoxChartLegend"
237+
[chartType]="brandBoxChartType"></canvas>
254238
</div>
255239
</div>
256240
<div class="brand-card-body">
@@ -270,15 +254,13 @@ <h4 class="card-title mb-0">Traffic</h4>
270254
<div class="brand-card-header bg-google-plus">
271255
<i class="fa fa-google-plus"></i>
272256
<div class="chart-wrapper">
273-
<canvas baseChart class="chart"
274-
[datasets]="socialChartData4"
275-
[labels]="socialChartLabels"
276-
[options]="socialChartOptions"
277-
[colors]="socialChartColours"
278-
[legend]="socialChartLegend"
279-
[chartType]="socialChartType"
280-
(chartHover)="chartHovered($event)"
281-
(chartClick)="chartClicked($event)"></canvas>
257+
<canvas id="brandBox4" baseChart class="chart"
258+
[datasets]="brandBoxChartData4"
259+
[labels]="brandBoxChartLabels"
260+
[options]="brandBoxChartOptions"
261+
[colors]="brandBoxChartColours"
262+
[legend]="brandBoxChartLegend"
263+
[chartType]="brandBoxChartType"></canvas>
282264
</div>
283265
</div>
284266
<div class="brand-card-body">
@@ -309,35 +291,13 @@ <h4 class="card-title mb-0">Traffic</h4>
309291
<small class="text-muted">New Clients</small>
310292
<br>
311293
<strong class="h4">9,123</strong>
312-
<div class="chart-wrapper" style="height:30px;">
313-
<canvas baseChart class="chart"
314-
[datasets]="sparklineChartData1"
315-
[labels]="sparklineChartLabels"
316-
[options]="sparklineChartOptions"
317-
[colors]="sparklineChartInfo"
318-
[legend]="sparklineChartLegend"
319-
[chartType]="sparklineChartType"
320-
(chartHover)="chartHovered($event)"
321-
(chartClick)="chartClicked($event)"></canvas>
322-
</div>
323294
</div>
324295
</div><!--/.col-->
325296
<div class="col-sm-6">
326297
<div class="callout callout-danger">
327298
<small class="text-muted">Recuring Clients</small>
328299
<br>
329300
<strong class="h4">22,643</strong>
330-
<div class="chart-wrapper" style="height:30px;">
331-
<canvas baseChart class="chart"
332-
[datasets]="sparklineChartData2"
333-
[labels]="sparklineChartLabels"
334-
[options]="sparklineChartOptions"
335-
[colors]="sparklineChartDanger"
336-
[legend]="sparklineChartLegend"
337-
[chartType]="sparklineChartType"
338-
(chartHover)="chartHovered($event)"
339-
(chartClick)="chartClicked($event)"></canvas>
340-
</div>
341301
</div>
342302
</div><!--/.col-->
343303
</div><!--/.row-->
@@ -455,35 +415,13 @@ <h4 class="card-title mb-0">Traffic</h4>
455415
<small class="text-muted">Pageviews</small>
456416
<br>
457417
<strong class="h4">78,623</strong>
458-
<div class="chart-wrapper" style="height:30px;">
459-
<canvas baseChart class="chart"
460-
[datasets]="sparklineChartData1"
461-
[labels]="sparklineChartLabels"
462-
[options]="sparklineChartOptions"
463-
[colors]="sparklineChartWarning"
464-
[legend]="sparklineChartLegend"
465-
[chartType]="sparklineChartType"
466-
(chartHover)="chartHovered($event)"
467-
(chartClick)="chartClicked($event)"></canvas>
468-
</div>
469418
</div>
470419
</div><!--/.col-->
471420
<div class="col-sm-6">
472421
<div class="callout callout-success">
473422
<small class="text-muted">Organic</small>
474423
<br>
475424
<strong class="h4">49,123</strong>
476-
<div class="chart-wrapper" style="height:30px;">
477-
<canvas baseChart class="chart"
478-
[datasets]="sparklineChartData2"
479-
[labels]="sparklineChartLabels"
480-
[options]="sparklineChartOptions"
481-
[colors]="sparklineChartSuccess"
482-
[legend]="sparklineChartLegend"
483-
[chartType]="sparklineChartType"
484-
(chartHover)="chartHovered($event)"
485-
(chartClick)="chartClicked($event)"></canvas>
486-
</div>
487425
</div>
488426
</div><!--/.col-->
489427
</div><!--/.row-->

0 commit comments

Comments
 (0)