diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 95d22058..b36af6b7 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -342,6 +342,39 @@ public class EgovLoginController { return "web/kccadr/login/SsoLoginUsr"; } } + + /** + * (사용자) SSO 소셜 로그인 화면. + * + * @return String + * @exception Exception + */ + @RequestMapping(value = "/web/user/login/ssoLoginSns.do") + public String ssoLoginSns(HttpServletRequest request, HttpServletResponse response, ModelMap model, @RequestParam Map commandMap, HttpSession session) throws Exception { + Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); + if (isAuthenticated) + return "redirect:/web/main/mainPage.do"; + + // 로그인필요 URL 호출하여 온경우 + String beforeUrl = (String) commandMap.get("beforeUrl"); + String message = (String) commandMap.get("message"); + String test = (String) commandMap.get("test"); + + // 실서버 적용시 바꾸기 + String returnSiteUrl = returnSiteUrlGlobal; + String returnSiteCode = returnSiteCodeGlobal; + String idFindUrl = idFindUrl_Global; + String pwFindUrl = pwFindUrl_Global; + String joinUrl = joinUrl_Global; + + model.addAttribute("returnSiteUrl", (URLEncoder.encode(returnSiteUrl))); + model.addAttribute("returnSiteCode", returnSiteCode); + + model.addAttribute("beforeUrl", beforeUrl); + model.addAttribute("message", message); + + return "web/kccadr/login/SsoLoginUsrSns"; + } @RequestMapping(value = "/web/user/oraSms/sendSms.do") public String oraSmsSend() throws Exception { diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp index b0cc4f9f..6f3a7816 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp @@ -92,8 +92,7 @@ function fnGoCrtfc(){

대리인 신청가능 : 권리자 또는 침해자의 대리인 자격으로 온라인 조정신청을 할 수 있습니다.

-

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.(STEP3 - 신청취지/원인 예문보기)

+

주의사항 : 분쟁조정신청 작성이 오래 걸릴 경우 신청 중 오류가 발생할 수 있습니다. 신청 취지/원인을 미리 작성한 후 신청하시기 바랍니다.
(STEP3 신청취지/원인 예문보기)

@@ -129,12 +128,12 @@ function fnGoCrtfc(){

2. 조정의 당사자 본인이신가요?

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp new file mode 100644 index 00000000..f202b2c4 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp @@ -0,0 +1,44 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + + + + + + + + + + + + +<%--
+ + +
--%> diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index 3ea15ed2..eb596103 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -25,7 +25,7 @@ .info_wrap .text_area .dep02{margin-top: 10px; padding: 15px 20px; background-color: #fff; border-radius: 5px;} .info_wrap .text_area .dep02 p{font-size: 15px; margin-bottom: 5px;} .info_wrap .text_area .dep02 p::before{content: "";} -.info_wrap .text_area .cf_text{font-size: 14px; font-weight: 500; color: #222; margin-top: 10px;} +.info_wrap .text_area .cf_text{font-size: 16px; font-weight: 500; color: #222; margin-top: 10px;} .info_wrap .text_area .cf_text::before{content: "*"; color: #222; top: 3px;} .tab_wrap .tab_btn_wrap{display: flex; border: 1px solid #e5e5e5; border-radius: 5px; margin-bottom: 53px;} @@ -77,6 +77,13 @@ .login_form .login_util button:first-child{padding-left: 0;} .login_form .login_util button:last-child{padding-right: 0;} .login_form .login_util button:last-child::after{display: none;} +/* sns 로그인 */ +.login_wrap2 {padding:130px 80px;} +.login_wrap2 .login_form .btn_wrap {margin-top:60px;} +.login_wrap2 .login_form .btn_wrap .btn_kakao {margin-bottom:15px;font-size:17px;line-height:45px;color:#000;background:#f9c700;transition:background-color 0.3s ease-in-out;} +.login_wrap2 .login_form .btn_wrap .btn_kakao:before {content:'';display:inline-block;width:24px;height:46px;margin:0 8px 0 0;vertical-align:top;background:url(/kccadrPb/usr/image/icon_login_kakao.png) no-repeat left top;} +.login_wrap2 .login_form .btn_wrap .btn_naver {font-size:17px;line-height:45px;color:#fff;background:#23b523;transition:background-color 0.3s ease-in-out;} +.login_wrap2 .login_form .btn_wrap .btn_naver:before {content:'';display:inline-block;width:24px;height:46px;margin:0 8px 0 0;vertical-align:top;background:url(/kccadrPb/usr/image/icon_login_naver.png) no-repeat left top;} /* //로그인 */ /* 대시보드 */ @@ -387,10 +394,16 @@ table .label{position: absolute;width: 1px; height: 1px; margin: 0; border: none .sub02_1 .choice_type li p{font-size: 20px; font-weight: 500; color: #222;} .sub02_1 .choice_type li.active p,.sub02_1 .choice_type li:hover p{color: #fff;} -.sub02_1 .choice_person li{width: calc(100% / 2); text-align: left; display: flex; align-items: center; height: 65px; padding-left: 20px; box-sizing: border-box;} -.sub02_1 .choice_person li:first-child{border-radius: 5px 0 0 5px;} -.sub02_1 .choice_person li:last-child{border-radius: 0 5px 5px 0; border-left: 0;} -.sub02_1 .choice_person input[type="radio"]+label{position: static; width: calc(100% - 30px); height: 100%; font-size: 20px; font-weight: 400; margin-left: 8px; display: flex; align-items: center;} +.sub02_1 .choice_person ul {display:flex;justify-content:center;align-items:center;width:75%;margin:0 auto;} +.sub02_1 .choice_person ul li {position:relative;width:calc(100%/3);height:231px;text-align:center;border:0 none;margin-right:30px;box-sizing:border-box;} +.sub02_1 .choice_person ul li input[type=radio] {position:absolute;left:0;top:0;width:100%;height:100%;opacity:0;filter:opacity(0);} +.sub02_1 .choice_person ul li input[type=radio] + label {position:relative;display:block;width:100%;height:100%;padding:40px 0 0;font-size:20px;font-weight:500;line-height:29px;color:#222;border:1px solid #d5d5d5;border-radius:5px;box-sizing:border-box;z-index:1;cursor:pointer;transition:all 0.3s ease-in-out;} +.sub02_1 .choice_person ul li input[type=radio] + label i {display:block;width:100px;height:100px;margin:0 auto 20px;background:url(/kccadrPb/usr/image/icon_sub02_1_08.png) #f0f2f5 no-repeat center center;border-radius:100px;} +.sub02_1 .choice_person ul li:nth-child(2) input[type=radio] + label i {margin-bottom:0;background-image:url(/kccadrPb/usr/image/icon_sub02_1_09.png);} +.sub02_1 .choice_person ul li:last-child {margin-right:0;} +.sub02_1 .choice_person ul li:hover input[type=radio] + label, +.sub02_1 .choice_person ul li input[type=radio]:checked + label {color:#fff;border-color:#2353b5;background-color:#2353b5;box-shadow: 0 0 5px rgba(0,0,0,0.3);} + .step_wrap{display: flex; width: 100%; margin-bottom: 50px;} .step_wrap .step{position: relative; width: calc(100% / 3); border: 1px solid #d5d5d5; padding: 15px 0; display: flex; align-items: center; justify-content: center; overflow: visible; box-sizing: border-box;} diff --git a/src/main/webapp/kccadrPb/usr/image/icon_login_kakao.png b/src/main/webapp/kccadrPb/usr/image/icon_login_kakao.png new file mode 100644 index 00000000..8f3ab5e3 Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/image/icon_login_kakao.png differ diff --git a/src/main/webapp/kccadrPb/usr/image/icon_login_naver.png b/src/main/webapp/kccadrPb/usr/image/icon_login_naver.png new file mode 100644 index 00000000..5e4b850d Binary files /dev/null and b/src/main/webapp/kccadrPb/usr/image/icon_login_naver.png differ