RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added USD conversion; added conversion to address page

Browse Source
This commit is contained in:
Darren Nelsen 2017-08-11 10:33:44 -04:00
parent 8ba0a07772
commit 1dfe384271
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/pages/address/address.html
View File

@ -5,7 +5,7 @@
<ion-content padding> <ion-content padding>
<h1>Address</h1> <h1>Address</h1>
<p class="ellipsis"><b>Address</b> {{ address.addrStr }}</p> <p class="ellipsis"><b>Address</b> {{ address.addrStr }}</p>
<p>{{ address.balance }} BTC</p> <p>{{ currency.getConversion(address.balance) }}</p>
<h2>Summary</h2> <h2>Summary</h2>
@ -13,19 +13,19 @@
<ion-item> <ion-item>
Total Received Total Received
<span item-end> <span item-end>
{{ address.totalReceived }} BTC {{ currency.getConversion(address.totalReceived) }}
</span> </span>
</ion-item> </ion-item>
<ion-item> <ion-item>
Total Sent Total Sent
<span item-end> <span item-end>
{{ address.totalSent }} BTC {{ currency.getConversion(address.totalSent) }}
</span> </span>
</ion-item> </ion-item>
<ion-item> <ion-item>
Final Balance Final Balance
<span item-end> <span item-end>
{{ address.balance }} BTC {{ currency.getConversion(address.balance) }}
</span> </span>
</ion-item> </ion-item>
<ion-item> <ion-item>

3
app/src/pages/address/address.ts
View File

@ -2,6 +2,7 @@ import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular'; import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { Http } from '@angular/http'; import { Http } from '@angular/http';
import { ApiProvider } from '../../providers/api/api'; import { ApiProvider } from '../../providers/api/api';
import { CurrencyProvider } from '../../providers/currency/currency';
/** /**
* Generated class for the AddressPage page. * Generated class for the AddressPage page.
@ -23,7 +24,7 @@ export class AddressPage {
private addrStr: string; private addrStr: string;
public address: any = {}; public address: any = {};
constructor(public navCtrl: NavController, public navParams: NavParams, private http: Http, private api: ApiProvider) { constructor(public navCtrl: NavController, public navParams: NavParams, private http: Http, private api: ApiProvider, public currency: CurrencyProvider) {
this.addrStr = navParams.get('addrStr'); this.addrStr = navParams.get('addrStr');
} }

22
app/src/providers/currency/currency.ts
View File

@ -1,5 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Http } from '@angular/http'; import { Http } from '@angular/http';
import { ApiProvider } from '../../providers/api/api';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
/* /*
@ -14,8 +15,10 @@ export class CurrencyProvider {
private defaultCurrency: string; private defaultCurrency: string;
private currencySymbol: string; private currencySymbol: string;
private factor: number = 1; private factor: number = 1;
private bitstamp: number;
private loading: boolean;
constructor(public http: Http) { constructor(public http: Http, private api: ApiProvider) {
this.defaultCurrency = 'BTC'; this.defaultCurrency = 'BTC';
this.currencySymbol = this.defaultCurrency; this.currencySymbol = this.defaultCurrency;
} }
@ -50,12 +53,17 @@ export class CurrencyProvider {
localStorage.setItem('insight-currency', currency); localStorage.setItem('insight-currency', currency);
if (currency === 'USD') { if (currency === 'USD') {
// TODO Replace this with call this.http.get(this.api.apiPrefix + 'currency').subscribe(
/* (data) => {
Currency.get({}, function(res) { let currencyParsed = JSON.parse(data['_body']);
$rootScope.currency.factor = $rootScope.currency.bitstamp = res.data.bitstamp; this.factor = this.bitstamp = currencyParsed.data.bitstamp;
}); this.loading = false;
*/ },
(err) => {
console.log('err is', err);
this.loading = false;
}
);
} else if (currency === 'mBTC') { } else if (currency === 'mBTC') {
this.factor = 1000; this.factor = 1000;
} else if (currency === 'bits') { } else if (currency === 'bits') {