Rearrange the web layer

modules/cms-kit/src/Volo.CmsKit.Admin.Web/AdminWebAutoMapperProfile.cs → modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebAutoMapperProfile.cs

@@ -2,13 +2,13 @@
 
 namespace Volo.CmsKit.Admin.Web
 {
-    public class AdminWebAutoMapperProfile : Profile
+    public class CmsKitAdminWebAutoMapperProfile : Profile
     {
-        public AdminWebAutoMapperProfile()
+        public CmsKitAdminWebAutoMapperProfile()
         {
             /* You can configure your AutoMapper mapping configuration here.
              * Alternatively, you can split your mapping configurations
              * into multiple profile classes for a better organization. */
         }
     }
-}
+}

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

@@ -13,8 +13,7 @@ namespace Volo.CmsKit.Admin.Web
 {
     [DependsOn(
         typeof(CmsKitAdminHttpApiModule),
-        typeof(CmsKitCommonWebModule),
-        typeof(AbpAutoMapperModule)
+        typeof(CmsKitCommonWebModule)
         )]
     public class CmsKitAdminWebModule : AbpModule
     {

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

@@ -1,9 +0,0 @@
-@page
-@using Microsoft.Extensions.Localization
-@using Volo.CmsKit.Localization
-@model Volo.CmsKit.Admin.Web.Pages.Admin.IndexModel
-@inject IStringLocalizer<CmsKitResource> L
-@{
-}
-<h1>Admin</h1>
-<p>@L["SamplePageMessage"]</p>

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

@@ -1,9 +0,0 @@
-namespace Volo.CmsKit.Admin.Web.Pages.Admin
-{
-    public class IndexModel : AdminPageModel
-    {
-        public void OnGet()
-        {
-        }
-    }
-}

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

@@ -1,6 +0,0 @@
-@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
-@addTagHelper *, Volo.CmsKit.Common.Web
-@addTagHelper *, Volo.CmsKit.Admin.Web

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/AdminPageModel.cs → modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKitAdminPageModel.cs

@@ -5,12 +5,12 @@ namespace Volo.CmsKit.Admin.Web.Pages
 {
     /* Inherit your PageModel classes from this class.
      */
-    public abstract class AdminPageModel : AbpPageModel
+    public abstract class CmsKitAdminPageModel : AbpPageModel
     {
-        protected AdminPageModel()
+        protected CmsKitAdminPageModel()
         {
             LocalizationResourceType = typeof(CmsKitResource);
             ObjectMapperContext = typeof(CmsKitAdminWebModule);
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj

@@ -29,4 +29,9 @@
     <Content Remove="Pages\**\*.js" />
   </ItemGroup>
 
+  <ItemGroup>
+    <_ContentIncludedByDefault Remove="Pages\Admin\Index.cshtml" />
+    <_ContentIncludedByDefault Remove="Pages\Admin\_ViewImports.cshtml" />
+  </ItemGroup>
+
 </Project>

modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs

@@ -1,4 +1,5 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
+using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 using Volo.CmsKit.Reactions;
@@ -8,7 +9,8 @@ namespace Volo.CmsKit.Web
 {
     [DependsOn(
         typeof(AbpAspNetCoreMvcUiThemeSharedModule),
-        typeof(CmsKitCommonHttpApiModule)
+        typeof(CmsKitCommonHttpApiModule),
+        typeof(AbpAutoMapperModule)
         )]
     public class CmsKitCommonWebModule : AbpModule
     {

modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj

@@ -14,6 +14,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
+        <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
         <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi\Volo.CmsKit.Common.HttpApi.csproj" />
     </ItemGroup>
 

modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/CmsKitPublicHttpApiClientModule.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
 
 namespace Volo.CmsKit

modules/cms-kit/src/Volo.CmsKit.Public.Web/PublicWebAutoMapperProfile.cs → modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs

@@ -2,13 +2,13 @@
 
 namespace Volo.CmsKit.Web
 {
-    public class PublicWebAutoMapperProfile : Profile
+    public class CmsKitPublicWebAutoMapperProfile : Profile
     {
-        public PublicWebAutoMapperProfile()
+        public CmsKitPublicWebAutoMapperProfile()
         {
             /* You can configure your AutoMapper mapping configuration here.
              * Alternatively, you can split your mapping configurations
              * into multiple profile classes for a better organization. */
         }
     }
-}
+}

modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs

@@ -12,9 +12,8 @@ namespace Volo.CmsKit.Web
 {
     [DependsOn(
         typeof(CmsKitPublicHttpApiModule),
-        typeof(CmsKitCommonWebModule),
-        typeof(AbpAutoMapperModule)
-        )]
+        typeof(CmsKitCommonWebModule)
+    )]
     public class CmsKitPublicWebModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)

modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj

@@ -12,10 +12,6 @@
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Volo.CmsKit.Common.Web\Volo.CmsKit.Common.Web.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Public.HttpApi\Volo.CmsKit.Public.HttpApi.csproj" />