Skip to content

Commit 31905c3

Browse files
author
Stedra Kristóf
committed
Separate blazor and mudblazor components
1 parent c018c8b commit 31905c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+120
-63
lines changed

‎AutSoftCore.sln‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4E394277
3434
EndProject
3535
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutSoft.AspNetCore.Auth", "src\AutSoft.AspNetCore.Auth\AutSoft.AspNetCore.Auth.csproj", "{6B158B44-E28E-4276-BB65-72CDA4163F39}"
3636
EndProject
37-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutSoft.AspNetCore.Blazor", "src\AutSoft.AspNetCore.Blazor\AutSoft.AspNetCore.Blazor.csproj", "{1E00D30A-1EF0-4DAD-98C9-61FEE3EA7EF6}"
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutSoft.AspNetCore.Blazor", "src\AutSoft.AspNetCore.Blazor\AutSoft.AspNetCore.Blazor.csproj", "{1E00D30A-1EF0-4DAD-98C9-61FEE3EA7EF6}"
38+
EndProject
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutSoft.Mud.Blazor", "src\AutSoft.Mud.Blazor\AutSoft.Mud.Blazor.csproj", "{91EDCF80-45C8-4728-9240-52DA8DAD8F02}"
3840
EndProject
3941
Global
4042
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -74,6 +76,10 @@ Global
7476
{1E00D30A-1EF0-4DAD-98C9-61FEE3EA7EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
7577
{1E00D30A-1EF0-4DAD-98C9-61FEE3EA7EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
7678
{1E00D30A-1EF0-4DAD-98C9-61FEE3EA7EF6}.Release|Any CPU.Build.0 = Release|Any CPU
79+
{91EDCF80-45C8-4728-9240-52DA8DAD8F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80+
{91EDCF80-45C8-4728-9240-52DA8DAD8F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
81+
{91EDCF80-45C8-4728-9240-52DA8DAD8F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
82+
{91EDCF80-45C8-4728-9240-52DA8DAD8F02}.Release|Any CPU.Build.0 = Release|Any CPU
7783
EndGlobalSection
7884
GlobalSection(SolutionProperties) = preSolution
7985
HideSolutionNode = FALSE
@@ -87,6 +93,7 @@ Global
8793
{D4D62897-E6D6-484E-AE4E-F3A0347ADD88} = {7029D162-AEB0-4B68-A21E-90ABCD21DAD3}
8894
{6B158B44-E28E-4276-BB65-72CDA4163F39} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
8995
{1E00D30A-1EF0-4DAD-98C9-61FEE3EA7EF6} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
96+
{91EDCF80-45C8-4728-9240-52DA8DAD8F02} = {C46AA3F7-CBFE-428A-AA49-D1A1D40AB8A6}
9097
EndGlobalSection
9198
GlobalSection(ExtensibilityGlobals) = postSolution
9299
SolutionGuid = {E4767DF1-41A6-4BF0-A957-2718986D8BC7}

‎src/AutSoft.All/AutSoft.All.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<ProjectReference Include="..\AutSoft.AspNetCore.Blazor\AutSoft.AspNetCore.Blazor.csproj" />
1212
<ProjectReference Include="..\AutSoft.DbScaffolding.Identity\AutSoft.DbScaffolding.Identity.csproj" />
1313
<ProjectReference Include="..\AutSoft.Linq\AutSoft.Linq.csproj" />
14+
<ProjectReference Include="..\AutSoft.Mud.Blazor\AutSoft.Mud.Blazor.csproj" />
1415
</ItemGroup>
1516

1617
</Project>

‎src/AutSoft.All/ServiceCollectionExtensions.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using AutSoft.AspNetCore.Auth;
22
using AutSoft.AspNetCore.Blazor;
33
using AutSoft.Common;
4+
using AutSoft.Mud.Blazor;
45

56
using Microsoft.Extensions.DependencyInjection;
67

@@ -17,9 +18,10 @@ public static class ServiceCollectionExtensions
1718
/// <returns>Expanded service collection</returns>
1819
public static IServiceCollection AddAutSoftAll(this IServiceCollection services)
1920
{
20-
services.AddAutSoftAspNetCoreBlazor();
2121
services.AddAutSoftAspNetCoreAuth();
2222
services.AddAutSoftCommon();
23+
services.AddAutSoftAspNetCoreBlazor();
24+
services.AddAutSoftMudBlazor();
2325

2426
return services;
2527
}

‎src/AutSoft.AspNetCore.Blazor/AutSoft.AspNetCore.Blazor.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Razor">
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -12,10 +12,8 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Sve.Blazor.InfiniteScroll" />
1615
<PackageReference Include="FluentValidation" />
1716
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
18-
<PackageReference Include="MudBlazor" />
1917
</ItemGroup>
2018

2119
<ItemGroup>

‎src/AutSoft.AspNetCore.Blazor/ErrorHandling/DisplayErrorFactory.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using AutSoft.Common.Exceptions;
2-
31
namespace AutSoft.AspNetCore.Blazor.ErrorHandling;
42

53
/// <inheritdoc />

‎src/AutSoft.AspNetCore.Blazor/ServiceCollectionExtensions.cs‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
using AutSoft.AspNetCore.Blazor.Clipboard;
22
using AutSoft.AspNetCore.Blazor.ComponentState;
3+
using AutSoft.AspNetCore.Blazor.Enumeration;
34
using AutSoft.AspNetCore.Blazor.ErrorHandling;
4-
using AutSoft.AspNetCore.Blazor.Loading;
55
using AutSoft.AspNetCore.Blazor.Localization;
66

77
using Microsoft.Extensions.DependencyInjection;
88

9-
using MudBlazor.Services;
10-
119
namespace AutSoft.AspNetCore.Blazor;
1210

1311
/// <summary>
@@ -21,14 +19,9 @@ public static class ServiceCollectionExtensions
2119
/// <returns>Expanded service collection</returns>
2220
public static IServiceCollection AddAutSoftAspNetCoreBlazor(this IServiceCollection services)
2321
{
24-
services.AddMudServices();
22+
services.AddScoped<IDisplayErrorFactory, DisplayErrorFactory>();
2523
services.AddScoped<IClipboardService, ClipboardService>();
2624
services.AddSingleton<IComponentStateStorage, ComponentStateStorage>();
27-
services.AddScoped<IDisplayErrorFactory, DisplayErrorFactory>();
28-
services.AddScoped<CustomActionLoadingErrorHandlerFactory>();
29-
services.AddScoped<DefaultLoadingErrorHandlerFactory>();
30-
services.AddTransient<LoadingOperation>();
31-
services.AddTransient<BlockingLoadingOperation>();
3225
services.AddSingleton<BlazorComponentLocalizer>();
3326

3427
return services;

‎src/AutSoft.AspNetCore.Blazor/_Imports.razor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
@using Microsoft.AspNetCore.Components.Web
2-
@using MudBlazor

‎src/AutSoft.Mud.Blazor/AutSoft.Mud.Blazor.csproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
</PropertyGroup>
8+
9+
10+
<ItemGroup>
11+
<SupportedPlatform Include="browser" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="Sve.Blazor.InfiniteScroll" />
16+
<PackageReference Include="FluentValidation" />
17+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
18+
<PackageReference Include="MudBlazor" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<Folder Include="wwwroot\" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<ProjectReference Include="..\AutSoft.AspNetCore.Blazor\AutSoft.AspNetCore.Blazor.csproj" />
27+
</ItemGroup>
28+
29+
</Project>

src/AutSoft.AspNetCore.Blazor/DataField/DataField.razor renamed to src/AutSoft.Mud.Blazor/DataField/DataField.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<MudText Typo="Typo.caption" Class="datafield-label">@Label</MudText>
33
</MudItem>
44
<MudItem xxl="ValueXxl" xl="ValueXl" lg="ValueLg" md="ValueMd" sm="ValueSm" xs="ValueXs">
5-
<MudText Typo="Typo.body1" Class="datafield-value">@ChildContent</MudText>
5+
<MudText Typo="Typo.h1" Class="datafield-value">@ChildContent</MudText>
66
</MudItem>

src/AutSoft.AspNetCore.Blazor/DataField/DataField.razor.cs renamed to src/AutSoft.Mud.Blazor/DataField/DataField.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.AspNetCore.Components;
22

3-
namespace AutSoft.AspNetCore.Blazor.DataField;
3+
namespace AutSoft.Mud.Blazor.DataField;
44

55
/// <summary>
66
/// Data field

0 commit comments

Comments
 (0)