diff --git a/stockMate/src/main/java/com/stockm8/controller/HomeController.java b/stockMate/src/main/java/com/stockm8/controller/HomeController.java index b92c41b..bea48e0 100644 --- a/stockMate/src/main/java/com/stockm8/controller/HomeController.java +++ b/stockMate/src/main/java/com/stockm8/controller/HomeController.java @@ -12,6 +12,7 @@ import javax.mail.internet.MimeMessage; import javax.servlet.http.HttpSession; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -224,4 +225,19 @@ public String priceGET(Model model, HttpSession session) throws Exception { return "/price"; } + + // 약도 - /minimap (GET) + @RequestMapping(value = "/minimap", method = RequestMethod.GET) + public String minimapGET(Model model, HttpSession session) throws Exception { + Long userId = (Long) session.getAttribute("userId"); +// if (id == null) { +// // 세션에 id가 없으면 에러 처리 +// return "redirect:/user/main"; +// } +// UserVO resultVO = userService.getUser(userId); +// model.addAttribute("resultVO", resultVO); + return "/minimap"; + } + } + diff --git a/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp b/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp index 3671464..a404f17 100644 --- a/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp +++ b/stockMate/src/main/webapp/WEB-INF/views/dashboard.jsp @@ -9,6 +9,18 @@ 대시보드 @@ -193,54 +184,90 @@ body {
회원가입 - 로그인 + 대시보드 대시보드 사용법 회사소개 창고소개 임대료 상담문의 + 오시는 길
- -
-

20년 노하우의 Stock-mate

- -
-
- Warehouse Exterior -
-
- Warehouse Interior -
-
+ +
+ 이용약관 | + 개인정보취급방침 | + 이메일주소무단수집거부
- -
-

회사 약도

- 회사 약도 + + - -
-

문의사항

-

대표번호: 031-532-0223

-

영업문의: 황성인 센터장 010-5555-6354

-

경기 용인시 처인구 양지면 주북로 105-5

-
+ + + + + diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp index 148e726..3e6311b 100644 --- a/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp +++ b/stockMate/src/main/webapp/WEB-INF/views/user/signin.jsp @@ -1,109 +1,108 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - - - - 로그인 - - - - -
- <%-- 에러 메시지 표시 --%> - -
${errorMessage}
- - - <%-- 성공 메시지 표시 --%> - -
${successMessage}
- + + +로그인 + + + + - \ No newline at end of file + diff --git a/stockMate/src/main/webapp/WEB-INF/views/user/signup.jsp b/stockMate/src/main/webapp/WEB-INF/views/user/signup.jsp index 3285675..ac1812c 100644 --- a/stockMate/src/main/webapp/WEB-INF/views/user/signup.jsp +++ b/stockMate/src/main/webapp/WEB-INF/views/user/signup.jsp @@ -2,129 +2,93 @@ - - - 회원가입 - - + + +회원가입 +