Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
BasePublicController.cs move to the project Grand.Web.Common
support9f73f5c83729
diff --git a/src/Web/Grand.Web/Controllers/BasePublicController.cs b/src/Web/Grand.Web.Common/Controllers/BasePublicController.cssimilarity index 77%rename from src/Web/Grand.Web/Controllers/BasePublicController.csrename to src/Web/Grand.Web.Common/Controllers/BasePublicController.csindex 1022fbf9a..d335a2367 100644--- a/src/Web/Grand.Web/Controllers/BasePublicController.cs+++ b/src/Web/Grand.Web.Common/Controllers/BasePublicController.cs@@ -1,8 +1,7 @@-using Grand.Web.Common.Controllers;-using Grand.Web.Common.Filters;+using Grand.Web.Common.Filters;using Microsoft.AspNetCore.Mvc;-namespace Grand.Web.Controllers+namespace Grand.Web.Common.Controllers{[PublicStore][ClosedStore]@@ -19,8 +18,8 @@ namespace Grand.Web.Controllersprivate bool IsJsonResponseView(){if (Request.Method.Equals("GET", StringComparison.InvariantCultureIgnoreCase))- return Request.Headers.Accept.ToString()- .Equals("application/json", StringComparison.InvariantCultureIgnoreCase);+ return Request.Headers.Accept.ToString().Contains("application/json", StringComparison.InvariantCultureIgnoreCase) ||+ Request.Headers.Accept.ToString().Equals("*/*", StringComparison.InvariantCultureIgnoreCase);if (Request.Method.Equals("POST", StringComparison.InvariantCultureIgnoreCase))return Request.ContentType?.Contains("application/json") ?? false;@@ -31,7 +30,7 @@ namespace Grand.Web.Controllerspublic new IActionResult View(object model){if (IsJsonResponseView())- return Json(model);+ return Ok(model);return base.View(model);}diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.csindex d08106a8d..21876bf61 100644--- a/src/Web/Grand.Web/Controllers/AccountController.cs+++ b/src/Web/Grand.Web/Controllers/AccountController.cs@@ -13,6 +13,7 @@ using Grand.Domain.Stores;using Grand.Infrastructure;using Grand.Infrastructure.Extensions;using Grand.Web.Commands.Models.Customers;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Captcha;using Grand.Web.Extensions;diff --git a/src/Web/Grand.Web/Controllers/ActionCartController.cs b/src/Web/Grand.Web/Controllers/ActionCartController.csindex 88c5c9343..48691cb6e 100644--- a/src/Web/Grand.Web/Controllers/ActionCartController.cs+++ b/src/Web/Grand.Web/Controllers/ActionCartController.cs@@ -9,6 +9,7 @@ using Grand.Domain.Catalog;using Grand.Domain.Common;using Grand.Domain.Orders;using Grand.Infrastructure;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Extensions;using Grand.Web.Features.Models.Products;diff --git a/src/Web/Grand.Web/Controllers/BlogController.cs b/src/Web/Grand.Web/Controllers/BlogController.csindex f2a435681..e5d559b20 100644--- a/src/Web/Grand.Web/Controllers/BlogController.cs+++ b/src/Web/Grand.Web/Controllers/BlogController.cs@@ -7,6 +7,7 @@ using Grand.Business.Core.Utilities.Common.Security;using Grand.Domain.Blogs;using Grand.Infrastructure;using Grand.Web.Commands.Models.Blogs;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Captcha;using Grand.Web.Events;diff --git a/src/Web/Grand.Web/Controllers/CatalogController.cs b/src/Web/Grand.Web/Controllers/CatalogController.csindex 177f99ea7..4af8ba2ba 100644--- a/src/Web/Grand.Web/Controllers/CatalogController.cs+++ b/src/Web/Grand.Web/Controllers/CatalogController.cs@@ -14,6 +14,7 @@ using Grand.Domain.Customers;using Grand.Domain.Vendors;using Grand.Infrastructure;using Grand.Web.Commands.Models.Vendors;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Features.Models.Catalog;using Grand.Web.Features.Models.Vendors;diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.csindex ca3b70af0..0e7a4a65e 100644--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs@@ -17,6 +17,7 @@ using Grand.Domain.Payments;using Grand.Domain.Shipping;using Grand.Infrastructure;using Grand.Infrastructure.Extensions;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Extensions;using Grand.Web.Features.Models.Checkout;diff --git a/src/Web/Grand.Web/Controllers/ContactController.cs b/src/Web/Grand.Web/Controllers/ContactController.csindex 3596812b3..5308cebef 100644--- a/src/Web/Grand.Web/Controllers/ContactController.cs+++ b/src/Web/Grand.Web/Controllers/ContactController.cs@@ -7,9 +7,9 @@ using Grand.Domain.Media;using Grand.Domain.Stores;using Grand.Infrastructure;using Grand.Web.Commands.Models.Contact;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;-using Grand.Web.Controllers;using Grand.Web.Events;using Grand.Web.Models.Contact;using MediatR;@@ -41,6 +41,7 @@ public class ContactController : BasePublicController//available even when a store is closed[ClosedStore(true)]+ [HttpGet]public virtual async Task<IActionResult> ContactUs([FromServices] StoreInformationSettings storeInformationSettings,[FromServices] IPageService pageService)diff --git a/src/Web/Grand.Web/Controllers/CountryController.cs b/src/Web/Grand.Web/Controllers/CountryController.csindex d432b979f..4e9cd452c 100644--- a/src/Web/Grand.Web/Controllers/CountryController.cs+++ b/src/Web/Grand.Web/Controllers/CountryController.cs@@ -1,4 +1,5 @@using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Features.Models.Common;using Grand.Web.Models.Common;diff --git a/src/Web/Grand.Web/Controllers/CourseController.cs b/src/Web/Grand.Web/Controllers/CourseController.csindex ea6ff9bf2..592cebf54 100644--- a/src/Web/Grand.Web/Controllers/CourseController.cs+++ b/src/Web/Grand.Web/Controllers/CourseController.cs@@ -9,6 +9,7 @@ using Grand.Domain.Courses;using Grand.Domain.Customers;using Grand.Infrastructure;using Grand.Web.Commands.Models.Courses;+using Grand.Web.Common.Controllers;using Grand.Web.Features.Models.Courses;using MediatR;using Microsoft.AspNetCore.Mvc;diff --git a/src/Web/Grand.Web/Controllers/DownloadController.cs b/src/Web/Grand.Web/Controllers/DownloadController.csindex ff86622cf..14237dc7f 100644--- a/src/Web/Grand.Web/Controllers/DownloadController.cs+++ b/src/Web/Grand.Web/Controllers/DownloadController.cs@@ -9,6 +9,7 @@ using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Orders;using Grand.Infrastructure;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Microsoft.AspNetCore.Mvc;using System.IO.Compression;diff --git a/src/Web/Grand.Web/Controllers/HomeController.cs b/src/Web/Grand.Web/Controllers/HomeController.csindex 13730b371..9e38b153d 100644--- a/src/Web/Grand.Web/Controllers/HomeController.cs+++ b/src/Web/Grand.Web/Controllers/HomeController.cs@@ -1,4 +1,5 @@-using Microsoft.AspNetCore.Mvc;+using Grand.Web.Common.Controllers;+using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Controllers{diff --git a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web/Controllers/KnowledgebaseController.csindex e7d29acd8..a811a87f7 100644--- a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs+++ b/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs@@ -12,6 +12,7 @@ using Grand.Domain.Knowledgebase;using Grand.Domain.Localization;using Grand.Infrastructure;using Grand.Infrastructure.Caching;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Captcha;using Grand.Web.Events.Cache;diff --git a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.csindex ed10b3e77..8a3080529 100644--- a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs+++ b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs@@ -6,6 +6,7 @@ using Grand.Domain.Common;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Web.Commands.Models.Orders;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Extensions;using Grand.Web.Features.Models.Common;diff --git a/src/Web/Grand.Web/Controllers/NewsController.cs b/src/Web/Grand.Web/Controllers/NewsController.csindex 4f05214b8..33af8605b 100644--- a/src/Web/Grand.Web/Controllers/NewsController.cs+++ b/src/Web/Grand.Web/Controllers/NewsController.cs@@ -7,6 +7,7 @@ using Grand.Business.Core.Utilities.Common.Security;using Grand.Domain.News;using Grand.Infrastructure;using Grand.Web.Commands.Models.News;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Events;using Grand.Web.Features.Models.News;diff --git a/src/Web/Grand.Web/Controllers/OrderController.cs b/src/Web/Grand.Web/Controllers/OrderController.csindex 6ffb6edc5..23b24ff67 100644--- a/src/Web/Grand.Web/Controllers/OrderController.cs+++ b/src/Web/Grand.Web/Controllers/OrderController.cs@@ -10,6 +10,7 @@ using Grand.Domain.Payments;using Grand.Domain.Shipping;using Grand.Infrastructure;using Grand.Web.Commands.Models.Orders;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Common.Page;using Grand.Web.Events;diff --git a/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs b/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.csindex 80302f111..54226a1d1 100644--- a/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs+++ b/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs@@ -6,6 +6,7 @@ using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Domain.Orders;using Grand.Infrastructure;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Features.Models.ShoppingCart;using Grand.Web.Models.Catalog;diff --git a/src/Web/Grand.Web/Controllers/PageController.cs b/src/Web/Grand.Web/Controllers/PageController.csindex dbf90252a..832fcb8d1 100644--- a/src/Web/Grand.Web/Controllers/PageController.cs+++ b/src/Web/Grand.Web/Controllers/PageController.cs@@ -1,6 +1,7 @@using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Security;using Grand.Business.Core.Utilities.Common.Security;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Features.Models.Pages;using Grand.Web.Models.Pages;diff --git a/src/Web/Grand.Web/Controllers/ProductController.cs b/src/Web/Grand.Web/Controllers/ProductController.csindex 9d09764cb..34d80e0df 100644--- a/src/Web/Grand.Web/Controllers/ProductController.cs+++ b/src/Web/Grand.Web/Controllers/ProductController.cs@@ -13,6 +13,7 @@ using Grand.Domain.Catalog;using Grand.Domain.Media;using Grand.Infrastructure;using Grand.Web.Commands.Models.Products;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Captcha;diff --git a/src/Web/Grand.Web/Controllers/PushNotificationsController.cs b/src/Web/Grand.Web/Controllers/PushNotificationsController.csindex fc1331ef1..c538dfc07 100644--- a/src/Web/Grand.Web/Controllers/PushNotificationsController.cs+++ b/src/Web/Grand.Web/Controllers/PushNotificationsController.cs@@ -1,6 +1,7 @@using Grand.Business.Core.Interfaces.Marketing.PushNotifications;using Grand.Domain.PushNotifications;using Grand.Infrastructure;+using Grand.Web.Common.Controllers;using Microsoft.AspNetCore.Mvc;namespace Grand.Web.Controllersdiff --git a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web/Controllers/ShoppingCartController.csindex 1a6fd140a..a634490ce 100644--- a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs+++ b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs@@ -15,6 +15,7 @@ using Grand.Domain.Media;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Web.Commands.Models.ShoppingCart;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;using Grand.Web.Features.Models.ShoppingCart;diff --git a/src/Web/Grand.Web/Controllers/VendorController.cs b/src/Web/Grand.Web/Controllers/VendorController.csindex 53eecd2ca..f23ea516d 100644--- a/src/Web/Grand.Web/Controllers/VendorController.cs+++ b/src/Web/Grand.Web/Controllers/VendorController.cs@@ -12,6 +12,7 @@ using Grand.Domain.Vendors;using Grand.Infrastructure;using Grand.SharedKernel.Extensions;using Grand.Web.Commands.Models.Vendors;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Captcha;diff --git a/src/Web/Grand.Web/Controllers/WishlistController.cs b/src/Web/Grand.Web/Controllers/WishlistController.csindex bcdefc071..694ea88d9 100644--- a/src/Web/Grand.Web/Controllers/WishlistController.cs+++ b/src/Web/Grand.Web/Controllers/WishlistController.cs@@ -10,6 +10,7 @@ using Grand.Domain.Customers;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.SharedKernel.Extensions;+using Grand.Web.Common.Controllers;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Captcha;using Grand.Web.Features.Models.ShoppingCart;