EpicCash/epic_explorer
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8

Browse Source
This commit is contained in:
root 2019-08-08 12:49:13 +05:30
commit 357f974c57
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/components/header/header.component.html
View File

@ -41,7 +41,7 @@
<span class="flag " [ngStyle]="{ 'background-image': 'url(assets/img/' + translate.getCurrentLang() + '.jpg)'}"></span>
<!--<span class="flag" ngIf="translate.getCurrentLang() =='de'" style="background-image: url('assets/img/german.jpg')"></span>-->
<select class="langbut py-2 ml-1" #langSelect (change)="translate.changeLang(langSelect.value)">
<select class="langbut py-2 mx-1" #langSelect (change)="translate.changeLang(langSelect.value)">
<option *ngFor="let lang of translate.getLanguage()" [value]="lang" [selected]="lang == translate.getCurrentLang()">{{translate.langLabel[lang]}}</option>
</select>
<i class="arrow_drpdwn"></i>

2
src/app/shared/components/siteheader/siteheader.component.html
View File

@ -36,7 +36,7 @@
<div class="nav-item dropdown bg-white px-2 d-inline-block ml-2 order-1 order-sm-2">
<span class="flag " [ngStyle]="{ 'background-image': 'url(assets/img/' + translate.getCurrentLang() + '.jpg)'}"></span>
<!--<span class="flag" ngIf="translate.getCurrentLang() =='de'" style="background-image: url('assets/img/german.jpg')"></span>-->
<select class="langbut py-2 ml-1" #langSelect (change)="translate.changeLang(langSelect.value)">
<select class="langbut py-2 mx-1" #langSelect (change)="translate.changeLang(langSelect.value)">
<option *ngFor="let lang of translate.getLanguage()" [value]="lang" [selected]="lang == translate.getCurrentLang()">{{translate.langLabel[lang]}}</option>
</select>
<i class="arrow_drpdwn"></i>

3
src/app/view/home/block-detail-list/block-detail-list.component.html
View File

@ -28,7 +28,6 @@
<div class="col-md-3">
<div
class="text-center detail_div"
[ngStyle]="{ 'min-height.px': minHeight }"
>
<p class="mb-0 desc">{{ "home.BLOCKCHAIN_HEIGHT" | translate }}</p>
<p
@ -42,7 +41,6 @@
<div class="col-md-3">
<div
class="text-center detail_div"
[ngStyle]="{ 'min-height.px': minHeight }"
>
<p class="mb-0 desc">{{ "home.LATEST_BLOCK" | translate }}</p>
<p
@ -81,7 +79,6 @@
<div class="col-md-3">
<div
class="text-center detail_div"
[ngStyle]="{ 'min-height.px': minHeight }"
>
<p class="mb-0 desc">{{ "home.COIN_IN" | translate }}</p>
<p

2
src/app/view/home/block-detail-list/block-detail-list.component.ts
View File

@ -36,7 +36,7 @@ export class BlockDetailListComponent implements OnInit {
}
ngAfterViewInit() {
this.minHeight = this.elementView.nativeElement.offsetHeight;
// this.minHeight = this.elementView.nativeElement.offsetHeight;
}
getBlockDetails() {

18
src/app/view/home/graph-list/graph-list.component.ts
View File

@ -403,6 +403,7 @@ export class GraphListComponent implements OnInit {
let BlocksChartDate = res.response.blockDate;
let TargetDifficulty = res.response.TargetDifficulty;
let range = [res.response.Minrange, res.response.Maxrange]
let tickformat = res.response.tickFormat;
this.lg_last =
TargetDifficulty[TargetDifficulty.length - 1];
@ -412,7 +413,8 @@ export class GraphListComponent implements OnInit {
DifficultychartDate,
TargetDifficulty,
this.Type,
range
range,
tickformat
);
break;
case 'target':
@ -420,7 +422,8 @@ export class GraphListComponent implements OnInit {
DifficultychartDate,
TargetDifficulty,
this.Type,
range
range,
tickformat
);
break;
}
@ -460,7 +463,7 @@ export class GraphListComponent implements OnInit {
});
}
difficultyChartFunc(DifficultychartDate, TargetDifficulty, Type, range) {
difficultyChartFunc(DifficultychartDate, TargetDifficulty, Type, range, tickformat) {
console.log('range rangerangerange@@@@@@@22444',range);
this.linearGraphData = {
data: [
@ -512,7 +515,7 @@ export class GraphListComponent implements OnInit {
showlegend: false,
xaxis: {
tickangle: -45,
tickformat: '%m-%d',
tickformat: tickformat,
showgrid: true,
fixedrange: true
},
@ -738,6 +741,7 @@ export class GraphListComponent implements OnInit {
}
growthFunc(gDate, gReward, gaddedreward) {
console.log('gDate gReward gaddedreward',gDate, gReward, gaddedreward)
this.growthGraphData = {
data: [
{
@ -1087,7 +1091,7 @@ export class GraphListComponent implements OnInit {
options: null,
};
}
totaldifficultyChartFunc(DifficultychartDate, TargetDifficulty, Type, range) {
totaldifficultyChartFunc(DifficultychartDate, TargetDifficulty, Type, range, tickformat) {
this.linearTotalGraphData = {
data: [
{
@ -1098,7 +1102,7 @@ export class GraphListComponent implements OnInit {
type: 'scatter',
name: '',
line: { color: '#ac3333' },
hovertemplate: '%{x}<br> Difficulty : %{text:,}',
hovertemplate: '%{DifficultychartDate}<br> Difficulty : %{text:,}',
},
],
layout: {
@ -1108,7 +1112,7 @@ export class GraphListComponent implements OnInit {
showlegend: false,
xaxis: {
tickangle: -45,
tickformat: '%m-%d',
tickformat: tickformat,
fixedrange: true,
showgrid: true
},

1
src/assets/css/style.css
View File

@ -286,6 +286,7 @@ a:focus {
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.1);
padding: 20px;
transition: 0.3s linear all;
min-height: 100%;
}
.detail_div .count {
font-size: 25px;