Skip to content

Commit ce856a9

Browse files
author
Alexandros Nikolopoulos
committed
UI tweaks
1 parent a7fafe6 commit ce856a9

28 files changed

+60
-37
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22
<PropertyGroup>
3+
<Product>Tilework</Product>
34
<Version>0.6.2</Version>
45
</PropertyGroup>
56
</Project>

tilework.core/AppMetadata.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System.Reflection;
2+
3+
namespace Tilework.Core;
4+
5+
public static class AppMetadata
6+
{
7+
private static readonly Assembly _assembly = typeof(AppMetadata).Assembly;
8+
9+
public static string Name { get; } =
10+
_assembly.GetCustomAttribute<AssemblyProductAttribute>()?.Product
11+
?? _assembly.GetName().Name
12+
?? "Application";
13+
14+
public static string InformationalVersion { get; } =
15+
_assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion
16+
?? "0.0.0";
17+
18+
public static string Version { get; } = InformationalVersion.Split('+')[0];
19+
20+
public static string DisplayVersion => $"v{Version}";
21+
}

tilework.core/Commands/PrintVersion.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Tilework.Core.Interfaces;
2-
using System.Reflection;
32

43
namespace Tilework.Core.Commands;
54

@@ -14,9 +13,7 @@ public PrintVersionInfoCommand()
1413

1514
public async Task<int> run(string[] args)
1615
{
17-
var assembly = Assembly.GetExecutingAssembly();
18-
var informationalVersion = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
19-
Console.WriteLine(informationalVersion);
16+
Console.WriteLine(AppMetadata.InformationalVersion);
2017
return 0;
2118
}
22-
}
19+
}

tilework.ui/Components/Layout/MainLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<MudLayout Class="mud-height-full">
88
<MudAppBar Elevation="0" Dense="true">
99
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@((e) => DrawerToggle())" />
10-
<MudText Typo="Typo.subtitle2" Class="ml-3">Tilework</MudText>
10+
<MudText Typo="Typo.subtitle2" Class="ml-3">@AppMetadata.Name</MudText>
1111
<MudSpacer />
1212
<MudIconButton Icon="@(DarkLightModeButtonIcon)" Color="Color.Inherit" OnClick="@DarkModeToggle" />
1313
<AuthorizeView>

tilework.ui/Components/Layout/NavMenu.razor

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@namespace Tilework.Ui.Components.Layout
2-
@using System.Reflection
32

43
<MudStack Class="d-flex flex-grow-1" StretchItems="StretchItems.Start">
54
<MudNavMenu>
@@ -18,14 +17,6 @@
1817
</MudNavMenu>
1918
<MudStack StretchItems="StretchItems.End" Spacing="0">
2019
<MudDivider />
21-
<MudText Align="Align.Center" Typo="Typo.caption" Class="pa-2 mud-text-secondary text-center"><strong>@AppVersion</strong></MudText>
20+
<MudText Align="Align.Center" Typo="Typo.caption" Class="pa-2 mud-text-secondary text-center"><strong>@AppMetadata.DisplayVersion</strong></MudText>
2221
</MudStack>
2322
</MudStack>
24-
25-
@code {
26-
private static readonly string AppVersion =
27-
"v" + Assembly.GetExecutingAssembly()
28-
.GetCustomAttribute<AssemblyInformationalVersionAttribute>()
29-
?.InformationalVersion?
30-
.Split('+')[0] ?? "0.0.0";
31-
}

tilework.ui/Components/Pages/CertificateManagement/CertificateAuthorityDetail.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@page "/cm/authorities/{Id:guid}"
1414

15-
<PageTitle>Certificate authority details</PageTitle>
15+
<PageTitle>@PageTitleHelper.Format("Certificate authority details")</PageTitle>
1616
@if(_item != null)
1717
{
1818
<GenericDetailview Title="@_item.Name" Breadcrumbs="@_breadcrumbs" Actions="@_actions">

tilework.ui/Components/Pages/CertificateManagement/CertificateAuthorityList.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@page "/cm/authorities"
1212

13-
<PageTitle>Certificate authorities</PageTitle>
13+
<PageTitle>@PageTitleHelper.Format("Certificate authorities")</PageTitle>
1414

1515
<GenericListview Title="Certificate authorities" Items="@_items" Actions="@_actions" Breadcrumbs="@_breadcrumbs">
1616
<HeaderContent>

tilework.ui/Components/Pages/CertificateManagement/CertificateAuthorityNew.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@page "/cm/authorities/new"
1616

17-
<PageTitle>New certificate authority</PageTitle>
17+
<PageTitle>@PageTitleHelper.Format("New certificate authority")</PageTitle>
1818

1919
@if(form is NewAcmeCertificateAuthorityForm acmeForm)
2020
{

tilework.ui/Components/Pages/CertificateManagement/CertificateDetail.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@page "/cm/certificates/{Id:guid}"
2121

22-
<PageTitle>Certificate details</PageTitle>
22+
<PageTitle>@PageTitleHelper.Format("Certificate details")</PageTitle>
2323
@if(_item != null)
2424
{
2525
<GenericDetailview Title="@_item.Name" Breadcrumbs="@_breadcrumbs" Actions="@_actions">

tilework.ui/Components/Pages/CertificateManagement/CertificateList.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
@page "/cm/certificates"
1717

18-
<PageTitle>Certificates</PageTitle>
18+
<PageTitle>@PageTitleHelper.Format("Certificates")</PageTitle>
1919

2020
<GenericListview Title="Certificates" Items="@_items" Actions="@_actions" Breadcrumbs="@_breadcrumbs">
2121
<HeaderContent>

0 commit comments

Comments
 (0)