Skip to content

Commit

Permalink
Update README, catalog image files and MVC page size
Browse files Browse the repository at this point in the history
  • Loading branch information
mvelosop committed Jun 21, 2021
1 parent 4b0c2c5 commit 7405eba
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 14 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@

Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers.

## SPA Application

![](img/eshop-spa-app-home.png)

## MVC application

![](img/eshop-webmvc-app-screenshot.png)

## Build Status (GitHub Actions)
Expand Down
Binary file added img/eshop-spa-app-home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/eshop-webmvc-app-screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions src/Services/Catalog/Catalog.API/Setup/CatalogBrands.csv
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
CatalogBrand
Azure
.NET
Visual Studio
SQL Server
Other
CatalogBrandTestOne
CatalogBrandTestTwo
Binary file not shown.
Binary file not shown.
9 changes: 5 additions & 4 deletions src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ T-Shirt,.NET,".NET Bot Black Hoodie, and more",.NET Bot Black Hoodie,19.5,1.png,
Mug,.NET,.NET Black & White Mug,.NET Black & White Mug,8.50,2.png,89,true
T-Shirt,Other,Prism White T-Shirt,Prism White T-Shirt,12,3.png,56,false
T-Shirt,.NET,.NET Foundation T-shirt,.NET Foundation T-shirt,12,4.png,120,false
Sheet,Other,Roslyn Red Sheet,Roslyn Red Sheet,8.5,5.png,55,false
Pin,Other,Roslyn Red Pin,Roslyn Red Pin,8.5,5.png,55,false
T-Shirt,.NET,.NET Blue Hoodie,.NET Blue Hoodie,12,6.png,17,false
T-Shirt,Other,Roslyn Red T-Shirt,Roslyn Red T-Shirt,12,7.png,8,false
T-Shirt,Other,Kudu Purple Hoodie,Kudu Purple Hoodie,8.5,8.png,34,false
Mug,Other,Cup<T> White Mug,Cup<T> White Mug,12,9.png,76,false
Sheet,.NET,.NET Foundation Sheet,.NET Foundation Sheet,12,10.png,11,false
Sheet,.NET,Cup<T> Sheet,Cup<T> Sheet,8.5,11.png,3,false
Pin,.NET,.NET Foundation Pin,.NET Foundation Pin,12,10.png,11,false
Pin,.NET,Cup<T> Pin,Cup<T> Pin,8.5,11.png,3,false
T-Shirt,Other,Prism White TShirt,Prism White TShirt,12,12.png,0,false
Mug, Other, De los Palotes, pepito, 12, 12.png, 0, false
Mug,.NET,Modern .NET Black & White Mug,Modern .NET Black & White Mug,8.50,13.png,89,true
Mug,Other,Modern Cup<T> White Mug,Modern Cup<T> White Mug,12,14.png,76,false
Binary file modified src/Services/Catalog/Catalog.API/Setup/CatalogItems.zip
Binary file not shown.
5 changes: 1 addition & 4 deletions src/Services/Catalog/Catalog.API/Setup/CatalogTypes.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
CatalogType
Mug
T-Shirt
Sheet
USB Memory Stick
CatalogTypeTestOne
CatalogTypeTestTwo
Pin
10 changes: 10 additions & 0 deletions src/Services/Catalog/Catalog.API/Setup/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Catalog set up

The catalog images have been updated to the new SPA looks.

If you want to use the classical images:

1. Drop the `Microsoft.eShopOnContainers.Services.CatalogDb` database from the `sqldata` container.
2. Rename `CatalogItems-MVC.zip` as `CatalogItems.zip`
3. Rebuild the `catalog-api` service with `docker-compose build catalog-api`
4. Restart the application as usual
2 changes: 1 addition & 1 deletion src/Web/WebMVC/Controllers/CatalogController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public CatalogController(ICatalogService catalogSvc) =>

public async Task<IActionResult> Index(int? BrandFilterApplied, int? TypesFilterApplied, int? page, [FromQuery] string errorMsg)
{
var itemsPage = 10;
var itemsPage = 9;
var catalog = await _catalogSvc.GetCatalogItems(page ?? 0, itemsPage, BrandFilterApplied, TypesFilterApplied);
var vm = new IndexViewModel()
{
Expand Down

0 comments on commit 7405eba

Please sign in to comment.