From 7c818445b0832f61ac4ee661a020e2345ad53e0c Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 17 Jan 2019 14:17:26 +0300
Subject: [PATCH] Resolved #739  Use UseMvcWithDefaultRouteAndArea in the
 samples/templates

---
 .../src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs   | 12 +-----------
 .../src/Acme.BookStore.Web/BookStoreWebModule.cs     |  1 +
 .../DemoAppModule.cs                                 | 10 +---------
 .../MyProjectNameWebModule.cs                        | 11 +----------
 .../MyProjectNameWebTestModule.cs                    | 11 +----------
 5 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs b/abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
index c8c021e728..dddcde3a32 100644
--- a/abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
+++ b/abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
@@ -158,18 +158,8 @@ namespace Volo.AbpWebSite
             app.UseVirtualFiles();
 
             app.UseAuthentication();
-            
-            //TODO: Create an extension method!
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "defaultWithArea",
-                    template: "{area}/{controller=Home}/{action=Index}/{id?}");
 
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRouteAndArea();
 
             AsyncHelper.RunSync(async () =>
             {
diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs
index b2860d0edc..03ac94574e 100644
--- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs
+++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs
@@ -162,6 +162,7 @@ namespace Acme.BookStore
                 options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API");
             });
 
+            //TODO: use app.UseMvcWithDefaultRouteAndArea(); after v1.3.0 release
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
diff --git a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs
index 3f7284fc4c..acf26ed383 100644
--- a/templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs
+++ b/templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs
@@ -110,16 +110,8 @@ namespace MyCompanyName.MyProjectName.DemoApp
             app.UseAbpRequestLocalization();
             app.UseAuditing();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "defaultWithArea",
-                    template: "{area}/{controller=Home}/{action=Index}/{id?}");
 
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRouteAndArea();
 
             AsyncHelper.RunSync(async () =>
             {
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
index 87b306e63d..6d8d976be1 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -182,16 +182,7 @@ namespace MyCompanyName.MyProjectName
 
             app.UseAuditing();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "defaultWithArea",
-                    template: "{area}/{controller=Home}/{action=Index}/{id?}");
-
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRouteAndArea();
 
             SeedDatabase(context);
         }
diff --git a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs
index 252a65b65f..eb3e0b827e 100644
--- a/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs
+++ b/templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs
@@ -87,16 +87,7 @@ namespace MyCompanyName.MyProjectName
 
             app.UseRequestLocalization(app.ApplicationServices.GetRequiredService<IOptions<RequestLocalizationOptions>>().Value);
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "defaultWithArea",
-                    template: "{area}/{controller=Home}/{action=Index}/{id?}");
-
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRouteAndArea();
         }
     }
 }
\ No newline at end of file