d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-15 15:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes spinner color

Browse Source 
Adds spinner to wallet
Updates Angular
Updates AngularCLI
Updates Typescript
This commit is contained in:
GloriousCode
2017-11-02 16:43:24 +11:00
parent 50f6fd8aaf
commit aeb0ed3399
8 changed files with 911 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1048
web/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
web/package.json
View File

@@ -47,28 +47,28 @@
},
"dependencies": {
"@amcharts/amcharts3-angular": "^1.5.0",
"@angular/animations": "^4.4.5",
"@angular/animations": "^5.0.0",
"@angular/cdk": "^2.0.0-beta.12",
"@angular/common": "4.4.5",
"@angular/compiler": "4.4.5",
"@angular/core": "4.4.5",
"@angular/forms": "4.4.5",
"@angular/http": "4.4.5",
"@angular/common": "5.0.0",
"@angular/compiler": "5.0.0",
"@angular/core": "5.0.0",
"@angular/forms": "5.0.0",
"@angular/http": "5.0.0",
"@angular/material": "^2.0.0-beta.12",
"@angular/platform-browser": "4.4.5",
"@angular/platform-browser-dynamic": "4.4.5",
"@angular/router": "4.4.5",
"@angular/platform-browser": "5.0.0",
"@angular/platform-browser-dynamic": "5.0.0",
"@angular/router": "5.0.0",
"@ngtools/webpack": "^1.7.4",
"core-js": "2.4.1",
"enhanced-resolve": "3.3.0",
"extract-text-webpack-plugin": "^3.0.1",
"html-webpack-plugin": "^2.30.1",
"rxjs": "^5.4.3",
"rxjs": "^5.5.0",
"zone.js": "0.8.12"
},
"devDependencies": {
"@angular/cli": "^1.4.7",
"@angular/compiler-cli": "4.4.5",
"@angular/cli": "^1.5.0",
"@angular/compiler-cli": "5.0.0",
"@types/bluebird": "3.5.8",
"@types/core-js": "0.9.36",
"@types/jasmine": "2.5.53",
@@ -111,7 +111,7 @@
"stylus-loader": "3.0.1",
"ts-node": "3.1.0",
"tslint": "5.4.3",
"typescript": "2.4.1",
"typescript": "2.4.2",
"url-loader": "0.5.9",
"webdriver-manager": "12.0.6",
"webpack": "3.3.0",

6
web/src/app/app.component.html
View File

@@ -12,9 +12,13 @@
<h3>Wallet</h3>
</mat-list-item>
<mat-list-item routerLink="trading" routerLinkActive="trading-highlight">
<mat-icon>history</mat-icon>&nbsp;
<mat-icon>add_shopping_cart</mat-icon>&nbsp;
<h3>Trading</h3>
</mat-list-item>
<mat-list-item routerLink="history" routerLinkActive="history-highlight">
<mat-icon>history</mat-icon>&nbsp;
<h3>History</h3>
</mat-list-item>
<mat-list-item routerLink="settings" routerLinkActive="settings-highlight">
<mat-icon>settings</mat-icon>&nbsp;
<h3>Settings</h3>

6
web/src/app/app.component.scss
View File

@@ -21,7 +21,11 @@
}
.trading-highlight {
color: red !important;
color: orangered !important;
}
.history-highlight {
color: blue !important;
}
.wallet-highlight {

2
web/src/app/pages/settings/settings.component.html
View File

@@ -1,5 +1,5 @@
<div class="loading-spinner" *ngIf="settings === null">
<mat-progress-spinner mode="indeterminate"></mat-progress-spinner>
<mat-progress-spinner color="accent" mode="indeterminate"></mat-progress-spinner>
</div>
<div *ngIf="settings !== null">

3
web/src/app/pages/wallet/wallet.component.html
View File

@@ -1,3 +1,6 @@
<div class="loading-spinner" *ngIf="wallet === null">
<mat-progress-spinner color="accent" mode="indeterminate"></mat-progress-spinner>
</div>
<mat-accordion *ngIf="wallet !== null">
<mat-expansion-panel [expanded]="true">
<mat-expansion-panel-header>

1
web/src/app/pages/wallet/wallet.component.ts
View File

@@ -22,6 +22,7 @@ export class WalletComponent implements OnInit {
};
constructor(private websocketHandler: WebsocketHandlerService) {
this.wallet= null;
this.ws = websocketHandler;
this.ws.messages.subscribe(msg => {
if (msg.Event === 'GetPortfolio') {

2
web/src/app/shared/all-enabled-currency-tickers/all-enabled-currency-tickers.component.html
View File

@@ -1,5 +1,5 @@
<div class="loading-spinner" *ngIf="tickerCards === null || tickerCards.length === 0">
<mat-progress-spinner mode="indeterminate"></mat-progress-spinner>
<mat-progress-spinner color="accent" mode="indeterminate"></mat-progress-spinner>
</div>
<mat-grid-list cols="4" rowHeight="4:3" >
<mat-grid-tile *ngFor="let ticker of tickerCards">