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 @@ - -
-
-
+
+
+
+
+ +
+ +
+
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp index ef9ae44..1c8b6c0 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 @@ } -
@@ -82,4 +81,3 @@ -
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 @@ -
@@ -113,5 +112,4 @@

- -
\ No newline at end of file + \ 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 6410cfc..b63fc32 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"%> -
@@ -64,4 +63,3 @@ -
diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp index 5e32d45..4bab15e 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 @@ -
" /> @@ -85,4 +84,3 @@
-
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 @@ -
@@ -174,6 +173,5 @@ -
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp index 7ae6288..e0ba673 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 @@ } -
@@ -109,4 +108,3 @@ -
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 @@ -
@@ -93,5 +92,4 @@
-
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 @@
-
@@ -51,7 +50,6 @@
-