@Model.FormattedContent
+@Html.Raw(Model.FormattedContent)
-
+
@@ -74,7 +82,7 @@
-
@@ -84,13 +92,12 @@
+ @foreach (var tag in Model.Post.Tags)
+ {
+ @tag.Name
+ }
@Model.Post.Title
-
- 
+ 
- @Model.Blog.Name, @Model.Post.CreationTime
+ Halil İbrahim Kalkan, @Model.Post.CreationTime.ToString("dd/MM/yyyy hh/mm")
|
- 156K @L["Read"]
+ @Model.Post.ReadCount @L["Read"]
|
@Model.CommentCount @L["Comment"]
+
+
+ @if (await Authorization.IsGrantedAsync(BloggingPermissions.Posts.Update))
+ {
+ |
+
+ @L["Edit"]
+
+ }
+
@L["LeaveComment"]
@@ -116,7 +123,7 @@Armağan Ünlü - @commentWithRepliesDto.Comment.CreationTime + @commentWithRepliesDto.Comment.CreationTime.ToString("dd/MM/yyyy hh/mm")
@commentWithRepliesDto.Comment.Text @@ -161,7 +168,7 @@
Zlatan Ibrahimovic - @reply.CreationTime + @reply.CreationTime.ToString("dd/MM/yyyy hh/mm")
@reply.Text diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml.cs index 362f0902e8..a653af7cff 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml.cs +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml.cs @@ -65,7 +65,7 @@ namespace Volo.Blogging.Pages.Blog.Posts private async Task GetData() { Blog = await _blogAppService.GetByShortNameAsync(BlogShortName); - Post = await _postAppService.GetByUrlAsync(new GetPostInput { BlogId = Blog.Id, Url = PostUrl }); + Post = await _postAppService.GetForReadingAsync(new GetPostInput { BlogId = Blog.Id, Url = PostUrl }); FormattedContent = RenderMarkdown(Post.Content); CommentsWithReplies = await _commentAppService.GetHierarchicalListOfPostAsync(new GetCommentListOfPostAsync() { PostId = Post.Id }); CountComments(); diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml index 995ccf58f5..46c2d8c3da 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml @@ -1,7 +1,9 @@ @page @inherits Volo.Blogging.Pages.Blog.BloggingPage +@using Microsoft.AspNetCore.Authorization +@using Volo.Blogging @using Volo.Blogging.Pages.Blog.Posts -@using Volo.Blogging.Posts +@inject IAuthorizationService Authorization @model Volo.Blogging.Pages.Blog.Posts.IndexModel @{ @@ -22,7 +24,7 @@
@foreach (var tag in post.Tags) { - @tag.Name + @tag.Name }
@post.Title
- @(post.Content == null ? "" : (post.Content.Length > 150 ? post.Content.Substring(0,150) : post.Content)) + @(post.Content == null ? "" : (post.Content.Length > 150 ? post.Content.Substring(0, 150) + "..." : post.Content))
@L["ContinueReading"] @@ -67,7 +69,7 @@ | - 156K @L["Read"] + @post.ReadCount @L["Read"] | @@ -92,7 +94,13 @@What is new?
+ + @if (await Authorization.IsGrantedAsync(BloggingPermissions.Posts.Create)) + { + Create New Post + } + +@L["WhatIsNew"]
@foreach (var tag in post.Tags) { - @tag.Name + @tag.Name }
@@ -200,7 +208,7 @@ | - 156K + @post.ReadCount | @@ -226,7 +234,7 @@
@foreach (var popularTag in Model.PopularTags)
{
- @popularTag.Tag.Name (@popularTag.Count @L["Posts"])
+ @popularTag.Name (@popularTag.UsageCount @L["Posts"])
}
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml.cs
index b1173f3011..9d6a9cb635 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml.cs
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml.cs
@@ -20,7 +20,7 @@ namespace Volo.Blogging.Pages.Blog.Posts
public IReadOnlyList Posts { get; set; }
- public IReadOnlyList PopularTags { get; set; }
+ public IReadOnlyList PopularTags { get; set; }
public IndexModel(IPostAppService postAppService, IBlogAppService blogAppService, ITagAppService tagAppService)
{
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Tags/Posts.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Tags/Posts.cshtml
new file mode 100644
index 0000000000..eca2193515
--- /dev/null
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Tags/Posts.cshtml
@@ -0,0 +1,93 @@
+@page
+@inherits Volo.Blogging.Pages.Blog.BloggingPage
+@using Volo.Blogging.Pages.Blog.Tags
+@model PostsModel
+@{
+}
+
+@section scripts {
+
+
+}
+@section styles {
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
+ @for (var index = 0; index < Model.Posts.Count; index++)
+ {
+ var post = Model.Posts[index];
+ var oddPost = index % 2 == 1;
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+ Armağan Ünlü, @((DateTime.Today - post.CreationTime).Days) @L["DaysAgo"]
+
+ |
+
+ @post.ReadCount
+
+ |
+
+ @post.CommentCount
+
+
+
+
+
+
+
+ }
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Tags/Posts.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Tags/Posts.cshtml.cs
new file mode 100644
index 0000000000..bb040e021b
--- /dev/null
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Tags/Posts.cshtml.cs
@@ -0,0 +1,34 @@
+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 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;
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/CommentAppService_Tests.cs b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/CommentAppService_Tests.cs
index b3bbaa0742..4c4397cc94 100644
--- a/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/CommentAppService_Tests.cs
+++ b/modules/blogging/test/Volo.Blogging.Application.Tests/Volo/Blogging/CommentAppService_Tests.cs
@@ -1,6 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Threading.Tasks;
using Shouldly;
using Volo.Blogging.Comments;
#@Model.TagName
++ @foreach (var tag in post.Tags) + { + @tag.Name + } +
++ @post.Title +
++ @(post.Content == null ? "" : (post.Content.Length > 250 ? post.Content.Substring(0, 150) : post.Content))... +
+