Merge pull request #7911 from abpframework/cotur/cms-kit/removing-content

CmsKit Content component removed

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210302075529_Added_Content_To_BlogPost.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Volo.CmsKit.Migrations
+{
+    public partial class Added_Content_To_BlogPost : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Content",
+                table: "CmsBlogPosts",
+                type: "nvarchar(max)",
+                maxLength: 2147483647,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Content",
+                table: "CmsBlogPosts");
+        }
+    }
+}

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210302091451_Added_Content_To_Page.cs

@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Volo.CmsKit.Migrations
+{
+    public partial class Added_Content_To_Page : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Content",
+                table: "CmsPages",
+                type: "nvarchar(max)",
+                maxLength: 2147483647,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Content",
+                table: "CmsPages");
+        }
+    }
+}

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs

@@ -1269,6 +1269,10 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnType("nvarchar(40)")
                         .HasColumnName("ConcurrencyStamp");
 
+                    b.Property<string>("Content")
+                        .HasMaxLength(2147483647)
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<DateTime>("CreationTime")
                         .HasColumnType("datetime2")
                         .HasColumnName("CreationTime");
@@ -1533,6 +1537,10 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnType("nvarchar(40)")
                         .HasColumnName("ConcurrencyStamp");
 
+                    b.Property<string>("Content")
+                        .HasMaxLength(2147483647)
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<DateTime>("CreationTime")
                         .HasColumnType("datetime2")
                         .HasColumnName("CreationTime");

modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml

@@ -8,7 +8,6 @@
 @using Volo.CmsKit.GlobalFeatures
 @using Volo.CmsKit.Pages
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
-@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Tags
@@ -31,11 +30,6 @@
 <abp-card>
     <abp-card-body class="p-5">
         <abp-blockquote class="text-center">
-            @if (GlobalFeatureManager.Instance.IsEnabled<ContentsFeature>())
-            {
-                @await Component.InvokeAsync(typeof(ContentViewComponent), new {entityType = "quote", entityId = "1"})
-            }
-            
             @if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
             {
                 @await Component.InvokeAsync(typeof(TagViewComponent), new

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/BlogPostDto.cs

@@ -11,6 +11,9 @@ namespace Volo.CmsKit.Admin.Blogs
         public string Title { get; set; }
 
         public string Slug { get; set; }
-        public string ShortDescription { get; protected set; }
+        
+        public string ShortDescription { get; set; }
+        
+        public string Content { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/CreateBlogPostDto.cs

@@ -21,5 +21,8 @@ namespace Volo.CmsKit.Admin.Blogs
 
         [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxShortDescriptionLength))]
         public string ShortDescription { get; set; }
+        
+        [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxContentLength))]
+        public string Content { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Blogs/UpdateBlogPostDto.cs

@@ -18,6 +18,8 @@ namespace Volo.CmsKit.Admin.Blogs
 
         [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxShortDescriptionLength))]
         public string ShortDescription { get; set; }
-
+        
+        [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxContentLength))]
+        public string Content { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentCreateDto.cs

@@ -1,23 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Volo.Abp.Validation;
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.Admin.Contents
-{
-    [Serializable]
-    public class ContentCreateDto
-    {
-        [Required]
-        [DynamicMaxLength(typeof(ContentConsts), nameof(ContentConsts.MaxEntityTypeLength))]
-        public string EntityType { get; set; }
-
-        [Required]
-        [DynamicMaxLength(typeof(ContentConsts), nameof(ContentConsts.MaxEntityIdLength))]
-        public string EntityId { get; set; }
-
-        [Required]
-        [DynamicMaxLength(typeof(ContentConsts), nameof(ContentConsts.MaxValueLength))]
-        public string Value { get; set; }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentDto.cs

@@ -1,15 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace Volo.CmsKit.Admin.Contents
-{
-    [Serializable]
-    public class ContentDto : EntityDto<Guid>
-    {
-        public string EntityType { get; set; }
-
-        public string EntityId { get; set; }
-
-        public string Value { get; set; }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentGetListDto.cs

@@ -1,13 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace Volo.CmsKit.Admin.Contents
-{
-    [Serializable]
-    public class ContentGetListDto : EntityDto<Guid>
-    {
-        public string EntityType { get; set; }
-
-        public string EntityId { get; set; }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentGetListInput.cs

@@ -1,10 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace Volo.CmsKit.Admin.Contents
-{
-    [Serializable]
-    public class ContentGetListInput : PagedAndSortedResultRequestDto
-    {
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/ContentUpdateDto.cs

@@ -1,15 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Volo.Abp.Validation;
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.Admin.Contents
-{
-    [Serializable]
-    public class ContentUpdateDto
-    {
-        [Required]
-        [DynamicMaxLength(typeof(ContentConsts), nameof(ContentConsts.MaxValueLength))]
-        public string Value { get; set; }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Contents/IContentAdminAppService.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-using Volo.CmsKit.Admin.Contents;
-
-namespace Volo.CmsKit.Admin.Contents
-{
-    public interface IContentAdminAppService 
-        : ICrudAppService<
-            ContentDto,
-            ContentGetListDto,
-            Guid,
-            ContentGetListInput,
-            ContentCreateDto,
-            ContentUpdateDto>
-    {
-        Task<ContentDto> GetAsync(string entityType, string entityId);
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/CreatePageInputDto.cs

@@ -16,5 +16,8 @@ namespace Volo.CmsKit.Admin.Pages
         [Required]
         [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))]
         public string Slug { get; set; }
+        
+        [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxContentLength))]
+        public string Content { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/PageDto.cs

@@ -9,5 +9,7 @@ namespace Volo.CmsKit.Admin.Pages
         public string Title { get; set; }
 
         public string Slug { get; set; }
+        
+        public string Content { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Pages/UpdatePageInputDto.cs

@@ -16,5 +16,8 @@ namespace Volo.CmsKit.Admin.Pages
         [Required]
         [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))]
         public string Slug { get; set; }
+        
+        [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxContentLength))]
+        public string Content { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs

@@ -54,7 +54,7 @@ namespace Volo.CmsKit.Admin.Blogs
                                                         input.Title,
                                                         input.Slug,
                                                         input.ShortDescription,
-                                                        CurrentTenant.Id);
+                                                        input.Content);
 
             await BlogPostRepository.InsertAsync(blogPost);
 
@@ -68,7 +68,8 @@ namespace Volo.CmsKit.Admin.Blogs
 
             blogPost.SetTitle(input.Title);
             blogPost.SetShortDescription(input.ShortDescription);
-
+            blogPost.SetContent(input.Content);
+            
             if (blogPost.Slug != input.Slug)
             {
                 await BlogPostManager.SetSlugUrlAsync(blogPost, input.Slug);

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs

@@ -2,13 +2,11 @@
 using Volo.Abp.AutoMapper;
 using Volo.CmsKit.Admin.Blogs;
 using Volo.CmsKit.Admin.Comments;
-using Volo.CmsKit.Admin.Contents;
 using Volo.CmsKit.Admin.MediaDescriptors;
 using Volo.CmsKit.Admin.Pages;
 using Volo.CmsKit.Blogs;
 using Volo.CmsKit.Admin.Tags;
 using Volo.CmsKit.Comments;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.MediaDescriptors;
 using Volo.CmsKit.Pages;
 using Volo.CmsKit.Tags;
@@ -28,11 +26,6 @@ namespace Volo.CmsKit.Admin
             
             CreateMap<Page, PageDto>();
 
-            CreateMap<Content, ContentDto>(MemberList.Destination);
-            CreateMap<Content, ContentGetListDto>(MemberList.Destination);
-            CreateMap<ContentCreateDto, Content>(MemberList.Source);
-            CreateMap<ContentUpdateDto, Content>(MemberList.Source);
-
             CreateMap<BlogPost, BlogPostDto>(MemberList.Destination);
             CreateMap<CreateBlogPostDto, BlogPost>(MemberList.Source);
             CreateMap<UpdateBlogPostDto, BlogPost>(MemberList.Source);

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs

@@ -21,15 +21,12 @@ namespace Volo.CmsKit.Admin
         )]
     public class CmsKitAdminApplicationModule : AbpModule
     {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            ConfigureTagOptions();
-        }
-
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddAutoMapperObjectMapper<CmsKitAdminApplicationModule>();
 
+            ConfigureTagOptions();
+
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddMaps<CmsKitAdminApplicationModule>(validate: true);

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Contents/ContentAdminAppService.cs

@@ -1,71 +0,0 @@
-using JetBrains.Annotations;
-using Microsoft.AspNetCore.Authorization;
-using System;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
-using Volo.CmsKit.Contents;
-using Volo.CmsKit.Permissions;
-
-namespace Volo.CmsKit.Admin.Contents
-{
-    [Authorize(CmsKitAdminPermissions.Contents.Default)]
-    public class ContentAdminAppService :
-        CrudAppService<
-            Content,
-            ContentDto,
-            ContentGetListDto,
-            Guid,
-            ContentGetListInput,
-            ContentCreateDto,
-            ContentUpdateDto
-            >, IContentAdminAppService
-    {
-        protected IContentManager ContentManager { get; }
-
-        protected IContentRepository ContentRepository { get; }
-
-        public ContentAdminAppService(
-            IRepository<Content, Guid> repository,
-            IContentManager contentManager,
-            IContentRepository contentRepository) : base(repository)
-        {
-            ContentManager = contentManager;
-            ContentRepository = contentRepository;
-
-            GetListPolicyName = CmsKitAdminPermissions.Contents.Default;
-            GetPolicyName = CmsKitAdminPermissions.Contents.Default;
-            CreatePolicyName = CmsKitAdminPermissions.Contents.Create;
-            UpdatePolicyName = CmsKitAdminPermissions.Contents.Update;
-            DeletePolicyName = CmsKitAdminPermissions.Contents.Delete;
-        }
-
-        [Authorize(CmsKitAdminPermissions.Contents.Create)]
-        public override async Task<ContentDto> CreateAsync(ContentCreateDto input)
-        {
-            var entity = new Content(
-                        GuidGenerator.Create(),
-                        input.EntityType,
-                        input.EntityId,
-                        input.Value,
-                        CurrentTenant?.Id);
-
-            await ContentManager.InsertAsync(entity);
-
-            return await MapToGetOutputDtoAsync(entity);
-        }
-
-        public virtual async Task<ContentDto> GetAsync(
-            [NotNull] string entityType,
-            [NotNull] string entityId)
-        {
-            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
-            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
-
-            var content = await ContentRepository.GetAsync(entityType, entityId, CurrentTenant?.Id);
-
-            return ObjectMapper.Map<Content, ContentDto>(content);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs

@@ -50,7 +50,7 @@ namespace Volo.CmsKit.Admin.Pages
         {
             await CheckPageSlugAsync(input.Slug);
 
-            var page = new Page(GuidGenerator.Create(), input.Title, input.Slug, CurrentTenant.Id);
+            var page = new Page(GuidGenerator.Create(), input.Title, input.Slug, input.Content, CurrentTenant.Id);
 
             await PageRepository.InsertAsync(page);
             
@@ -69,6 +69,7 @@ namespace Volo.CmsKit.Admin.Pages
 
             page.SetTitle(input.Title);
             page.SetSlug(input.Slug);
+            page.SetContent(input.Content);
 
             await PageRepository.UpdateAsync(page);
             

modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/Contents/ContentAdminController.cs

@@ -1,71 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.GlobalFeatures;
-using Volo.CmsKit.Admin.Contents;
-using Volo.CmsKit.GlobalFeatures;
-using Volo.CmsKit.Permissions;
-
-namespace Volo.CmsKit.Admin.Contents
-{
-    [Authorize(CmsKitAdminPermissions.Contents.Default)]
-    [RequiresGlobalFeature(typeof(ContentsFeature))]
-    [RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
-    [Route("api/cms-kit-admin/contents")]
-    public class ContentAdminController : CmsKitAdminController, IContentAdminAppService
-    {
-        protected IContentAdminAppService ContentAdminAppService { get; }
-
-        public ContentAdminController(IContentAdminAppService contentAdminAppService)
-        {
-            ContentAdminAppService = contentAdminAppService;
-        }
-
-        [HttpPost]
-        [Authorize(CmsKitAdminPermissions.Contents.Create)]
-        public Task<ContentDto> CreateAsync(ContentCreateDto input)
-        {
-            return ContentAdminAppService.CreateAsync(input);
-        }
-
-        [HttpDelete("{id}")]
-        [Authorize(CmsKitAdminPermissions.Contents.Delete)]
-        public Task DeleteAsync(Guid id)
-        {
-            return ContentAdminAppService.DeleteAsync(id);
-        }
-
-        [HttpGet("{id}")]
-        [Authorize(CmsKitAdminPermissions.Contents.Default)]
-        public Task<ContentDto> GetAsync(Guid id)
-        {
-            return ContentAdminAppService.GetAsync(id);
-        }
-
-        [HttpGet]
-        [Authorize(CmsKitAdminPermissions.Contents.Default)]
-        public Task<PagedResultDto<ContentGetListDto>> GetListAsync(ContentGetListInput input)
-        {
-            return ContentAdminAppService.GetListAsync(input);
-        }
-
-        [HttpPut]
-        [Authorize(CmsKitAdminPermissions.Contents.Update)]
-        public Task<ContentDto> UpdateAsync(Guid id, ContentUpdateDto input)
-        {
-            return ContentAdminAppService.UpdateAsync(id, input);
-        }
-
-        [HttpGet]
-        [Route("{entityType}/{entityId}")]
-        [Authorize(CmsKitAdminPermissions.Contents.Default)]
-        public Task<ContentDto> GetAsync(string entityType, string entityId)
-        {
-            return ContentAdminAppService.GetAsync(entityType, entityId);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs

@@ -76,11 +76,11 @@ namespace Volo.CmsKit.Admin.Web
                 options.Conventions.AddPageRoute("/CmsKit/Tags/Index", "/Cms/Tags");
                 options.Conventions.AddPageRoute("/CmsKit/Pages/Index", "/Cms/Pages");
                 options.Conventions.AddPageRoute("/CmsKit/Pages/Create", "/Cms/Pages/Create");
-                options.Conventions.AddPageRoute("/CmsKit/Pages/Update", "/Cms/Pages/Update");
+                options.Conventions.AddPageRoute("/CmsKit/Pages/Update", "/Cms/Pages/Update/{Id}");
                 options.Conventions.AddPageRoute("/CmsKit/Blogs/Index", "/Cms/Blogs");
                 options.Conventions.AddPageRoute("/CmsKit/BlogPosts/Index", "/Cms/BlogPosts");
                 options.Conventions.AddPageRoute("/CmsKit/BlogPosts/Create", "/Cms/BlogPosts/Create");
-                options.Conventions.AddPageRoute("/CmsKit/BlogPosts/Update", "/Cms/BlogPosts/Update");
+                options.Conventions.AddPageRoute("/CmsKit/BlogPosts/Update", "/Cms/BlogPosts/Update/{Id}");
                 options.Conventions.AddPageRoute("/CmsKit/Comments/Index", "/Cms/Comments");
                 options.Conventions.AddPageRoute("/CmsKit/Comments/Details", "/Cms/Details");
             });

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml

@@ -1,6 +1,7 @@
 @page
 
-@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.EntityContentEditor
+@using System.Globalization
+@using Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageToolbar
 @using Volo.CmsKit.Admin.Web.Pages
 @using Volo.CmsKit.Admin.Web.Menus
@@ -22,12 +23,19 @@
 
 @section scripts {
     <abp-script-bundle>
-        <abp-script type="typeof(UppyScriptContributor)" />
+        <abp-script type="typeof(TuiEditorScriptContributor)"/>
-        <abp-script src="/Pages/CmsKit/BlogPosts/create.js" />
+        <abp-script type="typeof(UppyScriptContributor)"/>
-        <abp-script type="typeof(SlugifyScriptContributor)" />
+        <abp-script type="typeof(SlugifyScriptContributor)"/>
+        <abp-script src="/Pages/CmsKit/BlogPosts/create.js"/>
     </abp-script-bundle>
 }
 
+@section styles {
+    <abp-style-bundle>
+        <abp-style type="typeof(TuiEditorStyleContributor)"/>
+    </abp-style-bundle>
+}
+
 @section content_toolbar {
     @await Component.InvokeAsync(typeof(AbpPageToolbarViewComponent), new { pageName = typeof(CreateModel).FullName })
 }
@@ -50,15 +58,14 @@
             <abp-input asp-for="ViewModel.Title" />
 
             <abp-input asp-for="ViewModel.Slug" />
-
+            
-            @await Component.InvokeAsync(typeof(EntityContentEditorViewComponent), new
-            {
-                entityType = BlogPostConsts.EntityType,
-                displaySubmitButton = false
-            })
-
             <abp-form-content />
 
+            <div class="content-editor" 
+                 id="ContentEditor" 
+                 data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
+                 data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
+            </div>
         </abp-dynamic-form>
 
         <div id="blog-post-tags-wrapper">

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml.cs

@@ -58,6 +58,10 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts
 
             [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxShortDescriptionLength))]
             public string ShortDescription { get; set; }
+            
+            [HiddenInput]
+            [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxContentLength))]
+            public string Content { get; set; }
         }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml

@@ -1,9 +1,10 @@
 @page "{Id}"
 
+@using System.Globalization
+@using Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor
 @using Volo.CmsKit.Blogs
 @using Volo.CmsKit.Admin.Web.Pages
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageToolbar
-@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.EntityContentEditor
 @using Volo.CmsKit.Admin.Web.Menus
 @using Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts
 @using Volo.CmsKit.Admin.Web.Pages.CmsKit.Tags.Components.TagEditor
@@ -22,12 +23,19 @@
 
 @section scripts {
     <abp-script-bundle>
-        <abp-script type="typeof(UppyScriptContributor)" />
+        <abp-script type="typeof(TuiEditorScriptContributor)"/>
-        <abp-script src="/Pages/CmsKit/BlogPosts/update.js" />
+        <abp-script type="typeof(UppyScriptContributor)"/>
-        <abp-script type="typeof(SlugifyScriptContributor)" />
+        <abp-script type="typeof(SlugifyScriptContributor)"/>
+        <abp-script src="/Pages/CmsKit/BlogPosts/update.js"/>
     </abp-script-bundle>
 }
 
+@section styles {
+    <abp-style-bundle>
+        <abp-style type="typeof(TuiEditorStyleContributor)"/>
+    </abp-style-bundle>
+}
+
 @section content_toolbar {
     @await Component.InvokeAsync(typeof(AbpPageToolbarViewComponent), new { pageName = typeof(UpdateModel).FullName })
 }
@@ -49,14 +57,14 @@
 
             <abp-input asp-for="ViewModel.Slug" />
 
-            @await Component.InvokeAsync(typeof(EntityContentEditorViewComponent), new
-               {
-                   entityType = BlogPostConsts.EntityType,
-                   entityId = Model.Id.ToString(),
-                   displaySubmitButton = false
-               })
-
             <abp-form-content />
+        
+            <div class="content-editor" 
+                 id="ContentEditor" 
+                 data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
+                 data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
+            </div>
+            
         </abp-dynamic-form>
 
         @if (Model.TagsFeature?.IsEnabled == true)

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml.cs

@@ -72,6 +72,10 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.BlogPosts
             [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxShortDescriptionLength))]
             [DisplayOrder(10001)]
             public string ShortDescription { get; set; }
+            
+            [HiddenInput]
+            [DynamicMaxLength(typeof(BlogPostConsts), nameof(BlogPostConsts.MaxContentLength))]
+            public string Content { get; set; }
         }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js

@@ -41,7 +41,12 @@
 
             $formCreate.ajaxSubmit({
                 success: function (result) {
-                    submitEntityContent(result.id);
+                    if (isTagsEnabled) {
+                        submitEntityTags(result.id);
+                    }
+                    else {
+                        submitCoverImage(result.id);
+                    }
                 },
                 error: function (result) {
                     abp.notify.error(result.responseJSON.error.message);
@@ -55,29 +60,16 @@
         e.preventDefault();
         $formCreate.submit();
     });
-
+    
-    function submitEntityContent(blogPostId) {
-        volo.cmsKit.admin.contents.contentAdmin
-            .create(
-                {
-                    entityType: 'BlogPost',
-                    entityId: blogPostId,
-                    value: $pageContentInput.val()
-                })
-            .then(function (result) {
-                if (isTagsEnabled) {
-                    submitEntityTags(blogPostId)
-                }
-                else {
-                    submitCoverImage(blogPostId);
-                }
-            });
-    }
-
     function submitEntityTags(blogPostId) {
 
-        var tags = $tagsInput.val().split(",");
+        var tags = $tagsInput.val().split(',').map(x => x.trim()).filter(x => x);
-
+                
+        if(tags.length === 0){
+            submitCoverImage(blogPostId);
+            return;
+        }
+        
         volo.cmsKit.admin.tags.entityTagAdmin
             .setEntityTags({
                 entityType: 'BlogPost',
@@ -209,4 +201,77 @@
                 }
             });
     });
+    
+    // -----------------------------------
+    var fileUploadUri = "/api/cms-kit-admin/media/blogpost";
+    var fileUriPrefix = "/api/cms-kit/media/";
+
+    var editorDataKey = "tuiEditor";
+
+    initAllEditors();
+
+    function initAllEditors() {
+        $('.content-editor').each(function (i, item) {
+            initEditor(item);
+        });
+    }
+
+    function initEditor(element) {
+        var $editorContainer = $(element);
+        var inputName = $editorContainer.data('input-id');
+        var $editorInput = $('#' + inputName);
+        var initialValue = $editorInput.val();
+
+        var editor = $editorContainer.tuiEditor({
+            usageStatistics: false,
+            useCommandShortcut: true,
+            initialValue: initialValue,
+            previewStyle: 'tab',
+            height: "25em",
+            minHeight: "25em",
+            initialEditType: initialValue ? 'wysiwyg' : 'markdown',
+            language: $editorContainer.data("language"),
+            hooks: {
+                addImageBlobHook: uploadFile,
+            },
+            events: {
+                change: function (_val) {
+                    $editorInput.val(editor.getHtml());
+                    $editorInput.trigger("change");
+                }
+            }
+        }).data(editorDataKey);
+    }
+
+    function uploadFile(blob, callback, source) {
+        var UPPY_OPTIONS = {
+            endpoint: fileUploadUri,
+            formData: true,
+            fieldName: "file",
+            method: "post",
+            headers: getUppyHeaders()
+        };
+
+        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+
+        UPPY.reset();
+
+        UPPY.addFile({
+            id: "content-file",
+            name: blob.name,
+            type: blob.type,
+            data: blob,
+        });
+
+        UPPY.upload().then((result) => {
+            if (result.failed.length > 0) {
+                abp.message.error("File upload failed");
+            } else {
+                var mediaDto = result.successful[0].response.body;
+                var fileUrl = (fileUriPrefix + mediaDto.id);
+
+                callback(fileUrl, mediaDto.name);
+            }
+        });
+    }
 });

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js

@@ -27,7 +27,7 @@ $(function () {
                             text: l('Edit'),
                             visible: abp.auth.isGranted('CmsKit.Blogs.Update'),
                             action: function (data) {
-                                location.href = "/CmsKit/BlogPosts/Update/" + data.record.id
+                                location.href = "BlogPosts/Update/" + data.record.id
                             }
                         },
                         {
@@ -63,6 +63,6 @@ $(function () {
 
     $('#AbpContentToolbar button[name=CreateBlogPost]').on('click', function (e) {
         e.preventDefault();
-        window.location.href = "/CmsKit/BlogPosts/Create"
+        window.location.href = "BlogPosts/Create"
     });
 });

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js

@@ -8,15 +8,15 @@
     var $titleClone = $('#title-clone');
     var $slug = $('#ViewModel_Slug');
     var $buttonSubmit = $('#button-blog-post-update');
-    var $contentValueInput = $('#ViewModel_Value');
     var $blogPostIdInput = $('#Id');
-    var $contentIdInput = $('#ViewModel_Id');
     var $tagsInput = $('.tag-editor-form input[name=tags]');
     var $fileInput = $('#BlogPostCoverImage');
 
     var UPPY_UPLOAD_ENDPOINT = "/api/cms-kit-admin/blogs/blog-posts/{0}/cover-image";
     var UPPY_FILE_ID = "uppy-upload-file";
 
+    var isTagsEnabled = true;
+    
     $formUpdate.data('validator').settings.ignore = ":hidden, [contenteditable='true']:not([name]), .tui-popup-wrapper";
     
     function initSelectBlog() {
@@ -40,7 +40,12 @@
 
             $formUpdate.ajaxSubmit({
                 success: function (result) {
-                    submitEntityContent();
+                    if (isTagsEnabled) {
+                        submitEntityTags($blogPostIdInput.val());
+                    }
+                    else {
+                        submitCoverImage($blogPostIdInput.val());
+                    }
                 },
                 error: function (result) {
                     abp.ui.clearBusy(); abp.notify.error(result.responseJSON.error.message);
@@ -53,49 +58,16 @@
         e.preventDefault();
         $formUpdate.submit();
     });
+    
+    function submitEntityTags(blogPostId) {      
 
-    function submitEntityContent() {
+        var tags = $tagsInput.val().split(',').map(x => x.trim()).filter(x => x);
-
-        var contentId = $contentIdInput.val();
-        var blogPostId = $blogPostIdInput.val();
-        var contentValue = $contentValueInput.val();
-
-        if (contentId) {
-            volo.cmsKit.admin.contents.contentAdmin
-                .update(contentId,
-                    {
-                        value: contentValue
-                    })
-                .then(function (result) {
-                    entityContentCallback(blogPostId);
-                });
-        }
-        else {
-            volo.cmsKit.admin.contents.contentAdmin
-                .create({
-                    entityType: 'BlogPost',
-                    entityId: blogPostId,
-                    value: contentValue
-                })
-                .then(function (result) {
-                    entityContentCallback(blogPostId);
-                });
-        }
-    }
 
-    function entityContentCallback(blogPostId) {
+        if(tags.length === 0){
-        if ($tagsInput.val()) {
-            submitEntityTags(blogPostId);
-        }
-        else {
             submitCoverImage(blogPostId);
+            return;
         }
-    }
+        
-
-    function submitEntityTags(blogPostId) {      
-
-        var tags = $tagsInput.val().split(",");
-
         volo.cmsKit.admin.tags.entityTagAdmin
             .setEntityTags({
                 entityType: 'BlogPost',
@@ -154,7 +126,7 @@
     function finishSaving(result) {
         abp.notify.success(l('SuccessfullySaved'));
         abp.ui.clearBusy();
-        location.href = "../BlogPosts/";
+        location.href = "../../BlogPosts";
     }
 
     $titleClone.on('change paste keyup', function () {
@@ -177,4 +149,78 @@
             });
         }
     }
+
+
+    // -----------------------------------
+    var fileUploadUri = "/api/cms-kit-admin/media/blogpost";
+    var fileUriPrefix = "/api/cms-kit/media/";
+
+    var editorDataKey = "tuiEditor";
+
+    initAllEditors();
+
+    function initAllEditors() {
+        $('.content-editor').each(function (i, item) {
+            initEditor(item);
+        });
+    }
+
+    function initEditor(element) {
+        var $editorContainer = $(element);
+        var inputName = $editorContainer.data('input-id');
+        var $editorInput = $('#' + inputName);
+        var initialValue = $editorInput.val();
+
+        var editor = $editorContainer.tuiEditor({
+            usageStatistics: false,
+            useCommandShortcut: true,
+            initialValue: initialValue,
+            previewStyle: 'tab',
+            height: "25em",
+            minHeight: "25em",
+            initialEditType: initialValue ? 'wysiwyg' : 'markdown',
+            language: $editorContainer.data("language"),
+            hooks: {
+                addImageBlobHook: uploadFile,
+            },
+            events: {
+                change: function (_val) {
+                    $editorInput.val(editor.getHtml());
+                    $editorInput.trigger("change");
+                }
+            }
+        }).data(editorDataKey);
+    }
+
+    function uploadFile(blob, callback, source) {
+        var UPPY_OPTIONS = {
+            endpoint: fileUploadUri,
+            formData: true,
+            fieldName: "file",
+            method: "post",
+            headers: getUppyHeaders()
+        };
+
+        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+
+        UPPY.reset();
+
+        UPPY.addFile({
+            id: "content-file",
+            name: blob.name,
+            type: blob.type,
+            data: blob,
+        });
+
+        UPPY.upload().then((result) => {
+            if (result.failed.length > 0) {
+                abp.message.error("File upload failed");
+            } else {
+                var mediaDto = result.successful[0].response.body;
+                var fileUrl = (fileUriPrefix + mediaDto.id);
+
+                callback(fileUrl, mediaDto.name);
+            }
+        });
+    }
 });

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/Components/ContentEditor/ContentEditorViewComponent.cs

@@ -1,44 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using System.Threading.Tasks;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor;
-using Volo.Abp.AspNetCore.Mvc.UI.Packages.Uppy;
-using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
-
-namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.ContentEditor
-{
-    [Widget(
-        StyleTypes = new[]
-        {
-            typeof(TuiEditorStyleContributor)
-        },
-        ScriptTypes = new[]
-        {
-            typeof(TuiEditorScriptContributor),
-            typeof(UppyScriptContributor)
-        },
-        ScriptFiles = new[]
-        {
-            "/Pages/CmsKit/Contents/Components/ContentEditor/default.js"
-        })]
-    public class ContentEditorViewComponent : AbpViewComponent
-    {
-        public async Task<IViewComponentResult> InvokeAsync(string inputId)
-        {
-            return View(
-                "~/Pages/CmsKit/Contents/Components/ContentEditor/Default.cshtml",
-                new ContentEditorViewModel(inputId));
-        }
-
-        public class ContentEditorViewModel
-        {
-            public ContentEditorViewModel(string inputId)
-            {
-                InputId = inputId;
-            }
-
-            public string InputId { get; set; }
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/Components/ContentEditor/Default.cshtml

@@ -1,7 +0,0 @@
-@using System.Globalization
-@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.ContentEditor
-
-@model ContentEditorViewComponent.ContentEditorViewModel
-
-<div class="content-editor" id="@Model.InputId-container" data-input-id="@Model.InputId" data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
-</div>

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/Components/ContentEditor/default.js

@@ -1,80 +0,0 @@
-$(function () {
-    var fileUploadUri = "/api/cms-kit-admin/media";
-    var fileUriPrefix = "/api/cms-kit/media/";
-
-    var editorDataKey = "tuiEditor";
-
-    initAllEditors();
-
-    function initAllEditors() {
-        $('.content-editor').each(function (i, item) {
-            initEditor(item);
-        });
-    }
-
-    function initEditor(element) {
-        var $editorContainer = $(element);
-        var inputName = $editorContainer.data('input-id');
-        var $editorInput = $('#' + inputName);
-        var initialValue = $editorInput.val();
-
-        var editor = $editorContainer.tuiEditor({
-            usageStatistics: false,
-            useCommandShortcut: true,
-            initialValue: initialValue,
-            previewStyle: 'tab',
-            height: "25em",
-            minHeight: "25em",
-            initialEditType: initialValue ? 'wysiwyg' : 'markdown',
-            language: $editorContainer.data("language"),
-            hooks: {
-                addImageBlobHook: uploadFile,
-            },
-            events: {
-                change: function (_val) {
-                    $editorInput.val(editor.getHtml());
-                    $editorInput.trigger("change");
-                }
-            }
-        }).data(editorDataKey);
-    }
-
-    function getUppyHeaders() {
-        var headers = {};
-        headers[abp.security.antiForgery.tokenHeaderName] = abp.security.antiForgery.getToken();
-
-        return headers;
-    }
-
-    function uploadFile(blob, callback, source) {
-        var UPPY_OPTIONS = {
-            endpoint: fileUploadUri,
-            formData: true,
-            fieldName: "file",
-            method: "post",
-            headers: getUppyHeaders()
-        };
-
-        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
-
-        UPPY.reset();
-
-        UPPY.addFile({
-            id: "content-file",
-            name: blob.name,
-            type: blob.type,
-            data: blob,
-        });
-
-        UPPY.upload().then((result) => {
-            if (result.failed.length > 0) {
-                abp.message.error("File upload failed");
-            } else {
-                var mediaDto = result.successful[0].response.body;
-                var fileUrl = (fileUriPrefix + mediaDto.id);
-
-                callback(fileUrl, mediaDto.name);
-            }
-        });
-    }
-});

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/Components/EntityContentEditor/ContentViewModel.cs

@@ -1,28 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using System;
-
-namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.EntityContentEditor
-{
-    public class ContentViewModel
-    {
-        public ContentViewModel(string entityType, string entityId, string value = null, Guid? id = null)
-        {
-            EntityType = entityType;
-            EntityId = entityId;
-            Value = value;
-            Id = id;
-        }
-
-        [HiddenInput]
-        public string EntityType { get; set; }
-
-        [HiddenInput]
-        public string EntityId { get; set; }
-
-        [HiddenInput]
-        public string Value { get; set; }
-
-        [HiddenInput]
-        public Guid? Id { get; set; }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/Components/EntityContentEditor/Default.cshtml

@@ -1,27 +0,0 @@
-@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.EntityContentEditor
-@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.ContentEditor
-@using Volo.CmsKit.Localization
-@using Microsoft.Extensions.Localization
-
-@model EntityContentEditorViewComponent.EntityContentEditorViewModel
-
-@inject IStringLocalizer<CmsKitResource> L
-
-@if (Model.DisplaySubmitButton)
-{
-    <abp-dynamic-form abp-model="ViewModel" class="form-entity-content-editor">
-
-        <abp-form-content />
-
-        <abp-button button-type="Primary" type="submit" text="@L["Submit"]" />
-    </abp-dynamic-form>
-}
-else
-{
-    <abp-input asp-for="ViewModel.Id" />
-    <abp-input asp-for="ViewModel.EntityId" />
-    <abp-input asp-for="ViewModel.EntityType" />
-    <abp-input asp-for="ViewModel.Value" />
-}
-
-@await Component.InvokeAsync(typeof(ContentEditorViewComponent), new { inputId = Html.IdFor(m => m.ViewModel.Value) })

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/Components/EntityContentEditor/EntityContentEditorViewComponent.cs

@@ -1,65 +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.Bootstrap.TagHelpers.Form;
-using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
-using Volo.Abp.Domain.Entities;
-using Volo.CmsKit.Admin.Contents;
-
-namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.EntityContentEditor
-{
-    [Widget(
-        ScriptFiles = new[]
-        {
-            "/Pages/CmsKit/Contents/Components/EntityContentEditor/default.js"
-        })]
-    public class EntityContentEditorViewComponent : AbpViewComponent
-    {
-        private readonly IContentAdminAppService contentAdminAppService;
-
-        public EntityContentEditorViewComponent(IContentAdminAppService contentAdminAppService)
-        {
-            this.contentAdminAppService = contentAdminAppService;
-        }
-
-        public async Task<IViewComponentResult> InvokeAsync(string entityType, string entityId, bool displaySubmitButton = true)
-        {
-            var viewModel = new ContentViewModel(entityType, entityId);
-
-            try
-            {
-                if (entityId != null)
-                {
-                    var content = await contentAdminAppService.GetAsync(entityType, entityId);
-                    viewModel.Value = content.Value;
-                    viewModel.Id = content.Id;
-                }
-            }
-            catch (EntityNotFoundException)
-            {
-                // Initialize editor even content doesn't exist.
-            }
-
-            return View(
-                "~/Pages/CmsKit/Contents/Components/EntityContentEditor/Default.cshtml",
-                new EntityContentEditorViewModel(viewModel, displaySubmitButton));
-        }
-
-        public class EntityContentEditorViewModel
-        {
-            public ContentViewModel ViewModel { get; set; }
-
-            public bool DisplaySubmitButton { get; set; }
-
-            public EntityContentEditorViewModel(ContentViewModel viewModel, bool displaySubmitButton)
-            {
-                ViewModel = viewModel;
-                DisplaySubmitButton = displaySubmitButton;
-            }
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/Components/EntityContentEditor/default.js

@@ -1,34 +0,0 @@
-$(function () {
-
-    $entityContentEditors = $('.form-entity-content-editor');
-
-    var contentAdminService = volo.cmsKit.admin.contents.contentAdmin;
-
-    $entityContentEditors.on('submit', function (e, obj) {
-        e.preventDefault();
-
-        var $form = $(e.currentTarget);
-
-        if ($form.valid()) {
-
-            var data = form.serializeFormToObject().viewModel;
-
-            abp.ui.setBusy(e);
-            if (data.id) {
-                contentAdminService
-                    .update(data.id, data)
-                    .then(function (result) {
-                        abp.ui.clearBusy();
-                    });
-
-            }
-            else {
-                contentAdminService
-                    .create(data)
-                    .then(function (result) {
-                        abp.ui.clearBusy();
-                    });
-            }
-        }
-    })
-})

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml

@@ -1,14 +1,15 @@
 @page
 
-@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.EntityContentEditor
+@using System.Globalization
+@using Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor
+@using Volo.Abp.AspNetCore.Mvc.UI.Packages.Uppy
 @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
 
-@model CreateModel
+@model Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.CreateModel
 
 @{
     PageLayout.Content.Title = L["Pages"].Value;
@@ -17,27 +18,36 @@
 }
 
 @section scripts {
-<abp-script-bundle>
+    <abp-script-bundle>
-    <abp-script src="/Pages/CmsKit/Pages/create.js" />
+        <abp-script type="typeof(TuiEditorScriptContributor)"/>
-    <abp-script type="typeof(SlugifyScriptContributor)" />
+        <abp-script type="typeof(UppyScriptContributor)"/>
-</abp-script-bundle>
+        <abp-script type="typeof(SlugifyScriptContributor)"/>
+        <abp-script src="/Pages/CmsKit/Pages/create.js" />
+    </abp-script-bundle>
+}
+
+@section styles {
+    <abp-style-bundle>
+        <abp-style type="typeof(TuiEditorStyleContributor)"/>
+    </abp-style-bundle>
 }
 
 <abp-card>
     <abp-card-header title="@L["New"].Value"></abp-card-header>
     <abp-card-body>
-        <abp-dynamic-form abp-model="ViewModel" asp-page="/CmsKit/Pages/Create" id="form-page-create">
+        <form asp-page="/CmsKit/Pages/Create" id="form-page-create">
-            <abp-form-content />
+            <abp-input asp-for="@Model.ViewModel.Title" />
-
+            
             <abp-input asp-for="ViewModel.Slug" title="@L["PageSlugInformation"]" data-toggle="tooltip"/>
-        </abp-dynamic-form>
+            
-
+            <abp-input asp-for="@Model.ViewModel.Content" />
-        @await Component.InvokeAsync(typeof(EntityContentEditorViewComponent), new
+            
-        {
+            <div class="content-editor"
-            entityType = "Page",
+                 id="ContentEditor"
-            displaySubmitButton = false
+                 data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
-        })
+                 data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
-
+            </div>
+        </form>
     </abp-card-body>
     <abp-card-footer>
         <abp-button button-type="Primary" type="submit" text="@L["Submit"].Value" id="button-page-create" />

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml.cs

@@ -2,10 +2,8 @@
 using Microsoft.AspNetCore.Mvc;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
-using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
 using Volo.Abp.Validation;
 using Volo.CmsKit.Admin.Pages;
-using Volo.CmsKit.Admin.Web.Pages;
 using Volo.CmsKit.Pages;
 
 namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages
@@ -34,14 +32,17 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages
         [AutoMap(typeof(CreatePageInputDto), ReverseMap = true)]
         public class CreatePageViewModel
         {
-            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxTitleLength))]
             [Required]
+            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxTitleLength))]
             public string Title { get; set; }
 
-            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))]
             [Required]
-            [DynamicFormIgnore]
+            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))]
             public string Slug { get; set; }
+            
+            [HiddenInput]
+            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))]
+            public string Content { get; set; }
         }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Index.cshtml

@@ -1,6 +1,4 @@
 @page
-
-@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageToolbar
 @using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPageSearchBox 
 @using Volo.CmsKit.Admin.Web.Pages

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml

@@ -1,13 +1,15 @@
 @page "{Id}"
 
-@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Contents.Components.EntityContentEditor
+@using System.Globalization
+@using Volo.Abp.AspNetCore.Mvc.UI.Packages.TuiEditor
+@using Volo.Abp.AspNetCore.Mvc.UI.Packages.Uppy
+@using Volo.CmsKit.Admin.Web.Bundles
 @using Volo.CmsKit.Admin.Web.Menus
-@using Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages
 @using Volo.CmsKit.Admin.Web.Pages
 
 @inherits CmsKitAdminPageBase
 
-@model UpdateModel
+@model Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages.UpdateModel
 
 @{
     PageLayout.Content.Title = L["Pages"].Value;
@@ -17,27 +19,38 @@
 
 
 @section scripts {
-    <abp-script src="/Pages/CmsKit/Pages/update.js" />
+    <abp-script-bundle>
+        <abp-script type="typeof(TuiEditorScriptContributor)"/>
+        <abp-script type="typeof(UppyScriptContributor)"/>
+        <abp-script type="typeof(SlugifyScriptContributor)"/>
+        <abp-script src="/Pages/CmsKit/Pages/update.js" />
+    </abp-script-bundle>
+}
+
+@section styles {
+    <abp-style-bundle>
+        <abp-style type="typeof(TuiEditorStyleContributor)"/>
+    </abp-style-bundle>
 }
 
 <abp-card>
     <abp-card-header title="@L["Update"].Value"></abp-card-header>
     <abp-card-body>
-        <abp-dynamic-form abp-model="ViewModel" asp-page="/CmsKit/Pages/Update" id="form-page-update">
+        <form asp-page="/CmsKit/Pages/Update" id="form-page-update">
-            <abp-input asp-for="Id" />
+            <abp-input asp-for="@Model.Id"/>
-
+            
-            <abp-form-content />
+            <abp-input asp-for="@Model.ViewModel.Title"/>
 
-            <abp-input asp-for="ViewModel.Slug" title="@L["PageSlugInformation"]" data-toggle="tooltip" />
+            <abp-input asp-for="ViewModel.Slug" title="@L["PageSlugInformation"]" data-toggle="tooltip"/>
-        </abp-dynamic-form>
 
-        @await Component.InvokeAsync(typeof(EntityContentEditorViewComponent), new
+            <abp-input asp-for="@Model.ViewModel.Content"/>
-        {
-            entityType = "Page",
-            entityId = Model.Id.ToString(),
-            displaySubmitButton = false
-        })
 
+            <div class="content-editor"
+                 id="ContentEditor"
+                 data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
+                 data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
+            </div>
+        </form>
     </abp-card-body>
     <abp-card-footer>
         <abp-button button-type="Primary" type="submit" text="@L["Submit"].Value" id="button-page-update" />

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml.cs

@@ -1,10 +1,7 @@
 using AutoMapper;
 using Microsoft.AspNetCore.Mvc;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
 using Volo.Abp.Validation;
@@ -49,14 +46,17 @@ namespace Volo.CmsKit.Admin.Web.Pages.CmsKit.Pages
         [AutoMap(typeof(UpdatePageInputDto), ReverseMap = true)]
         public class UpdatePageViewModel
         {
-            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxTitleLength))]
             [Required]
+            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxTitleLength))]
             public string Title { get; set; }
 
-            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))]
             [Required]
-            [DynamicFormIgnore]
+            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))]
             public string Slug { get; set; }
+            
+            [HiddenInput]
+            [DynamicMaxLength(typeof(PageConsts), nameof(PageConsts.MaxSlugLength))]
+            public string Content { get; set; }
         }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js

@@ -1,22 +1,25 @@
 $(function () {
     var l = abp.localization.getResource("CmsKit");
 
-    var $formCreate = $('#form-page-create');
+    var $createForm = $('#form-page-create');
     var $title = $('#ViewModel_Title');
     var $slug = $('#ViewModel_Slug');
     var $buttonSubmit = $('#button-page-create');
-    var $pageContentInput = $('#ViewModel_Value');
 
-    $formCreate.on('submit', function (e) {
+    $createForm.data('validator').settings.ignore = ":hidden, [contenteditable='true']:not([name]), .tui-popup-wrapper";
+    
+    $createForm.on('submit', function (e) {
         e.preventDefault();
 
-        if ($formCreate.valid()) {
+        if ($createForm.valid()) {
 
             abp.ui.setBusy();
 
-            $formCreate.ajaxSubmit({
+            $createForm.ajaxSubmit({
                 success: function (result) {
-                    submitEntityContent(result.id);
+                    abp.notify.success(l('SuccessfullySaved'));
+                    abp.ui.clearBusy();
+                    location.href = "/CmsKit/Pages/";
                 }
             });
         }
@@ -24,28 +27,9 @@
 
     $buttonSubmit.click(function (e) {
         e.preventDefault();
-        $formCreate.submit();
+        $createForm.submit();
     });
 
-    function submitEntityContent(pageId) {
-        volo.cmsKit.admin.contents.contentAdmin
-            .create(
-                {
-                    entityType: 'Page',
-                    entityId: pageId,
-                    value: $pageContentInput.val()
-                })
-            .then(function (result) {
-                finishSaving();
-            });
-    }
-
-    function finishSaving() {
-        abp.notify.success(l('SuccessfullySaved'));
-        abp.ui.clearBusy();
-        location.href = "/CmsKit/Pages/";
-    }
-
     var slugEdited = false;
 
     $title.on('change paste keyup', function () {
@@ -69,4 +53,84 @@
     $slug.change(function () {
         slugEdited = true;
     });
+    
+    // -----------------------------------
+    function getUppyHeaders() {
+        var headers = {};
+        headers[abp.security.antiForgery.tokenHeaderName] = abp.security.antiForgery.getToken();
+
+        return headers;
+    }
+    
+    var fileUploadUri = "/api/cms-kit-admin/media/page";
+    var fileUriPrefix = "/api/cms-kit/media/";
+
+    var editorDataKey = "tuiEditor";
+
+    initAllEditors();
+
+    function initAllEditors() {
+        $('.content-editor').each(function (i, item) {
+            initEditor(item);
+        });
+    }
+
+    function initEditor(element) {
+        var $editorContainer = $(element);
+        var inputName = $editorContainer.data('input-id');
+        var $editorInput = $('#' + inputName);
+        var initialValue = $editorInput.val();
+
+        var editor = $editorContainer.tuiEditor({
+            usageStatistics: false,
+            useCommandShortcut: true,
+            initialValue: initialValue,
+            previewStyle: 'tab',
+            height: "25em",
+            minHeight: "25em",
+            initialEditType: initialValue ? 'wysiwyg' : 'markdown',
+            language: $editorContainer.data("language"),
+            hooks: {
+                addImageBlobHook: uploadFile,
+            },
+            events: {
+                change: function (_val) {
+                    $editorInput.val(editor.getHtml());
+                    $editorInput.trigger("change");
+                }
+            }
+        }).data(editorDataKey);
+    }
+
+    function uploadFile(blob, callback, source) {
+        var UPPY_OPTIONS = {
+            endpoint: fileUploadUri,
+            formData: true,
+            fieldName: "file",
+            method: "post",
+            headers: getUppyHeaders()
+        };
+
+        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+
+        UPPY.reset();
+
+        UPPY.addFile({
+            id: "content-file",
+            name: blob.name,
+            type: blob.type,
+            data: blob,
+        });
+
+        UPPY.upload().then((result) => {
+            if (result.failed.length > 0) {
+                abp.message.error("File upload failed");
+            } else {
+                var mediaDto = result.successful[0].response.body;
+                var fileUrl = (fileUriPrefix + mediaDto.id);
+
+                callback(fileUrl, mediaDto.name);
+            }
+        });
+    }
 });

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js

@@ -4,9 +4,8 @@
 
     var $formUpdate = $('#form-page-update');
     var $buttonSubmit = $('#button-page-update');
-    var $pageContentInput = $('#ViewModel_Value');
+
-    var $pageIdInput = $('#Id');
+    $formUpdate.data('validator').settings.ignore = ":hidden, [contenteditable='true']:not([name]), .tui-popup-wrapper";
-    var $contentIdInput = $('#ViewModel_Id');
 
     $formUpdate.on('submit', function (e) {
         e.preventDefault();
@@ -17,7 +16,9 @@
 
             $formUpdate.ajaxSubmit({
                 success: function (result) {
-                    submitEntityContent();
+                    abp.notify.success(l('SuccessfullySaved'));
+                    abp.ui.clearBusy();
+                    location.href = "/CmsKit/Pages/";
                 }
             });
         }
@@ -28,38 +29,83 @@
         $formUpdate.submit();
     });
 
-    function submitEntityContent() {
+    // -----------------------------------
-
+    function getUppyHeaders() {
-        var contentId = $contentIdInput.val();
+        var headers = {};
-        var pageId = $pageIdInput.val();
+        headers[abp.security.antiForgery.tokenHeaderName] = abp.security.antiForgery.getToken();
-        var contentValue = $pageContentInput.val();
+
-
+        return headers;
-        if (contentId) {
+    }
-            volo.cmsKit.admin.contents.contentAdmin
+
-                .update(contentId,
+    var fileUploadUri = "/api/cms-kit-admin/media/page";
-                    {
+    var fileUriPrefix = "/api/cms-kit/media/";
-                        value: contentValue
+
-                    })
+    var editorDataKey = "tuiEditor";
-                .then(function (result) {
+
-                    finishSaving(result);
+    initAllEditors();
-                });
+
-        }
+    function initAllEditors() {
-        else {
+        $('.content-editor').each(function (i, item) {
-            volo.cmsKit.admin.contents.contentAdmin
+            initEditor(item);
-                .create({
+        });
-                    entityType: 'Page',
-                    entityId: pageId,
-                    value: contentValue
-                })
-                .then(function (result) {
-                    finishSaving(result);
-                });
-        }
     }
 
-    function finishSaving(result) {
+    function initEditor(element) {
-        abp.notify.success(l('SuccessfullySaved'));
+        var $editorContainer = $(element);
-        abp.ui.clearBusy();
+        var inputName = $editorContainer.data('input-id');
-        location.href = "/CmsKit/Pages/";
+        var $editorInput = $('#' + inputName);
+        var initialValue = $editorInput.val();
+
+        var editor = $editorContainer.tuiEditor({
+            usageStatistics: false,
+            useCommandShortcut: true,
+            initialValue: initialValue,
+            previewStyle: 'tab',
+            height: "25em",
+            minHeight: "25em",
+            initialEditType: initialValue ? 'wysiwyg' : 'markdown',
+            language: $editorContainer.data("language"),
+            hooks: {
+                addImageBlobHook: uploadFile,
+            },
+            events: {
+                change: function (_val) {
+                    $editorInput.val(editor.getHtml());
+                    $editorInput.trigger("change");
+                }
+            }
+        }).data(editorDataKey);
+    }
+
+    function uploadFile(blob, callback, source) {
+        var UPPY_OPTIONS = {
+            endpoint: fileUploadUri,
+            formData: true,
+            fieldName: "file",
+            method: "post",
+            headers: getUppyHeaders()
+        };
+
+        var UPPY = Uppy.Core().use(Uppy.XHRUpload, UPPY_OPTIONS);
+
+        UPPY.reset();
+
+        UPPY.addFile({
+            id: "content-file",
+            name: blob.name,
+            type: blob.type,
+            data: blob,
+        });
+
+        UPPY.upload().then((result) => {
+            if (result.failed.length > 0) {
+                abp.message.error("File upload failed");
+            } else {
+                var mediaDto = result.successful[0].response.body;
+                var fileUrl = (fileUriPrefix + mediaDto.id);
+
+                callback(fileUrl, mediaDto.name);
+            }
+        });
     }
 });

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Blogs/BlogPostConsts.cs

@@ -11,6 +11,8 @@ namespace Volo.CmsKit.Blogs
         public static int MinSlugLength { get; set; } = 2;
 
         public static int MaxShortDescriptionLength { get; set; } = 256;
+        
+        public static int MaxContentLength { get; set; } = int.MaxValue;
 
         public const string EntityType = "BlogPost";
     }

modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Pages/PageConsts.cs

@@ -7,5 +7,7 @@
         public static int MaxTitleLength { get; set; } = 256;
 
         public static int MaxSlugLength { get; set; } = 256;
+        
+        public static int MaxContentLength { get; set; } = int.MaxValue;
     }
 }

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPost.cs

@@ -21,9 +21,10 @@ namespace Volo.CmsKit.Blogs
         [NotNull] 
         public virtual string ShortDescription { get; protected set; }
 
+        public virtual string Content { get; protected set; }
+        
         public virtual Guid? TenantId { get; protected set; }
 
-        [NotNull]
         public Guid AuthorId { get; set; }
 
         public virtual CmsUser Author { get; set; }
@@ -38,13 +39,17 @@ namespace Volo.CmsKit.Blogs
             Guid authorId,
             [NotNull] string title,
             [NotNull] string slug,
-            [CanBeNull] string shortDescription = null) : base(id)
+            [CanBeNull] string shortDescription = null,
+            [CanBeNull] string content = null,
+            [CanBeNull] Guid? tenantId = null) : base(id)
         {
+            TenantId = tenantId;
             BlogId = blogId;
             AuthorId = authorId;
             SetTitle(title);
             SetSlug(slug);
-            ShortDescription = shortDescription;
+            SetShortDescription(shortDescription);
+            SetContent(content);
         }
 
         public virtual void SetTitle(string title)
@@ -63,5 +68,10 @@ namespace Volo.CmsKit.Blogs
         {
             ShortDescription = Check.Length(shortDescription, nameof(shortDescription), BlogPostConsts.MaxShortDescriptionLength);
         }
+
+        public virtual void SetContent(string content)
+        {
+            Content = Check.Length(content, nameof(content), BlogPostConsts.MaxContentLength);
+        }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Blogs/BlogPostManager.cs

@@ -27,7 +27,7 @@ namespace Volo.CmsKit.Blogs
             [NotNull] string title,
             [NotNull] string slug,
             [CanBeNull] string shortDescription = null,
-            [CanBeNull] Guid? tenantId = null)
+            [CanBeNull] string content = null)
         {
             Check.NotNull(author, nameof(author));
             Check.NotNull(blog, nameof(blog));
@@ -42,7 +42,9 @@ namespace Volo.CmsKit.Blogs
                         author.Id,
                         title,
                         slug,
-                        shortDescription
+                        shortDescription,
+                        content,
+                        CurrentTenant.Id
                         );
 
             await CheckSlugExistenceAsync(blog.Id, blogPost.Slug);

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/Content.cs

@@ -1,44 +0,0 @@
-using System;
-using JetBrains.Annotations;
-using Volo.Abp;
-using Volo.Abp.Domain.Entities.Auditing;
-using Volo.Abp.MultiTenancy;
-
-namespace Volo.CmsKit.Contents
-{
-    public class Content : FullAuditedAggregateRoot<Guid>, IMultiTenant
-    {
-        [CanBeNull] public virtual Guid? TenantId { get; protected set; }
-
-        [NotNull] public virtual string EntityType { get; protected set; }
-
-        [NotNull] public virtual string EntityId { get; protected set; }
-
-        [NotNull] public virtual string Value { get; protected set; }
-
-        protected Content()
-        {
-        }
-
-        public Content(Guid id, [NotNull] string entityType, [NotNull] string entityId, [NotNull] string value,
-            Guid? tenantId = null) : base(id)
-        {
-            EntityId = Check.NotNullOrWhiteSpace(entityId, nameof(entityId), ContentConsts.MaxEntityIdLength);
-            EntityType = Check.NotNullOrEmpty(entityType, nameof(entityType), ContentConsts.MaxEntityTypeLength);
-            Value = Check.NotNullOrEmpty(value, nameof(value), ContentConsts.MaxValueLength);
-
-            TenantId = tenantId;
-        }
-
-        public virtual void SetValue([NotNull] string value)
-        {
-            Value = Check.NotNullOrEmpty(value, nameof(value), ContentConsts.MaxValueLength);
-        }
-
-        public virtual void SetEntity([NotNull] string entityType, [NotNull] string entityId)
-        {
-            EntityType = Check.NotNullOrEmpty(entityType, nameof(entityType), ContentConsts.MaxEntityTypeLength);
-            EntityId = Check.NotNullOrWhiteSpace(entityId, nameof(entityId), ContentConsts.MaxEntityIdLength);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/ContentAlreadyExistException.cs

@@ -1,17 +0,0 @@
-using JetBrains.Annotations;
-using System;
-using Volo.Abp;
-
-namespace Volo.CmsKit.Contents
-{
-    [Serializable]
-    public class ContentAlreadyExistException : BusinessException
-    {
-        public ContentAlreadyExistException([NotNull] string entityType, [NotNull] string entityId)
-        {
-            Code = CmsKitErrorCodes.ContentAlreadyExist;
-            WithData(nameof(Content.EntityType), entityType);
-            WithData(nameof(Content.EntityId), entityId);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/ContentManager.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Services;
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.Contents
-{
-    public class ContentManager : DomainService, IContentManager
-    {
-        protected IContentRepository ContentRepository { get; }
-
-        public ContentManager(IContentRepository contentRepository)
-        {
-            ContentRepository = contentRepository;
-        }
-
-        public virtual async Task<Content> InsertAsync(Content content, CancellationToken cancellationToken = default)
-        {
-            if (await ContentRepository.ExistsAsync(content.EntityType, content.EntityId, content.TenantId,
-                cancellationToken))
-            {
-                throw new ContentAlreadyExistException(content.EntityType, content.EntityId);
-            }
-
-            return await ContentRepository.InsertAsync(content, cancellationToken: cancellationToken);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/IContentManager.cs

@@ -1,11 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.Contents
-{
-    public interface IContentManager
-    {
-        Task<Content> InsertAsync(Content content, CancellationToken cancellationToken = default);
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Contents/IContentRepository.cs

@@ -1,35 +0,0 @@
-using JetBrains.Annotations;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Repositories;
-
-namespace Volo.CmsKit.Contents
-{
-    public interface IContentRepository : IBasicRepository<Content, Guid>
-    {
-        Task<Content> GetAsync(
-            [NotNull] string entityType,
-            [NotNull] string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default);
-        
-        Task<Content> FindAsync(
-            [NotNull] string entityType,
-            [NotNull] string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default);
-
-        Task DeleteAsync(
-            [NotNull] string entityType,
-            [NotNull] string entityId,
-            Guid? tenantId = null, 
-            CancellationToken cancellationToken = default);
-
-        Task<bool> ExistsAsync(
-            [NotNull] string entityType,
-            [NotNull] string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default);
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/MediaDescriptors/DefaultMediaDescriptorDefinitionStore.cs

@@ -29,7 +29,7 @@ namespace Volo.CmsKit.MediaDescriptors
         {
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
 
-            var result = Options.EntityTypes.SingleOrDefault(x => x.EntityType == entityType) ??
+            var result = Options.EntityTypes.SingleOrDefault(x => x.EntityType.Equals(entityType, StringComparison.InvariantCultureIgnoreCase)) ??
                          throw new EntityCantHaveMediaException(entityType);
 
             return Task.FromResult(result);
@@ -39,7 +39,7 @@ namespace Volo.CmsKit.MediaDescriptors
         {
             Check.NotNullOrEmpty(entityType, nameof(entityType));
 
-            var isDefined = Options.EntityTypes.Any(a => a.EntityType == entityType);
+            var isDefined = Options.EntityTypes.Any(a => a.EntityType.Equals(entityType, StringComparison.InvariantCultureIgnoreCase));
 
             return Task.FromResult(isDefined);
         }

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Pages/Page.cs

@@ -8,22 +8,25 @@ namespace Volo.CmsKit.Pages
 {
     public class Page : FullAuditedAggregateRoot<Guid>, IMultiTenant
     {
-        [CanBeNull] public virtual Guid? TenantId { get; protected set; }
+        public virtual Guid? TenantId { get; protected set; }
 
-        [NotNull] public virtual string Title { get; protected set; }
+        public virtual string Title { get; protected set; }
 
-        [NotNull] public virtual string Slug { get; protected set; }
+        public virtual string Slug { get; protected set; }
 
+        public virtual string Content { get; protected set; }
+        
         protected Page()
         {
         }
 
-        public Page(Guid id, [NotNull] string title, [NotNull] string slug, [CanBeNull]Guid? tenantId = null) : base(id)
+        public Page(Guid id, [NotNull] string title, [NotNull] string slug, string content = null, Guid? tenantId = null) : base(id)
         {
-            Title = Check.NotNullOrEmpty(title, nameof(title), PageConsts.MaxTitleLength);
-            Slug = Check.NotNullOrEmpty(slug, nameof(slug), PageConsts.MaxSlugLength);
-
             TenantId = tenantId;
+            
+            SetTitle(title);
+            SetSlug(slug);
+            SetContent(content);
         }
 
         public virtual void SetTitle(string title)
@@ -35,5 +38,10 @@ namespace Volo.CmsKit.Pages
         {
             Slug = Check.NotNullOrEmpty(slug, nameof(slug), PageConsts.MaxSlugLength);
         }
+
+        public virtual void SetContent(string content)
+        {
+            Content = Check.Length(content, nameof(content), PageConsts.MaxContentLength);
+        }
     }
 }

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Contents/EfCoreContentRepository.cs

@@ -1,86 +0,0 @@
-using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore;
-using Volo.CmsKit.EntityFrameworkCore;
-
-namespace Volo.CmsKit.Contents
-{
-    public class EfCoreContentRepository : EfCoreRepository<ICmsKitDbContext, Content, Guid>, IContentRepository
-    {
-        public EfCoreContentRepository(IDbContextProvider<ICmsKitDbContext> dbContextProvider) : base(dbContextProvider)
-        {
-        }
-
-        public virtual Task<Content> GetAsync(
-            string entityType,
-            string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrEmpty(entityType, nameof(entityType));
-            Check.NotNullOrEmpty(entityId, nameof(entityId));
-            
-            return GetAsync(x =>
-                    x.EntityType == entityType &&
-                    x.EntityId == entityId &&
-                    x.TenantId == tenantId,
-                cancellationToken: GetCancellationToken(cancellationToken)
-            );
-        }
-        
-        public virtual Task<Content> FindAsync(
-            string entityType,
-            string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrEmpty(entityType, nameof(entityType));
-            Check.NotNullOrEmpty(entityId, nameof(entityId));
-            
-            return FindAsync(x =>
-                    x.EntityType == entityType &&
-                    x.EntityId == entityId &&
-                    x.TenantId == tenantId,
-                cancellationToken: GetCancellationToken(cancellationToken)
-                );
-        }
-
-        public virtual Task DeleteAsync(
-            string entityType,
-            string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrEmpty(entityType, nameof(entityType));
-            Check.NotNullOrEmpty(entityId, nameof(entityId));
-            
-            return DeleteAsync(x =>
-                        x.EntityType == entityType &&
-                        x.EntityId == entityId &&
-                        x.TenantId == tenantId,
-                        cancellationToken: GetCancellationToken(cancellationToken));
-        }
-
-        public virtual async Task<bool> ExistsAsync(
-            [NotNull] string entityType,
-            [NotNull] string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrEmpty(entityType, nameof(entityType));
-            Check.NotNullOrEmpty(entityId, nameof(entityId));
-            
-            var dbSet = await GetDbSetAsync();
-            return await dbSet.AnyAsync(x =>
-                        x.EntityType == entityType &&
-                        x.EntityId == entityId &&
-                        x.TenantId == tenantId,
-                        cancellationToken: GetCancellationToken(cancellationToken));
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContext.cs

@@ -3,7 +3,6 @@ using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.CmsKit.Blogs;
 using Volo.CmsKit.Comments;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.MediaDescriptors;
 using Volo.CmsKit.Pages;
 using Volo.CmsKit.Ratings;
@@ -16,7 +15,6 @@ namespace Volo.CmsKit.EntityFrameworkCore
     [ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
     public class CmsKitDbContext : AbpDbContext<CmsKitDbContext>, ICmsKitDbContext
     {
-        public DbSet<Content> Contents { get; set; }
         public DbSet<Comment> Comments { get; set; }
         public DbSet<CmsUser> User { get; set; }
         public DbSet<UserReaction> Reactions { get; set; }

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitDbContextModelCreatingExtensions.cs

@@ -8,7 +8,6 @@ using Volo.CmsKit.Comments;
 using Volo.CmsKit.Reactions;
 using Volo.CmsKit.Users;
 using Volo.Abp.Users.EntityFrameworkCore;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.GlobalFeatures;
 using Volo.CmsKit.Pages;
 using Volo.CmsKit.Ratings;
@@ -111,26 +110,6 @@ namespace Volo.CmsKit.EntityFrameworkCore
                 builder.Ignore<Rating>();
             }
 
-            if (GlobalFeatureManager.Instance.IsEnabled<ContentsFeature>())
-            {
-                builder.Entity<Content>(b =>
-                {
-                    b.ToTable(options.TablePrefix + "Contents", options.Schema);
-
-                    b.ConfigureByConvention();
-
-                    b.Property(x => x.EntityType).IsRequired().HasMaxLength(ContentConsts.MaxEntityTypeLength);
-                    b.Property(x => x.EntityId).IsRequired().HasMaxLength(ContentConsts.MaxEntityIdLength);
-                    b.Property(x => x.Value).IsRequired().HasMaxLength(ContentConsts.MaxValueLength);
-
-                    b.HasIndex(x => new { x.TenantId, x.EntityType, x.EntityId });
-                });
-            }
-            else
-            {
-                builder.Ignore<Content>();
-            }
-
             if (GlobalFeatureManager.Instance.IsEnabled<TagsFeature>())
             {
                 builder.Entity<Tag>(b =>
@@ -179,6 +158,7 @@ namespace Volo.CmsKit.EntityFrameworkCore
 
                     b.Property(x => x.Title).IsRequired().HasMaxLength(PageConsts.MaxTitleLength);
                     b.Property(x => x.Slug).IsRequired().HasMaxLength(PageConsts.MaxSlugLength);
+                    b.Property(x => x.Content).HasMaxLength(PageConsts.MaxContentLength);
 
                     b.HasIndex(x => new { x.TenantId, Url = x.Slug });
                 });
@@ -207,14 +187,12 @@ namespace Volo.CmsKit.EntityFrameworkCore
 
                     b.ConfigureByConvention();
 
+                    b.Property(p => p.AuthorId).IsRequired();
                     b.Property(p => p.Title).IsRequired().HasMaxLength(BlogPostConsts.MaxTitleLength);
-
                     b.Property(p => p.Slug).IsRequired().HasMaxLength(BlogPostConsts.MaxSlugLength);
-
                     b.Property(p => p.ShortDescription).HasMaxLength(BlogPostConsts.MaxShortDescriptionLength);
-
+                    b.Property(p => p.Content).HasMaxLength(BlogPostConsts.MaxContentLength);
-                    b.Property(p => p.AuthorId).IsRequired();
+                    
-
                     b.HasIndex(x => new { x.Slug, x.BlogId });
                 });
 

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/CmsKitEntityFrameworkCoreModule.cs

@@ -29,7 +29,6 @@ namespace Volo.CmsKit.EntityFrameworkCore
                 options.AddRepository<UserReaction, EfCoreUserReactionRepository>();
                 options.AddRepository<Comment, EfCoreCommentRepository>();
                 options.AddRepository<Rating, EfCoreRatingRepository>();
-                options.AddRepository<Content, EfCoreContentRepository>();
                 options.AddRepository<Tag, EfCoreTagRepository>();
                 options.AddRepository<EntityTag, EfCoreEntityTagRepository>();
                 options.AddRepository<Page, EfCorePageRepository>();

modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/EntityFrameworkCore/ICmsKitDbContext.cs

@@ -3,7 +3,6 @@ using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.CmsKit.Blogs;
 using Volo.CmsKit.Comments;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.MediaDescriptors;
 using Volo.CmsKit.Pages;
 using Volo.CmsKit.Ratings;
@@ -16,7 +15,6 @@ namespace Volo.CmsKit.EntityFrameworkCore
     [ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
     public interface ICmsKitDbContext : IEfCoreDbContext
     {
-        DbSet<Content> Contents { get; }
         DbSet<Comment> Comments { get; }
         DbSet<CmsUser> User { get; }
         DbSet<UserReaction> Reactions { get; }

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs

@@ -24,8 +24,6 @@ namespace Volo.CmsKit.MongoDB
         public IMongoCollection<CmsUser> CmsUsers => Collection<CmsUser>();
 
         public IMongoCollection<Rating> Ratings => Collection<Rating>();
-
-        public IMongoCollection<Content> Contents => Collection<Content>();
         
         public IMongoCollection<Tag> Tags => Collection<Tag>();
         

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs

@@ -47,11 +47,6 @@ namespace Volo.CmsKit.MongoDB
                 x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Ratings";
             });
             
-            builder.Entity<Content>(x =>
-            {
-                x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Contents";
-            });
-            
             builder.Entity<Tag>(x =>
             {
                 x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Tags";

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs

@@ -4,11 +4,9 @@ using Volo.Abp.MongoDB;
 using Volo.Abp.Users.MongoDB;
 using Volo.CmsKit.Blogs;
 using Volo.CmsKit.Comments;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.MediaDescriptors;
 using Volo.CmsKit.MongoDB.Blogs;
 using Volo.CmsKit.MongoDB.Comments;
-using Volo.CmsKit.MongoDB.Contents;
 using Volo.CmsKit.MongoDB.MediaDescriptors;
 using Volo.CmsKit.MongoDB.Pages;
 using Volo.CmsKit.MongoDB.Ratings;
@@ -38,7 +36,6 @@ namespace Volo.CmsKit.MongoDB
                 options.AddRepository<UserReaction, MongoUserReactionRepository>();
                 options.AddRepository<Comment, MongoCommentRepository>();
                 options.AddRepository<Rating, MongoRatingRepository>();
-                options.AddRepository<Content, MongoContentRepository>();
                 options.AddRepository<Tag, MongoTagRepository>();
                 options.AddRepository<EntityTag, MongoEntityTagRepository>();
                 options.AddRepository<Page, MongoPageRepository>();

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Contents/MongoContentRepository.cs

@@ -1,80 +0,0 @@
-using JetBrains.Annotations;
-using MongoDB.Driver.Linq;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.Domain.Repositories.MongoDB;
-using Volo.Abp.MongoDB;
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.MongoDB.Contents
-{
-    public class MongoContentRepository : MongoDbRepository<ICmsKitMongoDbContext, Content, Guid>, IContentRepository
-    {
-        public MongoContentRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider) : base(
-            dbContextProvider)
-        {
-        }
-
-        public virtual Task<Content> GetAsync(
-            string entityType,
-            string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrEmpty(entityType, nameof(entityType));
-            Check.NotNullOrEmpty(entityId, nameof(entityId));
-
-            return GetAsync(x =>
-                    x.EntityType == entityType &&
-                    x.EntityId == entityId &&
-                    x.TenantId == tenantId,
-                cancellationToken: GetCancellationToken(cancellationToken)
-            );
-        }
-
-        public virtual Task<Content> FindAsync(
-            string entityType,
-            string entityId,
-            Guid? tenantId = null,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrEmpty(entityType, nameof(entityType));
-            Check.NotNullOrEmpty(entityId, nameof(entityId));
-
-            return FindAsync(x =>
-                    x.EntityType == entityType &&
-                    x.EntityId == entityId &&
-                    x.TenantId == tenantId,
-                cancellationToken: GetCancellationToken(cancellationToken)
-            );
-        }
-
-        public virtual Task DeleteAsync(string entityType, string entityId, Guid? tenantId = null,
-            CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrEmpty(entityType, nameof(entityType));
-            Check.NotNullOrEmpty(entityId, nameof(entityId));
-
-            return DeleteAsync(x =>
-                    x.EntityType == entityType &&
-                    x.EntityId == entityId &&
-                    x.TenantId == tenantId,
-                cancellationToken: GetCancellationToken(cancellationToken));
-        }
-
-        public virtual async Task<bool> ExistsAsync([NotNull] string entityType, [NotNull] string entityId,
-            Guid? tenantId = null, CancellationToken cancellationToken = default)
-        {
-            Check.NotNullOrEmpty(entityType, nameof(entityType));
-            Check.NotNullOrEmpty(entityId, nameof(entityId));
-
-            return await (await GetMongoQueryableAsync(cancellationToken)).AnyAsync(x =>
-                    x.EntityType == entityType &&
-                    x.EntityId == entityId &&
-                    x.TenantId == tenantId,
-                cancellationToken: GetCancellationToken(cancellationToken));
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs

@@ -25,8 +25,6 @@ namespace Volo.CmsKit.MongoDB
 
         IMongoCollection<Rating> Ratings { get; }
 
-        IMongoCollection<Content> Contents { get; }
-
         IMongoCollection<Tag> Tags { get; }
 
         IMongoCollection<EntityTag> EntityTags { get; }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Blogs/BlogPostPublicDto.cs

@@ -15,6 +15,8 @@ namespace Volo.CmsKit.Public.Blogs
 
         public string ShortDescription { get; set; }
 
+        public string Content { get; set; }
+        
         public CmsUserDto Author { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Contents/ContentDto.cs

@@ -1,11 +0,0 @@
-using System;
-using Volo.Abp.Application.Dtos;
-
-namespace Volo.CmsKit.Public.Contents
-{
-    [Serializable]
-    public class ContentDto : EntityDto<Guid>
-    {
-        public string Value { get; set; }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Contents/GetContentInput.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace Volo.CmsKit.Public.Contents
-{
-    [Serializable]
-    public class GetContentInput
-    {
-        public string EntityType { get; set; }
-        
-        public string EntityId { get; set; }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Contents/IContentPublicAppService.cs

@@ -1,10 +0,0 @@
-using System.Threading.Tasks;
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.Public.Contents
-{
-    public interface IContentPublicAppService
-    {
-        Task<ContentDto> GetAsync(GetContentInput input);
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Pages/PageDto.cs

@@ -9,5 +9,7 @@ namespace Volo.CmsKit.Public.Pages
         public string Title { get; set; }
 
         public string Slug { get; set; }
+
+        public string Content { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Contents/ContentPublicAppService.cs

@@ -1,25 +0,0 @@
-using System.Threading.Tasks;
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.Public.Contents
-{
-    public class ContentPublicAppService : CmsKitPublicAppServiceBase, IContentPublicAppService
-    {
-        protected IContentRepository ContentRepository { get; }
-
-        public ContentPublicAppService(IContentRepository contentRepository)
-        {
-            ContentRepository = contentRepository;
-        }
-
-        public virtual async Task<ContentDto> GetAsync(GetContentInput input)
-        {
-            var entity = await ContentRepository.GetAsync(
-                input.EntityType,
-                input.EntityId,
-                CurrentTenant.Id);
-
-            return ObjectMapper.Map<Content, ContentDto>(entity);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs

@@ -2,11 +2,9 @@
 using Volo.Abp.AutoMapper;
 using Volo.CmsKit.Blogs;
 using Volo.CmsKit.Comments;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.Pages;
 using Volo.CmsKit.Public.Blogs;
 using Volo.CmsKit.Public.Comments;
-using Volo.CmsKit.Public.Contents;
 using Volo.CmsKit.Public.Pages;
 using Volo.CmsKit.Public.Ratings;
 using Volo.CmsKit.Ratings;
@@ -29,8 +27,6 @@ namespace Volo.CmsKit.Public
 
             CreateMap<Rating, RatingDto>();
             
-            CreateMap<Content, ContentDto>();
-            
             CreateMap<Page, PageDto>();
 
             CreateMap<BlogPost, BlogPostPublicDto>(MemberList.None);

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Contents/ContentController.cs

@@ -1,29 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp;
-using Volo.Abp.GlobalFeatures;
-using Volo.CmsKit.Contents;
-using Volo.CmsKit.GlobalFeatures;
-
-namespace Volo.CmsKit.Public.Contents
-{
-    [RequiresGlobalFeature(typeof(ContentsFeature))]
-    [RemoteService(Name = CmsKitCommonRemoteServiceConsts.RemoteServiceName)]
-    [Area("cms-kit")]
-    [Route("api/cms-kit-public/contents")]
-    public class ContentController : CmsKitControllerBase, IContentPublicAppService
-    {
-        protected IContentPublicAppService ContentAppService { get; }
-
-        public ContentController(IContentPublicAppService contentAppService)
-        {
-            ContentAppService = contentAppService;
-        }
-
-        [HttpGet]
-        public virtual Task<ContentDto> GetAsync(GetContentInput input)
-        {
-            return ContentAppService.GetAsync(input);
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml

@@ -1,6 +1,4 @@
 @model Volo.CmsKit.Public.Blogs.BlogPostPublicDto
-@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
-@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.CmsKit.Localization
 @using Microsoft.Extensions.Localization
 
@@ -14,11 +12,7 @@
     </abp-card-header>
 
     <abp-card-body>
-        @await Component.InvokeAsync(typeof(ContentViewComponent), new
+        @Html.Raw(Model.Content)
-            {
-                entityType = Volo.CmsKit.Blogs.BlogPostConsts.EntityType,
-                entityId = Model.Id.ToString()
-            })
     </abp-card-body>
     <abp-card-footer>
         <abp-card-subtitle>@Model.CreationTime</abp-card-subtitle>

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.Domain.Entities;
-using Volo.CmsKit.Public.Contents;
-using Volo.CmsKit.Web.Contents;
-
-namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
-{
-    [ViewComponent(Name = "CmsContent")]
-    public class ContentViewComponent : AbpViewComponent
-    {
-        private readonly IContentRenderer contentRenderer;
-        private readonly IContentPublicAppService contentAppService;
-
-        public ContentViewComponent(
-            IContentRenderer contentRenderer,
-            IContentPublicAppService contentAppService)
-        {
-            this.contentRenderer = contentRenderer;
-            this.contentAppService = contentAppService;
-        }
-
-        public virtual async Task<IViewComponentResult> InvokeAsync(
-            string entityType,
-            string entityId)
-        {
-            var content = string.Empty;
-            
-            try
-            {
-                var contentDto = await contentAppService.GetAsync(new GetContentInput
-                {
-                    EntityId = entityId,
-                    EntityType = entityType
-                });
-
-                content = contentDto.Value;
-            }
-            catch (EntityNotFoundException e)
-            {
-                // ContentDto can be null, we will render empty content.
-            }
-
-            var viewModel = new ContentViewModel
-            {
-                Value = await contentRenderer.RenderAsync(content)
-            };
-
-            return View("~/Pages/CmsKit/Shared/Components/Contents/Default.cshtml", viewModel);
-        }
-
-        public class ContentViewModel
-        {
-            public string Value { get; set; }
-        }
-    }
-}

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml

@@ -1,3 +0,0 @@
-@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents.ContentViewComponent.ContentViewModel
-
-@Html.Raw(Model.Value)

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml

@@ -1,8 +1,5 @@
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
-
-@using Microsoft.AspNetCore.Mvc.RazorPages
 @using Volo.Abp.AspNetCore.Mvc.UI.Layout
-@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages.PageViewModel
 @inject IPageLayout PageLayout
 
@@ -12,11 +9,6 @@
 
 <abp-card>
     <abp-card-body>
-        @await Component.InvokeAsync(typeof(ContentViewComponent), 
+        @Html.Raw(Model.Content)
-            new
-            {
-                entityType = nameof(Page),
-                entityId = Model.Id.ToString()
-            })
     </abp-card-body>
 </abp-card>

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/DefaultPageViewComponent.cs

@@ -16,12 +16,13 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages
             PagePublicAppService = pagePublicAppService;
         }
         
-        public virtual async Task<IViewComponentResult> InvokeAsync(Guid pageId, string title, string description)
+        public virtual async Task<IViewComponentResult> InvokeAsync(Guid pageId, string title, string content)
         {
             var model = new PageViewModel
             {
                 Id = pageId,
-                Title = title
+                Title = title,
+                Content = content
             };
             
             return View("~/Pages/CmsKit/Shared/Components/Pages/Default.cshtml", model);
@@ -33,5 +34,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages
         public Guid Id { get; set; }
         
         public string Title { get; set; }
+
+        public string Content { get; set; }
     }
 }

modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml

@@ -9,5 +9,6 @@
     new
     {
         pageId = Model.Page.Id,
-        title = Model.Page.Title
+        title = Model.Page.Title,
+        content = Model.Page.Content
     })

modules/cms-kit/test/Volo.CmsKit.Application.Tests/Blogs/BlogPostAdminAppService_Tests.cs

@@ -30,13 +30,15 @@ namespace Volo.CmsKit.Blogs
             var title = "My awesome new Post";
             var slug = "my-awesome-new-post";
             var shortDescription = "This blog is all about awesomeness 🤗!";
-
+            var content = "Another blog post shared on internet";
+            
             var created = await blogPostAdminAppService.CreateAsync(new CreateBlogPostDto
             {
                 BlogId = cmsKitTestData.Blog_Id,
                 Title = title,
                 Slug = slug,
-                ShortDescription = shortDescription
+                ShortDescription = shortDescription,
+                Content = content
             });
 
             created.Id.ShouldNotBe(Guid.Empty);
@@ -46,6 +48,7 @@ namespace Volo.CmsKit.Blogs
             blogPost.Title.ShouldBe(title);
             blogPost.Slug.ShouldBe(slug);
             blogPost.ShortDescription.ShouldBe(shortDescription);
+            blogPost.Content.ShouldBe(content);
         }
 
         [Fact]
@@ -54,6 +57,7 @@ namespace Volo.CmsKit.Blogs
             var title = "Another My Awesome New Post";
             var slug = "another-my-awesome-new-post";
             var shortDescription = "This blog is all about awesomeness 🤗!";
+            var content = "Another blog post shared on internet";
 
             var dto = new CreateBlogPostDto
             {
@@ -61,7 +65,8 @@ namespace Volo.CmsKit.Blogs
                 BlogId = Guid.NewGuid(),
                 Title = title,
                 Slug = slug,
-                ShortDescription = shortDescription
+                ShortDescription = shortDescription,
+                Content = content
             };
 
             var exception = await Should.ThrowAsync<EntityNotFoundException>(async () =>
@@ -107,12 +112,14 @@ namespace Volo.CmsKit.Blogs
             var shortDescription = "Another short description";
             var title = "[Solved] Another Blog Post";
             var slug = "another-short-blog-post";
+            var content = "Another blog post shared on internet";
 
             await blogPostAdminAppService.UpdateAsync(cmsKitTestData.BlogPost_2_Id, new UpdateBlogPostDto
             {
                 ShortDescription = shortDescription,
                 Title = title,
                 Slug = slug,
+                Content = content
             });
 
             var blogPost = await blogPostRepository.GetAsync(cmsKitTestData.BlogPost_2_Id);
@@ -120,6 +127,7 @@ namespace Volo.CmsKit.Blogs
             blogPost.Title.ShouldBe(title);
             blogPost.ShortDescription.ShouldBe(shortDescription);
             blogPost.Slug.ShouldBe(slug);
+            blogPost.Content.ShouldBe(content);
         }
 
         [Fact]

modules/cms-kit/test/Volo.CmsKit.Application.Tests/Contents/ContentAdminAppService_Tests.cs

@@ -1,142 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using NSubstitute;
-using Shouldly;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.Users;
-using Volo.CmsKit.Admin.Contents;
-using Xunit;
-
-namespace Volo.CmsKit.Contents
-{
-    public class ContentAdminAppService_Tests : CmsKitApplicationTestBase
-    {
-        private ICurrentUser _currentUser;
-        private readonly CmsKitTestData _data;
-        private readonly IContentAdminAppService _service;
-        public ContentAdminAppService_Tests()
-        {
-            _data = GetRequiredService<CmsKitTestData>();
-            _service = GetRequiredService<IContentAdminAppService>();
-        }
-
-        protected override void AfterAddApplication(IServiceCollection services)
-        {
-            _currentUser = Substitute.For<ICurrentUser>();
-            services.AddSingleton(_currentUser);
-        }
-
-        [Fact]
-        public async Task ShouldGetListAsync()
-        {
-            var result = await _service.GetListAsync(new ContentGetListInput());
-
-            result.ShouldNotBeNull();
-            result.Items.ShouldNotBeEmpty();
-            result.Items.Count.ShouldBe(4);
-            result.Items.All(x => x.ShouldBeOfType<ContentGetListDto>() != null);
-        }
-
-        [Fact]
-        public async Task ShouldGetAsync()
-        {
-            var result = await _service.GetAsync(_data.Content_1_Id);
-
-            result.ShouldNotBeNull();
-            result.ShouldBeOfType<Admin.Contents.ContentDto>();
-            result.ShouldNotBeNull(result.Value);
-        }
-
-        [Fact]
-        public async Task ShouldCreateAsync()
-        {
-            var entityId = "1-2-3";
-            var entityType = "My.Awesome.Blog";
-            var value = "Some long content";
-
-            var created = await _service.CreateAsync(new ContentCreateDto
-            {
-                EntityId = entityId,
-                EntityType = entityType,
-                Value = value
-            });
-
-            created.Id.ShouldNotBe(Guid.Empty);
-
-            var content = await _service.GetAsync(created.Id);
-
-            content.ShouldNotBeNull();
-            content.EntityType.ShouldBe(entityType);
-        }
-
-        [Fact]
-        public async Task ShouldNotCreateWithSameParametersAsync()
-        {
-            var entityTtype = "My.Awesome.Book";
-            var entityId = "1";
-
-            await _service.CreateAsync(new ContentCreateDto
-            {
-                EntityId = entityId,
-                EntityType = entityTtype,
-                Value = "Some long content"
-            });
-
-            await Should.ThrowAsync<ContentAlreadyExistException>(async () =>
-                await _service.CreateAsync(new ContentCreateDto
-                {
-                    EntityId = entityId,
-                    EntityType = entityTtype,
-                    Value = "Yet another long content"
-                })
-            );
-        }
-
-        [Fact]
-        public async Task ShouldUpdateAsync()
-        {
-            string newValue = "Newly created fresh value";
-            var updateDto = new ContentUpdateDto
-            {
-                Value = newValue
-            };
-
-            await _service.UpdateAsync(_data.Content_1_Id, updateDto);
-
-            var content = await _service.GetAsync(_data.Content_1_Id);
-            content.ShouldNotBeNull();
-            content.Value.ShouldBe(newValue);
-        }
-
-        [Fact]
-        public async Task ShouldDeleteAsync()
-        {
-            await _service.DeleteAsync(_data.Content_2_Id);
-
-            await Should.ThrowAsync<EntityNotFoundException>(async () => await _service.GetAsync(_data.Content_2_Id));
-        }
-
-        [Fact]
-        public async Task ShouldNotThrowEntityNotFoundExceptionWhileDeletingAlreadyDeletedAsync()
-        {
-            await _service.DeleteAsync(_data.Content_2_Id);
-
-            await Should.NotThrowAsync(async () =>
-                await _service.DeleteAsync(_data.Content_2_Id));
-        }
-
-        [Fact]
-        public async Task ShouldGetByEntityAsync()
-        {
-            var entity = await _service.GetAsync(_data.Content_1_EntityType, _data.Content_1_EntityId);
-
-            entity.ShouldNotBeNull();
-            entity.EntityId.ShouldBe(_data.Content_1_EntityId);
-            entity.EntityType.ShouldBe(_data.Content_1_EntityType);
-        }
-    }
-}

modules/cms-kit/test/Volo.CmsKit.Application.Tests/Pages/PageAdminAppService_Tests.cs

@@ -64,7 +64,8 @@ namespace Volo.CmsKit.Pages
             var dto = new CreatePageInputDto
             {
                 Title = "test",
-                Slug = "test-url"
+                Slug = "test-url",
+                Content = "test*content"
             };
 
             await Should.NotThrowAsync(async () => await _pageAdminAppService.CreateAsync(dto));
@@ -94,7 +95,8 @@ namespace Volo.CmsKit.Pages
             var dto = new UpdatePageInputDto
             {
                 Title = _data.Page_1_Title + "++",
-                Slug = _data.Page_1_Slug+ "test"
+                Slug = _data.Page_1_Slug+ "test",
+                Content = "changed"
             };
 
             await Should.NotThrowAsync(async () => await _pageAdminAppService.UpdateAsync(_data.Page_1_Id, dto));
@@ -106,6 +108,9 @@ namespace Volo.CmsKit.Pages
             
             updatedPage.Slug.ShouldNotBe(_data.Page_1_Slug);
             updatedPage.Slug.ShouldBe(dto.Slug);
+            
+            updatedPage.Content.ShouldNotBe(_data.Content_1);
+            updatedPage.Content.ShouldBe(dto.Content);
         }
         
         [Fact]

modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Contents/ContentRepository_Test.cs

@@ -1,9 +0,0 @@
-using Volo.CmsKit.Contents;
-
-namespace Volo.CmsKit.EntityFrameworkCore.Contents
-{
-    public class ContentRepository_Test : ContentRepository_Tests<CmsKitEntityFrameworkCoreTestModule>
-    {
-        
-    }
-}

modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Contents/ContentRepository_Test.cs

@@ -1,11 +0,0 @@
-using Volo.CmsKit.Contents;
-using Xunit;
-
-namespace Volo.CmsKit.MongoDB.Contents
-{
-    [Collection(MongoTestCollection.Name)]
-    public class ContentRepository_Test : ContentRepository_Tests<CmsKitMongoDbTestModule>
-    {
-        
-    }
-}

modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs

@@ -2,19 +2,16 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.BlobStoring;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Users;
 using Volo.CmsKit.Blogs;
 using Volo.CmsKit.Comments;
-using Volo.CmsKit.Contents;
 using Volo.CmsKit.MediaDescriptors;
 using Volo.CmsKit.Pages;
 using Volo.CmsKit.Ratings;
@@ -33,7 +30,6 @@ namespace Volo.CmsKit
         private readonly ReactionManager _reactionManager;
         private readonly IRatingRepository _ratingRepository;
         private readonly ICurrentTenant _currentTenant;
-        private readonly IContentRepository _contentRepository;
         private readonly EntityTagManager _entityTagManager;
         private readonly TagManager _tagManager;
         private readonly ITagRepository _tagRepository;
@@ -58,7 +54,6 @@ namespace Volo.CmsKit
             ReactionManager reactionManager,
             IRatingRepository ratingRepository,
             ICurrentTenant currentTenant,
-            IContentRepository contentRepository,
             TagManager tagManager,
             ITagRepository tagRepository,
             IEntityTagRepository entityTagRepository,
@@ -82,7 +77,6 @@ namespace Volo.CmsKit
             _reactionManager = reactionManager;
             _ratingRepository = ratingRepository;
             _currentTenant = currentTenant;
-            _contentRepository = contentRepository;
             _tagManager = tagManager;
             _tagRepository = tagRepository;
             _entityTagManager = entityTagManager;
@@ -114,8 +108,6 @@ namespace Volo.CmsKit
 
                 await SeedRatingsAsync();
 
-                await SeedContentsAsync();
-
                 await SeedTagsAsync();
 
                 await SeedPagesAsync();
@@ -273,37 +265,6 @@ namespace Volo.CmsKit
             ));
         }
 
-        private async Task SeedContentsAsync()
-        {
-            var content1 = new Content(
-                _cmsKitTestData.Content_1_Id,
-                _cmsKitTestData.Content_1_EntityType,
-                _cmsKitTestData.Content_1_EntityId,
-                _cmsKitTestData.Content_1
-                );
-
-            var content2 = new Content(
-                _cmsKitTestData.Content_2_Id,
-                _cmsKitTestData.Content_2_EntityType,
-                _cmsKitTestData.Content_2_EntityId,
-                _cmsKitTestData.Content_2
-            );
-
-            var content3 = new Content(
-                Guid.NewGuid(),
-                "deleted_entity_type",
-                "deleted_entity_id",
-                "Content"
-            )
-            {
-                IsDeleted = true,
-            };
-
-            await _contentRepository.InsertAsync(content1);
-            await _contentRepository.InsertAsync(content2);
-            await _contentRepository.InsertAsync(content3);
-        }
-
         private async Task SeedTagsAsync()
         {
             var created1 = await _tagRepository.InsertAsync(
@@ -347,17 +308,11 @@ namespace Volo.CmsKit
 
         private async Task SeedPagesAsync()
         {
-            var page1 = new Page(_cmsKitTestData.Page_1_Id, _cmsKitTestData.Page_1_Title, _cmsKitTestData.Page_1_Slug);
+            var page1 = new Page(_cmsKitTestData.Page_1_Id, _cmsKitTestData.Page_1_Title, _cmsKitTestData.Page_1_Slug, _cmsKitTestData.Content_1);
-            var page1Content = new Content(_guidGenerator.Create(), nameof(Page), page1.Id.ToString(), _cmsKitTestData.Page_1_Content);
-
             await _pageRepository.InsertAsync(page1);
-            await _contentRepository.InsertAsync(page1Content);
-
-            var page2 = new Page(_cmsKitTestData.Page_2_Id, _cmsKitTestData.Page_2_Title, _cmsKitTestData.Page_2_Slug);
-            var page2Content = new Content(_guidGenerator.Create(), nameof(Page), page2.Id.ToString(), _cmsKitTestData.Page_2_Content);
 
+            var page2 = new Page(_cmsKitTestData.Page_2_Id, _cmsKitTestData.Page_2_Title, _cmsKitTestData.Page_2_Slug, _cmsKitTestData.Content_2);
             await _pageRepository.InsertAsync(page2);
-            await _contentRepository.InsertAsync(page2Content);
         }
 
         private async Task SeedBlogsAsync()
@@ -376,7 +331,8 @@ namespace Volo.CmsKit
                         blog, 
                         _cmsKitTestData.BlogPost_1_Title, 
                         _cmsKitTestData.BlogPost_1_Slug, 
-                        "Short desc 1"))).Id;
+                        "Short desc 1",
+                        "Blog Post 1 Content"))).Id;
 
             _cmsKitTestData.BlogPost_2_Id =
                 (await _blogPostRepository.InsertAsync( 
@@ -385,7 +341,8 @@ namespace Volo.CmsKit
                         blog,
                         _cmsKitTestData.BlogPost_2_Title, 
                         _cmsKitTestData.BlogPost_2_Slug, 
-                        "Short desc 2"))).Id;
+                        "Short desc 2",
+                        "Blog Post 2 Content"))).Id;
         }
 
         private async Task SeedBlogFeaturesAsync()

modules/cms-kit/test/Volo.CmsKit.TestBase/Contents/ContentRepository_Tests.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Shouldly;
-using Volo.Abp.Domain.Entities;
-using Volo.Abp.Modularity;
-using Xunit;
-
-namespace Volo.CmsKit.Contents
-{
-    public abstract class ContentRepository_Tests<TStartupModule> : CmsKitTestBase<TStartupModule>
-        where TStartupModule : IAbpModule
-    {
-        private readonly CmsKitTestData _cmsKitTestData;
-        private readonly IContentRepository _contentRepository;
-
-        protected ContentRepository_Tests()
-        {
-            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
-            _contentRepository = GetRequiredService<IContentRepository>();
-        }
-
-        [Theory]
-        [InlineData("Lyrics", "1", "First things first")]
-        [InlineData("LyricsAlso", "2", "Second thing second")]
-        public async Task ShouldGetAsync(string entityType, string entityId, string contentStartsWith = null)
-        {
-            var content = await _contentRepository.GetAsync(entityType, entityId);
-
-            content.ShouldNotBeNull();
-
-            if (contentStartsWith != null)
-            {
-                content.Value.ShouldStartWith(contentStartsWith);
-            }
-        }
-
-        [Fact]
-        public async Task ShouldNotGetAsync()
-        {
-            Should.Throw<EntityNotFoundException>(
-                async ()
-                    =>
-                    await _contentRepository.GetAsync("not_exist_entity", Guid.NewGuid().ToString()));
-        }
-
-        [Fact]
-        public async Task ShouldFindAsync()
-        {
-            var content =
-                await _contentRepository.FindAsync(_cmsKitTestData.Content_1_EntityType, _cmsKitTestData.Content_1_EntityId);
-
-            content.ShouldNotBeNull();
-        }
-
-        [Fact]
-        public async Task ShouldNotFindAsync()
-        {
-            var content = await _contentRepository.FindAsync("not_exist_entity", Guid.NewGuid().ToString());
-
-            content.ShouldBeNull();
-        }
-    }
-}