Browse Source

keep search query in search field (#89)

* upgrade dependencies

* keep search query in search field
pull/90/head
Jason Dove 5 years ago committed by GitHub
parent
commit
ed365cfa43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  2. 10
      ErsatzTV/ErsatzTV.csproj
  3. 24
      ErsatzTV/Shared/MainLayout.razor

2
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4" />
<PackageReference Include="Refit" Version="6.0.24" />
<PackageReference Include="Refit" Version="6.0.38" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
</ItemGroup>

10
ErsatzTV/ErsatzTV.csproj

@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="Accelist.FluentValidation.Blazor" Version="4.0.0" />
<PackageReference Include="FluentValidation" Version="9.5.2" />
<PackageReference Include="FluentValidation.AspNetCore" Version="9.5.2" />
<PackageReference Include="FluentValidation" Version="9.5.3" />
<PackageReference Include="FluentValidation.AspNetCore" Version="9.5.3" />
<PackageReference Include="LanguageExt.Core" Version="3.4.15" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
@ -20,14 +20,14 @@ @@ -20,14 +20,14 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MudBlazor" Version="5.0.5" />
<PackageReference Include="MudBlazor" Version="5.0.6" />
<PackageReference Include="Refit.HttpClientFactory" Version="6.0.24" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.AspNetCore" Version="4.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.SQLite" Version="5.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.1.1" />
</ItemGroup>
<ItemGroup>

24
ErsatzTV/Shared/MainLayout.razor

@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
@using System.Reflection
@using Microsoft.AspNetCore.WebUtilities
@using Microsoft.Extensions.Primitives
@using System.Web
@inherits LayoutComponentBase
@inject NavigationManager NavigationManager
@ -15,7 +17,7 @@ @@ -15,7 +17,7 @@
</a>
</div>
<MudTextField T="string"
@ref="_textField"
@bind-Value="@_query"
AdornmentIcon="@Icons.Material.Filled.Search"
Adornment="Adornment.Start"
Variant="Variant.Outlined"
@ -65,7 +67,7 @@ @@ -65,7 +67,7 @@
@code {
private static readonly string InfoVersion = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "unknown";
private MudTextField<string> _textField;
private string _query;
private MudTheme _ersatzTvTheme => new()
{
@ -89,12 +91,26 @@ @@ -89,12 +91,26 @@
}
};
protected override async Task OnParametersSetAsync()
{
await base.OnParametersSetAsync();
string query = new Uri(NavigationManager.Uri).Query;
if (QueryHelpers.ParseQuery(query).TryGetValue("query", out StringValues value))
{
_query = value;
}
else
{
_query = string.Empty;
}
}
private void OnSearchKeyDown(KeyboardEventArgs args)
{
if (args.Code == "Enter")
{
string query = HttpUtility.UrlEncode(_textField.Value);
_textField.Reset();
string query = HttpUtility.UrlEncode(_query);
NavigationManager.NavigateTo($"/search?query={query}", true);
StateHasChanged();
}

Loading…
Cancel
Save