Skip to content
This repository has been archived by the owner on Oct 10, 2022. It is now read-only.

Commit

Permalink
Merge pull request #13 from SmartStockTz/csb-e7lybt
Browse files Browse the repository at this point in the history
update to angular 14
  • Loading branch information
joshuamshana authored Jun 26, 2022
2 parents 7068ece + 5face80 commit f604fbc
Show file tree
Hide file tree
Showing 12 changed files with 2,925 additions and 2,129 deletions.
3 changes: 1 addition & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,5 @@
}},
"cli": {
"analytics": "6f8e5b6f-6390-4c0a-9463-e7b060f0b071"
},
"defaultProject": "purchases"
}
}
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "smartstock-purchases",
"version": "1.0.0",
"version": "1.0.1",
"scripts": {
"ng": "ng",
"box": "yarn install && yarn start",
Expand All @@ -13,30 +13,30 @@
},
"private": true,
"dependencies": {
"@angular-devkit/core": "^13.0.4",
"@angular-devkit/schematics": "^13.0.4",
"@angular/animations": "~13.0.3",
"@angular/cdk": "^13.0.3",
"@angular/common": "~13.0.3",
"@angular/compiler": "~13.0.3",
"@angular/core": "~13.0.3",
"@angular/forms": "~13.0.3",
"@angular/material": "^13.0.3",
"@angular/platform-browser": "~13.0.3",
"@angular/platform-browser-dynamic": "~13.0.3",
"@angular/router": "~13.0.3",
"@angular-devkit/core": "^14.0.3",
"@angular-devkit/schematics": "^14.0.3",
"@angular/animations": "^14.0.3",
"@angular/cdk": "^14.0.3",
"@angular/common": "^14.0.3",
"@angular/compiler": "^14.0.3",
"@angular/core": "^14.0.3",
"@angular/forms": "^14.0.3",
"@angular/material": "^14.0.3",
"@angular/platform-browser": "^14.0.3",
"@angular/platform-browser-dynamic": "^14.0.3",
"@angular/router": "^14.0.3",
"bfast": "6.0.1",
"comlink": "4.3.1",
"ngx-infinite-scroll": "13.0.2",
"rxjs": "~7.4.0",
"smartstock-core": "1.0.0",
"smartstock-core": "1.0.2",
"tslib": "^2.0.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^13.0.4",
"@angular/cli": "^13.0.4",
"@angular/compiler-cli": "~13.0.3",
"@angular-devkit/build-angular": "^14.0.3",
"@angular/cli": "^14.0.3",
"@angular/compiler-cli": "^14.0.3",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
Expand All @@ -48,10 +48,10 @@
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^13.0.8",
"ng-packagr": "^14.0.2",
"protractor": "~7.0.0",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~4.4.4"
"typescript": "~4.7.4"
}
}
6 changes: 3 additions & 3 deletions projects/purchases-mock/src/app/pages/login.page.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnInit } from "@angular/core";
import { FormBuilder, FormGroup, Validators } from "@angular/forms";
import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
import { Router } from "@angular/router";
import { MatSnackBar } from "@angular/material/snack-bar";
import { auth, init } from "bfast";
Expand Down Expand Up @@ -44,11 +44,11 @@ import { getDaasAddress, getFaasAddress, UserService } from "smartstock-core";
`
})
export class LoginPageComponent implements OnInit {
loginForm: FormGroup;
loginForm: UntypedFormGroup;
isLogin = false;

constructor(
private readonly formBuilder: FormBuilder,
private readonly formBuilder: UntypedFormBuilder,
private readonly router: Router,
private readonly userService: UserService,
private readonly snack: MatSnackBar
Expand Down
2 changes: 1 addition & 1 deletion projects/purchases/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "smartstock-purchases",
"version": "1.0.0",
"version": "1.0.1",
"repository": {
"url": "git://github.com/smartstocktz/smartstock-purchases.git"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {PurchaseState} from '../states/purchase.state';
import {PurchaseModel} from '../models/purchase.model';

Expand Down Expand Up @@ -44,12 +44,12 @@ import {PurchaseModel} from '../models/purchase.model';
})

export class AddPurchasePaymentFormComponent implements OnInit {
purchasePaymentForm: FormGroup;
purchasePaymentForm: UntypedFormGroup;
@Input() purchase: PurchaseModel;
@Output() done = new EventEmitter();

constructor(public readonly purchaseState: PurchaseState,
private readonly formBuilder: FormBuilder) {
private readonly formBuilder: UntypedFormBuilder) {
}

ngOnInit(): void {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {StockModel} from '../models/stock.model';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {CartState} from '../states/cart.state';
import {PurchaseItemModel} from '../models/purchase-item.model';
import {StockState} from '../states/stock.state';
Expand Down Expand Up @@ -69,13 +69,13 @@ import {StockState} from '../states/stock.state';
})

export class AddToCartFormComponent implements OnInit {
addToCartForm: FormGroup;
addToCartForm: UntypedFormGroup;
@Input() product: StockModel;
@Output() done = new EventEmitter();

constructor(private readonly cartState: CartState,
private readonly stockState: StockState,
private readonly formBuilder: FormBuilder) {
private readonly formBuilder: UntypedFormBuilder) {
}

ngOnInit(): void {
Expand Down
4 changes: 2 additions & 2 deletions projects/purchases/src/components/purchase-cart.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, OnDestroy, OnInit } from "@angular/core";
import { FormControl, Validators } from "@angular/forms";
import { UntypedFormControl, Validators } from "@angular/forms";
import { MatSidenav } from "@angular/material/sidenav";
import { CartDrawerState, DeviceState, UserService } from "smartstock-core";
import { CartState } from "../states/cart.state";
Expand Down Expand Up @@ -140,7 +140,7 @@ import { SavePurchaseSheetComponent } from "./save-purchase-sheet.component";
})
export class PurchaseCartComponent implements OnInit, OnDestroy {
drawer: MatSidenav;
supplierFormControl = new FormControl("", [
supplierFormControl = new UntypedFormControl("", [
Validators.nullValidator,
Validators.required,
Validators.minLength(1)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
import { StockModel } from "../models/stock.model";
import { FormBuilder, FormGroup, Validators } from "@angular/forms";
import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
import { CartState } from "../states/cart.state";
import { PurchaseState } from "../states/purchase.state";
import { UserService } from "smartstock-core";
Expand Down Expand Up @@ -77,7 +77,7 @@ import { StockState } from "../states/stock.state";
styleUrls: ["../styles/add-to-cart.style.scss"]
})
export class SavePurchaseFormComponent implements OnInit {
purchaseHeaderForm: FormGroup;
purchaseHeaderForm: UntypedFormGroup;
@Input() product: StockModel;
@Output() done = new EventEmitter();

Expand All @@ -88,7 +88,7 @@ export class SavePurchaseFormComponent implements OnInit {
private readonly snack: MatSnackBar,
private readonly router: Router,
private readonly stockState: StockState,
private readonly formBuilder: FormBuilder
private readonly formBuilder: UntypedFormBuilder
) {}

ngOnInit(): void {
Expand Down
20 changes: 10 additions & 10 deletions projects/purchases/src/components/suppliers.component.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { StockState } from '../states/stock.state';
import { Component, Inject, OnInit, ViewChild } from '@angular/core';
import {
FormBuilder,
FormControl,
FormGroup,
UntypedFormBuilder,
UntypedFormControl,
UntypedFormGroup,
Validators,
} from '@angular/forms';
import { SupplierModel } from '../models/supplier.model';
Expand Down Expand Up @@ -269,14 +269,14 @@ export class SuppliersComponent implements OnInit {
suppliersTableColums = ['name', 'email', 'mobile', 'address', 'actions'];
suppliersArray: SupplierModel[];
fetchSuppliersFlag = false;
nameFormControl = new FormControl();
addressFormControl = new FormControl();
emailFormControl = new FormControl();
mobileFormControl = new FormControl();
nameFormControl = new UntypedFormControl();
addressFormControl = new UntypedFormControl();
emailFormControl = new UntypedFormControl();
mobileFormControl = new UntypedFormControl();

constructor(
private readonly stockState: StockState,
private readonly formBuilder: FormBuilder,
private readonly formBuilder: UntypedFormBuilder,
private readonly dialog: MatDialog,
private readonly snack: MatSnackBar
) {}
Expand Down Expand Up @@ -563,11 +563,11 @@ export class DialogSupplierDeleteComponent {
`,
})
export class DialogSupplierNewComponent implements OnInit {
newSupplierForm: FormGroup;
newSupplierForm: UntypedFormGroup;
createSupplierProgress = false;

constructor(
private readonly formBuilder: FormBuilder,
private readonly formBuilder: UntypedFormBuilder,
private readonly snack: MatSnackBar,
private readonly stockDatabase: StockState,
public dialogRef: MatDialogRef<DialogSupplierDeleteComponent>
Expand Down
2 changes: 1 addition & 1 deletion projects/purchases/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"target": "es2020",
"declaration": true,
"declarationMap": true,
"inlineSources": true,
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"target": "es2020",
"module": "es2020",
"lib": ["es2018", "dom"],
"paths": {
Expand Down
Loading

0 comments on commit f604fbc

Please sign in to comment.