Browse Source

Fixed NPM Issues and nuget packages

pull/975/head
jmanuelcorral 5 years ago
parent
commit
a1909521fd
9 changed files with 3787 additions and 2147 deletions
  1. +3
    -3
      src/Web/WebSPA/Client/modules/basket/basket.service.ts
  2. +2
    -2
      src/Web/WebSPA/Client/modules/campaigns/campaigns.service.ts
  3. +1
    -1
      src/Web/WebSPA/Client/modules/catalog/catalog.component.html
  4. +2
    -2
      src/Web/WebSPA/Client/modules/catalog/catalog.module.ts
  5. +3
    -3
      src/Web/WebSPA/Client/modules/catalog/catalog.service.ts
  6. +2
    -2
      src/Web/WebSPA/Client/modules/orders/orders.service.ts
  7. +3735
    -2110
      src/Web/WebSPA/package-lock.json
  8. +35
    -23
      src/Web/WebSPA/package.json
  9. +4
    -1
      src/Web/WebSPA/tsconfig.json

+ 3
- 3
src/Web/WebSPA/Client/modules/basket/basket.service.ts View File

@ -62,14 +62,14 @@ export class BasketService {
setBasket(basket): Observable<boolean> {
let url = this.purchaseUrl + '/api/v1/basket/';
this.basket = basket;
return this.service.post(url, basket).pipe(map((response: Response) => {
return this.service.post(url, basket).pipe(map((response: any) => {
return true;
}));
}
setBasketCheckout(basketCheckout): Observable<boolean> {
let url = this.basketUrl + '/api/v1/b/basket/checkout';
return this.service.postWithId(url, basketCheckout).pipe(map((response: Response) => {
return this.service.postWithId(url, basketCheckout).pipe(map((response: any) => {
this.basketEvents.orderCreated();
return true;
}));
@ -77,7 +77,7 @@ export class BasketService {
getBasket(): Observable<IBasket> {
let url = this.basketUrl + '/api/v1/b/basket/' + this.basket.buyerId;
return this.service.get(url).pipe(map((response: Response) => {
return this.service.get(url).pipe(map((response: any) => {
if (response.status === 204) {
return null;
}


+ 2
- 2
src/Web/WebSPA/Client/modules/campaigns/campaigns.service.ts View File

@ -32,7 +32,7 @@ export class CampaignsService {
let url = this.marketingUrl + '/api/v1/m/campaigns/user';
url = url + '?pageIndex=' + pageIndex + '&pageSize=' + pageSize;
return this.service.get(url).pipe(map((response: Response) => {
return this.service.get(url).pipe(map((response: any) => {
return response;
}));
}
@ -40,7 +40,7 @@ export class CampaignsService {
getCampaign(id: number): Observable<ICampaignItem> {
let url = this.marketingUrl + '/api/v1/m/campaigns/' + id;
return this.service.get(url).pipe(map((response: Response) => {
return this.service.get(url).pipe(map((response: any) => {
return response;
}));
}


+ 1
- 1
src/Web/WebSPA/Client/modules/catalog/catalog.component.html View File

@ -40,7 +40,7 @@
<span>{{item.name}}</span>
</div>
<div class="esh-catalog-price">
<span>{{item.price | number:'.2-2'}}</span>
<span>{{item.price | number:'3.2-2'}}</span>
</div>
</div>
</div>


+ 2
- 2
src/Web/WebSPA/Client/modules/catalog/catalog.module.ts View File

@ -1,13 +1,13 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { CommonModule } from '@angular/common'
import { SharedModule } from '../shared/shared.module';
import { CatalogComponent } from './catalog.component';
import { CatalogService } from './catalog.service';
import { Pager } from '../shared/components/pager/pager';
@NgModule({
imports: [BrowserModule, SharedModule],
imports: [BrowserModule, SharedModule, CommonModule],
declarations: [CatalogComponent],
providers: [CatalogService]
})


+ 3
- 3
src/Web/WebSPA/Client/modules/catalog/catalog.service.ts View File

@ -38,7 +38,7 @@ export class CatalogService {
return this.service.get(url)
.pipe(
map((response: Response) => {
map((response: any) => {
return response;
})
);
@ -47,7 +47,7 @@ export class CatalogService {
getBrands(): Observable<ICatalogBrand[]> {
return this.service.get(this.brandUrl)
.pipe(
map((response: Response) => {
map((response: any) => {
return response;
})
);
@ -56,7 +56,7 @@ export class CatalogService {
getTypes(): Observable<ICatalogType[]> {
return this.service.get(this.typesUrl)
.pipe(
map((response: Response) => {
map((response: any) => {
return response;
})
);


+ 2
- 2
src/Web/WebSPA/Client/modules/orders/orders.service.ts View File

@ -27,7 +27,7 @@ export class OrdersService {
getOrders(): Observable<IOrder[]> {
let url = this.ordersUrl + '/api/v1/o/orders';
return this.service.get(url).pipe(map((response: Response) => {
return this.service.get(url).pipe(map((response: any) => {
return response;
}));
}
@ -35,7 +35,7 @@ export class OrdersService {
getOrder(id: number): Observable<IOrderDetail> {
let url = this.ordersUrl + '/api/v1/o/orders/' + id;
return this.service.get(url).pipe(map((response: Response) => {
return this.service.get(url).pipe(map((response: any) => {
return response;
}));
}


+ 3735
- 2110
src/Web/WebSPA/package-lock.json
File diff suppressed because it is too large
View File


+ 35
- 23
src/Web/WebSPA/package.json View File

@ -27,19 +27,20 @@
"lint:ts": "tslint -c tslint.json Client/**/*.ts"
},
"dependencies": {
"@angular/animations": "^6.1.4",
"@angular/common": "6.1.4",
"@angular/compiler": "6.1.4",
"@angular/core": "6.1.4",
"@angular/forms": "6.1.4",
"@angular/http": "6.1.4",
"@angular/platform-browser": "6.1.4",
"@angular/platform-browser-dynamic": "6.1.4",
"@angular/router": "6.1.4",
"@angular/animations": "^7.2.10",
"@angular/common": "^7.2.10",
"@angular/compiler": "^7.2.10",
"@angular/core": "^7.2.10",
"@angular/forms": "^7.2.10",
"@angular/http": "^7.2.10",
"@angular/platform-browser": "^7.2.10",
"@angular/platform-browser-dynamic": "^7.2.10",
"@angular/platform-server": "^7.2.10",
"@angular/router": "^7.2.10",
"@aspnet/signalr": "1.0.3",
"@ng-bootstrap/ng-bootstrap": "3.1.0",
"@ng-bootstrap/ng-bootstrap": "3.3.0",
"bootstrap": "4.1.3",
"core-js": "^2.5.7",
"core-js": "^2.5.0",
"file-loader": "2.0.0",
"font-awesome": "4.7.0",
"isomorphic-fetch": "2.2.1",
@ -48,32 +49,43 @@
"normalize.css": "8.0.0",
"popper.js": "^1.14.4",
"preboot": "6.0.0-beta.5",
"rxjs": "6.2.2",
"webpack": "^4.17.1",
"rxjs": "~6.3.3",
"rxjs-compat": "~6.3.3",
"webpack-dev-server": "3.1.14",
"zone.js": "^0.8.26"
"zone.js": "^0.8.29"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.7.5",
"@angular/cli": "^6.1.5",
"@angular/compiler-cli": "6.1.4",
"@angular-devkit/build-angular": "^0.13.6",
"@angular/cli": "^7.3.6",
"@angular/compiler-cli": "^7.2.10",
"@angular/language-service": "^7.2.10",
"@types/core-js": "2.5.0",
"@types/hammerjs": "2.0.35",
"@types/jasmine": "2.8.8",
"@types/node": "~10.9.2",
"@types/jasmine": "^3.3.12",
"@types/node": "^11.11.4",
"@types/protractor": "4.0.0",
"@types/selenium-webdriver": "3.0.10",
"codelyzer": "~4.4.4",
"codelyzer": "^5.0.0-beta.1",
"handlebars": "~4.0.13",
"jasmine-core": "^3.3.0",
"jasmine-spec-reporter": "^4.2.1",
"karma": "^4.0.1",
"karma-chrome-launcher": "^2.2.0",
"karma-cli": "^2.0.0",
"karma-jasmine": "^2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"lodash": "4.17.11",
"merge": "1.2.1",
"npm-watch": "0.5.0",
"protractor": "^5.4.2",
"rxjs-tslint": "^0.1.7",
"sass-lint": "1.12.1",
"ts-helpers": "1.1.2",
"ts-node": "~7.0.1",
"tslint": "~5.11.0",
"tslint": "^5.14.0",
"typedoc": "0.12.0",
"typescript": "2.9.2",
"typescript": "^3.2.4",
"url-loader": "1.1.1",
"npm-watch": "0.5.0"
"webpack": "^4.29.6"
}
}

+ 4
- 1
src/Web/WebSPA/tsconfig.json View File

@ -17,5 +17,8 @@
"dom"
],
"module": "es2015"
}
},
"angularCompilerOptions": {
"enableIvy": false
}
}

Loading…
Cancel
Save