fix: admin web warning's & tiny fixes (8b4904ff) · Commits · Isfand Yar Khan / ever-demand

packages/admin-web-angular/src/app/@shared/translate/translate.module.ts

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		import { NgModule } from '@angular/core';
		import { HttpClient } from '@angular/common/http';
		import { TranslateHttpLoader } from '@ngx-translate/http-loader';
		import {
		TranslateLoader,
		TranslateModule as NgxTranslateModule
		} from '@ngx-translate/core';

		export function HttpLoaderFactory(http: HttpClient) {
		return new TranslateHttpLoader(http, './assets/i18n/', '.json');
		}

		@NgModule({
		declarations: [],
		exports: [NgxTranslateModule],
		imports: [
		NgxTranslateModule.forChild({
		loader: {
		provide: TranslateLoader,
		useFactory: HttpLoaderFactory,
		deps: [HttpClient]
		}
		})
		]
		})
		export class TranslateModule {}

packages/admin-web-angular/src/app/app.module.ts

+6 −6

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
		import { FormWizardModule } from '@ever-co/angular2-wizard';
		import { SimpleTimer } from 'ng2-simple-timer';
		import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
		import { TranslateHttpLoader } from '@ngx-translate/http-loader';
		import { ToasterModule } from 'angular2-toaster';
		import { Apollo } from 'apollo-angular';
		import { HttpLink, HttpLinkHandler } from 'apollo-angular/http';
		@@ -31,6 +30,7 @@ import { MaintenanceModuleGuard } from './pages/+maintenance-info/maintenance-in
		import { ServerConnectionService } from '@modules/client.common.angular2/services/server-connection.service';
		import { ServerSettingsService } from './@core/services/server-settings.service';
		import { NbEvaIconsModule } from '@nebular/eva-icons';
		import { HttpLoaderFactory } from './@shared/translate/translate.module';

		// It's more 'standard' way to use Font-Awesome module and special package,
		// but for some reason ngx-admin works without it. So we leave next line commented for now.
		@@ -105,7 +105,11 @@ import { NbEvaIconsModule } from '@nebular/eva-icons';
		],
		})
		export class AppModule {
		constructor(apollo: Apollo, httpLink: HttpLink, private store: Store) {
		constructor(
		private apollo: Apollo,
		private httpLink: HttpLink,
		private store: Store
		) {
		// Create an http link:
		const http: HttpLinkHandler = httpLink.create({
		uri: environment.GQL_ENDPOINT,
		@@ -167,10 +171,6 @@ export class AppModule {
		}
		}

		export function HttpLoaderFactory(http: HttpClient) {
		return new TranslateHttpLoader(http, './assets/i18n/', '.json');
		}

		export function googleMapsLoaderFactory(provider: GoogleMapsLoader) {
		return () => provider.load(environment.GOOGLE_MAPS_API_KEY);
		}

packages/admin-web-angular/src/app/pages/+warehouses/+warehouse-track/warehouse-track.component.html

+6 −32

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		</nb-card-body>
		</nb-card>
		</div>

		<div class="col-4">
		<nb-card>
		<nb-card-header>
		@@ -122,21 +121,9 @@
		<b>{{ selectedStore.name }}</b>
		</h6>
		<ul>
		<li>
		Phone:
		{{ selectedStore.contactPhone }}
		</li>
		<li>
		Email:
		{{ selectedStore.contactEmail }}
		</li>
		<li>
		Address:
		{{
		selectedStore.geoLocation
		.streetAddress
		}}
		</li>
		<li> Phone: {{ selectedStore?.contactPhone }} </li>
		<li> Email: {{ selectedStore?.contactEmail }} </li>
		<li *ngIf="selectedStore.geoLocation"> Address: {{ selectedStore?.geoLocation?.streetAddress }} </li>
		</ul>
		</div>
		<div class="carrier" *ngIf="selectedCarrier">
		@@ -144,22 +131,9 @@
		<b>{{ selectedCarrier.fullName }}</b>
		</h6>
		<ul>
		<li>
		Delivery Count:
		{{
		selectedCarrier.numberOfDeliveries
		}}
		</li>
		<li>
		Phone: {{ selectedCarrier.phone }}
		</li>
		<li>
		Address:
		{{
		selectedCarrier.geoLocation
		.streetAddress
		}}
		</li>
		<li> Delivery Count: {{ selectedCarrier.numberOfDeliveries }} </li>
		<li> Phone: {{ selectedCarrier.phone }} </li>
		<li *ngIf="selectedCarrier.geoLocation"> Address: {{ selectedStore?.geoLocation?.streetAddress }} </li>
		</ul>
		</div>
		</div>

packages/admin-web-angular/src/app/pages/+warehouses/+warehouse/products-table/products-table.module.ts

+3 −11

Original line number	Diff line number	Diff line
		import { NgModule } from '@angular/core';
		import { CommonModule } from '@angular/common';
		import { ThemeModule, HttpLoaderFactory } from '@app/@theme';
		import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
		import { HttpClient } from '@angular/common/http';
		import { ThemeModule } from '@app/@theme';
		import { TranslateModule } from '@app/@shared/translate/translate.module';
		import { ProductsTableComponent } from './products-table.component';
		import { ToasterModule } from 'angular2-toaster';
		import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';
		@@ -16,14 +15,7 @@ const COMPONENTS = [ProductsTableComponent];
		CommonModule,
		ThemeModule,
		ToasterModule.forChild(),
		TranslateModule.forChild({
		loader: {
		provide: TranslateLoader,
		useFactory: HttpLoaderFactory,
		deps: [HttpClient],
		},
		}),

		TranslateModule,
		NbSpinnerModule,
		ConfirmationModalModule,
		WarehouseProductFormsModule,

packages/admin-web-angular/src/app/pages/+warehouses/+warehouse/warehouse-select-view/warehouse-select-view.component.ts

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ export class WarehouseSelectViewComponent
		ngOnChanges() {}
		ngOnInit() {}

		protected selectWarehouse(warehouse: Warehouse) {
		public selectWarehouse(warehouse: Warehouse) {
		this.warehouse = warehouse;
		this.selectWarehouseEvent.emit(warehouse);
		console.log(this.selectedWarehouse);