refactor: fix error layout

CodeBlock-Dev · Nov 17, 2024 · bc2aeea · bc2aeea
1 parent ef47f7b
commit bc2aeea
Show file tree

Hide file tree

Showing 18 changed files with 121 additions and 100 deletions.
diff --git a/src/1-Libraries/Web.Blazor.Server/Components/Error.razor b/src/1-Libraries/Web.Blazor.Server/Components/Error.razor
@@ -1,29 +1,22 @@
 
-
-<div class="@(WrapperClass)">
-
-    <div class="card bg-form shadow mb-5 min-height-20rem width-xs-90 width-sm-40 width-md-40">
-        <div class="card-header text-center text-@Type h2 p-3">@Title</div>
-        <div class="card-body p-3 text-center text-white-50">
-            <p>
-                @Message
-            </p>
-            <i class="bi bi-exclamation-triangle-fill opacity-30" style="font-size:8rem;"></i>
-        </div>
-        @if (ShowIndexLink)
-        {
-            <div class="card-footer">
-                <a href="/" class="btn btn-warning d-block">@Localizer[BlazorResource.Error_Page_Home_Btn]</a>
-            </div>
-        }
+<div class="card bg-form shadow mb-5 min-height-20rem width-xs-90 width-sm-40 width-md-40">
+    <div class="card-header text-center text-@Type h2 p-3">@Title</div>
+    <div class="card-body p-3 text-center text-white-50">
+        <p>
+            @Message
+        </p>
+        <i class="bi bi-exclamation-triangle-fill opacity-30" style="font-size:8rem;"></i>
     </div>
-
+    @if (ShowIndexLink)
+    {
+        <div class="card-footer">
+            <a href="/" class="btn btn-warning d-block">@Localizer[BlazorResource.Error_Page_Home_Btn]</a>
+        </div>
+    }
 </div>
 
 
 @code {
-    [Parameter]
-    public string WrapperClass { get; set; } = "d-flex flex-column min-height-90 justify-content-center align-items-center";
 
     [Parameter]
     public string Type { get; set; } = "warning";

diff --git a/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.Designer.cs b/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.Designer.cs
diff --git a/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.fa.resx b/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.fa.resx
@@ -156,4 +156,16 @@
   <data name="Connection_State_Reload_Btn" xml:space="preserve">
     <value>رفرش کردن صفحه</value>
   </data>
+  <data name="Error_NotFound_Title" xml:space="preserve">
+    <value>صفحه ی مورد نظر پیدا نشد!</value>
+  </data>
+  <data name="Error_Authorization_Message" xml:space="preserve">
+    <value>شما به تازگی به سیستم وارد شدی، کمی زمان نیاز داریم که این موضوع رو بررسی کنیم</value>
+  </data>
+  <data name="Error_Authorization_Title" xml:space="preserve">
+    <value>در حال احراز هویت ...</value>
+  </data>
+  <data name="Error_NotFound_Message" xml:space="preserve">
+    <value>متاسفیم! صفحه ای که دنبالش بودی پیدا نشد.</value>
+  </data>
 </root>
diff --git a/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.resx b/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.resx
@@ -156,4 +156,16 @@
   <data name="Connection_State_Reload_Btn" xml:space="preserve">
     <value>Reload</value>
   </data>
+  <data name="Error_NotFound_Title" xml:space="preserve">
+    <value>Page not found!</value>
+  </data>
+  <data name="Error_Authorization_Message" xml:space="preserve">
+    <value>We are authorizing, please wait.</value>
+  </data>
+  <data name="Error_Authorization_Title" xml:space="preserve">
+    <value>Authorizing ...</value>
+  </data>
+  <data name="Error_NotFound_Message" xml:space="preserve">
+    <value>Sorry! It seems the page that you are looking for, does not exist.</value>
+  </data>
 </root>
diff --git a/src/1-Libraries/Web.Blazor.Server/Web.Blazor.Server.csproj b/src/1-Libraries/Web.Blazor.Server/Web.Blazor.Server.csproj
@@ -7,7 +7,7 @@
 		<AssemblyName>CodeBlock.DevKit.Web.Blazor.Server</AssemblyName>
 		<RootNamespace>CodeBlock.DevKit.Web.Blazor.Server</RootNamespace>
 		<Description>CodeBlock Development Kit</Description>
-		<VersionPrefix>1.1.3</VersionPrefix>
+		<VersionPrefix>1.1.5</VersionPrefix>
 		<Authors>Hamed Shirbandi</Authors>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageId>CodeBlock.DevKit.Web.Blazor.Server</PackageId>

diff --git a/src/4-Examples/BlazorServerApp/App.razor b/src/4-Examples/BlazorServerApp/App.razor
@@ -3,16 +3,20 @@
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
                 <Authorizing>
-                    <Error ShowIndexLink=false Title="@Localizer[BlazorServerAppResource.Error_Authorization_Title]" Message="@Localizer[BlazorServerAppResource.Error_Authorization_Message]" />
+                    <LayoutView Layout="@typeof(SimpleLayout)">
+                        <Error ShowIndexLink=false Title="@AppLocalizer[BlazorResource.Error_Authorization_Title]" Message="@AppLocalizer[BlazorResource.Error_Authorization_Message]" />
+                    </LayoutView>
                 </Authorizing>
                 <NotAuthorized>
-                    <RedirectToLogin />
+                    <LayoutView Layout="@typeof(SimpleLayout)">
+                        <RedirectToLogin />
+                    </LayoutView>
                 </NotAuthorized>
             </AuthorizeRouteView>
         </Found>
         <NotFound>
-            <LayoutView Layout="@typeof(MainLayout)">
-                <Error Title="@Localizer[BlazorServerAppResource.Error_NotFound_Title]" Message="@Localizer[BlazorServerAppResource.Error_NotFound_Message]" />
+            <LayoutView Layout="@typeof(SimpleLayout)">
+                <Error Title="@BlazorLocalizer[BlazorResource.Error_NotFound_Title]" Message="@AppLocalizer[BlazorResource.Error_NotFound_Message]" />
             </LayoutView>
         </NotFound>
     </Router>

diff --git a/src/4-Examples/BlazorServerApp/Pages/Home/Index.razor b/src/4-Examples/BlazorServerApp/Pages/Home/Index.razor
@@ -1,5 +1,5 @@
 @page "/"
 
-<h1>@Localizer[BlazorServerAppResource.Home_Page_Welcome]</h1>
+<h1>@AppLocalizer[BlazorServerAppResource.Home_Page_Welcome]</h1>
 
 
diff --git a/src/4-Examples/BlazorServerApp/Pages/Home/Roles.razor b/src/4-Examples/BlazorServerApp/Pages/Home/Roles.razor
@@ -1,9 +1,9 @@
 @page "/roles"
 @using CodeBlock.DevKit.Authorization.UI.Pages.Roles
 
-<PageTitle>@Localizer[BlazorServerAppResource.Nav_Menu_Roles]</PageTitle>
+<PageTitle>@AppLocalizer[BlazorServerAppResource.Nav_Menu_Roles]</PageTitle>
 
-<h1>@Localizer[BlazorServerAppResource.Nav_Menu_Roles]</h1>
+<h1>@AppLocalizer[BlazorServerAppResource.Nav_Menu_Roles]</h1>
 
 
 <RolesList />

diff --git a/src/4-Examples/BlazorServerApp/Pages/Home/Users.razor b/src/4-Examples/BlazorServerApp/Pages/Home/Users.razor
@@ -1,9 +1,9 @@
 @page "/users"
 @using CodeBlock.DevKit.Authorization.UI.Pages.Users
 
-<PageTitle>@Localizer[BlazorServerAppResource.Nav_Menu_Users]</PageTitle>
+<PageTitle>@AppLocalizer[BlazorServerAppResource.Nav_Menu_Users]</PageTitle>
 
-<h1>@Localizer[BlazorServerAppResource.Nav_Menu_Users]</h1>
+<h1>@AppLocalizer[BlazorServerAppResource.Nav_Menu_Users]</h1>
 
 <UsersList />
 

diff --git a/src/4-Examples/BlazorServerApp/Pages/Shared/MainLayout.razor b/src/4-Examples/BlazorServerApp/Pages/Shared/MainLayout.razor
@@ -20,8 +20,6 @@
         <div class="top-row px-4">
 
             <SelectLanguage />
-
-
             <NavLink class="nav-link" href="logout">
                 <span class="bi bi-power" aria-hidden="true"></span>
             </NavLink>

diff --git a/src/4-Examples/BlazorServerApp/Pages/Shared/NavMenu.razor b/src/4-Examples/BlazorServerApp/Pages/Shared/NavMenu.razor
@@ -1,6 +1,6 @@
 <div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
-        <a class="navbar-brand" href="">@Localizer[BlazorServerAppResource.App_Name]</a>
+        <a class="navbar-brand" href="">@AppLocalizer[BlazorServerAppResource.App_Name]</a>
         <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
             <span class="navbar-toggler-icon"></span>
         </button>
@@ -11,25 +11,25 @@
     <nav class="flex-column">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="bi bi-house-fill p-1" aria-hidden="true"></span> @Localizer[BlazorServerAppResource.Nav_Menu_Home]
+                <span class="bi bi-house-fill p-1" aria-hidden="true"></span> @AppLocalizer[BlazorServerAppResource.Nav_Menu_Home]
             </NavLink>
         </div>
 
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="/users">
-                <span class="bi bi-people-fill p-1" aria-hidden="true"></span> @Localizer[BlazorServerAppResource.Nav_Menu_Users]
+                <span class="bi bi-people-fill p-1" aria-hidden="true"></span> @AppLocalizer[BlazorServerAppResource.Nav_Menu_Users]
             </NavLink>
         </div>
 
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="/roles">
-                <span class="bi bi-command p-1" aria-hidden="true"></span> @Localizer[BlazorServerAppResource.Nav_Menu_Roles]
+                <span class="bi bi-command p-1" aria-hidden="true"></span> @AppLocalizer[BlazorServerAppResource.Nav_Menu_Roles]
             </NavLink>
         </div>
 
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="/logout">
-                <span class="bi bi-power p-1" aria-hidden="true"></span> @Localizer[BlazorServerAppResource.Nav_Menu_Logout]
+                <span class="bi bi-power p-1" aria-hidden="true"></span> @AppLocalizer[BlazorServerAppResource.Nav_Menu_Logout]
             </NavLink>
         </div> 
     </nav> 

diff --git a/src/4-Examples/BlazorServerApp/Pages/Shared/SimpleLayout.razor b/src/4-Examples/BlazorServerApp/Pages/Shared/SimpleLayout.razor
@@ -0,0 +1,16 @@
+@using Blazored.Toast
+@using Blazored.Toast.Configuration
+@inherits LayoutComponentBase
+
+<div class="bg-primary">
+    <div class="fixed-top background-none p-0 h1">
+        <div class="card-body">
+            <SelectLanguage BtnClass="btn btn-outline-primary text-white" />
+        </div>
+    </div>
+
+
+    <div class="d-flex flex-column min-height-100 justify-content-center align-items-center">
+        @Body
+    </div>
+</div>
diff --git a/src/4-Examples/BlazorServerApp/Pages/Shared/_Layout.cshtml b/src/4-Examples/BlazorServerApp/Pages/Shared/_Layout.cshtml
@@ -16,9 +16,14 @@
 </head>
 <body class="bg-primary" style="font-family: @LocalizationSettings.GetCurrentLanguageFont() !important">
 
-    <partial name="_SelectLanguage" model="@("btn btn-danger")" />
+    <div class="fixed-top background-none p-0 h1">
+        <div class="card-body">
+            <partial name="_SelectLanguage" model="@("btn btn-outline-primary text-white")" />
+        </div>
+    </div>
+
 
-    <div class="d-flex flex-column min-height-90 justify-content-center align-items-center">
+    <div class="d-flex flex-column min-height-100 justify-content-center align-items-center">
         @RenderBody()
     </div>
 

diff --git a/src/4-Examples/BlazorServerApp/Pages/_Host.cshtml b/src/4-Examples/BlazorServerApp/Pages/_Host.cshtml
@@ -5,6 +5,9 @@
 @using CodeBlock.DevKit.Web.Localization
 @using Microsoft.AspNetCore.Components.Web
 @inject LocalizationSettings LocalizationSettings
+@{
+    Layout = null;
+}
 
 <!DOCTYPE html>
 <html dir="@LocalizationSettings.GetCurrentLanguageDirection()" lang="@LocalizationSettings.GetCurrentLanguageCode()" style="font-family: @LocalizationSettings.GetCurrentLanguageFont() !important">

diff --git a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.Designer.cs b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.Designer.cs
diff --git a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.fa.resx b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.fa.resx
@@ -117,18 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Error_Authorization_Title" xml:space="preserve">
-    <value>در حال احراز هویت ...</value>
-  </data>
-  <data name="Error_Authorization_Message" xml:space="preserve">
-    <value>شما به تازگی به سیستم وارد شدی، کمی زمان نیاز داریم که این موضوع رو بررسی کنیم</value>
-  </data>
-  <data name="Error_NotFound_Message" xml:space="preserve">
-    <value>متاسفیم! صفحه ای که دنبالش بودی پیدا نشد.</value>
-  </data>
-  <data name="Error_NotFound_Title" xml:space="preserve">
-    <value>صفحه ی مورد نظر پیدا نشد!</value>
-  </data>
   <data name="Nav_Menu_Users" xml:space="preserve">
     <value>کاربرها</value>
   </data>

diff --git a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.resx b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.resx
@@ -117,18 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Error_Authorization_Title" xml:space="preserve">
-    <value>Authorizing ...</value>
-  </data>
-  <data name="Error_Authorization_Message" xml:space="preserve">
-    <value>We are authorizing, please wait.</value>
-  </data>
-  <data name="Error_NotFound_Message" xml:space="preserve">
-    <value>Sorry! It seems the page that you are looking for, does not exist.</value>
-  </data>
-  <data name="Error_NotFound_Title" xml:space="preserve">
-    <value>Page not found!</value>
-  </data>
   <data name="Nav_Menu_Users" xml:space="preserve">
     <value>Users</value>
   </data>

diff --git a/src/4-Examples/BlazorServerApp/_Imports.razor b/src/4-Examples/BlazorServerApp/_Imports.razor
@@ -15,6 +15,7 @@
 @using CodeBlock.DevKit.Core.Extensions
 @using CodeBlock.DevKit.Web.Blazor.Server.Extensions
 @using CodeBlock.DevKit.Web.Blazor.Server.Components
+@using CodeBlock.DevKit.Web.Blazor.Server.Resources
 @using Microsoft.Extensions.Localization
 @using BlazorServerApp.Resources
 
@@ -24,4 +25,5 @@
 @inject IModalService ModalService
 @inject IBus Bus
 
-@inject IStringLocalizer<BlazorServerAppResource> Localizer
+@inject IStringLocalizer<BlazorServerAppResource> AppLocalizer
+@inject IStringLocalizer<BlazorResource> BlazorLocalizer