Moved BlogPostPublicDto

4 years ago · d7714c90d7
10 changed files with 58 additions and 75 deletions
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs
@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
 using Volo.Abp.Application.Dtos;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.Users;

-namespace Volo.CmsKit.Public.Blogs;
+namespace Volo.CmsKit.Contents;

 [Serializable]
-public class BlogPostPublicDto : AuditedEntityDto<Guid>
+public class BlogPostPublicDto : AuditedEntityDto<Guid>, IContent
 {
    public Guid BlogId { get; set; }

@ -24,4 +23,4 @@ public class BlogPostPublicDto : AuditedEntityDto<Guid>
    public Guid? CoverImageMediaId { get; set; }

    public CmsUserDto Author { get; set; }
-}
+}
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/IBlogPostPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/IBlogPostPublicAppService.cs
@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using JetBrains.Annotations;
+using System;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.Users;
-using System;

 namespace Volo.CmsKit.Public.Blogs;

--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/BlogPostPublicClientProxy.Generated.cs
@ -2,11 +2,9 @@
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Http.Modeling;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client.ClientProxying;
-using Volo.CmsKit.Public.Blogs;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.Users;

 // ReSharper disable once CheckNamespace
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/ClientProxies/PagesPublicClientProxy.Generated.cs
@ -1,12 +1,8 @@
 // This file is automatically generated by ABP framework to use MVC Controllers from CSharp
-using System;
 using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Http.Client;
-using Volo.Abp.Http.Modeling;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client.ClientProxying;
-using Volo.CmsKit.Public.Pages;
+using Volo.CmsKit.Contents;

 // ReSharper disable once CheckNamespace
 namespace Volo.CmsKit.Public.Pages.ClientProxies;
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogPostPublicController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Blogs/BlogPostPublicController.cs
@ -1,11 +1,10 @@
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
-using Volo.Abp.Content;
 using Volo.Abp.GlobalFeatures;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.GlobalFeatures;
 using Volo.CmsKit.Users;

--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs
@ -8,7 +8,7 @@ using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 using Volo.CmsKit.Public.Comments;
-using Volo.CmsKit.Public.Web.Renderers;
+using Volo.CmsKit.Web.Renderers;

 namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting;

--- 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
@ -9,9 +9,9 @@
@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags
-@using Volo.CmsKit.Public.Web.Renderers
@using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs
@using Volo.CmsKit.Contents
+@using Volo.CmsKit.Web.Renderers

@inherits CmsKitPublicPageBase

@ -32,13 +32,14 @@
            <abp-style src="/Pages/Public/CmsKit/Blogs/bootstrap-toc.css" />
        </abp-abp-style-bundle>
    }
+    
    <abp-abp-style-bundle>
        <abp-style src="/Pages/Public/CmsKit/Blogs/blogPost.css" />
        <abp-style type="typeof(HighlightJsStyleContributor)" />
    </abp-abp-style-bundle>
 }

-    @section scripts{
+@section scripts{
    @if (isScrollIndexEnabled)
    {
        <abp-script-bundle>
@ -54,49 +55,39 @@
 }


-    <div class="row">
-        <div @Html.Raw(isScrollIndexEnabled ? "class=\"col-md-10 col-sm-12\"" : "class=\"col-md-12\"")>
-            <abp-card class="mb-4">
-                <img src="/api/cms-kit/media/@Model.BlogPost.CoverImageMediaId" class="card-img-top" onerror="this.src='@dummyImageSource'" />
-                <abp-card-body>
-                    <abp-row>
-                        <div class="col-lg-8 col-md-10 mx-auto pb-4">
-                            <h1 class="mt-lg-4 mt-md-3">@Model.BlogPost.Title</h1>
-                            <p class="mb-lg-5 mb-md-3">
-                                <a href="/blogs/@Model.BlogSlug?authorId=@Model.BlogPost.Author.Id">
-                                    <span class="font-weight-bold">@@@Model.BlogPost.Author?.UserName</span>
-                                </a>
-                                <small style="opacity:.65;">@Model.BlogPost.CreationTime</small>
-                            </p>
-                            @foreach (var contentFragment in Model.BlogPost.ContentFragments)
+<div class="row">
+    <div @Html.Raw(isScrollIndexEnabled ? "class=\"col-md-10 col-sm-12\"" : "class=\"col-md-12\"")>
+        <abp-card class="mb-4">
+            <img src="/api/cms-kit/media/@Model.BlogPost.CoverImageMediaId" class="card-img-top" onerror="this.src='@dummyImageSource'" />
+            <abp-card-body>
+                <abp-row>
+                    <div class="col-lg-8 col-md-10 mx-auto pb-4">
+                        <h1 class="mt-lg-4 mt-md-3">@Model.BlogPost.Title</h1>
+                        <p class="mb-lg-5 mb-md-3">
+                            <a href="/blogs/@Model.BlogSlug?authorId=@Model.BlogPost.Author.Id">
+                                <span class="font-weight-bold">@@@Model.BlogPost.Author?.UserName</span>
+                            </a>
+                            <small style="opacity:.65;">@Model.BlogPost.CreationTime</small>
+                        </p>
+                        @await Component.InvokeAsync("ContentFragment", new { contentDto = Model.BlogPost })
+                        <p class="mb-3">
+                            @if (Model.BlogPost.LastModificationTime != null)
                            {
-                                if (contentFragment.Type == ContentConsts.Markdown)
-                                {
-                                    @Html.Raw(await MarkdownRenderer.RenderAsync(contentFragment.GetProperty<string>("Content")))
-                                }
-                                else if (contentFragment.Type == ContentConsts.Widget)
-                                {
-                                    @await Component.InvokeAsync(contentFragment.GetProperty<string>("Type"), contentFragment.ExtraProperties.ConvertToDynamicObject())
-                                }
+                                <small style="opacity:.65;">@L["LastModification"].Value : @Model.BlogPost.LastModificationTime</small>
                            }
-                            <p class="mb-3">
-                                @if (Model.BlogPost.LastModificationTime != null)
-                                {
-                                    <small style="opacity:.65;">@L["LastModification"].Value : @Model.BlogPost.LastModificationTime</small>
-                                }
-                            </p>
-                            <hr />
+                        </p>
+                        <hr />

-                            @if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
+                        @if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
+                        {
+                            if (Model.TagsFeature?.IsEnabled == true)
                            {
-                                if (Model.TagsFeature?.IsEnabled == true)
+                                @await Component.InvokeAsync(typeof(TagViewComponent), new
                                {
-                                    @await Component.InvokeAsync(typeof(TagViewComponent), new
-                            {
-                            entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
-                            entityId = Model.BlogPost.Id.ToString(),
-                            urlFormat = $"/blogs/{Model.BlogSlug}?tagId={{TagId}}"
-                            })
+                                    entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
+                                    entityId = Model.BlogPost.Id.ToString(),
+                                    urlFormat = $"/blogs/{Model.BlogSlug}?tagId={{TagId}}"
+                                })
                            }
                        }
                    </div>
@ -109,10 +100,10 @@
                            if (Model.ReactionsFeature?.IsEnabled == true)
                            {
                                @await Component.InvokeAsync(typeof(ReactionSelectionViewComponent), new
-                        {
-                        entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
-                        entityId = Model.BlogPost.Id.ToString()
-                        })
+                                {
+                                    entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
+                                    entityId = Model.BlogPost.Id.ToString()
+                                })
                            }
                        }
                    </abp-column>
@ -122,10 +113,10 @@
                            if (Model.RatingsFeature?.IsEnabled == true)
                            {
                                @await Component.InvokeAsync(typeof(RatingViewComponent), new
-                        {
-                        entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
-                        entityId = Model.BlogPost.Id.ToString()
-                        })
+                                {
+                                    entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
+                                    entityId = Model.BlogPost.Id.ToString()
+                                })
                            }
                        }
                    </abp-column>
@ -133,6 +124,7 @@
            </abp-card-body>
        </abp-card>
    </div>
+    
    @if (isScrollIndexEnabled)
    {
        <div class="col-md-2 d-sm-none d-md-block">
@ -140,7 +132,7 @@
                <h5>@L["InThisDocument"]</h5>
                <nav id="blog-post-sticky-index" class="navbar index-scroll pt-0">
                </nav>
-
+    
                <div class="row">
                    <div class="col p-0 py-3">
                        <a href="#" class="scroll-top-btn">
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml.cs
@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.GlobalFeatures;
 using Volo.CmsKit.Blogs;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.GlobalFeatures;
 using Volo.CmsKit.Public.Blogs;

--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml.cs
@ -1,11 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination;
+using Volo.CmsKit.Contents;
 using Volo.CmsKit.Public.Blogs;
 using Volo.CmsKit.Users;

--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml
@ -25,7 +25,7 @@

 <abp-card>
    <abp-card-body>
-        @await Component.InvokeAsync("ContentFragment", new { pageDto = Model.PageDto })
+        @await Component.InvokeAsync("ContentFragment", new { contentDto = Model.PageDto })
    </abp-card-body>
 </abp-card>