Fixes up settings

Adds progress spinner, even if ugly right now
Changes routing for dashboard
This commit is contained in:
GloriousCode
2017-09-28 07:34:23 +10:00
parent e3d099a867
commit d78f239f20
8 changed files with 42 additions and 56 deletions

View File

@@ -1,3 +1,6 @@
<div *ngIf="tickerCards === null">
<md-progress-spinner mode="indeterminate"></md-progress-spinner>
</div>
<md-grid-list cols="4" rowHeight="4:3" >
<md-grid-tile *ngFor="let ticker of tickerCards">
<app-exchange-currency-ticker [ticker]="ticker" ></app-exchange-currency-ticker>

View File

@@ -11,8 +11,6 @@ export class AllEnabledCurrencyTickersComponent implements OnInit {
allCurrencies:ExchangeCurrency[];
tickerCards: TickerUpdate[];
constructor(private websocketHandler: WebsocketHandlerService) {
this.ws = websocketHandler;
this.allCurrencies = <ExchangeCurrency[]>[];
@@ -36,35 +34,22 @@ export class AllEnabledCurrencyTickersComponent implements OnInit {
ticker.Exchange = msg.Exchange;
this.tickerCards.push(ticker);
this.allCurrencies.push(modal);
console.log(JSON.stringify(this.allCurrencies));
} else {
console.log('deleting');
//time to replace
for(var j = 0; j< this.tickerCards.length; j++) {
console.log(j);
console.log("exchange" + this.tickerCards[j].Exchange === msg.Exchange );
console.log("curr" + this.tickerCards[j].CurrencyPair === msg.data.CurrencyPair );
if(this.tickerCards[j].Exchange === msg.Exchange
&& this.tickerCards[j].CurrencyPair === msg.data.CurrencyPair) {
console.log('doner');
var ticker = <TickerUpdate>msg.data;
this.tickerCards[j] = ticker;
this.tickerCards[j].Exchange = msg.Exchange;
console.log('done');
return;
} else {
console.log('not found?');
}
return;
}
}
}
}
});
}
ngOnInit() {
}
ngOnInit() { }
}
export interface ExchangeCurrency {