Blog module tag page moved to index

modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/Posts/IPostAppService.cs

@@ -7,8 +7,6 @@ namespace Volo.Blogging.Posts
 {
     public interface IPostAppService : IApplicationService
     {
-        Task<ListResultDto<PostWithDetailsDto>> GetListByBlogId(Guid id);
-
         Task<ListResultDto<PostWithDetailsDto>> GetListByBlogIdAndTagName(Guid blogId, string tagName);
 
         Task<PostWithDetailsDto> GetForReadingAsync(GetPostInput input);

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs

@@ -32,7 +32,7 @@ namespace Volo.Blogging.Posts
             _commentRepository = commentRepository;
         }
 
-        public async Task<ListResultDto<PostWithDetailsDto>> GetListByBlogId(Guid id)
+        public async Task<ListResultDto<PostWithDetailsDto>> GetListByBlogIdAndTagName(Guid id, string tagName)
         {
             var posts = _postRepository.GetPostsByBlogId(id);
 
@@ -50,16 +50,13 @@ namespace Volo.Blogging.Posts
                 postDto.CommentCount = (await _commentRepository.GetListAsync()).Count(p => p.PostId == postDto.Id);
             }
 
-            return new ListResultDto<PostWithDetailsDto>(postDtos);
+            if (!tagName.IsNullOrWhiteSpace())
-        }
+            {
-
+                var tag = await _tagRepository.GetByNameAsync(tagName);
-        public async Task<ListResultDto<PostWithDetailsDto>> GetListByBlogIdAndTagName(Guid blogId, string tagName)
+                postDtos = postDtos.Where(p => p.Tags.Any(t => t.Id == tag.Id)).ToList();
-        {
+            }
-            var all = (await GetListByBlogId(blogId)).Items;
-
-            var tag = await _tagRepository.GetByNameAsync(tagName);
 
-            return new ListResultDto<PostWithDetailsDto>(all.Where(p=>p.Tags.Any(t=>t.Id == tag.Id)).ToList());
+            return new ListResultDto<PostWithDetailsDto>(postDtos);
         }
 
         public async Task<PostWithDetailsDto> GetForReadingAsync(GetPostInput input)

modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs

@@ -61,7 +61,6 @@ namespace Volo.Blogging
                 options.Conventions.AddPageRoute("/Blog/Posts/Detail", "blog/{blogShortName}/{postUrl}");
                 options.Conventions.AddPageRoute("/Blog/Posts/Edit", "blog/{blogShortName}/posts/edit/{postId}");
                 options.Conventions.AddPageRoute("/Blog/Posts/New", "blog/{blogShortName}/posts/new");
-                options.Conventions.AddPageRoute("/Blog/Tags/Posts", "blog/{blogShortName}/{tagName}/posts");
             });
 
             context.Services.AddAssemblyOf<BloggingWebModule>();

modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml

@@ -30,7 +30,7 @@
                         <p class="tags">
                             @foreach (var tag in Model.Post.Tags)
                             {
-                                <a asp-page="/Blog/Tags/Posts" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
+                                <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
                             }
                         </p>
                         <h1>
@@ -94,7 +94,7 @@
                 <h5>@L["TagsInThisArticle"]</h5>
                 @foreach (var tag in Model.Post.Tags)
                 {
-                    <a asp-page="/Blog/Tags/Posts" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
+                    <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
                 }
             </div>
             <div class="comment-form mt-4">

modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml

@@ -46,7 +46,7 @@
                                         <p class="tags">
                                             @foreach (var tag in post.Tags)
                                             {
-                                                <a asp-page="/Blog/Tags/Posts" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
+                                                <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
                                             }
                                         </p>
                                         <h2>
@@ -188,7 +188,7 @@
                                 <p class="tags">
                                     @foreach (var tag in post.Tags)
                                     {
-                                        <a asp-page="/Blog/Tags/Posts" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
+                                        <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
                                     }
                                 </p>
                                 <h3>
@@ -234,7 +234,7 @@
                         <div class="popular-tags">
                             @foreach (var popularTag in Model.PopularTags)
                             {
-                                <a asp-page="/Blog/Tags/Posts" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@popularTag.Name">@popularTag.Name <span>(@popularTag.UsageCount @L["Posts"])</span></a>
+                                <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@popularTag.Name">@popularTag.Name <span>(@popularTag.UsageCount @L["Posts"])</span></a>
                             }
                         </div>
 

modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml.cs

@@ -18,6 +18,9 @@ namespace Volo.Blogging.Pages.Blog.Posts
         [BindProperty(SupportsGet = true)]
         public string BlogShortName { get; set; }
 
+        [BindProperty(SupportsGet = true)]
+        public string TagName { get; set; }
+
         public IReadOnlyList<PostWithDetailsDto> Posts { get; set; }
 
         public IReadOnlyList<TagDto> PopularTags { get; set; }
@@ -32,7 +35,7 @@ namespace Volo.Blogging.Pages.Blog.Posts
         public async Task OnGetAsync()
         {
             var blog = await _blogAppService.GetByShortNameAsync(BlogShortName);
-            Posts = (await _postAppService.GetListByBlogId(blog.Id)).Items;
+            Posts = (await _postAppService.GetListByBlogIdAndTagName(blog.Id, TagName)).Items;
             PopularTags = (await _tagAppService.GetPopularTags(new GetPopularTagsInput {ResultCount = 10}));
         }
     }

modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Tags/Posts.cshtml

@@ -1,93 +0,0 @@
-@page
-@inherits Volo.Blogging.Pages.Blog.BloggingPage
-@using Volo.Blogging.Pages.Blog.Tags
-@model PostsModel
-@{
-}
-
-@section scripts {
-    <abp-script-bundle name="@typeof(PostsModel).FullName">
-        <abp-script src="/Pages/Blog/Shared/Scripts/blog.js" />
-    </abp-script-bundle>
-}
-@section styles {
-    <abp-style-bundle name="@typeof(PostsModel).FullName">
-        <abp-style src="/Pages/Blog/Shared/Styles/blog.css" />
-    </abp-style-bundle>
-}
-
-<div class="container last-post-section pb-5">
-    <div class="row">
-        <div class="col-md-8">
-            <div class="row">
-                <div class="col">
-                    <div class="titline">
-                        <h2>#@Model.TagName</h2>
-                    </div>
-                </div>
-            </div>
-
-            @for (var index = 0; index < Model.Posts.Count; index++)
-            {
-                var post = Model.Posts[index];
-                var oddPost = index % 2 == 1;
-
-                <section class="box-articles">
-                    <div class="row @(oddPost?"align-middle":"")">
-                        <div class="col-md-4 order-md-@(oddPost?"last":"first")">
-                            <div class="img-container">
-                                <a asp-page="/Blog/Posts/Detail" asp-route-postUrl="@post.Url" asp-route-blogShortName="@Model.BlogShortName">
-                                    <img src="https://placeimg.com/480/270/tech" class="box-article-img">
-                                </a>
-                                <div class="user-link-icons">
-                                    <a class="add-bookmark" href="#">
-                                        <i class="fa fa-bookmark"></i>
-                                    </a>
-                                    <a class="share-article" href="#">
-                                        <i class="fa fa-share-alt"></i>
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-8 order-md-@(oddPost?"first":"last")">
-                            <p class="tags">
-                                @foreach (var tag in post.Tags)
-                                {
-                                    <a asp-page="/Blog/Tags/Posts" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
-                                }
-                            </p>
-                            <h3>
-                                <a asp-page="/Blog/Posts/Detail" asp-route-postUrl="@post.Url" asp-route-blogShortName="@Model.BlogShortName">@post.Title</a>
-                            </h3>
-                            <p>
-                                @(post.Content == null ? "" : (post.Content.Length > 250 ? post.Content.Substring(0, 150) : post.Content))...
-                            </p>
-                            <div class="article-owner">
-                                <div class="article-infos">
-                                    <div class="user-card">
-                                        <a href="#">
-                                            <img src="https://placeimg.com/120/120/pople" class="article-avatar">
-                                        </a>
-                                        <a href="#">
-                                            <strong>Armağan Ünlü</strong>, @((DateTime.Today - post.CreationTime).Days) @L["DaysAgo"]
-                                        </a>
-                                        <span class="seperator">|</span>
-                                        <a href="#">
-                                            <i class="fa fa-eye"></i> @post.ReadCount
-                                        </a>
-                                        <span class="seperator">|</span>
-                                        <a href="#">
-                                            <i class="fa fa-comment"></i>  @post.CommentCount
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-            }
-
-        </div>
-
-    </div>
-</div>

modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Tags/Posts.cshtml.cs

@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
-using Volo.Blogging.Blogs;
-using Volo.Blogging.Posts;
-
-namespace Volo.Blogging.Pages.Blog.Tags
-{
-    public class PostsModel : PageModel
-    {
-        private readonly IPostAppService _postAppService;
-        private readonly IBlogAppService _blogAppService;
-
-        [BindProperty(SupportsGet = true)]
-        public string BlogShortName { get; set; }
-
-        [BindProperty(SupportsGet = true)]
-        public string TagName { get; set; }
-
-        public IReadOnlyList<PostWithDetailsDto> Posts { get; set; }
-
-        public PostsModel(IPostAppService postAppService, IBlogAppService blogAppService)
-        {
-            _postAppService = postAppService;
-            _blogAppService = blogAppService;
-        }
-
-        public async void OnGetAsync()
-        {
-            var blog = await _blogAppService.GetByShortNameAsync(BlogShortName);
-            Posts = (await _postAppService.GetListByBlogIdAndTagName(blog.Id, TagName)).Items;
-        }
-    }
-}