From 4a339da74f7151169c02059960a20ca72a8d7d24 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 21 Aug 2019 18:42:34 +0530 Subject: [PATCH] changes updated --- server/i18n/de.json | 5 +- server/i18n/en.json | 5 +- .../graph-detail/graph-detail.component.html | 12 +-- .../graph-detail/graph-detail.component.ts | 16 +-- .../home/graph-list/graph-list.component.html | 97 +++++++++---------- .../home/graph-list/graph-list.component.ts | 6 +- 6 files changed, 71 insertions(+), 70 deletions(-) diff --git a/server/i18n/de.json b/server/i18n/de.json index f74ba02..e8d7ebb 100644 --- a/server/i18n/de.json +++ b/server/i18n/de.json @@ -11,6 +11,7 @@ "transactions-vs-date" : "Transaktionen nach Datum", "total-difficulty" : "Gesamtschwierigkeit", "target-difficulty" : "Zielschwierigkeit", + "avg-block-interval-per-day" : "Durchschnittliches Sperrintervall / Tag", "home": { "HEADER_TEXT": "Sie befinden sich in Beta", "COUNTDOWN": "Mainnet-Countdown", @@ -43,7 +44,7 @@ "TARGET_DIFFICULTY" : "Zielschwierigkeit", "TRANSACTIONS_BY_TIME" : "Transaktionen im Zeitverlauf", "BLOCKS" : "Blöcke", - "BLOCKSINTERVAL" : "Intervall-S / W-Blöcke", + "BLOCKSINTERVAL" : "Sperrintervall", "SUPPLY_GROWTH_HOVER" : "Aktuelle Blockbelohnung", "BOCKS_COUNT_HOVER" : "Heute Block Count", "TRANSACTION_FEE_HOVER" : "Heute Transaktionsgebühren insgesamt", @@ -55,7 +56,7 @@ "TRANSACTION_FEES" : "Transkationsgebühren", "SUPPLY_GROWTH" : "Angebotswachstum", "HASHRATE_GROWTH_CHART" : "HashRate-Wachstumstabelle", - "BLOCK_INTERVAL" : "Sperrintervall", + "BLOCK_INTERVAL" : "Durchschnittliches Sperrintervall / Tag", "TRANSACTIONS_VS_DATE" : "Transaktionen gegen Datum", "DAYS" : "Tage", "MONTHS" : "Monate", diff --git a/server/i18n/en.json b/server/i18n/en.json index fc420d8..9fd092e 100644 --- a/server/i18n/en.json +++ b/server/i18n/en.json @@ -11,6 +11,7 @@ "transactions-by-date" : "Transactions by Date", "total-difficulty" : "Total Difficulty", "target-difficulty" : "Target Difficulty", + "avg-block-interval-per-day" : "Avg Block Interval / Day", "home": { "HEADER_TEXT": "You are on Beta", "COUNTDOWN": "Mainnet Countdown", @@ -43,7 +44,7 @@ "TARGET_DIFFICULTY" : "Target Difficulty", "TRANSACTIONS_BY_TIME" : "Transactions over time", "BLOCKS" : "Blocks", - "BLOCKSINTERVAL" : "Interval B/W Blocks", + "BLOCKSINTERVAL" : "Block Interval", "SUPPLY_GROWTH_HOVER" : "Current Block Reward", "BOCKS_COUNT_HOVER" : "Today Block Count", "TRANSACTION_FEE_HOVER" : "Today Total Transaction Fees", @@ -55,7 +56,7 @@ "TRANSACTION_FEES" : "Transaction Fees", "SUPPLY_GROWTH" : "Supply Growth", "HASHRATE_GROWTH_CHART" : "HashRate Growth Chart", - "BLOCK_INTERVAL" : "Block Interval", + "BLOCK_INTERVAL" : "Avg Block Interval / Day", "TRANSACTIONS_VS_DATE" : "Transactions by Date", "DAYS" : "days", "MONTHS" : "months", diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.html b/src/app/view/graph-view/graph-detail/graph-detail.component.html index cd84b68..621e608 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.html +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.html @@ -96,7 +96,7 @@ --> -
+
+
Today @@ -176,8 +176,8 @@ routerLink="/chart/transactions-over-time">{{'home.TRANSACTIONS_BY_TIME' | translate}}
  • {{'home.BLOCKS' | translate}}
    • -
  • {{'home.BLOCKSINTERVAL' | translate}}
    • +
  • {{'home.BLOCKSINTERVAL' | translate}}
  • {{'home.BLOCKS_MINED' | translate}}
  • {{'home.SUPPLY_GROWTH' | translate}}
    • -
  • {{'home.BLOCK_INTERVAL' | translate}}
    • +
  • {{'home.BLOCK_INTERVAL' | translate}}
  • {{'home.TRANSACTIONS_VS_DATE' | translate}}
  • Blocks by Algorithm diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.ts b/src/app/view/graph-view/graph-detail/graph-detail.component.ts index 2778244..1c54ae6 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.ts +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.ts @@ -122,13 +122,13 @@ export class GraphDetailComponent implements OnInit { ); }); break; - case 'interval-between-blocks': + case 'block-interval': this.comp.Blockintervalreq().then(res => { this.hashdata = this.comp.barGraphIntevalData; this.currenyIntervalDate = this.comp.currenyIntervalDate; this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate; this.hashdata.layout.height = 300; - this.title = 'Interval B/W Blocks'; + this.title = 'Block Interval'; this.selectedInteverval = 1; this.titleService.setTitle( this.route.snapshot.data.title + ' - ' + this.title, @@ -178,13 +178,13 @@ export class GraphDetailComponent implements OnInit { // ); // }); break; - case 'block-interval': + case 'avg-block-interval-per-day': this.comp.Blockspersecreq().then(res => { this.hashdata = this.comp.areaGraphData; this.hashdata.layout.height = 300; // this.hashdata.layout.width = // window.innerWidth - window.innerWidth / 2.8; - this.title = 'Block Interval'; + this.title = 'Avg Block Interval / Day'; this.titleService.setTitle( this.route.snapshot.data.title + ' - ' + this.title, ); @@ -273,13 +273,13 @@ export class GraphDetailComponent implements OnInit { this.title = 'Blocks'; }); break; - case 'interval-between-blocks': + case 'block-interval': this.comp.Blockintervalreq(p1).then(res => { this.hashdata = this.comp.barGraphIntevalData; this.currenyIntervalDate = this.comp.currenyIntervalDate; this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate; this.hashdata.layout.height = 300; - this.title = 'Interval B/W Blocks'; + this.title = 'Block Interval'; }); break; case 'blocks-mined': @@ -312,13 +312,13 @@ export class GraphDetailComponent implements OnInit { // this.title = 'HashRate Growth Chart'; // }); break; - case 'block-interval': + case 'avg-block-interval-per-day': this.comp.Blockspersecreq(p1, p2, p3).then(res => { this.hashdata = this.comp.areaGraphData; this.hashdata.layout.height = 300; // this.hashdata.layout.width = // window.innerWidth - window.innerWidth / 2.8; - this.title = 'Block Interval'; + this.title = 'Avg Block Interval / Day'; }); break; case 'blocks-by-algorithm': diff --git a/src/app/view/home/graph-list/graph-list.component.html b/src/app/view/home/graph-list/graph-list.component.html index cb1e0e8..1087e71 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -164,7 +164,52 @@
    • - +
    +
    +
    +

    {{'home.SUPPLY_GROWTH' | translate}}

    + {{ + this.gg_last | number + }} +
    + + + +
    +
    +
    + 1 {{'home.WEEK' | translate}} + 15 {{'home.DAYS' | translate}} + 30 {{'home.DAYS' | translate}} + 60 {{'home.DAYS' | translate}} + 3 {{'home.MONTHS' | translate}} +
    +
    + {{'home.EXPLORE_IT' | translate}} +
    +
    +
    @@ -212,52 +257,6 @@
    -
    -
    -
    -

    {{'home.SUPPLY_GROWTH' | translate}}

    - {{ - this.gg_last | number - }} -
    - - - -
    -
    -
    - 1 {{'home.WEEK' | translate}} - 15 {{'home.DAYS' | translate}} - 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} - 3 {{'home.MONTHS' | translate}} -
    -
    - {{'home.EXPLORE_IT' | translate}} -
    -
    -
    @@ -438,7 +437,7 @@
    - {{'home.EXPLORE_IT' | translate}} + {{'home.EXPLORE_IT' | translate}}
    @@ -483,7 +482,7 @@ [ngClass]="{ active: selectedItem2 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}
    - {{'home.EXPLORE_IT' | translate}} {{'home.EXPLORE_IT' | translate}}
    diff --git a/src/app/view/home/graph-list/graph-list.component.ts b/src/app/view/home/graph-list/graph-list.component.ts index e0aa8ea..51a5727 100644 --- a/src/app/view/home/graph-list/graph-list.component.ts +++ b/src/app/view/home/graph-list/graph-list.component.ts @@ -799,7 +799,7 @@ export class GraphListComponent implements OnInit { y: Blockval, text: Blockval, name: '', - hovertemplate: 'Blocks : %{x}
    Inteval : %{text:,}', + hovertemplate: 'Block #%{x}
    Interval : %{text:,}s', type: 'bar', marker: { color: Blockval, @@ -815,12 +815,12 @@ export class GraphListComponent implements OnInit { xaxis: { tickangle: -45, showgrid: true, - title: 'Blocks Height', + title: 'Block Height', rangemode: 'nonnegative', fixedrange: true }, yaxis: { - title: 'Seonds', + title: 'Seconds', showgrid: true, fixedrange: true, rangemode: 'nonnegative'