From 3a35ebdffb88e1a1eb0509a404d6686d8ee48e1f Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Sun, 31 May 2020 21:04:12 +0300 Subject: [PATCH 1/5] rename Authorization folder to Permissions to make it same with the app template --- .../MyProjectNamePermissionDefinitionProvider.cs | 2 +- .../{Authorization => Permissions}/MyProjectNamePermissions.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/{Authorization => Permissions}/MyProjectNamePermissionDefinitionProvider.cs (91%) rename templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/{Authorization => Permissions}/MyProjectNamePermissions.cs (85%) diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs similarity index 91% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs index aede7399b7..ffac9007ad 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs @@ -2,7 +2,7 @@ using Volo.Abp.Authorization.Permissions; using Volo.Abp.Localization; -namespace MyCompanyName.MyProjectName.Authorization +namespace MyCompanyName.MyProjectName.Permissions { public class MyProjectNamePermissionDefinitionProvider : PermissionDefinitionProvider { diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissions.cs similarity index 85% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissions.cs index d4c035a652..75ecd85ff1 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissions.cs @@ -1,6 +1,6 @@ using Volo.Abp.Reflection; -namespace MyCompanyName.MyProjectName.Authorization +namespace MyCompanyName.MyProjectName.Permissions { public class MyProjectNamePermissions { From 76f9e65ad08566ce2bee61238297c7ad065e3c8f Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Sun, 31 May 2020 21:45:46 +0300 Subject: [PATCH 2/5] move menu items under menus folder --- .../{ => Menus}/MyProjectNameMenuContributor.cs | 2 +- .../Menus/MyProjectNameMenus.cs | 11 +++++++++++ .../MyProjectNameWebModule.cs | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) rename templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/{ => Menus}/MyProjectNameMenuContributor.cs (91%) create mode 100644 templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs similarity index 91% rename from templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs rename to templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs index 3d63d39465..68191369c1 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using Volo.Abp.UI.Navigation; -namespace MyCompanyName.MyProjectName.Web +namespace MyCompanyName.MyProjectName.Web.Menus { public class MyProjectNameMenuContributor : IMenuContributor { diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs new file mode 100644 index 0000000000..82ff4a2781 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs @@ -0,0 +1,11 @@ +namespace MyCompanyName.MyProjectName.Web.Menus +{ + public class MyProjectNameMenus + { + private const string Prefix = "MyProjectName"; + + //Add your menu items here... + //public const string Home = Prefix + ".MyNewMenuItem"; + + } +} \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 8e378a6bc2..26c3153d22 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; using MyCompanyName.MyProjectName.Localization; +using MyCompanyName.MyProjectName.Web.Menus; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AutoMapper; From 8cf4112ae4bd502bc1412e2ce34eb4e4cf0760fd Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Sun, 31 May 2020 23:45:08 +0300 Subject: [PATCH 3/5] enable myPermission group for CRUD page generator to add items under this group. --- .../Permissions/MyProjectNamePermissionDefinitionProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs index ffac9007ad..2dcf9a68f8 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs @@ -8,7 +8,7 @@ namespace MyCompanyName.MyProjectName.Permissions { public override void Define(IPermissionDefinitionContext context) { - //var moduleGroup = context.AddGroup(MyProjectNamePermissions.GroupName, L("Permission:MyProjectName")); + var myGroup = context.AddGroup(MyProjectNamePermissions.GroupName, L("Permission:MyProjectName")); } private static LocalizableString L(string name) From 10e51f5bacb688f38ba4db667696f8dd3da4a418 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Sun, 31 May 2020 23:47:27 +0300 Subject: [PATCH 4/5] add AbpProject type to common.props for discriminating app and module --- templates/app/aspnet-core/common.props | 1 + templates/module/aspnet-core/common.props | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/app/aspnet-core/common.props b/templates/app/aspnet-core/common.props index 7585f303ba..6caad60263 100644 --- a/templates/app/aspnet-core/common.props +++ b/templates/app/aspnet-core/common.props @@ -3,5 +3,6 @@ latest 1.0.0 $(NoWarn);CS1591 + app \ No newline at end of file diff --git a/templates/module/aspnet-core/common.props b/templates/module/aspnet-core/common.props index 4adb69f0fe..0e2bf35066 100644 --- a/templates/module/aspnet-core/common.props +++ b/templates/module/aspnet-core/common.props @@ -3,6 +3,7 @@ latest 0.1.0 $(NoWarn);CS1591 + module From 2812380ae66d410e82ae345ffbd44a1cba415b85 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Mon, 1 Jun 2020 00:29:31 +0300 Subject: [PATCH 5/5] add the using for CRUD page generator --- .../MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 26c3153d22..48f59634c7 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -8,6 +8,7 @@ using Volo.Abp.AutoMapper; using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; using Volo.Abp.VirtualFileSystem; +using MyCompanyName.MyProjectName.Permissions; namespace MyCompanyName.MyProjectName.Web {