diff --git a/app/src/components/latest-blocks/latest-blocks.html b/app/src/components/latest-blocks/latest-blocks.html
index d453741..b269bdd 100644
--- a/app/src/components/latest-blocks/latest-blocks.html
+++ b/app/src/components/latest-blocks/latest-blocks.html
@@ -9,25 +9,33 @@
Height
- Age
+ Age
+ Timestamp
Transactions
+ Mined By
Size
-
+
{{block.height}}
-
+
{{ block.time | amFromUnix | amTimeAgo }}
+
+ {{ block.time * 1000 | date:'medium' }}
+
{{block.txlength}}
+
+ {{block.poolInfo.poolName}}
+
{{ block.size }}
-
+
diff --git a/app/src/components/latest-blocks/latest-blocks.ts b/app/src/components/latest-blocks/latest-blocks.ts
index cd1155a..21fc1e4 100644
--- a/app/src/components/latest-blocks/latest-blocks.ts
+++ b/app/src/components/latest-blocks/latest-blocks.ts
@@ -1,4 +1,4 @@
-import { Component, NgZone } from '@angular/core';
+import { Component, NgZone, Input } from '@angular/core';
import { BlocksProvider } from '../../providers/blocks/blocks';
import { NavController } from 'ionic-angular';
@@ -16,6 +16,9 @@ export class LatestBlocksComponent {
public loading: boolean = true;
public blocks: Array = [];
+ @Input() public numBlocks: number;
+ @Input() public showAllBlocksButton: boolean;
+ @Input() public showTimeAs: string;
constructor(private blocksProvider: BlocksProvider, private navCtrl: NavController, ngZone: NgZone) {
this.loadBlocks();
@@ -50,9 +53,9 @@ export class LatestBlocksComponent {
});
}
- public getBlocks(num: number = 10): Array {
+ public getBlocks(): Array {
/* tslint:disable:no-unused-variable */
- return this.blocks.filter((block, index) => index < num);
+ return this.blocks.filter((block, index) => index < this.numBlocks);
/* tslint:enable:no-unused-variable */
}
diff --git a/app/src/pages/blocks/blocks.html b/app/src/pages/blocks/blocks.html
index 6f82937..54d52dc 100644
--- a/app/src/pages/blocks/blocks.html
+++ b/app/src/pages/blocks/blocks.html
@@ -9,31 +9,6 @@
Blocks
-
-
- Height
- Timestamp
- Transactions
- Mined By
- Size
-
-
-
- {{block.height}}
-
-
- {{ block.time * 1000 | date:'medium' }}
-
-
- {{ block.txlength }}
-
-
- {{block.poolInfo.poolName}}
-
-
- {{ block.size }}
-
-
-
+
diff --git a/app/src/pages/blocks/blocks.module.ts b/app/src/pages/blocks/blocks.module.ts
index 0ec9cc7..521ae44 100644
--- a/app/src/pages/blocks/blocks.module.ts
+++ b/app/src/pages/blocks/blocks.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { BlocksPage } from './blocks';
import { HeadNavComponentModule } from '../../components/head-nav/head-nav.module';
+import { LatestBlocksComponentModule } from '../../components/latest-blocks/latest-blocks.module';
@NgModule({
declarations: [
@@ -9,7 +10,8 @@ import { HeadNavComponentModule } from '../../components/head-nav/head-nav.modul
],
imports: [
IonicPageModule.forChild(BlocksPage),
- HeadNavComponentModule
+ HeadNavComponentModule,
+ LatestBlocksComponentModule
],
exports: [
BlocksPage
diff --git a/app/src/pages/home/home.html b/app/src/pages/home/home.html
index b29ea51..ad57d6d 100644
--- a/app/src/pages/home/home.html
+++ b/app/src/pages/home/home.html
@@ -13,7 +13,7 @@
Latest Blocks
-
+