From a2f414c460493314cd7ab6c1992d9bb463aa3fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?=
 <98148844+onurpicakci@users.noreply.github.com>
Date: Wed, 17 May 2023 10:42:34 +0300
Subject: [PATCH] refactoring

---
 .../Blogging/Localization/Resources/en.json   |   5 +-
 .../Pages/Blogs/Posts/Detail.cshtml           |   5 +-
 .../Pages/Members/Index.cshtml                | 223 +++++++++++-------
 3 files changed, 147 insertions(+), 86 deletions(-)

diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json
index 989926f760..a5499b77a5 100644
--- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json
+++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/Localization/Resources/en.json
@@ -73,6 +73,9 @@
     "FullURL": "Full URL",
     "JobTitle": "Job Title",
     "PersonalWebsite": "PERSONAL WEBSITE",
-    "EditProfile": "Edit Profile"
+    "EditProfile": "Edit Profile",
+    "MoreFromBlog": "More From Blog",
+    "MoreFromUser": "More From {0}",
+    "BlogPosts": "Posts"
   }
 }
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
index 0cb5ceeef0..383b7b12af 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
@@ -172,7 +172,7 @@
             @if (Model.LatestPosts.Count > 1)
             {
                 <hr/>
-                <p class="fs-3 fw-bold text-dark">More from Blog</p>
+                <p class="fs-3 fw-bold text-dark">@L["MoreFromBlog"]</p>
                 @for (var index = 0; index < Model.LatestPosts.Count && index < 5; index++)
                 {
                     if (Model.LatestPosts[index].Id != Model.Post.Id)
@@ -440,7 +440,8 @@ else
     <div class="hero content">
         @if (Model.PostsList.Count > 1)
         {
-            <p class="fs-3 fw-bold text-dark">More from @CultureInfo.CurrentCulture.TextInfo.ToTitleCase(Model.Post.Writer.UserName)</p>
+            var userName = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(Model.Post.Writer.UserName);
+            <p class="fs-3 fw-bold text-dark">@L["MoreFromUser", userName]</p>
             for (var index = 0; index < Model.PostsList.Count; index++)
             {
                 if (Model.PostsList[index].Id != Model.Post.Id)
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.cshtml
index 12ed3cc854..47b92f65d3 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.cshtml
@@ -99,99 +99,156 @@
                 </div>
             </div>
             <div class="col-md-8">
-                    <abp-tabs>
-                     @if (Model.Posts is not null && Model.Posts.Any())
-                     {
-                         <abp-tab name="all-posts" title="Blog Posts">
-                             <div class="mt-4 pt-3">
-                                 @foreach (var post in Model.Posts)
-                                 {
-                                     <div class="post-item">
-                                         <div class="post-type-cont">
-
-                                             <a href="@Model.GetMemberProfileUrl(Model.User)" class="text-decoration-none">
-                                                 <img gravatar-email="@Model.User.Email" default-image="Identicon" class="post-member-img rounded-circle d-block"/>
-                                             </a>
-                                             <span class="post-type">
-                                                 <i class="fas fa-pen-nib"></i>
-                                                 @L["Blog"].Value.ToUpper()
-                                             </span>
-                                         </div>
-                                         <div class="post-detail-cont">
-                                             <div class="post-info fs-12 mb-2">
-                                                 <a href="@Model.GetMemberProfileUrl(Model.User)" class="text-decoration-none">
-                                                     <span class="text-dark dot">@Model.User.UserName</span>
-                                                 </a>
-                                                 <span class="text-dark-200 dot">@post.CreationTime.ToString("MMMM yyyy")</span>
-                                                 <span class="text-dark-200">@post.ReadCount.ToString() @L["Views"]</span>
-                                             </div>
-                                             <h3 class="post-title mb-3">
-                                                 <a href="@Model.GetBlogPostUrl(post)">
-                                                     @post.Title
-                                                 </a>
-                                             </h3>
-                                             <p class="post-desc">
-                                                 <a href="@Model.GetBlogPostUrl(post)">
-                                                     @post.Description.TruncateWithPostfix(150)
-                                                 </a>
-                                                 <a href="@Model.GetBlogPostUrl(post)" class="readMore">@L["ReadMore"]</a>
-                                             </p>
-                                         </div>
-                                         <div class="post-img-cont">
-                                             <div class="post-list-span text-center post">
-                                                 <img src="@post.CoverImage" class="box-articles">
-                                             </div>
-                                         </div>
-                                     </div>
-                                 }
-                             </div>
-                         </abp-tab>
-                     }
-                     else
-                                 {
-                                     <div class="col-md-8">
-                                         <div class="mt-5 pt-6">
-                                             <p>@L["MemberNotPublishedPostYet"]</p>
-                                         </div>
-                                     </div>
-                                 }
-                        @if (CurrentUser.UserName == Model.User.UserName)
-                        {
-                            <abp-tab name="edit-profile" title="Edit Profile">
-                                <div class="mt-4 mb-3 pt-3">
-                                    <form method="post">
-                                        <abp-row>
-                                            <abp-column size="_12" v-align="Center">
-                                                <abp-input class="form-control" asp-for="CustomUserUpdate.Name" required-symbol="false" label="@($"{L["Name"].Value} ({L["Optional"].Value})")" value="@Model.User.Name"></abp-input>
+            @if (CurrentUser.UserName == Model.User.UserName)
+            {
+                <abp-tabs>
+                    @if (Model.Posts is not null && Model.Posts.Any())
+                    {
+                        <abp-tab name="all-posts" title="Posts">
+                            <div class="mt-4 pt-3">
+                                @foreach (var post in Model.Posts)
+                                {
+                                    <div class="post-item">
+                                        <div class="post-type-cont">
+
+                                            <a href="@Model.GetMemberProfileUrl(Model.User)" class="text-decoration-none">
+                                                <img gravatar-email="@Model.User.Email" default-image="Identicon" class="post-member-img rounded-circle d-block"/>
+                                            </a>
+                                            <span class="post-type">
+                                                <i class="fas fa-pen-nib"></i>
+                                                @L["Blog"].Value.ToUpper()
+                                            </span>
+                                        </div>
+                                        <div class="post-detail-cont">
+                                            <div class="post-info fs-12 mb-2">
+                                                <a href="@Model.GetMemberProfileUrl(Model.User)" class="text-decoration-none">
+                                                    <span class="text-dark dot">@Model.User.UserName</span>
+                                                </a>
+                                                <span class="text-dark-200 dot">@post.CreationTime.ToString("MMMM yyyy")</span>
+                                                <span class="text-dark-200">@post.ReadCount.ToString() @L["Views"]</span>
+                                            </div>
+                                            <h3 class="post-title mb-3">
+                                                <a href="@Model.GetBlogPostUrl(post)">
+                                                    @post.Title
+                                                </a>
+                                            </h3>
+                                            <p class="post-desc">
+                                                <a href="@Model.GetBlogPostUrl(post)">
+                                                    @post.Description.TruncateWithPostfix(150)
+                                                </a>
+                                                <a href="@Model.GetBlogPostUrl(post)" class="readMore">@L["ReadMore"]</a>
+                                            </p>
+                                        </div>
+                                        <div class="post-img-cont">
+                                            <div class="post-list-span text-center post">
+                                                <img src="@post.CoverImage" class="box-articles">
+                                            </div>
+                                        </div>
+                                    </div>
+                                }
+                            </div>
+                        </abp-tab>
+                    }
+                    else
+                    {
+                        <div class="col-md-8">
+                            <div class="mt-5 pt-6">
+                                <p>@L["MemberNotPublishedPostYet"]</p>
+                            </div>
+                        </div>
+                    }
+                    <abp-tab name="edit-profile" title="Edit Profile">
+                        <div class="mt-4 mb-3 pt-3">
+                            <form method="post">
+                                <abp-row>
+                                    <abp-column size="_12" v-align="Center">
+                                        <abp-input class="form-control" asp-for="CustomUserUpdate.Name" required-symbol="false" label="@($"{L["Name"].Value} ({L["Optional"].Value})")" value="@Model.User.Name"></abp-input>
 
-                                                <abp-input class="form-control" asp-for="CustomUserUpdate.Surname" required-symbol="false" label="@($"{L["Surname"].Value} ({L["Optional"].Value})")" value="@Model.User.Surname"></abp-input>
+                                        <abp-input class="form-control" asp-for="CustomUserUpdate.Surname" required-symbol="false" label="@($"{L["Surname"].Value} ({L["Optional"].Value})")" value="@Model.User.Surname"></abp-input>
 
-                                                <abp-input class="form-control" asp-for="CustomUserUpdate.WebSite" required-symbol="false" label="@($"{L["WebSite"].Value} ({L["Optional"].Value})")" value="@Model.User.WebSite" info="@L["UpdateUserWebSiteInfo"].Value"></abp-input>
+                                        <abp-input class="form-control" asp-for="CustomUserUpdate.WebSite" required-symbol="false" label="@($"{L["WebSite"].Value} ({L["Optional"].Value})")" value="@Model.User.WebSite" info="@L["UpdateUserWebSiteInfo"].Value"></abp-input>
 
-                                                <abp-input class="form-control" asp-for="CustomUserUpdate.Twitter" required-symbol="false" label="Twitter @($"{L["UserName"].Value} ({L["Optional"].Value})")" value="@Model.User.Twitter" info="@L["UpdateUserTwitterInfo"].Value"></abp-input>
+                                        <abp-input class="form-control" asp-for="CustomUserUpdate.Twitter" required-symbol="false" label="Twitter @($"{L["UserName"].Value} ({L["Optional"].Value})")" value="@Model.User.Twitter" info="@L["UpdateUserTwitterInfo"].Value"></abp-input>
 
-                                                <abp-input class="form-control" asp-for="CustomUserUpdate.Github" required-symbol="false" label="Github @($"{L["UserName"].Value} ({L["Optional"].Value})")" value="@Model.User.Github" info="@L["UpdateUserGithubInfo"].Value"></abp-input>
+                                        <abp-input class="form-control" asp-for="CustomUserUpdate.Github" required-symbol="false" label="Github @($"{L["UserName"].Value} ({L["Optional"].Value})")" value="@Model.User.Github" info="@L["UpdateUserGithubInfo"].Value"></abp-input>
 
-                                                <abp-input class="form-control" asp-for="CustomUserUpdate.Linkedin" required-symbol="false" label="Linkedin @($"{L["FullURL"].Value} ({L["Optional"].Value})")" value="@Model.User.Linkedin" info="@L["UpdateUserLinkedinInfo"].Value"></abp-input>
+                                        <abp-input class="form-control" asp-for="CustomUserUpdate.Linkedin" required-symbol="false" label="Linkedin @($"{L["FullURL"].Value} ({L["Optional"].Value})")" value="@Model.User.Linkedin" info="@L["UpdateUserLinkedinInfo"].Value"></abp-input>
 
-                                                <abp-input class="form-control" asp-for="CustomUserUpdate.Company" required-symbol="false" label="@($"{L["Company"].Value} ({L["Optional"].Value})")" value="@Model.User.Company" info="@L["UpdateUserCompanyInfo"].Value"></abp-input>
+                                        <abp-input class="form-control" asp-for="CustomUserUpdate.Company" required-symbol="false" label="@($"{L["Company"].Value} ({L["Optional"].Value})")" value="@Model.User.Company" info="@L["UpdateUserCompanyInfo"].Value"></abp-input>
 
-                                                <abp-input class="form-control" asp-for="CustomUserUpdate.JobTitle" required-symbol="false" label="@($"{L["JobTitle"].Value} ({L["Optional"].Value})")" value="@Model.User.JobTitle" info="@L["UpdateUserJobTitleInfo"].Value"></abp-input>
+                                        <abp-input class="form-control" asp-for="CustomUserUpdate.JobTitle" required-symbol="false" label="@($"{L["JobTitle"].Value} ({L["Optional"].Value})")" value="@Model.User.JobTitle" info="@L["UpdateUserJobTitleInfo"].Value"></abp-input>
 
-                                                <div class="mb-3">
-                                                    <label class="form-label">@L["Biography"] (@L["Optional"])</label>
-                                                    <textarea id="CustomUserUpdate_Biography" name="CustomUserUpdate.Biography" class="form-control " rows="7" data-val-length="The field Biography must be a string with a maximum length of 1000." data-val-length-max="1000" maxlength="1000">@Model.User.Biography</textarea>
-                                                </div>
-                                            </abp-column>
-                                        </abp-row>
-                                        <div class="d-grid gap-2">
-                                            <button id="btnSubmit" type="submit" class="btn btn-primary">@L["Submit"]</button>
+                                        <div class="mb-3">
+                                            <label class="form-label">@L["Biography"] (@L["Optional"])</label>
+                                            <textarea id="CustomUserUpdate_Biography" name="CustomUserUpdate.Biography" class="form-control " rows="7" data-val-length="The field Biography must be a string with a maximum length of 1000." data-val-length-max="1000" maxlength="1000">@Model.User.Biography</textarea>
                                         </div>
-                                    </form>
+                                    </abp-column>
+                                </abp-row>
+                                <div class="d-grid gap-2">
+                                    <button id="btnSubmit" type="submit" class="btn btn-primary">@L["Submit"]</button>
                                 </div>
-                            </abp-tab>
-                        }
-                    </abp-tabs>
+                            </form>
+                        </div>
+                    </abp-tab>
+                </abp-tabs>
+                }
+                else
+                {
+                    if (Model.Posts is not null && Model.Posts.Any())
+                    {
+                        <h2 class="m-lg-2">@L["BlogPosts"]</h2>
+                        <div class="mt-4 pt-3">
+                            @foreach (var post in Model.Posts)
+                            {
+                                <div class="post-item">
+                                    <div class="post-type-cont">
+
+                                        <a href="@Model.GetMemberProfileUrl(Model.User)" class="text-decoration-none">
+                                            <img gravatar-email="@Model.User.Email" default-image="Identicon" class="post-member-img rounded-circle d-block"/>
+                                        </a>
+                                        <span class="post-type">
+                                            <i class="fas fa-pen-nib"></i>
+                                            @L["Blog"].Value.ToUpper()
+                                        </span>
+                                    </div>
+                                    <div class="post-detail-cont">
+                                        <div class="post-info fs-12 mb-2">
+                                            <a href="@Model.GetMemberProfileUrl(Model.User)" class="text-decoration-none">
+                                                <span class="text-dark dot">@Model.User.UserName</span>
+                                            </a>
+                                            <span class="text-dark-200 dot">@post.CreationTime.ToString("MMMM yyyy")</span>
+                                            <span class="text-dark-200">@post.ReadCount.ToString() @L["Views"]</span>
+                                        </div>
+                                        <h3 class="post-title mb-3">
+                                            <a href="@Model.GetBlogPostUrl(post)">
+                                                @post.Title
+                                            </a>
+                                        </h3>
+                                        <p class="post-desc">
+                                            <a href="@Model.GetBlogPostUrl(post)">
+                                                @post.Description.TruncateWithPostfix(150)
+                                            </a>
+                                            <a href="@Model.GetBlogPostUrl(post)" class="readMore">@L["ReadMore"]</a>
+                                        </p>
+                                    </div>
+                                    <div class="post-img-cont">
+                                        <div class="post-list-span text-center post">
+                                            <img src="@post.CoverImage" class="box-articles">
+                                        </div>
+                                    </div>
+                                </div>
+                            }
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="col-md-8">
+                            <div class="mt-5 pt-6">
+                                <p>@L["MemberNotPublishedPostYet"]</p>
+                            </div>
+                        </div>
+                    }
+                }
                 </div>
         </div>
     </div>