Rearrange bundle files for bazor UI.

framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Bundling/BlazorGlobalScriptContributor.cs

@@ -10,6 +10,7 @@ namespace Volo.Abp.AspNetCore.Components.Server.Theming.Bundling
             context.Files.AddIfNotContains("/_framework/blazor.server.js");
             context.Files.AddIfNotContains("/_content/Blazorise/blazorise.js");
             context.Files.AddIfNotContains("/_content/Blazorise.Bootstrap/blazorise.bootstrap.js");
+            context.Files.AddIfNotContains("/_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
         }
     }
 }

framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/AbpAspNetCoreComponentsServerModule.cs

@@ -9,6 +9,11 @@ namespace Volo.Abp.AspNetCore.Components.Server
         )]
     public class AbpAspNetCoreComponentsServerModule : AbpModule
     {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            context.Services.AddServerSideBlazor();
+        }
+
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             context.GetEnvironment().WebRootFileProvider =

framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/ThemingBundleContributor.cs

@@ -1,25 +0,0 @@
-using Volo.Abp.Bundling;
-
-namespace Volo.Abp.AspNetCore.Components.Web.Theming
-{
-    public class ThemingBundleContributor : IBundleContributor
-    {
-        public void AddScripts(BundleContext context)
-        {
-
-        }
-
-        public void AddStyles(BundleContext context)
-        {
-            context.BundleDefinitions.Insert(0, new BundleDefinition
-            {
-                Source = "_content/Volo.Abp.AspNetCore.Components.Web.Theming/libs/bootstrap/css/bootstrap.min.css"
-            });
-            context.BundleDefinitions.Insert(1, new BundleDefinition
-            {
-                Source = "_content/Volo.Abp.AspNetCore.Components.Web.Theming/libs/fontawesome/css/all.css"
-            });
-            context.Add("_content/Volo.Abp.AspNetCore.Components.Web.Theming/libs/flag-icon/css/flag-icon.css");
-        }
-    }
-}

framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/ComponentsWebAssemblyBundleContributor.cs

@@ -1,17 +0,0 @@
-using Volo.Abp.Bundling;
-
-namespace Volo.Abp.AspNetCore.Components.Web
-{
-    public class ComponentsComponentsBundleContributor : IBundleContributor
-    {
-        public void AddScripts(BundleContext context)
-        {
-            context.Add("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
-        }
-
-        public void AddStyles(BundleContext context)
-        {
-
-        }
-    }
-}

framework/src/Volo.Abp.AspNetCore.Components.Web.BasicTheme/BasicThemeBundleContributor.cs → framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeBundleContributor.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.Bundling;
 
-namespace Volo.Abp.AspNetCore.Components.Web.BasicTheme
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme
 {
     public class BasicThemeBundleContributor : IBundleContributor
     {

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ComponentsWebAssemblyBundleContributor.cs

@@ -0,0 +1,32 @@
+using Volo.Abp.Bundling;
+
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming
+{
+    public class ComponentsComponentsBundleContributor : IBundleContributor
+    {
+        public void AddScripts(BundleContext context)
+        {
+            context.Add("_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js");
+            context.Add("_content/Blazorise/blazorise.js");
+            context.Add("_content/Blazorise.Bootstrap/blazorise.bootstrap.js");
+            context.Add("_content/Volo.Abp.AspNetCore.Components.Web/libs/abp/js/abp.js");
+        }
+
+        public void AddStyles(BundleContext context)
+        {
+            context.BundleDefinitions.Insert(0, new BundleDefinition
+            {
+                Source = "_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/bootstrap/css/bootstrap.min.css"
+            });
+            context.BundleDefinitions.Insert(1, new BundleDefinition
+            {
+                Source = "_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/fontawesome/css/all.css"
+            });
+            
+            context.Add("_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/flag-icon/css/flag-icon.css");
+            context.Add("_content/Blazorise/blazorise.css");
+            context.Add("_content/Blazorise.Bootstrap/blazorise.bootstrap.css");
+            context.Add("_content/Blazorise.Snackbar/blazorise.snackbar.css");
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-    <Import Project="..\..\..\configureawait.props" />
+    <Import Project="..\..\..\configureawait.props"/>
-    <Import Project="..\..\..\common.props" />
+    <Import Project="..\..\..\common.props"/>
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj" />
+        <ProjectReference Include="..\Volo.Abp.AspNetCore.Components.Web.Theming\Volo.Abp.AspNetCore.Components.Web.Theming.csproj"/>
     </ItemGroup>
 
 </Project>