From 866b45457d0ea80170e162f929aec05e9b898fe1 Mon Sep 17 00:00:00 2001 From: Darren Nelsen Date: Wed, 2 Aug 2017 14:26:41 -0400 Subject: [PATCH] replace address page placeholders with real data --- .../components/transactions/transactions.ts | 5 ++-- app/src/pages/address/address.html | 14 +++++------ app/src/pages/address/address.ts | 23 +++++++++++++++---- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/src/components/transactions/transactions.ts b/app/src/components/transactions/transactions.ts index 111310b..7524501 100644 --- a/app/src/components/transactions/transactions.ts +++ b/app/src/components/transactions/transactions.ts @@ -61,10 +61,9 @@ export class TransactionsComponent { */ } - public goToAddress(address: string): void { - console.log('address', address); + public goToAddress(addrStr: string): void { this.navCtrl.push('address', { - 'address': address + 'addrStr': addrStr }); } } diff --git a/app/src/pages/address/address.html b/app/src/pages/address/address.html index 08555a7..c297fbd 100644 --- a/app/src/pages/address/address.html +++ b/app/src/pages/address/address.html @@ -18,8 +18,8 @@

Address

-

0 BTC

-

{{ address }}

+

{{ address.addrStr }}

+

{{ address.balance }} BTC

@@ -27,19 +27,19 @@ Total Received: - 0.00000000 BTC + {{ address.totalReceived }} BTC Total Sent: - 0.00000000 BTC + {{ address.totalSent }} BTC Final Balance: - 0.00000000 BTC + {{ address.balance }} BTC No. Transactions: - 0 + {{ address.txApperances }} QR CODE @@ -49,5 +49,5 @@ - + diff --git a/app/src/pages/address/address.ts b/app/src/pages/address/address.ts index 03131e3..453678c 100644 --- a/app/src/pages/address/address.ts +++ b/app/src/pages/address/address.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; import { IonicPage, NavController, NavParams } from 'ionic-angular'; +import { Http } from '@angular/http'; /** * Generated class for the AddressPage page. @@ -9,7 +10,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; */ @IonicPage({ name: 'address', - segment: 'address/:address' + segment: 'address/:addrStr' }) @Component({ selector: 'page-address', @@ -18,14 +19,26 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; export class AddressPage { public loading: boolean = true; - private address: string; + private addrStr: string; + public address: any = {}; - constructor(public navCtrl: NavController, public navParams: NavParams) { - this.address = navParams.get('address'); + constructor(public navCtrl: NavController, public navParams: NavParams, private http: Http) { + this.addrStr = navParams.get('addrStr'); } public ionViewDidLoad(): void { - console.log('ionViewDidLoad AddressPage'); + let apiPrefix: string = 'http://localhost:3001/insight-api/'; + + this.http.get(apiPrefix + 'addr/' + this.addrStr + '/?noTxList=1').subscribe( + (data) => { + this.address = JSON.parse(data['_body']); + this.loading = false; + }, + (err) => { + console.log('err is', err); + this.loading = false; + } + ); } }