From 0bc3dd7ccf19a29cc1f6ae8b0457cdd23f627281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 24 Feb 2017 09:47:21 +0300
Subject: [PATCH] Moved mongo blog views inside the module.

---
 .../AbpDesk.MongoBlog/AbpDesk.MongoBlog.xproj |  2 +-
 .../Blogging/AbpDeskMongoBlogModule.cs        | 19 +++++++++++++++++--
 .../Areas/Blog/Controllers/PostsController.cs |  3 +--
 .../Areas/Blog/Views/Posts/Index.cshtml       |  0
 .../Properties/launchSettings.json            | 19 +++++++++++++++++++
 src/AbpDesk/AbpDesk.MongoBlog/project.json    | 13 ++++++++++---
 .../AbpIdentityWebModule.cs                   |  1 +
 .../AbpIdentityWebMainMenuContributor.cs      |  2 +-
 8 files changed, 50 insertions(+), 9 deletions(-)
 rename src/AbpDesk/{AbpDesk.Web.Mvc => AbpDesk.MongoBlog}/Areas/Blog/Controllers/PostsController.cs (91%)
 rename src/AbpDesk/{AbpDesk.Web.Mvc => AbpDesk.MongoBlog}/Areas/Blog/Views/Posts/Index.cshtml (100%)
 create mode 100644 src/AbpDesk/AbpDesk.MongoBlog/Properties/launchSettings.json
 rename src/Volo.Abp.Identity.Web/{ => Navigation}/AbpIdentityWebMainMenuContributor.cs (93%)

diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.xproj b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.xproj
index 9e02b68a2d..b5646e990e 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.xproj
+++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.xproj
@@ -16,5 +16,5 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
index e75fa1c76d..a1426378a4 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
+++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/AbpDeskMongoBlogModule.cs
@@ -1,10 +1,14 @@
-using Microsoft.Extensions.DependencyInjection;
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.EmbeddedFiles;
 using Volo.Abp.Modularity;
 using Volo.Abp.MongoDB;
 
 namespace AbpDesk.Blogging
 {
-    [DependsOn(typeof(AbpMongoDbModule))]
+    //TODO: Make this a plugin
+    [DependsOn(typeof(AbpMongoDbModule), typeof(AbpAspNetCoreMvcModule))]
     public class AbpDeskMongoBlogModule : AbpModule
     {
         public override void ConfigureServices(IServiceCollection services)
@@ -14,6 +18,17 @@ namespace AbpDesk.Blogging
                 options.WithDefaultRepositories();
             });
 
+            services.Configure<EmbeddedFileOptions>(options =>
+            {
+                options.Sources.Add(
+                    new EmbeddedFileSet(
+                        "/Areas/",
+                        GetType().GetTypeInfo().Assembly,
+                        "AbpDesk.MongoBlog.Areas"
+                        )
+                    );
+            });
+
             services.AddAssemblyOf<AbpDeskMongoBlogModule>();
         }
     }
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Areas/Blog/Controllers/PostsController.cs b/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Controllers/PostsController.cs
similarity index 91%
rename from src/AbpDesk/AbpDesk.Web.Mvc/Areas/Blog/Controllers/PostsController.cs
rename to src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Controllers/PostsController.cs
index 01ea8d6b6d..33f49c20a6 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Areas/Blog/Controllers/PostsController.cs
+++ b/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Controllers/PostsController.cs
@@ -5,9 +5,8 @@ using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Uow;
 
-namespace AbpDesk.Web.Mvc.Areas.Blog.Controllers
+namespace Areas.Blog.Controllers
 {
-    //TODO: Move this controller to a plug-in
     [Area("Blog")]
     public class PostsController : AbpController
     {
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Areas/Blog/Views/Posts/Index.cshtml b/src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml
similarity index 100%
rename from src/AbpDesk/AbpDesk.Web.Mvc/Areas/Blog/Views/Posts/Index.cshtml
rename to src/AbpDesk/AbpDesk.MongoBlog/Areas/Blog/Views/Posts/Index.cshtml
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/Properties/launchSettings.json b/src/AbpDesk/AbpDesk.MongoBlog/Properties/launchSettings.json
new file mode 100644
index 0000000000..d622e3fc0f
--- /dev/null
+++ b/src/AbpDesk/AbpDesk.MongoBlog/Properties/launchSettings.json
@@ -0,0 +1,19 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:54356/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/AbpDesk/AbpDesk.MongoBlog/project.json b/src/AbpDesk/AbpDesk.MongoBlog/project.json
index 3e6d5094da..c3cd0cc63f 100644
--- a/src/AbpDesk/AbpDesk.MongoBlog/project.json
+++ b/src/AbpDesk/AbpDesk.MongoBlog/project.json
@@ -2,14 +2,21 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "NETStandard.Library": "1.6.1",
-    "Volo.Abp": "1.0.0-*",
-    "Volo.Abp.MongoDB": "1.0.0-*"
+    "Volo.Abp.MongoDB": "1.0.0-*",
+    "Volo.Abp.AspNetCore.Mvc": "1.0.0-*"
   },
 
   "frameworks": {
     "netstandard1.6": {
       "imports": "dnxcore50"
     }
+  },
+
+  "buildOptions": {
+    "embed": {
+      "include": [
+        "Areas/**/*.*"
+      ]
+    }
   }
 }
diff --git a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
index d4237de1c0..a7afb9a61f 100644
--- a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
+++ b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.EmbeddedFiles;
+using Volo.Abp.Identity.Web.Navigation;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 
diff --git a/src/Volo.Abp.Identity.Web/AbpIdentityWebMainMenuContributor.cs b/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
similarity index 93%
rename from src/Volo.Abp.Identity.Web/AbpIdentityWebMainMenuContributor.cs
rename to src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
index a53bfc60d9..92101fe24a 100644
--- a/src/Volo.Abp.Identity.Web/AbpIdentityWebMainMenuContributor.cs
+++ b/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.UI.Navigation;
 
-namespace Volo.Abp.Identity.Web
+namespace Volo.Abp.Identity.Web.Navigation
 {
     public class AbpIdentityWebMainMenuContributor : IMenuContributor
     {