Fix references and remove error UI

6 years ago · 3e1e0a76a3
11 changed files with 12 additions and 37 deletions
--- a/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs
+++ b/modules/account/src/Volo.Abp.Account.Blazor/AbpAccountBlazorModule.cs
@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming;
-using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.UI.Theming;
+using Volo.Abp.AspNetCore.Components.UI.Theming.Routing;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
@ -8,9 +8,9 @@ using Volo.Abp.UI.Navigation;
 namespace Volo.Abp.Account.Blazor
 {
    [DependsOn(
-        typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule),
+        typeof(AbpAspNetCoreComponentsUiThemingModule),
        typeof(AbpAutoMapperModule),
-        typeof(AbpAccountHttpApiClientModule)
+        typeof(AbpAccountApplicationContractsModule)
        )]
    public class AbpAccountBlazorModule : AbpModule
    {
--- a/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj
+++ b/modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj
@ -9,12 +9,12 @@
  </PropertyGroup>

  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.WebAssembly.Theming\Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj" />
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Components.UI.Theming\Volo.Abp.AspNetCore.Components.UI.Theming.csproj" />
    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.Account.HttpApi.Client\Volo.Abp.Account.HttpApi.Client.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Account.Application.Contracts\Volo.Abp.Account.Application.Contracts.csproj" />
  </ItemGroup>

 </Project>
--- a/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor
+++ b/modules/account/src/Volo.Abp.Account.Blazor/_Imports.razor
@ -1,5 +1,4 @@
@using Microsoft.AspNetCore.Components.Web
-@using Volo.Abp.AspNetCore.Components.WebAssembly
@using Volo.Abp.BlazoriseUI
@using Volo.Abp.BlazoriseUI.Components
@using Blazorise
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementBlazorModule.cs
@ -7,7 +7,7 @@ namespace Volo.Abp.FeatureManagement.Blazor
    [DependsOn(
        typeof(AbpAspNetCoreComponentsUiThemingModule),
        typeof(AbpAutoMapperModule),
-        typeof(AbpFeatureManagementHttpApiClientModule)
+        typeof(AbpFeatureManagementApplicationContractsModule)
    )]
    public class AbpFeatureManagementBlazorModule : AbpModule
    {
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Volo.Abp.FeatureManagement.Blazor.csproj
@ -13,7 +13,7 @@
    </ItemGroup>

    <ItemGroup>
-        <ProjectReference Include="..\Volo.Abp.FeatureManagement.HttpApi.Client\Volo.Abp.FeatureManagement.HttpApi.Client.csproj" />
+        <ProjectReference Include="..\Volo.Abp.FeatureManagement.Application.Contracts\Volo.Abp.FeatureManagement.Application.Contracts.csproj" />
    </ItemGroup>

    <ItemGroup>
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/AbpPermissionManagementBlazorModule.cs
@ -7,7 +7,7 @@ namespace Volo.Abp.PermissionManagement.Blazor
    [DependsOn(
        typeof(AbpAspNetCoreComponentsUiThemingModule),
        typeof(AbpAutoMapperModule),
-        typeof(AbpPermissionManagementHttpApiClientModule)
+        typeof(AbpPermissionManagementApplicationContractsModule)
        )]
    public class AbpPermissionManagementBlazorModule : AbpModule
    {
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Volo.Abp.PermissionManagement.Blazor.csproj
@ -13,7 +13,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.PermissionManagement.HttpApi.Client\Volo.Abp.PermissionManagement.HttpApi.Client.csproj" />
+    <ProjectReference Include="..\Volo.Abp.PermissionManagement.Application.Contracts\Volo.Abp.PermissionManagement.Application.Contracts.csproj" />
  </ItemGroup>

 </Project>
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/AbpTenantManagementBlazorModule.cs
@ -10,7 +10,7 @@ namespace Volo.Abp.TenantManagement.Blazor
 {
    [DependsOn(
        typeof(AbpAutoMapperModule),
-        typeof(AbpTenantManagementHttpApiClientModule),
+        typeof(AbpTenantManagementApplicationContractsModule),
        typeof(AbpFeatureManagementBlazorModule)
    )]
    public class AbpTenantManagementBlazorModule : AbpModule
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Volo.Abp.TenantManagement.Blazor.csproj
@ -16,7 +16,7 @@
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\Volo.Abp.TenantManagement.HttpApi.Client\Volo.Abp.TenantManagement.HttpApi.Client.csproj" />
+    <ProjectReference Include="..\Volo.Abp.TenantManagement.Application.Contracts\Volo.Abp.TenantManagement.Application.Contracts.csproj" />
  </ItemGroup>

 </Project>
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs
@ -3,7 +3,6 @@ using System.IO;
 using System.Net.Http;
 using Blazorise.Bootstrap;
 using Blazorise.Icons.FontAwesome;
-using IdentityModel;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@ -120,18 +119,6 @@ namespace MyCompanyName.MyProjectName.Blazor.Server

        private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration)
        {
-            // context.Services.AddOidcAuthentication(options =>
-            // {
-            //     configuration.Bind("AuthServer", options.ProviderOptions);
-            //     options.UserOptions.RoleClaim = JwtClaimTypes.Role;
-            //     options.ProviderOptions.DefaultScopes.Add("MyProjectName");
-            //     options.ProviderOptions.DefaultScopes.Add("role");
-            //     options.ProviderOptions.DefaultScopes.Add("email");
-            //     options.ProviderOptions.DefaultScopes.Add("phone");
-            // });
-
-            
-            
            context.Services.AddAuthentication()
                .AddJwtBearer(options =>
                {
--- 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
@ -34,17 +34,6 @@
    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>

-    <div id="blazor-error-ui">
-        <environment include="Staging,Production">
-            An error has occurred. This application may no longer respond until reloaded.
-        </environment>
-        <environment include="Development">
-            An unhandled exception has occurred. See browser dev tools for details.
-        </environment>
-        <a href="" class="reload">Reload</a>
-        <a class="dismiss">🗙</a>
-    </div>
-
    <script src="_content/Blazorise/blazorise.js"></script>
    <script src="_content/Blazorise.Bootstrap/blazorise.bootstrap.js"></script>