Skip to content

Commit 7f1cd2c

Browse files
mhwlngmhwlng
committed
update mudblazor and dotnet 7 versions
1 parent 932c6b0 commit 7f1cd2c

7 files changed

+19
-22
lines changed

‎kiosk-server/Pages/Kiosk.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
</MudTabs>
1212
<MudSpacer />
13-
<MudIconButton Icon="@(LayoutService.IsDarkMode ? @Icons.Rounded.PowerSettingsNew : @Icons.Material.Outlined.PowerSettingsNew)" Color="Color.Inherit" OnClick="@HandleShutdown" />
13+
<MudIconButton Icon="@(LayoutService.IsDarkMode ? @Icons.Material.Rounded.PowerSettingsNew : @Icons.Material.Outlined.PowerSettingsNew)" Color="Color.Inherit" OnClick="@HandleShutdown" />
1414

1515
</MudAppBar>
1616
<MudMainContent Class="d-flex flex-column">

‎kiosk-server/Pages/Setup.razor

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@
1515

1616
</ToolBarContent>
1717
<Columns>
18-
<Column T="RedirectItem" Field="Id" IsEditable="false" HeaderStyle="width:1%" CellStyle="text-align:center;"/>
19-
<Column T="RedirectItem" Field="Name" HeaderStyle="Width:20%">
18+
<PropertyColumn T="RedirectItem" TProperty="int" Property="x => x.Id" IsEditable="false" HeaderStyle="width:1%" CellStyle="text-align:center;"/>
19+
<PropertyColumn T="RedirectItem" TProperty="string" Property="x => x.Name" HeaderStyle="Width:20%">
2020
<EditTemplate>
2121
<MudTextField T="string" Value="context.Item.Name" ValueChanged="@(async (e) => { context.Item.Name = e;await CommittedItemChanges(context.Item); })" Margin="@Margin.Dense" Style="margin-top:0" />
2222
</EditTemplate>
23-
</Column>
24-
<Column T="RedirectItem" Field="Url">
23+
</PropertyColumn>
24+
<PropertyColumn T="RedirectItem" TProperty="string" Property="x => x.Url">
2525
<EditTemplate>
2626
<MudTextField T="string" Value="context.Item.Url" ValueChanged="@(async (e) => { context.Item.Url = e;await CommittedItemChanges(context.Item); })" Margin="@Margin.Dense" Style="margin-top:0" />
2727
</EditTemplate>
28-
</Column>
28+
</PropertyColumn>
2929

30-
<Column T="RedirectItem" IsEditable="false" Title="Action" HeaderStyle="width:1%" CellStyle="text-align:center;">
30+
<TemplateColumn T="RedirectItem" IsEditable="false" Title="Action" HeaderStyle="width:1%" CellStyle="text-align:center;">
3131
<CellTemplate>
3232
@if (!string.IsNullOrEmpty(context.Item.Url))
3333
{
34-
<MudIconButton Size="@Size.Small" Icon="@Icons.Outlined.Delete" Title="Delete" OnClick="@(async (e) => { await DeleteUrl(context.Item); })"/>
34+
<MudIconButton Size="@Size.Small" Icon="@Icons.Material.Outlined.Delete" Title="Delete" OnClick="@(async (e) => { await DeleteUrl(context.Item); })"/>
3535
}
3636

3737
</CellTemplate>
38-
</Column>
38+
</TemplateColumn>
3939

4040
</Columns>
4141
</MudDataGrid>

‎kiosk-server/Shared/EmptyLayout.razor

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@using Microsoft.AspNetCore.Http
22
@inherits LayoutComponentBase
33

4-
<MudThemeProvider @ref="@_mudThemeProvider" IsDarkMode="@LayoutService.IsDarkMode"/>
4+
<MudThemeProvider IsDarkMode="@LayoutService.IsDarkMode"/>
55
<MudDialogProvider />
66
<MudSnackbarProvider />
77

‎kiosk-server/Shared/EmptyLayout.razor.cs

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ public partial class EmptyLayout
99
{
1010
[Inject] private LayoutService LayoutService { get; set; } = null!;
1111

12-
private MudThemeProvider _mudThemeProvider = null!;
13-
1412
protected override void OnInitialized()
1513
{
1614
LayoutService.MajorUpdateOccured += LayoutServiceOnMajorUpdateOccured;

‎kiosk-server/Shared/MainLayout.razor

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<PageTitle>@Title</PageTitle>
77

8-
<MudThemeProvider @ref="@_mudThemeProvider" IsDarkMode="@LayoutService.IsDarkMode" />
8+
<MudThemeProvider IsDarkMode="@LayoutService.IsDarkMode" />
99
<MudDialogProvider />
1010
<MudSnackbarProvider />
1111

1212
<MudLayout Style="height:100vh" Class="d-flex">
1313
<MudAppBar Elevation="10" Color="@(LayoutService.IsDarkMode ? @Color.Dark : @Color.Primary)">
1414
<MudText Typo="Typo.h4" Align="Align.Center" Class="flex-grow-1 flex-shrink-1">@Title</MudText>
15-
<MudIconButton Icon="@(LayoutService.IsDarkMode ? @Icons.Rounded.LightMode : @Icons.Material.Outlined.DarkMode)" Color="Color.Inherit" OnClick="@LayoutService.ToggleDarkMode"/>
15+
<MudIconButton Icon="@(LayoutService.IsDarkMode ? @Icons.Material.Rounded.LightMode : @Icons.Material.Outlined.DarkMode)" Color="Color.Inherit" OnClick="@LayoutService.ToggleDarkMode" />
1616

1717
</MudAppBar>
1818
<MudMainContent Class="d-flex flex-column">

‎kiosk-server/Shared/MainLayout.razor.cs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public partial class MainLayout
99
{
1010
[Inject] private LayoutService LayoutService { get; set; } = null!;
1111

12-
private MudThemeProvider _mudThemeProvider = null!;
1312
private string? _title;
1413

1514
public string Title

‎kiosk-server/kiosk-server.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@
1313
</PreBuildEvent>
1414
<ApplicationIcon>wwwroot\favicon.ico</ApplicationIcon>
1515
<Version>0.0.1.1</Version>
16-
<Copyright>Copyright © 2022</Copyright>
16+
<Copyright>Copyright © 2023</Copyright>
1717
<Company />
1818
<Authors />
1919
<AssemblyVersion>0.0.1.1</AssemblyVersion>
2020
<FileVersion>0.0.1.1</FileVersion>
2121
</PropertyGroup>
2222

2323
<Target Name="PiCopy" AfterTargets="AfterPublish">
24-
<Exec Command="&quot;C:\Program Files (x86)\WinSCP\WinSCP.com&quot; /command &quot;open sftp://pi:[email protected].38/&quot; &quot;synchronize remote C:\dotnet\projects\kiosk-server\kiosk-server\bin\Release\net7.0\publish /home/pi/kiosk-server/&quot; &quot;exit&quot;" />
24+
<Exec Command="&quot;C:\Program Files (x86)\WinSCP\WinSCP.com&quot; /command &quot;open sftp://pi:[email protected].44/&quot; &quot;synchronize remote C:\dotnet\projects\kiosk-server\kiosk-server\bin\Release\net7.0\publish /home/pi/kiosk-server/&quot; &quot;exit&quot;" />
2525
</Target>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.1" />
29-
<PackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="7.0.1" />
30-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.1" />
28+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.5" />
29+
<PackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="7.0.5" />
30+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.5" />
3131
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
32-
<PackageReference Include="Microsoft.JSInterop" Version="7.0.1" />
33-
<PackageReference Include="MudBlazor" Version="6.1.6" />
32+
<PackageReference Include="Microsoft.JSInterop" Version="7.0.5" />
33+
<PackageReference Include="MudBlazor" Version="6.2.2" />
3434
<PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
3535
</ItemGroup>
3636

0 commit comments

Comments
 (0)