Prettied, Linted and updated angular.json according to the latest schematic of Angular CLI.

Now all that is needed is to make it ready for strict compiling.
Removed eslint-plugin-prettier as it is not recommended and causes errors for both eslint and prettier

Bumped to v8.0.0
This commit is contained in:
tanshu committed 2020-10-10 08:45:05 +05:30
1 parent 438a98334d
commit 5ea09df272
320 files changed
+2233 -2268

No files matched your search

@@ -1,6 +1,7 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { Voucher } from '../core/voucher';
import { VoucherService } from '../core/voucher.service';
@@ -10,15 +11,15 @@ import { VoucherService } from '../core/voucher.service';
export class PaymentResolver implements Resolve<Voucher> {
constructor(private ser: VoucherService) {}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Voucher> {
resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
const id = route.paramMap.get('id');
const account = route.queryParamMap.get('a') || null;
if (id !== null) {
return this.ser.get(id, 'Payment');
} else if (account !== null) {
return this.ser.getOfType('Payment', account);
} else {
return this.ser.getOfType('Payment');
}
if (account !== null) {
return this.ser.getOfType('Payment', account);
}
return this.ser.getOfType('Payment');
}
}