Browse Source

Update README, catalog image files and MVC page size

pull/1705/head
Miguel Veloso 3 years ago
parent
commit
7405ebaf80
11 changed files with 23 additions and 14 deletions
  1. +6
    -0
      README.md
  2. BIN
      img/eshop-spa-app-home.png
  3. BIN
      img/eshop-webmvc-app-screenshot.png
  4. +0
    -5
      src/Services/Catalog/Catalog.API/Setup/CatalogBrands.csv
  5. BIN
      src/Services/Catalog/Catalog.API/Setup/CatalogItems-MVC.zip
  6. BIN
      src/Services/Catalog/Catalog.API/Setup/CatalogItems-SPA.zip
  7. +5
    -4
      src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv
  8. BIN
      src/Services/Catalog/Catalog.API/Setup/CatalogItems.zip
  9. +1
    -4
      src/Services/Catalog/Catalog.API/Setup/CatalogTypes.csv
  10. +10
    -0
      src/Services/Catalog/Catalog.API/Setup/README.md
  11. +1
    -1
      src/Web/WebMVC/Controllers/CatalogController.cs

+ 6
- 0
README.md View File

@ -6,6 +6,12 @@
Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers. 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) ![](img/eshop-webmvc-app-screenshot.png)
## Build Status (GitHub Actions) ## Build Status (GitHub Actions)


BIN
img/eshop-spa-app-home.png View File

Before After
Width: 1055  |  Height: 999  |  Size: 1.1 MiB

BIN
img/eshop-webmvc-app-screenshot.png View File

Before After
Width: 1413  |  Height: 952  |  Size: 1.1 MiB Width: 1055  |  Height: 999  |  Size: 1.1 MiB

+ 0
- 5
src/Services/Catalog/Catalog.API/Setup/CatalogBrands.csv View File

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

BIN
src/Services/Catalog/Catalog.API/Setup/CatalogItems-MVC.zip View File


BIN
src/Services/Catalog/Catalog.API/Setup/CatalogItems-SPA.zip View File


+ 5
- 4
src/Services/Catalog/Catalog.API/Setup/CatalogItems.csv 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 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,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 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,.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,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 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 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 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

BIN
src/Services/Catalog/Catalog.API/Setup/CatalogItems.zip View File


+ 1
- 4
src/Services/Catalog/Catalog.API/Setup/CatalogTypes.csv View File

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

+ 10
- 0
src/Services/Catalog/Catalog.API/Setup/README.md 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

+ 1
- 1
src/Web/WebMVC/Controllers/CatalogController.cs 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) 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 catalog = await _catalogSvc.GetCatalogItems(page ?? 0, itemsPage, BrandFilterApplied, TypesFilterApplied);
var vm = new IndexViewModel() var vm = new IndexViewModel()
{ {


Loading…
Cancel
Save