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 d927157a1f..cfa94589fe 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs @@ -34,6 +34,8 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.Web; using Volo.Abp.Threading; using Volo.Abp.VirtualFileSystem; +using Volo.CmsKit.Public; +using Volo.CmsKit.Public.Web; namespace Volo.CmsKit { @@ -58,7 +60,9 @@ namespace Volo.CmsKit typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), - typeof(AbpAspNetCoreSerilogModule) + typeof(AbpAspNetCoreSerilogModule), + typeof(CmsKitPublicWebModule), + typeof(CmsKitPublicApplicationModule) )] public class CmsKitWebUnifiedModule : AbpModule { @@ -136,7 +140,7 @@ namespace Volo.CmsKit app.UseAbpRequestLocalization(); app.UseAuthorization(); - + app.UseSwagger(); app.UseSwaggerUI(options => { diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml index 54166efe04..c504c5b668 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml @@ -2,6 +2,10 @@ @using Localization.Resources.AbpUi @using Microsoft.Extensions.Localization @using Volo.CmsKit.Pages +@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components @model IndexModel @inject IStringLocalizer Localizer -@Localizer["Login"] \ No newline at end of file +

CMS Kit DEMO

+

Reactions

+@await Component.InvokeAsync(typeof(ReactionSelectionViewComponent)) +@* *@ diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/_ViewImports.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/_ViewImports.cshtml index c1da1f5f10..da4fb49a47 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/_ViewImports.cshtml +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/_ViewImports.cshtml @@ -1,4 +1,5 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file +@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling +@addTagHelper *, Volo.CmsKit.Public.Web diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj index a6ac309702..ef31336779 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj @@ -37,6 +37,8 @@ + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/PublicApplicationContractsModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicApplicationContractsModule.cs similarity index 81% rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/PublicApplicationContractsModule.cs rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicApplicationContractsModule.cs index 8a4ee7f8e1..a1bc5b4eee 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/PublicApplicationContractsModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicApplicationContractsModule.cs @@ -9,7 +9,7 @@ namespace Volo.CmsKit.Public typeof(AbpDddApplicationContractsModule), typeof(AbpAuthorizationModule) )] - public class PublicApplicationContractsModule : AbpModule + public class CmsKitPublicApplicationContractsModule : AbpModule { } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationModule.cs similarity index 64% rename from modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationModule.cs rename to modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationModule.cs index 4ad2dc8cf5..6ce6a4b0a7 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationModule.cs @@ -7,18 +7,18 @@ namespace Volo.CmsKit.Public { [DependsOn( typeof(CmsKitDomainModule), - typeof(PublicApplicationContractsModule), + typeof(CmsKitPublicApplicationContractsModule), typeof(AbpDddApplicationModule), typeof(AbpAutoMapperModule) )] - public class PublicApplicationModule : AbpModule + public class CmsKitPublicApplicationModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); + context.Services.AddAutoMapperObjectMapper(); Configure(options => { - options.AddMaps(validate: true); + options.AddMaps(validate: true); }); } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicAppService.cs index 5593482811..c4723225b8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicAppService.cs @@ -8,7 +8,7 @@ namespace Volo.CmsKit.Public protected PublicAppService() { LocalizationResource = typeof(CmsKitResource); - ObjectMapperContext = typeof(PublicApplicationModule); + ObjectMapperContext = typeof(CmsKitPublicApplicationModule); } } } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/Public/PublicHttpApiClientModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/Public/PublicHttpApiClientModule.cs index 79a753eb9b..878540505e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/Public/PublicHttpApiClientModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/Public/PublicHttpApiClientModule.cs @@ -5,7 +5,7 @@ using Volo.Abp.Modularity; namespace Volo.CmsKit.Public { [DependsOn( - typeof(PublicApplicationContractsModule), + typeof(CmsKitPublicApplicationContractsModule), typeof(AbpHttpClientModule))] public class PublicHttpApiClientModule : AbpModule { @@ -14,7 +14,7 @@ namespace Volo.CmsKit.Public public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddHttpClientProxies( - typeof(PublicApplicationContractsModule).Assembly, + typeof(CmsKitPublicApplicationContractsModule).Assembly, RemoteServiceName ); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/PublicHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs similarity index 85% rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/PublicHttpApiModule.cs rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs index 9f3d25d366..d38cd8e1db 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/PublicHttpApiModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs @@ -8,15 +8,15 @@ using Volo.CmsKit.Localization; namespace Volo.CmsKit.Public { [DependsOn( - typeof(PublicApplicationContractsModule), + typeof(CmsKitPublicApplicationContractsModule), typeof(AbpAspNetCoreMvcModule))] - public class PublicHttpApiModule : AbpModule + public class CmsKitPublicHttpApiModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) { PreConfigure(mvcBuilder => { - mvcBuilder.AddApplicationPartIfNotExists(typeof(PublicHttpApiModule).Assembly); + mvcBuilder.AddApplicationPartIfNotExists(typeof(CmsKitPublicHttpApiModule).Assembly); }); } diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/PublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs similarity index 79% rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/PublicWebModule.cs rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs index 2954da7368..88a7cabe2f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/PublicWebModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs @@ -12,22 +12,22 @@ using Volo.CmsKit.Localization; namespace Volo.CmsKit.Public.Web { [DependsOn( - typeof(PublicHttpApiModule), + typeof(CmsKitPublicHttpApiModule), typeof(AbpAspNetCoreMvcUiThemeSharedModule), typeof(AbpAutoMapperModule) )] - public class PublicWebModule : AbpModule + public class CmsKitPublicWebModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) { context.Services.PreConfigure(options => { - options.AddAssemblyResource(typeof(CmsKitResource), typeof(PublicWebModule).Assembly); + options.AddAssemblyResource(typeof(CmsKitResource), typeof(CmsKitPublicWebModule).Assembly); }); PreConfigure(mvcBuilder => { - mvcBuilder.AddApplicationPartIfNotExists(typeof(PublicWebModule).Assembly); + mvcBuilder.AddApplicationPartIfNotExists(typeof(CmsKitPublicWebModule).Assembly); }); } @@ -40,13 +40,13 @@ namespace Volo.CmsKit.Public.Web Configure(options => { - options.FileSets.AddEmbedded(); + options.FileSets.AddEmbedded(); }); - context.Services.AddAutoMapperObjectMapper(); + context.Services.AddAutoMapperObjectMapper(); Configure(options => { - options.AddMaps(validate: true); + options.AddMaps(validate: true); }); Configure(options => diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Index.cshtml similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/Index.cshtml rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Index.cshtml diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/Index.cshtml.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Index.cshtml.cs similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/Index.cshtml.cs rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Index.cshtml.cs diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Default.cshtml new file mode 100644 index 0000000000..8f2ccffb60 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Default.cshtml @@ -0,0 +1,2 @@ +@model Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelectionViewModel +

TEST!

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewComponent.cs new file mode 100644 index 0000000000..324388d92c --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewComponent.cs @@ -0,0 +1,17 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; + +namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components +{ + public class ReactionSelectionViewComponent : AbpViewComponent + { + public virtual async Task InvokeAsync(string entityType = null, string entityId = null) + { + return View( + "~/Pages/CmsKit/Shared/Components/Default.cshtml", + new ReactionSelectionViewModel() + ); + } + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewModel.cs new file mode 100644 index 0000000000..2fd308b771 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewModel.cs @@ -0,0 +1,7 @@ +namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components +{ + public class ReactionSelectionViewModel + { + + } +} diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/_ViewImports.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml similarity index 100% rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/_ViewImports.cshtml rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs index a2d4d13b9f..0ea29457e9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs @@ -10,7 +10,7 @@ namespace Volo.CmsKit.Public.Web.Pages protected PublicPageModel() { LocalizationResourceType = typeof(CmsKitResource); - ObjectMapperContext = typeof(PublicWebModule); + ObjectMapperContext = typeof(CmsKitPublicWebModule); } } } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj index 1068695c56..2f00804b8c 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj @@ -8,7 +8,7 @@ $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; true Library - Volo.CmsKit.Public.Web + Volo.CmsKit.Web true @@ -30,6 +30,10 @@ + + true + PreserveNewest +