Skip to content
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
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<Version>0.6.2</Version>
</PropertyGroup>
</Project>
10 changes: 5 additions & 5 deletions tilework.core/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,16 @@ public static IServiceCollection AddLoadBalancing(this IServiceCollection servic
{
services.Configure<LoadBalancerConfiguration>(configuration);

services.AddAutoMapper(typeof(HAProxyConfigurationProfile));
services.AddAutoMapper(typeof(HAProxyMonitoringProfile));
services.AddAutoMapper(_ => { },
typeof(HAProxyConfigurationProfile),
typeof(HAProxyMonitoringProfile),
typeof(LoadBalancingMappingProfile));

services.AddScoped<ILoadBalancerService, LoadBalancerService>();
services.AddScoped<HAProxyConfigurator>();

services.AddHostedService<LoadBalancingInitializer>();

services.AddAutoMapper(typeof(LoadBalancingMappingProfile));

services.AddTransient<LoadBalancerCertificateListener>();

return services;
Expand All @@ -110,7 +110,7 @@ public static IServiceCollection AddCertificateManagement(this IServiceCollectio

services.AddHostedService<CertificateManagementInitializer>();

services.AddAutoMapper(typeof(CertificateManagementMappingProfile));
services.AddAutoMapper(_ => { }, typeof(CertificateManagementMappingProfile));

services.AddTransient<CertificateRenewalJob>();

Expand Down
2 changes: 1 addition & 1 deletion tilework.core/tilework.core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="14.0.0" />
<PackageReference Include="AutoMapper" Version="15.1.1" />
<PackageReference Include="ACMESharpCore" Version="2.2.0.148" />
<PackageReference Include="Coravel" Version="6.0.2" />
<PackageReference Include="CsvHelper" Version="33.1.0" />
Expand Down
43 changes: 29 additions & 14 deletions tilework.ui/Components/Layout/NavMenu.razor
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
@namespace Tilework.Ui.Components.Layout
@using System.Reflection

<MudNavMenu>
<MudNavGroup Title="Load balancing" Expanded="false">
<MudNavLink Href="/lb/loadbalancers" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.AltRoute">Load balancers</MudNavLink>
<MudNavLink Href="/lb/targetgroups" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Storage">Target groups</MudNavLink>
</MudNavGroup>
<MudNavGroup Title="Certificates" Expanded="false">
<MudNavLink Href="/cm/authorities" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.AccountBalance">Certificate authorities</MudNavLink>
<MudNavLink Href="/cm/certificates" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.VerifiedUser">Certificates</MudNavLink>
</MudNavGroup>
<MudNavGroup Title="Identity" Expanded="false">
@* <MudNavLink Href="/im/providers" Match="NavLinkMatch.Prefix">Identity providers</MudNavLink> *@
<MudNavLink Href="/im/users" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Person">Users</MudNavLink>
</MudNavGroup>
</MudNavMenu>
<MudStack Class="d-flex flex-grow-1" StretchItems="StretchItems.Start">
<MudNavMenu>
<MudNavGroup Title="Load balancing" Expanded="false">
<MudNavLink Href="/lb/loadbalancers" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.AltRoute">Load balancers</MudNavLink>
<MudNavLink Href="/lb/targetgroups" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Storage">Target groups</MudNavLink>
</MudNavGroup>
<MudNavGroup Title="Certificates" Expanded="false">
<MudNavLink Href="/cm/authorities" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.AccountBalance">Certificate authorities</MudNavLink>
<MudNavLink Href="/cm/certificates" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.VerifiedUser">Certificates</MudNavLink>
</MudNavGroup>
<MudNavGroup Title="Identity" Expanded="false">
@* <MudNavLink Href="/im/providers" Match="NavLinkMatch.Prefix">Identity providers</MudNavLink> *@
<MudNavLink Href="/im/users" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Person">Users</MudNavLink>
</MudNavGroup>
</MudNavMenu>
<MudStack StretchItems="StretchItems.End" Spacing="0">
<MudDivider />
<MudText Align="Align.Center" Typo="Typo.caption" Class="pa-2 mud-text-secondary text-center"><strong>@AppVersion</strong></MudText>
</MudStack>
</MudStack>

@code {
private static readonly string AppVersion =
"v" + Assembly.GetExecutingAssembly()
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
?.InformationalVersion?
.Split('+')[0] ?? "0.0.0";
}
2 changes: 1 addition & 1 deletion tilework.ui/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public static class ServiceCollectionExtensions
{
public static IServiceCollection AddUserInterface(this IServiceCollection services)
{
services.AddAutoMapper(typeof(FormMappingProfile));
services.AddAutoMapper(_ => { }, typeof(FormMappingProfile));
services.AddScoped<IBrowserTimeZoneProvider, BrowserTimeZoneProvider>();
services.AddScoped<DownloadService>();

Expand Down
3 changes: 2 additions & 1 deletion tilework.ui/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning",
"Microsoft.EntityFrameworkCore": "Warning"
"Microsoft.EntityFrameworkCore": "Warning",
"LuckyPennySoftware.AutoMapper.License": "None"
}
},
"LoadBalancing": {
Expand Down
2 changes: 1 addition & 1 deletion tilework.ui/tilework.ui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


<ItemGroup>
<PackageReference Include="AutoMapper" Version="14.0.0" />
<PackageReference Include="AutoMapper" Version="15.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
4 changes: 2 additions & 2 deletions tilework.ui/wwwroot/css/fonts.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
@font-face {
font-family: 'Inter';
src: url('/fonts/inter/Inter-VariableFont_opsz,wght.ttf') format('truetype');
src: url('/fonts/inter/Inter-VariableFont_opsz_wght.ttf') format('truetype');
font-weight: 100 900;
font-style: normal;
}

@font-face {
font-family: 'Inter';
src: url('/fonts/inter/Inter-Italic-VariableFont_opsz,wght.ttf') format('truetype');
src: url('/fonts/inter/Inter-Italic-VariableFont_opsz_wght.ttf') format('truetype');
font-weight: 100 900;
font-style: italic;
}
Expand Down
Loading