From 509a2f809f3fb2af7b68ae76b686185fe62471a3 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: Thu, 24 Feb 2022 10:55:05 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95.=20=EC=9D=B4=EB=AF=B8=EC=A7=80?=
 =?UTF-8?q?=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/admin/dashBoard.jsp    | 78 +++++++++++++++++--
 .../webapp/WEB-INF/jsp/include/header.jsp     | 10 +--
 .../webapp/WEB-INF/jsp/layout/leftMenu.jsp    | 12 +--
 .../WEB-INF/jsp/layout/template_login.jsp     |  2 +-
 src/main/webapp/WEB-INF/jsp/login.jsp         |  6 +-
 src/main/webapp/css/style.css                 | 22 +++---
 6 files changed, 98 insertions(+), 32 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp
index f1fa801..3d9772d 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp
@@ -9,10 +9,10 @@
 <div class="container">
   <div class="row">
     <div class="col-lg-3">
-      <div class="card">
+      <div class="card my-2">
         <div class="card-body row">
           <div class="col-auto">
-            <img src="../../../images/icon/icon_004.png" width="60" height="60" alt="">
+            <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>
@@ -20,12 +20,10 @@
           </div>
         </div>
       </div>
-    </div>
-    <div class="col-lg-3">
-      <div class="card">
+      <div class="card my-2">
         <div class="card-body row">
           <div class="col-auto">
-            <img src="../../../images/icon/icon_21.png" width="60" height="60" alt="">
+            <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>
@@ -33,6 +31,74 @@
           </div>
         </div>
       </div>
+      <div class="card my-2">
+        <div class="card-body row">
+          <div class="col-auto">
+            <img src="/images/icon/icon_03.png" width="60" height="60" alt="">
+          </div>
+          <div class="col-auto">
+            <p class="mb-0 text-black-50">오늘 방문자 수</p>
+            <h3><c:out value="${statusCnt}" /></h3>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="col-lg-9">
+      <div class="card my-2">
+        <div class="card-body">
+          <div class="col-auto">
+            <p class="mb-0 text-black-50">-</p>
+            그래프
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-lg-3">
+      <div class="card my-2">
+        <div class="card-body row">
+          <div class="col-auto">
+            <img src="/images/icon/icon_002.png" width="60" height="60" alt="">
+          </div>
+          <div class="col-auto">
+            <p class="mb-0 text-black-50">최근 한달 방문자 수</p>
+            <h3><c:out value="${statusCnt}" /></h3>
+          </div>
+        </div>
+      </div>
+      <div class="card my-2">
+        <div class="card-body row">
+          <div class="col-auto">
+            <img src="/images/icon/icon_002.png" width="60" height="60" alt="">
+          </div>
+          <div class="col-auto">
+            <p class="mb-0 text-black-50">-</p>
+            <h3>0</h3>
+          </div>
+        </div>
+      </div>
+      <div class="card my-2">
+        <div class="card-body row">
+          <div class="col-auto">
+            <img src="/images/icon/icon_002.png" width="60" height="60" alt="">
+          </div>
+          <div class="col-auto">
+            <p class="mb-0 text-black-50">-</p>
+            <h3>0</h3>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="col-lg-9">
+      <div class="card my-2">
+        <div class="card-body">
+          <div class="col-auto">
+            <p class="mb-0 text-black-50">-</p>
+            그래프
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/main/webapp/WEB-INF/jsp/include/header.jsp b/src/main/webapp/WEB-INF/jsp/include/header.jsp
index 039a75e..c9a771a 100644
--- a/src/main/webapp/WEB-INF/jsp/include/header.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/header.jsp
@@ -45,15 +45,15 @@
 		<div class="header_menu">
 			<ul>
         <li <c:if test="${fn:contains(thisURL, '/dashBoard')}">class="thisOn"</c:if> onclick="location.href='/admin/dashBoard'">
-          <img src="../../../images/icon/icon_analysis.png" width="30" height="30" alt=""> &nbsp;대시보드</li>
+          <img src="/images/icon/icon_analysis.png" width="30" height="30" alt=""> &nbsp;대시보드</li>
 				<li <c:if test="${fn:contains(thisURL, '/request')}">class="thisOn"</c:if> onclick="location.href='/admin/request'">
-          <img src="../../../images/icon/icon_map.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
+          <img src="/images/icon/icon_map.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
 				<li <c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if> onclick="location.href='/admin/history'">
-					<img src="../../../images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li>
+					<img src="/images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li>
 				<li <c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if> onclick="location.href='/admin/fieldData'">
-					<img src="../../../images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li>
+					<img src="/images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li>
 				<li <c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if> onclick="location.href='/admin/userInfo?auth=99'">
-					<img src="../../../images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li>
+					<img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li>
 			</ul>
 		</div>
 	</nav>
diff --git a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
index 7fd3502..902d767 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp
@@ -20,18 +20,18 @@
 </sec:authorize>
 <sec:authorize access="hasRole('ROLE_ADMIN')">
   <nav class="common_nav">
-    <div class="header_menu">
+    <div class="header_menu ms-2">
       <ul>
         <li <c:if test="${fn:contains(thisURL, '/dashBoard')}">class="thisOn"</c:if> onclick="location.href='/admin/dashBoard'">
-          <img src="../../../images/icon/icon_dashboard_on.png" width="30" height="30" alt=""> &nbsp;대시보드</li>
+          <img src="/images/icon/icon_dashboard_on.png" width="30" height="30" alt=""> &nbsp;대시보드</li>
         <li <c:if test="${fn:contains(thisURL, '/request')}">class="thisOn"</c:if> onclick="location.href='/admin/request'">
-          <img src="../../../images/icon/icon_map_on.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
+          <img src="/images/icon/icon_map_on.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
         <li <c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if> onclick="location.href='/admin/history'">
-          <img src="../../../images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li>
+          <img src="/images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li>
         <li <c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if> onclick="location.href='/admin/fieldData'">
-          <img src="../../../images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li>
+          <img src="/images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li>
         <li <c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if> onclick="location.href='/admin/userInfo?auth=99'">
-          <img src="../../../images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li>
+          <img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li>
       </ul>
     </div>
   </nav>
diff --git a/src/main/webapp/WEB-INF/jsp/layout/template_login.jsp b/src/main/webapp/WEB-INF/jsp/layout/template_login.jsp
index 25e051e..097cb48 100644
--- a/src/main/webapp/WEB-INF/jsp/layout/template_login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout/template_login.jsp
@@ -31,7 +31,7 @@
   <script src="<c:url value='/js/jquery-ui.min.js' />"></script>
   <script src="<c:url value="/js/bootstrap-5.1.3.min.js"/>"></script>
 </head>
-<body>
+<body style="overflow-y: hidden">
   <div id="wrap">
     <tiles:insertAttribute name="center"/>
   </div>
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index 0944858..234968a 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -9,7 +9,7 @@
     <form method="POST" action="/j_spring_security_check">
       <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
       <input type=hidden name=login_error value="${login_error}" />
-      <p class="login_title">모바일센터 관리시스템</p>
+      <p class="login_title text-white">모바일센터 관리시스템</p>
       <p class="login_text">
         <input type="text" class="form-control" name="username" id="user_id" value="" placeholder="사용자 ID" />
       </p>
@@ -23,11 +23,11 @@
       <div class="parent">
         <div class="find">
           <span class="glyphicon glyphicon-info-sign"></span>
-          <a href="#">아이디/비밀번호 찾기</a>
+          <a class="text-white" href="#">아이디/비밀번호 찾기</a>
         </div>
         <div class="join">
           <span class="glyphicon glyphicon-user"></span>
-          <a href="<c:url value=" /join" />">회원가입</a>
+          <a class="text-white" href="<c:url value=" /join" />">회원가입</a>
         </div>
       </div>
     </form>
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index 47624c7..5ffc967 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -85,14 +85,15 @@ a {
 }
 
 .loginWrap {
-	width: 400px;
-	margin: 0 auto;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	border: 1px solid #ccc;
-	box-shadow: 5px 5px 20px grey;
+  width: 400px;
+  height: 100%;
+  margin: 0 auto;
+  position: absolute;
+  left: 50%;
+  transform: translate(-50%);
+  background-color: rgba(55, 55, 55, 1);
+  border: 1px solid #ccc;
+  box-shadow: 5px 5px 20px grey;
 }
 .login_title{
   float: left;
@@ -107,9 +108,8 @@ a {
 }
 
 .loginBox {
-	background-color: rgba(255, 255, 255, 1);
-	overflow: hidden;
-	padding: 30px 0px 0px 0px;
+  overflow: hidden;
+  padding: 75% 0;
 }
 
 .login_text input {