Skip to content

Commit

Permalink
Add better tooltip with hours to charts
Browse files Browse the repository at this point in the history
  • Loading branch information
igorshelkovenkov committed Feb 15, 2022
1 parent b2bbc2e commit 3d32325
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 13 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"email": "[email protected]",
"url": "https://www.defichain-income.com"
},
"version": "8.12.20",
"version": "8.12.21",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand Down
10 changes: 8 additions & 2 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,10 @@ export class AppComponent implements OnInit {
}
}
}
]
],
x: {
format: 'd/M/yyyy H:m'
}
},
grid: {
borderColor: this.getTheme() === 'dark' ? '#f1f1f1' : '#808080'
Expand Down Expand Up @@ -713,7 +716,10 @@ export class AppComponent implements OnInit {
}
}
}
]
],
x: {
format: 'd/M/yyyy H:m'
}
},
grid: {
borderColor: this.getTheme() === 'dark' ? '#f1f1f1' : '#808080'
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/history/history.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
</div>
<div class='mt-2'>
<apx-chart
*ngIf='history && history.length > 0 && chartOptions4 && chartOptions4.series.length > 0'
*ngIf='false && history && history.length > 0 && chartOptions4 && chartOptions4.series.length > 0'
[series]='chartOptions4?.series'
[chart]='chartOptions4?.chart'
[xaxis]= 'chartOptions4?.xaxis'
Expand Down
24 changes: 18 additions & 6 deletions src/app/components/history/history.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class HistoryComponent implements OnInit {
this.buildChartPrice();
this.buildChartReserve();
this.buildChartLiquidity();
this.buildChartVolume();
//this.buildChartVolume();
this.spinner.hide('historySpinner');
} else {
this.spinner.hide('historySpinner');
Expand Down Expand Up @@ -140,7 +140,10 @@ export class HistoryComponent implements OnInit {
}
}
}
]
],
x: {
format: 'd/M/yyyy H:m'
}
},
grid: {
borderColor: this.getTheme() === 'dark' ? '#f1f1f1' : '#808080'
Expand Down Expand Up @@ -217,7 +220,10 @@ export class HistoryComponent implements OnInit {
}
}
}
]
],
x: {
format: 'd/M/yyyy H:m'
}
},
grid: {
borderColor: this.getTheme() === 'dark' ? '#f1f1f1' : '#808080'
Expand Down Expand Up @@ -294,7 +300,10 @@ export class HistoryComponent implements OnInit {
}
}
}
]
],
x: {
format: 'd/M/yyyy H:m'
}
},
grid: {
borderColor: this.getTheme() === 'dark' ? '#f1f1f1' : '#808080'
Expand Down Expand Up @@ -371,7 +380,10 @@ export class HistoryComponent implements OnInit {
}
}
}
]
],
x: {
format: 'd/M/yyyy H:m'
}
},
grid: {
borderColor: this.getTheme() === 'dark' ? '#f1f1f1' : '#808080'
Expand Down Expand Up @@ -506,7 +518,7 @@ export class HistoryComponent implements OnInit {
this.buildChartPrice();
this.buildChartReserve();
this.buildChartLiquidity();
this.buildChartVolume();
//this.buildChartVolume();
this.spinner.hide('historySpinner');
}

Expand Down
2 changes: 1 addition & 1 deletion src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const environment = {
mamon_account: 'https://sync.defichain-masternode-monitor.com/v1/KEY/masternodes',
mamon_account_node: 'https://api.defichain-masternode-monitor.com/v1/masternodes/info/',
burninfo: 'https://api.mydeficha.in/v1/getburninfo/',
version: '8.12.20',
version: '8.12.21',
bittrex: 'https://api.bittrex.com/v3/currencies/DFI',
kucoin: 'https://api.kucoin.com/api/v1/currencies/DFI',
graphql: 'https://graphql.defichain-income.com/graphql',
Expand Down
2 changes: 1 addition & 1 deletion src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const environment = {
mamon_account: 'https://sync.defichain-masternode-monitor.com/v1/KEY/masternodes',
mamon_account_node: 'https://api.defichain-masternode-monitor.com/v1/masternodes/info/',
burninfo: 'https://api.mydeficha.in/v1/getburninfo/',
version: '8.12.20',
version: '8.12.21',
graphql: 'https://graphql.defichain-income.com/graphql',
// Matomo
// No tracking for local -> wrong id
Expand Down
5 changes: 5 additions & 0 deletions src/interface/Changelog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ export class Changelog {

this.logs = new Array<Log>();

this.log = new Log();
this.log.version = '8.12.21 - 15.2.2022';
this.log.comment = 'Add better tooltip with hours to charts';
this.logs.push(this.log);

this.log = new Log();
this.log.version = '8.12.20 - 15.2.2022';
this.log.comment = 'Fix darkmode change in value and income history charts';
Expand Down
2 changes: 1 addition & 1 deletion src/interface/Data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export type ChartOptions6 = {
stroke: ApexStroke;
dataLabels: ApexDataLabels;
markers: ApexMarkers;
tooltip: any; // ApexTooltip;
tooltip: ApexTooltip;
yaxis: ApexYAxis;
grid: ApexGrid;
legend: ApexLegend;
Expand Down

0 comments on commit 3d32325

Please sign in to comment.