diff --git a/src/app/components/dashboard/dashboard.component.ts b/src/app/components/dashboard/dashboard.component.ts
index a324592..e34da12 100644
--- a/src/app/components/dashboard/dashboard.component.ts
+++ b/src/app/components/dashboard/dashboard.component.ts
@@ -35,12 +35,11 @@ export class DashboardComponent {
- this.chartData$ = this.clientInfo$.pipe(
- map((workerInfo: any) => {
+ this.chartData$ = this.clientService.getClientInfoChart(this.address).pipe(
+ map((chartData) => {
const GROUP_SIZE = 12; //6 = 1 hour
- let chartData: any[] = workerInfo.chartData;
let hourlyData = [];
@@ -54,10 +53,10 @@ export class DashboardComponent {
}
- const data = workerInfo.chartData.map((d: any) => { return { y: d.data, x: d.label } });
+ const data = chartData.map((d: any) => { return { y: d.data, x: d.label } });
return {
- labels: workerInfo.chartData.map((d: any) => d.label),
+ labels: chartData.map((d: any) => d.label),
datasets: [
{
type: 'line',
diff --git a/src/app/components/splash/splash.component.html b/src/app/components/splash/splash.component.html
index 728ee2d..844545b 100644
--- a/src/app/components/splash/splash.component.html
+++ b/src/app/components/splash/splash.component.html
@@ -57,8 +57,8 @@
-
Chart Returning Soon
-
+
+
diff --git a/src/app/components/splash/splash.component.ts b/src/app/components/splash/splash.component.ts
index 46433a8..3bc4ea3 100644
--- a/src/app/components/splash/splash.component.ts
+++ b/src/app/components/splash/splash.component.ts
@@ -24,16 +24,18 @@ export class SplashComponent {
constructor(private appService: AppService) {
const info$ = this.appService.getInfo().pipe(shareReplay({ refCount: true, bufferSize: 1 }));
+
this.blockData$ = info$.pipe(map(info => info.blockData));
this.userAgents$ = info$.pipe(map(info => info.userAgents));
- this.chartData$ = info$.pipe(
- map((info: any) => {
+
+ this.chartData$ = this.appService.getInfoChart().pipe(
+ map((chartData: any) => {
return {
- labels: info.chartData.map((d: any) => d.label),
+ labels: chartData.map((d: any) => d.label),
datasets: [
{
label: 'Public-Pool Hashrate',
- data: info.chartData.map((d: any) => d.data),
+ data: chartData.map((d: any) => d.data),
fill: false,
backgroundColor: documentStyle.getPropertyValue('--primary-color'),
borderColor: documentStyle.getPropertyValue('--primary-color'),
diff --git a/src/app/services/app.service.ts b/src/app/services/app.service.ts
index 8529316..2f0b2c2 100644
--- a/src/app/services/app.service.ts
+++ b/src/app/services/app.service.ts
@@ -16,4 +16,7 @@ export class AppService {
public getInfo() {
return this.httpClient.get(`${environment.API_URL}/api/info`) as Observable;
}
+ public getInfoChart() {
+ return this.httpClient.get(`${environment.API_URL}/api/info/chart`) as Observable;
+ }
}
diff --git a/src/app/services/client.service.ts b/src/app/services/client.service.ts
index 68f1426..c029595 100644
--- a/src/app/services/client.service.ts
+++ b/src/app/services/client.service.ts
@@ -1,5 +1,6 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
import { environment } from '../../environments/environment';
@@ -15,4 +16,7 @@ export class ClientService {
public getClientInfo(address: string) {
return this.httpClient.get(`${environment.API_URL}/api/client/${address}`);
}
+ public getClientInfoChart(address: string) {
+ return this.httpClient.get(`${environment.API_URL}/api/client/${address}/chart`) as Observable;
+ }
}