changes updated

This commit is contained in:
root 2019-08-21 18:42:34 +05:30
parent 220e4c416a
commit 4a339da74f
6 changed files with 71 additions and 70 deletions

View File

@ -11,6 +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",
"home": { "home": {
"HEADER_TEXT": "Sie befinden sich in Beta", "HEADER_TEXT": "Sie befinden sich in Beta",
"COUNTDOWN": "Mainnet-Countdown", "COUNTDOWN": "Mainnet-Countdown",
@ -43,7 +44,7 @@
"TARGET_DIFFICULTY" : "Zielschwierigkeit", "TARGET_DIFFICULTY" : "Zielschwierigkeit",
"TRANSACTIONS_BY_TIME" : "Transaktionen im Zeitverlauf", "TRANSACTIONS_BY_TIME" : "Transaktionen im Zeitverlauf",
"BLOCKS" : "Blöcke", "BLOCKS" : "Blöcke",
"BLOCKSINTERVAL" : "Intervall-S / W-Blöcke", "BLOCKSINTERVAL" : "Sperrintervall",
"SUPPLY_GROWTH_HOVER" : "Aktuelle Blockbelohnung", "SUPPLY_GROWTH_HOVER" : "Aktuelle Blockbelohnung",
"BOCKS_COUNT_HOVER" : "Heute Block Count", "BOCKS_COUNT_HOVER" : "Heute Block Count",
"TRANSACTION_FEE_HOVER" : "Heute Transaktionsgebühren insgesamt", "TRANSACTION_FEE_HOVER" : "Heute Transaktionsgebühren insgesamt",
@ -55,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" : "Sperrintervall", "BLOCK_INTERVAL" : "Durchschnittliches Sperrintervall / Tag",
"TRANSACTIONS_VS_DATE" : "Transaktionen gegen Datum", "TRANSACTIONS_VS_DATE" : "Transaktionen gegen Datum",
"DAYS" : "Tage", "DAYS" : "Tage",
"MONTHS" : "Monate", "MONTHS" : "Monate",

View File

@ -11,6 +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",
"home": { "home": {
"HEADER_TEXT": "You are on Beta", "HEADER_TEXT": "You are on Beta",
"COUNTDOWN": "Mainnet Countdown", "COUNTDOWN": "Mainnet Countdown",
@ -43,7 +44,7 @@
"TARGET_DIFFICULTY" : "Target Difficulty", "TARGET_DIFFICULTY" : "Target Difficulty",
"TRANSACTIONS_BY_TIME" : "Transactions over time", "TRANSACTIONS_BY_TIME" : "Transactions over time",
"BLOCKS" : "Blocks", "BLOCKS" : "Blocks",
"BLOCKSINTERVAL" : "Interval B/W Blocks", "BLOCKSINTERVAL" : "Block Interval",
"SUPPLY_GROWTH_HOVER" : "Current Block Reward", "SUPPLY_GROWTH_HOVER" : "Current Block Reward",
"BOCKS_COUNT_HOVER" : "Today Block Count", "BOCKS_COUNT_HOVER" : "Today Block Count",
"TRANSACTION_FEE_HOVER" : "Today Total Transaction Fees", "TRANSACTION_FEE_HOVER" : "Today Total Transaction Fees",
@ -55,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" : "Block Interval", "BLOCK_INTERVAL" : "Avg Block Interval / Day",
"TRANSACTIONS_VS_DATE" : "Transactions by Date", "TRANSACTIONS_VS_DATE" : "Transactions by Date",
"DAYS" : "days", "DAYS" : "days",
"MONTHS" : "months", "MONTHS" : "months",

View File

@ -96,7 +96,7 @@
</div> --> </div> -->
<epic-explorer-plotly *ngIf="hashdata.data" [data]="hashdata.data" [layout]="hashdata.layout"> <epic-explorer-plotly *ngIf="hashdata.data" [data]="hashdata.data" [layout]="hashdata.layout">
</epic-explorer-plotly> </epic-explorer-plotly>
<div class="day_filter" *ngIf="this.title!='Transactions over time' && this.title!='Interval B/W Blocks'"> <div class="day_filter" *ngIf="this.title!='Transactions over time' && this.title!='Block Interval'">
<a href="JavaScript:void(0);" *ngIf="this.title=='Total Difficulty' || this.title=='Target Difficulty' || this.title == 'Blocks'" (click)=" <a href="JavaScript:void(0);" *ngIf="this.title=='Total Difficulty' || this.title=='Target Difficulty' || this.title == 'Blocks'" (click)="
ChartFromView('', '', '1 day', comp.Type); selectedItem = 6; comp.difficultyRange = '1 day';comp.TdifficultyRange = '1 day' ChartFromView('', '', '1 day', comp.Type); selectedItem = 6; comp.difficultyRange = '1 day';comp.TdifficultyRange = '1 day'
@ -138,7 +138,7 @@
</div> </div>
<div class="day_filter" *ngIf="this.title=='Interval B/W Blocks'"> <div class="day_filter" *ngIf="this.title=='Block Interval'">
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
ChartFromView('today'); selectedInteverval = 1 ChartFromView('today'); selectedInteverval = 1
" id="1" #intevalitem1 [ngClass]="{ active: selectedInteverval == intevalitem1.id, txt_primay: true }">Today</a> " id="1" #intevalitem1 [ngClass]="{ active: selectedInteverval == intevalitem1.id, txt_primay: true }">Today</a>
@ -176,8 +176,8 @@
routerLink="/chart/transactions-over-time">{{'home.TRANSACTIONS_BY_TIME' | translate}}</a></li> routerLink="/chart/transactions-over-time">{{'home.TRANSACTIONS_BY_TIME' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Blocks'"><a <li class="mb-1" *ngIf="this.title!='Blocks'"><a
routerLink="/chart/blocks">{{'home.BLOCKS' | translate}}</a></li> routerLink="/chart/blocks">{{'home.BLOCKS' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Interval B/W Blocks'"><a <li class="mb-1" *ngIf="this.title!='Block Interval'"><a
routerLink="/chart/interval-between-blocks">{{'home.BLOCKSINTERVAL' | translate}}</a></li> routerLink="/chart/block-interval">{{'home.BLOCKSINTERVAL' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Blocks Mined'"><a <li class="mb-1" *ngIf="this.title!='Blocks Mined'"><a
routerLink="/chart/blocks-mined">{{'home.BLOCKS_MINED' | translate}}</a></li> routerLink="/chart/blocks-mined">{{'home.BLOCKS_MINED' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Transaction Fees'"><a <li class="mb-1" *ngIf="this.title!='Transaction Fees'"><a
@ -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!='Transactions over time'"><a <li class="mb-1" *ngIf="this.title!='Avg Block Interval / Day'"><a
routerLink="/chart/block-interval">{{'home.BLOCK_INTERVAL' | translate}}</a></li> routerLink="/chart/avg-block-interval-per-day">{{'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

@ -122,13 +122,13 @@ export class GraphDetailComponent implements OnInit {
); );
}); });
break; break;
case 'interval-between-blocks': case 'block-interval':
this.comp.Blockintervalreq().then(res => { this.comp.Blockintervalreq().then(res => {
this.hashdata = this.comp.barGraphIntevalData; this.hashdata = this.comp.barGraphIntevalData;
this.currenyIntervalDate = this.comp.currenyIntervalDate; this.currenyIntervalDate = this.comp.currenyIntervalDate;
this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate; this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate;
this.hashdata.layout.height = 300; this.hashdata.layout.height = 300;
this.title = 'Interval B/W Blocks'; this.title = 'Block Interval';
this.selectedInteverval = 1; this.selectedInteverval = 1;
this.titleService.setTitle( this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title, this.route.snapshot.data.title + ' - ' + this.title,
@ -178,13 +178,13 @@ export class GraphDetailComponent implements OnInit {
// ); // );
// }); // });
break; break;
case 'block-interval': case 'avg-block-interval-per-day':
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 = 'Block Interval'; this.title = 'Avg Block Interval / Day';
this.titleService.setTitle( this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title, this.route.snapshot.data.title + ' - ' + this.title,
); );
@ -273,13 +273,13 @@ export class GraphDetailComponent implements OnInit {
this.title = 'Blocks'; this.title = 'Blocks';
}); });
break; break;
case 'interval-between-blocks': case 'block-interval':
this.comp.Blockintervalreq(p1).then(res => { this.comp.Blockintervalreq(p1).then(res => {
this.hashdata = this.comp.barGraphIntevalData; this.hashdata = this.comp.barGraphIntevalData;
this.currenyIntervalDate = this.comp.currenyIntervalDate; this.currenyIntervalDate = this.comp.currenyIntervalDate;
this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate; this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate;
this.hashdata.layout.height = 300; this.hashdata.layout.height = 300;
this.title = 'Interval B/W Blocks'; this.title = 'Block Interval';
}); });
break; break;
case 'blocks-mined': case 'blocks-mined':
@ -312,13 +312,13 @@ export class GraphDetailComponent implements OnInit {
// this.title = 'HashRate Growth Chart'; // this.title = 'HashRate Growth Chart';
// }); // });
break; break;
case 'block-interval': case 'avg-block-interval-per-day':
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 = 'Block Interval'; this.title = 'Avg Block Interval / Day';
}); });
break; break;
case 'blocks-by-algorithm': case 'blocks-by-algorithm':

View File

@ -164,7 +164,52 @@
</div> </div>
</div> </div>
<div class="col-md-6 col-lg-4 mb-4">
<div class="box_shadow">
<div class="blocks">
<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">{{
this.gg_last | number
}}</span>
<div class="chart_show">
<epic-explorer-plotly *ngIf="growthGraphData.data" [data]="growthGraphData.data" [layout]="growthGraphData.layout">
</epic-explorer-plotly>
<div *ngIf="!growthGraphData.data" class="feedback_div news_desc text-center">
<div class="graph_img background_loading mx-auto mb-3"></div>
<div class=" bg-white">
<div class="sk-cube-grid">
<div class="sk-cube sk-cube1"></div>
<div class="sk-cube sk-cube2"></div>
<div class="sk-cube sk-cube3"></div>
<div class="sk-cube sk-cube4"></div>
<div class="sk-cube sk-cube5"></div>
<div class="sk-cube sk-cube6"></div>
<div class="sk-cube sk-cube7"></div>
<div class="sk-cube sk-cube8"></div>
<div class="sk-cube sk-cube9"></div>
</div>
</div>
</div>
</div>
</div>
<div class="day_filter">
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '1 week'); selectedItem5 = 1" id="1" #item1
[ngClass]="{ active: selectedItem5 == item1.id, txt_primay: true }">1 {{'home.WEEK' | translate}}</a>
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '15 days'); selectedItem5 = 2" id="2" #item2
[ngClass]="{ active: selectedItem5 == item2.id, day15_txt: true }">15 {{'home.DAYS' | translate}}</a>
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '30 days'); selectedItem5 = 3" id="3" #item3
[ngClass]="{ active: selectedItem5 == item3.id, day30_txt: true }">30 {{'home.DAYS' | translate}}</a>
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '60 days'); selectedItem5 = 4" id="4" #item4
[ngClass]="{ active: selectedItem5 == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}}</a>
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '3 months'); selectedItem5 = 5" id="5" #item5
[ngClass]="{ active: selectedItem5 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
</div>
<div class="explore_all text-right">
<a routerLink="/chart/supply-growth"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
class="fa fa-long-arrow-right"></i></span></a>
</div>
</div>
</div>
<div class="col-md-6 col-lg-4 mb-4"> <div class="col-md-6 col-lg-4 mb-4">
<div class="box_shadow"> <div class="box_shadow">
@ -212,52 +257,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6 col-lg-4 mb-4">
<div class="box_shadow">
<div class="blocks">
<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">{{
this.gg_last | number
}}</span>
<div class="chart_show">
<epic-explorer-plotly *ngIf="growthGraphData.data" [data]="growthGraphData.data" [layout]="growthGraphData.layout">
</epic-explorer-plotly>
<div *ngIf="!growthGraphData.data" class="feedback_div news_desc text-center">
<div class="graph_img background_loading mx-auto mb-3"></div>
<div class=" bg-white">
<div class="sk-cube-grid">
<div class="sk-cube sk-cube1"></div>
<div class="sk-cube sk-cube2"></div>
<div class="sk-cube sk-cube3"></div>
<div class="sk-cube sk-cube4"></div>
<div class="sk-cube sk-cube5"></div>
<div class="sk-cube sk-cube6"></div>
<div class="sk-cube sk-cube7"></div>
<div class="sk-cube sk-cube8"></div>
<div class="sk-cube sk-cube9"></div>
</div>
</div>
</div>
</div>
</div>
<div class="day_filter">
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '1 week'); selectedItem5 = 1" id="1" #item1
[ngClass]="{ active: selectedItem5 == item1.id, txt_primay: true }">1 {{'home.WEEK' | translate}}</a>
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '15 days'); selectedItem5 = 2" id="2" #item2
[ngClass]="{ active: selectedItem5 == item2.id, day15_txt: true }">15 {{'home.DAYS' | translate}}</a>
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '30 days'); selectedItem5 = 3" id="3" #item3
[ngClass]="{ active: selectedItem5 == item3.id, day30_txt: true }">30 {{'home.DAYS' | translate}}</a>
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '60 days'); selectedItem5 = 4" id="4" #item4
[ngClass]="{ active: selectedItem5 == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}}</a>
<a href="JavaScript:void(0);" (click)="Growthreq('', '', '3 months'); selectedItem5 = 5" id="5" #item5
[ngClass]="{ active: selectedItem5 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
</div>
<div class="explore_all text-right">
<a routerLink="/chart/supply-growth"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
class="fa fa-long-arrow-right"></i></span></a>
</div>
</div>
</div>
<div *ngIf="viewchartvar" [ngClass]="{'col-md-6 col-lg-4 mb-4' : true, 'd-none' : viewchart}"> <div *ngIf="viewchartvar" [ngClass]="{'col-md-6 col-lg-4 mb-4' : true, 'd-none' : viewchart}">
<div class="box_shadow"> <div class="box_shadow">
<div class="blocks"> <div class="blocks">
@ -438,7 +437,7 @@
</div> </div>
<div class="explore_all text-right"> <div class="explore_all text-right">
<a routerLink="/chart/interval-between-blocks"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i class="fa fa-long-arrow-right"></i></span></a> <a routerLink="/chart/block-interval"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i class="fa fa-long-arrow-right"></i></span></a>
</div> </div>
</div> </div>
</div> </div>
@ -483,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/block-interval"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i <a routerLink="/chart/avg-block-interval-per-day"><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

@ -799,7 +799,7 @@ export class GraphListComponent implements OnInit {
y: Blockval, y: Blockval,
text: Blockval, text: Blockval,
name: '', name: '',
hovertemplate: 'Blocks : %{x}<br> Inteval : %{text:,}', hovertemplate: 'Block #%{x}<br> Interval : %{text:,}s',
type: 'bar', type: 'bar',
marker: { marker: {
color: Blockval, color: Blockval,
@ -815,12 +815,12 @@ export class GraphListComponent implements OnInit {
xaxis: { xaxis: {
tickangle: -45, tickangle: -45,
showgrid: true, showgrid: true,
title: 'Blocks Height', title: 'Block Height',
rangemode: 'nonnegative', rangemode: 'nonnegative',
fixedrange: true fixedrange: true
}, },
yaxis: { yaxis: {
title: 'Seonds', title: 'Seconds',
showgrid: true, showgrid: true,
fixedrange: true, fixedrange: true,
rangemode: 'nonnegative' rangemode: 'nonnegative'