Browse Source
Merge pull request #1432 from wayneboyles/ui-namespace-fix
Fixed Namespace Issue
pull/1436/head
Halil İbrahim Kalkan
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with
18 additions and
18 deletions
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuExtensions.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItemList.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/DefaultMenuContributor.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/DefaultMenuNames.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/HasMenuItemsExtensions.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Localization/Resource/AbpUiNavigationResource.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlOptions.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/ApplicationUrlDictionary.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/ApplicationUrlInfo.cs
-
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/IAppUrlProvider.cs
-
framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
using Volo.Abp.Localization; |
|
|
|
using Volo.Abp.Modularity; |
|
|
|
using Volo.Abp.Ui.Navigation; |
|
|
|
using Volo.Abp.Ui.Navigation.Localization.Resource; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
using Volo.Abp.UI.Navigation.Localization.Resource; |
|
|
|
using Volo.Abp.VirtualFileSystem; |
|
|
|
|
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
|
|
|
|
@ -1,5 +1,5 @@ |
|
|
|
using JetBrains.Annotations; |
|
|
|
using Volo.Abp.Ui.Navigation; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
using JetBrains.Annotations; |
|
|
|
using System.Linq; |
|
|
|
using Volo.Abp.Ui.Navigation; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
using System.Collections.Generic; |
|
|
|
using JetBrains.Annotations; |
|
|
|
using Volo.Abp.Ui.Navigation; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic; |
|
|
|
using System.Linq; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.Ui.Navigation |
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
public class ApplicationMenuItemList : List<ApplicationMenuItem> |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,10 +1,10 @@ |
|
|
|
using Microsoft.Extensions.DependencyInjection; |
|
|
|
using Microsoft.Extensions.Localization; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using Volo.Abp.Ui.Navigation.Localization.Resource; |
|
|
|
using Volo.Abp.UI.Navigation.Localization.Resource; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.Ui.Navigation |
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
public class DefaultMenuContributor : IMenuContributor |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
namespace Volo.Abp.Ui.Navigation |
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
public static class DefaultMenuNames |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
using JetBrains.Annotations; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.Ui.Navigation |
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
public static class HasMenuItemsExtensions |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
using Volo.Abp.Ui.Navigation; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
|
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
using Volo.Abp.Localization; |
|
|
|
|
|
|
|
namespace Volo.Abp.Ui.Navigation.Localization.Resource |
|
|
|
namespace Volo.Abp.UI.Navigation.Localization.Resource |
|
|
|
{ |
|
|
|
[LocalizationResourceName("AbpUiNavigation")] |
|
|
|
public class AbpUiNavigationResource |
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
namespace Volo.Abp.Ui.Navigation.Urls |
|
|
|
namespace Volo.Abp.UI.Navigation.Urls |
|
|
|
{ |
|
|
|
public class AppUrlOptions |
|
|
|
{ |
|
|
|
|
|
|
|
@ -5,7 +5,7 @@ using Microsoft.Extensions.Options; |
|
|
|
using Volo.Abp.DependencyInjection; |
|
|
|
using Volo.Abp.MultiTenancy; |
|
|
|
|
|
|
|
namespace Volo.Abp.Ui.Navigation.Urls |
|
|
|
namespace Volo.Abp.UI.Navigation.Urls |
|
|
|
{ |
|
|
|
public class AppUrlProvider : IAppUrlProvider, ITransientDependency |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
using System.Collections.Generic; |
|
|
|
|
|
|
|
namespace Volo.Abp.Ui.Navigation.Urls |
|
|
|
namespace Volo.Abp.UI.Navigation.Urls |
|
|
|
{ |
|
|
|
public class ApplicationUrlDictionary |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
using System.Collections.Generic; |
|
|
|
|
|
|
|
namespace Volo.Abp.Ui.Navigation.Urls |
|
|
|
namespace Volo.Abp.UI.Navigation.Urls |
|
|
|
{ |
|
|
|
public class ApplicationUrlInfo |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
using System.Threading.Tasks; |
|
|
|
using JetBrains.Annotations; |
|
|
|
|
|
|
|
namespace Volo.Abp.Ui.Navigation.Urls |
|
|
|
namespace Volo.Abp.UI.Navigation.Urls |
|
|
|
{ |
|
|
|
public interface IAppUrlProvider |
|
|
|
{ |
|
|
|
|
|
|
|
@ -2,7 +2,7 @@ |
|
|
|
using Microsoft.Extensions.DependencyInjection; |
|
|
|
using Shouldly; |
|
|
|
using Volo.Abp.Modularity; |
|
|
|
using Volo.Abp.Ui.Navigation; |
|
|
|
using Volo.Abp.UI.Navigation; |
|
|
|
using Xunit; |
|
|
|
|
|
|
|
namespace Volo.Abp.UI.Navigation |
|
|
|
|