From b7ee102cf3c3841d91747363594c967313b29867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=AF=BC=EC=9A=B0?= <lmw7414@naver.com>
Date: Sun, 15 Jan 2023 17:27:24 +0900
Subject: [PATCH] Revert "Merge pull request #77 from
 lmw7414/feature/#76-n-comments"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

n차 대댓글 기능을 롤백한다.
실제로 서비스해보니 유저 반응이 좋지 않았음.
더 나은 서비스를 위해 1차 대댓글 기능만 제공하기로 논의함.


48e1944
---
 .../resources/templates/articles/detail.html  | 25 ++++++++++++++++---
 .../templates/articles/detail.th.xml          | 20 +++++++++------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/articles/detail.html b/src/main/resources/templates/articles/detail.html
index fbe4409..892b576 100644
--- a/src/main/resources/templates/articles/detail.html
+++ b/src/main/resources/templates/articles/detail.html
@@ -61,8 +61,8 @@ <h1>첫번째 글</h1>
                 </div>
             </form>
 
-            <ul class="article-comments">
-                <li class="article-comment">
+            <ul id="article-comments" class="row col-md-10 col-lg-8 pt-3">
+                <li class="parent-comment">
                     <form class="comment-delete-form">
                         <input type="hidden" class="article-id">
                         <div class="row">
@@ -80,7 +80,26 @@ <h1>첫번째 글</h1>
                         </div>
                     </form>
 
-                    <ul class="child-comments"></ul>
+                    <ul class="row me-0">
+                        <li class="child-comment">
+                            <form class="comment-delete-form">
+                                <input type="hidden" class="article-id">
+                                <div class="row">
+                                    <div class="col-md-10 col-lg-9">
+                                        <strong>Uno</strong>
+                                        <small><time>2022-01-01</time></small>
+                                        <p class="mb-1">
+                                            Lorem ipsum dolor sit amet, consectetur adipiscing elit.<br>
+                                            Lorem ipsum dolor sit amet
+                                        </p>
+                                    </div>
+                                    <div class="col-2 mb-3 align-self-center">
+                                        <button type="submit" class="btn btn-outline-danger">삭제</button>
+                                    </div>
+                                </div>
+                            </form>
+                        </li>
+                    </ul>
 
                     <div class="row">
                         <details class="col-md-10 col-lg-9 mb-4">
diff --git a/src/main/resources/templates/articles/detail.th.xml b/src/main/resources/templates/articles/detail.th.xml
index 1d429e4..523f7f3 100644
--- a/src/main/resources/templates/articles/detail.th.xml
+++ b/src/main/resources/templates/articles/detail.th.xml
@@ -28,20 +28,24 @@
             <attr sel=".comment-textbox" th:name="content" />
         </attr>
 
-        <attr sel=".article-comments"
-              th:remove="all-but-first"
-              th:fragment="articleComments(childComments)"
-              th:classappend="${childComments} != null ? 'row me-0' : 'row col-md-10 col-lg-8 pt-3'"
-        >
-            <attr sel=".article-comment[0]" th:each="articleComment : ${childComments} ?: ${articleComments}">
+        <attr sel="#article-comments" th:remove="all-but-first">
+            <attr sel=".parent-comment[0]" th:each="articleComment : ${articleComments}">
                 <attr sel=".comment-delete-form" th:action="'/comments/' + ${articleComment.id} + '/delete'" th:method="post">
                     <attr sel="div/strong" th:text="${articleComment.nickname}" />
                     <attr sel="div/small/time" th:datetime="${articleComment.createdAt}" th:text="${#temporals.format(articleComment.createdAt, 'yyyy-MM-dd HH:mm:ss')}" />
                     <attr sel="div/p" th:text="${articleComment.content}" />
                     <attr sel="button" th:if="${#authorization.expression('isAuthenticated()')} and ${articleComment.userId} == ${#authentication.name}" />
                 </attr>
-
-                <attr sel=".child-comments" th:unless="${articleComment.childComments.isEmpty}" th:replace=":: articleComments(${articleComment.childComments})" />
+                <attr sel="ul" th:if="${!articleComment.childComments.isEmpty}" th:remove="all-but-first">
+                    <attr sel=".child-comment[0]" th:each="childComment : ${articleComment.childComments}">
+                        <attr sel=".comment-delete-form" th:action="'/comments/' + ${childComment.id} + '/delete'" th:method="post">
+                            <attr sel="div/strong" th:text="${childComment.nickname}" />
+                            <attr sel="div/small/time" th:datetime="${childComment.createdAt}" th:text="${#temporals.format(childComment.createdAt, 'yyyy-MM-dd HH:mm:ss')}" />
+                            <attr sel="div/p" th:text="${childComment.content}" />
+                            <attr sel="button" th:if="${#authorization.expression('isAuthenticated()')} and ${childComment.userId} == ${#authentication.name}" />
+                        </attr>
+                    </attr>
+                </attr>
             </attr>
             <attr sel=".parent-comment-id" th:name="parentCommentId" th:value="${articleComment.id}" />
         </attr>