diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs index 5e953e82d6..27956c08ca 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs @@ -1,11 +1,7 @@ using System.IO; -using System.Linq; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Volo.CmsKit.EntityFrameworkCore; -using Volo.CmsKit.MultiTenancy; -using Volo.CmsKit.Web; using Microsoft.OpenApi.Models; using Volo.Abp; using Volo.Abp.Account; @@ -19,8 +15,8 @@ using Volo.Abp.BlobStoring.Database.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore.SqlServer; -using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.FeatureManagement; +using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity; using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Identity.Web; @@ -29,6 +25,7 @@ using Volo.Abp.Modularity; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement.EntityFrameworkCore; +using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.Swashbuckle; @@ -38,15 +35,16 @@ using Volo.Abp.TenantManagement.Web; using Volo.Abp.Threading; using Volo.Abp.VirtualFileSystem; using Volo.CmsKit.Admin.Web; -using Volo.CmsKit.Public.Web; -using System; -using Volo.Abp.PermissionManagement.HttpApi; -using Volo.CmsKit.Tags; using Volo.CmsKit.Comments; +using Volo.CmsKit.Contents; +using Volo.CmsKit.EntityFrameworkCore; using Volo.CmsKit.MediaDescriptors; -using Volo.CmsKit.Reactions; +using Volo.CmsKit.MultiTenancy; +using Volo.CmsKit.Public.Web; using Volo.CmsKit.Ratings; -using Volo.CmsKit.Contents; +using Volo.CmsKit.Reactions; +using Volo.CmsKit.Tags; +using Volo.CmsKit.Web; namespace Volo.CmsKit; @@ -93,9 +91,8 @@ public class CmsKitWebUnifiedModule : AbpModule public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.GetConfiguration(); - ConfigureCmsKit(context); + ConfigureCmsKit(); Configure(options => { @@ -156,11 +153,11 @@ public class CmsKitWebUnifiedModule : AbpModule Configure(options => { - options.AddWidget("ExComment", "CommentDate", "DecisionCommentDate"); + options.AddWidget("ExampleWidget", "ExampleDate", "ExampleModalDate"); }); } - private void ConfigureCmsKit(ServiceConfigurationContext context) + private void ConfigureCmsKit() { Configure(options => { diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs deleted file mode 100644 index 4122bb1481..0000000000 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc.UI.Widgets; - -namespace Volo.CmsKit.ViewComponents; - -[Widget( - AutoInitialize = true -)] - -[ViewComponent(Name = "CommentDate")] -public class CommentDateViewComponent : AbpViewComponent -{ - public bool IsShow { get; set; } - - public CommentDateViewComponent() - { - } - - public virtual async Task InvokeAsync(string isShow) - { - return View("~/ViewComponents/CommentDate.cshtml", new CommentDateViewComponent() { IsShow = bool.Parse(isShow) }); - } -} diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDate.cshtml similarity index 68% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDate.cshtml index 7921c0ecbd..9c07e18b1f 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDate.cshtml @@ -1,4 +1,4 @@ -@model Volo.CmsKit.ViewComponents.CommentDateViewComponent +@model Volo.CmsKit.ViewComponents.ExampleDateViewModel

Welcome Comment Date Component

@if (Model.IsShow) diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDateViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDateViewComponent.cs new file mode 100644 index 0000000000..28fe583d97 --- /dev/null +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDateViewComponent.cs @@ -0,0 +1,29 @@ +using System.ComponentModel; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; + +namespace Volo.CmsKit.ViewComponents; + +[Widget( + AutoInitialize = true +)] + +[ViewComponent(Name = "ExampleDate")] +public class ExampleDateViewComponent : AbpViewComponent +{ + public ExampleDateViewComponent() + { + } + + public virtual async Task InvokeAsync(string isShow) + { + return View("~/ViewComponents/ExampleDate.cshtml", new ExampleDateViewModel() { IsShow = bool.Parse(isShow) }); + } +} + +public class ExampleDateViewModel +{ + public bool IsShow { get; set; } +} \ No newline at end of file diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDate.cshtml similarity index 75% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDate.cshtml index 0622000bb7..aca74ce2bb 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDate.cshtml @@ -1,5 +1,5 @@ @using Volo.CmsKit.ViewComponents -@model DecisionCommentDateViewModel +@model ExampleModalDateViewModel
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDateViewComponent.cs similarity index 53% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDateViewComponent.cs index c4f52d508a..69490df9eb 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDateViewComponent.cs @@ -1,10 +1,8 @@ using System.ComponentModel; -using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -using Volo.Abp.Localization; namespace Volo.CmsKit.ViewComponents; @@ -12,20 +10,20 @@ namespace Volo.CmsKit.ViewComponents; AutoInitialize = true )] -[ViewComponent(Name = "DecisionCommentDate")] -public class DecisionCommentDateViewComponent : AbpViewComponent +[ViewComponent(Name = "ExampleModalDate")] +public class ExampleModalDateViewComponent : AbpViewComponent { - public DecisionCommentDateViewComponent() + public ExampleModalDateViewComponent() { } public virtual async Task InvokeAsync() { - return View("~/ViewComponents/DecisionCommentDate.cshtml", new DecisionCommentDateViewModel()); + return View("~/ViewComponents/ExampleModalDate.cshtml", new ExampleModalDateViewModel()); } } -public class DecisionCommentDateViewModel +public class ExampleModalDateViewModel { [DisplayName("Show date in the component")] public bool IsShow { get; set; } = true;