Skip to content

Commit 7cd138b

Browse files
committed
Improved ui/ux of theme pages. Upgraded mooncore.blazor.flyonui
1 parent 7dde1d8 commit 7cd138b

File tree

7 files changed

+26
-10
lines changed

7 files changed

+26
-10
lines changed

Moonlight.Client/Moonlight.Client.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<PackageReference Include="Blazor-ApexCharts" Version="6.0.0" />
2525
<PackageReference Include="MoonCore" Version="1.9.2" />
2626
<PackageReference Include="MoonCore.Blazor" Version="1.3.1" />
27-
<PackageReference Include="MoonCore.Blazor.FlyonUi" Version="1.0.8" />
27+
<PackageReference Include="MoonCore.Blazor.FlyonUi" Version="1.0.9" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<Compile Remove="storage\**\*" />
@@ -49,9 +49,4 @@
4949
<None Include="Styles/mappings/*.map" Pack="true" PackagePath="Styles/" />
5050
<None Include="Moonlight.Client.targets" Pack="true" PackagePath="build/Moonlight.Client.targets" />
5151
</ItemGroup>
52-
53-
<ItemGroup>
54-
<UpToDateCheckInput Remove="UI\Views\Internal\Mockup.razor" />
55-
<UpToDateCheckInput Remove="UI\Partials\Design\ThemeSettings.razor" />
56-
</ItemGroup>
5752
</Project>

Moonlight.Client/Styles/mappings/mooncore.map renamed to Moonlight.Client/Styles/MoonCore.Blazor.FlyonUi/mappings/mooncore.map

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ border-2
8181
border-b
8282
border-base-content
8383
border-base-content/20
84+
border-base-content/25
8485
border-base-content/40
8586
border-base-content/5
8687
border-dashed
@@ -295,6 +296,7 @@ md:text-3xl
295296
me-1
296297
me-1.5
297298
me-2
299+
me-2.5
298300
me-5
299301
menu
300302
menu-active

Moonlight.Client/UI/Views/Admin/Sys/Customisation/Index.razor

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
<NavTabs Index="1" Names="UiConstants.AdminNavNames" Links="UiConstants.AdminNavLinks"/>
1616

17-
<div class="mt-5 flex justify-between">
18-
<span class="text-lg font-semibold">Themes</span>
17+
<PageSeparator Icon="icon-palette">
18+
Themes
19+
</PageSeparator>
20+
21+
<div class="mt-5 flex justify-end">
1922
<div>
2023
<label for="import-theme" class="btn btn-info me-1">
2124
<i class="icon-file-up"></i>
@@ -26,7 +29,7 @@
2629
</div>
2730
</div>
2831

29-
<div class="mt-2.5">
32+
<div class="my-2.5">
3033
<DataTable TItem="ThemeResponse">
3134
<Configuration>
3235
<DataTableColumn TItem="ThemeResponse" Field="@(x => x.Id)" Name="Id"/>
@@ -78,6 +81,10 @@
7881
</DataTable>
7982
</div>
8083

84+
<PageSeparator Icon="icon-images">
85+
Images & Logos
86+
</PageSeparator>
87+
8188

8289
@code
8390
{

Moonlight.Client/UI/Views/Admin/Sys/Customisation/Themes/Create.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<label class="block text-sm font-medium leading-6 text-base-content">Version</label>
3939
<div class="mt-2">
4040
<input @bind="Request.Version" type="text" autocomplete="off" class="input w-full">
41+
<span class="helper-text">This field will be used for update checks</span>
4142
</div>
4243
</div>
4344
</div>

Moonlight.Client/UI/Views/Admin/Sys/Customisation/Themes/Update.razor

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<div class="mt-2">
2929
<div class="flex items-center gap-1">
3030
<input @bind="Request.IsEnabled" type="checkbox" class="switch" />
31+
<span class="helper-text">Toggle on in order to enable the theme globally (a reload is required to apply)</span>
3132
</div>
3233
</div>
3334
</div>
@@ -47,18 +48,21 @@
4748
<label class="block text-sm font-medium leading-6 text-base-content">Version</label>
4849
<div class="mt-2">
4950
<input @bind="Request.Version" type="text" autocomplete="off" class="input w-full">
51+
<span class="helper-text">This field will be used for update checks</span>
5052
</div>
5153
</div>
5254
<div class="sm:col-span-2">
5355
<label class="block text-sm font-medium leading-6 text-base-content">Donate URL</label>
5456
<div class="mt-2">
5557
<input @bind="Request.DonateUrl" type="text" autocomplete="off" class="input w-full">
58+
<span class="helper-text">Optional: Specify a url here which people should get redirected for donating to the author</span>
5659
</div>
5760
</div>
5861
<div class="sm:col-span-2">
5962
<label class="block text-sm font-medium leading-6 text-base-content">Update URL</label>
6063
<div class="mt-2">
6164
<input @bind="Request.UpdateUrl" type="text" autocomplete="off" class="input w-full">
65+
<span class="helper-text">Optional: Specify a url here which returns the latest version of this theme as the raw exported file</span>
6266
</div>
6367
</div>
6468
</div>

Moonlight.Client/UI/Views/Admin/Sys/Index.razor

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
<StatCard Title="Memory Usage" Text="@(Formatter.FormatSize(OverviewData.MemoryUsage))" Icon="icon-memory-stick"/>
2020
<StatCard Title="Host OS" Text="@(OverviewData.OperatingSystem)" Icon="icon-server-cog"/>
2121
<StatCard Title="Uptime" Text="@(Formatter.FormatUptime(OverviewData.Uptime))" Icon="icon-clock"/>
22-
22+
</div>
23+
24+
<PageSeparator Icon="icon-tool-case">
25+
Actions
26+
</PageSeparator>
27+
28+
<div class="flex">
2329
<div class="card card-body">
2430
<div class="flex justify-center">
2531
<WButton OnClick="Restart" CssClasses="btn btn-error w-full">

Moonlight.Client/UI/Views/Admin/Users/Update.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<label class="block text-sm font-medium leading-6 text-base-content">Password</label>
4646
<div class="mt-2">
4747
<input @bind="Request.Password" type="password" autocomplete="off" class="input w-full">
48+
<span class="helper-text">Leave empty if the password should not be changed</span>
4849
</div>
4950
</div>
5051
</div>

0 commit comments

Comments
 (0)