Fix in monolithic part for issue dotnet-architecture#67 dotnet-architecture#67 ViewModels folder

dsrodenas · dsrodenas · commit fb2da83805b3 · 2017-03-02T16:59:03.000+01:00
diff --git a/src/Web/WebMonolithic/eShopWeb/Controllers/CatalogController.cs b/src/Web/WebMonolithic/eShopWeb/Controllers/CatalogController.cs
@@ -1,15 +1,10 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using eShopWeb.Models.CatalogViewModels;
-using eShopWeb.Models;
-using eShopWeb.Models.Pagination;
-using Microsoft.AspNetCore.Mvc.Rendering;
+﻿using eShopWeb.Services;
+using eShopWeb.ViewModels;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using System;
 using System.IO;
-using eShopWeb.Services;
+using System.Threading.Tasks;
 
 // For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
@@ -33,7 +28,7 @@ public async Task<IActionResult> Index(int? BrandFilterApplied, int? TypesFilter
             var itemsPage = 10;           
             var catalog = await _catalogSvc.GetCatalogItems(page ?? 0, itemsPage, BrandFilterApplied, TypesFilterApplied);
 
-            var vm = new IndexViewModel()
+            var vm = new CatalogIndex()
             {
                 CatalogItems = catalog.Data,
                 Brands = await _catalogSvc.GetBrands(),
diff --git a/src/Web/WebMonolithic/eShopWeb/Services/CatalogService.cs b/src/Web/WebMonolithic/eShopWeb/Services/CatalogService.cs
@@ -1,13 +1,12 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using eShopWeb.Models;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using eShopWeb.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Configuration;
+using eShopWeb.ViewModels;
 
 namespace eShopWeb.Services
 {
diff --git a/src/Web/WebMonolithic/eShopWeb/Services/ICatalogService.cs b/src/Web/WebMonolithic/eShopWeb/Services/ICatalogService.cs
@@ -1,8 +1,6 @@
-﻿using eShopWeb.Models;
+﻿using eShopWeb.ViewModels;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace eShopWeb.Services
diff --git a/src/Web/WebMonolithic/eShopWeb/ViewModels/Catalog.cs b/src/Web/WebMonolithic/eShopWeb/ViewModels/Catalog.cs
@@ -1,9 +1,7 @@
-﻿using System;
+﻿using eShopWeb.Models;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace eShopWeb.Models
+namespace eShopWeb.ViewModels
 {
     public class Catalog
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/ViewModels/CatalogIndex.cs b/src/Web/WebMonolithic/eShopWeb/ViewModels/CatalogIndex.cs
@@ -1,13 +1,10 @@
-﻿using Microsoft.AspNetCore.Mvc.Rendering;
-using eShopWeb.Models.Pagination;
-using System;
+﻿using eShopWeb.Models;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace eShopWeb.Models.CatalogViewModels
+namespace eShopWeb.ViewModels
 {
-    public class IndexViewModel
+    public class CatalogIndex
     {
         public IEnumerable<CatalogItem> CatalogItems { get; set; }
         public IEnumerable<SelectListItem> Brands { get; set; }
diff --git a/src/Web/WebMonolithic/eShopWeb/ViewModels/PaginationInfo.cs b/src/Web/WebMonolithic/eShopWeb/ViewModels/PaginationInfo.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace eShopWeb.Models.Pagination
+namespace eShopWeb.ViewModels
 {
     public class PaginationInfo
     {
diff --git a/src/Web/WebMonolithic/eShopWeb/Views/Catalog/Index.cshtml b/src/Web/WebMonolithic/eShopWeb/Views/Catalog/Index.cshtml
@@ -1,6 +1,6 @@
 ﻿@{
     ViewData["Title"] = "Catalog";
-    @model eShopWeb.Models.CatalogViewModels.IndexViewModel
+    @model eShopWeb.ViewModels.CatalogIndex
 }
 <section class="esh-catalog-hero">
     <div class="container">
diff --git a/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_pagination.cshtml b/src/Web/WebMonolithic/eShopWeb/Views/Catalog/_pagination.cshtml
@@ -1,4 +1,4 @@
-﻿@model eShopWeb.Models.Pagination.PaginationInfo
+﻿@model eShopWeb.ViewModels.PaginationInfo
 
 <div class="esh-pager">
     <div class="container">

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`		`-using System;`
	`1`	`+using eShopWeb.Models;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
`5`	`3`
`6`		`-namespace eShopWeb.Models`
	`4`	`+namespace eShopWeb.ViewModels`
`7`	`5`	`{`
`8`	`6`	`public class Catalog`
`9`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`
`6`		`-namespace eShopWeb.Models.Pagination`
	`6`	`+namespace eShopWeb.ViewModels`
`7`	`7`	`{`
`8`	`8`	`public class PaginationInfo`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`@{`
`2`	`2`	`ViewData["Title"] = "Catalog";`
`3`		`- @model eShopWeb.Models.CatalogViewModels.IndexViewModel`
	`3`	`+ @model eShopWeb.ViewModels.CatalogIndex`
`4`	`4`	`}`
`5`	`5`	`<section class="esh-catalog-hero">`
`6`	`6`	`<div class="container">`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@model eShopWeb.Models.Pagination.PaginationInfo`
	`1`	`+@model eShopWeb.ViewModels.PaginationInfo`
`2`	`2`
`3`	`3`	`<div class="esh-pager">`
`4`	`4`	`<div class="container">`