From 6fbb6bb7550a18cd503b46c0353557b6ae645af5 Mon Sep 17 00:00:00 2001 From: enisn Date: Fri, 26 Feb 2021 15:29:48 +0300 Subject: [PATCH] CmsKit - Fix Admin Page Issues --- .../cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs | 4 ++++ .../Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js | 2 +- .../Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js | 2 +- .../Pages/CmsKit/Blogs/CreateModal.cshtml.cs | 2 +- .../Pages/CmsKit/Blogs/UpdateModal.cshtml.cs | 3 ++- .../Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml | 1 + .../Volo.CmsKit.Admin.Web/Pages/CmsKit/_ViewImports.cshtml | 4 ++++ .../src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs | 2 ++ .../Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml | 2 +- .../Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml | 2 +- 10 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/_ViewImports.cshtml diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs index fa93175efc..52241a8c87 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs @@ -10,6 +10,7 @@ using Volo.CmsKit.Web; using Volo.CmsKit.Permissions; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.PageToolbars; using Volo.Abp.Localization; +using Volo.Abp.AutoMapper; namespace Volo.CmsKit.Admin.Web { @@ -49,6 +50,9 @@ namespace Volo.CmsKit.Admin.Web options.FileSets.AddEmbedded("Volo.CmsKit.Admin.Web"); }); + context.Services.AddAutoMapperObjectMapper(); + Configure(options => { options.AddMaps(validate: true); }); + Configure(options => { options.Conventions.AuthorizeFolder("/CmsKit/Tags/", CmsKitAdminPermissions.Tags.Default); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js index dece495320..b2fd0613e6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js @@ -136,7 +136,7 @@ function finishSaving() { abp.notify.success(l('SuccessfullySaved')); abp.ui.clearBusy(); - location.href = "/Admin/BlogPosts/"; + location.href = "../BlogPosts"; } var urlEdited = false; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js index 60b618135b..9a2fb3c69a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js @@ -154,7 +154,7 @@ function finishSaving(result) { abp.notify.success(l('SuccessfullySaved')); abp.ui.clearBusy(); - location.href = "/Admin/BlogPosts/"; + location.href = "../BlogPosts/"; } $titleClone.on('change paste keyup', function () { diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/CreateModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/CreateModal.cshtml.cs index 3681e04624..05996b6f87 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/CreateModal.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/CreateModal.cshtml.cs @@ -29,7 +29,7 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs return NoContent(); } - [AutoMap(typeof(BlogDto), ReverseMap = true)] + [AutoMap(typeof(CreateBlogDto), ReverseMap = true)] public class CreateBlogViewModel { [Required] diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml.cs index 57b51026b6..75c15018d4 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml.cs @@ -45,7 +45,8 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Blogs return NoContent(); } - [AutoMap(typeof(BlogDto), ReverseMap = true)] + [AutoMap(typeof(BlogDto))] + [AutoMap(typeof(UpdateBlogDto), ReverseMap = true)] public class UpdateBlogViewModel { [Required] diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml index 1330dde48a..fe9f8d4b69 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml @@ -4,6 +4,7 @@ @using Volo.CmsKit.Admin.Web.Pages @using Volo.CmsKit.Admin.Web.Menus @using Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages +@using Volo.CmsKit.Admin.Web.Bundles @inherits CmsKitAdminPageBase diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/_ViewImports.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/_ViewImports.cshtml new file mode 100644 index 0000000000..c1da1f5f10 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/_ViewImports.cshtml @@ -0,0 +1,4 @@ +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs index fe30d70b50..28f5f66d5e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs @@ -64,6 +64,8 @@ namespace Volo.CmsKit.Public.Web Configure(options => { options.Conventions.AddPageRoute("/CmsKit/Pages/Index", @"/pages/{slug:minlength(1)}"); + options.Conventions.AddPageRoute("/CmsKit/Blogs/Index", @"/blogs/{blogSlug:minlength(1)}"); + options.Conventions.AddPageRoute("/CmsKit/Blogs/BlogPost", @"/blogs/{blogSlug}/{blogPostSlug}"); }); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml index 4eb2fa0ccd..d19b66f409 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/BlogPost.cshtml @@ -1,4 +1,4 @@ -@page "/blogs/{blogSlug}/{blogPostSlug}" +@page @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPost @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPostComment diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml index a58648f382..9a3f805bf1 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Blogs/Index.cshtml @@ -1,4 +1,4 @@ -@page "/blogs/{blogSlug}" +@page @using Volo.CmsKit.Public.Web.Pages