From 0a125d77e10b6305ef5dd2aeca20228d778a2930 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic <mladen.macanovic@gmail.com>
Date: Wed, 7 Oct 2020 12:55:50 +0200
Subject: [PATCH] Move use of UiMessageAlert to BasicTheme MainLayout

---
 .../Themes/Basic/MainLayout.razor                           | 6 ++++--
 .../Themes/Basic/_Imports.razor                             | 2 ++
 .../Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor    | 2 +-
 .../MyCompanyName.MyProjectName.Blazor/Pages/Index.razor    | 3 ---
 .../MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
index 8e64b32022..6954057142 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/MainLayout.razor
@@ -11,12 +11,14 @@
         </button>
         <div class="collapse navbar-collapse" id="main-navbar-collapse">
             <ul class="navbar-nav mx-auto">
-                <NavMenu/>
+                <NavMenu />
             </ul>
-            <NavToolbar/>
+            <NavToolbar />
         </div>
     </div>
 </nav>
 <div class="container">
     @Body
+
+    <UiMessageAlert />
 </div>
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
index f1ebc76453..7d695e9344 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/_Imports.razor
@@ -8,3 +8,5 @@
 @using Volo.Abp.AspNetCore.Components.WebAssembly
 @using Blazorise
 @using Blazorise.DataGrid
+@using Volo.Abp.BlazoriseUI;
+@using Volo.Abp.BlazoriseUI.Components;
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
index 0bba328a51..6caf37c0b9 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
@@ -9,7 +9,7 @@
         <ModalBody>
             @if ( ShowMessageIcon )
             {
-                <DisplayHeading Size="DisplayHeadingSize.Is2">
+                <DisplayHeading Size="DisplayHeadingSize.Is2" Style="text-align:center;">
                     <Icon Name="@MessageIcon" Style="@MessageIconStyle" />
                 </DisplayHeading>
             }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
index 5a0d3dd08b..0f0d1935df 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
@@ -3,7 +3,6 @@
 @using Volo.Abp.MultiTenancy
 @using Microsoft.Extensions.Localization
 @using MyCompanyName.MyProjectName.Localization
-@using Volo.Abp.BlazoriseUI.Components
 @inject ICurrentUser CurrentUser
 @inject ICurrentTenant CurrentTenant
 @inject AuthenticationStateProvider AuthenticationStateProvider
@@ -37,8 +36,6 @@
             </CardBody>
         </Card>
 
-        <UiMessageAlert />
-
         <h1>Welcome to the Application</h1>
 
         <p class="lead px-lg-5 mx-lg-5">@L["LongWelcomeMessage"]</p>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs
index 730da74983..7ac6682659 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Blazorise;