From 7d61b8e9434e9cf45d7704b0fd5d5c538c82f791 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: Mon, 8 May 2023 11:23:25 +0300
Subject: [PATCH] cms-kit: detail page edited and member page deficiencies
 completed

---
 .../Blogging/Localization/Resources/en.json   |  3 ++-
 .../Pages/Blogs/Posts/Detail.cshtml           | 24 ++++++++++-------
 .../Pages/Blogs/Posts/detail.js               | 15 +++++++----
 .../Pages/Blogs/Shared/Styles/blog.css        | 26 +++++++++++++++++--
 .../Pages/Members/Index.cshtml                |  6 ++++-
 .../Volo.Blogging.Web/Pages/Members/Index.js  | 12 +++++++++
 6 files changed, 67 insertions(+), 19 deletions(-)
 create mode 100644 modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.js

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 d9c7595247..989926f760 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
@@ -72,6 +72,7 @@
     "UserName": "Username",
     "FullURL": "Full URL",
     "JobTitle": "Job Title",
-    "PersonalWebsite": "PERSONAL WEBSITE"
+    "PersonalWebsite": "PERSONAL WEBSITE",
+    "EditProfile": "Edit Profile"
   }
 }
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 37780167bb..790b04ccdf 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
@@ -52,7 +52,7 @@
 
 <div class="vs-blog vs-blog-detail">
 <abp-input asp-for="FocusCommentId" class="m-0"/>
-<div class="container-xxl">
+<div class="container-xl">
 <div class="row">
     <div class="col-12 col-md-8 col-lg-8 mx-auto">
         <section class="hero-section">
@@ -114,9 +114,9 @@
                                             <a href="#" target="_blank" class="me-2" id="EmailShareLink" title="E-mail">
                                                 <i class="fa fa-envelope-square fa-lg"></i>
                                             </a>
-                                            <a class="copy-link">
+                                            <button class="copy-link me-2" id="CopyLink" title="CopyLink">
                                                 <i class="fa fa-link fa-lg"></i>
-                                            </a>
+                                            </button>
                                         </div>
                                     </div>
                                 </div>
@@ -130,8 +130,8 @@
             </div>
         </section>
     </div>
-    <div class="col-lg-2">
-        <div class="list-group">
+    <div class="col-12 col-md-4 col-lg-3">
+        <div class="card list-group">
             <div class="col-auto pe-2">
                 @if (Model.Post.Writer != null)
                 {
@@ -159,10 +159,14 @@
                         <p class="fw-lighter">@Model.Post.Writer.JobTitle</p>
                     }
                 </div>
+                @if (CurrentUser.UserName == Model.Post.Writer.UserName)
+                {
+                    <a class="fw-lighter" href="/Members/@Model.Post.Writer.UserName#edit-profile">@L["EditProfile"] <i class="fas fa-edit"></i></a>   
+                }
             </div>
             <hr/>
             <p class="fs-4 fw-bold text-dark">Last Blog Posts</p>
-            @for (var index = 0; index < Model.LatestPosts.Count && index < 4; index++)
+            @for (var index = 0; index < Model.LatestPosts.Count && index < 5; index++)
             {
                 if (Model.LatestPosts[index].Id != Model.Post.Id)
                 {
@@ -178,12 +182,12 @@
                                                 @if (post.Writer != null)
                                                 {
                                                     <a href="/Members/@post.Writer.UserName" aria-label="Go to user profile">
-                                                        <img gravatar-email="@post.Writer.Email" default-image="Identicon" class="article-avatar" alt="User Avatar"/>
+                                                        <img gravatar-email="@post.Writer.Email" default-image="Identicon" class="last-post-image" alt="User Avatar"/>
                                                     </a>
                                                 }
                                             </div>
                                             <div class="col">
-                                                <h5 class="mt-3">
+                                                <h5 class="last-post-name">
                                                     <a href="/Members/@post.Writer.UserName">
                                                         @(post.Writer.UserName)
                                                     </a>
@@ -214,7 +218,7 @@
             </p>
         </section>
     </div>
-    <div class="col-12 col-md-4 col-lg-2">
+    <div class="col-12 col-md-4 col-lg-3">
         
     </div>
 </div>
@@ -487,7 +491,7 @@ else
     </div>
 </div>
 </div>
-<div class="col-12 col-md-4 col-lg-2">
+<div class="col-12 col-md-4 col-lg-3">
         
     </div>
 </div>
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js
index b6d1a2d975..59a148ef91 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.js
@@ -49,12 +49,17 @@
                 encodeURI(pageHeader + ' | ' + blogName) +
                 '&'
         );
-        
-        $(".copy-link").click(function() {
-            var copiedLink = $(this);
-        });
     };
-
+    
+    $('#CopyLink').click(function (event) {
+        event.preventDefault();
+        var $temp = $('<input>');
+        $('body').append($temp);
+        $temp.val(window.location.href).select();
+        document.execCommand('copy');
+        $temp.remove();
+    });
+    
     $('div .replyForm').hide();
 
     $('div .editForm').hide();
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
index 66328cb885..b24425f547 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
@@ -321,8 +321,30 @@ div.vs-blog {
   div.vs-blog > .form-group {
     margin: 0 !important; }
 .last-post-title{
-  font-size: 0.9rem;
-  font-weight: 550;
+  font-size: 15px;
+  line-height: 20px;
+  font-weight: 700;
+  letter-spacing: 0px;
   text-decoration: none;
   color: black;
 }
+.last-post-image{
+  width: 30px;
+  height: 30px;
+  border-top-left-radius: 50%;
+  border-top-right-radius: 50%;
+  border-bottom-right-radius: 50%;
+  border-bottom-left-radius: 50%;
+}
+.last-post-name{
+  padding-right: 2px;
+  max-height: 16px;
+  padding-top: 0.5em;
+  padding-right: 0.5em;
+}
+#CopyLink{
+  padding: 0;
+  border: none;
+  background: none;
+}
+
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 58ab94f310..d8fba6b491 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.cshtml
@@ -15,6 +15,10 @@
     ViewBag.Title = @Model.User.UserName.ToUpper() + " - " + L["Blogs"].Value;
 }
 
+@section scripts {
+    <abp-script src="/Pages/Members/Index.js" />
+}
+
 @section styles {
     <abp-style src="/Pages/Members/Index.css"/>
 }
@@ -146,7 +150,7 @@
                         {
                             <abp-tab name="edit-profile" title="Edit Profile">
                                 <div class="mt-4 mb-3 pt-3">
-                                    <form method="post" id="UpdateUserProfileForm">
+                                    <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>
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.js b/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.js
new file mode 100644
index 0000000000..c20251820f
--- /dev/null
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Members/Index.js
@@ -0,0 +1,12 @@
+$(function () {
+    debugger
+    var hash = window.location.hash;
+    if(hash === '#edit-profile'){
+        console.log("asdasdsa")
+        $('#all-posts-tab').removeClass('active');
+        $('#all-posts').removeClass('show').removeClass('active');
+        $('#edit-profile-tab').addClass('active');
+        $('#edit-profile').addClass('show').addClass('active');
+        window.location.hash = '';
+    }
+});
\ No newline at end of file