+
+
+
\ No newline at end of file
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss
new file mode 100644
index 000000000..2aa192a3d
--- /dev/null
+++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss
@@ -0,0 +1,50 @@
+.dashboard-container {
+ padding-bottom: 60px;
+ text-align: center;
+ margin-top: 0.5rem;
+ @media (min-width: 992px) {
+ padding-bottom: 0px;
+ }
+ .col {
+ margin-bottom: 1.5rem;
+ }
+}
+
+.card {
+ background-color: #1d1f31;
+ height: 100%;
+}
+
+.card-wrapper {
+ .card {
+ height: auto !important;
+ }
+ .card-body {
+ display: flex;
+ flex: inherit;
+ text-align: center;
+ flex-direction: column;
+ justify-content: space-around;
+ padding: 22px 20px;
+ }
+}
+
+.blockchain-wrapper {
+ position: relative;
+ overflow: hidden;
+ height: 250px;
+
+ -webkit-user-select: none; /* Safari */
+ -moz-user-select: none; /* Firefox */
+ -ms-user-select: none; /* IE10+/Edge */
+ user-select: none; /* Standard */
+}
+
+.position-container {
+ position: absolute;
+ top: 75px;
+}
+
+.fade-border {
+ -webkit-mask-image: linear-gradient(90deg, #000 70%, transparent);
+}
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts
new file mode 100644
index 000000000..1b4b137de
--- /dev/null
+++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-mining-dashboard',
+ templateUrl: './mining-dashboard.component.html',
+ styleUrls: ['./mining-dashboard.component.scss']
+})
+export class MiningDashboardComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.html b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
index ac59ab2d2..a687e41c7 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -1,49 +1,48 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
| Rank | @@ -64,8 +63,8 @@{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%) | |||||
|---|---|---|---|---|---|---|
| - | - |
+ + | All miners | {{ miningStats.lastEstimatedHashrate}} {{ miningStats.miningUnits.hashrateUnit }} | {{ miningStats.blockCount }} | diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index 17ea83b71..5a5b2390f 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { Router } from '@angular/router'; import { EChartsOption, PieSeriesOption } from 'echarts'; @@ -25,6 +25,8 @@ import { chartColors } from 'src/app/app.constants'; `], }) export class PoolRankingComponent implements OnInit { + @Input() widget: boolean = false; + poolsWindowPreference: string; radioGroupForm: FormGroup; @@ -46,12 +48,17 @@ export class PoolRankingComponent implements OnInit { private router: Router, ) { this.seoService.setTitle($localize`:@@mining.mining-pools:Mining Pools`); - this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '1w'; - this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference }); - this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference); } ngOnInit(): void { + if (this.widget) { + this.poolsWindowPreference = '1w'; + } else { + this.poolsWindowPreference = this.storageService.getValue('poolsWindowPreference') ? this.storageService.getValue('poolsWindowPreference') : '1w'; + } + this.radioGroupForm = this.formBuilder.group({ dateSpan: this.poolsWindowPreference }); + this.radioGroupForm.controls.dateSpan.setValue(this.poolsWindowPreference); + // When... this.miningStatsObservable$ = combineLatest([ // ...a new block is mined @@ -65,7 +72,9 @@ export class PoolRankingComponent implements OnInit { .pipe( startWith(this.poolsWindowPreference), // (trigger when the page loads) tap((value) => { - this.storageService.setValue('poolsWindowPreference', value); + if (!this.widget) { + this.storageService.setValue('poolsWindowPreference', value); + } this.poolsWindowPreference = value; }) ) @@ -147,7 +156,7 @@ export class PoolRankingComponent implements OnInit { this.chartOptions = { title: { text: $localize`:@@mining.pool-chart-title:${network}:NETWORK: mining pools share`, - subtext: $localize`:@@mining.pool-chart-sub-title:Estimated from the # of blocks mined`, + subtext: $localize`:@@mining.pool-chart-sub-title:Estimated from the # of blocks mined (${this.poolsWindowPreference})`, left: 'center', textStyle: { color: '#FFF',