mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2025-02-23 14:40:38 +01:00
Code Issues Projects Releases Wiki Activity

Make all mining charts tooltips uniform

Browse source
This commit is contained in:
nymkappa 2022-06-10 23:34:13 +02:00
parent 2492bc69ff
commit da3272df76
No known key found for this signature in database
GPG key ID: E155910B16E8BD04
7 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
View file

@ -169,17 +169,16 @@ export class BlockFeeRatesGraphComponent implements OnInit {
if (data.length <= 0) { if (data.length <= 0) {
return ''; return '';
} }
let tooltip = `<b style="color: white; margin-left: 2px"> let tooltip = `<b style="color: white; margin-left: 2px">${formatterXAxis(this.locale, this.timespan, parseInt(data[0].axisValue, 10))}</b><br>`;
${formatterXAxis(this.locale, this.timespan, parseInt(data[0].axisValue, 10))}</b><br>`;
for (const pool of data.reverse()) { for (const pool of data.reverse()) {
tooltip += `${pool.marker} ${pool.seriesName}: ${pool.data[1]} sats/vByte<br>`; tooltip += `${pool.marker} ${pool.seriesName}: ${pool.data[1]} sats/vByte<br>`;
} }
if (['24h', '3d'].includes(this.timespan)) { if (['24h', '3d'].includes(this.timespan)) {
tooltip += `<small>At block: ${data[0].data[2]}</small>`; tooltip += `<small>` + $localize`At block: ${data[0].data[2]}` + `</small>`;
} else { } else {
tooltip += `<small>Around block ${data[0].data[2]}</small>`; tooltip += `<small>` + $localize`Around block: ${data[0].data[2]}` + `</small>`;
} }
return tooltip; return tooltip;

21
frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
View file

@ -6,7 +6,7 @@ import { ApiService } from 'src/app/services/api.service';
import { SeoService } from 'src/app/services/seo.service'; import { SeoService } from 'src/app/services/seo.service';
import { formatNumber } from '@angular/common'; import { formatNumber } from '@angular/common';
import { FormBuilder, FormGroup } from '@angular/forms'; import { FormBuilder, FormGroup } from '@angular/forms';
import { download, formatterXAxisLabel } from 'src/app/shared/graphs.utils'; import { download, formatterXAxis, formatterXAxisLabel } from 'src/app/shared/graphs.utils';
import { StorageService } from 'src/app/services/storage.service'; import { StorageService } from 'src/app/services/storage.service';
import { MiningService } from 'src/app/services/mining.service'; import { MiningService } from 'src/app/services/mining.service';
@ -71,7 +71,7 @@ export class BlockFeesGraphComponent implements OnInit {
.pipe( .pipe(
tap((response) => { tap((response) => {
this.prepareChartOptions({ this.prepareChartOptions({
blockFees: response.body.map(val => [val.timestamp * 1000, val.avgFees / 100000000]), blockFees: response.body.map(val => [val.timestamp * 1000, val.avgFees / 100000000, val.avgHeight]),
}); });
this.isLoading = false; this.isLoading = false;
}), }),
@ -119,12 +119,17 @@ export class BlockFeesGraphComponent implements OnInit {
}, },
borderColor: '#000', borderColor: '#000',
formatter: (ticks) => { formatter: (ticks) => {
const tick = ticks[0]; let tooltip = `<b style="color: white; margin-left: 2px">${formatterXAxis(this.locale, this.timespan, parseInt(ticks[0].axisValue, 10))}</b><br>`;
const feesString = `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.3-3')} BTC`; tooltip += `${ticks[0].marker} ${ticks[0].seriesName}: ${formatNumber(ticks[0].data[1], this.locale, '1.3-3')} BTC`;
return ` tooltip += `<br>`;
<b style="color: white; margin-left: 18px">${tick.axisValueLabel}</b><br>
<span>${feesString}</span> if (['24h', '3d'].includes(this.timespan)) {
`; tooltip += `<small>` + $localize`At block: ${ticks[0].data[2]}` + `</small>`;
} else {
tooltip += `<small>` + $localize`Around block: ${ticks[0].data[2]}` + `</small>`;
}
return tooltip;
} }
}, },
xAxis: { xAxis: {

21
frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.ts
View file

@ -6,7 +6,7 @@ import { ApiService } from 'src/app/services/api.service';
import { SeoService } from 'src/app/services/seo.service'; import { SeoService } from 'src/app/services/seo.service';
import { formatNumber } from '@angular/common'; import { formatNumber } from '@angular/common';
import { FormBuilder, FormGroup } from '@angular/forms'; import { FormBuilder, FormGroup } from '@angular/forms';
import { download, formatterXAxisLabel } from 'src/app/shared/graphs.utils'; import { download, formatterXAxis, formatterXAxisLabel } from 'src/app/shared/graphs.utils';
import { MiningService } from 'src/app/services/mining.service'; import { MiningService } from 'src/app/services/mining.service';
import { StorageService } from 'src/app/services/storage.service'; import { StorageService } from 'src/app/services/storage.service';
@ -69,7 +69,7 @@ export class BlockRewardsGraphComponent implements OnInit {
.pipe( .pipe(
tap((response) => { tap((response) => {
this.prepareChartOptions({ this.prepareChartOptions({
blockRewards: response.body.map(val => [val.timestamp * 1000, val.avgRewards / 100000000]), blockRewards: response.body.map(val => [val.timestamp * 1000, val.avgRewards / 100000000, val.avgHeight]),
}); });
this.isLoading = false; this.isLoading = false;
}), }),
@ -117,12 +117,17 @@ export class BlockRewardsGraphComponent implements OnInit {
}, },
borderColor: '#000', borderColor: '#000',
formatter: (ticks) => { formatter: (ticks) => {
const tick = ticks[0]; let tooltip = `<b style="color: white; margin-left: 2px">${formatterXAxis(this.locale, this.timespan, parseInt(ticks[0].axisValue, 10))}</b><br>`;
const rewardsString = `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.3-3')} BTC`; tooltip += `${ticks[0].marker} ${ticks[0].seriesName}: ${formatNumber(ticks[0].data[1], this.locale, '1.3-3')} BTC`;
return ` tooltip += `<br>`;
<b style="color: white; margin-left: 18px">${tick.axisValueLabel}</b><br>
<span>${rewardsString}</span> if (['24h', '3d'].includes(this.timespan)) {
`; tooltip += `<small>` + $localize`At block: ${ticks[0].data[2]}` + `</small>`;
} else {
tooltip += `<small>` + $localize`Around block: ${ticks[0].data[2]}` + `</small>`;
}
return tooltip;
} }
}, },
xAxis: { xAxis: {

20
frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts
View file

@ -10,7 +10,7 @@ import { StorageService } from 'src/app/services/storage.service';
import { MiningService } from 'src/app/services/mining.service'; import { MiningService } from 'src/app/services/mining.service';
import { StateService } from 'src/app/services/state.service'; import { StateService } from 'src/app/services/state.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { download } from 'src/app/shared/graphs.utils'; import { download, formatterXAxis } from 'src/app/shared/graphs.utils';
@Component({ @Component({
selector: 'app-block-sizes-weights-graph', selector: 'app-block-sizes-weights-graph',
@ -141,27 +141,21 @@ export class BlockSizesWeightsGraphComponent implements OnInit {
}, },
borderColor: '#000', borderColor: '#000',
formatter: (ticks) => { formatter: (ticks) => {
let sizeString = ''; let tooltip = `<b style="color: white; margin-left: 2px">${formatterXAxis(this.locale, this.timespan, parseInt(ticks[0].axisValue, 10))}</b><br>`;
let weightString = '';
for (const tick of ticks) { for (const tick of ticks) {
if (tick.seriesIndex === 0) { // Size if (tick.seriesIndex === 0) { // Size
sizeString = `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.2-2')} MB`; tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.2-2')} MB`;
} else if (tick.seriesIndex === 1) { // Weight } else if (tick.seriesIndex === 1) { // Weight
weightString = `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.2-2')} MWU`; tooltip += `${tick.marker} ${tick.seriesName}: ${formatNumber(tick.data[1], this.locale, '1.2-2')} MWU`;
} }
tooltip += `<br>`;
} }
const date = new Date(ticks[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' });
let tooltip = `<b style="color: white; margin-left: 18px">${date}</b><br>
<span>${sizeString}</span><br>
<span>${weightString}</span>`;
if (['24h', '3d'].includes(this.timespan)) { if (['24h', '3d'].includes(this.timespan)) {
tooltip += `<br><small>At block: ${ticks[0].data[2]}</small>`; tooltip += `<small>` + $localize`At block: ${ticks[0].data[2]}` + `</small>`;
} else { } else {
tooltip += `<br><small>Around block ${ticks[0].data[2]}</small>`; tooltip += `<small>` + $localize`Around block: ${ticks[0].data[2]}` + `</small>`;
} }
return tooltip; return tooltip;

2
frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
View file

@ -207,7 +207,7 @@ export class HashrateChartComponent implements OnInit {
const date = new Date(ticks[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' }); const date = new Date(ticks[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' });
return ` return `
<b style="color: white; margin-left: 18px">${date}</b><br> <b style="color: white; margin-left: 2px">${date}</b><br>
<span>${hashrateString}</span><br> <span>${hashrateString}</span><br>
<span>${difficultyString}</span> <span>${difficultyString}</span>
`; `;

2
frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts
View file

@ -186,7 +186,7 @@ export class HashrateChartPoolsComponent implements OnInit {
borderColor: '#000', borderColor: '#000',
formatter: function (data) { formatter: function (data) {
const date = new Date(data[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' }); const date = new Date(data[0].data[0]).toLocaleDateString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' });
let tooltip = `<b style="color: white; margin-left: 18px">${date}</b><br>`; let tooltip = `<b style="color: white; margin-left: 2px">${date}</b><br>`;
data.sort((a, b) => b.data[1] - a.data[1]); data.sort((a, b) => b.data[1] - a.data[1]);
for (const pool of data) { for (const pool of data) {
if (pool.data[1] > 0) { if (pool.data[1] > 0) {

6
frontend/src/app/shared/graphs.utils.ts
View file

@ -13,18 +13,16 @@ export const formatterXAxis = (
return date.toLocaleTimeString(locale, { hour: 'numeric', minute: 'numeric' }); return date.toLocaleTimeString(locale, { hour: 'numeric', minute: 'numeric' });
case '24h': case '24h':
case '3d': case '3d':
return date.toLocaleTimeString(locale, { weekday: 'short', hour: 'numeric', minute: 'numeric' });
case '1w': case '1w':
case '1m': case '1m':
case '3m': case '3m':
case '6m': case '6m':
case '1y': case '1y':
return date.toLocaleTimeString(locale, { month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' }); return date.toLocaleTimeString(locale, { month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
case '2y': case '2y':
case '3y': case '3y':
return date.toLocaleDateString(locale, { year: 'numeric', month: 'short', day: 'numeric' });
case 'all': case 'all':
return date.toLocaleDateString(locale, { year: 'numeric', month: 'short' }); return date.toLocaleDateString(locale, { year: 'numeric', month: 'long', day: 'numeric' });
} }
}; };