Browse Source

Add catalog pictures. Set port to 5106.

pull/73/head
dsanz 8 years ago
parent
commit
f91c2bc0a6
16 changed files with 66 additions and 13 deletions
  1. +34
    -12
      src/Web/WebMonolithic/eShopWeb/Controllers/CatalogController.cs
  2. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/1.png
  3. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/10.png
  4. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/11.png
  5. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/12.png
  6. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/2.png
  7. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/3.png
  8. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/4.png
  9. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/5.png
  10. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/6.png
  11. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/7.png
  12. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/8.png
  13. BIN
      src/Web/WebMonolithic/eShopWeb/Pics/9.png
  14. +1
    -0
      src/Web/WebMonolithic/eShopWeb/Program.cs
  15. +1
    -1
      src/Web/WebMonolithic/eShopWeb/Properties/launchSettings.json
  16. +30
    -0
      src/Web/WebMonolithic/eShopWeb/eShopWeb.csproj

+ 34
- 12
src/Web/WebMonolithic/eShopWeb/Controllers/CatalogController.cs View File

@ -7,6 +7,8 @@ using eShopWeb.Models.CatalogViewModels;
using eShopWeb.Models;
using eShopWeb.Models.Pagination;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Hosting;
using System.IO;
// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
@ -14,6 +16,14 @@ namespace eShopWeb.Controllers
{
public class CatalogController : Controller
{
private readonly IHostingEnvironment _env;
public CatalogController(IHostingEnvironment env)
{
_env = env;
}
// GET: /<controller>/
public IActionResult Index(int? BrandFilterApplied, int? TypesFilterApplied, int? page)
{
@ -43,6 +53,18 @@ namespace eShopWeb.Controllers
return View(vm);
}
[HttpGet("{id}")]
[Route("[controller]/pic/{id}")]
// GET: /<controller>/pic/{id}
public IActionResult GetImage(int id)
{
var contentRoot = _env.ContentRootPath + "//Pics";
var path = Path.Combine(contentRoot, id + ".png");
Byte[] b = System.IO.File.ReadAllBytes(path);
return File(b, "image/png");
}
static IEnumerable<SelectListItem> GetPreconfiguredCatalogBrands()
{
@ -73,18 +95,18 @@ namespace eShopWeb.Controllers
{
return new List<CatalogItem>()
{
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=2, Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = 19.5M, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/1" },
new CatalogItem() { CatalogTypeId=1,CatalogBrandId=2, Description = ".NET Black & White Mug", Name = ".NET Black & White Mug", Price= 8.50M, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/2" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=5, Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/3" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=2, Description = ".NET Foundation Sweatshirt", Name = ".NET Foundation Sweatshirt", Price = 12, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/4" },
new CatalogItem() { CatalogTypeId=3,CatalogBrandId=5, Description = "Roslyn Red Sheet", Name = "Roslyn Red Sheet", Price = 8.5M, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/5" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=2, Description = ".NET Blue Sweatshirt", Name = ".NET Blue Sweatshirt", Price = 12, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/6" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=5, Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/7" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=5, Description = "Kudu Purple Sweatshirt", Name = "Kudu Purple Sweatshirt", Price = 8.5M, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/8" },
new CatalogItem() { CatalogTypeId=1,CatalogBrandId=5, Description = "Cup<T> White Mug", Name = "Cup<T> White Mug", Price = 12, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/9" },
new CatalogItem() { CatalogTypeId=3,CatalogBrandId=2, Description = ".NET Foundation Sheet", Name = ".NET Foundation Sheet", Price = 12, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/10" },
new CatalogItem() { CatalogTypeId=3,CatalogBrandId=2, Description = "Cup<T> Sheet", Name = "Cup<T> Sheet", Price = 8.5M, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/11" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=5, Description = "Prism White TShirt", Name = "Prism White TShirt", Price = 12, PictureUri = "http://externalcatalogbaseurltobereplaced/api/v1/pic/12" }
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=2, Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = 19.5M, PictureUri = "http://localhost:5106/catalog/pic/1" },
new CatalogItem() { CatalogTypeId=1,CatalogBrandId=2, Description = ".NET Black & White Mug", Name = ".NET Black & White Mug", Price= 8.50M, PictureUri = "http://localhost:5106/catalog/pic/2" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=5, Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PictureUri = "http://localhost:5106/catalog/pic/3" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=2, Description = ".NET Foundation Sweatshirt", Name = ".NET Foundation Sweatshirt", Price = 12, PictureUri = "http://localhost:5106/catalog/pic/4" },
new CatalogItem() { CatalogTypeId=3,CatalogBrandId=5, Description = "Roslyn Red Sheet", Name = "Roslyn Red Sheet", Price = 8.5M, PictureUri = "http://localhost:5106/catalog/pic/5" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=2, Description = ".NET Blue Sweatshirt", Name = ".NET Blue Sweatshirt", Price = 12, PictureUri = "http://localhost:5106/catalog/pic/6" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=5, Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PictureUri = "http://localhost:5106/catalog/pic/7" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=5, Description = "Kudu Purple Sweatshirt", Name = "Kudu Purple Sweatshirt", Price = 8.5M, PictureUri = "http://localhost:5106/catalog/pic/8" },
new CatalogItem() { CatalogTypeId=1,CatalogBrandId=5, Description = "Cup<T> White Mug", Name = "Cup<T> White Mug", Price = 12, PictureUri = "http://localhost:5106/catalog/pic/9" },
new CatalogItem() { CatalogTypeId=3,CatalogBrandId=2, Description = ".NET Foundation Sheet", Name = ".NET Foundation Sheet", Price = 12, PictureUri = "http://localhost:5106/catalog/pic/10" },
new CatalogItem() { CatalogTypeId=3,CatalogBrandId=2, Description = "Cup<T> Sheet", Name = "Cup<T> Sheet", Price = 8.5M, PictureUri = "http://localhost:5106/catalog/pic/11" },
new CatalogItem() { CatalogTypeId=2,CatalogBrandId=5, Description = "Prism White TShirt", Name = "Prism White TShirt", Price = 12, PictureUri = "http://localhost:5106/catalog/pic/12" }
};
}
}


BIN
src/Web/WebMonolithic/eShopWeb/Pics/1.png View File

Before After
Width: 370  |  Height: 241  |  Size: 148 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/10.png View File

Before After
Width: 372  |  Height: 242  |  Size: 223 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/11.png View File

Before After
Width: 371  |  Height: 243  |  Size: 212 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/12.png View File

Before After
Width: 370  |  Height: 243  |  Size: 165 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/2.png View File

Before After
Width: 371  |  Height: 240  |  Size: 41 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/3.png View File

Before After
Width: 371  |  Height: 242  |  Size: 170 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/4.png View File

Before After
Width: 372  |  Height: 240  |  Size: 152 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/5.png View File

Before After
Width: 369  |  Height: 243  |  Size: 226 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/6.png View File

Before After
Width: 372  |  Height: 242  |  Size: 179 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/7.png View File

Before After
Width: 372  |  Height: 243  |  Size: 182 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/8.png View File

Before After
Width: 371  |  Height: 242  |  Size: 167 KiB

BIN
src/Web/WebMonolithic/eShopWeb/Pics/9.png View File

Before After
Width: 370  |  Height: 242  |  Size: 40 KiB

+ 1
- 0
src/Web/WebMonolithic/eShopWeb/Program.cs View File

@ -13,6 +13,7 @@ namespace eShopWeb
{
var host = new WebHostBuilder()
.UseKestrel()
.UseUrls("http://0.0.0.0:5106")
.UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration()
.UseStartup<Startup>()


+ 1
- 1
src/Web/WebMonolithic/eShopWeb/Properties/launchSettings.json View File

@ -3,7 +3,7 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:58298/",
"applicationUrl": "http://localhost:5106/",
"sslPort": 0
}
},


+ 30
- 0
src/Web/WebMonolithic/eShopWeb/eShopWeb.csproj View File

@ -7,6 +7,36 @@
<PropertyGroup>
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
</PropertyGroup>
<ItemGroup>
<None Remove="Pics\1.png" />
<None Remove="Pics\10.png" />
<None Remove="Pics\11.png" />
<None Remove="Pics\12.png" />
<None Remove="Pics\2.png" />
<None Remove="Pics\3.png" />
<None Remove="Pics\4.png" />
<None Remove="Pics\5.png" />
<None Remove="Pics\6.png" />
<None Remove="Pics\7.png" />
<None Remove="Pics\8.png" />
<None Remove="Pics\9.png" />
</ItemGroup>
<ItemGroup>
<Content Include="Pics\1.png" />
<Content Include="Pics\10.png" />
<Content Include="Pics\11.png" />
<Content Include="Pics\12.png" />
<Content Include="Pics\2.png" />
<Content Include="Pics\3.png" />
<Content Include="Pics\4.png" />
<Content Include="Pics\5.png" />
<Content Include="Pics\6.png" />
<Content Include="Pics\7.png" />
<Content Include="Pics\8.png" />
<Content Include="Pics\9.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.3" />


Loading…
Cancel
Save