From cef97b8038df96e2829eafe367e65d7413284e53 Mon Sep 17 00:00:00 2001 From: enisn Date: Fri, 12 Mar 2021 12:18:15 +0300 Subject: [PATCH] CmsKit - Remove BlogPostViewComponent --- .../Components/Blogs/BlogPost/Default.cshtml | 31 ---------------- .../BlogPost/DefaultBlogPostViewComponent.cs | 33 ----------------- .../Components/Tags/TagViewComponent.cs | 2 +- .../Pages/Public/CmsKit/Blogs/BlogPost.cshtml | 37 ++++++++++++++++--- .../CmsKit/Blogs/blogPost.css} | 0 5 files changed, 32 insertions(+), 71 deletions(-) delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/DefaultBlogPostViewComponent.cs rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/{CmsKit/Shared/Components/Blogs/BlogPost/default.css => Public/CmsKit/Blogs/blogPost.css} (100%) diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml deleted file mode 100644 index a66a57908f..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml +++ /dev/null @@ -1,31 +0,0 @@ -@model Volo.CmsKit.Public.Blogs.BlogPostPublicDto -@using Volo.CmsKit.Localization -@using Microsoft.Extensions.Localization - -@inject IStringLocalizer L - -@{ - string dummyImageSource = "https://dummyimage.com/1280x720/a3a3a3/fff.png?text=" + Model.Title; -} - - - - - -
-

@Model.Title

-

- @@@Model.Author?.UserName - @Model.CreationTime -

- @Html.Raw(Model.Content) -

- @if (Model.LastModificationTime != null) - { - @L["LastModification"].Value : @Model.LastModificationTime - } -

-
-
-
-
\ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/DefaultBlogPostViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/DefaultBlogPostViewComponent.cs deleted file mode 100644 index 24368728cd..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/DefaultBlogPostViewComponent.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -using Volo.CmsKit.Public.Blogs; - -namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPost -{ - [Widget(StyleFiles = new[] - { - "/Pages/CmsKit/Shared/Components/Blogs/BlogPost/default.css" - })] - public class DefaultBlogPostViewComponent : AbpViewComponent - { - protected IBlogPostPublicAppService BlogPostPublicAppService { get; } - - public DefaultBlogPostViewComponent(IBlogPostPublicAppService blogPostPublicAppService) - { - BlogPostPublicAppService = blogPostPublicAppService; - } - - public virtual async Task InvokeAsync(string blogSlug, string blogPostSlug) - { - var blogPost = await BlogPostPublicAppService.GetAsync(blogSlug, blogPostSlug); - - return View("~/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml", blogPost); - } - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/TagViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/TagViewComponent.cs index 3af0472b29..33031c4c21 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/TagViewComponent.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/TagViewComponent.cs @@ -14,7 +14,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags [Widget( StyleFiles = new[] { - "/Pages/CmsKit/Shared/Components/Blogs/BlogPost/default.css" + "/Pages/CmsKit/Shared/Components/Tags/default.css" })] public class TagViewComponent : AbpViewComponent { diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml index 28671aa34a..a7c3c60cce 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml @@ -1,6 +1,5 @@ @page -@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPost @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPostComment @using Volo.CmsKit.Public.Web.Pages @using Volo.Abp.GlobalFeatures @@ -13,11 +12,37 @@ @model Volo.CmsKit.Public.Web.Pages.Public.CmsKit.Blogs.BlogPostModel -@await Component.InvokeAsync(typeof(DefaultBlogPostViewComponent), new -{ - Model.BlogSlug, - Model.BlogPostSlug -}) + +@section styles{ + +} + +@{ + string dummyImageSource = "https://dummyimage.com/1280x720/a3a3a3/fff.png?text=" + Model.BlogPost.Title; +} + + + + + +
+

@Model.BlogPost.Title

+

+ @@@Model.BlogPost.Author?.UserName + @Model.BlogPost.CreationTime +

+ @Html.Raw(Model.BlogPost.Content) +

+ @if (Model.BlogPost.LastModificationTime != null) + { + @L["LastModification"].Value : @Model.BlogPost.LastModificationTime + } +

+
+
+
+
+ @if (GlobalFeatureManager.Instance.IsEnabled()) { diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/default.css b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.css similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/default.css rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/blogPost.css