diff --git a/.gitignore b/.gitignore index 587a6e0a0..8b7a2cbb9 100644 --- a/.gitignore +++ b/.gitignore @@ -281,3 +281,4 @@ pub/ src/**/app.yaml src/**/inf.yaml +.angular/ diff --git a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj index 707bd266a..b1a9128aa 100644 --- a/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj @@ -16,18 +16,18 @@ - - - - - - - + + + + + + + - - + + - + diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj index d8104f2d1..ae8aa834d 100644 --- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj +++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj @@ -16,19 +16,19 @@ - - - - - - - - + + + + + + + + - - + + - + diff --git a/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj b/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj index c1c2ae2db..012a292b3 100644 --- a/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj +++ b/src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj index 4b02b0d90..1d7f6b663 100644 --- a/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj +++ b/src/BuildingBlocks/EventBus/EventBusServiceBus/EventBusServiceBus.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj index 0343bb20c..94dbfb66b 100644 --- a/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj +++ b/src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj @@ -6,13 +6,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj index c3bad0c69..5ddb0265b 100644 --- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj +++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj @@ -10,14 +10,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj index 1cf1b7dfc..a91691f98 100644 --- a/src/Services/Basket/Basket.API/Basket.API.csproj +++ b/src/Services/Basket/Basket.API/Basket.API.csproj @@ -14,37 +14,37 @@ - - + + - + - - - - + + + + - - + + - + - + - + - - + + diff --git a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj index 002bd16c4..332c33db6 100644 --- a/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj +++ b/src/Services/Basket/Basket.FunctionalTests/Basket.FunctionalTests.csproj @@ -16,11 +16,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj index 73a4a773f..9294fd39e 100644 --- a/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj +++ b/src/Services/Basket/Basket.UnitTests/Basket.UnitTests.csproj @@ -7,12 +7,12 @@ - - - - + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Services/Catalog/Catalog.API/Catalog.API.csproj b/src/Services/Catalog/Catalog.API/Catalog.API.csproj index 362401a4d..f50fca5ff 100644 --- a/src/Services/Catalog/Catalog.API/Catalog.API.csproj +++ b/src/Services/Catalog/Catalog.API/Catalog.API.csproj @@ -41,37 +41,37 @@ - - - - + + + + - - - + + + - + - + - + - + - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj index 9597df839..582509ffb 100644 --- a/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj +++ b/src/Services/Catalog/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj @@ -33,9 +33,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj index b2d5f0b77..705f78e8a 100644 --- a/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj +++ b/src/Services/Catalog/Catalog.UnitTests/Catalog.UnitTests.csproj @@ -7,10 +7,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Services/Identity/Identity.API/Identity.API.csproj b/src/Services/Identity/Identity.API/Identity.API.csproj index 54c6f2a0e..7ae8fb70c 100644 --- a/src/Services/Identity/Identity.API/Identity.API.csproj +++ b/src/Services/Identity/Identity.API/Identity.API.csproj @@ -12,44 +12,44 @@ - - - - - + + + + + - - - + + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + - + - + - - + + - + diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs b/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs index 2d59f1730..5aa77e06c 100644 --- a/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs +++ b/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs @@ -21,13 +21,6 @@ public class MediatorModule : Autofac.Module .Where(t => t.IsClosedTypeOf(typeof(IValidator<>))) .AsImplementedInterfaces(); - - builder.Register(context => - { - var componentContext = context.Resolve(); - return t => { object o; return componentContext.TryResolve(t, out o) ? o : null; }; - }); - builder.RegisterGeneric(typeof(LoggingBehavior<,>)).As(typeof(IPipelineBehavior<,>)); builder.RegisterGeneric(typeof(ValidatorBehavior<,>)).As(typeof(IPipelineBehavior<,>)); builder.RegisterGeneric(typeof(TransactionBehaviour<,>)).As(typeof(IPipelineBehavior<,>)); diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj index 7a5813400..0be7c0d69 100644 --- a/src/Services/Ordering/Ordering.API/Ordering.API.csproj +++ b/src/Services/Ordering/Ordering.API/Ordering.API.csproj @@ -36,38 +36,37 @@ - + - + - - - - - + + + + - - - + + + - + - + - - + + diff --git a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj index fe7da8680..67d1462ef 100644 --- a/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj +++ b/src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj @@ -8,7 +8,7 @@ - + @@ -16,9 +16,9 @@ - + - + diff --git a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj index c6508b17b..54660820f 100644 --- a/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj +++ b/src/Services/Ordering/Ordering.Domain/Ordering.Domain.csproj @@ -5,8 +5,7 @@ - - + diff --git a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj index 9b9e67a58..c571e402e 100644 --- a/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj +++ b/src/Services/Ordering/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj @@ -17,9 +17,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj index bcf3ba5a5..b268bfcbc 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj +++ b/src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj @@ -9,10 +9,9 @@ - - - - + + + diff --git a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs index 3edbfbc8d..8693664c3 100644 --- a/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs +++ b/src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs @@ -147,5 +147,10 @@ public class OrderingContextDesignFactory : IDesignTimeDbContextFactory(TRequest request, CancellationToken cancellationToken = default) where TRequest : IRequest + { + return Task.CompletedTask; + } } } diff --git a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj index ac69727e2..3c6157e99 100644 --- a/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj +++ b/src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj @@ -8,22 +8,22 @@ - + - - - - + + + + - - + + - + diff --git a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj index e004f9c8c..8dd13a7ba 100644 --- a/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj +++ b/src/Services/Ordering/Ordering.UnitTests/Ordering.UnitTests.csproj @@ -7,10 +7,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Services/Payment/Payment.API/Payment.API.csproj b/src/Services/Payment/Payment.API/Payment.API.csproj index 02c255fa6..9c1527206 100644 --- a/src/Services/Payment/Payment.API/Payment.API.csproj +++ b/src/Services/Payment/Payment.API/Payment.API.csproj @@ -9,18 +9,18 @@ - + - + - + - - + + diff --git a/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj b/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj index ddbd22afd..1c6b83fee 100644 --- a/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj +++ b/src/Services/Webhooks/Webhooks.API/Webhooks.API.csproj @@ -15,13 +15,13 @@ - - - + + + - + - + diff --git a/src/Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj b/src/Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj index bd3ab30a1..d5c6bb3cb 100644 --- a/src/Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj +++ b/src/Tests/Services/Application.FunctionalTests/Application.FunctionalTests.csproj @@ -42,8 +42,8 @@ - - + + all diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj index a8ce35604..a34a80268 100644 --- a/src/Web/WebMVC/WebMVC.csproj +++ b/src/Web/WebMVC/WebMVC.csproj @@ -26,16 +26,16 @@ - - - - + + + + - + - + diff --git a/src/Web/WebSPA/Client/angular.json b/src/Web/WebSPA/Client/angular.json index 10b7036c2..f00440e80 100644 --- a/src/Web/WebSPA/Client/angular.json +++ b/src/Web/WebSPA/Client/angular.json @@ -117,5 +117,8 @@ "@schematics/angular:directive": { "prefix": "app" } + }, + "cli": { + "analytics": false } } \ No newline at end of file diff --git a/src/Web/WebSPA/Client/src/modules/app.routes.ts b/src/Web/WebSPA/Client/src/modules/app.routes.ts index 3816a9307..570ae5e16 100644 --- a/src/Web/WebSPA/Client/src/modules/app.routes.ts +++ b/src/Web/WebSPA/Client/src/modules/app.routes.ts @@ -15,4 +15,4 @@ export const routes: Routes = [ { path: 'order', component: OrdersNewComponent }, ]; -export const routing = RouterModule.forRoot(routes, {}); +export const routing = RouterModule.forRoot(routes, { }); diff --git a/src/Web/WebSPA/Client/src/modules/basket/basket.service.ts b/src/Web/WebSPA/Client/src/modules/basket/basket.service.ts index b14ff3e9b..b8f07c88d 100644 --- a/src/Web/WebSPA/Client/src/modules/basket/basket.service.ts +++ b/src/Web/WebSPA/Client/src/modules/basket/basket.service.ts @@ -24,7 +24,7 @@ export class BasketService { }; //observable that is fired when item is removed from basket - private basketUpdateSource = new Subject(); + private basketUpdateSource = new Subject(); basketUpdate$ = this.basketUpdateSource.asObservable(); constructor(private service: DataService, private authService: SecurityService, private basketWrapperService: BasketWrapperService, private router: Router, private configurationService: ConfigurationService, private storageService: StorageService) { diff --git a/src/Web/WebSPA/Client/src/modules/catalog/catalog.component.scss b/src/Web/WebSPA/Client/src/modules/catalog/catalog.component.scss index 9b06bc55d..3df012eb4 100644 --- a/src/Web/WebSPA/Client/src/modules/catalog/catalog.component.scss +++ b/src/Web/WebSPA/Client/src/modules/catalog/catalog.component.scss @@ -5,7 +5,7 @@ &-title { position: relative; - top: $banner-height / 3.5; + top: calc($banner-height / 3.5); } $filter-height: 65px; diff --git a/src/Web/WebSPA/Client/src/modules/catalog/catalog.component.ts b/src/Web/WebSPA/Client/src/modules/catalog/catalog.component.ts index 59e85e8c9..b5d5411ef 100644 --- a/src/Web/WebSPA/Client/src/modules/catalog/catalog.component.ts +++ b/src/Web/WebSPA/Client/src/modules/catalog/catalog.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Observable, Subscription } from 'rxjs'; +import { Observable, Subscription, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { CatalogService } from './catalog.service'; @@ -121,7 +121,7 @@ export class CatalogComponent implements OnInit { private handleError(error: any) { this.errorReceived = true; - return Observable.throw(error); + return throwError(() => error); } } diff --git a/src/Web/WebSPA/Client/src/modules/orders/orders-new/orders-new.component.ts b/src/Web/WebSPA/Client/src/modules/orders/orders-new/orders-new.component.ts index bcfb79b4c..7bc947044 100644 --- a/src/Web/WebSPA/Client/src/modules/orders/orders-new/orders-new.component.ts +++ b/src/Web/WebSPA/Client/src/modules/orders/orders-new/orders-new.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { OrdersService } from '../orders.service'; @@ -51,10 +51,10 @@ export class OrdersNewComponent implements OnInit { this.order.cardsecuritynumber = this.newOrderForm.controls['securitycode'].value; let basketCheckout = this.basketService.mapBasketInfoCheckout(this.order); this.basketService.setBasketCheckout(basketCheckout) - .pipe(catchError((errMessage) => { + .pipe(catchError((error) => { this.errorReceived = true; this.isOrderProcessing = false; - return Observable.throw(errMessage); + return throwError(() => error); })) .subscribe(res => { this.router.navigate(['orders']); diff --git a/src/Web/WebSPA/Client/src/modules/orders/orders.component.ts b/src/Web/WebSPA/Client/src/modules/orders/orders.component.ts index 25882d2c3..041e4414a 100644 --- a/src/Web/WebSPA/Client/src/modules/orders/orders.component.ts +++ b/src/Web/WebSPA/Client/src/modules/orders/orders.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { OrdersService } from './orders.service'; import { IOrder } from '../shared/models/order.model'; import { ConfigurationService } from '../shared/services/configuration.service'; -import { Observable } from 'rxjs'; +import { Observable, throwError } from 'rxjs'; import { catchError } from 'rxjs/operators'; import { SignalrService } from '../shared/services/signalr.service'; @@ -55,7 +55,7 @@ export class OrdersComponent implements OnInit { private handleError(error: any) { this.errorReceived = true; - return Observable.throw(error); + return throwError(() => error); } } diff --git a/src/Web/WebSPA/Client/src/modules/shared/services/basket.wrapper.service.ts b/src/Web/WebSPA/Client/src/modules/shared/services/basket.wrapper.service.ts index c8db17803..82b84fcd9 100644 --- a/src/Web/WebSPA/Client/src/modules/shared/services/basket.wrapper.service.ts +++ b/src/Web/WebSPA/Client/src/modules/shared/services/basket.wrapper.service.ts @@ -17,7 +17,7 @@ export class BasketWrapperService { private addItemToBasketSource = new Subject(); addItemToBasket$ = this.addItemToBasketSource.asObservable(); - private orderCreatedSource = new Subject(); + private orderCreatedSource = new Subject(); orderCreated$ = this.orderCreatedSource.asObservable(); addItemToBasket(item: ICatalogItem) { diff --git a/src/Web/WebSPA/Client/src/modules/shared/services/configuration.service.ts b/src/Web/WebSPA/Client/src/modules/shared/services/configuration.service.ts index 795d30647..821ba07bf 100644 --- a/src/Web/WebSPA/Client/src/modules/shared/services/configuration.service.ts +++ b/src/Web/WebSPA/Client/src/modules/shared/services/configuration.service.ts @@ -9,7 +9,7 @@ import { Observable, Subject } from 'rxjs'; export class ConfigurationService { serverSettings: IConfiguration; // observable that is fired when settings are loaded from server - private settingsLoadedSource = new Subject(); + private settingsLoadedSource = new Subject(); settingsLoaded$ = this.settingsLoadedSource.asObservable(); isReady: boolean = false; diff --git a/src/Web/WebSPA/Client/src/modules/shared/services/signalr.service.ts b/src/Web/WebSPA/Client/src/modules/shared/services/signalr.service.ts index 680ee06e9..86d15f61e 100644 --- a/src/Web/WebSPA/Client/src/modules/shared/services/signalr.service.ts +++ b/src/Web/WebSPA/Client/src/modules/shared/services/signalr.service.ts @@ -9,7 +9,7 @@ import { Subject } from 'rxjs'; export class SignalrService { private _hubConnection: HubConnection; private SignalrHubUrl: string = ''; - private msgSignalrSource = new Subject(); + private msgSignalrSource = new Subject(); msgReceived$ = this.msgSignalrSource.asObservable(); constructor( diff --git a/src/Web/WebSPA/Client/src/styles/globals.scss b/src/Web/WebSPA/Client/src/styles/globals.scss index 6974df3c1..2ccd69b88 100644 --- a/src/Web/WebSPA/Client/src/styles/globals.scss +++ b/src/Web/WebSPA/Client/src/styles/globals.scss @@ -4,7 +4,6 @@ @import 'bootstrap/scss/bootstrap'; @import 'button'; @import 'form'; -/*@import 'ngx-toastr/toastr-bs4-alert.scss';*/ @import 'toastr'; @import 'utilities'; @import 'node_modules/ngx-toastr/toastr'; diff --git a/src/Web/WebSPA/WebSPA.csproj b/src/Web/WebSPA/WebSPA.csproj index 6f8745016..16592d3ba 100644 --- a/src/Web/WebSPA/WebSPA.csproj +++ b/src/Web/WebSPA/WebSPA.csproj @@ -35,14 +35,14 @@ - - + + - - + + - + diff --git a/src/Web/WebSPA/wwwroot/favicon.ico b/src/Web/WebSPA/wwwroot/favicon.ico new file mode 100644 index 000000000..a8570bc42 Binary files /dev/null and b/src/Web/WebSPA/wwwroot/favicon.ico differ diff --git a/src/Web/WebStatus/WebStatus.csproj b/src/Web/WebStatus/WebStatus.csproj index 165d1630d..7b8599ebc 100644 --- a/src/Web/WebStatus/WebStatus.csproj +++ b/src/Web/WebStatus/WebStatus.csproj @@ -12,14 +12,14 @@ - + - + - + - + diff --git a/src/Web/WebhookClient/WebhookClient.csproj b/src/Web/WebhookClient/WebhookClient.csproj index 0273dfa31..b9aff1ad9 100644 --- a/src/Web/WebhookClient/WebhookClient.csproj +++ b/src/Web/WebhookClient/WebhookClient.csproj @@ -12,9 +12,9 @@ - + - + diff --git a/src/package-lock.json b/src/package-lock.json deleted file mode 100644 index 48e341a09..000000000 --- a/src/package-lock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "lockfileVersion": 1 -}