From 422bb5630ce8511a1d5173b63a3ed2a7a4423e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 3 Jan 2022 12:36:10 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kcgfilemanager/service/BoardService.java  |   2 +-
 src/main/resources/templates/admin/main.html  | 118 +++++++++---------
 .../resources/templates/layout/layout.html    |   4 +-
 3 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java
index 0553a70..ed96441 100644
--- a/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java
+++ b/src/main/java/com/dbnt/kcgfilemanager/service/BoardService.java
@@ -55,7 +55,7 @@ public class BoardService {
   @Transactional
   public Integer saveContent(Board content){
     Integer contentSeq = boardRepository.save(content).getContentSeq();
-    saveBoardLog(content.getContentSeq(), LogStatus.WRITE, null, content.getCreateId());
+    saveBoardLog(content.getContentSeq(), LogStatus.WRITE, content.getTitle(), content.getCreateId());
     saveHashTagLink(contentSeq, content.getHashTagStr());
     saveUploadFiles(content, content.getCreateId());
     return contentSeq;
diff --git a/src/main/resources/templates/admin/main.html b/src/main/resources/templates/admin/main.html
index 43b76e7..8edba1c 100644
--- a/src/main/resources/templates/admin/main.html
+++ b/src/main/resources/templates/admin/main.html
@@ -30,9 +30,9 @@
         <div class="card-body">
           <div class="row justify-content-start">
             <div class="col-4">
-              <h5><i class="bi bi-square-fill"></i><span> 저장공간</span></h5>
+              <h5 class="mx-2"><i class="bi bi-square-fill"></i><span> 저장공간</span></h5>
               <th:block th:each="diskInfo:${diskInfoList}">
-                <div class="row justify-content-center py-3 border rounded">
+                <div class="row justify-content-center py-3 m-2 border rounded">
                   <div class="col-12"><h5 th:text="${diskInfo.driveName}"></h5></div>
                   <div class="col-auto">
                     <div class="pie-chart" th:style="|background: conic-gradient(#ACACAC 0% ${diskInfo.useSizePer}%, #26A0DA ${diskInfo.useSizePer}% 100%)|">
@@ -48,60 +48,66 @@
               </th:block>
             </div>
             <div class="col-8">
-              <h5><i class="bi bi-square-fill"></i><span> 전체 이력</span></h5>
-              <table class="table table-striped table-hover">
-                <thead>
-                <tr>
-                  <th>제목</th>
-                  <th>행동</th>
-                  <th>내용</th>
-                  <th>사용자</th>
-                  <th>발생일시</th>
-                </tr>
-                </thead>
-                <tbody>
-                <th:block th:each="log:${boardLogList}">
-                  <tr>
-                    <td colspan="5" class="p-0">
-                      <a class="fs-6 text-decoration-none" th:href="|/board/contentList?categorySeq=${log.categorySeq}|"
-                         th:text="${log.categoryName}"></a>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td th:text="${log.title}"></td>
-                    <td th:text="${statusMap.get(log.logStatus)}"></td>
-                    <td th:text="${log.description}"></td>
-                    <td th:text="${log.createName}"></td>
-                    <td th:text="${#temporals.format(log.createDate, 'yyyy-MM-dd HH:mm:ss')}"></td>
-                  </tr>
-                </th:block>
-                </tbody>
-              </table>
-              <div class="row justify-content-center">
-                <div class="col-auto">
-                  <nav aria-label="Page navigation">
-                    <ul class="pagination">
-                      <th:block th:if="${searchParams.pageIndex>3}">
-                        <li class="page-item">
-                          <a class="page-link" th:href="|/admin/main?pageIndex=${(searchParams.pageIndex)-3}|" aria-label="Previous">
-                            <span aria-hidden="true">&laquo;</span>
-                          </a>
-                        </li>
-                      </th:block>
-                      <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
-                        <li class="page-item" th:classappend="${searchParams.pageIndex==num?'active':''}">
-                          <a class="page-link" th:href="|/admin/main?pageIndex=${(num)}|" th:text="${num}"></a>
-                        </li>
-                      </th:block>
-                      <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
-                        <li class="page-item">
-                          <a class="page-link" th:href="|/admin/main?pageIndex=${(searchParams.pageIndex)+3}|" aria-label="Next">
-                            <span aria-hidden="true">&raquo;</span>
-                          </a>
-                        </li>
-                      </th:block>
-                    </ul>
-                  </nav>
+              <h5 class="mx-2"><i class="bi bi-square-fill"></i><span> 전체 이력</span></h5>
+              <div class="row p-3 mx-2 border rounded">
+                <div class="col-12">
+                  <table class="table table-striped table-hover">
+                    <thead>
+                    <tr>
+                      <th>제목</th>
+                      <th>행동</th>
+                      <th>내용</th>
+                      <th>사용자</th>
+                      <th>발생일시</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <th:block th:each="log:${boardLogList}">
+                      <tr>
+                        <td colspan="5" class="p-0">
+                          <a class="fs-6 text-decoration-none" th:href="|/board/contentList?categorySeq=${log.categorySeq}|"
+                             th:text="${log.categoryName}"></a>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td th:text="${log.title}"></td>
+                        <td th:text="${statusMap.get(log.logStatus)}"></td>
+                        <td th:text="${log.description}"></td>
+                        <td th:text="${log.createName}"></td>
+                        <td th:text="${#temporals.format(log.createDate, 'yyyy-MM-dd HH:mm:ss')}"></td>
+                      </tr>
+                    </th:block>
+                    </tbody>
+                  </table>
+                </div>
+                <div class="col-12">
+                  <div class="row justify-content-center">
+                    <div class="col-auto">
+                      <nav aria-label="Page navigation">
+                        <ul class="pagination">
+                          <th:block th:if="${searchParams.pageIndex>3}">
+                            <li class="page-item">
+                              <a class="page-link" th:href="|/admin/main?pageIndex=${(searchParams.pageIndex)-3}|" aria-label="Previous">
+                                <span aria-hidden="true">&laquo;</span>
+                              </a>
+                            </li>
+                          </th:block>
+                          <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
+                            <li class="page-item" th:classappend="${searchParams.pageIndex==num?'active':''}">
+                              <a class="page-link" th:href="|/admin/main?pageIndex=${(num)}|" th:text="${num}"></a>
+                            </li>
+                          </th:block>
+                          <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
+                            <li class="page-item">
+                              <a class="page-link" th:href="|/admin/main?pageIndex=${(searchParams.pageIndex)+3}|" aria-label="Next">
+                                <span aria-hidden="true">&raquo;</span>
+                              </a>
+                            </li>
+                          </th:block>
+                        </ul>
+                      </nav>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html
index fc5458b..0e36675 100644
--- a/src/main/resources/templates/layout/layout.html
+++ b/src/main/resources/templates/layout/layout.html
@@ -19,10 +19,10 @@
     <!-- 컨텐츠페이지의 CSS 영역이 들어감 -->
     <th:block layout:fragment="css"></th:block>
 
-    <!--bootstrap-->
-    <script type="text/javascript" th:src="@{/vendor/bootstrap-5.1.3-dist/js/bootstrap.bundle.min.js}"></script>
     <!--jquery-->
     <script type="text/javascript" th:src="@{/vendor/jquery-3.6.0/jquery-3.6.0.min.js}"></script>
+    <!--bootstrap-->
+    <script type="text/javascript" th:src="@{/vendor/bootstrap-5.1.3-dist/js/bootstrap.min.js}"></script>
     <!--bootstrap-datepicker-->
     <script type="text/javascript" th:src="@{/vendor/bootstrap-datepicker-1.9.0-dist/js/bootstrap-datepicker.min.js}"></script>
     <script type="text/javascript" th:src="@{/vendor/bootstrap-datepicker-1.9.0-dist/locales/bootstrap-datepicker.ko.min.js}"></script>