Commit 789fb4b9 authored by dev0tion's avatar dev0tion

Fix indents and some clean up

parent 742c231f
...@@ -16,25 +16,5 @@ export class AppComponent implements OnInit { ...@@ -16,25 +16,5 @@ export class AppComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.router.navigate(['/login']); this.router.navigate(['/login']);
//this.checkWalletStatus();
} }
}
// private checkWalletStatus(){
// this.apiService.getWalletStatus()
// .subscribe(
// response => {
// if (response.status >= 200 && response.status < 400) {
// this.responseMessage = response;
// this.router.navigate(['/login']);
// }
// },
// error => {
// this.errorMessage = <any>error;
// if (error.status === 400 || error.status === 404) {
// this.router.navigate(['/setup']);
// console.log(this.errorMessage);
// }
// }
// );
// }
}
\ No newline at end of file
...@@ -11,10 +11,11 @@ import { WalletLoad } from '../shared/classes/wallet-load'; ...@@ -11,10 +11,11 @@ import { WalletLoad } from '../shared/classes/wallet-load';
templateUrl: './login.component.html', templateUrl: './login.component.html',
styleUrls: ['./login.component.css'] styleUrls: ['./login.component.css']
}) })
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
constructor(private globalService: GlobalService, private apiService: ApiService, private router: Router, private fb: FormBuilder) { constructor(private globalService: GlobalService, private apiService: ApiService, private router: Router, private fb: FormBuilder) {
this.buildDecryptForm(); this.buildDecryptForm();
} }
private openWalletForm: FormGroup; private openWalletForm: FormGroup;
private hasWallet: boolean = false; private hasWallet: boolean = false;
...@@ -109,7 +110,8 @@ export class LoginComponent implements OnInit { ...@@ -109,7 +110,8 @@ export class LoginComponent implements OnInit {
console.log(errorMessage); console.log(errorMessage);
} }
} }
); )
;
} }
private loadWallet(walletLoad: WalletLoad) { private loadWallet(walletLoad: WalletLoad) {
...@@ -131,6 +133,7 @@ export class LoginComponent implements OnInit { ...@@ -131,6 +133,7 @@ export class LoginComponent implements OnInit {
console.log(errorMessage); console.log(errorMessage);
} }
} }
); )
;
} }
} }
...@@ -21,7 +21,6 @@ export class CreateComponent { ...@@ -21,7 +21,6 @@ export class CreateComponent {
private createWalletForm: FormGroup; private createWalletForm: FormGroup;
private newWallet: WalletCreation; private newWallet: WalletCreation;
private mnemonic: string; private mnemonic: string;
private buildCreateForm(): void { private buildCreateForm(): void {
...@@ -104,6 +103,7 @@ export class CreateComponent { ...@@ -104,6 +103,7 @@ export class CreateComponent {
console.log(errorMessage); console.log(errorMessage);
} }
} }
); )
;
} }
} }
...@@ -2,33 +2,33 @@ import {Injectable} from "@angular/core"; ...@@ -2,33 +2,33 @@ import {Injectable} from "@angular/core";
@Injectable() @Injectable()
export class GlobalService { export class GlobalService {
constructor() {} constructor() {}
private walletPath: string; private walletPath: string;
private currentWalletName: string; private currentWalletName: string;
private coinType: number; private coinType: number;
getWalletPath() { getWalletPath() {
return this.walletPath; return this.walletPath;
} }
setWalletPath(walletPath: string) { setWalletPath(walletPath: string) {
this.walletPath = walletPath; this.walletPath = walletPath;
} }
getWalletName() { getWalletName() {
return this.currentWalletName; return this.currentWalletName;
} }
setWalletName(currentWalletName: string) { setWalletName(currentWalletName: string) {
this.currentWalletName = currentWalletName; this.currentWalletName = currentWalletName;
} }
getCoinType () { getCoinType () {
return this.coinType; return this.coinType;
} }
setCoinType (coinType: number) { setCoinType (coinType: number) {
this.coinType = coinType; this.coinType = coinType;
} }
} }
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
<th>Timestamp</th> <th>Timestamp</th>
</thead> </thead>
<tr *ngFor="let transaction of transactions; let i=index"> <tr *ngFor="let transaction of transactions; let i=index">
<!--<td *ngIf="{{ transaction.amount }} < 0">SENT</td> <!--<td *ngIf="{{ transaction.amount }} < 0">SENT</td>
<td *ngIf="{{ transaction.amount }} > 0">RECEIVED</td>--> <td *ngIf="{{ transaction.amount }} > 0">RECEIVED</td>-->
<td *ngIf="i<5">{{ transaction.type }}</td> <td *ngIf="i<5">{{ transaction.type }}</td>
<td *ngIf="i<5">{{ transaction.amount | coinNotation }}</td> <td *ngIf="i<5">{{ transaction.amount | coinNotation }}</td>
<td *ngIf="i<5">{{ transaction.id }}</td> <td *ngIf="i<5">{{ transaction.id }}</td>
<td *ngIf="i<5">{{ transaction.confirmedInBlock }}</td> <td *ngIf="i<5">{{ transaction.confirmedInBlock }}</td>
<td *ngIf="i<5">{{ transaction.timestamp * 1000 | date:'medium' }}</td> <td *ngIf="i<5">{{ transaction.timestamp * 1000 | date:'medium' }}</td>
</tr> </tr>
</table> </table>
<ng-template #noTransactions>Looks like you haven't made any transactions yet</ng-template> <ng-template #noTransactions>Looks like you haven't made any transactions yet</ng-template>
......
...@@ -49,20 +49,21 @@ export class DashboardComponent { ...@@ -49,20 +49,21 @@ export class DashboardComponent {
let walletInfo = new WalletInfo(this.globalService.getWalletName(), this.globalService.getCoinType()) let walletInfo = new WalletInfo(this.globalService.getWalletName(), this.globalService.getCoinType())
this.walletBalanceSubscription = this.apiService.getWalletBalance(walletInfo) this.walletBalanceSubscription = this.apiService.getWalletBalance(walletInfo)
.subscribe( .subscribe(
response => { response => {
if (response.status >= 200 && response.status < 400) { if (response.status >= 200 && response.status < 400) {
let balanceResponse = response.json(); let balanceResponse = response.json();
this.confirmedBalance = balanceResponse.balances[0].amountConfirmed; this.confirmedBalance = balanceResponse.balances[0].amountConfirmed;
this.unconfirmedBalance = balanceResponse.balances[0].amountUnconfirmed; this.unconfirmedBalance = balanceResponse.balances[0].amountUnconfirmed;
}
},
error => {
if (error.status >= 400) {
let errorMessage = <any>error;
console.log(errorMessage);
}
} }
); },
error => {
if (error.status >= 400) {
let errorMessage = <any>error;
console.log(errorMessage);
}
}
)
;
}; };
private getHistory() { private getHistory() {
...@@ -82,6 +83,7 @@ export class DashboardComponent { ...@@ -82,6 +83,7 @@ export class DashboardComponent {
console.log(errorMessage); console.log(errorMessage);
} }
} }
); )
;
}; };
} }
...@@ -46,6 +46,7 @@ export class HistoryComponent { ...@@ -46,6 +46,7 @@ export class HistoryComponent {
console.log(this.errorMessage); console.log(this.errorMessage);
} }
} }
); )
;
} }
} }
...@@ -23,10 +23,6 @@ export class ReceiveComponent { ...@@ -23,10 +23,6 @@ export class ReceiveComponent {
this.getUnusedReceiveAddresses(); this.getUnusedReceiveAddresses();
} }
private copyAddress() {
}
private getUnusedReceiveAddresses() { private getUnusedReceiveAddresses() {
let walletInfo = new WalletInfo(this.globalService.getWalletName(), this.globalService.getCoinType()) let walletInfo = new WalletInfo(this.globalService.getWalletName(), this.globalService.getCoinType())
this.apiService.getUnusedReceiveAddress(walletInfo) this.apiService.getUnusedReceiveAddress(walletInfo)
...@@ -42,6 +38,7 @@ export class ReceiveComponent { ...@@ -42,6 +38,7 @@ export class ReceiveComponent {
console.log(this.errorMessage); console.log(this.errorMessage);
} }
} }
); )
;
} }
} }
...@@ -103,7 +103,8 @@ export class SendComponent { ...@@ -103,7 +103,8 @@ export class SendComponent {
} }
}, },
() => this.sendTransaction(this.responseMessage.hex) () => this.sendTransaction(this.responseMessage.hex)
); )
;
}; };
private getFeeType(){ private getFeeType(){
...@@ -136,6 +137,7 @@ export class SendComponent { ...@@ -136,6 +137,7 @@ export class SendComponent {
console.log(this.errorMessage); console.log(this.errorMessage);
} }
} }
); )
;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment