From ca84211e1d0d0ffd2939c6fb9bb0ec7fb703e217 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: Wed, 23 Feb 2022 10:38:55 +0900
Subject: [PATCH] =?UTF-8?q?template=5Fmain=EC=97=90=20section=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80.=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mca/cmmn/web/AdminController.java     |  4 +++
 .../webapp/WEB-INF/jsp/admin/dashBoard.jsp    | 34 +++++++++++++++----
 .../webapp/WEB-INF/jsp/admin/fieldData.jsp    |  2 --
 .../webapp/WEB-INF/jsp/admin/fieldView.jsp    |  4 +--
 src/main/webapp/WEB-INF/jsp/admin/history.jsp |  2 --
 src/main/webapp/WEB-INF/jsp/admin/request.jsp |  2 --
 .../webapp/WEB-INF/jsp/admin/requestView.jsp  |  2 --
 .../webapp/WEB-INF/jsp/admin/userInfo.jsp     |  2 --
 .../webapp/WEB-INF/jsp/admin/userInfoView.jsp |  2 --
 src/main/webapp/WEB-INF/jsp/layout/header.jsp |  2 +-
 .../WEB-INF/jsp/layout/template_main.jsp      |  6 ++--
 src/main/webapp/WEB-INF/jsp/login.jsp         |  2 --
 src/main/webapp/WEB-INF/jsp/map/request.jsp   |  3 --
 .../webapp/WEB-INF/jsp/map/requestView.jsp    |  3 --
 .../webapp/WEB-INF/jsp/map/requestWrite.jsp   |  3 --
 src/main/webapp/WEB-INF/jsp/map/userInfo.jsp  |  3 --
 16 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/mca/cmmn/web/AdminController.java b/src/main/java/com/mca/cmmn/web/AdminController.java
index a02b0bd..94b13bc 100644
--- a/src/main/java/com/mca/cmmn/web/AdminController.java
+++ b/src/main/java/com/mca/cmmn/web/AdminController.java
@@ -75,6 +75,10 @@ public class AdminController {
       int statusCnt = useRequestService.selectUseRequeststatusCnt();
       model.addAttribute("statusCnt", statusCnt);
 
+      // 회원가입 승인대기 수
+      int standByCount = userService.selectUserStandByCount();
+      model.addAttribute("standByCount", standByCount);
+
       return "admin/dashBoard";
 
     } catch (Exception e) {
diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp
index 75809c8..f1fa801 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp
@@ -6,11 +6,33 @@
 
 <script src="../../../js/admin/dashBoard.js"></script>
 
-
-	<section class="section">
-    <div class="row">
-      <div class="col-lg-3">
-        <a href="/admin/request?status=99">지도사용 요청 승인대기<span class="badge"><c:out value="${statusCnt}" /></span></a>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-3">
+      <div class="card">
+        <div class="card-body row">
+          <div class="col-auto">
+            <img src="../../../images/icon/icon_004.png" width="60" height="60" alt="">
+          </div>
+          <div class="col-auto">
+            <a href="/admin/request?status=99" class="text-black-50">지도사용 요청 승인대기</a>
+            <h3><c:out value="${statusCnt}" /></h3>
+          </div>
+        </div>
       </div>
     </div>
-	</section>
+    <div class="col-lg-3">
+      <div class="card">
+        <div class="card-body row">
+          <div class="col-auto">
+            <img src="../../../images/icon/icon_21.png" width="60" height="60" alt="">
+          </div>
+          <div class="col-auto">
+            <a href="/admin/userInfo?auth=99" class="text-black-50">회원가입 승인대기</a>
+            <h3><c:out value="${standByCount}" /></h3>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
index 3bae709..4b4ee6a 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp
@@ -13,7 +13,6 @@
 	}
 </style>
 
-	<section class="section">
 		<div class="section_title">
 			<!-- <p>현장 지원 시스템</p> -->
 		</div>
@@ -82,4 +81,3 @@
 					</nav>
 				</div>
 		</div>
-	</section>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
index a08bf9b..9fbf79e 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/fieldView.jsp
@@ -7,7 +7,6 @@
 <script src="../../../js/admin/fieldView.js"></script>
 
 
-	<section class="section">
 	    <div class="section_title">
 	      <!-- <p>현장 지원 시스템</p> -->
 	    </div>
@@ -113,5 +112,4 @@
 			        <input class="btn btn-primary" type="button" value="반영" onclick="fieldReflect();" />
 				</p>
 			</div>
-		</div>
-	</section>
\ No newline at end of file
+		</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/admin/history.jsp b/src/main/webapp/WEB-INF/jsp/admin/history.jsp
index e36dd66..38d47ce 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/history.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/history.jsp
@@ -6,7 +6,6 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <script src="../../../js/admin/history.js"></script>
 
-<section class="section">
 	<div class="section_title">
 		<!-- <p>지도사용 이력</p> -->
 	</div>
@@ -64,4 +63,3 @@
 		</nav>
 	</div>
 	</div>
-</section>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
index ca95661..0d27386 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp
@@ -6,7 +6,6 @@
 <script src="../../../js/admin/request.js"></script>
 
 
-<section class="section">
   <div class="section_content">
     <form:form commandName="useRequestSearchVO" name="searchForm" action="/admin/request" method="get">
       <input type="hidden" name="status" value="<c:out value="${useRequestSearchVO.status}" />" />
@@ -85,4 +84,3 @@
   <div class="section_title">
     <!-- <p>현장 지원 시스템</p> -->
   </div>
-</section>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
index 9add204..2a4b5a4 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/requestView.jsp
@@ -8,7 +8,6 @@
 <script src="../../../js/admin/requestView.js"></script>
 
 
-<section class="section">
 	<form:form commandName="useRequestVO" name="frm" method="POST" action="/admin/updateReqConfirm" id="updateFrm">
 		<input type="hidden" name="idx" value="<c:out value='${useRequestVO.idx}' />" />
 		<input type="hidden" name="admin_id" value="<c:out value='${loginUserVO.userid}' />" />
@@ -174,6 +173,5 @@
 			</c:choose>
 		</div>
 	</form:form>
-</section>
 
 	
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
index 56295b9..eafd6d7 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp
@@ -14,7 +14,6 @@
 	}
 </style>
 
-	<section class="section">
 		<div class="section_title">
 			<!-- <p>현장 지원 시스템</p> -->
 		</div>
@@ -107,4 +106,3 @@
 				<input type="hidden" id="auth" name="auth" />				
 			</form:form>
 	</div>
-	</section>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
index ca8d8d6..1d2633b 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
@@ -10,7 +10,6 @@
 
 
 
-	<section class="section">
 		<div class="section_content">
 			<form:form commandName="userVO" name="updateForm" id="updateForm" action="/admin/userUpdate" method="post">
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
@@ -93,5 +92,4 @@
 				</div>
 			</form:form>
 		</div>
-	</section>
 	
diff --git a/src/main/webapp/WEB-INF/jsp/layout/header.jsp b/src/main/webapp/WEB-INF/jsp/layout/header.jsp
index fb8647d..5281ba7 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/header.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/header.jsp
@@ -26,7 +26,7 @@
 <sec:authorize access="hasRole('ROLE_ADMIN')">
   <header class="header">
     <div class="header_title">
-      <a href="/admin/request">모바일센터 관리시스템</a>
+      <a href="/admin/dashBoard">모바일센터 관리시스템</a>
     </div>
     <div class="header_info">
       <a href="<c:url value="/logout"/>">
diff --git a/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp b/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
index 830c018..095b466 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/template_main.jsp
@@ -25,8 +25,10 @@
 <body class="">
 	<div id="wrap">
 		<tiles:insertAttribute name="header"/>
-        <tiles:insertAttribute name="left"/>
-		<tiles:insertAttribute name="center"/>
+    <tiles:insertAttribute name="left"/>
+    <section class="section">
+      <tiles:insertAttribute name="center"/>
+    </section>
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index 969e3ef..ffb6f91 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -22,7 +22,6 @@
 		<div class="header_title"><a href="/">모바일센터 관리시스템</a></div>
 		<div class="header_menu"></div>
 	</header>
-	<section class="section">
 		<div class="loginWrap">
 			<div class="loginBox">
 				<form method="POST" action="/j_spring_security_check">
@@ -51,7 +50,6 @@
 				</form>
 			</div>
 		</div>
-	</section>
 </body>
 <script type="text/javascript">
 	$(document).ready(function(){
diff --git a/src/main/webapp/WEB-INF/jsp/map/request.jsp b/src/main/webapp/WEB-INF/jsp/map/request.jsp
index 6aab501..a8995c3 100644
--- a/src/main/webapp/WEB-INF/jsp/map/request.jsp
+++ b/src/main/webapp/WEB-INF/jsp/map/request.jsp
@@ -17,8 +17,6 @@
 <link href="<c:out value="/css/style.css" />" rel="stylesheet">
 </head>
 <body>
-	<%@ include file="../include/header.jsp"%>
-	<section class="section">
 		<div class="section_title">
 			<!-- <p>현장 지원 시스템</p> -->
 		</div>
@@ -72,7 +70,6 @@
 		<div class="section_btn">
 			<!-- <p><input class="btn" type="button" value="관리" onclick="location.href='fieldDetail.html'" /></p> -->
 		</div>
-	</section>
 </body>
 	<script type="text/javascript">
 		var start = "${b_start}";
diff --git a/src/main/webapp/WEB-INF/jsp/map/requestView.jsp b/src/main/webapp/WEB-INF/jsp/map/requestView.jsp
index 3b8637f..c95be68 100644
--- a/src/main/webapp/WEB-INF/jsp/map/requestView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/map/requestView.jsp
@@ -21,8 +21,6 @@
 <link href="<c:out value="/css/style.css" />" rel="stylesheet">
 </head>
 <body>
-<%@ include file="../include/header.jsp"%>
-<section class="section">
     <form:form commandName="useRequestVO" name="frm" method="POST" action="/map/updateReq" id="updateFrm">
         <input type="hidden" name="idx" value="${useRequestVO.idx}" />
         <div class="section_title">
@@ -259,7 +257,6 @@
             </c:choose>
         </div>
     </form:form>
-</section>
 	
 	<script type="text/javascript">
 		var areaAddCount = ${selectArea.size()};
diff --git a/src/main/webapp/WEB-INF/jsp/map/requestWrite.jsp b/src/main/webapp/WEB-INF/jsp/map/requestWrite.jsp
index ee1c0da..e4f6ae5 100644
--- a/src/main/webapp/WEB-INF/jsp/map/requestWrite.jsp
+++ b/src/main/webapp/WEB-INF/jsp/map/requestWrite.jsp
@@ -21,8 +21,6 @@
 </head>
 
 <body>
-<%@ include file="../include/header.jsp"%>
-<section class="section">
 	<form:form commandName="useRequestVO" name="frm" method="POST" action="/map/insertReq" id="insertFrm">
 	<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 		<div class="section_title">
@@ -117,7 +115,6 @@
 			</div>
 		</div>
 	</form:form>
-</section>
 	
 	<script type="text/javascript">
 		var areaAddCount = 0;
diff --git a/src/main/webapp/WEB-INF/jsp/map/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/map/userInfo.jsp
index 222e3cc..5873d05 100644
--- a/src/main/webapp/WEB-INF/jsp/map/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/map/userInfo.jsp
@@ -19,8 +19,6 @@
 <link href="<c:out value="/css/style.css" />" rel="stylesheet">
 </head>
 <body>
-	<%@ include file="../include/header.jsp"%>
-	<section class="section">
 		<form:form commandName="userVO" name="updateForm" action="/map/userUpdate" id="updateForm" method="post">
 			<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 			<input type="hidden" name="userid" value="${userVO.userid}" />
@@ -75,7 +73,6 @@
 				</div>
 			</div>
 		</form:form>
-	</section>
 	<script>
 		$(function(){
 			$("#changePw").click(function(){