From 7d1a705df0799eb20bffe8009c925377c38cc673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 13 Sep 2020 11:52:13 +0300
Subject: [PATCH] Introduce AbpBlazorRouterOptions and move App.razor to the
 Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme

---
 ...pAspNetCoreComponentsWebAssemblyBasicTheme.cs |  9 ++++++++-
 .../Themes/Basic}/App.razor                      | 10 +++++-----
 .../Routing/AbpBlazorRouterOptions.cs            | 16 ++++++++++++++++
 .../Routing/RouterAssemblyList.cs                | 10 ++++++++++
 .../AbpIdentityBlazorModule.cs                   |  6 ++++++
 .../MyProjectNameBlazorModule.cs                 | 11 +++++++++++
 6 files changed, 56 insertions(+), 6 deletions(-)
 rename {templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor => framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic}/App.razor (68%)
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
index 34511b291f..74c81ed72c 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/AbpAspNetCoreComponentsWebAssemblyBasicTheme.cs
@@ -1,4 +1,5 @@
 using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
@@ -8,6 +9,12 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
         )]
     public class AbpAspNetCoreComponentsWebAssemblyBasicThemeModule : AbpModule
     {
-
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AdditionalAssemblies.Add(typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule).Assembly);
+            });
+        }
     }
 }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/App.razor
similarity index 68%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/App.razor
index 2ec255119b..b6bba50bab 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/App.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/App.razor
@@ -1,9 +1,9 @@
-@using Volo.Abp.Identity.Blazor
-@using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
-@using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+@using Microsoft.Extensions.Options
+@inject IOptions<AbpRouterOptions> RouterOptions
 <CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(Program).Assembly"
-            AdditionalAssemblies="new []{ typeof(AbpIdentityBlazorModule).Assembly, typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule).Assembly }">
+    <Router AppAssembly="RouterOptions.Value.AppAssembly"
+            AdditionalAssemblies="RouterOptions.Value.AdditionalAssemblies">
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <NotAuthorized>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs
new file mode 100644
index 0000000000..107fc9b078
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/AbpBlazorRouterOptions.cs
@@ -0,0 +1,16 @@
+using System.Reflection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+{
+    public class AbpRouterOptions
+    {
+        public Assembly AppAssembly { get; set; }
+
+        public RouterAssemblyList AdditionalAssemblies { get; }
+
+        public AbpRouterOptions()
+        {
+            AdditionalAssemblies = new RouterAssemblyList();
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs
new file mode 100644
index 0000000000..e7a4a49343
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Routing/RouterAssemblyList.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing
+{
+    public class RouterAssemblyList : List<Assembly>
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
index fcf7d69b0e..cebde068c3 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.Blazor;
@@ -26,6 +27,11 @@ namespace Volo.Abp.Identity.Blazor
             {
                 options.MenuContributors.Add(new AbpIdentityWebMainMenuContributor());
             });
+
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AdditionalAssemblies.Add(typeof(AbpIdentityBlazorModule).Assembly);
+            });
         }
     }
 }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
index 4edf499972..411ec4208e 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
@@ -9,6 +9,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
 using Volo.Abp.Autofac;
 using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
+using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic;
+using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.Identity.Blazor;
@@ -31,10 +33,19 @@ namespace MyCompanyName.MyProjectName.Blazor
             ConfigureAuthentication(builder);
             ConfigureHttpClient(context, environment);
             ConfigureBlazorise(context);
+            ConfigureRouter(context);
             ConfigureUI(builder);
             ConfigureMenu(context);
         }
 
+        private void ConfigureRouter(ServiceConfigurationContext context)
+        {
+            Configure<AbpRouterOptions>(options =>
+            {
+                options.AppAssembly = typeof(MyProjectNameBlazorModule).Assembly;
+            });
+        }
+
         private void ConfigureMenu(ServiceConfigurationContext context)
         {
             Configure<AbpNavigationOptions>(options =>