David Britch
7 years ago
109 changed files with 1517 additions and 1076 deletions
Unified View
Diff Options
-
+1 -0.gitignore
-
+1 -0README.md
-
+18 -19cli-linux/build-bits-linux.sh
-
+14 -14docker-compose-windows.yml
-
+1 -1docker-compose.ci.build.yml
-
+154 -103eShopOnContainers-ServicesAndWebApps.sln
-
+22 -0src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
-
+56 -0src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
-
+11 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEvent.cs
-
+23 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEventHandler.cs
-
+23 -0src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationOtherEventHandler.cs
-
+8 -2src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
-
+26 -0src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
-
+115 -0src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
-
+6 -6src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs
-
+68 -73src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
-
+1 -2src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs
-
+15 -7src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckMiddleware.cs
-
+11 -4src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckStartupFilter.cs
-
+16 -5src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckWebHostBuilderExtension.cs
-
+2 -2src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/HealthCheckBuilderSqlServerExtensions.cs
-
+0 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj
-
+109 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs
-
+19 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheckExtensions.cs
-
+30 -24src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/AddCheck.cs
-
+5 -5src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/NumericChecks.cs
-
+1 -64src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/UrlChecks.cs
-
+11 -8src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CompositeHealthCheckResult.cs
-
+15 -49src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheck.cs
-
+102 -7src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckBuilder.cs
-
+0 -18src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckExtensions.cs
-
+37 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckGroup.cs
-
+0 -1src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckResult.cs
-
+91 -26src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckService.cs
-
+13 -5src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceCollectionExtensions.cs
-
+0 -38src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceExtensions.cs
-
+1 -4src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheck.cs
-
+46 -1src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheckService.cs
-
+18 -42src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Internal/UrlChecker.cs
-
+22 -10src/BuildingBlocks/HealthChecks/src/common/Guard.cs
-
+0 -1src/Services/Basket/Basket.API/Basket.API.csproj
-
+3 -7src/Services/Basket/Basket.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
-
+20 -11src/Services/Basket/Basket.API/Startup.cs
-
+1 -1src/Services/Catalog/Catalog.API/Catalog.API.csproj
-
+5 -3src/Services/Catalog/Catalog.API/Startup.cs
-
+1 -1src/Services/Identity/Identity.API/Identity.API.csproj
-
+2 -6src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs
-
+1 -1src/Services/Ordering/Ordering.API/Ordering.API.csproj
-
+5 -3src/Services/Ordering/Ordering.API/Startup.cs
-
+1 -1src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
-
+0 -1src/Web/WebMVC/WebMVC.csproj
-
+1 -1src/Web/WebMVC/wwwroot/css/site.min.css
-
+58 -0src/Web/WebSPA/.angular-cli.json
-
+1 -4src/Web/WebSPA/.gitignore
-
+0 -0src/Web/WebSPA/Client/assets/.gitkeep
-
+0 -0src/Web/WebSPA/Client/assets/images/arrow-down.png
-
+0 -0src/Web/WebSPA/Client/assets/images/arrow-right.svg
-
+0 -0src/Web/WebSPA/Client/assets/images/brand.png
-
+0 -0src/Web/WebSPA/Client/assets/images/brand_dark.png
-
+0 -0src/Web/WebSPA/Client/assets/images/cart.png
-
+0 -0src/Web/WebSPA/Client/assets/images/logout.png
-
+0 -0src/Web/WebSPA/Client/assets/images/main_banner.png
-
+0 -0src/Web/WebSPA/Client/assets/images/main_banner_text.png
-
+0 -0src/Web/WebSPA/Client/assets/images/my_orders.png
-
+0 -2src/Web/WebSPA/Client/custom-typings.d.ts
-
+3 -0src/Web/WebSPA/Client/environments/environment.prod.ts
-
+8 -0src/Web/WebSPA/Client/environments/environment.ts
-
+0 -0src/Web/WebSPA/Client/favicon.ico
-
+1 -0src/Web/WebSPA/Client/globals.scss
-
+18 -0src/Web/WebSPA/Client/index.html
-
+4 -16src/Web/WebSPA/Client/main.ts
-
+2 -2src/Web/WebSPA/Client/modules/app.component.html
-
+2 -2src/Web/WebSPA/Client/modules/app.component.ts
-
+1 -1src/Web/WebSPA/Client/modules/basket/basket-status/basket-status.component.html
-
+1 -1src/Web/WebSPA/Client/modules/catalog/catalog.component.html
-
+2 -2src/Web/WebSPA/Client/modules/catalog/catalog.component.scss
-
+5 -6src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.ts
-
+4 -4src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.ts
-
+2 -1src/Web/WebSPA/Client/modules/orders/orders.service.ts
-
+3 -3src/Web/WebSPA/Client/modules/shared/components/identity/identity.html
-
+1 -1src/Web/WebSPA/Client/modules/shared/components/identity/identity.ts
-
+14 -0src/Web/WebSPA/Client/modules/shared/models/order-detail.model.ts
-
+10 -2src/Web/WebSPA/Client/modules/shared/shared.module.ts
-
+66 -21src/Web/WebSPA/Client/polyfills.ts
-
+32 -0src/Web/WebSPA/Client/test.ts
-
+13 -0src/Web/WebSPA/Client/tsconfig.app.json
-
+20 -0src/Web/WebSPA/Client/tsconfig.spec.json
-
+5 -0src/Web/WebSPA/Client/typings.d.ts
-
+0 -20src/Web/WebSPA/Client/vendor.ts
-
+0 -18src/Web/WebSPA/Server/Controllers/HomeController.cs
-
+22 -18src/Web/WebSPA/Startup.cs
-
+0 -12src/Web/WebSPA/Views/Home/Index.cshtml
-
+0 -16src/Web/WebSPA/Views/Shared/_Layout.cshtml
-
+0 -3src/Web/WebSPA/Views/_ViewImports.cshtml
-
+0 -3src/Web/WebSPA/Views/_ViewStart.cshtml
-
+0 -14src/Web/WebSPA/WebSPA.csproj
-
+0 -23src/Web/WebSPA/config/helpers.js
-
+0 -3src/Web/WebSPA/config/webpack.config.dev.js
-
+0 -77src/Web/WebSPA/config/webpack.config.js
-
+0 -23src/Web/WebSPA/config/webpack.config.prod.js
+ 1
- 0
.gitignore
View File
+ 1
- 0
README.md
View File
+ 18
- 19
cli-linux/build-bits-linux.sh
View File
+ 14
- 14
docker-compose-windows.yml
View File
+ 1
- 1
docker-compose.ci.build.yml
View File
+ 154
- 103
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 22
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/EventBus.Tests.csproj
View File
| @ -0,0 +1,22 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk"> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp1.1</TargetFramework> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> | |||||
| <PackageReference Include="xunit" Version="2.2.0" /> | |||||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\EventBus\EventBus.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> | |||||
| </ItemGroup> | |||||
| </Project> | |||||
+ 56
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/InMemory_SubscriptionManager_Tests.cs
View File
| @ -0,0 +1,56 @@ | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus; | |||||
| using System; | |||||
| using System.Linq; | |||||
| using Xunit; | |||||
| namespace EventBus.Tests | |||||
| { | |||||
| public class InMemory_SubscriptionManager_Tests | |||||
| { | |||||
| [Fact] | |||||
| public void After_Creation_Should_Be_Empty() | |||||
| { | |||||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||||
| Assert.True(manager.IsEmpty); | |||||
| } | |||||
| [Fact] | |||||
| public void After_One_Event_Subscription_Should_Contain_The_Event() | |||||
| { | |||||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||||
| manager.AddSubscription<TestIntegrationEvent,TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||||
| Assert.True(manager.HasSubscriptionsForEvent<TestIntegrationEvent>()); | |||||
| } | |||||
| [Fact] | |||||
| public void After_All_Subscriptions_Are_Deleted_Event_Should_No_Longer_Exists() | |||||
| { | |||||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||||
| manager.RemoveSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(); | |||||
| Assert.False(manager.HasSubscriptionsForEvent<TestIntegrationEvent>()); | |||||
| } | |||||
| [Fact] | |||||
| public void Deleting_Last_Subscription_Should_Raise_On_Deleted_Event() | |||||
| { | |||||
| bool raised = false; | |||||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||||
| manager.OnEventRemoved += (o, e) => raised = true; | |||||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||||
| manager.RemoveSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(); | |||||
| Assert.True(raised); | |||||
| } | |||||
| [Fact] | |||||
| public void Get_Handlers_For_Event_Should_Return_All_Handlers() | |||||
| { | |||||
| var manager = new InMemoryEventBusSubscriptionsManager(); | |||||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationEventHandler>(() => new TestIntegrationEventHandler()); | |||||
| manager.AddSubscription<TestIntegrationEvent, TestIntegrationOtherEventHandler>(() => new TestIntegrationOtherEventHandler()); | |||||
| var handlers = manager.GetHandlersForEvent<TestIntegrationEvent>(); | |||||
| Assert.Equal(2, handlers.Count()); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 11
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEvent.cs
View File
| @ -0,0 +1,11 @@ | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Text; | |||||
| namespace EventBus.Tests | |||||
| { | |||||
| public class TestIntegrationEvent : IntegrationEvent | |||||
| { | |||||
| } | |||||
| } | |||||
+ 23
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationEventHandler.cs
View File
| @ -0,0 +1,23 @@ | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Text; | |||||
| using System.Threading.Tasks; | |||||
| namespace EventBus.Tests | |||||
| { | |||||
| public class TestIntegrationOtherEventHandler : IIntegrationEventHandler<TestIntegrationEvent> | |||||
| { | |||||
| public bool Handled { get; private set; } | |||||
| public TestIntegrationOtherEventHandler() | |||||
| { | |||||
| Handled = false; | |||||
| } | |||||
| public async Task Handle(TestIntegrationEvent @event) | |||||
| { | |||||
| Handled = true; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 23
- 0
src/BuildingBlocks/EventBus/EventBus.Tests/TestIntegrationOtherEventHandler.cs
View File
| @ -0,0 +1,23 @@ | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Text; | |||||
| using System.Threading.Tasks; | |||||
| namespace EventBus.Tests | |||||
| { | |||||
| public class TestIntegrationEventHandler : IIntegrationEventHandler<TestIntegrationEvent> | |||||
| { | |||||
| public bool Handled { get; private set; } | |||||
| public TestIntegrationEventHandler() | |||||
| { | |||||
| Handled = false; | |||||
| } | |||||
| public async Task Handle(TestIntegrationEvent @event) | |||||
| { | |||||
| Handled = true; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 8
- 2
src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
View File
| @ -1,11 +1,17 @@ | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | ||||
| using System; | |||||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions | namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions | ||||
| { | { | ||||
| public interface IEventBus | public interface IEventBus | ||||
| { | { | ||||
| void Subscribe<T>(IIntegrationEventHandler<T> handler) where T: IntegrationEvent; | |||||
| void Unsubscribe<T>(IIntegrationEventHandler<T> handler) where T : IntegrationEvent; | |||||
| void Subscribe<T, TH>(Func<TH> handler) | |||||
| where T : IntegrationEvent | |||||
| where TH : IIntegrationEventHandler<T>; | |||||
| void Unsubscribe<T, TH>() | |||||
| where TH : IIntegrationEventHandler<T> | |||||
| where T : IntegrationEvent; | |||||
| void Publish(IntegrationEvent @event); | void Publish(IntegrationEvent @event); | ||||
| } | } | ||||
| } | } | ||||
+ 26
- 0
src/BuildingBlocks/EventBus/EventBus/IEventBusSubscriptionsManager.cs
View File
| @ -0,0 +1,26 @@ | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus | |||||
| { | |||||
| public interface IEventBusSubscriptionsManager | |||||
| { | |||||
| bool IsEmpty { get; } | |||||
| event EventHandler<string> OnEventRemoved; | |||||
| void AddSubscription<T, TH>(Func<TH> handler) | |||||
| where T : IntegrationEvent | |||||
| where TH : IIntegrationEventHandler<T>; | |||||
| void RemoveSubscription<T, TH>() | |||||
| where TH : IIntegrationEventHandler<T> | |||||
| where T : IntegrationEvent; | |||||
| bool HasSubscriptionsForEvent<T>() where T : IntegrationEvent; | |||||
| bool HasSubscriptionsForEvent(string eventName); | |||||
| Type GetEventTypeByName(string eventName); | |||||
| void Clear(); | |||||
| IEnumerable<Delegate> GetHandlersForEvent<T>() where T : IntegrationEvent; | |||||
| IEnumerable<Delegate> GetHandlersForEvent(string eventName); | |||||
| } | |||||
| } | |||||
+ 115
- 0
src/BuildingBlocks/EventBus/EventBus/InMemoryEventBusSubscriptionsManager.cs
View File
| @ -0,0 +1,115 @@ | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||||
| using System; | |||||
| using System.Collections.Generic; | |||||
| using System.Linq; | |||||
| using System.Reflection; | |||||
| using System.Text; | |||||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus | |||||
| { | |||||
| public class InMemoryEventBusSubscriptionsManager : IEventBusSubscriptionsManager | |||||
| { | |||||
| private readonly Dictionary<string, List<Delegate>> _handlers; | |||||
| private readonly List<Type> _eventTypes; | |||||
| public event EventHandler<string> OnEventRemoved; | |||||
| public InMemoryEventBusSubscriptionsManager() | |||||
| { | |||||
| _handlers = new Dictionary<string, List<Delegate>>(); | |||||
| _eventTypes = new List<Type>(); | |||||
| } | |||||
| public bool IsEmpty => !_handlers.Keys.Any(); | |||||
| public void Clear() => _handlers.Clear(); | |||||
| public void AddSubscription<T, TH>(Func<TH> handler) | |||||
| where T : IntegrationEvent | |||||
| where TH : IIntegrationEventHandler<T> | |||||
| { | |||||
| var key = GetEventKey<T>(); | |||||
| if (!HasSubscriptionsForEvent<T>()) | |||||
| { | |||||
| _handlers.Add(key, new List<Delegate>()); | |||||
| } | |||||
| _handlers[key].Add(handler); | |||||
| _eventTypes.Add(typeof(T)); | |||||
| } | |||||
| public void RemoveSubscription<T, TH>() | |||||
| where TH : IIntegrationEventHandler<T> | |||||
| where T : IntegrationEvent | |||||
| { | |||||
| var handlerToRemove = FindHandlerToRemove<T, TH>(); | |||||
| if (handlerToRemove != null) | |||||
| { | |||||
| var key = GetEventKey<T>(); | |||||
| _handlers[key].Remove(handlerToRemove); | |||||
| if (!_handlers[key].Any()) | |||||
| { | |||||
| _handlers.Remove(key); | |||||
| var eventType = _eventTypes.SingleOrDefault(e => e.Name == key); | |||||
| if (eventType != null) | |||||
| { | |||||
| _eventTypes.Remove(eventType); | |||||
| RaiseOnEventRemoved(eventType.Name); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
| public IEnumerable<Delegate> GetHandlersForEvent<T>() where T : IntegrationEvent | |||||
| { | |||||
| var key = GetEventKey<T>(); | |||||
| return GetHandlersForEvent(key); | |||||
| } | |||||
| public IEnumerable<Delegate> GetHandlersForEvent(string eventName) => _handlers[eventName]; | |||||
| private void RaiseOnEventRemoved(string eventName) | |||||
| { | |||||
| var handler = OnEventRemoved; | |||||
| if (handler != null) | |||||
| { | |||||
| OnEventRemoved(this, eventName); | |||||
| } | |||||
| } | |||||
| private Delegate FindHandlerToRemove<T, TH>() | |||||
| where T : IntegrationEvent | |||||
| where TH : IIntegrationEventHandler<T> | |||||
| { | |||||
| if (!HasSubscriptionsForEvent<T>()) | |||||
| { | |||||
| return null; | |||||
| } | |||||
| var key = GetEventKey<T>(); | |||||
| foreach (var func in _handlers[key]) | |||||
| { | |||||
| var genericArgs = func.GetType().GetGenericArguments(); | |||||
| if (genericArgs.SingleOrDefault() == typeof(TH)) | |||||
| { | |||||
| return func; | |||||
| } | |||||
| } | |||||
| return null; | |||||
| } | |||||
| public bool HasSubscriptionsForEvent<T>() where T : IntegrationEvent | |||||
| { | |||||
| var key = GetEventKey<T>(); | |||||
| return HasSubscriptionsForEvent(key); | |||||
| } | |||||
| public bool HasSubscriptionsForEvent(string eventName) => _handlers.ContainsKey(eventName); | |||||
| public Type GetEventTypeByName(string eventName) => _eventTypes.Single(t => t.Name == eventName); | |||||
| private string GetEventKey<T>() | |||||
| { | |||||
| return typeof(T).Name; | |||||
| } | |||||
| } | |||||
| } | |||||
+ 6
- 6
src/BuildingBlocks/EventBus/EventBusRabbitMQ/DefaultRabbitMQPersisterConnection.cs
View File
+ 68
- 73
src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
View File
+ 1
- 2
src/BuildingBlocks/EventBus/EventBusRabbitMQ/IRabbitMQPersisterConnection.cs
View File
+ 15
- 7
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckMiddleware.cs
View File
+ 11
- 4
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckStartupFilter.cs
View File
+ 16
- 5
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckWebHostBuilderExtension.cs
View File
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/HealthCheckBuilderDataExtensions.cs → src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/HealthCheckBuilderSqlServerExtensions.cs
View File
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/Microsoft.Extensions.HealthChecks.Data.csproj → src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.SqlServer/Microsoft.Extensions.HealthChecks.SqlServer.csproj
View File
+ 109
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheck.cs
View File
| @ -0,0 +1,109 @@ | |||||
| // Copyright (c) .NET Foundation. All rights reserved. | |||||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||||
| using System; | |||||
| using System.Reflection; | |||||
| using System.Threading; | |||||
| using System.Threading.Tasks; | |||||
| using Microsoft.Extensions.DependencyInjection; | |||||
| namespace Microsoft.Extensions.HealthChecks | |||||
| { | |||||
| public abstract class CachedHealthCheck | |||||
| { | |||||
| private static readonly TypeInfo HealthCheckTypeInfo = typeof(IHealthCheck).GetTypeInfo(); | |||||
| private volatile int _writerCount; | |||||
| public CachedHealthCheck(string name, TimeSpan cacheDuration) | |||||
| { | |||||
| Guard.ArgumentNotNullOrEmpty(nameof(name), name); | |||||
| Guard.ArgumentValid(cacheDuration.TotalMilliseconds >= 0, nameof(cacheDuration), "Cache duration must be zero (disabled) or greater than zero."); | |||||
| Name = name; | |||||
| CacheDuration = cacheDuration; | |||||
| } | |||||
| public IHealthCheckResult CachedResult { get; internal set; } | |||||
| public TimeSpan CacheDuration { get; } | |||||
| public DateTimeOffset CacheExpiration { get; internal set; } | |||||
| public string Name { get; } | |||||
| protected virtual DateTimeOffset UtcNow => DateTimeOffset.UtcNow; | |||||
| protected abstract IHealthCheck Resolve(IServiceProvider serviceProvider); | |||||
| public async ValueTask<IHealthCheckResult> RunAsync(IServiceProvider serviceProvider, CancellationToken cancellationToken = default(CancellationToken)) | |||||
| { | |||||
| while (CacheExpiration <= UtcNow) | |||||
| { | |||||
| // Can't use a standard lock here because of async, so we'll use this flag to determine when we should write a value, | |||||
| // and the waiters who aren't allowed to write will just spin wait for the new value. | |||||
| if (Interlocked.Exchange(ref _writerCount, 1) != 0) | |||||
| { | |||||
| await Task.Delay(5, cancellationToken).ConfigureAwait(false); | |||||
| continue; | |||||
| } | |||||
| try | |||||
| { | |||||
| var check = Resolve(serviceProvider); | |||||
| CachedResult = await check.CheckAsync(cancellationToken); | |||||
| } | |||||
| catch (OperationCanceledException) | |||||
| { | |||||
| CachedResult = HealthCheckResult.Unhealthy("The health check operation timed out"); | |||||
| } | |||||
| catch (Exception ex) | |||||
| { | |||||
| CachedResult = HealthCheckResult.Unhealthy($"Exception during check: {ex.GetType().FullName}"); | |||||
| } | |||||
| CacheExpiration = UtcNow + CacheDuration; | |||||
| _writerCount = 0; | |||||
| break; | |||||
| } | |||||
| return CachedResult; | |||||
| } | |||||
| public static CachedHealthCheck FromHealthCheck(string name, TimeSpan cacheDuration, IHealthCheck healthCheck) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(healthCheck), healthCheck); | |||||
| return new TypeOrHealthCheck_HealthCheck(name, cacheDuration, healthCheck); | |||||
| } | |||||
| public static CachedHealthCheck FromType(string name, TimeSpan cacheDuration, Type healthCheckType) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(healthCheckType), healthCheckType); | |||||
| Guard.ArgumentValid(HealthCheckTypeInfo.IsAssignableFrom(healthCheckType.GetTypeInfo()), nameof(healthCheckType), $"Health check must implement '{typeof(IHealthCheck).FullName}'."); | |||||
| return new TypeOrHealthCheck_Type(name, cacheDuration, healthCheckType); | |||||
| } | |||||
| class TypeOrHealthCheck_HealthCheck : CachedHealthCheck | |||||
| { | |||||
| private readonly IHealthCheck _healthCheck; | |||||
| public TypeOrHealthCheck_HealthCheck(string name, TimeSpan cacheDuration, IHealthCheck healthCheck) : base(name, cacheDuration) | |||||
| => _healthCheck = healthCheck; | |||||
| protected override IHealthCheck Resolve(IServiceProvider serviceProvider) => _healthCheck; | |||||
| } | |||||
| class TypeOrHealthCheck_Type : CachedHealthCheck | |||||
| { | |||||
| private readonly Type _healthCheckType; | |||||
| public TypeOrHealthCheck_Type(string name, TimeSpan cacheDuration, Type healthCheckType) : base(name, cacheDuration) | |||||
| => _healthCheckType = healthCheckType; | |||||
| protected override IHealthCheck Resolve(IServiceProvider serviceProvider) | |||||
| => (IHealthCheck)serviceProvider.GetRequiredService(_healthCheckType); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 19
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CachedHealthCheckExtensions.cs
View File
| @ -0,0 +1,19 @@ | |||||
| // Copyright (c) .NET Foundation. All rights reserved. | |||||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||||
| using System; | |||||
| using System.Threading; | |||||
| using System.Threading.Tasks; | |||||
| namespace Microsoft.Extensions.HealthChecks | |||||
| { | |||||
| public static class CachedHealthCheckExtensions | |||||
| { | |||||
| public static ValueTask<IHealthCheckResult> RunAsync(this CachedHealthCheck check, IServiceProvider serviceProvider) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(check), check); | |||||
| return check.RunAsync(serviceProvider, CancellationToken.None); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 30
- 24
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/AddCheck.cs
View File
+ 5
- 5
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/NumericChecks.cs
View File
+ 1
- 64
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/UrlChecks.cs
View File
+ 11
- 8
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CompositeHealthCheckResult.cs
View File
+ 15
- 49
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheck.cs
View File
+ 102
- 7
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckBuilder.cs
View File
+ 0
- 18
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckExtensions.cs
View File
| @ -1,18 +0,0 @@ | |||||
| // Copyright (c) .NET Foundation. All rights reserved. | |||||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||||
| using System.Threading; | |||||
| using System.Threading.Tasks; | |||||
| namespace Microsoft.Extensions.HealthChecks | |||||
| { | |||||
| public static class HealthCheckExtensions | |||||
| { | |||||
| public static ValueTask<IHealthCheckResult> CheckAsync(this IHealthCheck healthCheck) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(healthCheck), healthCheck); | |||||
| return healthCheck.CheckAsync(CancellationToken.None); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 37
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckGroup.cs
View File
| @ -0,0 +1,37 @@ | |||||
| // Copyright (c) .NET Foundation. All rights reserved. | |||||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||||
| using System.Collections.Generic; | |||||
| namespace Microsoft.Extensions.HealthChecks | |||||
| { | |||||
| public class HealthCheckGroup | |||||
| { | |||||
| private CheckStatus _partialSuccessStatus; | |||||
| public HealthCheckGroup(string groupName, CheckStatus partialSuccessStatus) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(groupName), groupName); | |||||
| GroupName = groupName; | |||||
| PartiallyHealthyStatus = partialSuccessStatus; | |||||
| } | |||||
| public IReadOnlyList<CachedHealthCheck> Checks => ChecksInternal.AsReadOnly(); | |||||
| internal List<CachedHealthCheck> ChecksInternal { get; } = new List<CachedHealthCheck>(); | |||||
| public string GroupName { get; } | |||||
| public CheckStatus PartiallyHealthyStatus | |||||
| { | |||||
| get => _partialSuccessStatus; | |||||
| internal set | |||||
| { | |||||
| Guard.ArgumentValid(value != CheckStatus.Unknown, nameof(value), "Check status 'Unknown' is not valid for partial success."); | |||||
| _partialSuccessStatus = value; | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
+ 0
- 1
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckResult.cs
View File
+ 91
- 26
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckService.cs
View File
+ 13
- 5
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceCollectionExtensions.cs
View File
+ 0
- 38
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceExtensions.cs
View File
| @ -1,38 +0,0 @@ | |||||
| // Copyright (c) .NET Foundation. All rights reserved. | |||||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||||
| using System.Threading; | |||||
| using System.Threading.Tasks; | |||||
| namespace Microsoft.Extensions.HealthChecks | |||||
| { | |||||
| public static class HealthCheckServiceExtensions | |||||
| { | |||||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(service), service); | |||||
| return service.CheckHealthAsync(CheckStatus.Unhealthy, CancellationToken.None); | |||||
| } | |||||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CheckStatus partiallyHealthyStatus) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(service), service); | |||||
| return service.CheckHealthAsync(partiallyHealthyStatus, CancellationToken.None); | |||||
| } | |||||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CancellationToken cancellationToken) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(service), service); | |||||
| return service.CheckHealthAsync(CheckStatus.Unhealthy, cancellationToken); | |||||
| } | |||||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CheckStatus partiallyHealthyStatus, CancellationToken cancellationToken) | |||||
| { | |||||
| Guard.ArgumentNotNull(nameof(service), service); | |||||
| return service.CheckHealthAsync(partiallyHealthyStatus, cancellationToken); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 1
- 4
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheck.cs
View File
+ 46
- 1
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheckService.cs
View File
+ 18
- 42
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Internal/UrlChecker.cs
View File
+ 22
- 10
src/BuildingBlocks/HealthChecks/src/common/Guard.cs
View File
+ 0
- 1
src/Services/Basket/Basket.API/Basket.API.csproj
View File
+ 3
- 7
src/Services/Basket/Basket.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs
View File
+ 20
- 11
src/Services/Basket/Basket.API/Startup.cs
View File
+ 1
- 1
src/Services/Catalog/Catalog.API/Catalog.API.csproj
View File
+ 5
- 3
src/Services/Catalog/Catalog.API/Startup.cs
View File
+ 1
- 1
src/Services/Identity/Identity.API/Identity.API.csproj
View File
+ 2
- 6
src/Services/Ordering/Ordering.API/Application/Commands/CreateOrderCommand.cs
View File
+ 1
- 1
src/Services/Ordering/Ordering.API/Ordering.API.csproj
View File
+ 5
- 3
src/Services/Ordering/Ordering.API/Startup.cs
View File
+ 1
- 1
src/Services/Ordering/Ordering.Infrastructure/OrderingContext.cs
View File
+ 0
- 1
src/Web/WebMVC/WebMVC.csproj
View File
+ 1
- 1
src/Web/WebMVC/wwwroot/css/site.min.css
File diff suppressed because it is too large
View File
+ 58
- 0
src/Web/WebSPA/.angular-cli.json
View File
| @ -0,0 +1,58 @@ | |||||
| { | |||||
| "$schema": "./node_modules/@angular/cli/lib/config/schema.json", | |||||
| "project": { | |||||
| "name": "WebSPA" | |||||
| }, | |||||
| "apps": [ | |||||
| { | |||||
| "root": "Client", | |||||
| "outDir": "wwwroot", | |||||
| "assets": [ | |||||
| "assets", | |||||
| "favicon.ico" | |||||
| ], | |||||
| "index": "index.html", | |||||
| "main": "main.ts", | |||||
| "polyfills": "polyfills.ts", | |||||
| "test": "test.ts", | |||||
| "tsconfig": "tsconfig.app.json", | |||||
| "testTsconfig": "tsconfig.spec.json", | |||||
| "prefix": "app", | |||||
| "styles": [ | |||||
| "globals.scss", | |||||
| "../node_modules/bootstrap/scss/bootstrap.scss" | |||||
| ], | |||||
| "scripts": [], | |||||
| "environmentSource": "environments/environment.ts", | |||||
| "environments": { | |||||
| "dev": "environments/environment.ts", | |||||
| "prod": "environments/environment.prod.ts" | |||||
| } | |||||
| } | |||||
| ], | |||||
| "e2e": { | |||||
| "protractor": { | |||||
| "config": "./protractor.conf.js" | |||||
| } | |||||
| }, | |||||
| "lint": [ | |||||
| { | |||||
| "project": "Client/tsconfig.app.json" | |||||
| }, | |||||
| { | |||||
| "project": "Client/tsconfig.spec.json" | |||||
| }, | |||||
| { | |||||
| "project": "e2e/tsconfig.e2e.json" | |||||
| } | |||||
| ], | |||||
| "test": { | |||||
| "karma": { | |||||
| "config": "./karma.conf.js" | |||||
| } | |||||
| }, | |||||
| "defaults": { | |||||
| "styleExt": "scss", | |||||
| "component": {} | |||||
| } | |||||
| } | |||||
+ 1
- 4
src/Web/WebSPA/.gitignore
View File
+ 0
- 0
src/Web/WebSPA/Client/assets/.gitkeep
View File
src/Web/WebSPA/Client/images/arrow-down.png → src/Web/WebSPA/Client/assets/images/arrow-down.png
View File
src/Web/WebSPA/Client/images/arrow-right.svg → src/Web/WebSPA/Client/assets/images/arrow-right.svg
View File
src/Web/WebSPA/Client/images/brand.png → src/Web/WebSPA/Client/assets/images/brand.png
View File
src/Web/WebSPA/Client/images/brand_dark.png → src/Web/WebSPA/Client/assets/images/brand_dark.png
View File
src/Web/WebSPA/Client/images/cart.png → src/Web/WebSPA/Client/assets/images/cart.png
View File
src/Web/WebSPA/Client/images/logout.png → src/Web/WebSPA/Client/assets/images/logout.png
View File
src/Web/WebSPA/Client/images/main_banner.png → src/Web/WebSPA/Client/assets/images/main_banner.png
View File
src/Web/WebSPA/Client/images/main_banner_text.png → src/Web/WebSPA/Client/assets/images/main_banner_text.png
View File
src/Web/WebSPA/Client/images/my_orders.png → src/Web/WebSPA/Client/assets/images/my_orders.png
View File
+ 0
- 2
src/Web/WebSPA/Client/custom-typings.d.ts
View File
| @ -1,2 +0,0 @@ | |||||
| // Extra variables that live on Global that will be replaced by webpack DefinePlugin | |||||
| // declare var process: any; | |||||
+ 3
- 0
src/Web/WebSPA/Client/environments/environment.prod.ts
View File
| @ -0,0 +1,3 @@ | |||||
| export const environment = { | |||||
| production: true | |||||
| }; | |||||
+ 8
- 0
src/Web/WebSPA/Client/environments/environment.ts
View File
| @ -0,0 +1,8 @@ | |||||
| // The file contents for the current environment will overwrite these during build. | |||||
| // The build system defaults to the dev environment which uses `environment.ts`, but if you do | |||||
| // `ng build --env=prod` then `environment.prod.ts` will be used instead. | |||||
| // The list of which env maps to which file can be found in `.angular-cli.json`. | |||||
| export const environment = { | |||||
| production: false | |||||
| }; | |||||
src/Web/WebSPA/wwwroot/favicon.ico → src/Web/WebSPA/Client/favicon.ico
View File
+ 1
- 0
src/Web/WebSPA/Client/globals.scss
View File
+ 18
- 0
src/Web/WebSPA/Client/index.html
View File
| @ -0,0 +1,18 @@ | |||||
| <!doctype html> | |||||
| <html> | |||||
| <head> | |||||
| <meta charset="utf-8"> | |||||
| <title>eShopConContainers.WebSPA</title> | |||||
| <base href="/"> | |||||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | |||||
| <link rel="icon" type="image/x-icon" href="favicon.ico"> | |||||
| </head> | |||||
| <body> | |||||
| <esh-app> | |||||
| <div class="preloading"> | |||||
| <i class="fa fa-spinner fa-spin fa-5x" aria-hidden="true"></i> | |||||
| </div> | |||||
| </esh-app> | |||||
| </body> | |||||
| </html> | |||||
+ 4
- 16
src/Web/WebSPA/Client/main.ts
View File
| @ -1,23 +1,11 @@ | |||||
| import './polyfills'; | |||||
| import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; | |||||
| import { enableProdMode } from '@angular/core'; | import { enableProdMode } from '@angular/core'; | ||||
| import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; | |||||
| import { AppModule } from './modules/app.module'; | |||||
| import { AppModule } from './modules/app.module'; | |||||
| import { environment } from './environments/environment'; | |||||
| if (process.env.ENV === 'Development') { | |||||
| // Development | |||||
| } else { | |||||
| // Production | |||||
| if (environment.production) { | |||||
| enableProdMode(); | enableProdMode(); | ||||
| } | } | ||||
| platformBrowserDynamic().bootstrapModule(AppModule); | platformBrowserDynamic().bootstrapModule(AppModule); | ||||
| // Basic hot reloading support. Automatically reloads and restarts the Angular 2 app each time | |||||
| // you modify source files. This will not preserve any application state other than the URL. | |||||
| declare var module: any; | |||||
| if (module.hot) { | |||||
| module.hot.accept(); | |||||
| } | |||||
+ 2
- 2
src/Web/WebSPA/Client/modules/app.component.html
View File
+ 2
- 2
src/Web/WebSPA/Client/modules/app.component.ts
View File
+ 1
- 1
src/Web/WebSPA/Client/modules/basket/basket-status/basket-status.component.html
View File
+ 1
- 1
src/Web/WebSPA/Client/modules/catalog/catalog.component.html
View File
+ 2
- 2
src/Web/WebSPA/Client/modules/catalog/catalog.component.scss
View File
+ 5
- 6
src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.ts
View File
+ 4
- 4
src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.ts
View File
+ 2
- 1
src/Web/WebSPA/Client/modules/orders/orders.service.ts
View File
+ 3
- 3
src/Web/WebSPA/Client/modules/shared/components/identity/identity.html
View File
+ 1
- 1
src/Web/WebSPA/Client/modules/shared/components/identity/identity.ts
View File
+ 14
- 0
src/Web/WebSPA/Client/modules/shared/models/order-detail.model.ts
View File
| @ -0,0 +1,14 @@ | |||||
| import {IOrderItem} from './orderItem.model'; | |||||
| export interface IOrderDetail { | |||||
| ordernumber: string; | |||||
| status: string; | |||||
| street: string; | |||||
| date: Date; | |||||
| city: number; | |||||
| state: string; | |||||
| zipcode: string; | |||||
| country: number; | |||||
| total: number; | |||||
| orderitems: IOrderItem[]; | |||||
| } | |||||
+ 10
- 2
src/Web/WebSPA/Client/modules/shared/shared.module.ts
View File
+ 66
- 21
src/Web/WebSPA/Client/polyfills.ts
View File
| @ -1,23 +1,68 @@ | |||||
| // Added parts of es6 which are necessary for your project or your browser support requirements. | |||||
| import 'core-js/es6/symbol'; | |||||
| import 'core-js/es6/object'; | |||||
| import 'core-js/es6/function'; | |||||
| import 'core-js/es6/parse-int'; | |||||
| import 'core-js/es6/parse-float'; | |||||
| import 'core-js/es6/number'; | |||||
| import 'core-js/es6/math'; | |||||
| import 'core-js/es6/string'; | |||||
| import 'core-js/es6/date'; | |||||
| import 'core-js/es6/array'; | |||||
| import 'core-js/es6/regexp'; | |||||
| import 'core-js/es6/map'; | |||||
| import 'core-js/es6/set'; | |||||
| import 'core-js/es6/weak-map'; | |||||
| import 'core-js/es6/weak-set'; | |||||
| import 'core-js/es6/typed'; | |||||
| import 'core-js/es6/reflect'; | |||||
| // see issue https://github.com/AngularClass/angular2-webpack-starter/issues/709 | |||||
| // import 'core-js/es6/promise'; | |||||
| /** | |||||
| * This file includes polyfills needed by Angular and is loaded before the app. | |||||
| * You can add your own extra polyfills to this file. | |||||
| * | |||||
| * This file is divided into 2 sections: | |||||
| * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. | |||||
| * 2. Application imports. Files imported after ZoneJS that should be loaded before your main | |||||
| * file. | |||||
| * | |||||
| * The current setup is for so-called "evergreen" browsers; the last versions of browsers that | |||||
| * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), | |||||
| * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. | |||||
| * | |||||
| * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html | |||||
| */ | |||||
| /*************************************************************************************************** | |||||
| * BROWSER POLYFILLS | |||||
| */ | |||||
| /** IE9, IE10 and IE11 requires all of the following polyfills. **/ | |||||
| // import 'core-js/es6/symbol'; | |||||
| // import 'core-js/es6/object'; | |||||
| // import 'core-js/es6/function'; | |||||
| // import 'core-js/es6/parse-int'; | |||||
| // import 'core-js/es6/parse-float'; | |||||
| // import 'core-js/es6/number'; | |||||
| // import 'core-js/es6/math'; | |||||
| // import 'core-js/es6/string'; | |||||
| // import 'core-js/es6/date'; | |||||
| // import 'core-js/es6/array'; | |||||
| // import 'core-js/es6/regexp'; | |||||
| // import 'core-js/es6/map'; | |||||
| // import 'core-js/es6/set'; | |||||
| /** IE10 and IE11 requires the following for NgClass support on SVG elements */ | |||||
| // import 'classlist.js'; // Run `npm install --save classlist.js`. | |||||
| /** IE10 and IE11 requires the following to support `@angular/animation`. */ | |||||
| // import 'web-animations-js'; // Run `npm install --save web-animations-js`. | |||||
| /** Evergreen browsers require these. **/ | |||||
| import 'core-js/es6/reflect'; | |||||
| import 'core-js/es7/reflect'; | import 'core-js/es7/reflect'; | ||||
| import 'zone.js/dist/zone'; | |||||
| /** ALL Firefox browsers require the following to support `@angular/animation`. **/ | |||||
| // import 'web-animations-js'; // Run `npm install --save web-animations-js`. | |||||
| /*************************************************************************************************** | |||||
| * Zone JS is required by Angular itself. | |||||
| */ | |||||
| import 'zone.js/dist/zone'; // Included with Angular CLI. | |||||
| /*************************************************************************************************** | |||||
| * APPLICATION IMPORTS | |||||
| */ | |||||
| /** | |||||
| * Date, currency, decimal and percent pipes. | |||||
| * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 | |||||
| */ | |||||
| // import 'intl'; // Run `npm install --save intl`. | |||||
+ 32
- 0
src/Web/WebSPA/Client/test.ts
View File
| @ -0,0 +1,32 @@ | |||||
| // This file is required by karma.conf.js and loads recursively all the .spec and framework files | |||||
| import 'zone.js/dist/long-stack-trace-zone'; | |||||
| import 'zone.js/dist/proxy.js'; | |||||
| import 'zone.js/dist/sync-test'; | |||||
| import 'zone.js/dist/jasmine-patch'; | |||||
| import 'zone.js/dist/async-test'; | |||||
| import 'zone.js/dist/fake-async-test'; | |||||
| import { getTestBed } from '@angular/core/testing'; | |||||
| import { | |||||
| BrowserDynamicTestingModule, | |||||
| platformBrowserDynamicTesting | |||||
| } from '@angular/platform-browser-dynamic/testing'; | |||||
| // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. | |||||
| declare var __karma__: any; | |||||
| declare var require: any; | |||||
| // Prevent Karma from running prematurely. | |||||
| __karma__.loaded = function () {}; | |||||
| // First, initialize the Angular testing environment. | |||||
| getTestBed().initTestEnvironment( | |||||
| BrowserDynamicTestingModule, | |||||
| platformBrowserDynamicTesting() | |||||
| ); | |||||
| // Then we find all the tests. | |||||
| const context = require.context('./', true, /\.spec\.ts$/); | |||||
| // And load the modules. | |||||
| context.keys().map(context); | |||||
| // Finally, start Karma to run the tests. | |||||
| __karma__.start(); | |||||
+ 13
- 0
src/Web/WebSPA/Client/tsconfig.app.json
View File
| @ -0,0 +1,13 @@ | |||||
| { | |||||
| "extends": "../tsconfig.json", | |||||
| "compilerOptions": { | |||||
| "outDir": "../out-tsc/app", | |||||
| "module": "es2015", | |||||
| "baseUrl": "", | |||||
| "types": [] | |||||
| }, | |||||
| "exclude": [ | |||||
| "test.ts", | |||||
| "**/*.spec.ts" | |||||
| ] | |||||
| } | |||||
+ 20
- 0
src/Web/WebSPA/Client/tsconfig.spec.json
View File
| @ -0,0 +1,20 @@ | |||||
| { | |||||
| "extends": "../tsconfig.json", | |||||
| "compilerOptions": { | |||||
| "outDir": "../out-tsc/spec", | |||||
| "module": "commonjs", | |||||
| "target": "es5", | |||||
| "baseUrl": "", | |||||
| "types": [ | |||||
| "jasmine", | |||||
| "node" | |||||
| ] | |||||
| }, | |||||
| "files": [ | |||||
| "test.ts" | |||||
| ], | |||||
| "include": [ | |||||
| "**/*.spec.ts", | |||||
| "**/*.d.ts" | |||||
| ] | |||||
| } | |||||
+ 5
- 0
src/Web/WebSPA/Client/typings.d.ts
View File
| @ -0,0 +1,5 @@ | |||||
| /* SystemJS module definition */ | |||||
| declare var module: NodeModule; | |||||
| interface NodeModule { | |||||
| id: string; | |||||
| } | |||||
+ 0
- 20
src/Web/WebSPA/Client/vendor.ts
View File
| @ -1,20 +0,0 @@ | |||||
| // For vendors for example jQuery, Lodash, angular2-jwt just import them here unless you plan on | |||||
| // chunking vendors files for async loading. You would need to import the async loaded vendors | |||||
| // at the entry point of the async loaded file. Also see custom-typings.d.ts as you also need to | |||||
| // run `typings install x` where `x` is your module | |||||
| // Angular 2 | |||||
| import '@angular/platform-browser'; | |||||
| import '@angular/platform-browser-dynamic'; | |||||
| import '@angular/core'; | |||||
| import '@angular/common'; | |||||
| import '@angular/forms'; | |||||
| import '@angular/http'; | |||||
| import '@angular/router'; | |||||
| // RxJS | |||||
| import 'rxjs/add/operator/map'; | |||||
| import 'rxjs/add/operator/mergeMap'; | |||||
| import 'rxjs/add/operator/catch'; | |||||
| import 'rxjs/add/operator/finally'; | |||||
| import 'rxjs/add/observable/throw'; | |||||
+ 0
- 18
src/Web/WebSPA/Server/Controllers/HomeController.cs
View File
+ 22
- 18
src/Web/WebSPA/Startup.cs
View File
+ 0
- 12
src/Web/WebSPA/Views/Home/Index.cshtml
View File
| @ -1,12 +0,0 @@ | |||||
| <esh-app class="esh-app" asp-prerender-webpack-config="config/webpack.config.js"> | |||||
| <div class="preloading"> | |||||
| <i class="fa fa-spinner fa-spin fa-5x" aria-hidden="true"></i> | |||||
| </div> | |||||
| </esh-app> | |||||
| <script> | |||||
| window.user = '@ViewBag.user'; | |||||
| </script> | |||||
| <script src="~/dist/vendor.js" asp-append-version="true"></script> | |||||
| <script src="~/dist/@ViewBag.HashedMain" asp-append-version="true"></script> | |||||
+ 0
- 16
src/Web/WebSPA/Views/Shared/_Layout.cshtml
View File
| @ -1,16 +0,0 @@ | |||||
| <!DOCTYPE html> | |||||
| <html> | |||||
| <head> | |||||
| <meta charset="utf-8" /> | |||||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | |||||
| <title>eShopConContainers.WebSPA</title> | |||||
| <base href="/" /> | |||||
| <link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" /> | |||||
| </head> | |||||
| <body> | |||||
| @RenderBody() | |||||
| </body> | |||||
| </html> | |||||
+ 0
- 3
src/Web/WebSPA/Views/_ViewImports.cshtml
View File
| @ -1,3 +0,0 @@ | |||||
| @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers" | |||||
| @addTagHelper "*, Microsoft.AspNetCore.SpaServices" | |||||
+ 0
- 3
src/Web/WebSPA/Views/_ViewStart.cshtml
View File
| @ -1,3 +0,0 @@ | |||||
| @{ | |||||
| Layout = "_Layout"; | |||||
| } | |||||
+ 0
- 14
src/Web/WebSPA/WebSPA.csproj
View File
+ 0
- 23
src/Web/WebSPA/config/helpers.js
View File
| @ -1,23 +0,0 @@ | |||||
| /** | |||||
| * @author: @AngularClass | |||||
| */ | |||||
| var path = require('path'); | |||||
| // Helper functions | |||||
| var ROOT = path.resolve(__dirname, '..'); | |||||
| console.log('root directory:', root() + '\n'); | |||||
| function hasProcessFlag(flag) { | |||||
| return process.argv.join('').indexOf(flag) > -1; | |||||
| } | |||||
| function root(args) { | |||||
| args = Array.prototype.slice.call(arguments, 0); | |||||
| return path.join.apply(path, [ROOT].concat(args)); | |||||
| } | |||||
| exports.hasProcessFlag = hasProcessFlag; | |||||
| exports.root = root; | |||||
+ 0
- 3
src/Web/WebSPA/config/webpack.config.dev.js
View File
| @ -1,3 +0,0 @@ | |||||
| module.exports = { | |||||
| //devtool: 'cheap-module-source-map' | |||||
| }; | |||||
+ 0
- 77
src/Web/WebSPA/config/webpack.config.js
View File
| @ -1,77 +0,0 @@ | |||||
| var path = require('path'); | |||||
| var webpack = require('webpack'); | |||||
| var merge = require('extendify')({ isDeep: true, arrays: 'concat' }); | |||||
| var ExtractTextPlugin = require('extract-text-webpack-plugin'); | |||||
| var extractCSS = new ExtractTextPlugin('styles.css'); | |||||
| var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin; | |||||
| var devConfig = require('./webpack.config.dev'); | |||||
| var prodConfig = require('./webpack.config.prod'); | |||||
| var CopyWebpackPlugin = require('copy-webpack-plugin'); | |||||
| var isDevelopment = process.env.ASPNETCORE_ENVIRONMENT === 'Development'; | |||||
| console.log("==========Dev Mode = " + isDevelopment + " ============" ) | |||||
| module.exports = merge({ | |||||
| resolve: { | |||||
| extensions: ['.js', '.ts'] | |||||
| }, | |||||
| module: { | |||||
| rules: [ | |||||
| { | |||||
| test: /\.ts$/, exclude: [/\.(spec|e2e)\.ts$/], | |||||
| loaders: ['awesome-typescript-loader?forkChecker=true ', 'angular2-template-loader', 'angular2-router-loader'] | |||||
| }, | |||||
| { test: /\.html$/, loader: "html" }, | |||||
| { test: /\.scss$/, loader: 'exports-loader?module.exports.toString()!css-loader!sass-loader' }, | |||||
| { test: /\.json$/, loader: 'json-loader' }, | |||||
| { | |||||
| test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, | |||||
| loader: "file-loader" | |||||
| }, { | |||||
| test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, | |||||
| loader: "file-loader" | |||||
| }, { | |||||
| test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, | |||||
| loader: "file-loader" | |||||
| }, { | |||||
| test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, | |||||
| loader: "file-loader" | |||||
| }, | |||||
| { | |||||
| test: /\.(png|jpg|gif|svg)$/, | |||||
| loader: "file-loader?name=images/[name].[ext]" | |||||
| } | |||||
| ] | |||||
| }, | |||||
| entry: { | |||||
| 'main': './Client/main.ts' | |||||
| }, | |||||
| output: { | |||||
| path: path.join(__dirname, '../wwwroot', 'dist'), | |||||
| filename: '[name].js', | |||||
| publicPath: '/dist/' | |||||
| }, | |||||
| profile: true, | |||||
| plugins: [ | |||||
| extractCSS, | |||||
| new webpack.DllReferencePlugin({ | |||||
| context: __dirname, | |||||
| manifest: require('../wwwroot/dist/vendor-manifest.json') | |||||
| }), | |||||
| // To eliminate warning | |||||
| // https://github.com/AngularClass/angular2-webpack-starter/issues/993 | |||||
| new webpack.ContextReplacementPlugin( | |||||
| /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/, | |||||
| __dirname | |||||
| ), | |||||
| new ForkCheckerPlugin(), | |||||
| new webpack.DefinePlugin({ | |||||
| 'process.env': { | |||||
| 'ENV': JSON.stringify(process.env.ASPNETCORE_ENVIRONMENT) | |||||
| } | |||||
| }), | |||||
| new CopyWebpackPlugin([ | |||||
| { from: 'Client/fonts', to: 'fonts' } | |||||
| ]) | |||||
| ] | |||||
| }, isDevelopment ? devConfig : prodConfig); | |||||
+ 0
- 23
src/Web/WebSPA/config/webpack.config.prod.js
View File
| @ -1,23 +0,0 @@ | |||||
| var webpack = require('webpack'); | |||||
| const WebpackMd5Hash = require('webpack-md5-hash'); | |||||
| module.exports = { | |||||
| devtool: 'source-map', | |||||
| output: { | |||||
| filename: '[name].[chunkhash].bundle.js', | |||||
| sourceMapFilename: '[name].[chunkhash].bundle.map', | |||||
| chunkFilename: '[id].[chunkhash].chunk.js' | |||||
| }, | |||||
| plugins: [ | |||||
| // new webpack.LoaderOptionsPlugin({ | |||||
| // minimize: true, | |||||
| // debug: false | |||||
| // }), | |||||
| new WebpackMd5Hash(), | |||||
| new webpack.optimize.UglifyJsPlugin({ | |||||
| beautify: false, | |||||
| comments: false, | |||||
| sourceMap: true | |||||
| }) | |||||
| ] | |||||
| }; | |||||