From 9eafb527141225c83a3ad1f8d2c420a3f4384e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 15 Jul 2020 13:15:06 +0300
Subject: [PATCH] Rename modules.

---
 .../CmsKitWebUnifiedModule.cs                 |  9 +++---
 .../Pages/Index.cshtml                        |  1 +
 .../Volo.CmsKit.Web.Unified.csproj            |  3 +-
 ... CmsKitAdminApplicationContractsModule.cs} |  2 +-
 .../Volo/CmsKit/Admin/AdminAppService.cs      |  2 +-
 ...ule.cs => CmsKitAdminApplicationModule.cs} |  8 +++---
 .../CmsKit/Admin/AdminHttpApiClientModule.cs  |  4 +--
 .../Volo/CmsKit/Admin/AdminHttpApiModule.cs   |  2 +-
 .../Pages/Admin/_ViewImports.cshtml           |  4 ++-
 .../Volo.CmsKit.Application.Contracts.csproj  |  6 ++--
 .../CmsKitApplicationContractsModule.cs       |  5 +++-
 .../Volo.CmsKit.Application.csproj            |  2 ++
 .../Volo/CmsKit/CmsKitApplicationModule.cs    |  4 +++
 .../Icons/CmsIconTagHelper.cs                 | 16 +++++++++++
 .../Icons/CmsIconTagHelperService.cs          | 28 +++++++++++++++++++
 .../{ => ReactionSelection}/Default.cshtml    |  2 +-
 .../ReactionSelectionViewComponent.cs         |  4 +--
 .../ReactionSelectionViewModel.cs             |  3 +-
 .../ReactionViewModel.cs                      |  4 +--
 .../Pages/CmsKit/_ViewImports.cshtml          |  4 ++-
 .../Volo.CmsKit.Public.Web.csproj             |  4 +++
 .../src/Volo.CmsKit.Web/CmsKitWebModule.cs    |  6 +++-
 .../Pages/CmsKit/_ViewImports.cshtml          |  5 +++-
 .../Volo.CmsKit.Web/Volo.CmsKit.Web.csproj    |  2 ++
 24 files changed, 100 insertions(+), 30 deletions(-)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/{AdminApplicationContractsModule.cs => CmsKitAdminApplicationContractsModule.cs} (81%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/{AdminApplicationModule.cs => CmsKitAdminApplicationModule.cs} (64%)
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelper.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelperService.cs
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/{ => ReactionSelection}/Default.cshtml (86%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/{ => ReactionSelection}/ReactionSelectionViewComponent.cs (90%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/{ => ReactionSelection}/ReactionSelectionViewModel.cs (74%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/{ => ReactionSelection}/ReactionViewModel.cs (77%)

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 69377a1416..183469ce48 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
@@ -6,7 +6,6 @@ using Volo.CmsKit.EntityFrameworkCore;
 using Volo.CmsKit.MultiTenancy;
 using Volo.CmsKit.Web;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.Swagger;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
@@ -34,7 +33,7 @@ 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.Admin.Web;
 
 namespace Volo.CmsKit
 {
@@ -59,9 +58,7 @@ namespace Volo.CmsKit
         typeof(AbpTenantManagementApplicationModule),
         typeof(AbpTenantManagementEntityFrameworkCoreModule),
         typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-        typeof(AbpAspNetCoreSerilogModule),
-        typeof(CmsKitPublicWebModule),
-        typeof(CmsKitPublicApplicationModule)
+        typeof(AbpAspNetCoreSerilogModule)
         )]
     public class CmsKitWebUnifiedModule : AbpModule
     {
@@ -82,7 +79,9 @@ namespace Volo.CmsKit
                     options.FileSets.ReplaceEmbeddedByPhysical<CmsKitDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Domain.Shared", Path.DirectorySeparatorChar)));
                     options.FileSets.ReplaceEmbeddedByPhysical<CmsKitDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Domain", Path.DirectorySeparatorChar)));
 
+                    options.FileSets.ReplaceEmbeddedByPhysical<CmsKitCommonWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Common.Web", Path.DirectorySeparatorChar)));
                     options.FileSets.ReplaceEmbeddedByPhysical<CmsKitPublicWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Public.Web", Path.DirectorySeparatorChar)));
+                    options.FileSets.ReplaceEmbeddedByPhysical<CmsKitAdminWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Admin.Web", Path.DirectorySeparatorChar)));
 
                     options.FileSets.ReplaceEmbeddedByPhysical<CmsKitApplicationContractsModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Application.Contracts", Path.DirectorySeparatorChar)));
                     options.FileSets.ReplaceEmbeddedByPhysical<CmsKitApplicationModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Application", Path.DirectorySeparatorChar)));
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 f657733499..6d65685a77 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
@@ -3,6 +3,7 @@
 @using Microsoft.Extensions.Localization
 @using Volo.CmsKit.Pages
 @using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
+@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 @model IndexModel
 @inject IStringLocalizer<AbpUiResource> Localizer
 <h1>CMS Kit DEMO</h1>
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 ef31336779..d0237cd54c 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,8 +37,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Volo.CmsKit.Application\Volo.CmsKit.Application.csproj" />
     <ProjectReference Include="..\..\src\Volo.CmsKit.EntityFrameworkCore\Volo.CmsKit.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\src\Volo.CmsKit.Public.Application\Volo.CmsKit.Public.Application.csproj" />
-    <ProjectReference Include="..\..\src\Volo.CmsKit.Public.Web\Volo.CmsKit.Public.Web.csproj" />
+    <ProjectReference Include="..\..\src\Volo.CmsKit.Application\Volo.CmsKit.Application.csproj" />
     <ProjectReference Include="..\..\src\Volo.CmsKit.Web\Volo.CmsKit.Web.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Host.Shared\Volo.CmsKit.Host.Shared.csproj" />
   </ItemGroup>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/AdminApplicationContractsModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminApplicationContractsModule.cs
similarity index 81%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/AdminApplicationContractsModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminApplicationContractsModule.cs
index b2fd98458f..c063e74aa7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/AdminApplicationContractsModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminApplicationContractsModule.cs
@@ -9,7 +9,7 @@ namespace Volo.CmsKit.Admin
         typeof(AbpDddApplicationContractsModule),
         typeof(AbpAuthorizationModule)
         )]
-    public class AdminApplicationContractsModule : AbpModule
+    public class CmsKitAdminApplicationContractsModule : AbpModule
     {
 
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminAppService.cs
index 9504290fc7..b6bde71b07 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminAppService.cs
@@ -8,7 +8,7 @@ namespace Volo.CmsKit.Admin
         protected AdminAppService()
         {
             LocalizationResource = typeof(CmsKitResource);
-            ObjectMapperContext = typeof(AdminApplicationModule);
+            ObjectMapperContext = typeof(CmsKitAdminApplicationModule);
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs
similarity index 64%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminApplicationModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs
index dc4c73600e..dcac5b6bea 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminApplicationModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs
@@ -7,18 +7,18 @@ namespace Volo.CmsKit.Admin
 {
     [DependsOn(
         typeof(CmsKitDomainModule),
-        typeof(AdminApplicationContractsModule),
+        typeof(CmsKitAdminApplicationContractsModule),
         typeof(AbpDddApplicationModule),
         typeof(AbpAutoMapperModule)
         )]
-    public class AdminApplicationModule : AbpModule
+    public class CmsKitAdminApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            context.Services.AddAutoMapperObjectMapper<AdminApplicationModule>();
+            context.Services.AddAutoMapperObjectMapper<CmsKitAdminApplicationModule>();
             Configure<AbpAutoMapperOptions>(options =>
             {
-                options.AddMaps<AdminApplicationModule>(validate: true);
+                options.AddMaps<CmsKitAdminApplicationModule>(validate: true);
             });
         }
     }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/AdminHttpApiClientModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/AdminHttpApiClientModule.cs
index dd600cf2c1..db632b2c70 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/AdminHttpApiClientModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/AdminHttpApiClientModule.cs
@@ -5,7 +5,7 @@ using Volo.Abp.Modularity;
 namespace Volo.CmsKit.Admin
 {
     [DependsOn(
-        typeof(AdminApplicationContractsModule),
+        typeof(CmsKitAdminApplicationContractsModule),
         typeof(AbpHttpClientModule))]
     public class AdminHttpApiClientModule : AbpModule
     {
@@ -14,7 +14,7 @@ namespace Volo.CmsKit.Admin
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddHttpClientProxies(
-                typeof(AdminApplicationContractsModule).Assembly,
+                typeof(CmsKitAdminApplicationContractsModule).Assembly,
                 RemoteServiceName
             );
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminHttpApiModule.cs
index 09f5312693..77bdd46a4a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminHttpApiModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminHttpApiModule.cs
@@ -8,7 +8,7 @@ using Volo.CmsKit.Localization;
 namespace Volo.CmsKit.Admin
 {
     [DependsOn(
-        typeof(AdminApplicationContractsModule),
+        typeof(CmsKitAdminApplicationContractsModule),
         typeof(AbpAspNetCoreMvcModule))]
     public class AdminHttpApiModule : AbpModule
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/Admin/_ViewImports.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/Admin/_ViewImports.cshtml
index c1da1f5f10..b6971d50af 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/Admin/_ViewImports.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/Admin/_ViewImports.cshtml
@@ -1,4 +1,6 @@
 @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.Common.Web
+@addTagHelper *, Volo.CmsKit.Admin.Web
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj
index ddc9a68e4d..3c8c46b999 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj
@@ -9,9 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj"/>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj"/>
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Domain.Shared\Volo.CmsKit.Domain.Shared.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
index b5454a8fc8..363563f48f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
@@ -1,13 +1,16 @@
 using Volo.Abp.Application;
 using Volo.Abp.Modularity;
 using Volo.Abp.Authorization;
+using Volo.CmsKit.Admin;
 
 namespace Volo.CmsKit
 {
     [DependsOn(
         typeof(CmsKitDomainSharedModule),
         typeof(AbpDddApplicationContractsModule),
-        typeof(AbpAuthorizationModule)
+        typeof(AbpAuthorizationModule),
+        typeof(CmsKitPublicApplicationContractsModule),
+        typeof(CmsKitAdminApplicationContractsModule)
         )]
     public class CmsKitApplicationContractsModule : AbpModule
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj
index 7a735222e2..ab528fe08b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj
@@ -11,8 +11,10 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Admin.Application\Volo.CmsKit.Admin.Application.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Application.Contracts\Volo.CmsKit.Application.Contracts.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Domain\Volo.CmsKit.Domain.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Public.Application\Volo.CmsKit.Public.Application.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
index 2617af614e..4d633df1a6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
@@ -2,12 +2,16 @@
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.Application;
+using Volo.CmsKit.Admin;
+using Volo.CmsKit.Public;
 
 namespace Volo.CmsKit
 {
     [DependsOn(
         typeof(CmsKitDomainModule),
         typeof(CmsKitApplicationContractsModule),
+        typeof(CmsKitPublicApplicationModule),
+        typeof(CmsKitAdminApplicationModule),
         typeof(AbpDddApplicationModule),
         typeof(AbpAutoMapperModule)
         )]
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelper.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelper.cs
new file mode 100644
index 0000000000..6db6e0e8a0
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelper.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
+
+namespace Volo.CmsKit.Web.Icons
+{
+    [HtmlTargetElement(TagStructure = TagStructure.WithoutEndTag)]
+    public class CmsIconTagHelper : AbpTagHelper<CmsIconTagHelper, CmsIconTagHelperService>
+    {
+        public string Name { get; set; }
+
+        public CmsIconTagHelper(CmsIconTagHelperService service)
+            : base(service)
+        {
+        }
+    }
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelperService.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelperService.cs
new file mode 100644
index 0000000000..b90025f96a
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelperService.cs
@@ -0,0 +1,28 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
+
+namespace Volo.CmsKit.Web.Icons
+{
+    public class CmsIconTagHelperService : AbpTagHelperService<CmsIconTagHelper>
+    {
+        public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            if (TagHelper.Name.Contains("."))
+            {
+                output.TagName = "img";
+                output.Attributes.Add("src", TagHelper.Name);
+                output.Attributes.Add("width", "20");
+                output.Attributes.Add("height", "20");
+            }
+            else
+            {
+                //TODO: Allow to font, svg icons.. etc.
+                throw new AbpException("Only file icons are allowed!");
+            }
+
+            return Task.CompletedTask;
+        }
+    }
+}
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/ReactionSelection/Default.cshtml
similarity index 86%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Default.cshtml
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
index 7f703d2517..2dca928e65 100644
--- 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/ReactionSelection/Default.cshtml
@@ -1,4 +1,4 @@
-@model Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelectionViewModel
+@model Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection.ReactionSelectionViewModel
 <p>TEST!</p>
 <p>EntityType: @Model.EntityType</p>
 <p>EntityId: @Model.EntityId</p>
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/ReactionSelection/ReactionSelectionViewComponent.cs
similarity index 90%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewComponent.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionViewComponent.cs
index 5497ea9ba5..98ccfee129 100644
--- 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/ReactionSelection/ReactionSelectionViewComponent.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.CmsKit.Reactions;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
+namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 {
     public class ReactionSelectionViewComponent : AbpViewComponent
     {
@@ -50,7 +50,7 @@ namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
                     });
             }
 
-            return View("~/Pages/CmsKit/Shared/Components/Default.cshtml", viewModel);
+            return View("~/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml", viewModel);
         }
     }
 }
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/ReactionSelection/ReactionSelectionViewModel.cs
similarity index 74%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewModel.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionViewModel.cs
index 5448952e1c..bd22fd4229 100644
--- 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/ReactionSelection/ReactionSelectionViewModel.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
-using Volo.CmsKit.Reactions;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
+namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 {
     public class ReactionSelectionViewModel
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionViewModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionViewModel.cs
similarity index 77%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionViewModel.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionViewModel.cs
index e64e4e2b77..f3d798903a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionViewModel.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionViewModel.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
+namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 {
     public class ReactionViewModel
     {
@@ -13,4 +13,4 @@ namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
         [NotNull]
         public string Icon { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml
index c1da1f5f10..3a0a2aecec 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml
@@ -1,4 +1,6 @@
 @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.Common.Web
+@addTagHelper *, Volo.CmsKit.Public.Web
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 e0a79d98aa..8b781b6cf8 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
@@ -30,6 +30,10 @@
     <EmbeddedResource Include="Pages\**\*.js" />
     <Content Remove="Pages\**\*.css" />
     <Content Remove="Pages\**\*.js" />
+    <Content Update="Pages\CmsKit\Shared\Components\ReactionSelection\Default.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
   </ItemGroup>
 
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs
index 52b64c1c65..e1fe46f5f5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs
@@ -8,6 +8,7 @@ using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
+using Volo.CmsKit.Admin.Web;
 using Volo.CmsKit.Permissions;
 
 namespace Volo.CmsKit.Web
@@ -15,7 +16,9 @@ namespace Volo.CmsKit.Web
     [DependsOn(
         typeof(CmsKitHttpApiModule),
         typeof(AbpAspNetCoreMvcUiThemeSharedModule),
-        typeof(AbpAutoMapperModule)
+        typeof(AbpAutoMapperModule),
+        typeof(CmsKitPublicWebModule),
+        typeof(CmsKitAdminWebModule)
         )]
     public class CmsKitWebModule : AbpModule
     {
@@ -45,6 +48,7 @@ namespace Volo.CmsKit.Web
             });
 
             context.Services.AddAutoMapperObjectMapper<CmsKitWebModule>();
+
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddMaps<CmsKitWebModule>(validate: true);
diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml b/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml
index c1da1f5f10..6798eba494 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml
@@ -1,4 +1,7 @@
 @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.Common.Web
+@addTagHelper *, Volo.CmsKit.Public.Web
+@addTagHelper *, Volo.CmsKit.Admin.Web
diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj
index d876642970..ea9fab1337 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj
@@ -15,9 +15,11 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Public.Web\Volo.CmsKit.Public.Web.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Volo.CmsKit.Admin.Web\Volo.CmsKit.Admin.Web.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.HttpApi\Volo.CmsKit.HttpApi.csproj" />
   </ItemGroup>