diff --git a/src/1-Libraries/Web.Blazor.Server/Components/Error.razor b/src/1-Libraries/Web.Blazor.Server/Components/Error.razor index 9ba1bc4..a386ab2 100644 --- a/src/1-Libraries/Web.Blazor.Server/Components/Error.razor +++ b/src/1-Libraries/Web.Blazor.Server/Components/Error.razor @@ -1,29 +1,22 @@  - -
- -
-
@Title
-
-

- @Message -

- -
- @if (ShowIndexLink) - { -
- @Localizer[BlazorResource.Error_Page_Home_Btn] -
- } +
+
@Title
+
+

+ @Message +

+
- + @if (ShowIndexLink) + { +
+ @Localizer[BlazorResource.Error_Page_Home_Btn] +
+ }
@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 index 784ac4b..904b2e9 100644 --- a/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.Designer.cs +++ b/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.Designer.cs @@ -150,6 +150,42 @@ public static string Connection_State_Retry_Btn { } } + /// + /// Looks up a localized string similar to We are authorizing, please wait.. + /// + public static string Error_Authorization_Message { + get { + return ResourceManager.GetString("Error_Authorization_Message", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Authorizing .... + /// + public static string Error_Authorization_Title { + get { + return ResourceManager.GetString("Error_Authorization_Title", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sorry! It seems the page that you are looking for, does not exist.. + /// + public static string Error_NotFound_Message { + get { + return ResourceManager.GetString("Error_NotFound_Message", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Page not found!. + /// + public static string Error_NotFound_Title { + get { + return ResourceManager.GetString("Error_NotFound_Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to We are sorry! We were unable to process your request at this time. Our technical team was informed about this issue and it will be investigated soon. Thank you for your patience.. /// diff --git a/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.fa.resx b/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.fa.resx index 22a3d1c..109a2f9 100644 --- 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 @@ رفرش کردن صفحه + + صفحه ی مورد نظر پیدا نشد! + + + شما به تازگی به سیستم وارد شدی، کمی زمان نیاز داریم که این موضوع رو بررسی کنیم + + + در حال احراز هویت ... + + + متاسفیم! صفحه ای که دنبالش بودی پیدا نشد. + \ No newline at end of file diff --git a/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.resx b/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.resx index 940757c..28026db 100644 --- a/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.resx +++ b/src/1-Libraries/Web.Blazor.Server/Resources/BlazorResource.resx @@ -156,4 +156,16 @@ Reload + + Page not found! + + + We are authorizing, please wait. + + + Authorizing ... + + + Sorry! It seems the page that you are looking for, does not exist. + \ No newline at end of file diff --git a/src/1-Libraries/Web.Blazor.Server/Web.Blazor.Server.csproj b/src/1-Libraries/Web.Blazor.Server/Web.Blazor.Server.csproj index 3923af9..5a8c421 100644 --- 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 @@ CodeBlock.DevKit.Web.Blazor.Server CodeBlock.DevKit.Web.Blazor.Server CodeBlock Development Kit - 1.1.3 + 1.1.5 Hamed Shirbandi true CodeBlock.DevKit.Web.Blazor.Server diff --git a/src/4-Examples/BlazorServerApp/App.razor b/src/4-Examples/BlazorServerApp/App.razor index ae3ba92..cb3b4e2 100644 --- a/src/4-Examples/BlazorServerApp/App.razor +++ b/src/4-Examples/BlazorServerApp/App.razor @@ -3,16 +3,20 @@ - + + + - + + + - - + + diff --git a/src/4-Examples/BlazorServerApp/Pages/Home/Index.razor b/src/4-Examples/BlazorServerApp/Pages/Home/Index.razor index 362b34a..4982ebb 100644 --- a/src/4-Examples/BlazorServerApp/Pages/Home/Index.razor +++ b/src/4-Examples/BlazorServerApp/Pages/Home/Index.razor @@ -1,5 +1,5 @@ @page "/" -

@Localizer[BlazorServerAppResource.Home_Page_Welcome]

+

@AppLocalizer[BlazorServerAppResource.Home_Page_Welcome]

diff --git a/src/4-Examples/BlazorServerApp/Pages/Home/Roles.razor b/src/4-Examples/BlazorServerApp/Pages/Home/Roles.razor index 2f2762d..64df301 100644 --- 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 -@Localizer[BlazorServerAppResource.Nav_Menu_Roles] +@AppLocalizer[BlazorServerAppResource.Nav_Menu_Roles] -

@Localizer[BlazorServerAppResource.Nav_Menu_Roles]

+

@AppLocalizer[BlazorServerAppResource.Nav_Menu_Roles]

diff --git a/src/4-Examples/BlazorServerApp/Pages/Home/Users.razor b/src/4-Examples/BlazorServerApp/Pages/Home/Users.razor index e0f0a03..190e4d3 100644 --- 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 -@Localizer[BlazorServerAppResource.Nav_Menu_Users] +@AppLocalizer[BlazorServerAppResource.Nav_Menu_Users] -

@Localizer[BlazorServerAppResource.Nav_Menu_Users]

+

@AppLocalizer[BlazorServerAppResource.Nav_Menu_Users]

diff --git a/src/4-Examples/BlazorServerApp/Pages/Shared/MainLayout.razor b/src/4-Examples/BlazorServerApp/Pages/Shared/MainLayout.razor index bdf0d53..0952cd7 100644 --- a/src/4-Examples/BlazorServerApp/Pages/Shared/MainLayout.razor +++ b/src/4-Examples/BlazorServerApp/Pages/Shared/MainLayout.razor @@ -20,8 +20,6 @@
- - diff --git a/src/4-Examples/BlazorServerApp/Pages/Shared/NavMenu.razor b/src/4-Examples/BlazorServerApp/Pages/Shared/NavMenu.razor index 6661b74..bcd2ba2 100644 --- a/src/4-Examples/BlazorServerApp/Pages/Shared/NavMenu.razor +++ b/src/4-Examples/BlazorServerApp/Pages/Shared/NavMenu.razor @@ -1,6 +1,6 @@ 
- @Localizer[BlazorServerAppResource.App_Name] + @AppLocalizer[BlazorServerAppResource.App_Name] @@ -11,25 +11,25 @@ diff --git a/src/4-Examples/BlazorServerApp/Pages/Shared/SimpleLayout.razor b/src/4-Examples/BlazorServerApp/Pages/Shared/SimpleLayout.razor new file mode 100644 index 0000000..94d5fe0 --- /dev/null +++ b/src/4-Examples/BlazorServerApp/Pages/Shared/SimpleLayout.razor @@ -0,0 +1,16 @@ +@using Blazored.Toast +@using Blazored.Toast.Configuration +@inherits LayoutComponentBase + +
+
+
+ +
+
+ + +
+ @Body +
+
\ No newline at end of file diff --git a/src/4-Examples/BlazorServerApp/Pages/Shared/_Layout.cshtml b/src/4-Examples/BlazorServerApp/Pages/Shared/_Layout.cshtml index 3794625..0d61419 100644 --- a/src/4-Examples/BlazorServerApp/Pages/Shared/_Layout.cshtml +++ b/src/4-Examples/BlazorServerApp/Pages/Shared/_Layout.cshtml @@ -16,9 +16,14 @@ - +
+
+ +
+
+ -
+
@RenderBody()
diff --git a/src/4-Examples/BlazorServerApp/Pages/_Host.cshtml b/src/4-Examples/BlazorServerApp/Pages/_Host.cshtml index 76ec178..1a544c5 100644 --- 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; +} diff --git a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.Designer.cs b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.Designer.cs index ec369ee..10abfbd 100644 --- a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.Designer.cs +++ b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.Designer.cs @@ -69,42 +69,6 @@ public static string App_Name { } } - /// - /// Looks up a localized string similar to We are authorizing, please wait.. - /// - public static string Error_Authorization_Message { - get { - return ResourceManager.GetString("Error_Authorization_Message", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Authorizing .... - /// - public static string Error_Authorization_Title { - get { - return ResourceManager.GetString("Error_Authorization_Title", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sorry! It seems the page that you are looking for, does not exist.. - /// - public static string Error_NotFound_Message { - get { - return ResourceManager.GetString("Error_NotFound_Message", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Page not found!. - /// - public static string Error_NotFound_Title { - get { - return ResourceManager.GetString("Error_NotFound_Title", resourceCulture); - } - } - /// /// Looks up a localized string similar to Welcome!. /// diff --git a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.fa.resx b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.fa.resx index 3cc8a13..fd04aed 100644 --- a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.fa.resx +++ b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.fa.resx @@ -117,18 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - در حال احراز هویت ... - - - شما به تازگی به سیستم وارد شدی، کمی زمان نیاز داریم که این موضوع رو بررسی کنیم - - - متاسفیم! صفحه ای که دنبالش بودی پیدا نشد. - - - صفحه ی مورد نظر پیدا نشد! - کاربرها diff --git a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.resx b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.resx index 0eb3f12..c82dd95 100644 --- a/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.resx +++ b/src/4-Examples/BlazorServerApp/Resources/BlazorServerAppResource.resx @@ -117,18 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Authorizing ... - - - We are authorizing, please wait. - - - Sorry! It seems the page that you are looking for, does not exist. - - - Page not found! - Users diff --git a/src/4-Examples/BlazorServerApp/_Imports.razor b/src/4-Examples/BlazorServerApp/_Imports.razor index d1a7531..0d528ee 100644 --- 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 Localizer \ No newline at end of file +@inject IStringLocalizer AppLocalizer +@inject IStringLocalizer BlazorLocalizer