oliverbooth/oliverbooth.dev
oliverbooth/oliverbooth.dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

fix: fix tag links

Browse Source
This commit is contained in:
Oliver Booth 2024-07-15 19:38:56 +01:00
parent 0bebcb69fe
commit d32d46e221
Signed by: oliverbooth
GPG Key ID: E60B570D1B7557B5
8 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OliverBooth.Common/Services/IBlogPostService.cs
View File

@ -24,8 +24,9 @@ public interface IBlogPostService
/// Returns the total number of blog posts.
/// </summary>
/// <param name="visibility">The post visibility filter.</param>
/// <param name="tags">The tags of the posts to return.</param>
/// <returns>The total number of blog posts.</returns>
int GetBlogPostCount(Visibility visibility = Visibility.None);
int GetBlogPostCount(Visibility visibility = Visibility.None, string[]? tags = null);
/// <summary>
/// Returns a collection of blog posts from the specified page, optionally limiting the number of posts
@ -33,8 +34,9 @@ public interface IBlogPostService
/// </summary>
/// <param name="page">The zero-based index of the page to return.</param>
/// <param name="pageSize">The maximum number of posts to return per page.</param>
/// <param name="tags">The tags of the posts to return.</param>
/// <returns>A collection of blog posts.</returns>
IReadOnlyList<IBlogPost> GetBlogPosts(int page, int pageSize = 10);
IReadOnlyList<IBlogPost> GetBlogPosts(int page, int pageSize = 10, string[]? tags = null);
/// <summary>
/// Returns the number of legacy comments for the specified post.
@ -70,8 +72,9 @@ public interface IBlogPostService
/// </summary>
/// <param name="pageSize">The page size. Defaults to 10.</param>
/// <param name="visibility">The post visibility filter.</param>
/// <param name="tags">The tags of the posts to return.</param>
/// <returns>The page count.</returns>
int GetPageCount(int pageSize = 10, Visibility visibility = Visibility.None);
int GetPageCount(int pageSize = 10, Visibility visibility = Visibility.None, string[]? tags = null);
/// <summary>
/// Returns the previous blog post from the specified blog post.

5
OliverBooth/Pages/Blog/Index.cshtml
View File

@ -12,7 +12,7 @@
@await Html.PartialAsync("Partials/_MastodonStatus")
<div id="all-blog-posts">
@foreach (IBlogPost post in BlogPostService.GetBlogPosts(0))
@foreach (IBlogPost post in BlogPostService.GetBlogPosts(0, tags: Model.Tag))
{
@await Html.PartialAsync("Partials/_BlogCard", post)
}
@ -22,5 +22,6 @@
{
["UrlRoot"] = "/blog",
["Page"] = 1,
["PageCount"] = BlogPostService.GetPageCount(visibility: Visibility.Published)
["Tags"] = Model.Tag,
["PageCount"] = BlogPostService.GetPageCount(visibility: Visibility.Published, tags: Model.Tag)
})

6
OliverBooth/Pages/Blog/Index.cshtml.cs
View File

@ -15,11 +15,15 @@ public class Index : PageModel
_blogPostService = blogPostService;
}
public string[] Tag { get; private set; } = [];
public IActionResult OnGet([FromQuery(Name = "pid")] Guid? postId = null,
[FromQuery(Name = "p")] int? wpPostId = null)
[FromQuery(Name = "p")] int? wpPostId = null,
[FromQuery(Name = "tag")] string? tag = null)
{
if (postId.HasValue == wpPostId.HasValue)
{
Tag = tag?.Split('+').Select(t => t.Replace("%20", " ")).ToArray() ?? [];
return Page();
}

5
OliverBooth/Pages/Blog/List.cshtml
View File

@ -9,7 +9,7 @@
@await Html.PartialAsync("Partials/_MastodonStatus")
<div id="all-blog-posts">
@foreach (IBlogPost post in BlogPostService.GetBlogPosts(Model.PageNumber - 1))
@foreach (IBlogPost post in BlogPostService.GetBlogPosts(Model.PageNumber - 1, tags: Model.Tag))
{
@await Html.PartialAsync("Partials/_BlogCard", post)
}
@ -19,5 +19,6 @@
{
["UrlRoot"] = "/blog",
["Page"] = Model.PageNumber,
["PageCount"] = BlogPostService.GetPageCount(visibility: Visibility.Published)
["Tags"] = Model.Tag,
["PageCount"] = BlogPostService.GetPageCount(visibility: Visibility.Published, tags: Model.Tag)
})

6
OliverBooth/Pages/Blog/List.cshtml.cs
View File

@ -14,12 +14,15 @@ public class List : PageModel
/// <value>The requested page number.</value>
public int PageNumber { get; private set; }
public string[] Tag { get; private set; } = [];
/// <summary>
/// Handles the incoming GET request to the page.
/// </summary>
/// <param name="page">The requested page number, starting from 1.</param>
/// <param name="tag">The tag by which to filter results.</param>
/// <returns></returns>
public IActionResult OnGet([FromRoute(Name = "pageNumber")] int page = 1)
public IActionResult OnGet([FromRoute(Name = "pageNumber")] int page = 1, [FromQuery(Name = "tag")] string? tag = null)
{
if (page < 2)
{
@ -27,6 +30,7 @@ public class List : PageModel
}
PageNumber = page;
Tag = tag?.Split('+').Select(t => t.Replace("%20", " ")).ToArray() ?? [];
return Page();
}
}

6
OliverBooth/Pages/Shared/Partials/PageTabsUtility.cs
View File

@ -32,6 +32,8 @@ public class PageTabsUtility
set => _urlRoot = string.IsNullOrWhiteSpace(value) ? string.Empty : value.Trim();
}
public string[]? Tags { get; set; } = [];
/// <summary>
/// Shows the bound chevrons for the specified bounds type.
/// </summary>
@ -129,7 +131,9 @@ public class PageTabsUtility
private string GetLinkForPage(int page)
{
// page 1 doesn't use /page/n route
return page == 1 ? _urlRoot : $"{_urlRoot}/page/{page}";
return page == 1
? $"{_urlRoot}{(Tags is { Length: > 0 } ? $"?tag={string.Join('+', Tags)}" : "")}"
: $"{_urlRoot}/page/{page}{(Tags is { Length: > 0 } ? $"?tag={string.Join('+', Tags)}" : "")}";
}
private string ShowLowerBound()

3
OliverBooth/Pages/Shared/Partials/_PageTabs.cshtml
View File

@ -7,7 +7,8 @@
{
CurrentPage = page,
PageCount = pageCount,
UrlRoot = urlRoot
UrlRoot = urlRoot,
Tags = ViewData["Tags"] as string[]
};
}
<nav>

26
OliverBooth/Services/BlogPostService.cs
View File

@ -36,9 +36,16 @@ internal sealed class BlogPostService : IBlogPostService
}
/// <inheritdoc />
public int GetBlogPostCount(Visibility visibility = Visibility.None)
public int GetBlogPostCount(Visibility visibility = Visibility.None, string[]? tags = null)
{
using BlogContext context = _dbContextFactory.CreateDbContext();
if (tags is { Length: > 0 })
{
return visibility == Visibility.None
? context.BlogPosts.AsEnumerable().Count(p => !p.IsRedirect && p.Tags.Intersect(tags).Any())
: context.BlogPosts.AsEnumerable().Count(p => !p.IsRedirect && p.Visibility == visibility && p.Tags.Intersect(tags).Any());
}
return visibility == Visibility.None
? context.BlogPosts.Count(p => !p.IsRedirect)
: context.BlogPosts.Count(p => !p.IsRedirect && p.Visibility == visibility);
@ -60,13 +67,20 @@ internal sealed class BlogPostService : IBlogPostService
}
/// <inheritdoc />
public IReadOnlyList<IBlogPost> GetBlogPosts(int page, int pageSize = 10)
public IReadOnlyList<IBlogPost> GetBlogPosts(int page, int pageSize = 10, string[]? tags = null)
{
using BlogContext context = _dbContextFactory.CreateDbContext();
return context.BlogPosts
IEnumerable<BlogPost> posts = context.BlogPosts
.Where(p => p.Visibility == Visibility.Published && !p.IsRedirect)
.OrderByDescending(post => post.Published)
.Skip(page * pageSize)
.AsEnumerable();
if (tags is { Length: > 0 })
{
posts = posts.Where(p => p.Tags.Intersect(tags).Any());
}
return posts.Skip(page * pageSize)
.Take(pageSize)
.ToArray().Select(CacheAuthor).ToArray();
}
@ -103,9 +117,9 @@ internal sealed class BlogPostService : IBlogPostService
}
/// <inheritdoc />
public int GetPageCount(int pageSize = 10, Visibility visibility = Visibility.None)
public int GetPageCount(int pageSize = 10, Visibility visibility = Visibility.None, string[]? tags = null)
{
float postCount = GetBlogPostCount(visibility);
float postCount = GetBlogPostCount(visibility, tags);
return (int)MathF.Ceiling(postCount / pageSize);
}