From 6dbd74ca1f947d1bf5745ecbdd4be8626676dc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 11 Jun 2019 10:14:15 +0300 Subject: [PATCH] Refactor and comment for base classes. --- .../MyProjectNameAppService.cs | 18 ++++++++++++++++++ .../Controllers/MyProjectNameController.cs | 2 ++ .../MyProjectNameWebModule.cs | 5 +++-- .../MyProjectNameWebModule.cs | 10 +++++----- .../Pages/Index.cshtml | 2 +- .../Pages/Index.cshtml.cs | 2 +- ...ectNamePageBase.cs => MyProjectNamePage.cs} | 5 ++++- ...eModelBase.cs => MyProjectNamePageModel.cs} | 6 ++++-- 8 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs rename templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/{MyProjectNamePageBase.cs => MyProjectNamePage.cs} (56%) rename templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/{MyProjectNamePageModelBase.cs => MyProjectNamePageModel.cs} (59%) diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs new file mode 100644 index 0000000000..8cf7cca603 --- /dev/null +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameAppService.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Text; +using MyCompanyName.MyProjectName.Localization; +using Volo.Abp.Application.Services; + +namespace MyCompanyName.MyProjectName +{ + /* Inherit your application services from this class. + */ + public abstract class MyProjectNameAppService : ApplicationService + { + protected MyProjectNameAppService() + { + LocalizationResource = typeof(MyProjectNameResource); + } + } +} diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs index c80e008681..7fff0ecbc5 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.HttpApi/Controllers/MyProjectNameController.cs @@ -3,6 +3,8 @@ using Volo.Abp.AspNetCore.Mvc; namespace MyCompanyName.MyProjectName.Controllers { + /* Inherit your controllers from this class. + */ public abstract class MyProjectNameController : AbpController { protected MyProjectNameController() diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 7eba8ff7c8..17df5f5df5 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -145,8 +145,6 @@ namespace MyCompanyName.MyProjectName.Web { Configure(options => { - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Application.Contracts", Path.DirectorySeparatorChar))); // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); @@ -156,6 +154,9 @@ namespace MyCompanyName.MyProjectName.Web options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar))); // + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Application.Contracts", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPhysical(hostingEnvironment.ContentRootPath); }); } } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 84cacf1d48..77da95f24a 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -113,11 +113,6 @@ namespace MyCompanyName.MyProjectName.Web { Configure(options => { - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Domain.Shared", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Application.Contracts", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Application", Path.DirectorySeparatorChar))); - options.FileSets.ReplaceEmbeddedByPhysical(hostingEnvironment.ContentRootPath); // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); @@ -128,6 +123,11 @@ namespace MyCompanyName.MyProjectName.Web options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar))); // + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Domain.Shared", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Application.Contracts", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}MyCompanyName.MyProjectName.Application", Path.DirectorySeparatorChar))); + options.FileSets.ReplaceEmbeddedByPhysical(hostingEnvironment.ContentRootPath); }); } } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml index 2565dc8267..9324a9891a 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml @@ -1,5 +1,5 @@ @page -@inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePageBase +@inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePage @model MyCompanyName.MyProjectName.Web.Pages.IndexModel @section styles { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs index f8d2476c5b..6a89e42f63 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs @@ -1,6 +1,6 @@ namespace MyCompanyName.MyProjectName.Web.Pages { - public class IndexModel : MyProjectNamePageModelBase + public class IndexModel : MyProjectNamePageModel { public void OnGet() { diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePage.cs similarity index 56% rename from templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePage.cs index 217c70d491..5fe044221d 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePage.cs @@ -5,7 +5,10 @@ using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; namespace MyCompanyName.MyProjectName.Web.Pages { - public abstract class MyProjectNamePageBase : AbpPage + /* Inherit your UI Pages from this class. To do that, add this line to your Pages (.cshtml files under the Page folder): + * @inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePage + */ + public abstract class MyProjectNamePage : AbpPage { [RazorInject] public IHtmlLocalizer L { get; set; } diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModel.cs similarity index 59% rename from templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs rename to templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModel.cs index afd22b08c4..d0b9c04a45 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModel.cs @@ -3,9 +3,11 @@ using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; namespace MyCompanyName.MyProjectName.Web.Pages { - public abstract class MyProjectNamePageModelBase : AbpPageModel + /* Inherit your PageModel classes from this class. + */ + public abstract class MyProjectNamePageModel : AbpPageModel { - protected MyProjectNamePageModelBase() + protected MyProjectNamePageModel() { LocalizationResourceType = typeof(MyProjectNameResource); }