Merge pull request #1362 from nymkappa/feature/update-hashrate-widget

Make the hashrate/difficulty widget simpler

frontend/src/app/components/hashrate-chart/hashrate-chart.component.html

@@ -1,5 +1,23 @@
 <div [class]="widget === false ? 'full-container' : ''">
 
+  <div *ngIf="widget">
+    <div class="pool-distribution" *ngIf="(hashrateObservable$ | async) as hashrates; else loadingStats">
+      <div class="item">
+        <h5 class="card-title" i18n="mining.hashrate">Hashrate</h5>
+        <p class="card-text">
+          {{ hashrates.currentHashrate | amountShortener }}
+          <span class="symbol">hashes/tx</span>
+        </p>
+      </div>
+      <div class="item">
+        <h5 class="card-title" i18n="master-page.blocks">Difficulty</h5>
+        <p class="card-text">
+          {{ hashrates.currentDifficulty | amountShortener }}
+        </p>
+      </div>
+    </div>
+  </div>
+
   <div class="card-header mb-0 mb-md-4" [style]="widget ? 'display:none' : ''">
     <span i18n="mining.mining-pool-share">Hashrate & Difficulty</span>
     <form [formGroup]="radioGroupForm" class="formRadioGroup" *ngIf="(hashrateObservable$ | async) as hashrates">
@@ -33,3 +51,20 @@
   </div>
   
 </div>
+
+<ng-template #loadingStats>
+  <div class="pool-distribution">
+    <div class="item">
+      <h5 class="card-title" i18n="mining.miners-luck">Hashrate</h5>
+      <p class="card-text">
+        <span class="skeleton-loader skeleton-loader-big"></span>
+      </p>
+    </div>
+    <div class="item">
+      <h5 class="card-title" i18n="master-page.blocks">Difficulty</h5>
+      <p class="card-text">
+        <span class="skeleton-loader skeleton-loader-big"></span>
+      </p>
+    </div>
+  </div>
+</ng-template>

frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss

@@ -53,7 +53,7 @@
 .chart-widget {
   width: 100%;
   height: 100%;
-  max-height: 293px;
+  max-height: 270px;
 }
 
 .formRadioGroup {
@@ -80,3 +80,66 @@
     }
   }
 }
+
+.pool-distribution {
+  min-height: 56px;
+  display: block;
+  @media (min-width: 485px) {
+    display: flex;
+    flex-direction: row;
+  }
+  h5 {
+    margin-bottom: 10px;
+  }
+  .item {
+    width: 50%;
+    margin: 0px auto 10px;
+    display: inline-block;
+    @media (min-width: 485px) {
+      margin: 0px auto 10px;
+    }
+    @media (min-width: 785px) {
+      margin: 0px auto 0px;
+    }
+    &:last-child {
+      margin: 0px auto 0px;
+    }
+    &:nth-child(2) {
+      order: 2;
+      @media (min-width: 485px) {
+        order: 3;
+      }
+    }
+    &:nth-child(3) {
+      order: 3;
+      @media (min-width: 485px) {
+        order: 2;
+        display: block;
+      }
+      @media (min-width: 768px) {
+        display: none;
+      }
+      @media (min-width: 992px) {
+        display: block;
+      }
+    }
+    .card-title {
+      font-size: 1rem;
+      color: #4a68b9;
+    }
+    .card-text {
+      font-size: 18px;
+      span {
+        color: #ffffff66;
+        font-size: 12px;
+      }
+    }
+  }
+}
+
+.skeleton-loader {
+  width: 100%;
+  display: block;
+  max-width: 80px;
+  margin: 15px auto 3px;
+}

frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts

@@ -110,21 +110,10 @@ export class HashrateChartComponent implements OnInit {
                   (new Date().getTime() / 1000) - (data.oldestIndexedBlockTimestamp)
                 ) / 3600 / 24;
 
-                const tableData = [];
-                for (let i = data.difficulty.length - 1; i > 0; --i) {
-                  const selectedPowerOfTen: any = selectPowerOfTen(data.difficulty[i].difficulty);
-                  const change = (data.difficulty[i].difficulty / data.difficulty[i - 1].difficulty - 1) * 100;
-
-                  tableData.push(Object.assign(data.difficulty[i], {
-                    change: change,
-                    difficultyShorten: formatNumber(
-                      data.difficulty[i].difficulty / selectedPowerOfTen.divider,
-                      this.locale, '1.2-2') + selectedPowerOfTen.unit
-                  }));
-                }
                 return {
                   availableTimespanDay: availableTimespanDay,
-                  difficulty: this.tableOnly ? tableData.slice(0, 5) : tableData,
+                  currentDifficulty: Math.round(data.difficulty[data.difficulty.length - 1].difficulty * 100) / 100,
+                  currentHashrate: data.hashrates[data.hashrates.length - 1].avgHashrate,
                 };
               }),
               retryWhen((errors) => errors.pipe(
@@ -168,6 +157,7 @@ export class HashrateChartComponent implements OnInit {
         '#D81B60',
       ],
       grid: {
+        top: 30,
         right: this.right,
         left: this.left,
         bottom: this.widget ? 30 : this.isMobile() ? 90 : 60,
@@ -211,7 +201,7 @@ export class HashrateChartComponent implements OnInit {
         type: 'time',
         splitNumber: (this.isMobile() || this.widget) ? 5 : 10,
       },
-      legend: data.hashrates.length === 0 ? undefined : {
+      legend: (this.widget || data.hashrates.length === 0) ? undefined : {
         data: [
           {
             name: 'Hashrate',

frontend/src/app/components/mining-dashboard/mining-dashboard.component.html

@@ -86,9 +86,6 @@
     <div class="col">
       <div class="card" style="height: 385px">
         <div class="card-body">
-          <h5 class="card-title">
-            Hashrate (1y)
-          </h5>
           <app-hashrate-chart [widget]=true></app-hashrate-chart>
           <div class="mt-1"><a [routerLink]="['/graphs/mining/hashrate-difficulty' | relativeUrl]" i18n="dashboard.view-more">View more
               &raquo;</a></div>

frontend/src/app/shared/pipes/amount-shortener.pipe.ts

@@ -1,39 +1,26 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
-// https://medium.com/@thunderroid/angular-short-number-suffix-pipe-1k-2m-3b-dded4af82fb4
-
 @Pipe({
   name: 'amountShortener'
 })
 export class AmountShortenerPipe implements PipeTransform {
-  transform(number: number, args?: any): any {
-    if (isNaN(number)) return null; // will only work value is a number
-    if (number === null) return null;
-    if (number === 0) return null;
-    let abs = Math.abs(number);
-    const rounder = Math.pow(10, 1);
-    const isNegative = number < 0; // will also work for Negetive numbers
-    let key = '';
-
-    const powers = [
-      { key: 'E', value: 10e18 },
-      { key: 'P', value: 10e15 },
-      { key: 'T', value: 10e12 },
-      { key: 'B', value: 10e9 },
-      { key: 'M', value: 10e6 },
-      { key: 'K', value: 1000 }
-    ];
-
-    for (let i = 0; i < powers.length; i++) {
-      let reduced = abs / powers[i].value;
-      reduced = Math.round(reduced * rounder) / rounder;
-      if (reduced >= 1) {
-        abs = reduced;
-        key = powers[i].key;
-        break;
-      }
+  transform(num: number, ...args: number[]): unknown {
+    if (num < 1000) {
+      return num;
     }
 
-    return (isNegative ? '-' : '') + abs + key;
+    const digits = args[0] || 1;
+    const lookup = [
+      { value: 1, symbol: '' },
+      { value: 1e3, symbol: 'k' },
+      { value: 1e6, symbol: 'M' },
+      { value: 1e9, symbol: 'G' },
+      { value: 1e12, symbol: 'T' },
+      { value: 1e15, symbol: 'P' },
+      { value: 1e18, symbol: 'E' }
+    ];
+    const rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
+    var item = lookup.slice().reverse().find((item) => num >= item.value);
+    return item ? (num / item.value).toFixed(digits).replace(rx, '$1') + item.symbol : '0';
   }
 }