Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for inheritance UI Kits #6

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@using EasyMicroservices.UI.BlazorKits.Components
@using EasyMicroservices.UI.BlazorKits.MudBlazorUI.Converters
@using MudBlazor

@inherits EasyButtonBase

<MudButton
@ref="Control"
Disabled="@(!IsEnabled)"
Color="@(DataTypeConverter.ConvertColor(Color))"
Variant="@DataTypeConverter.ConvertVariant(Variant)"
>@ChildContent</MudButton>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using EasyMicroservices.UI.BlazorKits.DataTypes;
using MudBlazor;

namespace EasyMicroservices.UI.BlazorKits.MudBlazorUI.Converters;
internal static class DataTypeConverter
{
public static Color ConvertColor(EasyColorType easyColorType)
{
return (Color)easyColorType;
}

public static Variant ConvertVariant(EasyVariantType easyVariantType)
{
return (Variant)easyVariantType;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MudBlazor" Version="6.11.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\EasyMicroservices.UI.BlazorKits\EasyMicroservices.UI.BlazorKits.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@using EasyMicroservices.UI.BlazorKits.Components
@using EasyMicroservices.UI.BlazorKits.RadzenBlazorUI.Converters
@using Radzen
@using Radzen.Blazor

@inherits EasyButtonBase

<RadzenButton @ref="Control"
Disabled="@(!IsEnabled)"
Variant="@DataTypeConverter.ConvertVariant(Variant)"
ButtonStyle="@(DataTypeConverter.ConvertButtonStyle(Color))">@ChildContent</RadzenButton>

@* Color="@(DataTypeConverter.ConvertColor(Color))" *@
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
using EasyMicroservices.UI.BlazorKits.DataTypes;
using Radzen;

namespace EasyMicroservices.UI.BlazorKits.RadzenBlazorUI.Converters;
internal static class DataTypeConverter
{
public static Variant ConvertVariant(EasyVariantType easyVariantType)
{
switch (easyVariantType)
{
case EasyVariantType.Text:
return Variant.Text;

case EasyVariantType.Filled:
return Variant.Filled;

case EasyVariantType.Outlined:
return Variant.Outlined;

default:
throw new ArgumentOutOfRangeException(nameof(easyVariantType), easyVariantType, null);
}
}

public static ButtonStyle ConvertButtonStyle(EasyColorType easyColorType)
{
switch (easyColorType)
{
case EasyColorType.Primary:
return ButtonStyle.Primary;
case EasyColorType.Secondary:
return ButtonStyle.Secondary;
case EasyColorType.Success:
return ButtonStyle.Success;
case EasyColorType.Warning:
return ButtonStyle.Warning;
case EasyColorType.Error:
return ButtonStyle.Danger;
case EasyColorType.Info:
return ButtonStyle.Info;
case EasyColorType.Dark:
return ButtonStyle.Dark;
case EasyColorType.Transparent:
case EasyColorType.Inherit:
case EasyColorType.Surface:
case EasyColorType.Tertiary:
case EasyColorType.Default:
return ButtonStyle.Light;
default:
// Handle any cases that don't have a direct mapping.
throw new ArgumentOutOfRangeException(nameof(easyColorType), easyColorType, null);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Radzen.Blazor" Version="4.23.4" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\EasyMicroservices.UI.BlazorKits\EasyMicroservices.UI.BlazorKits.csproj" />
</ItemGroup>

</Project>
12 changes: 12 additions & 0 deletions src/CSharp/Blazor/EasyMicroservices.UI.BlazorKits.Tests/App.razor
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Router AppAssembly="@typeof(App).Assembly">
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
</Found>
<NotFound>
<PageTitle>Not found</PageTitle>
<LayoutView Layout="@typeof(MainLayout)">
<p role="alert">Sorry, there's nothing at this address.</p>
</LayoutView>
</NotFound>
</Router>
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\EasyMicroservices.UI.BlazorKits.MudBlazorUI\EasyMicroservices.UI.BlazorKits.MudBlazorUI.csproj" />
<ProjectReference Include="..\EasyMicroservices.UI.BlazorKits.RadzenBlazorUI\EasyMicroservices.UI.BlazorKits.RadzenBlazorUI.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@inherits LayoutComponentBase
@using MudBlazor

<MudThemeProvider />

<main>
@Body
</main>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@page "/"

<EasyButton Color="EasyColorType.Success" Variant="EasyVariantType.Filled">Test</EasyButton>

@code {
protected override async Task OnInitializedAsync()
{
await base.OnInitializedAsync();
}
}
13 changes: 13 additions & 0 deletions src/CSharp/Blazor/EasyMicroservices.UI.BlazorKits.Tests/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using EasyMicroservices.UI.BlazorKits.Tests;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using MudBlazor.Services;

var builder = WebAssemblyHostBuilder.CreateDefault(args);
builder.RootComponents.Add<App>("#app");
builder.RootComponents.Add<HeadOutlet>("head::after");

builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
builder.Services.AddMudServices();

await builder.Build().RunAsync();
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"iisSettings": {
"iisExpress": {
"applicationUrl": "http://localhost:55715",
"sslPort": 0
}
},
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"applicationUrl": "http://localhost:5002",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@using System.Net.Http
@using System.Net.Http.Json
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.WebAssembly.Http
@using Microsoft.JSInterop
@using EasyMicroservices.UI.BlazorKits.Tests
@using EasyMicroservices.UI.BlazorKits.DataTypes

@using EasyMicroservices.UI.BlazorKits.MudBlazorUI.Components
@* @using EasyMicroservices.UI.BlazorKits.RadzenBlazorUI.Components *@
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
h1:focus {
outline: none;
}

#blazor-error-ui {
background: lightyellow;
bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
display: none;
left: 0;
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
position: fixed;
width: 100%;
z-index: 1000;
}

#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}

.blazor-error-boundary {
background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
padding: 1rem 1rem 1rem 3.7rem;
color: white;
}

.blazor-error-boundary::after {
content: "An error has occurred."
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />
<title>EasyMicroservices.UI.BlazorKits.Test</title>
<base href="/" />
<link href="css/app.css" rel="stylesheet" />

<!--MUDBLAZOR START-->
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
<!--MUDBLAZOR END-->

<!--RAZDEN START-->
<!--<link rel="stylesheet" href="_content/Radzen.Blazor/css/material-base.css">
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
<link rel="stylesheet" href="_content/Radzen.Blazor/css/standard-base.css">-->
<!--RAZDEN END-->

<!-- If you add any scoped CSS files, uncomment the following to load them
<link href="EasyMicroservices.UI.BlazorKits.Test.styles.css" rel="stylesheet" /> -->
</head>

<body>
<div id="app">Loading...</div>

<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>
<script src="_framework/blazor.webassembly.js"></script>

<!--MUDBLAZOR START-->
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
<!--MUDBLAZOR END-->

<!--RAZDEN START-->
<!--<script src="_content/Radzen.Blazor/Radzen.Blazor.js"></script>-->
<!--RAZDEN END-->
</body>

</html>
Loading
Loading