From e1ef010e07c91855d13eb78ebfa03327a6a3791c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 9 Mar 2021 20:33:08 +0300
Subject: [PATCH] Created bundles for the basic theme.

---
 ...NetCoreComponentsServerBasicThemeModule.cs | 24 +++++++++++++++++++
 .../Bundling/BlazorBasicThemeBundles.cs       | 15 ++++++++++++
 .../BlazorBasicThemeScriptContributor.cs      |  9 +++++++
 .../BlazorBasicThemeStyleContributor.cs       | 13 ++++++++++
 .../Pages/_Host.cshtml                        |  6 ++---
 5 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeBundles.cs
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeScriptContributor.cs
 create mode 100644 framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeStyleContributor.cs

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/AbpAspNetCoreComponentsServerBasicThemeModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/AbpAspNetCoreComponentsServerBasicThemeModule.cs
index 6cbda610d6..5d5da96d44 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/AbpAspNetCoreComponentsServerBasicThemeModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/AbpAspNetCoreComponentsServerBasicThemeModule.cs
@@ -1,6 +1,9 @@
 using Volo.Abp.AspNetCore.Components.Server.Theming;
+using Volo.Abp.AspNetCore.Components.Server.Theming.Bundling;
+using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Toolbars;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server
@@ -22,6 +25,27 @@ namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server
             {
                 options.Contributors.Add(new BasicThemeToolbarContributor());
             });
+            
+            Configure<AbpBundlingOptions>(options =>
+            {
+                options
+                    .StyleBundles
+                    .Add(BlazorBasicThemeBundles.Styles.Global, bundle =>
+                    {
+                        bundle
+                            .AddBaseBundles(BlazorStandardBundles.Styles.Global)
+                            .AddContributors(typeof(BlazorBasicThemeStyleContributor));
+                    });
+
+                options
+                    .ScriptBundles
+                    .Add(BlazorBasicThemeBundles.Scripts.Global, bundle =>
+                    {
+                        bundle
+                            .AddBaseBundles(BlazorStandardBundles.Scripts.Global)
+                            .AddContributors(typeof(BlazorBasicThemeScriptContributor));
+                    });
+            });
         }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeBundles.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeBundles.cs
new file mode 100644
index 0000000000..30fecd2b8d
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeBundles.cs
@@ -0,0 +1,15 @@
+namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling
+{
+    public class BlazorBasicThemeBundles
+    {
+        public static class Styles
+        {
+            public static string Global = "Blazor.BasicTheme.Global";
+        }
+
+        public static class Scripts
+        {
+            public static string Global = "Blazor.BasicTheme.Global";
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeScriptContributor.cs
new file mode 100644
index 0000000000..b190c85bd9
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeScriptContributor.cs
@@ -0,0 +1,9 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling
+{
+    public class BlazorBasicThemeScriptContributor : BundleContributor
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeStyleContributor.cs
new file mode 100644
index 0000000000..add9373621
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Bundling/BlazorBasicThemeStyleContributor.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling
+{
+    public class BlazorBasicThemeStyleContributor : BundleContributor
+    {
+        public override void ConfigureBundle(BundleConfigurationContext context)
+        {
+            context.Files.AddIfNotContains("/_content/Volo.Abp.AspNetCore.Components.Web.BasicTheme/libs/abp/css/theme.css");
+        }
+    }
+}
\ No newline at end of file
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
index 05c58741dc..0445f93219 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml
@@ -1,7 +1,7 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
 @using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
-@using Volo.Abp.AspNetCore.Components.Server.Theming.Bundling
+@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Server.Bundling
 @{
     Layout = null;
 }
@@ -14,11 +14,11 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
     
-    <abp-style-bundle name="@BlazorStandardBundles.Styles.Global" />
+    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
 </head>
 <body>
     <component type="typeof(App)" render-mode="Server" />
 
-    <abp-script-bundle name="@BlazorStandardBundles.Scripts.Global" />
+    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
 </body>
 </html>