diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss
index b2e9abde9..dea5e673f 100644
--- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss
+++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss
@@ -55,55 +55,3 @@
text-align: center;
padding-bottom: 3px;
}
-
-.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-text {
- font-size: 18px;
- span {
- color: #ffffff66;
- font-size: 12px;
- }
- }
- }
-}
\ No newline at end of file
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 43b71d4c9..6bba39df4 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -1,5 +1,26 @@
+
+
+
Pools luck (1w)
+
+ {{ miningStats['minersLuck'] }}%
+
+
+
+
Blocks (1w)
+
+ {{ miningStats.blockCount }}
+
+
+
+
Pools count (1w)
+
+ {{ miningStats.pools.length }}
+
+
+
+
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
index ee0cf8e85..f73486395 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
@@ -47,3 +47,59 @@
.loadingGraphs.widget {
top: 25%;
}
+
+.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;
+ }
+ }
+ }
+}
\ No newline at end of file
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 ae252330b..eacf4683f 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts
@@ -85,6 +85,7 @@ export class PoolRankingComponent implements OnInit {
}),
map(data => {
data.pools = data.pools.map((pool: SinglePoolStats) => this.formatPoolUI(pool));
+ data['minersLuck'] = (100 * (data.blockCount / 1008)).toFixed(2); // luck 1w
return data;
}),
tap(data => {
@@ -298,7 +299,7 @@ export class PoolRankingComponent implements OnInit {
/**
* Default mining stats if something goes wrong
*/
- getEmptyMiningStat() {
+ getEmptyMiningStat(): MiningStats {
return {
lastEstimatedHashrate: 'Error',
blockCount: 0,
diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts
index d8760d1f0..a05671257 100644
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -64,7 +64,7 @@ export interface SinglePoolStats {
blockCount: number;
emptyBlocks: number;
rank: number;
- share: string;
+ share: number;
lastEstimatedHashrate: string;
emptyBlockRatio: string;
logo: string;
@@ -75,13 +75,6 @@ export interface PoolsStats {
oldestIndexedBlockTimestamp: number;
pools: SinglePoolStats[];
}
-export interface MiningStats {
- lastEstimatedHashrate: string;
- blockCount: number;
- totalEmptyBlock: number;
- totalEmptyBlockRatio: string;
- pools: SinglePoolStats[];
-}
/**
* Pool component
diff --git a/frontend/src/app/services/mining.service.ts b/frontend/src/app/services/mining.service.ts
index c216515b0..68f7e9da1 100644
--- a/frontend/src/app/services/mining.service.ts
+++ b/frontend/src/app/services/mining.service.ts
@@ -73,7 +73,7 @@ export class MiningService {
const totalEmptyBlockRatio = (totalEmptyBlock / stats.blockCount * 100).toFixed(2);
const poolsStats = stats.pools.map((poolStat) => {
return {
- share: (poolStat.blockCount / stats.blockCount * 100).toFixed(2),
+ share: parseFloat((poolStat.blockCount / stats.blockCount * 100).toFixed(2)),
lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / hashrateDivider).toFixed(2),
emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2),
logo: `./resources/mining-pools/` + poolStat.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg',