Commint after @angular/cli update
This commit is contained in:
parent
7910b7160b
commit
0d122cc07d
10 changed files with 7270 additions and 5748 deletions
|
@ -105,6 +105,5 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"defaultProject": "zgo"
|
||||
}
|
||||
}
|
||||
|
|
12840
package-lock.json
generated
12840
package-lock.json
generated
File diff suppressed because it is too large
Load diff
24
package.json
24
package.json
|
@ -10,16 +10,16 @@
|
|||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "~13.0.2",
|
||||
"@angular/animations": "^14.0.5",
|
||||
"@angular/cdk": "^13.3.9",
|
||||
"@angular/common": "~13.0.2",
|
||||
"@angular/compiler": "~13.0.2",
|
||||
"@angular/core": "~13.0.2",
|
||||
"@angular/forms": "~13.0.2",
|
||||
"@angular/common": "^14.0.5",
|
||||
"@angular/compiler": "^14.0.5",
|
||||
"@angular/core": "^14.0.5",
|
||||
"@angular/forms": "^14.0.5",
|
||||
"@angular/material": "^12.2.8",
|
||||
"@angular/platform-browser": "~13.0.2",
|
||||
"@angular/platform-browser-dynamic": "~13.0.2",
|
||||
"@angular/router": "~13.0.2",
|
||||
"@angular/platform-browser": "^14.0.5",
|
||||
"@angular/platform-browser-dynamic": "^14.0.5",
|
||||
"@angular/router": "^14.0.5",
|
||||
"@fortawesome/angular-fontawesome": "^0.10.2",
|
||||
"@fortawesome/fontawesome-free": "^6.1.1",
|
||||
"@fortawesome/fontawesome-svg-core": "^6.1.0",
|
||||
|
@ -41,9 +41,9 @@
|
|||
"zone.js": "~0.11.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "~13.0.2",
|
||||
"@angular/cli": "~13.0.2",
|
||||
"@angular/compiler-cli": "~13.0.2",
|
||||
"@angular-devkit/build-angular": "^14.0.5",
|
||||
"@angular/cli": "^14.0.5",
|
||||
"@angular/compiler-cli": "^14.0.5",
|
||||
"@types/jasmine": "~3.8.0",
|
||||
"@types/node": "^12.20.33",
|
||||
"@types/urlsafe-base64": "^1.0.28",
|
||||
|
@ -54,6 +54,6 @@
|
|||
"karma-coverage": "~2.0.3",
|
||||
"karma-jasmine": "~4.0.0",
|
||||
"karma-jasmine-html-reporter": "~1.7.0",
|
||||
"typescript": "~4.4.4"
|
||||
"typescript": "~4.7.4"
|
||||
}
|
||||
}
|
|
@ -43,65 +43,56 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
|
|||
import { PromptInvoiceComponent } from './prompt-invoice/prompt-invoice.component';
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
AppComponent,
|
||||
HeaderComponent,
|
||||
ViewerComponent,
|
||||
ItemListComponent,
|
||||
LoginComponent,
|
||||
OrderComponent,
|
||||
ItemCreateComponent,
|
||||
ItemDeleteComponent,
|
||||
ItemAddComponent,
|
||||
CancelComponent,
|
||||
CheckoutComponent,
|
||||
SettingsComponent,
|
||||
ScanComponent,
|
||||
ListOrdersComponent,
|
||||
BusinessComponent,
|
||||
SearchOptionsPipe,
|
||||
TermsComponent,
|
||||
ReceiptComponent,
|
||||
ReceiptQRComponent,
|
||||
InvoiceComponent,
|
||||
PromptInvoiceComponent
|
||||
],
|
||||
imports: [
|
||||
BrowserModule,
|
||||
AppRoutingModule,
|
||||
FormsModule,
|
||||
ReactiveFormsModule,
|
||||
MatIconModule,
|
||||
HttpClientModule,
|
||||
MatInputModule,
|
||||
MatCardModule,
|
||||
MatButtonModule,
|
||||
MatToolbarModule,
|
||||
MatExpansionModule,
|
||||
MatDialogModule,
|
||||
MatDividerModule,
|
||||
MatListModule,
|
||||
MatSelectModule,
|
||||
MatProgressBarModule,
|
||||
MatStepperModule,
|
||||
MatAutocompleteModule,
|
||||
MatSlideToggleModule,
|
||||
BrowserAnimationsModule,
|
||||
FontAwesomeModule
|
||||
],
|
||||
exports: [
|
||||
MatIconModule
|
||||
],
|
||||
providers: [],
|
||||
bootstrap: [AppComponent],
|
||||
entryComponents: [
|
||||
ItemCreateComponent,
|
||||
ItemDeleteComponent,
|
||||
ItemAddComponent,
|
||||
CancelComponent,
|
||||
CheckoutComponent,
|
||||
SettingsComponent,
|
||||
ScanComponent
|
||||
]
|
||||
declarations: [
|
||||
AppComponent,
|
||||
HeaderComponent,
|
||||
ViewerComponent,
|
||||
ItemListComponent,
|
||||
LoginComponent,
|
||||
OrderComponent,
|
||||
ItemCreateComponent,
|
||||
ItemDeleteComponent,
|
||||
ItemAddComponent,
|
||||
CancelComponent,
|
||||
CheckoutComponent,
|
||||
SettingsComponent,
|
||||
ScanComponent,
|
||||
ListOrdersComponent,
|
||||
BusinessComponent,
|
||||
SearchOptionsPipe,
|
||||
TermsComponent,
|
||||
ReceiptComponent,
|
||||
ReceiptQRComponent,
|
||||
InvoiceComponent,
|
||||
PromptInvoiceComponent
|
||||
],
|
||||
imports: [
|
||||
BrowserModule,
|
||||
AppRoutingModule,
|
||||
FormsModule,
|
||||
ReactiveFormsModule,
|
||||
MatIconModule,
|
||||
HttpClientModule,
|
||||
MatInputModule,
|
||||
MatCardModule,
|
||||
MatButtonModule,
|
||||
MatToolbarModule,
|
||||
MatExpansionModule,
|
||||
MatDialogModule,
|
||||
MatDividerModule,
|
||||
MatListModule,
|
||||
MatSelectModule,
|
||||
MatProgressBarModule,
|
||||
MatStepperModule,
|
||||
MatAutocompleteModule,
|
||||
MatSlideToggleModule,
|
||||
BrowserAnimationsModule,
|
||||
FontAwesomeModule
|
||||
],
|
||||
exports: [
|
||||
MatIconModule
|
||||
],
|
||||
providers: [],
|
||||
bootstrap: [AppComponent]
|
||||
})
|
||||
export class AppModule { }
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core';
|
||||
import { FormBuilder, Validators, FormGroup, FormControl } from '@angular/forms';
|
||||
import { UntypedFormBuilder, Validators, UntypedFormGroup, FormControl } from '@angular/forms';
|
||||
import { MatDialog, MatDialogConfig} from '@angular/material/dialog';
|
||||
import { ProgressBarMode } from '@angular/material/progress-bar';
|
||||
import { Router } from '@angular/router';
|
||||
|
@ -38,8 +38,8 @@ export class BusinessComponent implements OnInit {
|
|||
viewValue: '1 month: 0.1 ZEC'
|
||||
}
|
||||
];
|
||||
bizForm: FormGroup;
|
||||
payForm: FormGroup;
|
||||
bizForm: UntypedFormGroup;
|
||||
payForm: UntypedFormGroup;
|
||||
barMessage = 'Awaiting for transaction';
|
||||
barMode: ProgressBarMode = 'indeterminate';
|
||||
barValue = 0;
|
||||
|
@ -76,7 +76,7 @@ export class BusinessComponent implements OnInit {
|
|||
termsChecked = false;
|
||||
|
||||
constructor(
|
||||
private fb: FormBuilder,
|
||||
private fb: UntypedFormBuilder,
|
||||
private userService: UserService,
|
||||
private fullnodeService: FullnodeService,
|
||||
private dialog: MatDialog,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { Inject, Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
|
||||
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
||||
import { FormBuilder, Validators, FormGroup, FormControl } from '@angular/forms';
|
||||
import { UntypedFormBuilder, Validators, UntypedFormGroup, FormControl } from '@angular/forms';
|
||||
import { LineItem } from '../lineitem.model';
|
||||
import { Order } from '../../order/order.model';
|
||||
|
||||
|
@ -12,12 +12,12 @@ import { Order } from '../../order/order.model';
|
|||
|
||||
export class ItemAddComponent implements OnInit {
|
||||
|
||||
orderForm: FormGroup;
|
||||
orderForm: UntypedFormGroup;
|
||||
lineItem: LineItem;
|
||||
//order: Order;
|
||||
|
||||
constructor(
|
||||
private fb: FormBuilder,
|
||||
private fb: UntypedFormBuilder,
|
||||
private dialogRef: MatDialogRef<ItemAddComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: LineItem
|
||||
) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import { Inject, Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
|
||||
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
||||
import { FormBuilder, Validators, FormGroup, FormControl } from '@angular/forms';
|
||||
import { UntypedFormBuilder, Validators, UntypedFormGroup, UntypedFormControl } from '@angular/forms';
|
||||
import { Item } from '../item.model';
|
||||
|
||||
|
||||
|
@ -12,12 +12,12 @@ import { Item } from '../item.model';
|
|||
|
||||
export class ItemCreateComponent implements OnInit {
|
||||
|
||||
form: FormGroup;
|
||||
form: UntypedFormGroup;
|
||||
id: string | undefined = '';
|
||||
numberRegEx = /\d*\.?\d{1,2}/;
|
||||
|
||||
constructor(
|
||||
private fb: FormBuilder,
|
||||
private fb: UntypedFormBuilder,
|
||||
private dialogRef: MatDialogRef<ItemCreateComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: Item
|
||||
){
|
||||
|
@ -26,7 +26,7 @@ export class ItemCreateComponent implements OnInit {
|
|||
id: [''],
|
||||
name: [null, Validators.required],
|
||||
description: [null, Validators.required],
|
||||
cost: new FormControl('', {
|
||||
cost: new UntypedFormControl('', {
|
||||
validators: [Validators.required, Validators.pattern(this.numberRegEx)],
|
||||
updateOn: "blur"
|
||||
})
|
||||
|
@ -37,7 +37,7 @@ export class ItemCreateComponent implements OnInit {
|
|||
id: [data._id],
|
||||
name: [data.name, Validators.required],
|
||||
description: [data.description, Validators.required],
|
||||
cost: new FormControl(data.cost, {
|
||||
cost: new UntypedFormControl(data.cost, {
|
||||
validators: [Validators.required, Validators.pattern(this.numberRegEx)],
|
||||
updateOn: "blur"
|
||||
})
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { Component, OnInit, OnDestroy, Injectable, ChangeDetectorRef, ViewChild, AfterViewInit } from '@angular/core';
|
||||
import { CanActivate, Router, RouterStateSnapshot, ActivatedRouteSnapshot, ActivatedRoute } from '@angular/router';
|
||||
import { MatDialog, MatDialogConfig} from '@angular/material/dialog';
|
||||
import { FormBuilder, Validators, FormGroup, FormControl } from '@angular/forms';
|
||||
import { UntypedFormBuilder, Validators, UntypedFormGroup, FormControl } from '@angular/forms';
|
||||
import { ProgressBarMode } from '@angular/material/progress-bar';
|
||||
import { MatStepper } from '@angular/material/stepper';
|
||||
import { UserService } from '../user.service';
|
||||
|
@ -88,12 +88,12 @@ export class LoginComponent implements OnInit, AfterViewInit {
|
|||
barMessage = 'Scanning blockchain for login memo, please wait.';
|
||||
@ViewChild('stepper') private myStepper?: MatStepper;
|
||||
|
||||
entryForm: FormGroup;
|
||||
pinForm: FormGroup;
|
||||
entryForm: UntypedFormGroup;
|
||||
pinForm: UntypedFormGroup;
|
||||
|
||||
|
||||
constructor(
|
||||
private fb: FormBuilder,
|
||||
private fb: UntypedFormBuilder,
|
||||
private activatedRoute: ActivatedRoute,
|
||||
public fullnodeService: FullnodeService,
|
||||
private router: Router,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import { Inject, Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
|
||||
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
|
||||
import { MatSlideToggleChange } from '@angular/material/slide-toggle';
|
||||
import { FormBuilder, Validators, FormGroup, FormControl } from '@angular/forms';
|
||||
import { UntypedFormBuilder, Validators, UntypedFormGroup, FormControl } from '@angular/forms';
|
||||
import {User} from '../user.model';
|
||||
import {Owner} from '../owner.model';
|
||||
|
||||
|
@ -13,7 +13,7 @@ import {Owner} from '../owner.model';
|
|||
|
||||
export class SettingsComponent implements OnInit {
|
||||
|
||||
settingsForm: FormGroup;
|
||||
settingsForm: UntypedFormGroup;
|
||||
owner: Owner;
|
||||
useZats: boolean;
|
||||
coins = [
|
||||
|
@ -36,7 +36,7 @@ export class SettingsComponent implements OnInit {
|
|||
];
|
||||
|
||||
constructor(
|
||||
private fb: FormBuilder,
|
||||
private fb: UntypedFormBuilder,
|
||||
private dialogRef: MatDialogRef<SettingsComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: Owner
|
||||
) {
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
"experimentalDecorators": true,
|
||||
"moduleResolution": "node",
|
||||
"importHelpers": true,
|
||||
"target": "es2017",
|
||||
"target": "es2020",
|
||||
"module": "es2020",
|
||||
"lib": [
|
||||
"es2018",
|
||||
|
|
Loading…
Reference in a new issue