From c239c09eeb6f85d82f527210af2bb780e2ea090b Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Thu, 28 Jun 2018 16:46:00 +0300 Subject: [PATCH] Refactor new blog post page. --- .../Volo/Blogging/Blogs/BlogAppService.cs | 4 +++- .../src/Volo.Blogging.Web/BloggingWebModule.cs | 13 +++++++++++++ .../Localization/Resources/Blogging/Web/en.json | 7 +++++++ .../Localization/Resources/Blogging/Web/tr.json | 7 +++++++ .../Pages/Blog/{QaPage.cs => BloggingPage.cs} | 0 .../Pages/Blog/Posts/New.cshtml | 5 +++-- .../Pages/Blog/Posts/New.cshtml.cs | 2 ++ .../Volo.Blogging.Web/Volo.Blogging.Web.csproj | 17 +---------------- .../MyProjectNameDomainModule.cs | 2 ++ 9 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json create mode 100644 modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json rename modules/blogging/src/Volo.Blogging.Web/Pages/Blog/{QaPage.cs => BloggingPage.cs} (100%) diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Blogs/BlogAppService.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Blogs/BlogAppService.cs index 8f90bb5e7a..7867c41885 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Blogs/BlogAppService.cs +++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Blogs/BlogAppService.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.Abp.Domain.Entities; using Volo.Abp.UI; namespace Volo.Blogging.Blogs @@ -30,7 +32,7 @@ namespace Volo.Blogging.Blogs if (blog == null) { - throw new UserFriendlyException("Blog Doesn't exist"); + throw new EntityNotFoundException(typeof(Blog), shortName); } return ObjectMapper.Map(blog); diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs index 9047bc2a15..0cc374472e 100644 --- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs +++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs @@ -1,8 +1,12 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.Localization; +using Volo.Abp.Localization.Resources.AbpValidation; using Volo.Abp.Modularity; +using Volo.Abp.UI; using Volo.Abp.VirtualFileSystem; using Volo.Blogging.Localization; @@ -29,6 +33,15 @@ namespace Volo.Blogging options.FileSets.AddEmbedded("Volo.Blogging"); }); + services.Configure(options => + { + options.Resources + .Get() + .AddBaseTypes(typeof(AbpValidationResource)) + .AddBaseTypes(typeof(AbpUiModule)) + .AddVirtualJson("/Localization/Resources/Blogging/Web"); + }); + services.Configure(options => { //TODO: Make configurable! diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json new file mode 100644 index 0000000000..20273b9e44 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json @@ -0,0 +1,7 @@ +{ + "culture": "en", + "texts": { + "Title": "Title", + "Content": "Content" + } +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json new file mode 100644 index 0000000000..5a6d6506de --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json @@ -0,0 +1,7 @@ +{ + "culture": "tr", + "texts": { + "Title": "Başlık", + "Content": "İçerik" + } +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/QaPage.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs similarity index 100% rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/QaPage.cs rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml index a0e26402eb..64e1cdd664 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml @@ -1,14 +1,15 @@ @page @using Volo.Blogging.Pages.Blog.Posts @model NewModel +@inherits Volo.Blogging.Pages.Blog.BloggingPage
- +
@* TODO: Remove label when the issue is fixed *@ - + \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs index 7fec53f61a..fa1b9f819a 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs @@ -59,9 +59,11 @@ namespace Volo.Blogging.Pages.Blog.Posts [Required] [StringLength(PostConsts.MaxTitleLength)] + [Display(Name = "Title")] public string Title { get; set; } [StringLength(PostConsts.MaxContentLength)] + [Display(Name = "Content")] public string Content { get; set; } } } diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj index 58d29adaeb..bcbdfcfb3e 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj +++ b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj @@ -20,23 +20,8 @@ + - - - - - - - - - - - - - $(IncludeRazorContentInPack) - - - diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs index b34a3a90b5..f867befd4c 100644 --- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs +++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs @@ -3,6 +3,7 @@ using MyCompanyName.MyProjectName.Localization.MyProjectName; using MyCompanyName.MyProjectName.Settings; using Volo.Abp.Identity; using Volo.Abp.Localization; +using Volo.Abp.Localization.Resources.AbpValidation; using Volo.Abp.Modularity; using Volo.Abp.Settings; using Volo.Abp.VirtualFileSystem; @@ -23,6 +24,7 @@ namespace MyCompanyName.MyProjectName { options.Resources .Add("en") + .AddBaseTypes(typeof(AbpValidationResource)) .AddVirtualJson("/Localization/MyProjectName"); });