From 87b8319bf39a69e52df926f05fdb416308502b25 Mon Sep 17 00:00:00 2001 From: Darren Nelsen Date: Tue, 20 Mar 2018 11:51:34 -0400 Subject: [PATCH] moved explorers call back into currency provider so that explorers data is available when denomination component is instantiated --- app/package.json | 2 +- app/src/components/denomination/denomination.ts | 16 ++-------------- app/src/providers/api/api.ts | 2 +- app/src/providers/currency/currency.ts | 13 +++++++++++++ package-lock.json | 2 +- package.json | 3 ++- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/package.json b/app/package.json index b65e0b3..7cbe5da 100644 --- a/app/package.json +++ b/app/package.json @@ -67,4 +67,4 @@ "node": ">=8" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/app/src/components/denomination/denomination.ts b/app/src/components/denomination/denomination.ts index 0cf6093..4333092 100644 --- a/app/src/components/denomination/denomination.ts +++ b/app/src/components/denomination/denomination.ts @@ -11,7 +11,6 @@ import { ApiProvider } from '../../providers/api/api'; export class DenominationComponent { public switcherOn: boolean; - private explorers: any = []; public units: any = []; constructor( @@ -20,25 +19,14 @@ export class DenominationComponent { public http: Http, public api: ApiProvider ) { - - let url: string = this.api.apiPrefix + 'explorers'; - this.http.get(url).subscribe( - (data) => { - this.explorers = JSON.parse(data['_body']); - this.switcherOn = true; - }, - (err) => { - this.switcherOn = false; - console.error('err', err); - } - ); - this.units = [ 'USD', this.currencyProvider.defaultCurrency, 'm' + this.currencyProvider.defaultCurrency, 'bits' ]; + + this.switcherOn = currencyProvider.explorers.length > 1; } public close(): void { diff --git a/app/src/providers/api/api.ts b/app/src/providers/api/api.ts index 54083c0..a76ccd6 100644 --- a/app/src/providers/api/api.ts +++ b/app/src/providers/api/api.ts @@ -15,7 +15,7 @@ export class ApiProvider { constructor(public http: Http) { // TODO Make this an API call - this.apiPrefix = '/insight-api/'; + this.apiPrefix = '/api/'; } } diff --git a/app/src/providers/currency/currency.ts b/app/src/providers/currency/currency.ts index e0f4680..452fd10 100644 --- a/app/src/providers/currency/currency.ts +++ b/app/src/providers/currency/currency.ts @@ -18,11 +18,24 @@ export class CurrencyProvider { private bitstamp: number; private kraken: number; private loading: boolean; + public explorers: any = []; constructor(public http: Http, private api: ApiProvider) { // TODO Make this an API call this.defaultCurrency = 'BTC'; this.currencySymbol = this.defaultCurrency; + + let url: string = this.api.apiPrefix + 'explorers'; + console.log('exploers url is', url); + this.http.get(url).subscribe( + (data) => { + console.log('', data); + this.explorers = JSON.parse(data['_body']); + }, + (err) => { + console.error('err', err); + } + ); } public roundFloat(aFloat: number, decimalPlaces: number): number { diff --git a/package-lock.json b/package-lock.json index 6e10a71..cff44db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "insight", + "name": "insight-ui", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 00c175d..dfd3e23 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "insight", + "name": "insight-ui", "description": "A bitcoin block explorer and API.", "version": "1.0.0", "repository": "git://github.com/bitpay/insight.git", @@ -10,6 +10,7 @@ "license": "MIT", "keywords": [ "insight", + "insight-ui", "blockchain", "block explorer", "bitcoin",