Skip to content
Permalink
Browse files

chore(ever-merchant): completed upgrade to angular 8

  • Loading branch information...
AlishMekliov931 committed Jun 7, 2019
1 parent c20c3cb commit 71cc862cbc38659badccf2dccfec1dd74ca714ba
Showing with 1,157 additions and 924 deletions.
  1. +1 −1 merchant/tablet-ionic/angular.json
  2. +23 −24 merchant/tablet-ionic/package.json
  3. +1 −1 merchant/tablet-ionic/src/@shared/google-map/google-map.component.ts
  4. +1 −1 merchant/tablet-ionic/src/components/order-map-popup/order-map-popup.ts
  5. +1 −1 merchant/tablet-ionic/src/components/settings-page-components/location/location.ts
  6. +4 −4 merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-carriers-popup.ts
  7. +3 −3 merchant/tablet-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/add-new-carrier.ts
  8. +1 −1 ...-ionic/src/pages/+carriers/add-carriers-popup/add-new-carrier/location/location-form.component.ts
  9. +1 −1 merchant/tablet-ionic/src/pages/+carriers/carrier-addr-popup/carrier-addr-popup.ts
  10. +3 −3 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/carrier-edit-popup.ts
  11. +1 −1 merchant/tablet-ionic/src/pages/+carriers/carrier-edit-popup/location/location-form.component.ts
  12. +1 −1 merchant/tablet-ionic/src/pages/+carriers/carrier-track-popup/carrier-track-popup.ts
  13. +1 −1 merchant/tablet-ionic/src/pages/+customers/customer-addr-popup/customer-addr-popup.ts
  14. +2 −2 merchant/tablet-ionic/src/pages/+track/track.ts
  15. +2 −2 merchant/tablet-ionic/src/pages/+warehouse/create-product-type-popup/create-product-type-popup.ts
  16. +2 −2 merchant/tablet-ionic/src/pages/+warehouse/edit-product-type-popup/edit-product-type-popup.ts
  17. +2 −0 merchant/tablet-ionic/src/polyfills.ts
  18. +1,105 −873 merchant/tablet-ionic/yarn.lock
  19. +1 −1 shared/core-angular/components/ngx-barcode/ngx-barcode.component.ts
  20. +1 −1 shop/website-angular/yarn.lock
@@ -69,7 +69,7 @@
}
},
"serve": {
"builder": "@angular-builders/dev-server:generic",
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "app:build"
},
@@ -59,7 +59,6 @@
"@angular/common": "^8.0.0",
"@angular/core": "^8.0.0",
"@angular/forms": "^8.0.0",
"@angular/http": "^7.2.15",
"@angular/platform-browser": "^8.0.0",
"@angular/platform-browser-dynamic": "^8.0.0",
"@angular/pwa": "^0.800.1",
@@ -95,10 +94,10 @@
"@ngx-translate/http-loader": "^4.0.0",
"angular2-logger": "^0.7.0",
"angular2-wizard": "^0.4.0",
"apollo-angular": "^1.5.0",
"apollo-angular-link-http": "^1.5.0",
"apollo-cache-inmemory": "^1.5.1",
"apollo-client": "^2.5.1",
"apollo-angular": "^1.6.0",
"apollo-angular-link-http": "^1.7.0",
"apollo-cache-inmemory": "^1.6.2",
"apollo-client": "^2.6.2",
"apollo-link-context": "^1.0.17",
"apollo-link-ws": "^1.0.17",
"bootstrap": "^4.3.1",
@@ -141,8 +140,8 @@
"graphql-tag": "^2.10.1",
"handlebars": "^4.1.2",
"imagesloaded": "^4.1.4",
"ionic-selectable": "4.4.1",
"ionicons": "^4.5.5",
"ionic-selectable": "^4.4.1",
"ionicons": "^4.5.8",
"jsbarcode": "^3.11.0",
"lodash": "^4.17.11",
"masonry-layout": "^4.2.2",
@@ -160,33 +159,32 @@
"phonegap-plugin-barcodescanner": "^8.0.1",
"pm2": "^3.4.0",
"qrcode": "^1.3.3",
"rxjs": "^6.4.0",
"rxjs-compat": "^6.4.0",
"rxjs": "^6.5.2",
"rxjs-compat": "^6.5.2",
"socket.io-client": "^2.2.0",
"stripe": "^7.0.0",
"subscriptions-transport-ws": "^0.9.16",
"sw-toolbox": "^3.6.0",
"symbol-observable": "^1.2.0",
"uglify-js": "^3.6.0",
"uuid": "^3.3.2",
"zone.js": "^0.8.29"
"zone.js": "^0.9.1"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^7.4.3",
"@angular-builders/dev-server": "^7.3.1",
"@angular-devkit/architect": "^0.13.8",
"@angular-devkit/build-angular": "^0.13.8",
"@angular-devkit/build-optimizer": "^0.13.8",
"@angular-devkit/core": "^7.3.8",
"@angular-devkit/schematics": "^7.3.8",
"@angular/cli": "^7.3.8",
"@angular-builders/custom-webpack": "^8.0.2",
"@angular-devkit/architect": "^0.800.2",
"@angular-devkit/build-angular": "^0.800.2",
"@angular-devkit/build-optimizer": "^0.800.2",
"@angular-devkit/core": "^8.0.2",
"@angular-devkit/schematics": "^8.0.2",
"@angular/cli": "^8.0.2",
"@angular/compiler": "^8.0.0",
"@angular/compiler-cli": "^7.2.12",
"@angular/language-service": "^7.2.12",
"@angular/compiler-cli": "^8.0.0",
"@angular/language-service": "^8.0.0",
"@compodoc/compodoc": "^1.1.9",
"@ionic/angular-toolkit": "^1.5.1",
"@ionic/app-scripts": "^3.2.3",
"@ionic/lab": "^2.0.0",
"@ionic/app-scripts": "^3.2.4",
"@ionic/lab": "^2.0.1",
"@types/d3-color": "^1.2.2",
"@types/googlemaps": "^3.30.19",
"@types/graphql": "^14.0.7",
@@ -201,19 +199,20 @@
"@types/stripe": "^6.25.17",
"@types/uuid": "^3.4.4",
"@types/yargs": "^13.0.0",
"@webcomponents/webcomponentsjs": "^2.2.10",
"codelyzer": "^5.0.1",
"cpr": "^3.0.1",
"cross-env": "^5.2.0",
"dotenv": "^8.0.0",
"envalid": "^5.0.0",
"husky": "^2.4.0",
"ionic": "^4.12.0",
"ionic": "^5.0.1",
"rxjs-tslint": "0.1.5",
"terser": "^4.0.0",
"terser-webpack-plugin": "^1.2.3",
"ts-node": "^8.0.3",
"tslint": "^5.14.0",
"typescript": "~3.2.4",
"typescript": "3.4.5",
"webpack-bundle-analyzer": "^3.1.0",
"webpack-merge": "^4.2.1",
"yargs": "^13.2.4"
@@ -17,7 +17,7 @@ import { takeUntil } from 'rxjs/operators';
`
})
export class GoogleMapComponent implements OnInit, OnDestroy {
@ViewChild('gmap', { static: false })
@ViewChild('gmap', { static: true })
mapElement: any;

@Input()
@@ -19,7 +19,7 @@ declare var google: any;
styleUrls: ['./order-map-popup.scss']
})
export class OrderMapPopupPage implements OnInit {
@ViewChild('gmap', { static: false })
@ViewChild('gmap', { static: true })
gmapElement: ElementRef;

@Input()
@@ -47,7 +47,7 @@ export class LocationComponent implements OnInit, OnChanges, OnDestroy {

map: google.maps.Map;

@ViewChild('autocomplete', { static: false })
@ViewChild('autocomplete', { static: true })
searchElement: ElementRef;

mapCoordEmitter = new EventEmitter<google.maps.LatLng>();
@@ -24,16 +24,16 @@ export class AddCarriersPopupPage implements OnInit, OnDestroy {
@ViewChild('carriersCatalog', { static: false })
carriersCatalog: CarriersCatalogComponent;

@ViewChild('addChoice', { static: false })
@ViewChild('addChoice', { static: true })
addChoiceComponent: AddChoiceComponent;

@ViewChild('wizzardFrom', { static: false })
@ViewChild('wizzardFrom', { static: true })
wizzardFrom: any;

@ViewChild('wizzardFromStep1', { static: false })
@ViewChild('wizzardFromStep1', { static: true })
wizzardFromStep1: any;

@ViewChild('wizardFormStep2', { static: false })
@ViewChild('wizardFormStep2', { static: true })
wizardFormStep2: any;

choiced: string;
@@ -36,13 +36,13 @@ export class AddNewCarrierComponent implements OnInit, OnDestroy, OnChanges {
@Input()
isDone: boolean;

@ViewChild('basicInfoForm', { static: false })
@ViewChild('basicInfoForm', { static: true })
basicInfoForm: BasicInfoFormComponent;

@ViewChild('accountForm', { static: false })
@ViewChild('accountForm', { static: true })
accountForm: AccountFormComponent;

@ViewChild('locationForm', { static: false })
@ViewChild('locationForm', { static: true })
locationForm: LocationFormComponent;

isNextStepOneAvailable: boolean = true;
@@ -36,7 +36,7 @@ import { first } from 'rxjs/operators';
templateUrl: 'location-form.component.html'
})
export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
@ViewChild('autocomplete', { static: false })
@ViewChild('autocomplete', { static: true })
searchElement: ElementRef;

@Output()
@@ -8,7 +8,7 @@ import { ModalController } from '@ionic/angular';
styleUrls: ['./carrier-addr-popup.scss']
})
export class CarrierAddrPopupPage implements OnInit {
@ViewChild('gmap', { static: false })
@ViewChild('gmap', { static: true })
gmapElement: ElementRef;

map: google.maps.Map;
@@ -42,13 +42,13 @@ export class CarrierEditPopupPage implements OnInit, OnDestroy, OnChanges {
@Input()
carrier: Carrier;

@ViewChild('basicInfoForm', { static: false })
@ViewChild('basicInfoForm', { static: true })
basicInfoForm: BasicInfoFormComponent;

@ViewChild('accountForm', { static: false })
@ViewChild('accountForm', { static: true })
accountForm: AccountFormComponent;

@ViewChild('locationForm', { static: false })
@ViewChild('locationForm', { static: true })
locationForm: LocationFormComponent;

isNextStepOneAvailable: boolean = true;
@@ -32,7 +32,7 @@ import Carrier from '@modules/server.common/entities/Carrier';
templateUrl: 'location-form.component.html'
})
export class LocationFormComponent implements OnDestroy, OnInit, OnChanges {
@ViewChild('autocomplete', { static: false })
@ViewChild('autocomplete', { static: true })
searchElement: ElementRef;

@Input()
@@ -18,7 +18,7 @@ const directionsService = new google.maps.DirectionsService();
styleUrls: ['./carrier-track-popup.scss']
})
export class CarrierTrackPopup implements OnInit {
@ViewChild('gmap', { static: false })
@ViewChild('gmap', { static: true })
gmapElement: ElementRef;

@Input()
@@ -8,7 +8,7 @@ import User from '@modules/server.common/entities/User';
styleUrls: ['./customer-addr-popup.scss']
})
export class CustomerAddrPopupPage implements OnInit {
@ViewChild('gmap', { static: false })
@ViewChild('gmap', { static: true })
gmapElement: ElementRef;
map: google.maps.Map;
myLatLng = { lat: 0, lng: 0 };
@@ -49,10 +49,10 @@ export class TrackPage implements OnInit, OnDestroy {
carrierListDropdown: Carrier[];
sharedCarrierListId: string[];

@ViewChild('gmap', { static: false })
@ViewChild('gmap', { static: true })
gmapElement: ElementRef;

@ViewChild('filterComponent', { static: false })
@ViewChild('filterComponent', { static: true })
filterComponent: IonicSelectableComponent;

constructor(
@@ -58,7 +58,7 @@ export class CreateProductTypePopupPage implements OnInit {

hasImage: boolean;

@ViewChild('fileInput', { static: false })
@ViewChild('fileInput', { static: true })
fileInput: ElementRef;

private imagesData: IProductImage[];
@@ -133,7 +133,7 @@ export class CreateProductTypePopupPage implements OnInit {

ionViewDidLoad() {}

@ViewChild('imageHolder', { static: false })
@ViewChild('imageHolder', { static: true })
private _imageHolder: ElementRef;

imageUrlChanged(ev) {
@@ -59,7 +59,7 @@ export class EditProductTypePopupPage implements OnInit, AfterViewInit {
private lastProductCount: number;
private imagesData: IProductImage[];

@ViewChild('fileInput', { static: false })
@ViewChild('fileInput', { static: true })
private fileInput: ElementRef;

constructor(
@@ -119,7 +119,7 @@ export class EditProductTypePopupPage implements OnInit, AfterViewInit {
};
}

@ViewChild('imageHolder', { static: false })
@ViewChild('imageHolder', { static: true })
private _imageHolder: ElementRef;

imageUrlChanged(ev) {
@@ -23,6 +23,8 @@

(window as any).global = window;

import '@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js';

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
// import 'core-js/es6/symbol';
// import 'core-js/es6/object';

0 comments on commit 71cc862

Please sign in to comment.
You can’t perform that action at this time.