Merge branch 'release'

Author: LoicDelorme

ionic.config.json

@@ -2,16 +2,7 @@
   "name": "CryptoWallet",
   "app_id": "1bbfbbf6",
   "type": "ionic-angular",
-  "proxies": [
-    {
-      "path": "/coinmarketcapticker",
-      "proxyUrl": "https://api.coinmarketcap.com/v1/ticker/"
-    },
-    {
-      "path": "/coinmarketcapgraphs",
-      "proxyUrl": "https://graphs2.coinmarketcap.com/currencies/"
-    }
-  ],
+  "proxies": [],
   "integrations": {
     "cordova": {
     }

src/entities/graphs.ts

@@ -0,0 +1,9 @@
+export class Graphs {
+
+  public marketCapByAvailableSupply: Array<Array<number>>;
+  public priceBtc: Array<Array<number>>;
+  public priceUsd: Array<Array<number>>;
+  public volumeUsd: Array<Array<number>>;
+
+  constructor() {}
+}

src/entities/ticker.ts

@@ -0,0 +1,7 @@
+export class Ticker {
+
+  public priceBtc: number;
+  public priceUsd: number;
+
+  constructor() {}
+}

src/pages/all-assets/all-assets.ts

@@ -5,13 +5,13 @@ import { Wallet } from '../../entities/wallet';
 import { Asset } from '../../entities/asset';
 
 import { RegisteredUserProvider } from '../../providers/registered/user';
+import { CoinMarketCapProvider } from '../../providers/coinmarketcap/coinmarketcap';
 import { LocalStorageProvider } from '../../providers/storage/localstorage';
 
 import { UserAuthenticationPage } from '../user-authentication/user-authentication';
 import { InsertAssetPage } from '../insert-asset/insert-asset';
 import { UpdateAssetPage } from '../update-asset/update-asset';
 import { AllWalletsPage } from '../all-wallets/all-wallets';
-import { CoinMarketCapProvider } from '../../providers/coinmarketcap/coinmarketcap';
 
 @Component({
   selector: 'page-all-assets',
@@ -58,9 +58,9 @@ export class AllAssetsPage {
       for (let offset = 0; offset < this.all.length; offset++) {
         let asset: Asset = this.all[offset];
         this.purchasePrice = this.purchasePrice + asset.purchasePrice;
-        this.coinMarketCapProvider.getPrice(asset.cryptocurrency).subscribe(result => {
-          console.log(result);console.log(asset.amount);console.log(parseFloat(result[0].price_btc));
-          this.currentPrice = this.currentPrice + (asset.amount * parseFloat(result[0].price_btc));
+
+        this.coinMarketCapProvider.getCurrentPrice(asset.cryptocurrency).subscribe(result => {
+          this.currentPrice = this.currentPrice + (asset.amount * result.data.priceBtc);
         }, error => {
           console.error(error);
           this.toastCtrl.create({ message: 'An error occured...', duration: 3000, position: 'top' }).present();

src/pages/chart/chart.ts

@@ -6,7 +6,8 @@ import * as moment from 'moment';
 
 import { Cryptocurrency } from '../../entities/cryptocurrency';
 import { ChartPeriod } from '../../entities/chartperiod';
-import { CoinMarketCapGraphsResponse } from '../../responses/coinmarketcapgraphsresponse';
+import { Graphs } from '../../entities/graphs';
+import { CryptoWalletResponse } from '../../responses/cryptowalletresponse';
 
 import { CoinMarketCapProvider } from '../../providers/coinmarketcap/coinmarketcap';
 import { UnregisteredChartPeriodProvider } from '../../providers/unregistered/chartperiod';
@@ -242,9 +243,9 @@ export class ChartPage {
     let loadingOverlay = this.loadingCtrl.create({ content: 'Please wait...' });
     loadingOverlay.present();
 
-    let coinMarketCapGraphsResponse: Observable<CoinMarketCapGraphsResponse> = (period === "ALL" ? this.coinMarketCapProvider.allPrices(this.cryptocurrency) : this.coinMarketCapProvider.allPricesBetween(this.cryptocurrency, startDateValue, endDateValue));
-    coinMarketCapGraphsResponse.subscribe(result => {
-      refreshChartCallback(refreshChart, chart, result, this.getFormatValue(period), this.getMaxTicksValue(period));
+    let graphsResponse: Observable<CryptoWalletResponse<Graphs>> = (period === "ALL" ? this.coinMarketCapProvider.allPrices(this.cryptocurrency) : this.coinMarketCapProvider.allPricesBetween(this.cryptocurrency, startDateValue, endDateValue));
+    graphsResponse.subscribe(result => {
+      refreshChartCallback(refreshChart, chart, result.data, this.getFormatValue(period), this.getMaxTicksValue(period));
 
       loadingOverlay.dismiss();
     }, error => {
@@ -308,20 +309,20 @@ export class ChartPage {
     }
   }
 
-  private refreshUsdChart(refreshChart: Function, chart: Chart, coinMarketCapGraphsResponse: CoinMarketCapGraphsResponse, labelFormat: string, maxTicksValue: number): void {
-    refreshChart(chart, coinMarketCapGraphsResponse.price_usd, labelFormat, maxTicksValue);
+  private refreshUsdChart(refreshChart: Function, chart: Chart, graphs: Graphs, labelFormat: string, maxTicksValue: number): void {
+    refreshChart(chart, graphs.priceUsd, labelFormat, maxTicksValue);
   }
 
-  private refreshBtcChart(refreshChart: Function, chart: Chart, coinMarketCapGraphsResponse: CoinMarketCapGraphsResponse, labelFormat: string, maxTicksValue: number): void {
-    refreshChart(chart, coinMarketCapGraphsResponse.price_btc, labelFormat, maxTicksValue);
+  private refreshBtcChart(refreshChart: Function, chart: Chart, graphs: Graphs, labelFormat: string, maxTicksValue: number): void {
+    refreshChart(chart, graphs.priceBtc, labelFormat, maxTicksValue);
   }
 
-  private refreshMarketCapChart(refreshChart: Function, chart: Chart, coinMarketCapGraphsResponse: CoinMarketCapGraphsResponse, labelFormat: string, maxTicksValue: number): void {
-    refreshChart(chart, coinMarketCapGraphsResponse.market_cap_by_available_supply, labelFormat, maxTicksValue);
+  private refreshMarketCapChart(refreshChart: Function, chart: Chart, graphs: Graphs, labelFormat: string, maxTicksValue: number): void {
+    refreshChart(chart, graphs.marketCapByAvailableSupply, labelFormat, maxTicksValue);
   }
 
-  private refreshVolumesChart(refreshChart: Function, chart: Chart, coinMarketCapGraphsResponse: CoinMarketCapGraphsResponse, labelFormat: string, maxTicksValue: number): void {
-    refreshChart(chart, coinMarketCapGraphsResponse.volume_usd, labelFormat, maxTicksValue);
+  private refreshVolumesChart(refreshChart: Function, chart: Chart, graphs: Graphs, labelFormat: string, maxTicksValue: number): void {
+    refreshChart(chart, graphs.volumeUsd, labelFormat, maxTicksValue);
   }
 
   private refreshChart(chart: Chart, values: Array<Array<number>>, labelFormat: string, maxTicksValue: number): void {

src/providers/coinmarketcap/coinmarketcap.ts

@@ -3,27 +3,28 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 
 import { Cryptocurrency } from '../../entities/cryptocurrency';
-import { CoinMarketCapTickerResponse } from '../../responses/coinmarketcaptickerresponse';
-import { CoinMarketCapGraphsResponse } from '../../responses/coinmarketcapgraphsresponse';
+import { Ticker } from '../../entities/ticker';
+import { Graphs } from '../../entities/graphs';
+import { CryptoWalletResponse } from '../../responses/cryptowalletresponse';
 
 @Injectable()
 export class CoinMarketCapProvider {
 
-  private readonly getPricePath: string = "coinmarketcapticker/RESOURCE_URL/";
-  private readonly allPricesPath: string = "coinmarketcapgraphs/RESOURCE_URL/";
-  private readonly allPricesBetweenPath: string = "coinmarketcapgraphs/RESOURCE_URL/START_DATE/END_DATE/";
+  private readonly getCurrentPricePath: string = "https://cryptowallet.loic-delorme.fr/api/cryptowallet/coinmarketcap/ticker/RESOURCE_URL";
+  private readonly allPricesPath: string = "https://cryptowallet.loic-delorme.fr/api/cryptowallet/coinmarketcap/graphs/RESOURCE_URL";
+  private readonly allPricesBetweenPath: string = "https://cryptowallet.loic-delorme.fr/api/cryptowallet/coinmarketcap/graphs/RESOURCE_URL/START_DATE/END_DATE";
 
   constructor(private http: HttpClient) {}
 
-  public getPrice(cryptocurrency: Cryptocurrency): Observable<Array<CoinMarketCapTickerResponse>> {
-    return this.http.get<Array<CoinMarketCapTickerResponse>>(this.getPricePath.replace("RESOURCE_URL", cryptocurrency.resourceUrl));
+  public getCurrentPrice(cryptocurrency: Cryptocurrency): Observable<CryptoWalletResponse<Ticker>> {
+    return this.http.get<CryptoWalletResponse<Ticker>>(this.getCurrentPricePath.replace("RESOURCE_URL", cryptocurrency.resourceUrl));
   }
 
-  public allPrices(cryptocurrency: Cryptocurrency): Observable<CoinMarketCapGraphsResponse> {
-    return this.http.get<CoinMarketCapGraphsResponse>(this.allPricesPath.replace("RESOURCE_URL", cryptocurrency.resourceUrl));
+  public allPrices(cryptocurrency: Cryptocurrency): Observable<CryptoWalletResponse<Graphs>> {
+    return this.http.get<CryptoWalletResponse<Graphs>>(this.allPricesPath.replace("RESOURCE_URL", cryptocurrency.resourceUrl));
   }
 
-  public allPricesBetween(cryptocurrency: Cryptocurrency, startDate: string, endDate: string): Observable<CoinMarketCapGraphsResponse> {
-    return this.http.get<CoinMarketCapGraphsResponse>(this.allPricesBetweenPath.replace("RESOURCE_URL", cryptocurrency.resourceUrl).replace("START_DATE", startDate).replace("END_DATE", endDate));
+  public allPricesBetween(cryptocurrency: Cryptocurrency, startDate: string, endDate: string): Observable<CryptoWalletResponse<Graphs>> {
+    return this.http.get<CryptoWalletResponse<Graphs>>(this.allPricesBetweenPath.replace("RESOURCE_URL", cryptocurrency.resourceUrl).replace("START_DATE", startDate).replace("END_DATE", endDate));
   }
 }