Compare commits

...

3 Commits

Author SHA1 Message Date
Max
69eeb5c44e Finished MudBlazor & layouts implementation 2024-06-17 15:31:16 +02:00
Max
2f6ed064f1 Configured MudBlazor & added layouts 2024-06-17 14:47:10 +02:00
Max
73d5ba2dad Added MudBlazor to SharpRSS.Blazor 2024-06-17 13:53:48 +02:00
16 changed files with 123 additions and 110 deletions

View File

@ -9,12 +9,18 @@
<link rel="stylesheet" href="app.css"/> <link rel="stylesheet" href="app.css"/>
<link rel="stylesheet" href="SharpRSS.Blazor.styles.css"/> <link rel="stylesheet" href="SharpRSS.Blazor.styles.css"/>
<link rel="icon" type="image/png" href="favicon.png"/> <link rel="icon" type="image/png" href="favicon.png"/>
@*MudBlazor*@
<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" />
<HeadOutlet/> <HeadOutlet/>
</head> </head>
<body> <body>
<Routes/> @*Rendermode to 'InteractiveServer' or else MudBlazor will not work with interactivity*@
<Routes @rendermode="InteractiveServer"/>
<script src="_framework/blazor.web.js"></script> <script src="_framework/blazor.web.js"></script>
@*MudBlazor*@
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
</body> </body>
</html> </html>

View File

@ -0,0 +1,29 @@
@inherits LayoutComponentBase
@layout BaseLayout
<CascadingValue Value="this">
<MudAppBar Color="Color.Primary">
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@((e) => ToggleDrawerOpen())" />
<MudText Typo="Typo.h6">@AppText</MudText>
<MudSpacer/>
<MudTooltip Text="Go to the source code on GitHub">
<MudIconButton Icon="@Icons.Custom.Brands.GitHub" Href="https://github.com/hmaxnl/SharpRSS" Target="_blank"/>
</MudTooltip>
<MudTooltip Text="@(BaseLayout.DarkTheme ? "Toggle to light mode" : "Toggle to dark mode")">
<MudToggleIconButton @bind-Toggled="@BaseLayout.DarkTheme" Color="Color.Dark" ToggledColor="Color.Warning" Icon="@Icons.Material.Filled.DarkMode" ToggledIcon="@Icons.Material.Filled.LightMode"/>
</MudTooltip>
</MudAppBar>
@Body
</CascadingValue>
@code {
[CascadingParameter]
public BaseLayout BaseLayout { get; set; } = null!;
public bool DrawerOpen { get; set; } = true;
public string AppText { get; set; } = "SharpRSS";
private void ToggleDrawerOpen()
{
DrawerOpen = !DrawerOpen;
}
}

View File

@ -0,0 +1,46 @@
@inherits LayoutComponentBase
<MudThemeProvider @ref="@_themeProvider" Theme="@MudTheme" IsDarkMode="@DarkTheme"/>
<MudDialogProvider/>
<MudSnackbarProvider/>
<CascadingValue Value="this">
<MudLayout>
<MudMainContent>
@Body
</MudMainContent>
</MudLayout>
</CascadingValue>
@code {
public readonly MudTheme MudTheme = new MudTheme();
private MudThemeProvider? _themeProvider;
private bool _isDarkTheme = true;
public event EventHandler<bool>? OnDarkThemeChanged;
public bool DarkTheme
{
get => _isDarkTheme;
set
{
_isDarkTheme = value;
ThemeChanged();
}
}
private async void ThemeChanged()
{
//TODO: Update user settings
StateHasChanged();
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender && _themeProvider != null)
{
DarkTheme = await _themeProvider.GetSystemPreference();
_themeProvider.IsDarkModeChanged = EventCallback.Factory.Create<bool>(this, x => OnDarkThemeChanged?.Invoke(this, x));
}
}
}

View File

@ -0,0 +1,8 @@
@inherits LayoutComponentBase
@layout BaseLayout
@Body
@code {
}

View File

@ -1,23 +1,18 @@
@inherits LayoutComponentBase @inherits LayoutComponentBase
@layout ApplicationLayout
<div class="page"> <PageTitle>SharpRSS</PageTitle>
<div class="sidebar">
<NavMenu/>
</div>
<main> <MudDrawer @bind-Open="@ApplicationLayout.DrawerOpen" ClipMode="DrawerClipMode.Always">
<div class="top-row px-4"> <MudNavMenu>
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a> <MudNavLink Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Home" Href="/">Home</MudNavLink>
</div> </MudNavMenu>
<MudSpacer/>
</MudDrawer>
@Body
<article class="content px-4"> @code
@Body {
</article> [CascadingParameter]
</main> public ApplicationLayout ApplicationLayout { get; set; } = null!;
</div> }
<div id="blazor-error-ui">
An unhandled error has occurred.
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>

View File

@ -1,20 +0,0 @@
@page "/counter"
@rendermode InteractiveServer
<PageTitle>Counter</PageTitle>
<h1>Counter</h1>
<p role="status">Current count: @currentCount</p>
<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
@code {
private int currentCount = 0;
private void IncrementCount()
{
currentCount++;
}
}

View File

@ -2,6 +2,6 @@
<PageTitle>Home</PageTitle> <PageTitle>Home</PageTitle>
<h1>Hello, world!</h1> <MudText Typo="Typo.h4">Mud text!</MudText>
Welcome to your new app. Welcome to your new app.

View File

@ -1,67 +0,0 @@
@page "/weather"
@attribute [StreamRendering]
<PageTitle>Weather</PageTitle>
<h1>Weather</h1>
<p>This component demonstrates showing data.</p>
@if (forecasts == null)
{
<p>
<em>Loading...</em>
</p>
}
else
{
<table class="table">
<thead>
<tr>
<th>Date</th>
<th>Temp. (C)</th>
<th>Temp. (F)</th>
<th>Summary</th>
</tr>
</thead>
<tbody>
@foreach (var forecast in forecasts)
{
<tr>
<td>@forecast.Date.ToShortDateString()</td>
<td>@forecast.TemperatureC</td>
<td>@forecast.TemperatureF</td>
<td>@forecast.Summary</td>
</tr>
}
</tbody>
</table>
}
@code {
private WeatherForecast[]? forecasts;
protected override async Task OnInitializedAsync()
{
// Simulate asynchronous loading to demonstrate streaming rendering
await Task.Delay(500);
var startDate = DateOnly.FromDateTime(DateTime.Now);
var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" };
forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast
{
Date = startDate.AddDays(index),
TemperatureC = Random.Shared.Next(-20, 55),
Summary = summaries[Random.Shared.Next(summaries.Length)]
}).ToArray();
}
private class WeatherForecast
{
public DateOnly Date { get; set; }
public int TemperatureC { get; set; }
public string? Summary { get; set; }
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
}
}

View File

@ -6,5 +6,9 @@
@using static Microsoft.AspNetCore.Components.Web.RenderMode @using static Microsoft.AspNetCore.Components.Web.RenderMode
@using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop @using Microsoft.JSInterop
@*SharpRSS*@
@using SharpRSS.Blazor @using SharpRSS.Blazor
@using SharpRSS.Blazor.Components @using SharpRSS.Blazor.Components
@*MudBlazor*@
@using MudBlazor
@using MudBlazor.Components

View File

@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using MudBlazor.Services;
using SharpRSS.Blazor.Components; using SharpRSS.Blazor.Components;
using SharpRSS.Business; using SharpRSS.Business;
using SharpRSS.Data; using SharpRSS.Data;
@ -10,6 +11,7 @@ builder.UseSRSS();
// Add services to the container. // Add services to the container.
builder.Services.AddRazorComponents() builder.Services.AddRazorComponents()
.AddInteractiveServerComponents(); .AddInteractiveServerComponents();
builder.Services.AddMudServices();
var app = builder.Build(); var app = builder.Build();

View File

@ -11,4 +11,8 @@
<ProjectReference Include="..\SharpRSS.Core\SharpRSS.Core.csproj" /> <ProjectReference Include="..\SharpRSS.Core\SharpRSS.Core.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="MudBlazor" Version="6.20.0" />
</ItemGroup>
</Project> </Project>

View File

@ -14,4 +14,9 @@
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Domains\" />
<Folder Include="Repositories\" />
</ItemGroup>
</Project> </Project>

View File

@ -24,9 +24,10 @@ git push
git config --global status.submoduleSummary true git config --global status.submoduleSummary true
## Update all submoduels ## Update submodule if submodule has changed
git submodule update --remote --merge git submodule update --remote --merge
git commit -m "Submodule updated!"
## Remove submodule ## Remove submodule
git rm <path-to-submodule> git rm <path-to-submodule>