Adjust the structure of Web projects

integration/EasyAbp.EShop/src/EasyAbp.EShop.Web/EShopWebModule.cs

@@ -6,6 +6,7 @@ using EasyAbp.EShop.Orders.Web;
 using EasyAbp.EShop.Payments.Web;
 using EasyAbp.EShop.Products.Web;
 using EasyAbp.EShop.Stores.Web;
+using EasyAbp.EShop.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;

integration/EasyAbp.EShop/src/EasyAbp.EShop.Web/EShopMenuContributor.cs → integration/EasyAbp.EShop/src/EasyAbp.EShop.Web/Menus/EShopMenuContributor.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.UI.Navigation;
 
-namespace EasyAbp.EShop.Web
+namespace EasyAbp.EShop.Web.Menus
 {
     public class EShopMenuContributor : IMenuContributor
     {

integration/EasyAbp.EShop/src/EasyAbp.EShop.Web/Menus/EShopMenus.cs

@@ -0,0 +1,13 @@
+namespace EasyAbp.EShop.Web.Menus
+{
+    public class EShopMenus
+    {
+        public const string ModuleGroupPrefix = "EasyAbp.EShop";
+
+        public const string Prefix = ModuleGroupPrefix;
+        
+        //Add your menu items here...
+        //public const string Home = Prefix + ".MyNewMenuItem";
+
+    }
+}

integration/EasyAbp.EShop/src/EasyAbp.EShop.Web/Pages/EShop/Index.cshtml

@@ -1,5 +1,4 @@
 @page
-@inherits EasyAbp.EShop.Web.Pages.EShopPage
 @model EasyAbp.EShop.Web.Pages.EShop.IndexModel
 @{
 }

integration/EasyAbp.EShop/src/EasyAbp.EShop.Web/Pages/EShopPage.cs

@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Localization;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
-using EasyAbp.EShop.Localization;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-
-namespace EasyAbp.EShop.Web.Pages
-{
-    /* Inherit your UI Pages from this class. To do that, add this line to your Pages (.cshtml files under the Page folder):
-     * @inherits EasyAbp.EShop.Web.Pages.EShopPage
-     */
-    public abstract class EShopPage : AbpPage
-    {
-        [RazorInject]
-        public IHtmlLocalizer<EShopResource> L { get; set; }
-    }
-}

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/EShopOrdersWebModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using EasyAbp.EShop.Orders.Localization;
+using EasyAbp.EShop.Orders.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/OrdersMenuContributor.cs → modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Menus/OrdersMenuContributor.cs

@@ -1,14 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using EasyAbp.EShop.Orders.Authorization;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Localization;
 using EasyAbp.EShop.Orders.Localization;
 using EasyAbp.EShop.Stores.Stores;
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.UI.Navigation;
 
-namespace EasyAbp.EShop.Orders.Web
+namespace EasyAbp.EShop.Orders.Web.Menus
 {
     public class OrdersMenuContributor : IMenuContributor
     {
@@ -24,7 +22,7 @@ namespace EasyAbp.EShop.Orders.Web
         {
             var l = context.GetLocalizer<OrdersResource>();            //Add main menu items.
 
-            var orderManagementMenuItem = new ApplicationMenuItem("EasyAbpEShopOrders", l["Menu:OrderManagement"]);
+            var orderManagementMenuItem = new ApplicationMenuItem(OrdersMenus.Prefix, l["Menu:OrderManagement"]);
 
             if (await context.IsGrantedAsync(OrdersPermissions.Orders.Manage))
             {
@@ -33,14 +31,14 @@ namespace EasyAbp.EShop.Orders.Web
                 var defaultStore = (await storeAppService.GetDefaultAsync())?.Id;
                 
                 orderManagementMenuItem.AddItem(
-                    new ApplicationMenuItem("EasyAbpEShopOrdersOrder", l["Menu:Order"], "/EShop/Orders/Orders/Order?storeId=" + defaultStore)
+                    new ApplicationMenuItem(OrdersMenus.Order, l["Menu:Order"], "/EShop/Orders/Orders/Order?storeId=" + defaultStore)
                 );
             }
             
             if (!orderManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == "EasyAbpEShop",
-                    () => new ApplicationMenuItem("EasyAbpEShop", l["Menu:EasyAbpEShop"]));
+                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == OrdersMenus.ModuleGroupPrefix,
+                    () => new ApplicationMenuItem(OrdersMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"]));
                 
                 eShopMenuItem.Items.Add(orderManagementMenuItem);
             }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Menus/OrdersMenus.cs

@@ -0,0 +1,15 @@
+namespace EasyAbp.EShop.Orders.Web.Menus
+{
+    public class OrdersMenus
+    {
+        public const string ModuleGroupPrefix = "EasyAbp.EShop";
+
+        public const string Prefix = ModuleGroupPrefix + ".Orders";
+        
+        public const string Order = Prefix + ".Order";
+
+        //Add your menu items here...
+        //public const string Home = Prefix + ".MyNewMenuItem";
+
+    }
+}

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Index.cshtml

@@ -1,5 +1,4 @@
 @page
-@inherits EasyAbp.EShop.Orders.Web.Pages.OrdersPage
 @model EasyAbp.EShop.Orders.Web.Pages.EShop.Orders.IndexModel
 @{
 }

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/EShop/Orders/Orders/Order/Index.cshtml

@@ -1,15 +1,18 @@
 @page
+@using EasyAbp.EShop.Orders.Localization
+@using EasyAbp.EShop.Orders.Web.Menus
 @using EasyAbp.EShop.Orders.Web.Pages.EShop.Orders.Orders.Order
+@using Microsoft.Extensions.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
-@inherits EasyAbp.EShop.Orders.Web.Pages.OrdersPage
 @model IndexModel
 @inject IPageLayout PageLayout
+@inject IStringLocalizer<OrdersResource> L
 @{
     PageLayout.Content.Title = L["Order"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:Order"].Value);
-    PageLayout.Content.MenuItemName = "EasyAbpEShopOrdersOrder";
+    PageLayout.Content.MenuItemName = OrdersMenus.Order;
 
-    var cardTitle = @L["Order"].Value;
+    var cardTitle = L["Order"].Value;
     
     if (Model.StoreName != null)
     {

modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Pages/OrdersPage.cs

@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Localization;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
-using EasyAbp.EShop.Orders.Localization;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-
-namespace EasyAbp.EShop.Orders.Web.Pages
-{
-    /* Inherit your UI Pages from this class. To do that, add this line to your Pages (.cshtml files under the Page folder):
-     * @inherits EasyAbp.EShop.Orders.Web.Pages.EShop.Orders.OrdersPage
-     */
-    public abstract class OrdersPage : AbpPage
-    {
-        [RazorInject]
-        public IHtmlLocalizer<OrdersResource> L { get; set; }
-    }
-}

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/EShopPaymentsWebModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using EasyAbp.EShop.Payments.Localization;
+using EasyAbp.EShop.Payments.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/PaymentsMenuContributor.cs → modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Menus/PaymentsMenuContributor.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
-using EasyAbp.EShop.Payments.Localization;
-using EasyAbp.EShop.Payments.Authorization;
 using System.Threading.Tasks;
+using EasyAbp.EShop.Payments.Authorization;
+using EasyAbp.EShop.Payments.Localization;
 using EasyAbp.EShop.Stores.Stores;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.UI.Navigation;
 
-namespace EasyAbp.EShop.Payments.Web
+namespace EasyAbp.EShop.Payments.Web.Menus
 {
     public class PaymentsMenuContributor : IMenuContributor
     {
@@ -22,7 +22,7 @@ namespace EasyAbp.EShop.Payments.Web
         {
             var l = context.GetLocalizer<PaymentsResource>();            //Add main menu items.
 
-            var paymentManagementMenuItem = new ApplicationMenuItem("EasyAbpEShopPayments", l["Menu:PaymentManagement"]);
+            var paymentManagementMenuItem = new ApplicationMenuItem(PaymentsMenus.Prefix, l["Menu:PaymentManagement"]);
              
             var storeAppService = context.ServiceProvider.GetRequiredService<IStoreAppService>();
 
@@ -31,20 +31,20 @@ namespace EasyAbp.EShop.Payments.Web
             if (await context.IsGrantedAsync(PaymentsPermissions.Payments.Manage))
             {
                 paymentManagementMenuItem.AddItem(
-                    new ApplicationMenuItem("EasyAbpEShopPaymentsPayment", l["Menu:Payment"], "/EShop/Payments/Payments/Payment?storeId=" + defaultStore)
+                    new ApplicationMenuItem(PaymentsMenus.Payment, l["Menu:Payment"], "/EShop/Payments/Payments/Payment?storeId=" + defaultStore)
                 );
             }
             if (await context.IsGrantedAsync(PaymentsPermissions.Refunds.Manage))
             {
                 paymentManagementMenuItem.AddItem(
-                    new ApplicationMenuItem("EasyAbpEShopPaymentsRefund", l["Menu:Refund"], "/EShop/Payments/Refunds/Refund?storeId=" + defaultStore)
+                    new ApplicationMenuItem(PaymentsMenus.Refund, l["Menu:Refund"], "/EShop/Payments/Refunds/Refund?storeId=" + defaultStore)
                 );
             }
 
             if (!paymentManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == "EasyAbpEShop",
-                    () => new ApplicationMenuItem("EasyAbpEShop", l["Menu:EasyAbpEShop"]));
+                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == PaymentsMenus.ModuleGroupPrefix,
+                    () => new ApplicationMenuItem(PaymentsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"]));
                 
                 eShopMenuItem.Items.Add(paymentManagementMenuItem);
             }

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Menus/PaymentsMenus.cs

@@ -0,0 +1,17 @@
+namespace EasyAbp.EShop.Payments.Web.Menus
+{
+    public class PaymentsMenus
+    {
+        public const string ModuleGroupPrefix = "EasyAbp.EShop";
+
+        public const string Prefix = ModuleGroupPrefix + ".Payments";
+        
+        public const string Payment = Prefix + ".Payment";
+        
+        public const string Refund = Prefix + ".Refund";
+
+        //Add your menu items here...
+        //public const string Home = Prefix + ".MyNewMenuItem";
+
+    }
+}

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Index.cshtml

@@ -1,5 +1,4 @@
 @page
-@inherits EasyAbp.EShop.Payments.Web.Pages.PaymentsPage
 @model EasyAbp.EShop.Payments.Web.Pages.EShop.Payments.IndexModel
 @{
 }

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Payments/Payment/Index.cshtml

@@ -1,18 +1,20 @@
 @page
 @using Microsoft.AspNetCore.Authorization
-@using EasyAbp.EShop.Payments.Authorization
+@using EasyAbp.EShop.Payments.Localization
+@using EasyAbp.EShop.Payments.Web.Menus
 @using EasyAbp.EShop.Payments.Web.Pages.EShop.Payments.Payments.Payment
+@using Microsoft.Extensions.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
-@inherits EasyAbp.EShop.Payments.Web.Pages.PaymentsPage
 @model IndexModel
 @inject IPageLayout PageLayout
+@inject IStringLocalizer<PaymentsResource> L
 @inject IAuthorizationService Authorization
 @{
     PageLayout.Content.Title = L["Payment"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:Payment"].Value);
-    PageLayout.Content.MenuItemName = "EasyAbpEShopPaymentsPayment";
+    PageLayout.Content.MenuItemName = PaymentsMenus.Payment;
     
-    var cardTitle = @L["Payment"].Value;
+    var cardTitle = L["Payment"].Value;
     
     if (Model.StoreName != null)
     {

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/EShop/Payments/Refunds/Refund/Index.cshtml

@@ -1,18 +1,21 @@
 @page
 @using Microsoft.AspNetCore.Authorization
 @using EasyAbp.EShop.Payments.Authorization
+@using EasyAbp.EShop.Payments.Localization
+@using EasyAbp.EShop.Payments.Web.Menus
 @using EasyAbp.EShop.Payments.Web.Pages.EShop.Payments.Refunds.Refund
+@using Microsoft.Extensions.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
-@inherits EasyAbp.EShop.Payments.Web.Pages.PaymentsPage
 @model IndexModel
 @inject IPageLayout PageLayout
+@inject IStringLocalizer<PaymentsResource> L
 @inject IAuthorizationService Authorization
 @{
     PageLayout.Content.Title = L["Refund"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:Refund"].Value);
-    PageLayout.Content.MenuItemName = "EasyAbpEShopPaymentsRefund";
+    PageLayout.Content.MenuItemName = PaymentsMenus.Refund;
     
-    var cardTitle = @L["Refund"].Value;
+    var cardTitle = L["Refund"].Value;
     
     if (Model.StoreName != null)
     {

modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Pages/PaymentsPage.cs

@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Localization;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
-using EasyAbp.EShop.Payments.Localization;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-
-namespace EasyAbp.EShop.Payments.Web.Pages
-{
-    /* Inherit your UI Pages from this class. To do that, add this line to your Pages (.cshtml files under the Page folder):
-     * @inherits EasyAbp.EShop.Payments.Web.Pages.PaymentsPage
-     */
-    public abstract class PaymentsPage : AbpPage
-    {
-        [RazorInject]
-        public IHtmlLocalizer<PaymentsResource> L { get; set; }
-    }
-}

modules/EasyAbp.EShop.Plugins/src/EasyAbp.EShop.Plugins.Web/EShopPluginsWebModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using EasyAbp.EShop.Plugins.Localization;
+using EasyAbp.EShop.Plugins.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;

modules/EasyAbp.EShop.Plugins/src/EasyAbp.EShop.Plugins.Web/PluginsMenuContributor.cs → modules/EasyAbp.EShop.Plugins/src/EasyAbp.EShop.Plugins.Web/Menus/PluginsMenuContributor.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.UI.Navigation;
 
-namespace EasyAbp.EShop.Plugins.Web
+namespace EasyAbp.EShop.Plugins.Web.Menus
 {
     public class PluginsMenuContributor : IMenuContributor
     {

modules/EasyAbp.EShop.Plugins/src/EasyAbp.EShop.Plugins.Web/Menus/PluginsMenus.cs

@@ -0,0 +1,13 @@
+namespace EasyAbp.EShop.Plugins.Web.Menus
+{
+    public class PluginsMenus
+    {
+        public const string ModuleGroupPrefix = "EasyAbp.EShop";
+
+        public const string Prefix = ModuleGroupPrefix + ".Plugins";
+        
+        //Add your menu items here...
+        //public const string Home = Prefix + ".MyNewMenuItem";
+
+    }
+}

modules/EasyAbp.EShop.Plugins/src/EasyAbp.EShop.Plugins.Web/Pages/EShop/Plugins/Index.cshtml

@@ -1,5 +1,4 @@
 @page
-@inherits EasyAbp.EShop.Plugins.Web.Pages.PluginsPage
 @model EasyAbp.EShop.Plugins.Web.Pages.EShop.Plugins.IndexModel
 @{
 }

modules/EasyAbp.EShop.Plugins/src/EasyAbp.EShop.Plugins.Web/Pages/PluginsPage.cs

@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Localization;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
-using EasyAbp.EShop.Plugins.Localization;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-
-namespace EasyAbp.EShop.Plugins.Web.Pages
-{
-    /* Inherit your UI Pages from this class. To do that, add this line to your Pages (.cshtml files under the Page folder):
-     * @inherits EasyAbp.EShop.Plugins.Web.Pages.PluginsPage
-     */
-    public abstract class PluginsPage : AbpPage
-    {
-        [RazorInject]
-        public IHtmlLocalizer<PluginsResource> L { get; set; }
-    }
-}

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/EShopProductsWebModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using EasyAbp.EShop.Products.Localization;
+using EasyAbp.EShop.Products.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/ProductsMenuContributor.cs → modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Menus/ProductsMenuContributor.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using EasyAbp.EShop.Products.Authorization;
-using Microsoft.Extensions.DependencyInjection;
 using EasyAbp.EShop.Products.Localization;
 using EasyAbp.EShop.Stores.Stores;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.UI.Navigation;
 
-namespace EasyAbp.EShop.Products.Web
+namespace EasyAbp.EShop.Products.Web.Menus
 {
     public class ProductsMenuContributor : IMenuContributor
     {
@@ -22,19 +22,19 @@ namespace EasyAbp.EShop.Products.Web
         {
             var l = context.GetLocalizer<ProductsResource>();            //Add main menu items.
 
-            var productManagementMenuItem = new ApplicationMenuItem("EasyAbpEShopProducts", l["Menu:ProductManagement"]);
+            var productManagementMenuItem = new ApplicationMenuItem(ProductsMenus.Prefix, l["Menu:ProductManagement"]);
 
             if (await context.IsGrantedAsync(ProductsPermissions.ProductTypes.Default))
             {
                 productManagementMenuItem.AddItem(
-                    new ApplicationMenuItem("EasyAbpEShopProductsProductType", l["Menu:ProductType"], "/EShop/Products/ProductTypes/ProductType")
+                    new ApplicationMenuItem(ProductsMenus.ProductType, l["Menu:ProductType"], "/EShop/Products/ProductTypes/ProductType")
                 );
             }
 
             if (await context.IsGrantedAsync(ProductsPermissions.Categories.Default))
             {
                 productManagementMenuItem.AddItem(
-                    new ApplicationMenuItem("EasyAbpEShopProductsCategory", l["Menu:Category"], "/EShop/Products/Categories/Category")
+                    new ApplicationMenuItem(ProductsMenus.Category, l["Menu:Category"], "/EShop/Products/Categories/Category")
                 );
             }
 
@@ -45,14 +45,14 @@ namespace EasyAbp.EShop.Products.Web
                 var defaultStore = (await storeAppService.GetDefaultAsync())?.Id;
                 
                 productManagementMenuItem.AddItem(
-                    new ApplicationMenuItem("EasyAbpEShopProductsProduct", l["Menu:Product"], "/EShop/Products/Products/Product?storeId=" + defaultStore)
+                    new ApplicationMenuItem(ProductsMenus.Product, l["Menu:Product"], "/EShop/Products/Products/Product?storeId=" + defaultStore)
                 );
             }
 
             if (!productManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == "EasyAbpEShop",
-                    () => new ApplicationMenuItem("EasyAbpEShop", l["Menu:EasyAbpEShop"]));
+                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == ProductsMenus.ModuleGroupPrefix,
+                    () => new ApplicationMenuItem(ProductsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"]));
                 
                 eShopMenuItem.Items.Add(productManagementMenuItem);
             }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Menus/ProductsMenus.cs

@@ -0,0 +1,19 @@
+namespace EasyAbp.EShop.Products.Web.Menus
+{
+    public class ProductsMenus
+    {
+        public const string ModuleGroupPrefix = "EasyAbp.EShop";
+
+        public const string Prefix = ModuleGroupPrefix + ".Products";
+        
+        public const string ProductType = Prefix + ".ProductType";
+        
+        public const string Category = Prefix + ".Category";
+        
+        public const string Product = Prefix + ".Product";
+
+        //Add your menu items here...
+        //public const string Home = Prefix + ".MyNewMenuItem";
+
+    }
+}

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/CreateModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@using EasyAbp.EShop.Products.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<ProductsResource> L
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.Categories.Category.CreateModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/EditModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@using EasyAbp.EShop.Products.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<ProductsResource> L
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.Categories.Category.EditModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Categories/Category/Index.cshtml

@@ -1,13 +1,16 @@
 @page
+@using EasyAbp.EShop.Products.Localization
+@using EasyAbp.EShop.Products.Web.Menus
 @using EasyAbp.EShop.Products.Web.Pages.EShop.Products.Categories.Category
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@inject IHtmlLocalizer<ProductsResource> L
 @model IndexModel
 @inject IPageLayout PageLayout
 @{
     PageLayout.Content.Title = L["Category"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:Category"].Value);
-    PageLayout.Content.MenuItemName = "EasyAbpEShopProductsCategory";
+    PageLayout.Content.MenuItemName = ProductsMenus.Category;
 }
 
 @section scripts

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Index.cshtml

@@ -1,5 +1,4 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.IndexModel
 @{
 }

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/CreateModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@using EasyAbp.EShop.Products.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<ProductsResource> L
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.ProductTypes.ProductType.CreateModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/EditModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@using EasyAbp.EShop.Products.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<ProductsResource> L
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.ProductTypes.ProductType.EditModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/ProductTypes/ProductType/Index.cshtml

@@ -1,13 +1,16 @@
 @page
+@using EasyAbp.EShop.Products.Localization
+@using EasyAbp.EShop.Products.Web.Menus
 @using EasyAbp.EShop.Products.Web.Pages.EShop.Products.ProductTypes.ProductType
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
 @model IndexModel
 @inject IPageLayout PageLayout
+@inject IHtmlLocalizer<ProductsResource> L
 @{
     PageLayout.Content.Title = L["ProductType"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:ProductType"].Value);
-    PageLayout.Content.MenuItemName = "EasyAbpEShopProductsProductType";
+    PageLayout.Content.MenuItemName = ProductsMenus.ProductType;
 }
 
 @section scripts

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/CreateModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@using EasyAbp.EShop.Products.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<ProductsResource> L
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.Product.CreateModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/EditModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@using EasyAbp.EShop.Products.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<ProductsResource> L
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.Product.EditModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/Product/Index.cshtml

@@ -1,13 +1,16 @@
 @page
+@using EasyAbp.EShop.Products.Localization
+@using EasyAbp.EShop.Products.Web.Menus
 @using EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.Product
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
 @model IndexModel
 @inject IPageLayout PageLayout
+@inject IHtmlLocalizer<ProductsResource> L
 @{
     PageLayout.Content.Title = L["Product"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:Product"].Value);
-    PageLayout.Content.MenuItemName = "EasyAbpEShopProductsProduct";
+    PageLayout.Content.MenuItemName = ProductsMenus.Product;
 }
 
 @section scripts

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/CreateModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@using EasyAbp.EShop.Products.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<ProductsResource> L
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.ProductSku.CreateModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/EditModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
+@using EasyAbp.EShop.Products.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<ProductsResource> L
 @model EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.ProductSku.EditModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/EShop/Products/Products/ProductSku/Index.cshtml

@@ -1,13 +1,16 @@
 @page
+@using EasyAbp.EShop.Products.Localization
+@using EasyAbp.EShop.Products.Web.Menus
 @using EasyAbp.EShop.Products.Web.Pages.EShop.Products.Products.ProductSku
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
-@inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
 @model IndexModel
 @inject IPageLayout PageLayout
+@inject IHtmlLocalizer<ProductsResource> L
 @{
     PageLayout.Content.Title = L["ProductSku"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:Product"].Value);
-    PageLayout.Content.MenuItemName = "EasyAbpEShopProductsProduct";
+    PageLayout.Content.MenuItemName = ProductsMenus.Product;
 }
 
 @section scripts

modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Pages/ProductsPage.cs

@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Localization;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
-using EasyAbp.EShop.Products.Localization;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-
-namespace EasyAbp.EShop.Products.Web.Pages
-{
-    /* Inherit your UI Pages from this class. To do that, add this line to your Pages (.cshtml files under the Page folder):
-     * @inherits EasyAbp.EShop.Products.Web.Pages.ProductsPage
-     */
-    public abstract class ProductsPage : AbpPage
-    {
-        [RazorInject]
-        public IHtmlLocalizer<ProductsResource> L { get; set; }
-    }
-}

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application.Contracts/EasyAbp/EShop/Stores/Authorization/StoresPermissionDefinitionProvider.cs → modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application.Contracts/EasyAbp/EShop/Stores/Permissions/StoresPermissionDefinitionProvider.cs

@@ -3,7 +3,7 @@ using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
 using Volo.Abp.MultiTenancy;
 
-namespace EasyAbp.EShop.Stores.Authorization
+namespace EasyAbp.EShop.Stores.Permissions
 {
     public class StoresPermissionDefinitionProvider : PermissionDefinitionProvider
     {

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application.Contracts/EasyAbp/EShop/Stores/Authorization/StoresPermissions.cs → modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Application.Contracts/EasyAbp/EShop/Stores/Permissions/StoresPermissions.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.Reflection;
 
-namespace EasyAbp.EShop.Stores.Authorization
+namespace EasyAbp.EShop.Stores.Permissions
 {
     public class StoresPermissions
     {

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/EShopStoresWebModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using EasyAbp.EShop.Stores.Localization;
+using EasyAbp.EShop.Stores.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/StoresMenuContributor.cs → modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Menus/StoresMenuContributor.cs

@@ -1,13 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using EasyAbp.EShop.Stores.Authorization;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Localization;
 using EasyAbp.EShop.Stores.Localization;
-using Microsoft.AspNetCore.Authorization;
+using EasyAbp.EShop.Stores.Permissions;
 using Volo.Abp.UI.Navigation;
 
-namespace EasyAbp.EShop.Stores.Web
+namespace EasyAbp.EShop.Stores.Web.Menus
 {
     public class StoresMenuContributor : IMenuContributor
     {
@@ -23,19 +20,19 @@ namespace EasyAbp.EShop.Stores.Web
         {
             var l = context.GetLocalizer<StoresResource>();            //Add main menu items.
 
-            var storeManagementMenuItem = new ApplicationMenuItem("EasyAbpEShopStores", l["Menu:StoreManagement"]);
+            var storeManagementMenuItem = new ApplicationMenuItem(StoresMenus.Prefix, l["Menu:StoreManagement"]);
 
             if (await context.IsGrantedAsync(StoresPermissions.Stores.Default))
             {
                 storeManagementMenuItem.AddItem(
-                    new ApplicationMenuItem("EasyAbpEShopStoresStore", l["Menu:Store"], "/EShop/Stores/Stores/Store")
+                    new ApplicationMenuItem(StoresMenus.Store, l["Menu:Store"], "/EShop/Stores/Stores/Store")
                 );
             }
             
             if (!storeManagementMenuItem.Items.IsNullOrEmpty())
             {
-                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == "EasyAbpEShop",
-                    () => new ApplicationMenuItem("EasyAbpEShop", l["Menu:EasyAbpEShop"]));
+                var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == StoresMenus.ModuleGroupPrefix,
+                    () => new ApplicationMenuItem(StoresMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"]));
                 
                 eShopMenuItem.Items.Add(storeManagementMenuItem);
             }

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Menus/StoresMenus.cs

@@ -0,0 +1,15 @@
+namespace EasyAbp.EShop.Stores.Web.Menus
+{
+    public class StoresMenus
+    {
+        public const string ModuleGroupPrefix = "EasyAbp.EShop";
+
+        public const string Prefix = ModuleGroupPrefix + ".Stores";
+        
+        public const string Store = Prefix + ".Store";
+
+        //Add your menu items here...
+        //public const string Home = Prefix + ".MyNewMenuItem";
+
+    }
+}

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Index.cshtml

@@ -1,5 +1,4 @@
 @page
-@inherits EasyAbp.EShop.Stores.Web.Pages.StoresPage
 @model EasyAbp.EShop.Stores.Web.Pages.EShop.Stores.IndexModel
 @{
 }

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Stores/Store/CreateModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Stores.Web.Pages.StoresPage
+@using EasyAbp.EShop.Stores.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<StoresResource> L
 @model EasyAbp.EShop.Stores.Web.Pages.EShop.Stores.Stores.Store.CreateModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Stores/Store/EditModal.cshtml

@@ -1,6 +1,8 @@
 @page
-@inherits EasyAbp.EShop.Stores.Web.Pages.StoresPage
+@using EasyAbp.EShop.Stores.Localization
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@inject IHtmlLocalizer<StoresResource> L
 @model EasyAbp.EShop.Stores.Web.Pages.EShop.Stores.Stores.Store.EditModalModel
 @{
     Layout = null;

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/EShop/Stores/Stores/Store/Index.cshtml

@@ -1,6 +1,20 @@
 @page
-@inherits EasyAbp.EShop.Stores.Web.Pages.StoresPage
-@model EasyAbp.EShop.Stores.Web.Pages.EShop.Stores.Stores.Store.IndexModel
+@using EasyAbp.EShop.Stores.Permissions
+@using EasyAbp.EShop.Stores.Web.Pages.EShop.Stores.Stores.Store
+@using EasyAbp.EShop.Stores.Localization
+@using EasyAbp.EShop.Stores.Web.Menus
+@using Microsoft.AspNetCore.Authorization
+@using Microsoft.AspNetCore.Mvc.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@model IndexModel
+@inject IPageLayout PageLayout
+@inject IHtmlLocalizer<StoresResource> L
+@inject IAuthorizationService Authorization
+@{
+    PageLayout.Content.Title = L["BasketItem"].Value;
+    PageLayout.Content.BreadCrumb.Add(L["Menu:BasketItem"].Value);
+    PageLayout.Content.MenuItemName = StoresMenus.Store;
+}
 
 @section scripts
 {
@@ -14,14 +28,17 @@
 <abp-card>
     <abp-card-header>
         <abp-row>
-            <abp-column size-md="_2">
-                <h2>@L["Store"]</h2>
+            <abp-column size-md="_6">
+                <abp-card-title>@L["Store"]</abp-card-title>
             </abp-column>
-            <abp-column size-md="_10" class="text-right">
+            <abp-column size-md="_6" class="text-right">
+			    @if (await Authorization.IsGrantedAsync(StoresPermissions.Stores.Create))
+                { 
                 <abp-button id="NewStoreButton"
                             text="@L["CreateStore"].Value"
                             icon="plus"
                             button-type="Primary" />
+                }
             </abp-column>
         </abp-row>
     </abp-card-header>

modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Pages/StoresPage.cs

@@ -1,16 +0,0 @@
-using Microsoft.AspNetCore.Mvc.Localization;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
-using EasyAbp.EShop.Stores.Localization;
-using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
-
-namespace EasyAbp.EShop.Stores.Web.Pages
-{
-    /* Inherit your UI Pages from this class. To do that, add this line to your Pages (.cshtml files under the Page folder):
-     * @inherits EasyAbp.EShop.Stores.Web.Pages.StoresPage
-     */
-    public abstract class StoresPage : AbpPage
-    {
-        [RazorInject]
-        public IHtmlLocalizer<StoresResource> L { get; set; }
-    }
-}

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/EditModal.cshtml

@@ -12,7 +12,7 @@
         <abp-modal-header title="@L["EditBasketItem"].Value"></abp-modal-header>
         <abp-modal-body>
             <abp-input asp-for="Id" />
-        <abp-form-content />
+            <abp-form-content />
         </abp-modal-body>
         <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)"></abp-modal-footer>
     </abp-modal>

plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Pages/EShop/Plugins/Baskets/BasketItems/BasketItem/Index.cshtml

@@ -2,6 +2,7 @@
 @using EasyAbp.EShop.Plugins.Baskets.Permissions
 @using EasyAbp.EShop.Plugins.Baskets.Web.Pages.EShop.Plugins.Baskets.BasketItems.BasketItem
 @using EasyAbp.EShop.Plugins.Baskets.Localization
+@using EasyAbp.EShop.Plugins.Baskets.Web.Menus
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
@@ -12,7 +13,7 @@
 @{
     PageLayout.Content.Title = L["BasketItem"].Value;
     PageLayout.Content.BreadCrumb.Add(L["Menu:BasketItem"].Value);
-    PageLayout.Content.MenuItemName = "EasyAbpEShopBasketsBasketItem";
+    PageLayout.Content.MenuItemName = BasketsMenus.BasketItem;
 }
 
 @section scripts