From 05d0e680ab1b8ea1ac059204833ea963e0faf285 Mon Sep 17 00:00:00 2001 From: HappyITN Date: Wed, 21 Sep 2022 14:41:54 +0900 Subject: [PATCH] =?UTF-8?q?220921=20=EB=A0=88=EB=93=9C=EB=A7=88=EC=9D=B8?= =?UTF-8?q?=20#2718=20=EC=86=8C=EC=85=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=9E=91=EC=97=85=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uat/uia/web/EgovLoginController.java | 33 +++++++++++++ .../adjst/adjstReqRegistInformation.jsp | 11 ++--- .../jsp/web/kccadr/login/SsoLoginUsrSns.jsp | 44 ++++++++++++++++++ src/main/webapp/kccadrPb/usr/css/content.css | 23 +++++++-- .../kccadrPb/usr/image/icon_login_kakao.png | Bin 0 -> 1778 bytes .../kccadrPb/usr/image/icon_login_naver.png | Bin 0 -> 1277 bytes 6 files changed, 100 insertions(+), 11 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsrSns.jsp create mode 100644 src/main/webapp/kccadrPb/usr/image/icon_login_kakao.png create mode 100644 src/main/webapp/kccadrPb/usr/image/icon_login_naver.png 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 0000000000000000000000000000000000000000..8f3ab5e394e653f7c150be2fd3a715f6a9bb78f3 GIT binary patch literal 1778 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 literal 0 HcmV?d00001