Update README, catalog image files and MVC page size

This commit is contained in:
Miguel Veloso 2021-06-21 16:01:42 +01:00
parent 4b0c2c56dd
commit 7405ebaf80
11 changed files with 23 additions and 14 deletions

View File

@ -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)

BIN
img/eshop-spa-app-home.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

View File

@ -1,8 +1,3 @@
CatalogBrand
Azure
.NET
Visual Studio
SQL Server
Other
CatalogBrandTestOne
CatalogBrandTestTwo
1 CatalogBrand
Azure
2 .NET
Visual Studio
SQL Server
3 Other
CatalogBrandTestOne
CatalogBrandTestTwo

View File

@ -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

1 CatalogTypeName CatalogBrandName Description Name Price PictureFileName availablestock onreorder
3 Mug .NET .NET Black & White Mug .NET Black & White Mug 8.50 2.png 89 true
4 T-Shirt Other Prism White T-Shirt Prism White T-Shirt 12 3.png 56 false
5 T-Shirt .NET .NET Foundation T-shirt .NET Foundation T-shirt 12 4.png 120 false
6 Sheet Pin Other Roslyn Red Sheet Roslyn Red Pin Roslyn Red Sheet Roslyn Red Pin 8.5 5.png 55 false
7 T-Shirt .NET .NET Blue Hoodie .NET Blue Hoodie 12 6.png 17 false
8 T-Shirt Other Roslyn Red T-Shirt Roslyn Red T-Shirt 12 7.png 8 false
9 T-Shirt Other Kudu Purple Hoodie Kudu Purple Hoodie 8.5 8.png 34 false
10 Mug Other Cup<T> White Mug Cup<T> White Mug 12 9.png 76 false
11 Sheet Pin .NET .NET Foundation Sheet .NET Foundation Pin .NET Foundation Sheet .NET Foundation Pin 12 10.png 11 false
12 Sheet Pin .NET Cup<T> Sheet Cup<T> Pin Cup<T> Sheet Cup<T> Pin 8.5 11.png 3 false
13 T-Shirt Other Prism White TShirt Prism White TShirt 12 12.png 0 false
14 Mug Other .NET De los Palotes Modern .NET Black & White Mug pepito Modern .NET Black & White Mug 12 8.50 12.png 13.png 0 89 false true
15 Mug Other Modern Cup<T> White Mug Modern Cup<T> White Mug 12 14.png 76 false

View File

@ -1,7 +1,4 @@
CatalogType
Mug
T-Shirt
Sheet
USB Memory Stick
CatalogTypeTestOne
CatalogTypeTestTwo
Pin
1 CatalogType
2 Mug
3 T-Shirt
4 Sheet Pin
USB Memory Stick
CatalogTypeTestOne
CatalogTypeTestTwo

View File

@ -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

View File

@ -16,7 +16,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
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()
{