tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Move role management page to the identity module

pull/5399/head
Halil İbrahim Kalkan 6 years ago
parent
9211722122
commit
e14358cfe0
11 changed files with 99 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      framework/Volo.Abp.sln
  2. 3
      framework/src/Volo.Abp.Blazorise/FodyWeavers.xml
  3. 30
      framework/src/Volo.Abp.Blazorise/FodyWeavers.xsd
  4. 24
      framework/src/Volo.Abp.Blazorise/Volo.Abp.Blazorise.csproj
  5. 23
      framework/src/Volo.Abp.Blazorise/Volo/Abp/BlazoriseLib/AbpBlazoriseModule.cs
  6. 5
      modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
  7. 0
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
  8. 5
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
  9. 10
      modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
  10. 4
      modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
  11. 1
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj

7
framework/Volo.Abp.sln
View File

@ -337,6 +337,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.Cli
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Components.WebAssembly", "src\Volo.Abp.AspNetCore.Components.WebAssembly\Volo.Abp.AspNetCore.Components.WebAssembly.csproj", "{E1A62D10-F2FB-4040-BD60-11A3934058DF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Blazorise", "src\Volo.Abp.Blazorise\Volo.Abp.Blazorise.csproj", "{D97028EB-A66C-4739-B5C8-1F035F7228E7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -1003,6 +1005,10 @@ Global
{E1A62D10-F2FB-4040-BD60-11A3934058DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1A62D10-F2FB-4040-BD60-11A3934058DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E1A62D10-F2FB-4040-BD60-11A3934058DF}.Release|Any CPU.Build.0 = Release|Any CPU
{D97028EB-A66C-4739-B5C8-1F035F7228E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D97028EB-A66C-4739-B5C8-1F035F7228E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D97028EB-A66C-4739-B5C8-1F035F7228E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D97028EB-A66C-4739-B5C8-1F035F7228E7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -1173,6 +1179,7 @@ Global
{3D35A1E0-A9A1-404F-9B55-5F1A7EB6D5B8} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
{8A22D962-016E-474A-8BB7-F831F0ABF3AC} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
{E1A62D10-F2FB-4040-BD60-11A3934058DF} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
{D97028EB-A66C-4739-B5C8-1F035F7228E7} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

3
framework/src/Volo.Abp.Blazorise/FodyWeavers.xml
View File

@ -0,0 +1,3 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<ConfigureAwait ContinueOnCapturedContext="false" />
</Weavers>

30
framework/src/Volo.Abp.Blazorise/FodyWeavers.xsd
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation>
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation>
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

24
framework/src/Volo.Abp.Blazorise/Volo.Abp.Blazorise.csproj
View File

@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<RootNamespace />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Volo.Abp.AspNetCore.Components.WebAssembly\Volo.Abp.AspNetCore.Components.WebAssembly.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Blazorise" Version="0.9.1.2" />
<PackageReference Include="Blazorise.DataGrid" Version="0.9.1.2" />
</ItemGroup>
</Project>

23
framework/src/Volo.Abp.Blazorise/Volo/Abp/BlazoriseLib/AbpBlazoriseModule.cs
View File

@ -0,0 +1,23 @@
using Blazorise;
using Volo.Abp.AspNetCore.Components.WebAssembly;
using Volo.Abp.Modularity;
namespace Volo.Abp.BlazoriseLib
{
[DependsOn(
typeof(AbpAspNetCoreComponentsWebAssemblyModule)
)]
public class AbpBlazoriseModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
ConfigureBlazorise(context);
}
private void ConfigureBlazorise(ServiceConfigurationContext context)
{
context.Services
.AddBlazorise();
}
}
}

5
modules/identity/src/Volo.Abp.Identity.Blazor/AbpIdentityBlazorModule.cs
View File

@ -1,12 +1,13 @@
using Volo.Abp.Modularity;
using Volo.Abp.BlazoriseLib;
namespace Volo.Abp.Identity.Blazor
{
[DependsOn(
typeof(AbpIdentityHttpApiClientModule)
typeof(AbpIdentityHttpApiClientModule),
typeof(AbpBlazoriseModule)
)]
public class AbpIdentityBlazorModule : AbpModule
{
}
}

0
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/RoleManagement.razor → modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
View File

5
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/RoleManagement.razor.cs → modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs
View File

@ -4,11 +4,10 @@ using System.Linq;
using System.Threading.Tasks;
using Blazorise;
using Blazorise.DataGrid;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Application.Dtos;
namespace MyCompanyName.MyProjectName.Blazor.Pages
namespace Volo.Abp.Identity.Blazor.Pages.Identity
{
public partial class RoleManagement
{

10
modules/identity/src/Volo.Abp.Identity.Blazor/Volo.Abp.Identity.Blazor.csproj
View File

@ -1,20 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="..\..\..\..\configureawait.props" />
<Import Project="..\..\..\..\common.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.7" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Blazorise\Volo.Abp.Blazorise.csproj" />
</ItemGroup>
</Project>

4
modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor
View File

@ -1 +1,5 @@
@using Microsoft.AspNetCore.Components.Web
@using Volo.Abp.AspNetCore.Components.WebAssembly
@using Volo.Abp.BlazoriseLib
@using Blazorise
@using Blazorise.DataGrid

1
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj
View File

@ -7,7 +7,6 @@
<ItemGroup>
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.1.2" />
<PackageReference Include="Blazorise.DataGrid" Version="0.9.1.2" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />

Write Preview
Loading…
Cancel
Save