From eecc75ab0aebf3593f9811d64d7944b09c036359 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 29 Sep 2020 16:46:37 +0300 Subject: [PATCH 1/3] Update Getting-Started-React-Native.md --- docs/en/Getting-Started-React-Native.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Getting-Started-React-Native.md b/docs/en/Getting-Started-React-Native.md index 74a8f2b829..a06257fec9 100644 --- a/docs/en/Getting-Started-React-Native.md +++ b/docs/en/Getting-Started-React-Native.md @@ -110,4 +110,4 @@ The application is up and running. You can continue to develop your application ## See Also -* [React Native project structure](./Startup-Templates/Application.md#react-native) +* [React Native project structure](./Startup-Templates/Application#react-native) From dfef2b808cad008073445489979cc0a6c9d9dd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 30 Sep 2020 10:10:37 +0300 Subject: [PATCH 2/3] Update SignalR-Integration.md --- docs/en/SignalR-Integration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/SignalR-Integration.md b/docs/en/SignalR-Integration.md index f6ba81b550..29c37e30b2 100644 --- a/docs/en/SignalR-Integration.md +++ b/docs/en/SignalR-Integration.md @@ -1,6 +1,6 @@ # SignalR Integration -> It is already possible to follow [the standard Microsoft tutorial](https://docs.microsoft.com/en-us/aspnet/core/tutorials/signalr) to add [SignalR](https://docs.microsoft.com/en-us/aspnet/core/signalr/introduction) to your application. However, ABP provides a SignalR integration packages those simplify the integration and usage. +> It is already possible to follow [the standard Microsoft tutorial](https://docs.microsoft.com/en-us/aspnet/core/tutorials/signalr) to add [SignalR](https://docs.microsoft.com/en-us/aspnet/core/signalr/introduction) to your application. However, ABP provides SignalR integration packages those simplify the integration and usage. ## Installation From c8aa4e5e4a9b57970c272bc98b0ca9823a3ceec3 Mon Sep 17 00:00:00 2001 From: Ahmet Date: Wed, 30 Sep 2020 17:25:06 +0300 Subject: [PATCH 3/3] Fixed the basic theme main menu --- .../Themes/Basic/NavMenu.razor | 46 +++++++++++++++- .../Themes/Basic/NavMenuItem.razor | 55 +++++++++---------- .../wwwroot/index.html | 2 +- 3 files changed, 71 insertions(+), 32 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor index e1ede1c0fd..c3ada520dc 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenu.razor @@ -2,6 +2,50 @@ { foreach (var menuItem in Menu.Items) { - + var elementId = menuItem.ElementId ?? "MenuItem_" + menuItem.Name.Replace(".", "_"); + var cssClass = string.IsNullOrEmpty(menuItem.CssClass) ? string.Empty : menuItem.CssClass; + var disabled = menuItem.IsDisabled ? "disabled" : string.Empty; + var url = string.IsNullOrEmpty(menuItem.Url) ? "#" : menuItem.Url; + if (menuItem.IsLeaf) + { + if (menuItem.Url != null) + { + + } + } + else + { +
  • +
    + +
    + @foreach (var childMenuItem in menuItem.Items) + { + + } +
    +
    +
    • + } } } diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor index 8194896f61..bbf9bb69d8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavMenuItem.razor @@ -2,51 +2,46 @@ @{ var elementId = MenuItem.ElementId ?? "MenuItem_" + MenuItem.Name.Replace(".", "_"); var cssClass = string.IsNullOrEmpty(MenuItem.CssClass) ? string.Empty : MenuItem.CssClass; + var disabled = MenuItem.IsDisabled ? "disabled" : string.Empty; var url = string.IsNullOrEmpty(MenuItem.Url) ? "#" : MenuItem.Url; } @if (MenuItem.IsLeaf) { if (MenuItem.Url != null) { -
  • - - @if (MenuItem.Icon != null) + + @if (MenuItem.Icon != null) + { + if (MenuItem.Icon.StartsWith("fa")) { - if (MenuItem.Icon.StartsWith("fa")) - { - - } + } - @MenuItem.DisplayName - -
    • + } + @MenuItem.DisplayName + } } else { -
  • -
    -
    -
    - @foreach (var childMenuItem in MenuItem.Items) - { - - } -
    + + +
    + @foreach (var childMenuItem in MenuItem.Items) + { + + }
    -
    • - + } @code { [Parameter] public ApplicationMenuItem MenuItem { get; set; } -} +} \ No newline at end of file diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html index 99ab025095..9edbaa4185 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html @@ -16,7 +16,7 @@ - + Loading...