Refactor namespaces and add Grand.Web.Models project

Author: KrzysztofPajak

GrandNode.sln

@@ -139,6 +139,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.Api", "src\Mod
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.ScheduledTasks", "src\Modules\Grand.Module.ScheduledTasks\Grand.Module.ScheduledTasks.csproj", "{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Web.Models", "src\Web\Grand.Web.Models\Grand.Web.Models.csproj", "{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -368,6 +370,10 @@ Global
 		{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -429,6 +435,7 @@ Global
 		{75F9D855-026B-4BCB-90CE-3800F02FA0A7} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
 		{E0B26803-010B-4198-8016-002242076B61} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
 		{136F1E35-8B20-465C-8D42-30A5A0D0DA1F} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}

src/Web/Grand.Web.Common/Binders/CustomAttributesBinder.cs src/Core/Grand.Infrastructure/ModelBinding/CustomAttributesBinder.cs

@@ -1,8 +1,8 @@
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System.Text.RegularExpressions;
 
-namespace Grand.Web.Common.Binders;
+namespace Grand.Infrastructure.ModelBinding;
 
 public class CustomAttributesBinder : IModelBinder
 {

src/Web/Grand.Web.Common/Page/Paging/BasePageableModel.cs src/Core/Grand.Infrastructure/Models/BasePageableModel.cs

@@ -3,7 +3,7 @@
 using Grand.Domain;
 using Grand.SharedKernel.Attributes;
 
-namespace Grand.Web.Common.Page.Paging;
+namespace Grand.Infrastructure.Models;
 
 public abstract class BasePageableModel : IPageableModel
 {

src/Web/Grand.Web.Common/Models/CustomAttributeModel.cs src/Core/Grand.Infrastructure/Models/CustomAttributeModel.cs

@@ -1,4 +1,4 @@
-namespace Grand.Web.Common.Models;
+namespace Grand.Infrastructure.Models;
 
 public class CustomAttributeModel
 {

src/Web/Grand.Web.Common/Page/Paging/IPageableModel.cs src/Core/Grand.Infrastructure/Models/IPageableModel.cs

@@ -2,7 +2,7 @@
 
 using Grand.SharedKernel.Attributes;
 
-namespace Grand.Web.Common.Page.Paging;
+namespace Grand.Infrastructure.Models;
 
 /// <summary>
 ///     A collection of objects that has been split into pages.

src/Plugins/Theme.Modern/Theme.Modern.csproj

@@ -34,7 +34,7 @@
             <Private>false</Private>
             <ExcludeAssets>all</ExcludeAssets>
         </ProjectReference>
-        <ProjectReference Include="..\..\Web\Grand.Web\Grand.Web.csproj">
+        <ProjectReference Include="..\..\Web\Grand.Web.Models\Grand.Web.Models.csproj">
             <Private>false</Private>
             <ExcludeAssets>all</ExcludeAssets>
         </ProjectReference>

src/Plugins/Theme.Modern/Views/Modern/_ViewImports.cshtml

@@ -14,7 +14,6 @@
 @using Grand.Web.Common.Extensions
 @using Grand.Web.Common.Security.Captcha
 @using Grand.Web.Common.Themes
-@using Grand.Web.Extensions
 @using Grand.Web.Models.Blogs
 @using Grand.Web.Models.Catalog
 @using Grand.Web.Models.Checkout

src/Web/Grand.Web.Admin/Controllers/CustomerController.cs

@@ -23,9 +23,9 @@
 using Grand.Web.Admin.Models.Orders;
 using Grand.Web.Common.DataSource;
 using Grand.Web.Common.Filters;
-using Grand.Web.Common.Models;
 using Grand.Web.Common.Security.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Admin.Controllers;
 

src/Web/Grand.Web.Admin/Models/Orders/AddProductToOrderModel.cs

@@ -1,5 +1,5 @@
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Admin.Models.Orders;

src/Web/Grand.Web.Common/Binders/CustomAttributesBinderProvider.cs

@@ -1,4 +1,5 @@
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
 

src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs

@@ -1,6 +1,6 @@
 using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Infrastructure.Models;
 using Grand.Web.Common.Extensions;
-using Grand.Web.Common.Page.Paging;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;

src/Web/Grand.Web/Models/Blogs/AddBlogCommentModel.cs src/Web/Grand.Web.Models/Blogs/AddBlogCommentModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Blogs;
 

src/Web/Grand.Web/Models/Blogs/BlogCommentModel.cs src/Web/Grand.Web.Models/Blogs/BlogCommentModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Catalog;
 

src/Web/Grand.Web/Models/Blogs/BlogPagingFilteringModel.cs src/Web/Grand.Web.Models/Blogs/BlogPagingFilteringModel.cs

@@ -3,7 +3,6 @@
 using Grand.Domain.Catalog;
 using Grand.Infrastructure.Extensions;
 using Grand.Infrastructure.Models;
-using Grand.Web.Common.Page.Paging;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Rendering;
 

src/Web/Grand.Web/Models/Blogs/BlogPostCategoryModel.cs src/Web/Grand.Web.Models/Blogs/BlogPostCategoryModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Catalog;
 

src/Web/Grand.Web/Models/Blogs/BlogPostListModel.cs src/Web/Grand.Web.Models/Blogs/BlogPostListModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Catalog;
 

src/Web/Grand.Web/Models/Blogs/BlogPostModel.cs src/Web/Grand.Web.Models/Blogs/BlogPostModel.cs

@@ -1,5 +1,5 @@
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.Catalog;

src/Web/Grand.Web/Models/Blogs/BlogPostTagListModel.cs src/Web/Grand.Web.Models/Blogs/BlogPostTagListModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Catalog;
 

src/Web/Grand.Web/Models/Blogs/BlogPostTagModel.cs src/Web/Grand.Web.Models/Blogs/BlogPostTagModel.cs

@@ -1,7 +1,5 @@
 using Grand.Infrastructure.ModelBinding;
 using Grand.Infrastructure.Models;
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using System.ComponentModel.DataAnnotations;

src/Web/Grand.Web/Models/Blogs/BlogPostYearMonthModel.cs src/Web/Grand.Web.Models/Blogs/BlogPostYearMonthModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Common;
 

src/Web/Grand.Web/Models/Blogs/HomePageBlogItemsModel.cs src/Web/Grand.Web.Models/Blogs/HomePageBlogItemsModel.cs

@@ -1,5 +1,5 @@
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.Contact;

src/Web/Grand.Web/Models/Catalog/BrandListModel.cs src/Web/Grand.Web.Models/Catalog/BrandListModel.cs

@@ -2,8 +2,6 @@
 using Grand.Domain.Common;
 using Grand.Infrastructure.ModelBinding;
 using Grand.Infrastructure.Models;
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.Contact;

src/Web/Grand.Web/Models/Catalog/BrandModel.cs src/Web/Grand.Web.Models/Catalog/BrandModel.cs

@@ -2,8 +2,6 @@
 using Grand.Infrastructure.ModelBinding;
 using Grand.Infrastructure.Models;
 using Grand.SharedKernel;
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
 using Grand.Web.Models.Newsletter;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;

src/Web/Grand.Web/Models/Catalog/BrandPagingModel.cs src/Web/Grand.Web.Models/Catalog/BrandPagingModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Customer;
 

src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs src/Web/Grand.Web.Models/Catalog/CatalogPagingFilteringModel.cs

@@ -1,8 +1,6 @@
 using Grand.Infrastructure.ModelBinding;
 using Grand.Infrastructure.Models;
 using Grand.SharedKernel;
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
 using Grand.Web.Models.Newsletter;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;

src/Web/Grand.Web/Models/Catalog/CategoryListModel.cs src/Web/Grand.Web.Models/Catalog/CategoryListModel.cs

@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\Build\Grand.Common.props" />
+    <ItemGroup>
+        <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
+        <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" />
+        <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
+    </ItemGroup>
+</Project>

src/Web/Grand.Web/Models/Catalog/CategoryModel.cs src/Web/Grand.Web.Models/Catalog/CategoryModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.News;
 

src/Web/Grand.Web/Models/Catalog/CategoryNavigationModel.cs src/Web/Grand.Web.Models/Catalog/CategoryNavigationModel.cs

@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Orders;
 

src/Web/Grand.Web/Models/Catalog/CategoryPagingModel.cs src/Web/Grand.Web.Models/Catalog/CategoryPagingModel.cs

@@ -1,5 +1,5 @@
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.ShoppingCart;

src/Web/Grand.Web/Models/Catalog/CategorySimpleModel.cs src/Web/Grand.Web.Models/Catalog/CategorySimpleModel.cs

@@ -1,6 +1,6 @@
 using Grand.Domain.Orders;
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.ShoppingCart;

src/Web/Grand.Web/Models/Catalog/CollectionListModel.cs src/Web/Grand.Web.Models/Catalog/CollectionListModel.cs

@@ -1,6 +1,6 @@
 using Grand.Domain.Customers;
 using Grand.Domain.Stores;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Commands.Models.Contact;

src/Web/Grand.Web/Models/Catalog/CollectionModel.cs src/Web/Grand.Web.Models/Catalog/CollectionModel.cs

@@ -2,7 +2,7 @@
 using Grand.Domain.Customers;
 using Grand.Domain.Orders;
 using Grand.Domain.Stores;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Commands.Models.ShoppingCart;

src/Web/Grand.Web/Models/Catalog/CollectionNavigationModel.cs src/Web/Grand.Web.Models/Catalog/CollectionNavigationModel.cs

@@ -1,5 +1,5 @@
 using Grand.Domain.Common;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Features.Models.Common;

src/Web/Grand.Web/Models/Catalog/CollectionPagingModel.cs src/Web/Grand.Web.Models/Catalog/CollectionPagingModel.cs

@@ -1,5 +1,5 @@
 using Grand.Domain.Common;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Features.Models.Customers;

src/Web/Grand.Web/Models/Catalog/CompareProductsModel.cs src/Web/Grand.Web.Models/Catalog/CompareProductsModel.cs

@@ -1,6 +1,6 @@
 using Grand.Domain.Catalog;
 using Grand.Domain.Common;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Features.Models.ShoppingCart;

src/Web/Grand.Web/Models/Catalog/CustomerOutOfStockSubscriptionsModel.cs src/Web/Grand.Web.Models/Catalog/CustomerOutOfStockSubscriptionsModel.cs

@@ -20,6 +20,7 @@
 		<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" />
 		<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" />
 		<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
+		<ProjectReference Include="..\Grand.Web.Models\Grand.Web.Models.csproj" />
 		<ProjectReference Include="..\Grand.Web.Common\Grand.Web.Common.csproj" />
 		<ProjectReference Include="..\Grand.Web.Admin\Grand.Web.Admin.csproj" />
 		<ProjectReference Include="..\Grand.Web.Vendor\Grand.Web.Vendor.csproj" />