ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into eShop-servicebus

Browse Source
This commit is contained in:
Wenjie Yu（MSFT） 2021-07-23 14:16:02 +08:00 committed by GitHub
commit 4191d7f22a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 4647 additions and 4229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -10,10 +10,6 @@ Sample .NET Core reference application, powered by Microsoft, based on a simplif
![](img/eshop-spa-app-home.png) ![](img/eshop-spa-app-home.png)
## MVC application (ASP.NET Core)
![](img/eshop-webmvc-app-screenshot.png)
## Build Status (GitHub Actions) ## Build Status (GitHub Actions)
| Image | Status | Image | Status | | Image | Status | Image | Status |

4
deploy/windows/add-firewall-rules-for-sts-auth-thru-docker.ps1
View File

@ -10,10 +10,10 @@ function Check-Admin {
$currentUser.IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator) $currentUser.IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
} }
function Add-InboundRule { function Add-InboundRule {
New-NetFirewallRule -DisplayName $InboundDisplayName -Confirm -Description "$Name Inbound Rule for port range 5100-5150" -LocalAddress Any -LocalPort 5100-5150 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound New-NetFirewallRule -DisplayName $InboundDisplayName -Confirm -Description "$Name Inbound Rule for port range 5100-5205" -LocalAddress Any -LocalPort 5100-5205 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Inbound
} }
function Add-OutboundRule { function Add-OutboundRule {
New-NetFirewallRule -DisplayName $OutboundDisplayName -Confirm -Description "$Name Outbound Rule for port range 5100-5150" -LocalAddress Any -LocalPort 5100-5150 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound New-NetFirewallRule -DisplayName $OutboundDisplayName -Confirm -Description "$Name Outbound Rule for port range 5100-5205" -LocalAddress Any -LocalPort 5100-5205 -Protocol tcp -RemoteAddress Any -RemotePort Any -Direction Outbound
} }
if ((Check-Admin) -eq $false) { if ((Check-Admin) -eq $false) {

9
src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
View File

@ -144,12 +144,9 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ
_persistentConnection.TryConnect(); _persistentConnection.TryConnect();
} }
using (var channel = _persistentConnection.CreateModel()) _consumerChannel.QueueBind(queue: _queueName,
{ exchange: BROKER_NAME,
channel.QueueBind(queue: _queueName, routingKey: eventName);
exchange: BROKER_NAME,
routingKey: eventName);
}
} }
} }

2
src/Web/WebMVC/Views/Order/Detail.cshtml
View File

@ -40,7 +40,7 @@
<section class="esh-orders_detail-section"> <section class="esh-orders_detail-section">
<article class="esh-orders_detail-titles row"> <article class="esh-orders_detail-titles row">
<section class="esh-orders_detail-title col-12">Shiping address</section> <section class="esh-orders_detail-title col-12">Shipping address</section>
</article> </article>
<article class="esh-orders_detail-items row"> <article class="esh-orders_detail-items row">

1
src/Web/WebSPA/Client/angular.json
View File

@ -36,7 +36,6 @@
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"extractCss": true,
"namedChunks": false, "namedChunks": false,
"aot": true, "aot": true,
"extractLicenses": true, "extractLicenses": true,

8814
src/Web/WebSPA/Client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

34
src/Web/WebSPA/Client/package.json
View File

@ -28,15 +28,15 @@
}, },
"dependencies": { "dependencies": {
"@angular-devkit/schematics": "^11.0.4", "@angular-devkit/schematics": "^11.0.4",
"@angular/animations": "10.2.5", "@angular/animations": "11.2.14",
"@angular/common": "10.2.5", "@angular/common": "11.2.14",
"@angular/compiler": "10.2.5", "@angular/compiler": "11.2.14",
"@angular/core": "10.2.5", "@angular/core": "11.2.14",
"@angular/forms": "10.2.5", "@angular/forms": "11.2.14",
"@angular/platform-browser": "10.2.5", "@angular/platform-browser": "11.2.14",
"@angular/platform-browser-dynamic": "10.2.5", "@angular/platform-browser-dynamic": "11.2.14",
"@angular/platform-server": "10.2.5", "@angular/platform-server": "11.2.14",
"@angular/router": "10.2.5", "@angular/router": "11.2.14",
"@microsoft/signalr": "3.0.1", "@microsoft/signalr": "3.0.1",
"@ng-bootstrap/ng-bootstrap": "^8.0.0", "@ng-bootstrap/ng-bootstrap": "^8.0.0",
"@popperjs/core": "2.0.0", "@popperjs/core": "2.0.0",
@ -61,22 +61,22 @@
"zone.js": "~0.10.2" "zone.js": "~0.10.2"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.1002.3", "@angular-devkit/build-angular": "~0.1102.14",
"@angular/cli": "10.2.3", "@angular/cli": "11.2.14",
"@angular/compiler-cli": "10.2.5", "@angular/compiler-cli": "11.2.14",
"@angular/language-service": "10.2.5", "@angular/language-service": "11.2.14",
"@types/core-js": "2.5.0", "@types/core-js": "2.5.0",
"@types/hammerjs": "2.0.35", "@types/hammerjs": "2.0.35",
"@types/jasmine": "^3.5.10", "@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1", "@types/node": "^12.11.1",
"@types/protractor": "4.0.0", "@types/protractor": "4.0.0",
"@types/selenium-webdriver": "3.0.10", "@types/selenium-webdriver": "3.0.10",
"codelyzer": "^5.1.2", "codelyzer": "^6.0.0",
"eslint": "^6.8.0", "eslint": "^6.8.0",
"handlebars": "^4.7.7", "handlebars": "^4.7.7",
"jasmine-core": "~3.5.0", "jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0", "jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0", "karma": "~6.3.4",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-cli": "^2.0.0", "karma-cli": "^2.0.0",
"karma-jasmine": "~4.0.0", "karma-jasmine": "~4.0.0",

2
src/Web/WebSPA/Client/src/modules/app.routes.ts
View File

@ -15,4 +15,4 @@ export const routes: Routes = [
{ path: 'order', component: OrdersNewComponent }, { path: 'order', component: OrdersNewComponent },
]; ];
export const routing = RouterModule.forRoot(routes); export const routing = RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' });

2
src/Web/WebSPA/Client/src/modules/orders/orders-detail/orders-detail.component.html
View File

@ -16,7 +16,7 @@
<section class="col-3">{{order.status}}</section> <section class="col-3">{{order.status}}</section>
</article> </article>
<h2 class="esh-orders_detail-title mt-5">Shiping address</h2> <h2 class="esh-orders_detail-title mt-5">Shipping address</h2>
<div class="u-mb-5">{{order.street}} {{order.city}} {{order.country}}</div> <div class="u-mb-5">{{order.street}} {{order.city}} {{order.country}}</div>
<article class="esh-orders_detail-items divider divider--bottom d-flex align-items-center pb-3 mt-3 u-text-sm" <article class="esh-orders_detail-items divider divider--bottom d-flex align-items-center pb-3 mt-3 u-text-sm"

2
src/Web/WebSPA/Client/src/modules/shared/components/page-not-found/page-not-found.component.spec.ts
View File

@ -1,6 +1,6 @@
/* tslint:disable:no-unused-variable */ /* tslint:disable:no-unused-variable */
import { TestBed, async } from '@angular/core/testing'; import { TestBed, waitForAsync } from '@angular/core/testing';
import { PageNotFoundComponent } from './page-not-found.component'; import { PageNotFoundComponent } from './page-not-found.component';
describe('Component: PageNotFound', () => { describe('Component: PageNotFound', () => {