From bbf093258e6ae27f658b51afaf3ee427b41d614e Mon Sep 17 00:00:00 2001
From: Kana <Kana@Desktop>
Date: Wed, 24 Jan 2024 10:16:33 +0900
Subject: [PATCH] mainpage

---
 src/main/java/com/no1/wms/base/BaseController.java  |  5 +----
 .../java/com/no1/wms/base/MainPageController.java   | 13 +++++++++++++
 src/main/webapp/WEB-INF/views/base/main.jsp         | 13 ++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/com/no1/wms/base/MainPageController.java

diff --git a/src/main/java/com/no1/wms/base/BaseController.java b/src/main/java/com/no1/wms/base/BaseController.java
index 55fb254..64317d2 100644
--- a/src/main/java/com/no1/wms/base/BaseController.java
+++ b/src/main/java/com/no1/wms/base/BaseController.java
@@ -26,10 +26,7 @@ public class BaseController {
         return mav;
     }
     
-    @GetMapping("/main")
-    public String mainPage() {
-    	return "base/main";
-    }
+    
 
 
 }
diff --git a/src/main/java/com/no1/wms/base/MainPageController.java b/src/main/java/com/no1/wms/base/MainPageController.java
new file mode 100644
index 0000000..de62206
--- /dev/null
+++ b/src/main/java/com/no1/wms/base/MainPageController.java
@@ -0,0 +1,13 @@
+package com.no1.wms.base;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class MainPageController {
+
+	@GetMapping("/main")
+    public String mainPage() {
+    	return "base/main";
+    }
+}
diff --git a/src/main/webapp/WEB-INF/views/base/main.jsp b/src/main/webapp/WEB-INF/views/base/main.jsp
index be2d01c..ed5c6c9 100644
--- a/src/main/webapp/WEB-INF/views/base/main.jsp
+++ b/src/main/webapp/WEB-INF/views/base/main.jsp
@@ -9,15 +9,14 @@
 	<div class="container-fluid">
 		
 		<div class="row">
-			<div class="col-md-5 ">
-				<div class="text-center"><h2><b>No.1 WMS 달력</b></h2></div>
-				<div id='calendar'></div>
-				<div id='popup' style="width: 500px; height: 600px; display: none; background-color: white; padding: 20px; border-radius: 14px; border: 2px solid #eeeeee"></div>
+			<div class="col-md-6 ">
+				<div>첫 번째 공간</div>
 			</div>
 
-			<div class="col-md-6">
-				<!-- 두 번째 공간 -->
-				<div>두 번째 공간</div>
+			<div class="col-md-5">
+								<div class="text-center"><h2><b>No.1 WMS 달력</b></h2></div>
+				<div id='calendar'></div>
+				<div id='popup' style="width: 500px; height: 600px; display: none; background-color: white; padding: 20px; border-radius: 14px; border: 2px solid #eeeeee"></div>
 			</div>
 		</div>