From ff65510ef83bb4d1317b624389b7a3fa6ee3c638 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 6 Jan 2020 13:12:36 +0300
Subject: [PATCH] [Blogging module] Change "Blog" folder name to "Blogs"

resolves https://github.com/abpframework/abp/issues/2564
---
 .../Volo.Blogging.Web/BloggingWebModule.cs    |   8 +-
 .../Pages/Blog/Posts/Detail.cshtml            | 319 ------------------
 .../Pages/{Blog => Blogs}/BloggingPage.cs     |   0
 .../{Blog => Blogs}/BloggingPageModel.cs      |   0
 .../Pages/{Blog => Blogs}/Index.cshtml        |   2 +-
 .../Pages/{Blog => Blogs}/Index.cshtml.cs     |   0
 .../Pages/Blogs/Posts/Detail.cshtml           | 319 ++++++++++++++++++
 .../{Blog => Blogs}/Posts/Detail.cshtml.cs    |   0
 .../Pages/{Blog => Blogs}/Posts/Edit.cshtml   |   4 +-
 .../{Blog => Blogs}/Posts/Edit.cshtml.cs      |   0
 .../Pages/{Blog => Blogs}/Posts/Index.cshtml  |  10 +-
 .../{Blog => Blogs}/Posts/Index.cshtml.cs     |   0
 .../Pages/{Blog => Blogs}/Posts/Index.css     |   0
 .../Pages/{Blog => Blogs}/Posts/Index.min.css |   0
 .../Pages/{Blog => Blogs}/Posts/Index.scss    |   0
 .../Pages/{Blog => Blogs}/Posts/New.cshtml    |   4 +-
 .../Pages/{Blog => Blogs}/Posts/New.cshtml.cs |   0
 .../Pages/{Blog => Blogs}/Posts/detail.js     |   0
 .../Pages/{Blog => Blogs}/Posts/edit.js       |   0
 .../Pages/{Blog => Blogs}/Posts/new.css       |   0
 .../Pages/{Blog => Blogs}/Posts/new.css.map   |   0
 .../Pages/{Blog => Blogs}/Posts/new.js        |   0
 .../Pages/{Blog => Blogs}/Posts/new.min.css   |   0
 .../Pages/{Blog => Blogs}/Posts/new.scss      |   0
 .../{Blog => Blogs}/Shared/Scripts/blog.js    |   0
 .../Shared/Styles/_bootstrap-overwrite.scss   |   0
 .../Shared/Styles/_custom.scss                |   0
 .../Shared/Styles/_header.scss                |   0
 .../{Blog => Blogs}/Shared/Styles/_home.css   |   0
 .../Shared/Styles/_home.min.css               |   0
 .../{Blog => Blogs}/Shared/Styles/_home.scss  |   0
 .../{Blog => Blogs}/Shared/Styles/_post.scss  |   0
 .../{Blog => Blogs}/Shared/Styles/blog.css    |   0
 .../Shared/Styles/blog.css.map                |   0
 .../Shared/Styles/blog.min.css                |   0
 .../{Blog => Blogs}/Shared/Styles/blog.scss   |   0
 .../Pages/{Blog => Blogs}/_ViewImports.cshtml |   0
 37 files changed, 333 insertions(+), 333 deletions(-)
 delete mode 100644 modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/BloggingPage.cs (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/BloggingPageModel.cs (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Index.cshtml (89%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Index.cshtml.cs (100%)
 create mode 100644 modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/Detail.cshtml.cs (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/Edit.cshtml (96%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/Edit.cshtml.cs (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/Index.cshtml (94%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/Index.cshtml.cs (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/Index.css (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/Index.min.css (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/Index.scss (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/New.cshtml (96%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/New.cshtml.cs (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/detail.js (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/edit.js (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/new.css (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/new.css.map (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/new.js (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/new.min.css (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Posts/new.scss (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Scripts/blog.js (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/_bootstrap-overwrite.scss (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/_custom.scss (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/_header.scss (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/_home.css (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/_home.min.css (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/_home.scss (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/_post.scss (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/blog.css (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/blog.css.map (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/blog.min.css (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/Shared/Styles/blog.scss (100%)
 rename modules/blogging/src/Volo.Blogging.Web/Pages/{Blog => Blogs}/_ViewImports.cshtml (100%)

diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs
index 063ecebf5b2..00fa553902d 100644
--- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs
+++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs
@@ -59,10 +59,10 @@ public override void ConfigureServices(ServiceConfigurationContext context)
 
                 var routePrefix = urlOptions.RoutePrefix;
 
-                options.Conventions.AddPageRoute("/Blog/Posts/Index", routePrefix + "{blogShortName}");
-                options.Conventions.AddPageRoute("/Blog/Posts/Detail", routePrefix + "{blogShortName}/{postUrl}");
-                options.Conventions.AddPageRoute("/Blog/Posts/Edit", routePrefix + "{blogShortName}/posts/{postId}/edit");
-                options.Conventions.AddPageRoute("/Blog/Posts/New", routePrefix + "{blogShortName}/posts/new");
+                options.Conventions.AddPageRoute("/Blogs/Posts/Index", routePrefix + "{blogShortName}");
+                options.Conventions.AddPageRoute("/Blogs/Posts/Detail", routePrefix + "{blogShortName}/{postUrl}");
+                options.Conventions.AddPageRoute("/Blogs/Posts/Edit", routePrefix + "{blogShortName}/posts/{postId}/edit");
+                options.Conventions.AddPageRoute("/Blogs/Posts/New", routePrefix + "{blogShortName}/posts/new");
             });
         }
     }
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml
deleted file mode 100644
index 4c945e8aac1..00000000000
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml
+++ /dev/null
@@ -1,319 +0,0 @@
-@page
-@inherits Volo.Blogging.Pages.Blog.BloggingPage
-@using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Http.Extensions
-@using Volo.Abp.Users
-@using Volo.Blogging
-@using Volo.Blogging.Pages.Blog.Posts
-@using Volo.Blogging.Areas.Blog.Helpers.TagHelpers
-@inject IAuthorizationService Authorization
-@model DetailModel
-@{
-    ViewBag.PageTitle = "Blog";
-    var hasCommentingPermission = CurrentUser.IsAuthenticated; //TODO: Apply real policy!
-}
-@section scripts {
-    <abp-script-bundle name="@typeof(DetailModel).FullName">
-        <abp-script src="/Pages/Blog/Posts/detail.js" />
-    </abp-script-bundle>
-}
-@section styles {
-    <abp-style-bundle name="@typeof(DetailModel).FullName">
-        <abp-style src="/Pages/Blog/Shared/Styles/blog.css" />
-    </abp-style-bundle>
-}
-
-<div class="vs-blog vs-blog-detail">
-    <abp-input asp-for="FocusCommentId" class="m-0" />
-    <div class="container">
-        <div class="row">
-            <div class="col-md-8 col-lg-8 mx-auto">
-                <section class="hero-section">
-                    <div class="hero-articles">
-                        <div class="hero-content">
-                            <h1 class="mb-3">
-                                <a asp-page="./Detail" asp-route-postUrl="@Model.Post.Url" asp-route-blogShortName="@Model.BlogShortName">@Model.Post.Title</a>
-                            </h1>
-
-                            <div class="article-owner">
-                                <div class="article-infos">
-                                    <div class="user-card mt-3 mb-4">
-                                        <div class="row">
-                                            <div class="col-auto pr-1">
-                                                @if (Model.Post.Writer != null)
-                                                {
-                                                    <img gravatar-email="@Model.Post.Writer.Email" default-image="Identicon" class="article-avatar" />
-                                                }
-                                            </div>
-                                            <div class="col pl-1">
-                                                @if (Model.Post.Writer != null)
-                                                {
-                                                    <h5 class="mt-2 mb-1">@(Model.Post.Writer.UserName) <span>@ConvertDatetimeToTimeAgo(Model.Post.CreationTime)</span></h5>
-
-                                                }
-                                                
-                                                <i class="fa fa-eye"></i> @L["WiewsWithCount", @Model.Post.ReadCount]
-                                                <span class="vs-seperator">|</span>
-                                                <i class="fa fa-comment"></i> @L["CommentWithCount", @Model.CommentCount]
-
-
-                                                @if (await Authorization.IsGrantedAsync(BloggingPermissions.Posts.Update))
-                                                {
-                                                    <span class="seperator">|</span>
-                                                    <a asp-page="./Edit" asp-route-postId="@Model.Post.Id" asp-route-blogShortName="@Model.BlogShortName">
-                                                        <i class="fa fa-pencil"></i> @L["Edit"]
-                                                    </a>
-                                                }
-                                                @if (await Authorization.IsGrantedAsync(BloggingPermissions.Posts.Delete) || (CurrentUser.Id.HasValue && CurrentUser.Id == Model.Post.CreatorId))
-                                                {
-                                                    <span class="seperator">|</span>
-                                                    <a href="#" id="DeletePostLink" data-postid="@Model.Post.Id" data-blogShortName="@Model.BlogShortName">
-                                                        <i class="fa fa-trash"></i> @L["Delete"]
-                                                    </a>
-                                                }
-                                            </div>
-                                        </div> 
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="img-container mb-3">
-                            <img src="@Model.Post.CoverImage" />
-                        </div>
-                    </div>
-                </section>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-md-8 col-lg-8 mx-auto">
-                <section class="post-content">
-                    <p>
-                        @Html.Raw(RenderMarkdownToHtml(Model.Post.Content))
-                    </p>
-                </section>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-md-8 col-lg-8 mx-auto">
-                @if (Model.Post.Tags.Count > 0)
-                {
-                    <div class="tags">
-                        <h5>@L["TagsInThisArticle"]</h5>
-                        @foreach (var tag in Model.Post.Tags)
-                        {
-                            <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
-                        }
-                    </div>
-                }
-
-
-                @if (Model.CommentsWithReplies.Count > 0)
-                {
-                    <abp-row v-align="Start">
-                        <abp-column size-sm="_12">
-                            <p class="float-left"><i class="fa fa-comment"></i> @L["CommentWithCount", @Model.CommentCount]</p>
-                            @if (hasCommentingPermission)
-                            {
-                                <a abp-button="Primary" class="btn-rounded float-right active" href="#LeaveComment">@L["LeaveComment"]</a>
-                            }
-                            else
-                            {
-                                <a abp-button="Primary" class="btn-rounded float-right active" href="/Account/Login?returnUrl=@Request.GetEncodedPathAndQuery()">@L["LeaveComment"]</a>
-                            }
-                        </abp-column>
-                    </abp-row>
-                }
-
-                <div class="comment-area">
-                    @foreach (var commentWithRepliesDto in Model.CommentsWithReplies)
-                    {
-                        <div class="media">
-                            <img gravatar-email="@commentWithRepliesDto.Comment.Writer.Email" default-image="Identicon" class="d-flex mr-3 rounded-circle comment-avatar" />
-                            <div class="media-body">
-                                <h5 class="comment-owner">
-                                    @(commentWithRepliesDto.Comment.Writer == null ? "" : commentWithRepliesDto.Comment.Writer.UserName)
-                                    <span>@ConvertDatetimeToTimeAgo(commentWithRepliesDto.Comment.CreationTime)</span>
-                                </h5>
-                                <p id="@commentWithRepliesDto.Comment.Id">
-                                    @commentWithRepliesDto.Comment.Text
-                                </p>
-                                <div class="comment-buttons">
-
-                                    @if (hasCommentingPermission)
-                                    {
-                                        <a href="#" class="tag replyLink" data-relpyid="@commentWithRepliesDto.Comment.Id">
-                                            <i class="fa fa-reply" aria-hidden="true"></i> @L["Reply"]
-                                        </a>
-                                    }
-
-                                    @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Delete))
-                                    {
-                                        <span class="seperator">|</span>
-                                        <a href="#" class="tag deleteLink" data-deleteid="@commentWithRepliesDto.Comment.Id">
-                                            <i class="fa fa-trash" aria-hidden="true"></i> @L["Delete"]
-                                        </a>
-                                    }
-
-                                    @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
-                                    {
-                                        <span class="seperator">|</span>
-                                        <a href="#" class="tag updateLink" data-updateid="@commentWithRepliesDto.Comment.Id">
-                                            <i class="fa fa-pencil" aria-hidden="true"></i> @L["Edit"]
-                                        </a>
-                                    }
-                                </div>
-
-                                @if (hasCommentingPermission)
-                                {
-                                    <div class="comment-form mt-4 replyForm">
-                                        <div class="clearfix p-4">
-                                            <h3 class="mt-0">
-                                                @L["ReplyTo", commentWithRepliesDto.Comment.Writer == null ? "" : commentWithRepliesDto.Comment.Writer.UserName]
-
-                                            </h3>
-                                            <div>
-                                                <form method="post">
-                                                    <input name="postId" value="@Model.Post.Id" hidden />
-                                                    <input name="repliedCommentId" value="@commentWithRepliesDto.Comment.Id" hidden />
-
-                                                    <div class="form-group">
-                                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
-                                                    </div>
-                                                    <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Comment"].Value" />
-                                                    <abp-button button-type="Danger" class="btn-rounded float-right replyCancelButton" text="@L["Cancel"].Value" />
-                                                </form>
-                                            </div>
-                                        </div>
-                                    </div>
-                                }
-                                @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
-                                {
-                                    <div class="comment-form mt-4 editForm">
-                                        <div class="clearfix p-4">
-                                            <div>
-                                                <form class="editFormClass">
-                                                    <input name="commentId" value="@commentWithRepliesDto.Comment.Id" hidden />
-                                                    <div class="form-group">
-                                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4">@commentWithRepliesDto.Comment.Text</textarea>
-                                                    </div>
-                                                    <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
-                                                    <abp-button button-type="Danger" class="btn-rounded float-right editCancelButton" text="@L["Cancel"].Value" />
-                                                </form>
-                                            </div>
-                                        </div>
-                                    </div>
-                                }
-
-                                @foreach (var reply in commentWithRepliesDto.Replies)
-                                {
-                                    <div class="media">
-                                        <img gravatar-email="@reply.Writer.Email" default-image="Identicon" class="d-flex mr-3 rounded-circle comment-avatar" />
-                                        <div class="media-body">
-                                            <h5 class="comment-owner">
-                                                @(reply.Writer == null ? "" : reply.Writer.UserName)
-                                                <span>@ConvertDatetimeToTimeAgo(reply.CreationTime)</span>
-                                            </h5>
-                                            <p id="@reply.Id">
-                                                @reply.Text
-                                            </p>
-                                            <div class="comment-buttons">
-
-                                                @if (hasCommentingPermission)
-                                                {
-                                                    <a href="#" class="tag replyLink" data-relpyid="@commentWithRepliesDto.Comment.Id">
-                                                        <i class="fa fa-reply" aria-hidden="true"></i> @L["Reply"]
-                                                    </a>
-                                                }
-                                                @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Delete) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
-                                                {
-                                                    <span class="seperator">|</span>
-                                                    <a href="#" class="tag deleteLink" data-deleteid="@reply.Id">
-                                                        <i class="fa fa-trash" aria-hidden="true"></i> @L["Delete"]
-                                                    </a>
-                                                }
-
-                                                @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
-                                                {
-                                                    <span class="seperator">|</span>
-                                                    <a href="#" class="tag updateLink" data-updateid="@reply.Id">
-                                                        <i class="fa fa-pencil" aria-hidden="true"></i> @L["Edit"]
-                                                    </a>
-                                                }
-                                            </div>
-
-                                            @if (hasCommentingPermission)
-                                            {
-                                                <div class="comment-form mt-4 replyForm">
-                                                    <div class="clearfix bg-light p-4">
-                                                        <h3 class="mt-0">
-                                                            @L["ReplyTo", commentWithRepliesDto.Comment.Writer == null ? "" : commentWithRepliesDto.Comment.Writer.UserName]
-                                                        </h3>
-                                                        <div>
-                                                            <form method="post">
-                                                                <input name="postId" value="@Model.Post.Id" hidden />
-                                                                <input name="repliedCommentId" value="@commentWithRepliesDto.Comment.Id" hidden />
-                                                                <div class="form-group">
-                                                                    <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
-                                                                </div>
-                                                                <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
-                                                                <abp-button button-type="Danger" class="btn-rounded float-right replyCancelButton" text="@L["Cancel"].Value" />
-                                                            </form>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            }
-                                            @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
-                                            {
-                                                <div class="comment-form mt-4 editForm">
-                                                    <div class="clearfix bg-light p-4">
-                                                        <div>
-                                                            <form class="editFormClass">
-                                                                <input name="commentId" value="@reply.Id" hidden />
-                                                                <div class="form-group">
-                                                                    <textarea class="form-control no-border" name="text" id="textBoxId" rows="4">@reply.Text</textarea>
-                                                                </div>
-                                                                <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
-                                                                <abp-button button-type="Danger" class="btn-rounded float-right editCancelButton" text="@L["Cancel"].Value" />
-                                                            </form>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            }
-                                        </div>
-                                    </div>
-                                }
-                            </div>
-                        </div>
-                    }
-                </div>
-
-                @if (hasCommentingPermission)
-                {
-                    <div class="comment-form mt-4" id="LeaveComment">
-                        <div class="vs-blog-title mb-0">
-                            <h3>@L["LeaveComment"]</h3>
-                        </div>
-                        <div class="clearfix bg-light p-4">
-                            <div>
-                                <form method="post">
-                                    <input name="postId" value="@Model.Post.Id" hidden />
-                                    <input name="repliedCommentId" id="repliedCommentId" hidden />
-                                    <div class="form-group">
-                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
-                                    </div>
-                                    <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                }
-                else
-                {
-                    <a abp-button="Primary" class="btn-rounded float-right active mt-3" href="/Account/Login?returnUrl=@Request.GetEncodedPathAndQuery()">@L["LeaveComment"]</a>
-                }
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPage.cs
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPage.cs
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPageModel.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPageModel.cs
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPageModel.cs
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/BloggingPageModel.cs
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml
similarity index 89%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml
index 97f06b6dc09..91eb12fac4a 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml
@@ -3,7 +3,7 @@
 @inherits BloggingPage
 @model IndexModel
 @{
-    ViewBag.PageTitle = "Blog";
+    ViewBag.PageTitle = "Blogs";
 }
 <h2>
     @L["Blogs"]
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Index.cshtml.cs
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Index.cshtml.cs
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
new file mode 100644
index 00000000000..a76e92ea9b9
--- /dev/null
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
@@ -0,0 +1,319 @@
+@page
+@inherits Volo.Blogging.Pages.Blog.BloggingPage
+@using Microsoft.AspNetCore.Authorization
+@using Microsoft.AspNetCore.Http.Extensions
+@using Volo.Abp.Users
+@using Volo.Blogging
+@using Volo.Blogging.Pages.Blog.Posts
+@using Volo.Blogging.Areas.Blog.Helpers.TagHelpers
+@inject IAuthorizationService Authorization
+@model DetailModel
+@{
+    ViewBag.PageTitle = Model.Post.Title;
+    var hasCommentingPermission = CurrentUser.IsAuthenticated; //TODO: Apply real policy!
+}
+@section scripts {
+    <abp-script-bundle name="@typeof(DetailModel).FullName">
+        <abp-script src="/Pages/Blogs/Posts/detail.js" />
+    </abp-script-bundle>
+}
+@section styles {
+    <abp-style-bundle name="@typeof(DetailModel).FullName">
+        <abp-style src="/Pages/Blogs/Shared/Styles/blog.css" />
+    </abp-style-bundle>
+}
+
+<div class="vs-blog vs-blog-detail">
+    <abp-input asp-for="FocusCommentId" class="m-0" />
+    <div class="container">
+        <div class="row">
+            <div class="col-md-8 col-lg-8 mx-auto">
+                <section class="hero-section">
+                    <div class="hero-articles">
+                        <div class="hero-content">
+                            <h1 class="mb-3">
+                                <a asp-page="./Detail" asp-route-postUrl="@Model.Post.Url" asp-route-blogShortName="@Model.BlogShortName">@Model.Post.Title</a>
+                            </h1>
+
+                            <div class="article-owner">
+                                <div class="article-infos">
+                                    <div class="user-card mt-3 mb-4">
+                                        <div class="row">
+                                            <div class="col-auto pr-1">
+                                                @if (Model.Post.Writer != null)
+                                                {
+                                                    <img gravatar-email="@Model.Post.Writer.Email" default-image="Identicon" class="article-avatar" />
+                                                }
+                                            </div>
+                                            <div class="col pl-1">
+                                                @if (Model.Post.Writer != null)
+                                                {
+                                                    <h5 class="mt-2 mb-1">@(Model.Post.Writer.UserName) <span>@ConvertDatetimeToTimeAgo(Model.Post.CreationTime)</span></h5>
+
+                                                }
+
+                                                <i class="fa fa-eye"></i> @L["WiewsWithCount", @Model.Post.ReadCount]
+                                                <span class="vs-seperator">|</span>
+                                                <i class="fa fa-comment"></i> @L["CommentWithCount", @Model.CommentCount]
+
+
+                                                @if (await Authorization.IsGrantedAsync(BloggingPermissions.Posts.Update))
+                                                {
+                                                    <span class="seperator">|</span>
+                                                    <a asp-page="./Edit" asp-route-postId="@Model.Post.Id" asp-route-blogShortName="@Model.BlogShortName">
+                                                        <i class="fa fa-pencil"></i> @L["Edit"]
+                                                    </a>
+                                                }
+                                                @if (await Authorization.IsGrantedAsync(BloggingPermissions.Posts.Delete) || (CurrentUser.Id.HasValue && CurrentUser.Id == Model.Post.CreatorId))
+                                                {
+                                                    <span class="seperator">|</span>
+                                                    <a href="#" id="DeletePostLink" data-postid="@Model.Post.Id" data-blogShortName="@Model.BlogShortName">
+                                                        <i class="fa fa-trash"></i> @L["Delete"]
+                                                    </a>
+                                                }
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="img-container mb-3">
+                            <img src="@Model.Post.CoverImage" />
+                        </div>
+                    </div>
+                </section>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8 col-lg-8 mx-auto">
+                <section class="post-content">
+                    <p>
+                        @Html.Raw(RenderMarkdownToHtml(Model.Post.Content))
+                    </p>
+                </section>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-8 col-lg-8 mx-auto">
+                @if (Model.Post.Tags.Count > 0)
+                {
+                    <div class="tags">
+                        <h5>@L["TagsInThisArticle"]</h5>
+                        @foreach (var tag in Model.Post.Tags)
+                        {
+                            <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
+                        }
+                    </div>
+                }
+
+
+                @if (Model.CommentsWithReplies.Count > 0)
+                {
+                    <abp-row v-align="Start">
+                        <abp-column size-sm="_12">
+                            <p class="float-left"><i class="fa fa-comment"></i> @L["CommentWithCount", @Model.CommentCount]</p>
+                            @if (hasCommentingPermission)
+                            {
+                                <a abp-button="Primary" class="btn-rounded float-right active" href="#LeaveComment">@L["LeaveComment"]</a>
+                            }
+                            else
+                            {
+                                <a abp-button="Primary" class="btn-rounded float-right active" href="/Account/Login?returnUrl=@Request.GetEncodedPathAndQuery()">@L["LeaveComment"]</a>
+                            }
+                        </abp-column>
+                    </abp-row>
+
+                    <div class="comment-area">
+                        @foreach (var commentWithRepliesDto in Model.CommentsWithReplies)
+                        {
+                            <div class="media">
+                                <img gravatar-email="@commentWithRepliesDto.Comment.Writer.Email" default-image="Identicon" class="d-flex mr-3 rounded-circle comment-avatar" />
+                                <div class="media-body">
+                                    <h5 class="comment-owner">
+                                        @(commentWithRepliesDto.Comment.Writer == null ? "" : commentWithRepliesDto.Comment.Writer.UserName)
+                                        <span>@ConvertDatetimeToTimeAgo(commentWithRepliesDto.Comment.CreationTime)</span>
+                                    </h5>
+                                    <p id="@commentWithRepliesDto.Comment.Id">
+                                        @commentWithRepliesDto.Comment.Text
+                                    </p>
+                                    <div class="comment-buttons">
+
+                                        @if (hasCommentingPermission)
+                                        {
+                                            <a href="#" class="tag replyLink" data-relpyid="@commentWithRepliesDto.Comment.Id">
+                                                <i class="fa fa-reply" aria-hidden="true"></i> @L["Reply"]
+                                            </a>
+                                        }
+
+                                        @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Delete))
+                                        {
+                                            <span class="seperator">|</span>
+                                            <a href="#" class="tag deleteLink" data-deleteid="@commentWithRepliesDto.Comment.Id">
+                                                <i class="fa fa-trash" aria-hidden="true"></i> @L["Delete"]
+                                            </a>
+                                        }
+
+                                        @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
+                                        {
+                                            <span class="seperator">|</span>
+                                            <a href="#" class="tag updateLink" data-updateid="@commentWithRepliesDto.Comment.Id">
+                                                <i class="fa fa-pencil" aria-hidden="true"></i> @L["Edit"]
+                                            </a>
+                                        }
+                                    </div>
+
+                                    @if (hasCommentingPermission)
+                                    {
+                                        <div class="comment-form mt-4 replyForm">
+                                            <div class="clearfix p-4">
+                                                <h3 class="mt-0">
+                                                    @L["ReplyTo", commentWithRepliesDto.Comment.Writer == null ? "" : commentWithRepliesDto.Comment.Writer.UserName]
+
+                                                </h3>
+                                                <div>
+                                                    <form method="post">
+                                                        <input name="postId" value="@Model.Post.Id" hidden />
+                                                        <input name="repliedCommentId" value="@commentWithRepliesDto.Comment.Id" hidden />
+
+                                                        <div class="form-group">
+                                                            <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
+                                                        </div>
+                                                        <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Comment"].Value" />
+                                                        <abp-button button-type="Danger" class="btn-rounded float-right replyCancelButton" text="@L["Cancel"].Value" />
+                                                    </form>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    }
+                                    @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
+                                    {
+                                        <div class="comment-form mt-4 editForm">
+                                            <div class="clearfix p-4">
+                                                <div>
+                                                    <form class="editFormClass">
+                                                        <input name="commentId" value="@commentWithRepliesDto.Comment.Id" hidden />
+                                                        <div class="form-group">
+                                                            <textarea class="form-control no-border" name="text" id="textBoxId" rows="4">@commentWithRepliesDto.Comment.Text</textarea>
+                                                        </div>
+                                                        <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
+                                                        <abp-button button-type="Danger" class="btn-rounded float-right editCancelButton" text="@L["Cancel"].Value" />
+                                                    </form>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    }
+
+                                    @foreach (var reply in commentWithRepliesDto.Replies)
+                                    {
+                                        <div class="media">
+                                            <img gravatar-email="@reply.Writer.Email" default-image="Identicon" class="d-flex mr-3 rounded-circle comment-avatar" />
+                                            <div class="media-body">
+                                                <h5 class="comment-owner">
+                                                    @(reply.Writer == null ? "" : reply.Writer.UserName)
+                                                    <span>@ConvertDatetimeToTimeAgo(reply.CreationTime)</span>
+                                                </h5>
+                                                <p id="@reply.Id">
+                                                    @reply.Text
+                                                </p>
+                                                <div class="comment-buttons">
+
+                                                    @if (hasCommentingPermission)
+                                                    {
+                                                        <a href="#" class="tag replyLink" data-relpyid="@commentWithRepliesDto.Comment.Id">
+                                                            <i class="fa fa-reply" aria-hidden="true"></i> @L["Reply"]
+                                                        </a>
+                                                    }
+                                                    @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Delete) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
+                                                    {
+                                                        <span class="seperator">|</span>
+                                                        <a href="#" class="tag deleteLink" data-deleteid="@reply.Id">
+                                                            <i class="fa fa-trash" aria-hidden="true"></i> @L["Delete"]
+                                                        </a>
+                                                    }
+
+                                                    @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
+                                                    {
+                                                        <span class="seperator">|</span>
+                                                        <a href="#" class="tag updateLink" data-updateid="@reply.Id">
+                                                            <i class="fa fa-pencil" aria-hidden="true"></i> @L["Edit"]
+                                                        </a>
+                                                    }
+                                                </div>
+
+                                                @if (hasCommentingPermission)
+                                                {
+                                                    <div class="comment-form mt-4 replyForm">
+                                                        <div class="clearfix bg-light p-4">
+                                                            <h3 class="mt-0">
+                                                                @L["ReplyTo", commentWithRepliesDto.Comment.Writer == null ? "" : commentWithRepliesDto.Comment.Writer.UserName]
+                                                            </h3>
+                                                            <div>
+                                                                <form method="post">
+                                                                    <input name="postId" value="@Model.Post.Id" hidden />
+                                                                    <input name="repliedCommentId" value="@commentWithRepliesDto.Comment.Id" hidden />
+                                                                    <div class="form-group">
+                                                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
+                                                                    </div>
+                                                                    <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
+                                                                    <abp-button button-type="Danger" class="btn-rounded float-right replyCancelButton" text="@L["Cancel"].Value" />
+                                                                </form>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                }
+                                                @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
+                                                {
+                                                    <div class="comment-form mt-4 editForm">
+                                                        <div class="clearfix bg-light p-4">
+                                                            <div>
+                                                                <form class="editFormClass">
+                                                                    <input name="commentId" value="@reply.Id" hidden />
+                                                                    <div class="form-group">
+                                                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4">@reply.Text</textarea>
+                                                                    </div>
+                                                                    <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
+                                                                    <abp-button button-type="Danger" class="btn-rounded float-right editCancelButton" text="@L["Cancel"].Value" />
+                                                                </form>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                }
+                                            </div>
+                                        </div>
+                                    }
+                                </div>
+                            </div>
+                        }
+                    </div>
+                }
+
+                @if (hasCommentingPermission)
+                {
+                    <div class="comment-form mt-4" id="LeaveComment">
+                        <div class="vs-blog-title mb-0">
+                            <h3>@L["LeaveComment"]</h3>
+                        </div>
+                        <div class="clearfix bg-light p-4">
+                            <div>
+                                <form method="post">
+                                    <input name="postId" value="@Model.Post.Id" hidden />
+                                    <input name="repliedCommentId" id="repliedCommentId" hidden />
+                                    <div class="form-group">
+                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
+                                    </div>
+                                    <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                }
+                else
+                {
+                    <a abp-button="Primary" class="btn-rounded float-right active mt-3" href="/Account/Login?returnUrl=@Request.GetEncodedPathAndQuery()">@L["LeaveComment"]</a>
+                }
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml.cs
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml.cs
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
similarity index 96%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
index dac2d5122ff..15119745df8 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
@@ -9,13 +9,13 @@
 @section styles {
     <abp-style-bundle name="@typeof(EditModel).FullName">
         <abp-style type="@typeof(TuiEditorStyleContributor)" />
-        <abp-style src="/Pages/Blog/Posts/new.css" />
+        <abp-style src="/Pages/Blogs/Posts/new.css" />
     </abp-style-bundle>
 }
 @section scripts {
     <abp-script-bundle name="@typeof(EditModel).FullName">
         <abp-script type="@typeof(TuiEditorScriptContributor)" />
-        <abp-script src="/Pages/Blog/Posts/edit.js" />
+        <abp-script src="/Pages/Blogs/Posts/edit.js" />
     </abp-script-bundle>
 }
 
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Edit.cshtml.cs
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml.cs
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml
similarity index 94%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml
index 20ebc1887fb..b0f9dc4d465 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml
@@ -12,13 +12,13 @@
 @section scripts {
     <abp-script-bundle name="@typeof(IndexModel).FullName">
         <abp-script type="@typeof(OwlCarouselScriptContributor)" />
-        <abp-script src="/Pages/Blog/Shared/Scripts/blog.js" />
+        <abp-script src="/Pages/Blogs/Shared/Scripts/blog.js" />
     </abp-script-bundle>
 }
 @section styles {
     <abp-style-bundle name="@typeof(IndexModel).FullName">
         <abp-script type="@typeof(OwlCarouselStyleContributor)" />
-        <abp-style src="/Pages/Blog/Shared/Styles/blog.css" />
+        <abp-style src="/Pages/Blogs/Shared/Styles/blog.css" />
     </abp-style-bundle>
 }
 
@@ -69,7 +69,7 @@
                             <p class="tags">
                                 @foreach (var tag in post.Tags)
                                 {
-                                    <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
+                                    <a asp-page="/Blogs/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
                                 }
                             </p>
 
@@ -178,7 +178,7 @@
                                             <p class="tags">
                                                 @foreach (var tag in post.Tags)
                                                 {
-                                                    <a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
+                                                    <a asp-page="/Blogs/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
                                                 }
                                             </p>
                                         </div>
@@ -200,7 +200,7 @@
                             @foreach (var popularTag in Model.PopularTags)
                             {
                                 <div class="list-group-item">
-                                    <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>
+                                    <a asp-page="/Blogs/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@popularTag.Name">@popularTag.Name <span>(@popularTag.UsageCount @L["Posts"])</span></a>
                                 </div>
 
                             }
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml.cs
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml.cs
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.css
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.css
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.css
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.min.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.min.css
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.min.css
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.min.css
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.scss
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.scss
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.scss
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
similarity index 96%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
index b96a531550a..95b7de9e03e 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
@@ -9,13 +9,13 @@
 @section styles {
     <abp-style-bundle name="@typeof(NewModel).FullName">
         <abp-style type="@typeof(TuiEditorStyleContributor)" />
-        <abp-style src="/Pages/Blog/Posts/new.css" />
+        <abp-style src="/Pages/Blogs/Posts/new.css" />
     </abp-style-bundle>
 }
 @section scripts {
     <abp-script-bundle name="@typeof(NewModel).FullName">
         <abp-script type="@typeof(TuiEditorScriptContributor)" />
-        <abp-script src="/Pages/Blog/Posts/new.js" />
+        <abp-script src="/Pages/Blogs/Posts/new.js" />
     </abp-script-bundle>
 }
 <main>
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/New.cshtml.cs
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml.cs
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/detail.js
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/edit.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/edit.js
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/edit.js
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/edit.js
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.css
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.css
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.css
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.css.map b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.css.map
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.css.map
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.css.map
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.js
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.js
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.js
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.min.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.min.css
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.min.css
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.min.css
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.scss
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/new.scss
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/new.scss
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Scripts/blog.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Scripts/blog.js
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Scripts/blog.js
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_bootstrap-overwrite.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_bootstrap-overwrite.scss
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_custom.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_custom.scss
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_custom.scss
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_custom.scss
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_header.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_header.scss
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_header.scss
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_header.scss
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_home.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.css
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_home.css
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.css
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_home.min.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.min.css
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_home.min.css
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.min.css
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_home.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.scss
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_home.scss
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.scss
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_post.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_post.scss
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/_post.scss
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_post.scss
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/blog.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/blog.css
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/blog.css.map b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css.map
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/blog.css.map
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css.map
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/blog.min.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/blog.min.css
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/blog.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Shared/Styles/blog.scss
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blog/_ViewImports.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/_ViewImports.cshtml
similarity index 100%
rename from modules/blogging/src/Volo.Blogging.Web/Pages/Blog/_ViewImports.cshtml
rename to modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/_ViewImports.cshtml