Rafsanul Hasan
6 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
129 changed files with 11784 additions and 32900 deletions
Unified View
Diff Options
-
BINCertificates/DotNet Foundation CA.pfx
-
BINCertificates/eShopOnContainers.pfx
-
+4 -2cli-windows/add-firewall-rules-for-sts-auth-thru-docker.ps1
-
+1 -1docker-compose.dcproj
-
+20 -9docker-compose.override.yml
-
+51 -51eShopOnContainers-ServicesAndWebApps.sln
-
+2 -2src/ApiGateways/ApiGw-Base/Dockerfile
-
+11 -10src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
-
+2 -1src/ApiGateways/ApiGw-Base/Properties/launchSettings.json
-
+2 -2src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
-
+15 -14src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
-
+2 -1src/ApiGateways/Mobile.Bff.Shopping/aggregator/Properties/launchSettings.json
-
+172 -162src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs
-
+21 -13src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.json
-
+2 -2src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
-
+2 -1src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json
-
+174 -165src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
-
+17 -15src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
-
+4 -4src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
-
+1 -1src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj
-
+3 -3src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj
-
+2 -2src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj
-
+1 -1src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
-
+30 -29src/Services/Basket/Basket.API/Basket.API.csproj
-
+2 -2src/Services/Basket/Basket.API/Dockerfile
-
+2 -1src/Services/Basket/Basket.API/Properties/launchSettings.json
-
+274 -272src/Services/Basket/Basket.API/Startup.cs
-
+22 -22src/Services/Basket/Basket.API/appsettings.json
-
+6 -6src/Services/Catalog/Catalog.API/Catalog.API.csproj
-
+2 -2src/Services/Catalog/Catalog.API/Dockerfile
-
+2 -1src/Services/Catalog/Catalog.API/Properties/launchSettings.json
-
+294 -291src/Services/Catalog/Catalog.API/Startup.cs
-
+0 -3src/Services/Identity/Identity.API/.bowerrc
-
+4 -2src/Services/Identity/Identity.API/Dockerfile
-
+62 -55src/Services/Identity/Identity.API/Identity.API.csproj
-
+4 -3src/Services/Identity/Identity.API/Properties/launchSettings.json
-
BINsrc/Services/Identity/Identity.API/Setup/DotNet Foundation CA.pfx
-
BINsrc/Services/Identity/Identity.API/Setup/eShopOnContainers.pfx
-
+168 -154src/Services/Identity/Identity.API/Startup.cs
-
+31 -23src/Services/Identity/Identity.API/appsettings.json
-
+0 -10src/Services/Identity/Identity.API/bower.json
-
+228 -0src/Services/Identity/Identity.API/libman.json
-
+0 -45src/Services/Identity/Identity.API/wwwroot/lib/bootstrap/.bower.json
-
+0 -21src/Services/Identity/Identity.API/wwwroot/lib/bootstrap/LICENSE
-
+0 -13src/Services/Identity/Identity.API/wwwroot/lib/bootstrap/dist/js/npm.js
-
+0 -44src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
-
+1 -5src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
-
+0 -40src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/.bower.json
-
+0 -22src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/LICENSE.md
-
+0 -998src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/dist/additional-methods.js
-
+0 -4src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
-
+0 -1398src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/dist/jquery.validate.js
-
+0 -4src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
-
+0 -25src/Services/Identity/Identity.API/wwwroot/lib/jquery/.bower.json
-
+0 -36src/Services/Identity/Identity.API/wwwroot/lib/jquery/LICENSE.txt
-
+0 -9831src/Services/Identity/Identity.API/wwwroot/lib/jquery/dist/jquery.js
-
+0 -4src/Services/Identity/Identity.API/wwwroot/lib/jquery/dist/jquery.min.js
-
+0 -1src/Services/Identity/Identity.API/wwwroot/lib/jquery/dist/jquery.min.map
-
+2586 -1965src/Services/Identity/Identity.API/wwwroot/lib/jquery/jquery.js
-
+4 -5src/Services/Identity/Identity.API/wwwroot/lib/jquery/jquery.min.js
-
+1 -1src/Services/Identity/Identity.API/wwwroot/lib/jquery/jquery.min.map
-
+2 -2src/Services/Location/Locations.API/Dockerfile
-
+29 -28src/Services/Location/Locations.API/Locations.API.csproj
-
+2 -1src/Services/Location/Locations.API/Properties/launchSettings.json
-
+2 -2src/Services/Marketing/Marketing.API/Dockerfile
-
+50 -49src/Services/Marketing/Marketing.API/Marketing.API.csproj
-
+2 -1src/Services/Marketing/Marketing.API/Properties/launchSettings.json
-
+2 -2src/Services/Ordering/Ordering.API/Dockerfile
-
+50 -49src/Services/Ordering/Ordering.API/Ordering.API.csproj
-
+2 -1src/Services/Ordering/Ordering.API/Properties/launchSettings.json
-
+2 -2src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
-
+25 -24src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
-
+3 -2src/Services/Ordering/Ordering.BackgroundTasks/Properties/launchSettings.json
-
+3 -3src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
-
+2 -2src/Services/Ordering/Ordering.SignalrHub/Dockerfile
-
+25 -24src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
-
+3 -2src/Services/Ordering/Ordering.SignalrHub/Properties/launchSettings.json
-
+2 -2src/Services/Payment/Payment.API/Dockerfile
-
+24 -23src/Services/Payment/Payment.API/Payment.API.csproj
-
+2 -1src/Services/Payment/Payment.API/Properties/launchSettings.json
-
+0 -3src/Web/WebMVC/.bowerrc
-
+13 -0src/Web/WebMVC/Controllers/HomeController.cs
-
+4 -2src/Web/WebMVC/Dockerfile
-
+11 -10src/Web/WebMVC/Properties/launchSettings.json
-
+5 -4src/Web/WebMVC/Services/CatalogService.cs
-
+269 -249src/Web/WebMVC/Startup.cs
-
+22 -20src/Web/WebMVC/Views/Campaigns/Details.cshtml
-
+60 -57src/Web/WebMVC/Views/Campaigns/Index.cshtml
-
+7 -7src/Web/WebMVC/Views/Cart/Index.cshtml
-
+44 -44src/Web/WebMVC/Views/Catalog/Index.cshtml
-
+6 -0src/Web/WebMVC/Views/Home/Privacy.cshtml
-
+93 -91src/Web/WebMVC/Views/Order/Create.cshtml
-
+71 -70src/Web/WebMVC/Views/Order/Detail.cshtml
-
+38 -36src/Web/WebMVC/Views/Order/Index.cshtml
-
+33 -32src/Web/WebMVC/Views/OrderManagement/Index.cshtml
-
+41 -0src/Web/WebMVC/Views/Shared/_CookieConsentPartial.cshtml
-
+65 -63src/Web/WebMVC/Views/Shared/_Layout.cshtml
-
+46 -47src/Web/WebMVC/WebMVC.csproj
-
+34 -25src/Web/WebMVC/appsettings.json
-
+0 -10src/Web/WebMVC/bower.json
BIN
Certificates/DotNet Foundation CA.pfx
View File
BIN
Certificates/eShopOnContainers.pfx
View File
+ 4
- 2
cli-windows/add-firewall-rules-for-sts-auth-thru-docker.ps1
View File
+ 1
- 1
docker-compose.dcproj
View File
+ 20
- 9
docker-compose.override.yml
View File
+ 51
- 51
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 2
- 2
src/ApiGateways/ApiGw-Base/Dockerfile
View File
+ 11
- 10
src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj
View File
| @ -1,15 +1,16 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="wwwroot\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="wwwroot\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" /> | |||||
| <PackageReference Include="Ocelot" Version="3.0.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="Ocelot" Version="3.0.0" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 2
- 1
src/ApiGateways/ApiGw-Base/Properties/launchSettings.json
View File
+ 2
- 2
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
View File
+ 15
- 14
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj
View File
| @ -1,20 +1,21 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName> | |||||
| <RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace> | |||||
| <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <AssemblyName>Mobile.Shopping.HttpAggregator</AssemblyName> | |||||
| <RootNamespace>Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator</RootNamespace> | |||||
| <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="wwwroot\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="wwwroot\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 2
- 1
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Properties/launchSettings.json
View File
+ 172
- 162
src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs
View File
+ 21
- 13
src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.json
View File
| @ -1,15 +1,23 @@ | |||||
| { | { | ||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "Debug": { | |||||
| "LogLevel": { | |||||
| "Default": "Warning" | |||||
| } | |||||
| }, | |||||
| "Console": { | |||||
| "LogLevel": { | |||||
| "Default": "Warning" | |||||
| } | |||||
| } | |||||
| } | |||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "Debug": { | |||||
| "LogLevel": { | |||||
| "Default": "Warning" | |||||
| } | |||||
| }, | |||||
| "Console": { | |||||
| "LogLevel": { | |||||
| "Default": "Warning" | |||||
| } | |||||
| } | |||||
| }, | |||||
| "Kestrel": { | |||||
| "Certificates": { | |||||
| "Default": { | |||||
| "Path": "./synergydev.pfx", | |||||
| "Password": "RH@ssl2018" | |||||
| } | |||||
| } | |||||
| } | |||||
| } | } | ||||
+ 2
- 2
src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
View File
+ 2
- 1
src/ApiGateways/Web.Bff.Shopping/aggregator/Properties/launchSettings.json
View File
+ 174
- 165
src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs
View File
+ 17
- 15
src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj
View File
| @ -1,21 +1,23 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <AssemblyName>Web.Shopping.HttpAggregator</AssemblyName> | |||||
| <RootNamespace>Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator</RootNamespace> | |||||
| <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <AssemblyName>Web.Shopping.HttpAggregator</AssemblyName> | |||||
| <RootNamespace>Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator</RootNamespace> | |||||
| <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| <UserSecretsId>0890cb23-79b5-408d-9aeb-13e6ff218d71</UserSecretsId> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="wwwroot\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="wwwroot\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 4
- 4
src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
View File
+ 1
- 1
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj
View File
+ 3
- 3
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/Microsoft.Extensions.HealthChecks.AzureStorage.csproj
View File
+ 2
- 2
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj
View File
+ 1
- 1
src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHost.Customization.csproj
View File
+ 30
- 29
src/Services/Basket/Basket.API/Basket.API.csproj
View File
| @ -1,36 +1,37 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Content Update="web.config"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Content Update="web.config"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" /> | |||||
| <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.4" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" /> | |||||
| <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.4" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 2
- 2
src/Services/Basket/Basket.API/Dockerfile
View File
+ 2
- 1
src/Services/Basket/Basket.API/Properties/launchSettings.json
View File
+ 274
- 272
src/Services/Basket/Basket.API/Startup.cs
View File
+ 22
- 22
src/Services/Basket/Basket.API/appsettings.json
View File
| @ -1,24 +1,24 @@ | |||||
| { | { | ||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "LogLevel": { | |||||
| "Default": "Debug", | |||||
| "System": "Information", | |||||
| "Microsoft": "Information" | |||||
| } | |||||
| }, | |||||
| "IdentityUrl": "http://localhost:5105", | |||||
| "ConnectionString": "127.0.0.1", | |||||
| "AzureServiceBusEnabled": false, | |||||
| "SubscriptionClientName": "Basket", | |||||
| "ApplicationInsights": { | |||||
| "InstrumentationKey": "" | |||||
| }, | |||||
| "EventBusRetryCount": 5, | |||||
| "UseVault": false, | |||||
| "Vault": { | |||||
| "Name": "eshop", | |||||
| "ClientId": "your-clien-id", | |||||
| "ClientSecret": "your-client-secret" | |||||
| } | |||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "LogLevel": { | |||||
| "Default": "Debug", | |||||
| "System": "Information", | |||||
| "Microsoft": "Information" | |||||
| } | |||||
| }, | |||||
| "IdentityUrl": "https://localhost:4105", | |||||
| "ConnectionString": "127.0.0.1", | |||||
| "AzureServiceBusEnabled": false, | |||||
| "SubscriptionClientName": "Basket", | |||||
| "ApplicationInsights": { | |||||
| "InstrumentationKey": "" | |||||
| }, | |||||
| "EventBusRetryCount": 5, | |||||
| "UseVault": false, | |||||
| "Vault": { | |||||
| "Name": "eshop", | |||||
| "ClientId": "your-clien-id", | |||||
| "ClientSecret": "your-client-secret" | |||||
| } | |||||
| } | } | ||||
+ 6
- 6
src/Services/Catalog/Catalog.API/Catalog.API.csproj
View File
+ 2
- 2
src/Services/Catalog/Catalog.API/Dockerfile
View File
+ 2
- 1
src/Services/Catalog/Catalog.API/Properties/launchSettings.json
View File
+ 294
- 291
src/Services/Catalog/Catalog.API/Startup.cs
View File
+ 0
- 3
src/Services/Identity/Identity.API/.bowerrc
View File
| @ -1,3 +0,0 @@ | |||||
| { | |||||
| "directory": "wwwroot/lib" | |||||
| } | |||||
+ 4
- 2
src/Services/Identity/Identity.API/Dockerfile
View File
+ 62
- 55
src/Services/Identity/Identity.API/Identity.API.csproj
View File
| @ -1,59 +1,66 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Content Include="Setup\**\*;"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" /> | |||||
| <PackageReference Include="IdentityServer4.EntityFramework" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.3" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| </ItemGroup> | |||||
| <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish"> | |||||
| <Exec Command="dotnet bundle" Condition="'$(ASPNETCORE_ENVIRONMENT)'!='Development'" /> | |||||
| </Target> | |||||
| <ItemGroup> | |||||
| <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.7.385" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <EmbeddedResource Include="Certificate\idsrv3test.pfx" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\WebHostCustomization\WebHost.Customization\WebHost.Customization.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Update="Setup\*"> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </None> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="Extensions\" /> | |||||
| </ItemGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <UserSecretsId>aspnet-eShopOnContainers.Identity-90487118-103c-4ff0-b9da-e5e26f7ab0c5</UserSecretsId> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Content Include="Setup\**\*;"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Remove="Setup\DotNet Foundation CA.pfx" /> | |||||
| <None Remove="Setup\eShopOnContainers.pfx" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" /> | |||||
| <PackageReference Include="IdentityServer4.EntityFramework" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.3" /> | |||||
| <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.113" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| </ItemGroup> | |||||
| <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish"> | |||||
| <Exec Command="dotnet bundle" Condition="'$(ASPNETCORE_ENVIRONMENT)'!='Development'" /> | |||||
| </Target> | |||||
| <ItemGroup> | |||||
| <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.7.385" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <EmbeddedResource Include="Certificate\idsrv3test.pfx" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\WebHostCustomization\WebHost.Customization\WebHost.Customization.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Update="Setup\*"> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </None> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="Extensions\" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 4
- 3
src/Services/Identity/Identity.API/Properties/launchSettings.json
View File
BIN
src/Services/Identity/Identity.API/Setup/DotNet Foundation CA.pfx
View File
BIN
src/Services/Identity/Identity.API/Setup/eShopOnContainers.pfx
View File
+ 168
- 154
src/Services/Identity/Identity.API/Startup.cs
View File
+ 31
- 23
src/Services/Identity/Identity.API/appsettings.json
View File
| @ -1,25 +1,33 @@ | |||||
| { | { | ||||
| "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;", | |||||
| "IsClusterEnv": "False", | |||||
| "MvcClient": "http://localhost:5100", | |||||
| "SpaClient": "http://localhost:5104", | |||||
| "XamarinCallback": "http://localhost:5105/xamarincallback", | |||||
| "UseCustomizationData": false, | |||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "LogLevel": { | |||||
| "Default": "Trace", | |||||
| "System": "Information", | |||||
| "Microsoft": "Information" | |||||
| } | |||||
| }, | |||||
| "ApplicationInsights": { | |||||
| "InstrumentationKey": "" | |||||
| }, | |||||
| "UseVault": false, | |||||
| "Vault": { | |||||
| "Name": "eshop", | |||||
| "ClientId": "your-clien-id", | |||||
| "ClientSecret": "your-client-secret" | |||||
| } | |||||
| "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word;", | |||||
| "IsClusterEnv": "False", | |||||
| "MvcClient": "https://localhost:4100", | |||||
| "SpaClient": "https://localhost:4104", | |||||
| "XamarinCallback": "https://localhost:4105/xamarincallback", | |||||
| "UseCustomizationData": false, | |||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "LogLevel": { | |||||
| "Default": "Trace", | |||||
| "System": "Information", | |||||
| "Microsoft": "Information" | |||||
| } | |||||
| }, | |||||
| "ApplicationInsights": { | |||||
| "InstrumentationKey": "" | |||||
| }, | |||||
| "UseVault": false, | |||||
| "Vault": { | |||||
| "Name": "eshop", | |||||
| "ClientId": "your-clien-id", | |||||
| "ClientSecret": "your-client-secret" | |||||
| }, | |||||
| "Kestrel": { | |||||
| "Certificates": { | |||||
| "Default": { | |||||
| "Path": "./Setup/eshopOnContainers.pfx", | |||||
| "Password": "D0tNet@" | |||||
| } | |||||
| } | |||||
| } | |||||
| } | } | ||||
+ 0
- 10
src/Services/Identity/Identity.API/bower.json
View File
| @ -1,10 +0,0 @@ | |||||
| { | |||||
| "name": "asp.net", | |||||
| "private": true, | |||||
| "dependencies": { | |||||
| "bootstrap": "v3.3.7", | |||||
| "jquery": "2.2.0", | |||||
| "jquery-validation": "1.14.0", | |||||
| "jquery-validation-unobtrusive": "3.2.6" | |||||
| } | |||||
| } | |||||
+ 228
- 0
src/Services/Identity/Identity.API/libman.json
View File
| @ -0,0 +1,228 @@ | |||||
| { | |||||
| "defaultProvider": "cdnjs", | |||||
| "libraries": [ | |||||
| { | |||||
| "destination": "wwwroot/lib/bootstrap", | |||||
| "files": [ | |||||
| "dist/css/bootstrap.css", | |||||
| "dist/css/bootstrap.css.map", | |||||
| "dist/css/bootstrap.min.css", | |||||
| "dist/css/bootstrap.min.css.map", | |||||
| "dist/css/bootstrap-theme.css", | |||||
| "dist/css/bootstrap-theme.css.map", | |||||
| "dist/css/bootstrap-theme.min.css", | |||||
| "dist/css/bootstrap-theme.min.css.map", | |||||
| "dist/fonts/glyphicons-halflings-regular.eot", | |||||
| "dist/fonts/glyphicons-halflings-regular.svg", | |||||
| "dist/fonts/glyphicons-halflings-regular.ttf", | |||||
| "dist/fonts/glyphicons-halflings-regular.woff", | |||||
| "dist/fonts/glyphicons-halflings-regular.woff2", | |||||
| "dist/js/bootstrap.js", | |||||
| "dist/js/bootstrap.min.js", | |||||
| "fonts/glyphicons-halflings-regular.eot", | |||||
| "fonts/glyphicons-halflings-regular.svg", | |||||
| "fonts/glyphicons-halflings-regular.ttf", | |||||
| "fonts/glyphicons-halflings-regular.woff", | |||||
| "fonts/glyphicons-halflings-regular.woff2" | |||||
| ], | |||||
| "library": "bootstrap@3.3.7", | |||||
| "provider": "unpkg" | |||||
| }, | |||||
| { | |||||
| "destination": "wwwroot/lib/jquery", | |||||
| "files": [ | |||||
| "jquery.js", | |||||
| "jquery.min.js", | |||||
| "jquery.min.map" | |||||
| ], | |||||
| "library": "jquery@2.2.0" | |||||
| }, | |||||
| { | |||||
| "destination": "wwwroot/lib/jquery-validation/", | |||||
| "files": [ | |||||
| "additional-methods.js", | |||||
| "additional-methods.min.js", | |||||
| "jquery.validate.js", | |||||
| "jquery.validate.min.js", | |||||
| "localization/messages_ar.js", | |||||
| "localization/messages_ar.min.js", | |||||
| "localization/messages_ar.min.js.map", | |||||
| "localization/messages_bg.js", | |||||
| "localization/messages_bg.min.js", | |||||
| "localization/messages_bg.min.js.map", | |||||
| "localization/messages_bn_BD.js", | |||||
| "localization/messages_bn_BD.min.js", | |||||
| "localization/messages_bn_BD.min.js.map", | |||||
| "localization/messages_ca.js", | |||||
| "localization/messages_ca.min.js", | |||||
| "localization/messages_ca.min.js.map", | |||||
| "localization/messages_cs.js", | |||||
| "localization/messages_cs.min.js", | |||||
| "localization/messages_cs.min.js.map", | |||||
| "localization/messages_da.js", | |||||
| "localization/messages_da.min.js", | |||||
| "localization/messages_da.min.js.map", | |||||
| "localization/messages_de.js", | |||||
| "localization/messages_de.min.js", | |||||
| "localization/messages_de.min.js.map", | |||||
| "localization/messages_el.js", | |||||
| "localization/messages_el.min.js", | |||||
| "localization/messages_el.min.js.map", | |||||
| "localization/messages_es.js", | |||||
| "localization/messages_es.min.js", | |||||
| "localization/messages_es.min.js.map", | |||||
| "localization/messages_es_AR.js", | |||||
| "localization/messages_es_AR.min.js", | |||||
| "localization/messages_es_AR.min.js.map", | |||||
| "localization/messages_es_PE.js", | |||||
| "localization/messages_es_PE.min.js", | |||||
| "localization/messages_es_PE.min.js.map", | |||||
| "localization/messages_et.js", | |||||
| "localization/messages_et.min.js", | |||||
| "localization/messages_et.min.js.map", | |||||
| "localization/messages_eu.js", | |||||
| "localization/messages_eu.min.js", | |||||
| "localization/messages_eu.min.js.map", | |||||
| "localization/messages_fa.js", | |||||
| "localization/messages_fa.min.js", | |||||
| "localization/messages_fa.min.js.map", | |||||
| "localization/messages_fi.js", | |||||
| "localization/messages_fi.min.js", | |||||
| "localization/messages_fi.min.js.map", | |||||
| "localization/messages_fr.js", | |||||
| "localization/messages_fr.min.js", | |||||
| "localization/messages_fr.min.js.map", | |||||
| "localization/messages_ge.js", | |||||
| "localization/messages_ge.min.js", | |||||
| "localization/messages_ge.min.js.map", | |||||
| "localization/messages_gl.js", | |||||
| "localization/messages_gl.min.js", | |||||
| "localization/messages_gl.min.js.map", | |||||
| "localization/messages_he.js", | |||||
| "localization/messages_he.min.js", | |||||
| "localization/messages_he.min.js.map", | |||||
| "localization/messages_hr.js", | |||||
| "localization/messages_hr.min.js", | |||||
| "localization/messages_hr.min.js.map", | |||||
| "localization/messages_hu.js", | |||||
| "localization/messages_hu.min.js", | |||||
| "localization/messages_hu.min.js.map", | |||||
| "localization/messages_hy_AM.js", | |||||
| "localization/messages_hy_AM.min.js", | |||||
| "localization/messages_hy_AM.min.js.map", | |||||
| "localization/messages_id.js", | |||||
| "localization/messages_id.min.js", | |||||
| "localization/messages_id.min.js.map", | |||||
| "localization/messages_is.js", | |||||
| "localization/messages_is.min.js", | |||||
| "localization/messages_is.min.js.map", | |||||
| "localization/messages_it.js", | |||||
| "localization/messages_it.min.js", | |||||
| "localization/messages_it.min.js.map", | |||||
| "localization/messages_ja.js", | |||||
| "localization/messages_ja.min.js", | |||||
| "localization/messages_ja.min.js.map", | |||||
| "localization/messages_ka.js", | |||||
| "localization/messages_ka.min.js", | |||||
| "localization/messages_ka.min.js.map", | |||||
| "localization/messages_kk.js", | |||||
| "localization/messages_kk.min.js", | |||||
| "localization/messages_kk.min.js.map", | |||||
| "localization/messages_ko.js", | |||||
| "localization/messages_ko.min.js", | |||||
| "localization/messages_ko.min.js.map", | |||||
| "localization/messages_lt.js", | |||||
| "localization/messages_lt.min.js", | |||||
| "localization/messages_lt.min.js.map", | |||||
| "localization/messages_lv.js", | |||||
| "localization/messages_lv.min.js", | |||||
| "localization/messages_lv.min.js.map", | |||||
| "localization/messages_my.js", | |||||
| "localization/messages_my.min.js", | |||||
| "localization/messages_my.min.js.map", | |||||
| "localization/messages_nl.js", | |||||
| "localization/messages_nl.min.js", | |||||
| "localization/messages_nl.min.js.map", | |||||
| "localization/messages_no.js", | |||||
| "localization/messages_no.min.js", | |||||
| "localization/messages_no.min.js.map", | |||||
| "localization/messages_pl.js", | |||||
| "localization/messages_pl.min.js", | |||||
| "localization/messages_pl.min.js.map", | |||||
| "localization/messages_pt_BR.js", | |||||
| "localization/messages_pt_BR.min.js", | |||||
| "localization/messages_pt_BR.min.js.map", | |||||
| "localization/messages_pt_PT.js", | |||||
| "localization/messages_pt_PT.min.js", | |||||
| "localization/messages_pt_PT.min.js.map", | |||||
| "localization/messages_ro.js", | |||||
| "localization/messages_ro.min.js", | |||||
| "localization/messages_ro.min.js.map", | |||||
| "localization/messages_ru.js", | |||||
| "localization/messages_ru.min.js", | |||||
| "localization/messages_ru.min.js.map", | |||||
| "localization/messages_si.js", | |||||
| "localization/messages_si.min.js", | |||||
| "localization/messages_si.min.js.map", | |||||
| "localization/messages_sk.js", | |||||
| "localization/messages_sk.min.js", | |||||
| "localization/messages_sk.min.js.map", | |||||
| "localization/messages_sl.js", | |||||
| "localization/messages_sl.min.js", | |||||
| "localization/messages_sl.min.js.map", | |||||
| "localization/messages_sr.js", | |||||
| "localization/messages_sr.min.js", | |||||
| "localization/messages_sr.min.js.map", | |||||
| "localization/messages_sr_lat.js", | |||||
| "localization/messages_sr_lat.min.js", | |||||
| "localization/messages_sr_lat.min.js.map", | |||||
| "localization/messages_sv.js", | |||||
| "localization/messages_sv.min.js", | |||||
| "localization/messages_sv.min.js.map", | |||||
| "localization/messages_th.js", | |||||
| "localization/messages_th.min.js", | |||||
| "localization/messages_th.min.js.map", | |||||
| "localization/messages_tj.js", | |||||
| "localization/messages_tj.min.js", | |||||
| "localization/messages_tj.min.js.map", | |||||
| "localization/messages_tr.js", | |||||
| "localization/messages_tr.min.js", | |||||
| "localization/messages_tr.min.js.map", | |||||
| "localization/messages_uk.js", | |||||
| "localization/messages_uk.min.js", | |||||
| "localization/messages_uk.min.js.map", | |||||
| "localization/messages_vi.js", | |||||
| "localization/messages_vi.min.js", | |||||
| "localization/messages_vi.min.js.map", | |||||
| "localization/messages_zh.js", | |||||
| "localization/messages_zh.min.js", | |||||
| "localization/messages_zh.min.js.map", | |||||
| "localization/messages_zh_TW.js", | |||||
| "localization/messages_zh_TW.min.js", | |||||
| "localization/messages_zh_TW.min.js.map", | |||||
| "localization/methods_de.js", | |||||
| "localization/methods_de.min.js", | |||||
| "localization/methods_de.min.js.map", | |||||
| "localization/methods_es_CL.js", | |||||
| "localization/methods_es_CL.min.js", | |||||
| "localization/methods_es_CL.min.js.map", | |||||
| "localization/methods_fi.js", | |||||
| "localization/methods_fi.min.js", | |||||
| "localization/methods_fi.min.js.map", | |||||
| "localization/methods_nl.js", | |||||
| "localization/methods_nl.min.js", | |||||
| "localization/methods_nl.min.js.map", | |||||
| "localization/methods_pt.js", | |||||
| "localization/methods_pt.min.js", | |||||
| "localization/methods_pt.min.js.map" | |||||
| ], | |||||
| "library": "jquery-validate@1.14.0" | |||||
| }, | |||||
| { | |||||
| "destination": "wwwroot/lib/jquery-validation-unobtrusive", | |||||
| "files": [ "jquery.validate.unobtrusive.js", "jquery.validate.unobtrusive.min.js" ], | |||||
| "library": "jquery-validation-unobtrusive@3.2.6" | |||||
| } | |||||
| ], | |||||
| "version": "1.0" | |||||
| } | |||||
+ 0
- 45
src/Services/Identity/Identity.API/wwwroot/lib/bootstrap/.bower.json
View File
| @ -1,45 +0,0 @@ | |||||
| { | |||||
| "name": "bootstrap", | |||||
| "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", | |||||
| "keywords": [ | |||||
| "css", | |||||
| "js", | |||||
| "less", | |||||
| "mobile-first", | |||||
| "responsive", | |||||
| "front-end", | |||||
| "framework", | |||||
| "web" | |||||
| ], | |||||
| "homepage": "http://getbootstrap.com", | |||||
| "license": "MIT", | |||||
| "moduleType": "globals", | |||||
| "main": [ | |||||
| "less/bootstrap.less", | |||||
| "dist/js/bootstrap.js" | |||||
| ], | |||||
| "ignore": [ | |||||
| "/.*", | |||||
| "_config.yml", | |||||
| "CNAME", | |||||
| "composer.json", | |||||
| "CONTRIBUTING.md", | |||||
| "docs", | |||||
| "js/tests", | |||||
| "test-infra" | |||||
| ], | |||||
| "dependencies": { | |||||
| "jquery": "1.9.1 - 3" | |||||
| }, | |||||
| "version": "3.3.7", | |||||
| "_release": "3.3.7", | |||||
| "_resolution": { | |||||
| "type": "version", | |||||
| "tag": "v3.3.7", | |||||
| "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86" | |||||
| }, | |||||
| "_source": "https://github.com/twbs/bootstrap.git", | |||||
| "_target": "v3.3.7", | |||||
| "_originalSource": "bootstrap", | |||||
| "_direct": true | |||||
| } | |||||
+ 0
- 21
src/Services/Identity/Identity.API/wwwroot/lib/bootstrap/LICENSE
View File
| @ -1,21 +0,0 @@ | |||||
| The MIT License (MIT) | |||||
| Copyright (c) 2011-2016 Twitter, Inc. | |||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | |||||
| of this software and associated documentation files (the "Software"), to deal | |||||
| in the Software without restriction, including without limitation the rights | |||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |||||
| copies of the Software, and to permit persons to whom the Software is | |||||
| furnished to do so, subject to the following conditions: | |||||
| The above copyright notice and this permission notice shall be included in | |||||
| all copies or substantial portions of the Software. | |||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |||||
| THE SOFTWARE. | |||||
+ 0
- 13
src/Services/Identity/Identity.API/wwwroot/lib/bootstrap/dist/js/npm.js
View File
| @ -1,13 +0,0 @@ | |||||
| // This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment. | |||||
| require('../../js/transition.js') | |||||
| require('../../js/alert.js') | |||||
| require('../../js/button.js') | |||||
| require('../../js/carousel.js') | |||||
| require('../../js/collapse.js') | |||||
| require('../../js/dropdown.js') | |||||
| require('../../js/modal.js') | |||||
| require('../../js/tooltip.js') | |||||
| require('../../js/popover.js') | |||||
| require('../../js/scrollspy.js') | |||||
| require('../../js/tab.js') | |||||
| require('../../js/affix.js') | |||||
+ 0
- 44
src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation-unobtrusive/.bower.json
View File
| @ -1,44 +0,0 @@ | |||||
| { | |||||
| "name": "jquery-validation-unobtrusive", | |||||
| "version": "3.2.6", | |||||
| "homepage": "https://github.com/aspnet/jquery-validation-unobtrusive", | |||||
| "description": "Add-on to jQuery Validation to enable unobtrusive validation options in data-* attributes.", | |||||
| "main": [ | |||||
| "jquery.validate.unobtrusive.js" | |||||
| ], | |||||
| "ignore": [ | |||||
| "**/.*", | |||||
| "*.json", | |||||
| "*.md", | |||||
| "*.txt", | |||||
| "gulpfile.js" | |||||
| ], | |||||
| "keywords": [ | |||||
| "jquery", | |||||
| "asp.net", | |||||
| "mvc", | |||||
| "validation", | |||||
| "unobtrusive" | |||||
| ], | |||||
| "authors": [ | |||||
| "Microsoft" | |||||
| ], | |||||
| "license": "http://www.microsoft.com/web/webpi/eula/net_library_eula_enu.htm", | |||||
| "repository": { | |||||
| "type": "git", | |||||
| "url": "git://github.com/aspnet/jquery-validation-unobtrusive.git" | |||||
| }, | |||||
| "dependencies": { | |||||
| "jquery-validation": ">=1.8", | |||||
| "jquery": ">=1.8" | |||||
| }, | |||||
| "_release": "3.2.6", | |||||
| "_resolution": { | |||||
| "type": "version", | |||||
| "tag": "v3.2.6", | |||||
| "commit": "13386cd1b5947d8a5d23a12b531ce3960be1eba7" | |||||
| }, | |||||
| "_source": "git://github.com/aspnet/jquery-validation-unobtrusive.git", | |||||
| "_target": "3.2.6", | |||||
| "_originalSource": "jquery-validation-unobtrusive" | |||||
| } | |||||
+ 1
- 5
src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
File diff suppressed because it is too large
View File
+ 0
- 40
src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/.bower.json
View File
| @ -1,40 +0,0 @@ | |||||
| { | |||||
| "name": "jquery-validation", | |||||
| "homepage": "http://jqueryvalidation.org/", | |||||
| "repository": { | |||||
| "type": "git", | |||||
| "url": "git://github.com/jzaefferer/jquery-validation.git" | |||||
| }, | |||||
| "authors": [ | |||||
| "Jörn Zaefferer <joern.zaefferer@gmail.com>" | |||||
| ], | |||||
| "description": "Form validation made easy", | |||||
| "main": "dist/jquery.validate.js", | |||||
| "keywords": [ | |||||
| "forms", | |||||
| "validation", | |||||
| "validate" | |||||
| ], | |||||
| "license": "MIT", | |||||
| "ignore": [ | |||||
| "**/.*", | |||||
| "node_modules", | |||||
| "bower_components", | |||||
| "test", | |||||
| "demo", | |||||
| "lib" | |||||
| ], | |||||
| "dependencies": { | |||||
| "jquery": ">= 1.7.2" | |||||
| }, | |||||
| "version": "1.14.0", | |||||
| "_release": "1.14.0", | |||||
| "_resolution": { | |||||
| "type": "version", | |||||
| "tag": "1.14.0", | |||||
| "commit": "c1343fb9823392aa9acbe1c3ffd337b8c92fed48" | |||||
| }, | |||||
| "_source": "git://github.com/jzaefferer/jquery-validation.git", | |||||
| "_target": ">=1.8", | |||||
| "_originalSource": "jquery-validation" | |||||
| } | |||||
+ 0
- 22
src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/LICENSE.md
View File
| @ -1,22 +0,0 @@ | |||||
| The MIT License (MIT) | |||||
| ===================== | |||||
| Copyright Jörn Zaefferer | |||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | |||||
| of this software and associated documentation files (the "Software"), to deal | |||||
| in the Software without restriction, including without limitation the rights | |||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |||||
| copies of the Software, and to permit persons to whom the Software is | |||||
| furnished to do so, subject to the following conditions: | |||||
| The above copyright notice and this permission notice shall be included in | |||||
| all copies or substantial portions of the Software. | |||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |||||
| THE SOFTWARE. | |||||
+ 0
- 998
src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/dist/additional-methods.js
View File
| @ -1,998 +0,0 @@ | |||||
| /*! | |||||
| * jQuery Validation Plugin v1.14.0 | |||||
| * | |||||
| * http://jqueryvalidation.org/ | |||||
| * | |||||
| * Copyright (c) 2015 Jörn Zaefferer | |||||
| * Released under the MIT license | |||||
| */ | |||||
| (function( factory ) { | |||||
| if ( typeof define === "function" && define.amd ) { | |||||
| define( ["jquery", "./jquery.validate"], factory ); | |||||
| } else { | |||||
| factory( jQuery ); | |||||
| } | |||||
| }(function( $ ) { | |||||
| (function() { | |||||
| function stripHtml(value) { | |||||
| // remove html tags and space chars | |||||
| return value.replace(/<.[^<>]*?>/g, " ").replace(/ | /gi, " ") | |||||
| // remove punctuation | |||||
| .replace(/[.(),;:!?%#$'\"_+=\/\-“”’]*/g, ""); | |||||
| } | |||||
| $.validator.addMethod("maxWords", function(value, element, params) { | |||||
| return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length <= params; | |||||
| }, $.validator.format("Please enter {0} words or less.")); | |||||
| $.validator.addMethod("minWords", function(value, element, params) { | |||||
| return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params; | |||||
| }, $.validator.format("Please enter at least {0} words.")); | |||||
| $.validator.addMethod("rangeWords", function(value, element, params) { | |||||
| var valueStripped = stripHtml(value), | |||||
| regex = /\b\w+\b/g; | |||||
| return this.optional(element) || valueStripped.match(regex).length >= params[0] && valueStripped.match(regex).length <= params[1]; | |||||
| }, $.validator.format("Please enter between {0} and {1} words.")); | |||||
| }()); | |||||
| // Accept a value from a file input based on a required mimetype | |||||
| $.validator.addMethod("accept", function(value, element, param) { | |||||
| // Split mime on commas in case we have multiple types we can accept | |||||
| var typeParam = typeof param === "string" ? param.replace(/\s/g, "").replace(/,/g, "|") : "image/*", | |||||
| optionalValue = this.optional(element), | |||||
| i, file; | |||||
| // Element is optional | |||||
| if (optionalValue) { | |||||
| return optionalValue; | |||||
| } | |||||
| if ($(element).attr("type") === "file") { | |||||
| // If we are using a wildcard, make it regex friendly | |||||
| typeParam = typeParam.replace(/\*/g, ".*"); | |||||
| // Check if the element has a FileList before checking each file | |||||
| if (element.files && element.files.length) { | |||||
| for (i = 0; i < element.files.length; i++) { | |||||
| file = element.files[i]; | |||||
| // Grab the mimetype from the loaded file, verify it matches | |||||
| if (!file.type.match(new RegExp( "\\.?(" + typeParam + ")$", "i"))) { | |||||
| return false; | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
| // Either return true because we've validated each file, or because the | |||||
| // browser does not support element.files and the FileList feature | |||||
| return true; | |||||
| }, $.validator.format("Please enter a value with a valid mimetype.")); | |||||
| $.validator.addMethod("alphanumeric", function(value, element) { | |||||
| return this.optional(element) || /^\w+$/i.test(value); | |||||
| }, "Letters, numbers, and underscores only please"); | |||||
| /* | |||||
| * Dutch bank account numbers (not 'giro' numbers) have 9 digits | |||||
| * and pass the '11 check'. | |||||
| * We accept the notation with spaces, as that is common. | |||||
| * acceptable: 123456789 or 12 34 56 789 | |||||
| */ | |||||
| $.validator.addMethod("bankaccountNL", function(value, element) { | |||||
| if (this.optional(element)) { | |||||
| return true; | |||||
| } | |||||
| if (!(/^[0-9]{9}|([0-9]{2} ){3}[0-9]{3}$/.test(value))) { | |||||
| return false; | |||||
| } | |||||
| // now '11 check' | |||||
| var account = value.replace(/ /g, ""), // remove spaces | |||||
| sum = 0, | |||||
| len = account.length, | |||||
| pos, factor, digit; | |||||
| for ( pos = 0; pos < len; pos++ ) { | |||||
| factor = len - pos; | |||||
| digit = account.substring(pos, pos + 1); | |||||
| sum = sum + factor * digit; | |||||
| } | |||||
| return sum % 11 === 0; | |||||
| }, "Please specify a valid bank account number"); | |||||
| $.validator.addMethod("bankorgiroaccountNL", function(value, element) { | |||||
| return this.optional(element) || | |||||
| ($.validator.methods.bankaccountNL.call(this, value, element)) || | |||||
| ($.validator.methods.giroaccountNL.call(this, value, element)); | |||||
| }, "Please specify a valid bank or giro account number"); | |||||
| /** | |||||
| * BIC is the business identifier code (ISO 9362). This BIC check is not a guarantee for authenticity. | |||||
| * | |||||
| * BIC pattern: BBBBCCLLbbb (8 or 11 characters long; bbb is optional) | |||||
| * | |||||
| * BIC definition in detail: | |||||
| * - First 4 characters - bank code (only letters) | |||||
| * - Next 2 characters - ISO 3166-1 alpha-2 country code (only letters) | |||||
| * - Next 2 characters - location code (letters and digits) | |||||
| * a. shall not start with '0' or '1' | |||||
| * b. second character must be a letter ('O' is not allowed) or one of the following digits ('0' for test (therefore not allowed), '1' for passive participant and '2' for active participant) | |||||
| * - Last 3 characters - branch code, optional (shall not start with 'X' except in case of 'XXX' for primary office) (letters and digits) | |||||
| */ | |||||
| $.validator.addMethod("bic", function(value, element) { | |||||
| return this.optional( element ) || /^([A-Z]{6}[A-Z2-9][A-NP-Z1-2])(X{3}|[A-WY-Z0-9][A-Z0-9]{2})?$/.test( value ); | |||||
| }, "Please specify a valid BIC code"); | |||||
| /* | |||||
| * Código de identificación fiscal ( CIF ) is the tax identification code for Spanish legal entities | |||||
| * Further rules can be found in Spanish on http://es.wikipedia.org/wiki/C%C3%B3digo_de_identificaci%C3%B3n_fiscal | |||||
| */ | |||||
| $.validator.addMethod( "cifES", function( value ) { | |||||
| "use strict"; | |||||
| var num = [], | |||||
| controlDigit, sum, i, count, tmp, secondDigit; | |||||
| value = value.toUpperCase(); | |||||
| // Quick format test | |||||
| if ( !value.match( "((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)" ) ) { | |||||
| return false; | |||||
| } | |||||
| for ( i = 0; i < 9; i++ ) { | |||||
| num[ i ] = parseInt( value.charAt( i ), 10 ); | |||||
| } | |||||
| // Algorithm for checking CIF codes | |||||
| sum = num[ 2 ] + num[ 4 ] + num[ 6 ]; | |||||
| for ( count = 1; count < 8; count += 2 ) { | |||||
| tmp = ( 2 * num[ count ] ).toString(); | |||||
| secondDigit = tmp.charAt( 1 ); | |||||
| sum += parseInt( tmp.charAt( 0 ), 10 ) + ( secondDigit === "" ? 0 : parseInt( secondDigit, 10 ) ); | |||||
| } | |||||
| /* The first (position 1) is a letter following the following criteria: | |||||
| * A. Corporations | |||||
| * B. LLCs | |||||
| * C. General partnerships | |||||
| * D. Companies limited partnerships | |||||
| * E. Communities of goods | |||||
| * F. Cooperative Societies | |||||
| * G. Associations | |||||
| * H. Communities of homeowners in horizontal property regime | |||||
| * J. Civil Societies | |||||
| * K. Old format | |||||
| * L. Old format | |||||
| * M. Old format | |||||
| * N. Nonresident entities | |||||
| * P. Local authorities | |||||
| * Q. Autonomous bodies, state or not, and the like, and congregations and religious institutions | |||||
| * R. Congregations and religious institutions (since 2008 ORDER EHA/451/2008) | |||||
| * S. Organs of State Administration and regions | |||||
| * V. Agrarian Transformation | |||||
| * W. Permanent establishments of non-resident in Spain | |||||
| */ | |||||
| if ( /^[ABCDEFGHJNPQRSUVW]{1}/.test( value ) ) { | |||||
| sum += ""; | |||||
| controlDigit = 10 - parseInt( sum.charAt( sum.length - 1 ), 10 ); | |||||
| value += controlDigit; | |||||
| return ( num[ 8 ].toString() === String.fromCharCode( 64 + controlDigit ) || num[ 8 ].toString() === value.charAt( value.length - 1 ) ); | |||||
| } | |||||
| return false; | |||||
| }, "Please specify a valid CIF number." ); | |||||
| /* | |||||
| * Brazillian CPF number (Cadastrado de Pessoas Físicas) is the equivalent of a Brazilian tax registration number. | |||||
| * CPF numbers have 11 digits in total: 9 numbers followed by 2 check numbers that are being used for validation. | |||||
| */ | |||||
| $.validator.addMethod("cpfBR", function(value) { | |||||
| // Removing special characters from value | |||||
| value = value.replace(/([~!@#$%^&*()_+=`{}\[\]\-|\\:;'<>,.\/? ])+/g, ""); | |||||
| // Checking value to have 11 digits only | |||||
| if (value.length !== 11) { | |||||
| return false; | |||||
| } | |||||
| var sum = 0, | |||||
| firstCN, secondCN, checkResult, i; | |||||
| firstCN = parseInt(value.substring(9, 10), 10); | |||||
| secondCN = parseInt(value.substring(10, 11), 10); | |||||
| checkResult = function(sum, cn) { | |||||
| var result = (sum * 10) % 11; | |||||
| if ((result === 10) || (result === 11)) {result = 0;} | |||||
| return (result === cn); | |||||
| }; | |||||
| // Checking for dump data | |||||
| if (value === "" || | |||||
| value === "00000000000" || | |||||
| value === "11111111111" || | |||||
| value === "22222222222" || | |||||
| value === "33333333333" || | |||||
| value === "44444444444" || | |||||
| value === "55555555555" || | |||||
| value === "66666666666" || | |||||
| value === "77777777777" || | |||||
| value === "88888888888" || | |||||
| value === "99999999999" | |||||
| ) { | |||||
| return false; | |||||
| } | |||||
| // Step 1 - using first Check Number: | |||||
| for ( i = 1; i <= 9; i++ ) { | |||||
| sum = sum + parseInt(value.substring(i - 1, i), 10) * (11 - i); | |||||
| } | |||||
| // If first Check Number (CN) is valid, move to Step 2 - using second Check Number: | |||||
| if ( checkResult(sum, firstCN) ) { | |||||
| sum = 0; | |||||
| for ( i = 1; i <= 10; i++ ) { | |||||
| sum = sum + parseInt(value.substring(i - 1, i), 10) * (12 - i); | |||||
| } | |||||
| return checkResult(sum, secondCN); | |||||
| } | |||||
| return false; | |||||
| }, "Please specify a valid CPF number"); | |||||
| /* NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator | |||||
| * Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0 | |||||
| * Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings) | |||||
| */ | |||||
| $.validator.addMethod("creditcardtypes", function(value, element, param) { | |||||
| if (/[^0-9\-]+/.test(value)) { | |||||
| return false; | |||||
| } | |||||
| value = value.replace(/\D/g, ""); | |||||
| var validTypes = 0x0000; | |||||
| if (param.mastercard) { | |||||
| validTypes |= 0x0001; | |||||
| } | |||||
| if (param.visa) { | |||||
| validTypes |= 0x0002; | |||||
| } | |||||
| if (param.amex) { | |||||
| validTypes |= 0x0004; | |||||
| } | |||||
| if (param.dinersclub) { | |||||
| validTypes |= 0x0008; | |||||
| } | |||||
| if (param.enroute) { | |||||
| validTypes |= 0x0010; | |||||
| } | |||||
| if (param.discover) { | |||||
| validTypes |= 0x0020; | |||||
| } | |||||
| if (param.jcb) { | |||||
| validTypes |= 0x0040; | |||||
| } | |||||
| if (param.unknown) { | |||||
| validTypes |= 0x0080; | |||||
| } | |||||
| if (param.all) { | |||||
| validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080; | |||||
| } | |||||
| if (validTypes & 0x0001 && /^(5[12345])/.test(value)) { //mastercard | |||||
| return value.length === 16; | |||||
| } | |||||
| if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa | |||||
| return value.length === 16; | |||||
| } | |||||
| if (validTypes & 0x0004 && /^(3[47])/.test(value)) { //amex | |||||
| return value.length === 15; | |||||
| } | |||||
| if (validTypes & 0x0008 && /^(3(0[012345]|[68]))/.test(value)) { //dinersclub | |||||
| return value.length === 14; | |||||
| } | |||||
| if (validTypes & 0x0010 && /^(2(014|149))/.test(value)) { //enroute | |||||
| return value.length === 15; | |||||
| } | |||||
| if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover | |||||
| return value.length === 16; | |||||
| } | |||||
| if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb | |||||
| return value.length === 16; | |||||
| } | |||||
| if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb | |||||
| return value.length === 15; | |||||
| } | |||||
| if (validTypes & 0x0080) { //unknown | |||||
| return true; | |||||
| } | |||||
| return false; | |||||
| }, "Please enter a valid credit card number."); | |||||
| /** | |||||
| * Validates currencies with any given symbols by @jameslouiz | |||||
| * Symbols can be optional or required. Symbols required by default | |||||
| * | |||||
| * Usage examples: | |||||
| * currency: ["£", false] - Use false for soft currency validation | |||||
| * currency: ["$", false] | |||||
| * currency: ["RM", false] - also works with text based symbols such as "RM" - Malaysia Ringgit etc | |||||
| * | |||||
| * <input class="currencyInput" name="currencyInput"> | |||||
| * | |||||
| * Soft symbol checking | |||||
| * currencyInput: { | |||||
| * currency: ["$", false] | |||||
| * } | |||||
| * | |||||
| * Strict symbol checking (default) | |||||
| * currencyInput: { | |||||
| * currency: "$" | |||||
| * //OR | |||||
| * currency: ["$", true] | |||||
| * } | |||||
| * | |||||
| * Multiple Symbols | |||||
| * currencyInput: { | |||||
| * currency: "$,£,¢" | |||||
| * } | |||||
| */ | |||||
| $.validator.addMethod("currency", function(value, element, param) { | |||||
| var isParamString = typeof param === "string", | |||||
| symbol = isParamString ? param : param[0], | |||||
| soft = isParamString ? true : param[1], | |||||
| regex; | |||||
| symbol = symbol.replace(/,/g, ""); | |||||
| symbol = soft ? symbol + "]" : symbol + "]?"; | |||||
| regex = "^[" + symbol + "([1-9]{1}[0-9]{0,2}(\\,[0-9]{3})*(\\.[0-9]{0,2})?|[1-9]{1}[0-9]{0,}(\\.[0-9]{0,2})?|0(\\.[0-9]{0,2})?|(\\.[0-9]{1,2})?)$"; | |||||
| regex = new RegExp(regex); | |||||
| return this.optional(element) || regex.test(value); | |||||
| }, "Please specify a valid currency"); | |||||
| $.validator.addMethod("dateFA", function(value, element) { | |||||
| return this.optional(element) || /^[1-4]\d{3}\/((0?[1-6]\/((3[0-1])|([1-2][0-9])|(0?[1-9])))|((1[0-2]|(0?[7-9]))\/(30|([1-2][0-9])|(0?[1-9]))))$/.test(value); | |||||
| }, $.validator.messages.date); | |||||
| /** | |||||
| * Return true, if the value is a valid date, also making this formal check dd/mm/yyyy. | |||||
| * | |||||
| * @example $.validator.methods.date("01/01/1900") | |||||
| * @result true | |||||
| * | |||||
| * @example $.validator.methods.date("01/13/1990") | |||||
| * @result false | |||||
| * | |||||
| * @example $.validator.methods.date("01.01.1900") | |||||
| * @result false | |||||
| * | |||||
| * @example <input name="pippo" class="{dateITA:true}" /> | |||||
| * @desc Declares an optional input element whose value must be a valid date. | |||||
| * | |||||
| * @name $.validator.methods.dateITA | |||||
| * @type Boolean | |||||
| * @cat Plugins/Validate/Methods | |||||
| */ | |||||
| $.validator.addMethod("dateITA", function(value, element) { | |||||
| var check = false, | |||||
| re = /^\d{1,2}\/\d{1,2}\/\d{4}$/, | |||||
| adata, gg, mm, aaaa, xdata; | |||||
| if ( re.test(value)) { | |||||
| adata = value.split("/"); | |||||
| gg = parseInt(adata[0], 10); | |||||
| mm = parseInt(adata[1], 10); | |||||
| aaaa = parseInt(adata[2], 10); | |||||
| xdata = new Date(Date.UTC(aaaa, mm - 1, gg, 12, 0, 0, 0)); | |||||
| if ( ( xdata.getUTCFullYear() === aaaa ) && ( xdata.getUTCMonth () === mm - 1 ) && ( xdata.getUTCDate() === gg ) ) { | |||||
| check = true; | |||||
| } else { | |||||
| check = false; | |||||
| } | |||||
| } else { | |||||
| check = false; | |||||
| } | |||||
| return this.optional(element) || check; | |||||
| }, $.validator.messages.date); | |||||
| $.validator.addMethod("dateNL", function(value, element) { | |||||
| return this.optional(element) || /^(0?[1-9]|[12]\d|3[01])[\.\/\-](0?[1-9]|1[012])[\.\/\-]([12]\d)?(\d\d)$/.test(value); | |||||
| }, $.validator.messages.date); | |||||
| // Older "accept" file extension method. Old docs: http://docs.jquery.com/Plugins/Validation/Methods/accept | |||||
| $.validator.addMethod("extension", function(value, element, param) { | |||||
| param = typeof param === "string" ? param.replace(/,/g, "|") : "png|jpe?g|gif"; | |||||
| return this.optional(element) || value.match(new RegExp("\\.(" + param + ")$", "i")); | |||||
| }, $.validator.format("Please enter a value with a valid extension.")); | |||||
| /** | |||||
| * Dutch giro account numbers (not bank numbers) have max 7 digits | |||||
| */ | |||||
| $.validator.addMethod("giroaccountNL", function(value, element) { | |||||
| return this.optional(element) || /^[0-9]{1,7}$/.test(value); | |||||
| }, "Please specify a valid giro account number"); | |||||
| /** | |||||
| * IBAN is the international bank account number. | |||||
| * It has a country - specific format, that is checked here too | |||||
| */ | |||||
| $.validator.addMethod("iban", function(value, element) { | |||||
| // some quick simple tests to prevent needless work | |||||
| if (this.optional(element)) { | |||||
| return true; | |||||
| } | |||||
| // remove spaces and to upper case | |||||
| var iban = value.replace(/ /g, "").toUpperCase(), | |||||
| ibancheckdigits = "", | |||||
| leadingZeroes = true, | |||||
| cRest = "", | |||||
| cOperator = "", | |||||
| countrycode, ibancheck, charAt, cChar, bbanpattern, bbancountrypatterns, ibanregexp, i, p; | |||||
| // check the country code and find the country specific format | |||||
| countrycode = iban.substring(0, 2); | |||||
| bbancountrypatterns = { | |||||
| "AL": "\\d{8}[\\dA-Z]{16}", | |||||
| "AD": "\\d{8}[\\dA-Z]{12}", | |||||
| "AT": "\\d{16}", | |||||
| "AZ": "[\\dA-Z]{4}\\d{20}", | |||||
| "BE": "\\d{12}", | |||||
| "BH": "[A-Z]{4}[\\dA-Z]{14}", | |||||
| "BA": "\\d{16}", | |||||
| "BR": "\\d{23}[A-Z][\\dA-Z]", | |||||
| "BG": "[A-Z]{4}\\d{6}[\\dA-Z]{8}", | |||||
| "CR": "\\d{17}", | |||||
| "HR": "\\d{17}", | |||||
| "CY": "\\d{8}[\\dA-Z]{16}", | |||||
| "CZ": "\\d{20}", | |||||
| "DK": "\\d{14}", | |||||
| "DO": "[A-Z]{4}\\d{20}", | |||||
| "EE": "\\d{16}", | |||||
| "FO": "\\d{14}", | |||||
| "FI": "\\d{14}", | |||||
| "FR": "\\d{10}[\\dA-Z]{11}\\d{2}", | |||||
| "GE": "[\\dA-Z]{2}\\d{16}", | |||||
| "DE": "\\d{18}", | |||||
| "GI": "[A-Z]{4}[\\dA-Z]{15}", | |||||
| "GR": "\\d{7}[\\dA-Z]{16}", | |||||
| "GL": "\\d{14}", | |||||
| "GT": "[\\dA-Z]{4}[\\dA-Z]{20}", | |||||
| "HU": "\\d{24}", | |||||
| "IS": "\\d{22}", | |||||
| "IE": "[\\dA-Z]{4}\\d{14}", | |||||
| "IL": "\\d{19}", | |||||
| "IT": "[A-Z]\\d{10}[\\dA-Z]{12}", | |||||
| "KZ": "\\d{3}[\\dA-Z]{13}", | |||||
| "KW": "[A-Z]{4}[\\dA-Z]{22}", | |||||
| "LV": "[A-Z]{4}[\\dA-Z]{13}", | |||||
| "LB": "\\d{4}[\\dA-Z]{20}", | |||||
| "LI": "\\d{5}[\\dA-Z]{12}", | |||||
| "LT": "\\d{16}", | |||||
| "LU": "\\d{3}[\\dA-Z]{13}", | |||||
| "MK": "\\d{3}[\\dA-Z]{10}\\d{2}", | |||||
| "MT": "[A-Z]{4}\\d{5}[\\dA-Z]{18}", | |||||
| "MR": "\\d{23}", | |||||
| "MU": "[A-Z]{4}\\d{19}[A-Z]{3}", | |||||
| "MC": "\\d{10}[\\dA-Z]{11}\\d{2}", | |||||
| "MD": "[\\dA-Z]{2}\\d{18}", | |||||
| "ME": "\\d{18}", | |||||
| "NL": "[A-Z]{4}\\d{10}", | |||||
| "NO": "\\d{11}", | |||||
| "PK": "[\\dA-Z]{4}\\d{16}", | |||||
| "PS": "[\\dA-Z]{4}\\d{21}", | |||||
| "PL": "\\d{24}", | |||||
| "PT": "\\d{21}", | |||||
| "RO": "[A-Z]{4}[\\dA-Z]{16}", | |||||
| "SM": "[A-Z]\\d{10}[\\dA-Z]{12}", | |||||
| "SA": "\\d{2}[\\dA-Z]{18}", | |||||
| "RS": "\\d{18}", | |||||
| "SK": "\\d{20}", | |||||
| "SI": "\\d{15}", | |||||
| "ES": "\\d{20}", | |||||
| "SE": "\\d{20}", | |||||
| "CH": "\\d{5}[\\dA-Z]{12}", | |||||
| "TN": "\\d{20}", | |||||
| "TR": "\\d{5}[\\dA-Z]{17}", | |||||
| "AE": "\\d{3}\\d{16}", | |||||
| "GB": "[A-Z]{4}\\d{14}", | |||||
| "VG": "[\\dA-Z]{4}\\d{16}" | |||||
| }; | |||||
| bbanpattern = bbancountrypatterns[countrycode]; | |||||
| // As new countries will start using IBAN in the | |||||
| // future, we only check if the countrycode is known. | |||||
| // This prevents false negatives, while almost all | |||||
| // false positives introduced by this, will be caught | |||||
| // by the checksum validation below anyway. | |||||
| // Strict checking should return FALSE for unknown | |||||
| // countries. | |||||
| if (typeof bbanpattern !== "undefined") { | |||||
| ibanregexp = new RegExp("^[A-Z]{2}\\d{2}" + bbanpattern + "$", ""); | |||||
| if (!(ibanregexp.test(iban))) { | |||||
| return false; // invalid country specific format | |||||
| } | |||||
| } | |||||
| // now check the checksum, first convert to digits | |||||
| ibancheck = iban.substring(4, iban.length) + iban.substring(0, 4); | |||||
| for (i = 0; i < ibancheck.length; i++) { | |||||
| charAt = ibancheck.charAt(i); | |||||
| if (charAt !== "0") { | |||||
| leadingZeroes = false; | |||||
| } | |||||
| if (!leadingZeroes) { | |||||
| ibancheckdigits += "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(charAt); | |||||
| } | |||||
| } | |||||
| // calculate the result of: ibancheckdigits % 97 | |||||
| for (p = 0; p < ibancheckdigits.length; p++) { | |||||
| cChar = ibancheckdigits.charAt(p); | |||||
| cOperator = "" + cRest + "" + cChar; | |||||
| cRest = cOperator % 97; | |||||
| } | |||||
| return cRest === 1; | |||||
| }, "Please specify a valid IBAN"); | |||||
| $.validator.addMethod("integer", function(value, element) { | |||||
| return this.optional(element) || /^-?\d+$/.test(value); | |||||
| }, "A positive or negative non-decimal number please"); | |||||
| $.validator.addMethod("ipv4", function(value, element) { | |||||
| return this.optional(element) || /^(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)\.(25[0-5]|2[0-4]\d|[01]?\d\d?)$/i.test(value); | |||||
| }, "Please enter a valid IP v4 address."); | |||||
| $.validator.addMethod("ipv6", function(value, element) { | |||||
| return this.optional(element) || /^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$/i.test(value); | |||||
| }, "Please enter a valid IP v6 address."); | |||||
| $.validator.addMethod("lettersonly", function(value, element) { | |||||
| return this.optional(element) || /^[a-z]+$/i.test(value); | |||||
| }, "Letters only please"); | |||||
| $.validator.addMethod("letterswithbasicpunc", function(value, element) { | |||||
| return this.optional(element) || /^[a-z\-.,()'"\s]+$/i.test(value); | |||||
| }, "Letters or punctuation only please"); | |||||
| $.validator.addMethod("mobileNL", function(value, element) { | |||||
| return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)6((\s|\s?\-\s?)?[0-9]){8}$/.test(value); | |||||
| }, "Please specify a valid mobile number"); | |||||
| /* For UK phone functions, do the following server side processing: | |||||
| * Compare original input with this RegEx pattern: | |||||
| * ^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$ | |||||
| * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set $prefix to '0' | |||||
| * Extract $2 and remove hyphens, spaces and parentheses. Phone number is combined $prefix and $2. | |||||
| * A number of very detailed GB telephone number RegEx patterns can also be found at: | |||||
| * http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers | |||||
| */ | |||||
| $.validator.addMethod("mobileUK", function(phone_number, element) { | |||||
| phone_number = phone_number.replace(/\(|\)|\s+|-/g, ""); | |||||
| return this.optional(element) || phone_number.length > 9 && | |||||
| phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)7(?:[1345789]\d{2}|624)\s?\d{3}\s?\d{3})$/); | |||||
| }, "Please specify a valid mobile number"); | |||||
| /* | |||||
| * The número de identidad de extranjero ( NIE )is a code used to identify the non-nationals in Spain | |||||
| */ | |||||
| $.validator.addMethod( "nieES", function( value ) { | |||||
| "use strict"; | |||||
| value = value.toUpperCase(); | |||||
| // Basic format test | |||||
| if ( !value.match( "((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)" ) ) { | |||||
| return false; | |||||
| } | |||||
| // Test NIE | |||||
| //T | |||||
| if ( /^[T]{1}/.test( value ) ) { | |||||
| return ( value[ 8 ] === /^[T]{1}[A-Z0-9]{8}$/.test( value ) ); | |||||
| } | |||||
| //XYZ | |||||
| if ( /^[XYZ]{1}/.test( value ) ) { | |||||
| return ( | |||||
| value[ 8 ] === "TRWAGMYFPDXBNJZSQVHLCKE".charAt( | |||||
| value.replace( "X", "0" ) | |||||
| .replace( "Y", "1" ) | |||||
| .replace( "Z", "2" ) | |||||
| .substring( 0, 8 ) % 23 | |||||
| ) | |||||
| ); | |||||
| } | |||||
| return false; | |||||
| }, "Please specify a valid NIE number." ); | |||||
| /* | |||||
| * The Número de Identificación Fiscal ( NIF ) is the way tax identification used in Spain for individuals | |||||
| */ | |||||
| $.validator.addMethod( "nifES", function( value ) { | |||||
| "use strict"; | |||||
| value = value.toUpperCase(); | |||||
| // Basic format test | |||||
| if ( !value.match("((^[A-Z]{1}[0-9]{7}[A-Z0-9]{1}$|^[T]{1}[A-Z0-9]{8}$)|^[0-9]{8}[A-Z]{1}$)") ) { | |||||
| return false; | |||||
| } | |||||
| // Test NIF | |||||
| if ( /^[0-9]{8}[A-Z]{1}$/.test( value ) ) { | |||||
| return ( "TRWAGMYFPDXBNJZSQVHLCKE".charAt( value.substring( 8, 0 ) % 23 ) === value.charAt( 8 ) ); | |||||
| } | |||||
| // Test specials NIF (starts with K, L or M) | |||||
| if ( /^[KLM]{1}/.test( value ) ) { | |||||
| return ( value[ 8 ] === String.fromCharCode( 64 ) ); | |||||
| } | |||||
| return false; | |||||
| }, "Please specify a valid NIF number." ); | |||||
| jQuery.validator.addMethod( "notEqualTo", function( value, element, param ) { | |||||
| return this.optional(element) || !$.validator.methods.equalTo.call( this, value, element, param ); | |||||
| }, "Please enter a different value, values must not be the same." ); | |||||
| $.validator.addMethod("nowhitespace", function(value, element) { | |||||
| return this.optional(element) || /^\S+$/i.test(value); | |||||
| }, "No white space please"); | |||||
| /** | |||||
| * Return true if the field value matches the given format RegExp | |||||
| * | |||||
| * @example $.validator.methods.pattern("AR1004",element,/^AR\d{4}$/) | |||||
| * @result true | |||||
| * | |||||
| * @example $.validator.methods.pattern("BR1004",element,/^AR\d{4}$/) | |||||
| * @result false | |||||
| * | |||||
| * @name $.validator.methods.pattern | |||||
| * @type Boolean | |||||
| * @cat Plugins/Validate/Methods | |||||
| */ | |||||
| $.validator.addMethod("pattern", function(value, element, param) { | |||||
| if (this.optional(element)) { | |||||
| return true; | |||||
| } | |||||
| if (typeof param === "string") { | |||||
| param = new RegExp("^(?:" + param + ")$"); | |||||
| } | |||||
| return param.test(value); | |||||
| }, "Invalid format."); | |||||
| /** | |||||
| * Dutch phone numbers have 10 digits (or 11 and start with +31). | |||||
| */ | |||||
| $.validator.addMethod("phoneNL", function(value, element) { | |||||
| return this.optional(element) || /^((\+|00(\s|\s?\-\s?)?)31(\s|\s?\-\s?)?(\(0\)[\-\s]?)?|0)[1-9]((\s|\s?\-\s?)?[0-9]){8}$/.test(value); | |||||
| }, "Please specify a valid phone number."); | |||||
| /* For UK phone functions, do the following server side processing: | |||||
| * Compare original input with this RegEx pattern: | |||||
| * ^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$ | |||||
| * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set $prefix to '0' | |||||
| * Extract $2 and remove hyphens, spaces and parentheses. Phone number is combined $prefix and $2. | |||||
| * A number of very detailed GB telephone number RegEx patterns can also be found at: | |||||
| * http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers | |||||
| */ | |||||
| $.validator.addMethod("phoneUK", function(phone_number, element) { | |||||
| phone_number = phone_number.replace(/\(|\)|\s+|-/g, ""); | |||||
| return this.optional(element) || phone_number.length > 9 && | |||||
| phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?)|(?:\(?0))(?:\d{2}\)?\s?\d{4}\s?\d{4}|\d{3}\)?\s?\d{3}\s?\d{3,4}|\d{4}\)?\s?(?:\d{5}|\d{3}\s?\d{3})|\d{5}\)?\s?\d{4,5})$/); | |||||
| }, "Please specify a valid phone number"); | |||||
| /** | |||||
| * matches US phone number format | |||||
| * | |||||
| * where the area code may not start with 1 and the prefix may not start with 1 | |||||
| * allows '-' or ' ' as a separator and allows parens around area code | |||||
| * some people may want to put a '1' in front of their number | |||||
| * | |||||
| * 1(212)-999-2345 or | |||||
| * 212 999 2344 or | |||||
| * 212-999-0983 | |||||
| * | |||||
| * but not | |||||
| * 111-123-5434 | |||||
| * and not | |||||
| * 212 123 4567 | |||||
| */ | |||||
| $.validator.addMethod("phoneUS", function(phone_number, element) { | |||||
| phone_number = phone_number.replace(/\s+/g, ""); | |||||
| return this.optional(element) || phone_number.length > 9 && | |||||
| phone_number.match(/^(\+?1-?)?(\([2-9]([02-9]\d|1[02-9])\)|[2-9]([02-9]\d|1[02-9]))-?[2-9]([02-9]\d|1[02-9])-?\d{4}$/); | |||||
| }, "Please specify a valid phone number"); | |||||
| /* For UK phone functions, do the following server side processing: | |||||
| * Compare original input with this RegEx pattern: | |||||
| * ^\(?(?:(?:00\)?[\s\-]?\(?|\+)(44)\)?[\s\-]?\(?(?:0\)?[\s\-]?\(?)?|0)([1-9]\d{1,4}\)?[\s\d\-]+)$ | |||||
| * Extract $1 and set $prefix to '+44<space>' if $1 is '44', otherwise set $prefix to '0' | |||||
| * Extract $2 and remove hyphens, spaces and parentheses. Phone number is combined $prefix and $2. | |||||
| * A number of very detailed GB telephone number RegEx patterns can also be found at: | |||||
| * http://www.aa-asterisk.org.uk/index.php/Regular_Expressions_for_Validating_and_Formatting_GB_Telephone_Numbers | |||||
| */ | |||||
| //Matches UK landline + mobile, accepting only 01-3 for landline or 07 for mobile to exclude many premium numbers | |||||
| $.validator.addMethod("phonesUK", function(phone_number, element) { | |||||
| phone_number = phone_number.replace(/\(|\)|\s+|-/g, ""); | |||||
| return this.optional(element) || phone_number.length > 9 && | |||||
| phone_number.match(/^(?:(?:(?:00\s?|\+)44\s?|0)(?:1\d{8,9}|[23]\d{9}|7(?:[1345789]\d{8}|624\d{6})))$/); | |||||
| }, "Please specify a valid uk phone number"); | |||||
| /** | |||||
| * Matches a valid Canadian Postal Code | |||||
| * | |||||
| * @example jQuery.validator.methods.postalCodeCA( "H0H 0H0", element ) | |||||
| * @result true | |||||
| * | |||||
| * @example jQuery.validator.methods.postalCodeCA( "H0H0H0", element ) | |||||
| * @result false | |||||
| * | |||||
| * @name jQuery.validator.methods.postalCodeCA | |||||
| * @type Boolean | |||||
| * @cat Plugins/Validate/Methods | |||||
| */ | |||||
| $.validator.addMethod( "postalCodeCA", function( value, element ) { | |||||
| return this.optional( element ) || /^[ABCEGHJKLMNPRSTVXY]\d[A-Z] \d[A-Z]\d$/.test( value ); | |||||
| }, "Please specify a valid postal code" ); | |||||
| /* | |||||
| * Valida CEPs do brasileiros: | |||||
| * | |||||
| * Formatos aceitos: | |||||
| * 99999-999 | |||||
| * 99.999-999 | |||||
| * 99999999 | |||||
| */ | |||||
| $.validator.addMethod("postalcodeBR", function(cep_value, element) { | |||||
| return this.optional(element) || /^\d{2}.\d{3}-\d{3}?$|^\d{5}-?\d{3}?$/.test( cep_value ); | |||||
| }, "Informe um CEP válido."); | |||||
| /* Matches Italian postcode (CAP) */ | |||||
| $.validator.addMethod("postalcodeIT", function(value, element) { | |||||
| return this.optional(element) || /^\d{5}$/.test(value); | |||||
| }, "Please specify a valid postal code"); | |||||
| $.validator.addMethod("postalcodeNL", function(value, element) { | |||||
| return this.optional(element) || /^[1-9][0-9]{3}\s?[a-zA-Z]{2}$/.test(value); | |||||
| }, "Please specify a valid postal code"); | |||||
| // Matches UK postcode. Does not match to UK Channel Islands that have their own postcodes (non standard UK) | |||||
| $.validator.addMethod("postcodeUK", function(value, element) { | |||||
| return this.optional(element) || /^((([A-PR-UWYZ][0-9])|([A-PR-UWYZ][0-9][0-9])|([A-PR-UWYZ][A-HK-Y][0-9])|([A-PR-UWYZ][A-HK-Y][0-9][0-9])|([A-PR-UWYZ][0-9][A-HJKSTUW])|([A-PR-UWYZ][A-HK-Y][0-9][ABEHMNPRVWXY]))\s?([0-9][ABD-HJLNP-UW-Z]{2})|(GIR)\s?(0AA))$/i.test(value); | |||||
| }, "Please specify a valid UK postcode"); | |||||
| /* | |||||
| * Lets you say "at least X inputs that match selector Y must be filled." | |||||
| * | |||||
| * The end result is that neither of these inputs: | |||||
| * | |||||
| * <input class="productinfo" name="partnumber"> | |||||
| * <input class="productinfo" name="description"> | |||||
| * | |||||
| * ...will validate unless at least one of them is filled. | |||||
| * | |||||
| * partnumber: {require_from_group: [1,".productinfo"]}, | |||||
| * description: {require_from_group: [1,".productinfo"]} | |||||
| * | |||||
| * options[0]: number of fields that must be filled in the group | |||||
| * options[1]: CSS selector that defines the group of conditionally required fields | |||||
| */ | |||||
| $.validator.addMethod("require_from_group", function(value, element, options) { | |||||
| var $fields = $(options[1], element.form), | |||||
| $fieldsFirst = $fields.eq(0), | |||||
| validator = $fieldsFirst.data("valid_req_grp") ? $fieldsFirst.data("valid_req_grp") : $.extend({}, this), | |||||
| isValid = $fields.filter(function() { | |||||
| return validator.elementValue(this); | |||||
| }).length >= options[0]; | |||||
| // Store the cloned validator for future validation | |||||
| $fieldsFirst.data("valid_req_grp", validator); | |||||
| // If element isn't being validated, run each require_from_group field's validation rules | |||||
| if (!$(element).data("being_validated")) { | |||||
| $fields.data("being_validated", true); | |||||
| $fields.each(function() { | |||||
| validator.element(this); | |||||
| }); | |||||
| $fields.data("being_validated", false); | |||||
| } | |||||
| return isValid; | |||||
| }, $.validator.format("Please fill at least {0} of these fields.")); | |||||
| /* | |||||
| * Lets you say "either at least X inputs that match selector Y must be filled, | |||||
| * OR they must all be skipped (left blank)." | |||||
| * | |||||
| * The end result, is that none of these inputs: | |||||
| * | |||||
| * <input class="productinfo" name="partnumber"> | |||||
| * <input class="productinfo" name="description"> | |||||
| * <input class="productinfo" name="color"> | |||||
| * | |||||
| * ...will validate unless either at least two of them are filled, | |||||
| * OR none of them are. | |||||
| * | |||||
| * partnumber: {skip_or_fill_minimum: [2,".productinfo"]}, | |||||
| * description: {skip_or_fill_minimum: [2,".productinfo"]}, | |||||
| * color: {skip_or_fill_minimum: [2,".productinfo"]} | |||||
| * | |||||
| * options[0]: number of fields that must be filled in the group | |||||
| * options[1]: CSS selector that defines the group of conditionally required fields | |||||
| * | |||||
| */ | |||||
| $.validator.addMethod("skip_or_fill_minimum", function(value, element, options) { | |||||
| var $fields = $(options[1], element.form), | |||||
| $fieldsFirst = $fields.eq(0), | |||||
| validator = $fieldsFirst.data("valid_skip") ? $fieldsFirst.data("valid_skip") : $.extend({}, this), | |||||
| numberFilled = $fields.filter(function() { | |||||
| return validator.elementValue(this); | |||||
| }).length, | |||||
| isValid = numberFilled === 0 || numberFilled >= options[0]; | |||||
| // Store the cloned validator for future validation | |||||
| $fieldsFirst.data("valid_skip", validator); | |||||
| // If element isn't being validated, run each skip_or_fill_minimum field's validation rules | |||||
| if (!$(element).data("being_validated")) { | |||||
| $fields.data("being_validated", true); | |||||
| $fields.each(function() { | |||||
| validator.element(this); | |||||
| }); | |||||
| $fields.data("being_validated", false); | |||||
| } | |||||
| return isValid; | |||||
| }, $.validator.format("Please either skip these fields or fill at least {0} of them.")); | |||||
| /* Validates US States and/or Territories by @jdforsythe | |||||
| * Can be case insensitive or require capitalization - default is case insensitive | |||||
| * Can include US Territories or not - default does not | |||||
| * Can include US Military postal abbreviations (AA, AE, AP) - default does not | |||||
| * | |||||
| * Note: "States" always includes DC (District of Colombia) | |||||
| * | |||||
| * Usage examples: | |||||
| * | |||||
| * This is the default - case insensitive, no territories, no military zones | |||||
| * stateInput: { | |||||
| * caseSensitive: false, | |||||
| * includeTerritories: false, | |||||
| * includeMilitary: false | |||||
| * } | |||||
| * | |||||
| * Only allow capital letters, no territories, no military zones | |||||
| * stateInput: { | |||||
| * caseSensitive: false | |||||
| * } | |||||
| * | |||||
| * Case insensitive, include territories but not military zones | |||||
| * stateInput: { | |||||
| * includeTerritories: true | |||||
| * } | |||||
| * | |||||
| * Only allow capital letters, include territories and military zones | |||||
| * stateInput: { | |||||
| * caseSensitive: true, | |||||
| * includeTerritories: true, | |||||
| * includeMilitary: true | |||||
| * } | |||||
| * | |||||
| * | |||||
| * | |||||
| */ | |||||
| $.validator.addMethod("stateUS", function(value, element, options) { | |||||
| var isDefault = typeof options === "undefined", | |||||
| caseSensitive = ( isDefault || typeof options.caseSensitive === "undefined" ) ? false : options.caseSensitive, | |||||
| includeTerritories = ( isDefault || typeof options.includeTerritories === "undefined" ) ? false : options.includeTerritories, | |||||
| includeMilitary = ( isDefault || typeof options.includeMilitary === "undefined" ) ? false : options.includeMilitary, | |||||
| regex; | |||||
| if (!includeTerritories && !includeMilitary) { | |||||
| regex = "^(A[KLRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$"; | |||||
| } else if (includeTerritories && includeMilitary) { | |||||
| regex = "^(A[AEKLPRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$"; | |||||
| } else if (includeTerritories) { | |||||
| regex = "^(A[KLRSZ]|C[AOT]|D[CE]|FL|G[AU]|HI|I[ADLN]|K[SY]|LA|M[ADEINOPST]|N[CDEHJMVY]|O[HKR]|P[AR]|RI|S[CD]|T[NX]|UT|V[AIT]|W[AIVY])$"; | |||||
| } else { | |||||
| regex = "^(A[AEKLPRZ]|C[AOT]|D[CE]|FL|GA|HI|I[ADLN]|K[SY]|LA|M[ADEINOST]|N[CDEHJMVY]|O[HKR]|PA|RI|S[CD]|T[NX]|UT|V[AT]|W[AIVY])$"; | |||||
| } | |||||
| regex = caseSensitive ? new RegExp(regex) : new RegExp(regex, "i"); | |||||
| return this.optional(element) || regex.test(value); | |||||
| }, | |||||
| "Please specify a valid state"); | |||||
| // TODO check if value starts with <, otherwise don't try stripping anything | |||||
| $.validator.addMethod("strippedminlength", function(value, element, param) { | |||||
| return $(value).text().length >= param; | |||||
| }, $.validator.format("Please enter at least {0} characters")); | |||||
| $.validator.addMethod("time", function(value, element) { | |||||
| return this.optional(element) || /^([01]\d|2[0-3]|[0-9])(:[0-5]\d){1,2}$/.test(value); | |||||
| }, "Please enter a valid time, between 00:00 and 23:59"); | |||||
| $.validator.addMethod("time12h", function(value, element) { | |||||
| return this.optional(element) || /^((0?[1-9]|1[012])(:[0-5]\d){1,2}(\ ?[AP]M))$/i.test(value); | |||||
| }, "Please enter a valid time in 12-hour am/pm format"); | |||||
| // same as url, but TLD is optional | |||||
| $.validator.addMethod("url2", function(value, element) { | |||||
| return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value); | |||||
| }, $.validator.messages.url); | |||||
| /** | |||||
| * Return true, if the value is a valid vehicle identification number (VIN). | |||||
| * | |||||
| * Works with all kind of text inputs. | |||||
| * | |||||
| * @example <input type="text" size="20" name="VehicleID" class="{required:true,vinUS:true}" /> | |||||
| * @desc Declares a required input element whose value must be a valid vehicle identification number. | |||||
| * | |||||
| * @name $.validator.methods.vinUS | |||||
| * @type Boolean | |||||
| * @cat Plugins/Validate/Methods | |||||
| */ | |||||
| $.validator.addMethod("vinUS", function(v) { | |||||
| if (v.length !== 17) { | |||||
| return false; | |||||
| } | |||||
| var LL = [ "A", "B", "C", "D", "E", "F", "G", "H", "J", "K", "L", "M", "N", "P", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" ], | |||||
| VL = [ 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 7, 9, 2, 3, 4, 5, 6, 7, 8, 9 ], | |||||
| FL = [ 8, 7, 6, 5, 4, 3, 2, 10, 0, 9, 8, 7, 6, 5, 4, 3, 2 ], | |||||
| rs = 0, | |||||
| i, n, d, f, cd, cdv; | |||||
| for (i = 0; i < 17; i++) { | |||||
| f = FL[i]; | |||||
| d = v.slice(i, i + 1); | |||||
| if (i === 8) { | |||||
| cdv = d; | |||||
| } | |||||
| if (!isNaN(d)) { | |||||
| d *= f; | |||||
| } else { | |||||
| for (n = 0; n < LL.length; n++) { | |||||
| if (d.toUpperCase() === LL[n]) { | |||||
| d = VL[n]; | |||||
| d *= f; | |||||
| if (isNaN(cdv) && n === 8) { | |||||
| cdv = LL[n]; | |||||
| } | |||||
| break; | |||||
| } | |||||
| } | |||||
| } | |||||
| rs += d; | |||||
| } | |||||
| cd = rs % 11; | |||||
| if (cd === 10) { | |||||
| cd = "X"; | |||||
| } | |||||
| if (cd === cdv) { | |||||
| return true; | |||||
| } | |||||
| return false; | |||||
| }, "The specified vehicle identification number (VIN) is invalid."); | |||||
| $.validator.addMethod("zipcodeUS", function(value, element) { | |||||
| return this.optional(element) || /^\d{5}(-\d{4})?$/.test(value); | |||||
| }, "The specified US ZIP Code is invalid"); | |||||
| $.validator.addMethod("ziprange", function(value, element) { | |||||
| return this.optional(element) || /^90[2-5]\d\{2\}-\d{4}$/.test(value); | |||||
| }, "Your ZIP-code must be in the range 902xx-xxxx to 905xx-xxxx"); | |||||
| })); | |||||
+ 0
- 4
src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
File diff suppressed because it is too large
View File
+ 0
- 1398
src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/dist/jquery.validate.js
File diff suppressed because it is too large
View File
+ 0
- 4
src/Services/Identity/Identity.API/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
File diff suppressed because it is too large
View File
+ 0
- 25
src/Services/Identity/Identity.API/wwwroot/lib/jquery/.bower.json
View File
| @ -1,25 +0,0 @@ | |||||
| { | |||||
| "name": "jquery", | |||||
| "main": "dist/jquery.js", | |||||
| "license": "MIT", | |||||
| "ignore": [ | |||||
| "package.json" | |||||
| ], | |||||
| "keywords": [ | |||||
| "jquery", | |||||
| "javascript", | |||||
| "browser", | |||||
| "library" | |||||
| ], | |||||
| "homepage": "https://github.com/jquery/jquery-dist", | |||||
| "version": "2.2.0", | |||||
| "_release": "2.2.0", | |||||
| "_resolution": { | |||||
| "type": "version", | |||||
| "tag": "2.2.0", | |||||
| "commit": "6fc01e29bdad0964f62ef56d01297039cdcadbe5" | |||||
| }, | |||||
| "_source": "git://github.com/jquery/jquery-dist.git", | |||||
| "_target": "2.2.0", | |||||
| "_originalSource": "jquery" | |||||
| } | |||||
+ 0
- 36
src/Services/Identity/Identity.API/wwwroot/lib/jquery/LICENSE.txt
View File
| @ -1,36 +0,0 @@ | |||||
| Copyright jQuery Foundation and other contributors, https://jquery.org/ | |||||
| This software consists of voluntary contributions made by many | |||||
| individuals. For exact contribution history, see the revision history | |||||
| available at https://github.com/jquery/jquery | |||||
| The following license applies to all parts of this software except as | |||||
| documented below: | |||||
| ==== | |||||
| Permission is hereby granted, free of charge, to any person obtaining | |||||
| a copy of this software and associated documentation files (the | |||||
| "Software"), to deal in the Software without restriction, including | |||||
| without limitation the rights to use, copy, modify, merge, publish, | |||||
| distribute, sublicense, and/or sell copies of the Software, and to | |||||
| permit persons to whom the Software is furnished to do so, subject to | |||||
| the following conditions: | |||||
| The above copyright notice and this permission notice shall be | |||||
| included in all copies or substantial portions of the Software. | |||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |||||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |||||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | |||||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | |||||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | |||||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | |||||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |||||
| ==== | |||||
| All files located in the node_modules and external directories are | |||||
| externally maintained libraries used by this software which have their | |||||
| own licenses; we recommend you read them, as their terms may differ from | |||||
| the terms above. | |||||
+ 0
- 9831
src/Services/Identity/Identity.API/wwwroot/lib/jquery/dist/jquery.js
File diff suppressed because it is too large
View File
+ 0
- 4
src/Services/Identity/Identity.API/wwwroot/lib/jquery/dist/jquery.min.js
File diff suppressed because it is too large
View File
+ 0
- 1
src/Services/Identity/Identity.API/wwwroot/lib/jquery/dist/jquery.min.map
File diff suppressed because it is too large
View File
+ 2586
- 1965
src/Services/Identity/Identity.API/wwwroot/lib/jquery/jquery.js
File diff suppressed because it is too large
View File
+ 4
- 5
src/Services/Identity/Identity.API/wwwroot/lib/jquery/jquery.min.js
File diff suppressed because it is too large
View File
+ 1
- 1
src/Services/Identity/Identity.API/wwwroot/lib/jquery/jquery.min.map
File diff suppressed because it is too large
View File
+ 2
- 2
src/Services/Location/Locations.API/Dockerfile
View File
+ 29
- 28
src/Services/Location/Locations.API/Locations.API.csproj
View File
| @ -1,32 +1,33 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| <UserSecretsId>aspnet-Locations.API-20161122013619</UserSecretsId> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| <PackageReference Include="mongocsharpdriver" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Bson" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Driver" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Driver.Core" Version="2.5.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| <UserSecretsId>aspnet-Locations.API-20161122013619</UserSecretsId> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="mongocsharpdriver" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Bson" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Driver" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Driver.Core" Version="2.5.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="2.4.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 2
- 1
src/Services/Location/Locations.API/Properties/launchSettings.json
View File
+ 2
- 2
src/Services/Marketing/Marketing.API/Dockerfile
View File
+ 50
- 49
src/Services/Marketing/Marketing.API/Marketing.API.csproj
View File
| @ -1,55 +1,56 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| <RootNamespace>Microsoft.eShopOnContainers.Services.Marketing.API</RootNamespace> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| <UserSecretsId>aspnet-Marketing.API-20161122013619</UserSecretsId> | |||||
| <AssemblyName /> | |||||
| <ApplicationInsightsResourceId>/subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights</ApplicationInsightsResourceId> | |||||
| <ApplicationInsightsAnnotationResourceId>/subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights</ApplicationInsightsAnnotationResourceId> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| <RootNamespace>Microsoft.eShopOnContainers.Services.Marketing.API</RootNamespace> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| <UserSecretsId>aspnet-Marketing.API-20161122013619</UserSecretsId> | |||||
| <AssemblyName /> | |||||
| <ApplicationInsightsResourceId>/subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights</ApplicationInsightsResourceId> | |||||
| <ApplicationInsightsAnnotationResourceId>/subscriptions/6c22bb55-0221-4ce4-9bf1-3c4a10a7294c/resourcegroups/eshop-log/providers/microsoft.insights/components/eshopappinsights</ApplicationInsightsAnnotationResourceId> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="Connected Services\" /> | |||||
| <Folder Include="Infrastructure\MarketingMigrations\" /> | |||||
| <Content Include="Pics\**\*;"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| <Folder Include="Infrastructure\MarketingMigrations\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| <PackageReference Include="mongocsharpdriver" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Bson" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Driver" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Driver.Core" Version="2.5.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.AzureStorage\Microsoft.Extensions.HealthChecks.AzureStorage.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\WebHostCustomization\WebHost.Customization\WebHost.Customization.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="Connected Services\" /> | |||||
| <Folder Include="Infrastructure\MarketingMigrations\" /> | |||||
| <Content Include="Pics\**\*;"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| <Folder Include="Infrastructure\MarketingMigrations\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="mongocsharpdriver" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Bson" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Driver" Version="2.5.0" /> | |||||
| <PackageReference Include="MongoDB.Driver.Core" Version="2.5.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.AzureStorage\Microsoft.Extensions.HealthChecks.AzureStorage.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\WebHostCustomization\WebHost.Customization\WebHost.Customization.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Update="Pics\*"> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </None> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Update="Pics\*"> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </None> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <WCFMetadata Include="Connected Services" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <WCFMetadata Include="Connected Services" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 2
- 1
src/Services/Marketing/Marketing.API/Properties/launchSettings.json
View File
+ 2
- 2
src/Services/Ordering/Ordering.API/Dockerfile
View File
+ 50
- 49
src/Services/Ordering/Ordering.API/Ordering.API.csproj
View File
| @ -1,56 +1,57 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <UserSecretsId>aspnet-Ordering.API-20161122013547</UserSecretsId> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <UserSecretsId>aspnet-Ordering.API-20161122013547</UserSecretsId> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Content Update="web.config;"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| <Content Include="Setup\**\*;"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Content Update="web.config;"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| <Content Include="Setup\**\*;"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| </Content> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\WebHostCustomization\WebHost.Customization\WebHost.Customization.csproj" /> | |||||
| <ProjectReference Include="..\Ordering.Domain\Ordering.Domain.csproj" /> | |||||
| <ProjectReference Include="..\Ordering.Infrastructure\Ordering.Infrastructure.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\WebHostCustomization\WebHost.Customization\WebHost.Customization.csproj" /> | |||||
| <ProjectReference Include="..\Ordering.Domain\Ordering.Domain.csproj" /> | |||||
| <ProjectReference Include="..\Ordering.Infrastructure\Ordering.Infrastructure.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="FluentValidation.AspNetCore" Version="7.5.0" /> | |||||
| <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="4.1.0" /> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| <PackageReference Include="MediatR" Version="4.1.0" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| <PackageReference Include="System.Reflection" Version="4.3.0" /> | |||||
| <PackageReference Include="Dapper" Version="1.50.4" /> | |||||
| <PackageReference Include="System.ValueTuple" Version="4.5.0" /> | |||||
| <PackageReference Include="Polly" Version="6.0.1" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Update="Setup\*"> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </None> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Dapper" Version="1.50.4" /> | |||||
| <PackageReference Include="FluentValidation.AspNetCore" Version="7.5.0" /> | |||||
| <PackageReference Include="MediatR" Version="4.1.0" /> | |||||
| <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="4.1.0" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" /> | |||||
| <PackageReference Include="Polly" Version="6.0.1" /> | |||||
| <PackageReference Include="Swashbuckle.AspNetCore" Version="2.4.0" /> | |||||
| <PackageReference Include="System.Reflection" Version="4.3.0" /> | |||||
| <PackageReference Include="System.ValueTuple" Version="4.5.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Update="Setup\*"> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </None> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 2
- 1
src/Services/Ordering/Ordering.API/Properties/launchSettings.json
View File
+ 2
- 2
src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
View File
+ 25
- 24
src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
View File
| @ -1,31 +1,32 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Compile Remove="wwwroot\**" /> | |||||
| <Content Remove="wwwroot\**" /> | |||||
| <EmbeddedResource Remove="wwwroot\**" /> | |||||
| <None Remove="wwwroot\**" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Compile Remove="wwwroot\**" /> | |||||
| <Content Remove="wwwroot\**" /> | |||||
| <EmbeddedResource Remove="wwwroot\**" /> | |||||
| <None Remove="wwwroot\**" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Dapper" Version="1.50.4" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Dapper" Version="1.50.4" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 3
- 2
src/Services/Ordering/Ordering.BackgroundTasks/Properties/launchSettings.json
View File
+ 3
- 3
src/Services/Ordering/Ordering.Infrastructure/Ordering.Infrastructure.csproj
View File
+ 2
- 2
src/Services/Ordering/Ordering.SignalrHub/Dockerfile
View File
+ 25
- 24
src/Services/Ordering/Ordering.SignalrHub/Ordering.SignalrHub.csproj
View File
| @ -1,31 +1,32 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="wwwroot\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <Folder Include="wwwroot\" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.0.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.0" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.3" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.SignalR.Core" Version="1.0.3" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.SignalR.Redis" Version="1.0.3" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 3
- 2
src/Services/Ordering/Ordering.SignalrHub/Properties/launchSettings.json
View File
+ 2
- 2
src/Services/Payment/Payment.API/Dockerfile
View File
+ 24
- 23
src/Services/Payment/Payment.API/Payment.API.csproj
View File
| @ -1,28 +1,29 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| </PropertyGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 2
- 1
src/Services/Payment/Payment.API/Properties/launchSettings.json
View File
+ 0
- 3
src/Web/WebMVC/.bowerrc
View File
| @ -1,3 +0,0 @@ | |||||
| { | |||||
| "directory": "wwwroot/lib" | |||||
| } | |||||
+ 13
- 0
src/Web/WebMVC/Controllers/HomeController.cs
View File
| @ -0,0 +1,13 @@ | |||||
| using Microsoft.AspNetCore.Mvc; | |||||
| namespace WebMVC.Controllers | |||||
| { | |||||
| public class HomeController : Controller | |||||
| { | |||||
| public IActionResult Privacy() | |||||
| { | |||||
| return View(); | |||||
| } | |||||
| } | |||||
| } | |||||
+ 4
- 2
src/Web/WebMVC/Dockerfile
View File
+ 11
- 10
src/Web/WebMVC/Properties/launchSettings.json
View File
+ 5
- 4
src/Web/WebMVC/Services/CatalogService.cs
View File
+ 269
- 249
src/Web/WebMVC/Startup.cs
View File
+ 22
- 20
src/Web/WebMVC/Views/Campaigns/Details.cshtml
View File
| @ -1,28 +1,30 @@ | |||||
| @{ | @{ | ||||
| ViewData["Title"] = "Campaign details"; | |||||
| @model CampaignItem | |||||
| ViewData["Title"] = "Campaign details"; | |||||
| var headers = new List<Header>{ | |||||
| new Header { Controller = "Campaigns", Text = "Back to Campaigns" }, | |||||
| new Header { Controller = "Catalog", Text = "Back to catalog" } | |||||
| }; | |||||
| @model CampaignItem | |||||
| } | } | ||||
| <section class="esh-campaigns-hero"> | <section class="esh-campaigns-hero"> | ||||
| <div class="container"> | |||||
| <img class="esh-campaigns-title" src="~/images/main_banner_text.png" /> | |||||
| </div> | |||||
| <div class="container"> | |||||
| <img class="esh-campaigns-title" src="~/images/main_banner_text.png" /> | |||||
| </div> | |||||
| </section> | </section> | ||||
| @Html.Partial("_Header", new List<Header>() { | |||||
| new Header() { Controller = "Catalog", Text = "Back to catalog" }, | |||||
| new Header() { Controller = "Campaigns", Text = "Back to Campaigns" } }) | |||||
| <partial name="_Header" model="headers" /> | |||||
| <div class="container"> | <div class="container"> | ||||
| <div class="card esh-campaigns-items"> | |||||
| <img class="card-img-top" src="@Model.PictureUri" alt="Card image cap"> | |||||
| <div class="card-block"> | |||||
| <h4 class="card-title">@Model.Name</h4> | |||||
| <p class="card-text">@Model.Description</p> | |||||
| <p class="card-text"> | |||||
| <small class="text-muted"> | |||||
| From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy") | |||||
| </small> | |||||
| </p> | |||||
| </div> | |||||
| </div> | |||||
| <div class="card esh-campaigns-items"> | |||||
| <img class="card-img-top" src="@Model.PictureUri" alt="Card image cap"> | |||||
| <div class="card-block"> | |||||
| <h4 class="card-title">@Model.Name</h4> | |||||
| <p class="card-text">@Model.Description</p> | |||||
| <p class="card-text"> | |||||
| <small class="text-muted"> | |||||
| From @Model.From.ToString("MMMM dd, yyyy") until @Model.To.ToString("MMMM dd, yyyy") | |||||
| </small> | |||||
| </p> | |||||
| </div> | |||||
| </div> | |||||
| </div> | </div> | ||||
+ 60
- 57
src/Web/WebMVC/Views/Campaigns/Index.cshtml
View File
| @ -1,72 +1,75 @@ | |||||
| @{ | @{ | ||||
| ViewData["Title"] = "Campaigns"; | |||||
| @model WebMVC.ViewModels.CampaignViewModel | |||||
| ViewData["Title"] = "Campaigns"; | |||||
| @model WebMVC.ViewModels.CampaignViewModel | |||||
| var headers = new List<Header>() { | |||||
| new Header() { Controller = "Catalog", Text = "Back to catalog" } }; | |||||
| } | } | ||||
| <section class="esh-campaigns-hero"> | <section class="esh-campaigns-hero"> | ||||
| <div class="container"> | |||||
| <img class="esh-campaigns-title" src="~/images/main_banner_text.png" /> | |||||
| </div> | |||||
| <div class="container"> | |||||
| <img class="esh-campaigns-title" src="~/images/main_banner_text.png" /> | |||||
| </div> | |||||
| </section> | </section> | ||||
| @Html.Partial("_Header", new List<Header>() { | |||||
| new Header() { Controller = "Catalog", Text = "Back to catalog" } }) | |||||
| <partial name="_Header" model="headers" /> | |||||
| <div class="container"> | <div class="container"> | ||||
| <br /> | |||||
| <div class="row"> | |||||
| @if (!ViewData.ModelState.IsValid) | |||||
| { | |||||
| <div class="alert alert-warning"> | |||||
| @Html.ValidationSummary(false) | |||||
| </div> | |||||
| } | |||||
| <br /> | |||||
| <div class="row"> | |||||
| <div class="col-md-12"> | |||||
| <div class="esh-campaigns-items" style="font-weight: 300;"> | |||||
| UPDATE USER LOCATION | |||||
| </div> | |||||
| @if (!ViewData.ModelState.IsValid) | |||||
| { | |||||
| <div class="alert alert-warning"> | |||||
| @Html.ValidationSummary(false) | |||||
| </div> | |||||
| } | |||||
| <form class="form-inline" asp-action="CreateNewUserLocation" method="post"> | |||||
| <label class="sr-only" for="longitudeInput">Name</label> | |||||
| <div class="input-group mb-2 mr-sm-2 mb-sm-0"> | |||||
| <div class="input-group-addon">Lat</div> | |||||
| <input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="latitudeInput" asp-for="Lat" placeholder="Latitude"> | |||||
| </div> | |||||
| <div class="col-md-12"> | |||||
| <div class="esh-campaigns-items" style="font-weight: 300;"> | |||||
| UPDATE USER LOCATION | |||||
| </div> | |||||
| <div class="input-group mb-2 mr-sm-2 mb-sm-0"> | |||||
| <div class="input-group-addon">Lon</div> | |||||
| <input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="longitudeInput" asp-for="Lon" placeholder="Longitude"> | |||||
| </div> | |||||
| <div class="input-group mb-2 mr-sm-2 mb-sm-0 col-md-2"> | |||||
| <input type="submit" value="Update" class="btn esh-campaigns-form-button" /> | |||||
| </div> | |||||
| </form> | |||||
| </div> | |||||
| </div> | |||||
| <br /> | |||||
| @if (Model != null && Model.CampaignItems !=null && Model.CampaignItems.Any()) | |||||
| { | |||||
| <div class="card-group esh-campaigns-items row"> | |||||
| @foreach (var catalogItem in Model.CampaignItems) | |||||
| { | |||||
| <div class="esh-campaigns-item col-md-4"> | |||||
| @Html.Partial("_campaign", catalogItem) | |||||
| </div> | |||||
| } | |||||
| </div> | |||||
| <form class="form-inline" asp-action="CreateNewUserLocation" method="post"> | |||||
| <label class="sr-only" for="longitudeInput">Name</label> | |||||
| @Html.Partial("_pagination", Model.PaginationInfo) | |||||
| } | |||||
| else | |||||
| { | |||||
| <div class="esh-campaigns-items row"> | |||||
| THERE ARE NO CAMPAIGNS | |||||
| </div> | |||||
| } | |||||
| <div class="input-group mb-2 mr-sm-2 mb-sm-0"> | |||||
| <div class="input-group-addon">Lat</div> | |||||
| <input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="latitudeInput" asp-for="Lat" placeholder="Latitude"> | |||||
| </div> | |||||
| <div class="input-group mb-2 mr-sm-2 mb-sm-0"> | |||||
| <div class="input-group-addon">Lon</div> | |||||
| <input type="text" class="form-control mb-2 mr-sm-2 mb-sm-0" id="longitudeInput" asp-for="Lon" placeholder="Longitude"> | |||||
| </div> | |||||
| <div class="input-group mb-2 mr-sm-2 mb-sm-0 col-md-2"> | |||||
| <input type="submit" value="Update" class="btn esh-campaigns-form-button" /> | |||||
| </div> | |||||
| </form> | |||||
| </div> | |||||
| </div> | |||||
| <br /> | |||||
| @if (Model != null && Model.CampaignItems != null && Model.CampaignItems.Any()) | |||||
| { | |||||
| <div class="card-group esh-campaigns-items row"> | |||||
| @foreach (var catalogItem in Model.CampaignItems) | |||||
| { | |||||
| <div class="esh-campaigns-item col-md-4"> | |||||
| @*@Html.Partial("_campaign", catalogItem)*@ | |||||
| <partial name="_campaign" model="catalogItem" /> | |||||
| </div> | |||||
| } | |||||
| </div> | |||||
| @*@Html.Partial("_pagination", Model.PaginationInfo)*@ | |||||
| <partial name="_pagination" model="Model.PaginationInfo" /> | |||||
| } | |||||
| else | |||||
| { | |||||
| <div class="esh-campaigns-items row"> | |||||
| THERE ARE NO CAMPAIGNS | |||||
| </div> | |||||
| } | |||||
| </div> | </div> | ||||
+ 7
- 7
src/Web/WebMVC/Views/Cart/Index.cshtml
View File
+ 44
- 44
src/Web/WebMVC/Views/Catalog/Index.cshtml
View File
| @ -1,57 +1,57 @@ | |||||
| @{ | @{ | ||||
| ViewData["Title"] = "Catalog"; | |||||
| @model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel | |||||
| ViewData["Title"] = "Catalog"; | |||||
| @model Microsoft.eShopOnContainers.WebMVC.ViewModels.CatalogViewModels.IndexViewModel | |||||
| } | } | ||||
| <section class="esh-catalog-hero"> | <section class="esh-catalog-hero"> | ||||
| <div class="container"> | |||||
| <img class="esh-catalog-title" src="~/images/main_banner_text.png" /> | |||||
| </div> | |||||
| <div class="container"> | |||||
| <img class="esh-catalog-title" src="~/images/main_banner_text.png" /> | |||||
| </div> | |||||
| </section> | </section> | ||||
| <section class="esh-catalog-filters"> | <section class="esh-catalog-filters"> | ||||
| <div class="container"> | |||||
| <form asp-action="Index" asp-controller="Catalog" method="post"> | |||||
| <label class="esh-catalog-label" data-title="brand"> | |||||
| <select asp-for="@Model.BrandFilterApplied" asp-items="@Model.Brands" class="esh-catalog-filter"></select> | |||||
| </label> | |||||
| <label class="esh-catalog-label" data-title="type"> | |||||
| <select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="esh-catalog-filter"></select> | |||||
| </label> | |||||
| <input class="esh-catalog-send" type="image" src="~/images/arrow-right.svg" /> | |||||
| </form> | |||||
| </div> | |||||
| <div class="container"> | |||||
| <form asp-action="Index" asp-controller="Catalog" method="post"> | |||||
| <label class="esh-catalog-label" data-title="brand"> | |||||
| <select asp-for="@Model.BrandFilterApplied" asp-items="@Model.Brands" class="esh-catalog-filter"></select> | |||||
| </label> | |||||
| <label class="esh-catalog-label" data-title="type"> | |||||
| <select asp-for="@Model.TypesFilterApplied" asp-items="@Model.Types" class="esh-catalog-filter"></select> | |||||
| </label> | |||||
| <input class="esh-catalog-send" type="image" src="~/images/arrow-right.svg" /> | |||||
| </form> | |||||
| </div> | |||||
| </section> | </section> | ||||
| <div class="container"> | <div class="container"> | ||||
| <div class="row"> | |||||
| <br /> | |||||
| @if(ViewBag.BasketInoperativeMsg != null) | |||||
| { | |||||
| <div class="alert alert-warning" role="alert"> | |||||
| @ViewBag.BasketInoperativeMsg | |||||
| </div> | |||||
| } | |||||
| </div> | |||||
| <div class="row"> | |||||
| <br /> | |||||
| @if (ViewBag.BasketInoperativeMsg != null) | |||||
| { | |||||
| <div class="alert alert-warning" role="alert"> | |||||
| @ViewBag.BasketInoperativeMsg | |||||
| </div> | |||||
| } | |||||
| </div> | |||||
| @if (Model.CatalogItems.Count() > 0) | |||||
| { | |||||
| @Html.Partial("_pagination", Model.PaginationInfo) | |||||
| @if (Model.CatalogItems.Count() > 0) | |||||
| { | |||||
| <partial name="_pagination" model="Model.PaginationInfo" /> | |||||
| <div class="esh-catalog-items row"> | |||||
| @foreach (var catalogItem in Model.CatalogItems) | |||||
| { | |||||
| <div class="esh-catalog-item col-md-4"> | |||||
| @Html.Partial("_product", catalogItem) | |||||
| </div> | |||||
| } | |||||
| </div> | |||||
| <div class="esh-catalog-items row"> | |||||
| @foreach (var catalogItem in Model.CatalogItems) | |||||
| { | |||||
| <div class="esh-catalog-item col-md-4"> | |||||
| <partial name="_product" , model="catalogItem" /> | |||||
| </div> | |||||
| } | |||||
| </div> | |||||
| @Html.Partial("_pagination", Model.PaginationInfo) | |||||
| } | |||||
| else | |||||
| { | |||||
| <div class="esh-catalog-items row"> | |||||
| THERE ARE NO RESULTS THAT MATCH YOUR SEARCH | |||||
| </div> | |||||
| } | |||||
| <partial name="_pagination" model="Model.PaginationInfo" /> | |||||
| } | |||||
| else | |||||
| { | |||||
| <div class="esh-catalog-items row"> | |||||
| THERE ARE NO RESULTS THAT MATCH YOUR SEARCH | |||||
| </div> | |||||
| } | |||||
| </div> | </div> | ||||
+ 6
- 0
src/Web/WebMVC/Views/Home/Privacy.cshtml
View File
| @ -0,0 +1,6 @@ | |||||
| @{ | |||||
| ViewData["Title"] = "Privacy Policy"; | |||||
| } | |||||
| <h2>@ViewData["Title"]</h2> | |||||
| <p>Use this page to detail your site's privacy policy.</p> | |||||
+ 93
- 91
src/Web/WebMVC/Views/Order/Create.cshtml
View File
+ 71
- 70
src/Web/WebMVC/Views/Order/Detail.cshtml
View File
+ 38
- 36
src/Web/WebMVC/Views/Order/Index.cshtml
View File
+ 33
- 32
src/Web/WebMVC/Views/OrderManagement/Index.cshtml
View File
+ 41
- 0
src/Web/WebMVC/Views/Shared/_CookieConsentPartial.cshtml
View File
| @ -0,0 +1,41 @@ | |||||
| @using Microsoft.AspNetCore.Http.Features | |||||
| @{ | |||||
| var consentFeature = Context.Features.Get<ITrackingConsentFeature>(); | |||||
| var showBanner = !consentFeature?.CanTrack ?? false; | |||||
| var cookieString = consentFeature?.CreateConsentCookie(); | |||||
| } | |||||
| @if (showBanner) | |||||
| { | |||||
| <nav id="cookieConsent" class="navbar navbar-default navbar-fixed-top" role="alert"> | |||||
| <div class="container"> | |||||
| <div class="navbar-header"> | |||||
| <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#cookieConsent .navbar-collapse"> | |||||
| <span class="sr-only">Toggle cookie consent banner</span> | |||||
| <span class="icon-bar"></span> | |||||
| <span class="icon-bar"></span> | |||||
| <span class="icon-bar"></span> | |||||
| </button> | |||||
| <span class="navbar-brand"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></span> | |||||
| </div> | |||||
| <div class="collapse navbar-collapse"> | |||||
| <p class="navbar-text"> | |||||
| Use this space to summarize your privacy and cookie use policy. | |||||
| </p> | |||||
| <div class="navbar-right"> | |||||
| <a asp-controller="Home" asp-action="Privacy" class="btn btn-info navbar-btn">Learn More</a> | |||||
| <button type="button" class="btn btn-default navbar-btn" data-cookie-string="@cookieString">Accept</button> | |||||
| </div> | |||||
| </div> | |||||
| </div> | |||||
| </nav> | |||||
| <script> | |||||
| (function () { | |||||
| document.querySelector("#cookieConsent button[data-cookie-string]").addEventListener("click", function (el) { | |||||
| document.cookie = el.target.dataset.cookieString; | |||||
| document.querySelector("#cookieConsent").classList.add("hidden"); | |||||
| }, false); | |||||
| })(); | |||||
| </script> | |||||
| } | |||||
+ 65
- 63
src/Web/WebMVC/Views/Shared/_Layout.cshtml
View File
+ 46
- 47
src/Web/WebMVC/WebMVC.csproj
View File
| @ -1,51 +1,50 @@ | |||||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <UserSecretsId>aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3</UserSecretsId> | |||||
| <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Content Include="Setup\images.zip"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </Content> | |||||
| <Content Include="Setup\override.css"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </Content> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="BuildBundlerMinifier" Version="2.6.375" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.3" /> | |||||
| <PackageReference Include="Microsoft.VisualStudio.Azure.Fabric.MSBuild" Version="1.6.5" /> | |||||
| </ItemGroup> | |||||
| <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish"> | |||||
| <Exec Command="dotnet bundle" Condition="'$(ASPNETCORE_ENVIRONMENT)'!='Development'" /> | |||||
| </Target> | |||||
| <ItemGroup> | |||||
| <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.7.385" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Include="ViewModels\CampaignItem.cs" /> | |||||
| </ItemGroup> | |||||
| <PropertyGroup> | |||||
| <TargetFramework>netcoreapp2.1</TargetFramework> | |||||
| <RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion> | |||||
| <UserSecretsId>aspnet-Microsoft.eShopOnContainers-946ae052-8305-4a99-965b-ec8636ddbae3</UserSecretsId> | |||||
| <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||||
| </PropertyGroup> | |||||
| <ItemGroup> | |||||
| <Content Include="Setup\images.zip"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </Content> | |||||
| <Content Include="Setup\override.css"> | |||||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | |||||
| <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | |||||
| </Content> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <PackageReference Include="BuildBundlerMinifier" Version="2.8.391" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.4.1" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.7.2" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta9" /> | |||||
| <PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" /> | |||||
| <PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.1" /> | |||||
| <PackageReference Include="Microsoft.VisualStudio.Azure.Fabric.MSBuild" Version="1.6.7" /> | |||||
| <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.3" /> | |||||
| <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.163" /> | |||||
| </ItemGroup> | |||||
| <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish"> | |||||
| <Exec Command="dotnet bundle" Condition="'$(ASPNETCORE_ENVIRONMENT)'!='Development'" /> | |||||
| </Target> | |||||
| <ItemGroup> | |||||
| <ProjectReference Include="..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||||
| <ProjectReference Include="..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||||
| </ItemGroup> | |||||
| <ItemGroup> | |||||
| <None Include="ViewModels\CampaignItem.cs" /> | |||||
| </ItemGroup> | |||||
| </Project> | </Project> | ||||
+ 34
- 25
src/Web/WebMVC/appsettings.json
View File
| @ -1,27 +1,36 @@ | |||||
| { | { | ||||
| "CatalogUrl": "http://localhost:5101", | |||||
| "OrderingUrl": "http://localhost:5102", | |||||
| "BasketUrl": "http://localhost:5103", | |||||
| "MarketingUrl": "http://localhost:5110", | |||||
| "IdentityUrl": "http://localhost:5105", | |||||
| "CallBackUrl": "http://localhost:5100/", | |||||
| "LocationsUrl": "http://localhost:5109/", | |||||
| "IsClusterEnv": "False", | |||||
| "UseResilientHttp": "True", | |||||
| "UseLoadTest": false, | |||||
| "ActivateCampaignDetailFunction": "False", | |||||
| "UseCustomizationData": false, | |||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "LogLevel": { | |||||
| "Default": "Trace", | |||||
| "System": "Information", | |||||
| "Microsoft": "Information" | |||||
| } | |||||
| }, | |||||
| "ApplicationInsights": { | |||||
| "InstrumentationKey": "" | |||||
| }, | |||||
| "HttpClientRetryCount": 8, | |||||
| "HttpClientExceptionsAllowedBeforeBreaking": 7 | |||||
| "AllowedHosts": "*", | |||||
| "CatalogUrl": "http://localhost:5101", | |||||
| "OrderingUrl": "http://localhost:5102", | |||||
| "BasketUrl": "http://localhost:5103", | |||||
| "MarketingUrl": "http://localhost:5110", | |||||
| "IdentityUrl": "https://localhost:4105", | |||||
| "CallBackUrl": "https://localhost:4100/", | |||||
| "LocationsUrl": "http://localhost:5109/", | |||||
| "IsClusterEnv": "False", | |||||
| "UseResilientHttp": "True", | |||||
| "UseLoadTest": false, | |||||
| "ActivateCampaignDetailFunction": "False", | |||||
| "UseCustomizationData": false, | |||||
| "Logging": { | |||||
| "IncludeScopes": false, | |||||
| "LogLevel": { | |||||
| "Default": "Trace", | |||||
| "System": "Information", | |||||
| "Microsoft": "Information" | |||||
| } | |||||
| }, | |||||
| "ApplicationInsights": { | |||||
| "InstrumentationKey": "" | |||||
| }, | |||||
| "HttpClientRetryCount": 8, | |||||
| "HttpClientExceptionsAllowedBeforeBreaking": 7, | |||||
| "Kestrel": { | |||||
| "Certificates": { | |||||
| "Default": { | |||||
| "Path": "./Setup/eShopOnContainers.pfx", | |||||
| "Password": "D0tNet@" | |||||
| } | |||||
| } | |||||
| } | |||||
| } | } | ||||
+ 0
- 10
src/Web/WebMVC/bower.json
View File
| @ -1,10 +0,0 @@ | |||||
| { | |||||
| "name": "asp.net", | |||||
| "private": true, | |||||
| "dependencies": { | |||||
| "bootstrap": "v3.3.7", | |||||
| "jquery": "2.2.0", | |||||
| "jquery-validation": "1.14.0", | |||||
| "jquery-validation-unobtrusive": "3.2.6" | |||||
| } | |||||
| } | |||||