From 13fbf0cefe583a07ea44c9193d314ac85fd8343c 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 16:19:54 +0300
Subject: [PATCH] Rearrange the HttpApi layers of the CMS Kit.

---
 .../Volo.CmsKit.Admin.HttpApi.Client.csproj          |  2 +-
 ...ntModule.cs => CmsKitAdminHttpApiClientModule.cs} |  9 +++++----
 .../Volo.CmsKit.Admin.HttpApi.csproj                 |  2 +-
 .../Volo/CmsKit/CmsKitAdminController.cs}            |  6 +++---
 ...nHttpApiModule.cs => CmsKitAdminHttpApiModule.cs} | 12 +++++++-----
 .../Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs    |  2 +-
 .../Volo.CmsKit.Public.HttpApi.Client.csproj         |  2 +-
 ...tModule.cs => CmsKitPublicHttpApiClientModule.cs} |  8 ++++----
 .../Volo.CmsKit.Public.HttpApi.csproj                |  2 +-
 .../Volo/CmsKit/CmsKitPublicController.cs}           |  6 +++---
 .../CmsKit/{Public => }/CmsKitPublicHttpApiModule.cs |  6 +++---
 .../Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs  |  1 -
 12 files changed, 30 insertions(+), 28 deletions(-)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/{Admin/AdminHttpApiClientModule.cs => CmsKitAdminHttpApiClientModule.cs} (68%)
 rename modules/cms-kit/src/{Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/PublicController.cs => Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminController.cs} (55%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/{Admin/AdminHttpApiModule.cs => CmsKitAdminHttpApiModule.cs} (82%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/{Public/PublicHttpApiClientModule.cs => CmsKitPublicHttpApiClientModule.cs} (70%)
 rename modules/cms-kit/src/{Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminController.cs => Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicController.cs} (55%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/{Public => }/CmsKitPublicHttpApiModule.cs (93%)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
index e38c564555..1fb91747a2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo.CmsKit.Admin.HttpApi.Client.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi.Client\Volo.CmsKit.Common.HttpApi.Client.csproj" />
   </ItemGroup>
 
 </Project>
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/CmsKitAdminHttpApiClientModule.cs
similarity index 68%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/AdminHttpApiClientModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/CmsKitAdminHttpApiClientModule.cs
index db632b2c70..274476fdcc 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/CmsKitAdminHttpApiClientModule.cs
@@ -1,15 +1,16 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
+using Volo.CmsKit.Admin;
 
-namespace Volo.CmsKit.Admin
+namespace Volo.CmsKit
 {
     [DependsOn(
         typeof(CmsKitAdminApplicationContractsModule),
-        typeof(AbpHttpClientModule))]
-    public class AdminHttpApiClientModule : AbpModule
+        typeof(CmsKitCommonHttpApiClientModule))]
+    public class CmsKitAdminHttpApiClientModule : AbpModule
     {
-        public const string RemoteServiceName = "Admin";
+        public const string RemoteServiceName = "CmsKitAdmin";
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.csproj
index d3df3b3538..84a5b7bf3b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo.CmsKit.Admin.HttpApi.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi\Volo.CmsKit.Common.HttpApi.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/PublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminController.cs
similarity index 55%
rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/PublicController.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminController.cs
index 5683e42e44..cf0ca68a86 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/PublicController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminController.cs
@@ -1,11 +1,11 @@
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.CmsKit.Localization;
 
-namespace Volo.CmsKit.Public
+namespace Volo.CmsKit
 {
-    public abstract class PublicController : AbpController
+    public abstract class CmsKitAdminController : AbpController
     {
-        protected PublicController()
+        protected CmsKitAdminController()
         {
             LocalizationResource = typeof(CmsKitResource);
         }
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/CmsKitAdminHttpApiModule.cs
similarity index 82%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminHttpApiModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminHttpApiModule.cs
index 77bdd46a4a..851c9f5d93 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/CmsKitAdminHttpApiModule.cs
@@ -1,22 +1,24 @@
 using Localization.Resources.AbpUi;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
-using Microsoft.Extensions.DependencyInjection;
+using Volo.CmsKit.Admin;
 using Volo.CmsKit.Localization;
 
-namespace Volo.CmsKit.Admin
+namespace Volo.CmsKit
 {
     [DependsOn(
         typeof(CmsKitAdminApplicationContractsModule),
-        typeof(AbpAspNetCoreMvcModule))]
-    public class AdminHttpApiModule : AbpModule
+        typeof(CmsKitCommonHttpApiModule)
+        )]
+    public class CmsKitAdminHttpApiModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
             PreConfigure<IMvcBuilder>(mvcBuilder =>
             {
-                mvcBuilder.AddApplicationPartIfNotExists(typeof(AdminHttpApiModule).Assembly);
+                mvcBuilder.AddApplicationPartIfNotExists(typeof(CmsKitAdminHttpApiModule).Assembly);
             });
         }
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
index 45d2d2e24f..8f137a51e2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
@@ -12,7 +12,7 @@ using Volo.CmsKit.Web;
 namespace Volo.CmsKit.Admin.Web
 {
     [DependsOn(
-        typeof(AdminHttpApiModule),
+        typeof(CmsKitAdminHttpApiModule),
         typeof(CmsKitCommonWebModule),
         typeof(AbpAutoMapperModule)
         )]
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
index f7a1e8cb62..74087990f5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo.CmsKit.Public.HttpApi.Client.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Http.Client\Volo.Abp.Http.Client.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi.Client\Volo.CmsKit.Common.HttpApi.Client.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
   </ItemGroup>
 
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/CmsKitPublicHttpApiClientModule.cs
similarity index 70%
rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/Public/PublicHttpApiClientModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/CmsKitPublicHttpApiClientModule.cs
index 878540505e..4ca4a0dc23 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/CmsKitPublicHttpApiClientModule.cs
@@ -2,14 +2,14 @@
 using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit.Public
+namespace Volo.CmsKit
 {
     [DependsOn(
         typeof(CmsKitPublicApplicationContractsModule),
-        typeof(AbpHttpClientModule))]
-    public class PublicHttpApiClientModule : AbpModule
+        typeof(CmsKitCommonHttpApiClientModule))]
+    public class CmsKitPublicHttpApiClientModule : AbpModule
     {
-        public const string RemoteServiceName = "Public";
+        public const string RemoteServiceName = "CmsKitPublic";
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj
index 32cfc093b5..da54b3d2bf 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo.CmsKit.Public.HttpApi.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\Volo.CmsKit.Common.HttpApi\Volo.CmsKit.Common.HttpApi.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
   </ItemGroup>
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicController.cs
similarity index 55%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminController.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicController.cs
index 9e66873133..75f38932f1 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicController.cs
@@ -1,11 +1,11 @@
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.CmsKit.Localization;
 
-namespace Volo.CmsKit.Admin
+namespace Volo.CmsKit
 {
-    public abstract class AdminController : AbpController
+    public abstract class CmsKitPublicController : AbpController
     {
-        protected AdminController()
+        protected CmsKitPublicController()
         {
             LocalizationResource = typeof(CmsKitResource);
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs
similarity index 93%
rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs
index d38cd8e1db..fc281fa81f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs
@@ -1,15 +1,15 @@
 using Localization.Resources.AbpUi;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
-using Microsoft.Extensions.DependencyInjection;
 using Volo.CmsKit.Localization;
 
-namespace Volo.CmsKit.Public
+namespace Volo.CmsKit
 {
     [DependsOn(
         typeof(CmsKitPublicApplicationContractsModule),
-        typeof(AbpAspNetCoreMvcModule))]
+        typeof(CmsKitCommonHttpApiModule))]
     public class CmsKitPublicHttpApiModule : AbpModule
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
index 7bf00dea5e..0a80268b81 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
@@ -6,7 +6,6 @@ using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 using Volo.CmsKit.Localization;
-using Volo.CmsKit.Public;
 using Volo.CmsKit.Web.Menus;
 
 namespace Volo.CmsKit.Web