From 68e7900bbf54cb41c974f769b03f5d2c0aab22a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Mon, 9 Oct 2017 10:40:26 +0300
Subject: [PATCH] Removed temporary page.

---
 .../Navigation/MainMenuContributor.cs         |  8 ++++---
 src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs        | 11 +++++----
 .../AbpAspNetCoreMvcUiModule.cs               |  6 -----
 .../Controllers/AbpEmbeddedDemoController.cs  | 12 ----------
 .../EmbeddedDemoMainMenuContributor.cs        | 23 -------------------
 .../Views/AbpEmbeddedDemo/Index.cshtml        |  3 ---
 .../Volo.Abp.AspNetCore.Mvc.UI.csproj         |  6 ++++-
 7 files changed, 16 insertions(+), 53 deletions(-)
 delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI/Controllers/AbpEmbeddedDemoController.cs
 delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
 delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI/Views/AbpEmbeddedDemo/Index.cshtml

diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
index bf5945ef62..fe4cd7db75 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs
@@ -22,10 +22,12 @@ namespace AbpDesk.Web.Mvc.Navigation
                         .AddItem(
                             new ApplicationMenuItem("TicketManagement.Tickets", "Tickets", url: "/Tickets")
                         )
-                )
-                .AddItem(
-                    new ApplicationMenuItem("Blog", "Blog", url: "/Blog/Posts")
                 );
+            
+            //Disabled blog module. This should be inside the module!
+            //.AddItem(
+            //    new ApplicationMenuItem("Blog", "Blog", url: "/Blog/Posts")
+            //);
 
             return Task.CompletedTask;
         }
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
index ec1a55362c..781db47760 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
@@ -28,12 +28,13 @@ namespace AbpDesk.Web.Mvc
                 /* @halil: I added Abp.MongoDb package as a dependency to the main application in order to use the blog plugin.
                  * Otherwise, we should add all dependencies (Recursively) into plugin folder
                  * and load in correct order. We should carefully think on that problem in the future.
+                 * NOTE: Disabled 
                  */
-                options.PlugInSources.AddFolder(
-                    Path.Combine(
-                        _env.ContentRootPath,
-                        @"../Web_PlugIns/")
-                );
+                //options.PlugInSources.AddFolder(
+                //    Path.Combine(
+                //        _env.ContentRootPath,
+                //        @"../Web_PlugIns/")
+                //);
             });
 
             //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory!
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
index 41d9d1d0af..0b88d83c2d 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
@@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Bundling;
 using Volo.Abp.EmbeddedFiles;
 using Volo.Abp.Modularity;
-using Volo.Abp.Ui.Navigation;
 
 namespace Volo.Abp.AspNetCore.Mvc
 {
@@ -15,11 +14,6 @@ namespace Volo.Abp.AspNetCore.Mvc
         {
             services.AddAssemblyOf<AbpAspNetCoreMvcUiModule>();
 
-            services.Configure<NavigationOptions>(options =>
-            {
-                options.MenuContributors.Add(new EmbeddedDemoMainMenuContributor());
-            });
-
             services.Configure<EmbeddedFileOptions>(options =>
             {
                 options.Sources.Add(
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Controllers/AbpEmbeddedDemoController.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Controllers/AbpEmbeddedDemoController.cs
deleted file mode 100644
index 5be7ac962b..0000000000
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Controllers/AbpEmbeddedDemoController.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace Volo.Abp.AspNetCore.Mvc.Controllers
-{
-    public class AbpEmbeddedDemoController : AbpController
-    {
-        public ActionResult Index()
-        {
-            return View();
-        }
-    }
-}
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
deleted file mode 100644
index 994dc97b73..0000000000
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/EmbeddedDemoMainMenuContributor.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Ui.Navigation;
-
-namespace Volo.Abp.AspNetCore.Mvc
-{
-    public class EmbeddedDemoMainMenuContributor : IMenuContributor
-    {
-        public Task ConfigureMenuAsync(MenuConfigurationContext context)
-        {
-            if (context.Menu.Name != StandardMenus.Main)
-            {
-                return Task.CompletedTask;
-            }
-
-            context.Menu
-                .AddItem(
-                    new ApplicationMenuItem("EmbeddedDemo", "EmbeddedDemo", url: "/AbpEmbeddedDemo")
-                );
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/AbpEmbeddedDemo/Index.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/AbpEmbeddedDemo/Index.cshtml
deleted file mode 100644
index 0aa28f9368..0000000000
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/AbpEmbeddedDemo/Index.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<h2>ABP Embedded Demo Page</h2>
-
-<p>This page's content is stored as an embedded file!</p>
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
index 375ad7d571..f811492531 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
@@ -11,7 +11,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Views\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+    <EmbeddedResource Include="Views\Shared\Components\AbpMenu\AbpMenuViewComponent.cs" />
+    <EmbeddedResource Include="Views\Shared\Components\AbpScriptBundle\AbpStyleBundleViewComponent.cs" />
+    <EmbeddedResource Include="Views\Shared\Components\AbpScriptBundle\Default.cshtml" />
+    <EmbeddedResource Include="Views\Shared\Components\AbpStyleBundle\AbpStyleBundleViewComponent.cs" />
+    <EmbeddedResource Include="Views\Shared\Components\AbpStyleBundle\Default.cshtml" />
   </ItemGroup>
 
   <ItemGroup>