changes updated

This commit is contained in:
root 2019-08-22 17:41:55 +05:30
parent 4a339da74f
commit ee2506ceab
7 changed files with 29 additions and 22 deletions

View File

@ -11,7 +11,7 @@
"transactions-vs-date" : "Transaktionen nach Datum", "transactions-vs-date" : "Transaktionen nach Datum",
"total-difficulty" : "Gesamtschwierigkeit", "total-difficulty" : "Gesamtschwierigkeit",
"target-difficulty" : "Zielschwierigkeit", "target-difficulty" : "Zielschwierigkeit",
"avg-block-interval-per-day" : "Durchschnittliches Sperrintervall / Tag", "avg-block-interval" : "Durchschnittliches Sperrintervall",
"home": { "home": {
"HEADER_TEXT": "Sie befinden sich in Beta", "HEADER_TEXT": "Sie befinden sich in Beta",
"COUNTDOWN": "Mainnet-Countdown", "COUNTDOWN": "Mainnet-Countdown",
@ -46,7 +46,7 @@
"BLOCKS" : "Blöcke", "BLOCKS" : "Blöcke",
"BLOCKSINTERVAL" : "Sperrintervall", "BLOCKSINTERVAL" : "Sperrintervall",
"SUPPLY_GROWTH_HOVER" : "Aktuelle Blockbelohnung", "SUPPLY_GROWTH_HOVER" : "Aktuelle Blockbelohnung",
"BOCKS_COUNT_HOVER" : "Heute Block Count", "BOCKS_COUNT_HOVER" : "Anzahl der letzten 24h Blöcke",
"TRANSACTION_FEE_HOVER" : "Heute Transaktionsgebühren insgesamt", "TRANSACTION_FEE_HOVER" : "Heute Transaktionsgebühren insgesamt",
"BLOCK_INTERVAL_HOVER" : "Heute Blockintervall in Sekunden", "BLOCK_INTERVAL_HOVER" : "Heute Blockintervall in Sekunden",
"TRANSACTION_LINECHAT_HOVER" : "Heute Gesamtzahl der Transaktionen", "TRANSACTION_LINECHAT_HOVER" : "Heute Gesamtzahl der Transaktionen",
@ -56,7 +56,7 @@
"TRANSACTION_FEES" : "Transkationsgebühren", "TRANSACTION_FEES" : "Transkationsgebühren",
"SUPPLY_GROWTH" : "Angebotswachstum", "SUPPLY_GROWTH" : "Angebotswachstum",
"HASHRATE_GROWTH_CHART" : "HashRate-Wachstumstabelle", "HASHRATE_GROWTH_CHART" : "HashRate-Wachstumstabelle",
"BLOCK_INTERVAL" : "Durchschnittliches Sperrintervall / Tag", "BLOCK_INTERVAL" : "Durchschnittliches Sperrintervall",
"TRANSACTIONS_VS_DATE" : "Transaktionen gegen Datum", "TRANSACTIONS_VS_DATE" : "Transaktionen gegen Datum",
"DAYS" : "Tage", "DAYS" : "Tage",
"MONTHS" : "Monate", "MONTHS" : "Monate",

View File

@ -11,7 +11,7 @@
"transactions-by-date" : "Transactions by Date", "transactions-by-date" : "Transactions by Date",
"total-difficulty" : "Total Difficulty", "total-difficulty" : "Total Difficulty",
"target-difficulty" : "Target Difficulty", "target-difficulty" : "Target Difficulty",
"avg-block-interval-per-day" : "Avg Block Interval / Day", "avg-block-interval" : "Avg Block Interval",
"home": { "home": {
"HEADER_TEXT": "You are on Beta", "HEADER_TEXT": "You are on Beta",
"COUNTDOWN": "Mainnet Countdown", "COUNTDOWN": "Mainnet Countdown",
@ -46,7 +46,7 @@
"BLOCKS" : "Blocks", "BLOCKS" : "Blocks",
"BLOCKSINTERVAL" : "Block Interval", "BLOCKSINTERVAL" : "Block Interval",
"SUPPLY_GROWTH_HOVER" : "Current Block Reward", "SUPPLY_GROWTH_HOVER" : "Current Block Reward",
"BOCKS_COUNT_HOVER" : "Today Block Count", "BOCKS_COUNT_HOVER" : "Last 24h Blocks Count",
"TRANSACTION_FEE_HOVER" : "Today Total Transaction Fees", "TRANSACTION_FEE_HOVER" : "Today Total Transaction Fees",
"BLOCK_INTERVAL_HOVER" : "Today Block Interval in Secs", "BLOCK_INTERVAL_HOVER" : "Today Block Interval in Secs",
"TRANSACTION_LINECHAT_HOVER" : "Today Total Transaction Count", "TRANSACTION_LINECHAT_HOVER" : "Today Total Transaction Count",
@ -56,7 +56,7 @@
"TRANSACTION_FEES" : "Transaction Fees", "TRANSACTION_FEES" : "Transaction Fees",
"SUPPLY_GROWTH" : "Supply Growth", "SUPPLY_GROWTH" : "Supply Growth",
"HASHRATE_GROWTH_CHART" : "HashRate Growth Chart", "HASHRATE_GROWTH_CHART" : "HashRate Growth Chart",
"BLOCK_INTERVAL" : "Avg Block Interval / Day", "BLOCK_INTERVAL" : "Avg Block Interval",
"TRANSACTIONS_VS_DATE" : "Transactions by Date", "TRANSACTIONS_VS_DATE" : "Transactions by Date",
"DAYS" : "days", "DAYS" : "days",
"MONTHS" : "months", "MONTHS" : "months",

View File

@ -185,8 +185,8 @@
<li class="mb-1" *ngIf="this.title!='Supply Growth'"><a <li class="mb-1" *ngIf="this.title!='Supply Growth'"><a
routerLink="/chart/supply-growth">{{'home.SUPPLY_GROWTH' | translate}}</a></li> routerLink="/chart/supply-growth">{{'home.SUPPLY_GROWTH' | translate}}</a></li>
<!-- <li class="mb-1" *ngIf="this.title!='HashRate Growth Chart'"><a routerLink="/chart/hashrate-growth-chart">{{'home.HASHRATE_GROWTH_CHART' | translate}}</a></li> --> <!-- <li class="mb-1" *ngIf="this.title!='HashRate Growth Chart'"><a routerLink="/chart/hashrate-growth-chart">{{'home.HASHRATE_GROWTH_CHART' | translate}}</a></li> -->
<li class="mb-1" *ngIf="this.title!='Avg Block Interval / Day'"><a <li class="mb-1" *ngIf="this.title!='Avg Block Interval'"><a
routerLink="/chart/avg-block-interval-per-day">{{'home.BLOCK_INTERVAL' | translate}}</a></li> routerLink="/chart/avg-block-interval">{{'home.BLOCK_INTERVAL' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Transactions by Date'"><a <li class="mb-1" *ngIf="this.title!='Transactions by Date'"><a
routerLink="/chart/transactions-by-date">{{'home.TRANSACTIONS_VS_DATE' | translate}}</a></li> routerLink="/chart/transactions-by-date">{{'home.TRANSACTIONS_VS_DATE' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Stackbar Chart'"><a routerLink="/chart/blocks-by-algorithm">Blocks by Algorithm</a> <li class="mb-1" *ngIf="this.title!='Stackbar Chart'"><a routerLink="/chart/blocks-by-algorithm">Blocks by Algorithm</a>

View File

@ -178,13 +178,13 @@ export class GraphDetailComponent implements OnInit {
// ); // );
// }); // });
break; break;
case 'avg-block-interval-per-day': case 'avg-block-interval':
this.comp.Blockspersecreq().then(res => { this.comp.Blockspersecreq().then(res => {
this.hashdata = this.comp.areaGraphData; this.hashdata = this.comp.areaGraphData;
this.hashdata.layout.height = 300; this.hashdata.layout.height = 300;
// this.hashdata.layout.width = // this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8; // window.innerWidth - window.innerWidth / 2.8;
this.title = 'Avg Block Interval / Day'; this.title = 'Avg Block Interval';
this.titleService.setTitle( this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title, this.route.snapshot.data.title + ' - ' + this.title,
); );
@ -312,13 +312,13 @@ export class GraphDetailComponent implements OnInit {
// this.title = 'HashRate Growth Chart'; // this.title = 'HashRate Growth Chart';
// }); // });
break; break;
case 'avg-block-interval-per-day': case 'avg-block-interval':
this.comp.Blockspersecreq(p1, p2, p3).then(res => { this.comp.Blockspersecreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.areaGraphData; this.hashdata = this.comp.areaGraphData;
this.hashdata.layout.height = 300; this.hashdata.layout.height = 300;
// this.hashdata.layout.width = // this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8; // window.innerWidth - window.innerWidth / 2.8;
this.title = 'Avg Block Interval / Day'; this.title = 'Avg Block Interval';
}); });
break; break;
case 'blocks-by-algorithm': case 'blocks-by-algorithm':

View File

@ -170,7 +170,7 @@
<h2 class="chart_heading d-inline-block">{{'home.SUPPLY_GROWTH' | translate}}</h2> <h2 class="chart_heading d-inline-block">{{'home.SUPPLY_GROWTH' | translate}}</h2>
<span class="txn_count" title="{{'home.SUPPLY_GROWTH_HOVER' | translate}}" *ngIf="this.gg_last">{{ <span class="txn_count" title="{{'home.SUPPLY_GROWTH_HOVER' | translate}}" *ngIf="this.gg_last">{{
this.gg_last | number this.gg_last | number
}}</span> }}Epic</span>
<div class="chart_show"> <div class="chart_show">
<epic-explorer-plotly *ngIf="growthGraphData.data" [data]="growthGraphData.data" [layout]="growthGraphData.layout"> <epic-explorer-plotly *ngIf="growthGraphData.data" [data]="growthGraphData.data" [layout]="growthGraphData.layout">
</epic-explorer-plotly> </epic-explorer-plotly>
@ -407,7 +407,7 @@
<h2 class="chart_heading d-inline-block">{{'home.BLOCKSINTERVAL' | translate}}</h2> <h2 class="chart_heading d-inline-block">{{'home.BLOCKSINTERVAL' | translate}}</h2>
<span class="txn_count" title="{{'home.BLOCK_INTERVAL_BW_BLOCKS_HOVER' | translate}}" *ngIf="this.blockinteval_last">{{ <span class="txn_count" title="{{'home.BLOCK_INTERVAL_BW_BLOCKS_HOVER' | translate}}" *ngIf="this.blockinteval_last">{{
this.blockinteval_last | number this.blockinteval_last | number
}}</span> }}s</span>
<div class="chart_show"> <div class="chart_show">
<epic-explorer-plotly *ngIf="barGraphIntevalData.data" [data]="barGraphIntevalData.data" [layout]="barGraphIntevalData.layout"></epic-explorer-plotly> <epic-explorer-plotly *ngIf="barGraphIntevalData.data" [data]="barGraphIntevalData.data" [layout]="barGraphIntevalData.layout"></epic-explorer-plotly>
<div *ngIf="!barGraphIntevalData.data" class="feedback_div news_desc text-center"> <div *ngIf="!barGraphIntevalData.data" class="feedback_div news_desc text-center">
@ -446,7 +446,7 @@
<div class="box_shadow"> <div class="box_shadow">
<div class="blocks"> <div class="blocks">
<h2 class="chart_heading d-inline-block">{{'home.BLOCK_INTERVAL' | translate}}</h2> <h2 class="chart_heading d-inline-block">{{'home.BLOCK_INTERVAL' | translate}}</h2>
<span class="txn_count" title="{{'home.BLOCK_INTERVAL_HOVER' | translate}}" *ngIf="this.ag_last">{{ this.ag_last | number }} sec</span> <span class="txn_count" title="{{'home.BLOCK_INTERVAL_HOVER' | translate}}" *ngIf="this.ag_last">{{ this.ag_last | number }}s</span>
<div class="chart_show"> <div class="chart_show">
<epic-explorer-plotly *ngIf="areaGraphData.data" [data]="areaGraphData.data" [layout]="areaGraphData.layout"> <epic-explorer-plotly *ngIf="areaGraphData.data" [data]="areaGraphData.data" [layout]="areaGraphData.layout">
@ -482,7 +482,7 @@
[ngClass]="{ active: selectedItem2 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a> [ngClass]="{ active: selectedItem2 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
</div> </div>
<div class="explore_all text-right"> <div class="explore_all text-right">
<a routerLink="/chart/avg-block-interval-per-day"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i <a routerLink="/chart/avg-block-interval"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
class="fa fa-long-arrow-right"></i></span></a> class="fa fa-long-arrow-right"></i></span></a>
</div> </div>
</div> </div>

View File

@ -76,7 +76,7 @@ export class GraphListComponent implements OnInit {
if (this.router.url == '/all') { if (this.router.url == '/all') {
this.viewchartvar = true; this.viewchartvar = true;
} else { } else {
this.viewchartvar = false; this.viewchartvar = true;
} }
} }
@ -564,7 +564,7 @@ export class GraphListComponent implements OnInit {
.subscribe( .subscribe(
res => { res => {
if (res['status'] == 200) { if (res['status'] == 200) {
let BlocksChartHeight = res.response.height; let BlocksChartHeight = res.response.Blocks;
let Blockval = res.response.alter; let Blockval = res.response.alter;
this.blockinteval_last = Blockval[Blockval.length - 1]; this.blockinteval_last = Blockval[Blockval.length - 1];
this.BlocksIntevalFunc(BlocksChartHeight, Blockval); this.BlocksIntevalFunc(BlocksChartHeight, Blockval);
@ -806,6 +806,12 @@ export class GraphListComponent implements OnInit {
colorscale: 'Viridis', colorscale: 'Viridis',
}, },
}, },
{
name: 'Average Block Interval',
y: [60],
orientation: 'h',
type: 'bar'
}
], ],
layout: { layout: {
hovermode: 'closest', hovermode: 'closest',
@ -834,6 +840,7 @@ export class GraphListComponent implements OnInit {
}, },
options: null, options: null,
}; };
console.log(this.barGraphIntevalData.data)
} }
@ -937,7 +944,7 @@ export class GraphListComponent implements OnInit {
}, },
text: gReward, text: gReward,
hovertemplate: hovertemplate:
'%{x}<br> supply per day : %{text:,}<br> Total supply : %{y:,}', '%{x}<br> Supply Per Day : %{text:,}<br> Total supply : %{y:,}',
}, },
], ],
layout: { layout: {

View File

@ -27,9 +27,9 @@ import { ActivatedRoute } from '@angular/router';
routerLink="/all" routerLink="/all"
class="text-center my-3" class="text-center my-3"
> >
<button class="btn btn_primary align-middle"> <!-- <button class="btn btn_primary align-middle">
View All Charts <i class="fa fa-long-arrow-right ml-3 "></i> View All Charts <i class="fa fa-long-arrow-right ml-3 "></i>
</button> </button> -->
</div> </div>
</div> </div>
</div> </div>
@ -53,7 +53,7 @@ export class HomeWorksapceComponent extends Utils
if (this.router.url == '/all') { if (this.router.url == '/all') {
this.viewchartvar = false; this.viewchartvar = false;
} else { } else {
this.viewchartvar = true; this.viewchartvar = false;
} }
} }