From 69c0a539a20aaad3093a70e59cb501e53b112622 Mon Sep 17 00:00:00 2001 From: malik masis Date: Tue, 14 Jun 2022 10:19:58 +0300 Subject: [PATCH] Fixed unbuildable code --- .../Volo/CmsKit/Polls/PollConsts.cs | 5 ----- .../Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs | 1 - .../CmsKit/Shared/Components/Pages/PageViewModel.cs | 1 - .../Pages/Public/CmsKit/Blogs/BlogPost.cshtml | 10 +++++----- 4 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Polls/PollConsts.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Polls/PollConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Polls/PollConsts.cs deleted file mode 100644 index 8f8ab97073..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Polls/PollConsts.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Volo.CmsKit.Polls; -public static class PollConsts -{ - public static string Delimeter { get; } = "----"; -} diff --git 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 index 06e7eec7a5..695f50836e 100644 --- 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 @@ -2,7 +2,6 @@ using System.Collections.Generic; using Volo.Abp.Application.Dtos; using Volo.CmsKit.Contents; -using Volo.CmsKit.Polls; using Volo.CmsKit.Users; namespace Volo.CmsKit.Public.Blogs; diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/PageViewModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/PageViewModel.cs index acd5ed2447..8dcc71c3b2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/PageViewModel.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/PageViewModel.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Volo.CmsKit.Contents; -using Volo.CmsKit.Polls; namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages; 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 6115f33676..c6fabf0f81 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,6 @@ @page -@using Volo.CmsKit.Polls +@using Volo.Abp.Data @using Volo.CmsKit.Public.Blogs @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPostComment @using Volo.CmsKit.Public.Web.Pages @@ -69,13 +69,13 @@

@foreach (var contentFragment in Model.BlogPost.ContentFragments) { - if (contentFragment is MarkdownContentFragment markdownContentFragment) + if (contentFragment.Type == "Markdown") //TODO: Constant { - @Html.Raw(await MarkdownRenderer.RenderAsync(markdownContentFragment.Content)) + @Html.Raw(await MarkdownRenderer.RenderAsync(contentFragment.GetProperty("Content"))) } - else if (contentFragment is WidgetContentFragment widgetContentFragment) + else if (contentFragment.Type == "Widget") //TODO: Constant { - @await Component.InvokeAsync(widgetContentFragment.Name, widgetContentFragment.Properties) + @await Component.InvokeAsync(contentFragment.GetProperty("Type"), contentFragment.ExtraProperties) } }