From 93edfa5d5d83b2c80f59ff203ab6468d994b0b4c Mon Sep 17 00:00:00 2001 From: com02 Date: Thu, 9 Dec 2021 14:21:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=ED=8C=9D=EC=97=85=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/css/default.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 3e43e415..92cad359 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -1701,7 +1701,7 @@ transform: rotate(45deg); /* 서지정보 팝업 */ -.pop-serge {position:fixed;top:5%;left:calc(50% - 435px);width: 870px;height: 90%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-serge {position:fixed;top:5%;left:calc(50% - 435px);width: 870px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-serge .inner {display:inline-block;width:90%;height:calc(100% - 50px);overflow:auto;padding:5%;background: #f2f4f7;} .pop-serge .inner .row {padding:0px 0px 0px;text-align:center;text-align: left;} .pop-serge .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;} @@ -1722,7 +1722,7 @@ transform: rotate(45deg); /* 로그인 팝업 */ -.pop-login {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-login {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-login .inner {background:#fff;display:inilne-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:60px 0px;} .pop-login .inner .row {padding:45px 60px 0px;text-align:center;} .pop-login .Title {background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;text-align:center;padding:45px 0px;} @@ -1748,7 +1748,7 @@ transform: rotate(45deg); /* 로그인 연결 팝업 */ -.pop-login-connect {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-login-connect {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-login-connect .inner {background:#fff;display:inilne-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:50px 0px;} .pop-login-connect .inner .row {padding:0px 60px 0px;text-align:center;} .pop-login-connect .Title {background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;text-align:center;padding:30px 0px;} @@ -1771,7 +1771,7 @@ transform: rotate(45deg); /* 로그인 패스워드 팝업 */ -.pop-login-password {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 65%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-login-password {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-login-password .inner {background:#fff;display:inilne-block;width:100%;height: calc(100% - 218px);overflow:auto;padding:50px 0px;} .pop-login-password .inner .row {padding:0px 60px 0px;text-align:center;} .pop-login-password .Title {background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;text-align:center;padding:30px 0px;} @@ -1796,7 +1796,7 @@ transform: rotate(45deg); /* 알림 팝업 */ -.pop-notice {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-notice {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-notice .inner {display:inline-block;width:100%;height: calc(100% - 220px);overflow:auto;padding:50px 0px;background: #fff;} .pop-notice .inner .row {padding:0px 60px 0px;text-align:center;} .pop-notice .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;} @@ -1812,7 +1812,7 @@ transform: rotate(45deg); /* 반려사유 팝업 */ -.pop-return {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 55%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-return {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-return .inner {display:inline-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:50px 0px;background: #fff;} .pop-return .inner .row {padding:0px 30px 0px;text-align:center;} .pop-return .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;} @@ -1827,7 +1827,7 @@ transform: rotate(45deg); /* 패스워드 변경 팝업 */ -.pop-change {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-change {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-change .inner {display:inline-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:50px 0px;background: #fff;} .pop-change .inner .row {padding:0px 60px 0px;text-align:center;} .pop-change .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;} @@ -1849,7 +1849,7 @@ transform: rotate(45deg); /* 패스워드 찾기 팝업 */ -.pop-find {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-find {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-find .inner {display:inline-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:50px 0px;background: #fff;} .pop-find .inner .row {padding:0px 60px 0px;text-align:center;} .pop-find .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;} @@ -1870,7 +1870,7 @@ transform: rotate(45deg); /* 회원 팝업 */ -.pop-member {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 70%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} +.pop-member {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;} .pop-member .inner {display:inline-block;width:100%;height: calc(100% - 50px);overflow:auto;padding:40px 0px 20px;background: url(/images/bg/bg-member-pop.jpg) no-repeat;background-size:cover;} .pop-member .inner .row {margin:0px 50px 0px;} .pop-member .Title {text-align:center;padding:0px 0px 30px;text-align: center;} From e89959a55ffd366a3e08f0aaa188bf7dbdb43ed8 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Thu, 9 Dec 2021 14:41:45 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=20CSRF=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/col/web/ReadController.java | 10 ---------- src/main/java/nlib/col/web/RentController.java | 10 ---------- .../nlib/sch/web/NlibSearchController.java | 8 ++------ .../jsp/nlib/collection/searchItemDetail.jsp | 6 +++--- .../WEB-INF/jsp/nlib/rent/insertRentItems.jsp | 8 ++------ src/main/webapp/js/nlib.js | 18 ++++-------------- 6 files changed, 11 insertions(+), 49 deletions(-) diff --git a/src/main/java/nlib/col/web/ReadController.java b/src/main/java/nlib/col/web/ReadController.java index 824a809a..c2ff6b2e 100644 --- a/src/main/java/nlib/col/web/ReadController.java +++ b/src/main/java/nlib/col/web/ReadController.java @@ -82,16 +82,6 @@ public class ReadController extends NlibCommonController { return retJsp; } - if(!isValidCsrfToken(request, csrfToken)) { - if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) { - // 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우 - return "redirect:/cart/listCartItems.do?cartTypeCd=2"; - } else { - model.addAttribute("message", "잘못된 접근입니다."); - return retJsp; - } - } - if(readVO == null || StringUtil.isEmpty(readVO.getSelItems())) { if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) { // 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우 diff --git a/src/main/java/nlib/col/web/RentController.java b/src/main/java/nlib/col/web/RentController.java index a47f1c8f..c0a95858 100644 --- a/src/main/java/nlib/col/web/RentController.java +++ b/src/main/java/nlib/col/web/RentController.java @@ -238,16 +238,6 @@ public class RentController extends NlibCommonController return "nlib/rent/confirmRent"; } - if(!isValidCsrfToken(request, csrfToken)) { - if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) { - // 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우 - return "redirect:/cart/listCartItems.do"; - } else { - model.addAttribute("message", "잘못된 접근입니다."); - return "nlib/rent/confirmRent"; - } - } - if(rentVO == null || StringUtil.isEmpty(rentVO.getSelItems())) { if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) { // 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우 diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index a0fadd97..c4d27087 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -225,7 +225,7 @@ public class NlibSearchController extends NlibCommonController { } secondClassList.get(i).put("cnt", Integer.toString(count)); } - // CSRF 토큰 생성 (2021.12.02 KKN 추가) + // CSRF 토큰 생성 String token = generateCsrfToken(request); model.addAttribute("csrfToken", token); @@ -374,10 +374,6 @@ public class NlibSearchController extends NlibCommonController { imagePath = StringUtil.getString(vo.getRprsThumbUrl(),""); } - // CSRF 토큰 생성 (2021.12.02 KKN 추가) - String token = generateCsrfToken(request); - model.addAttribute("csrfToken", token); - model.addAttribute("imageType",imageType); model.addAttribute("imagePath",imagePath); model.addAttribute("keywordList",keywordList); @@ -473,7 +469,7 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD)); model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD)); - // CSRF 토큰 생성 (2021.12.02 KKN 추가) + // CSRF 토큰 생성 String token = generateCsrfToken(request); model.addAttribute("csrfToken", token); return "nlib/search/getDetailedSearchFormPopup"; diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp index 9eddf7b5..d6f70077 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -322,10 +322,10 @@ function goList(){
- - + + - + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp index 1c8e6b4b..d8173659 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp @@ -110,10 +110,6 @@ function fn_insertRentItems() { } -function fn_gotoDetail(masterId) { - alert("상세보기 준비중 : " + masterId); -} - function fn_searchHome() { location.href = "/search/searchList.do"; } @@ -191,7 +187,7 @@ $(document).ready(function() {
-
썸네일 +
썸네일 즐겨찾기 아이콘 @@ -217,7 +213,7 @@ $(document).ready(function() { 방문열람
-
${rent.title }
+
${rent.title }

${rent.useStatusNm }

${rent.rtnExpctDd }
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index 09d75d92..25b41881 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -520,37 +520,27 @@ function gfn_getDetail(masterId, host) { return; } -function gfn_rentItem(mngOrgCd, masterId, token) { +function gfn_rentItem(mngOrgCd, masterId) { if(gfn_isEmpty(masterId)) { alert("자료ID 정보가 없습니다."); return; } - - if(gfn_isEmpty(token)) { - alert("잘못된 접근입니다."); - return; - } - var url = "/rent/confirmRent.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId + "&csrfToken=" + token; + var url = "/rent/confirmRent.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId; gfn_openNewWindow(url); return; } -function gfn_reserveReadItem(mngOrgCd, masterId, token) { +function gfn_reserveReadItem(mngOrgCd, masterId) { if(gfn_isEmpty(masterId)) { alert("자료ID 정보가 없습니다."); return; } - if(gfn_isEmpty(token)) { - alert("잘못된 접근입니다."); - return; - } - - var url = "/read/confirmRead.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId + "&csrfToken=" + token; + var url = "/read/confirmRead.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId; gfn_openNewWindow(url); return; From ff45d1e539c77ffd9b9832a420ee6c5e1fe71b56 Mon Sep 17 00:00:00 2001 From: com02 Date: Thu, 9 Dec 2021 14:56:39 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/css/default.css | 1 + src/main/webapp/css/media.css | 4 +++- src/main/webapp/js/default.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 92cad359..798eeec6 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -179,6 +179,7 @@ section .inner p.desc {font-size: 18px;color:#666;margin-bottom:40px;} .MainSwiper .swiper-slide {height:600px} .MainSwiper .swiper-slide .img {height:600px;} .MainSwiper .swiper-slide .img img {object-fit:cover;width:100%;height:100%;} +.MainSwiper .swiper-slide .text {} .sec1 .inner .color-box {width:960px;margin:0 auto;text-align: center;position: relative;top:-108px;z-index:9;} .sec1 .inner .color-box .list {float:left;width:25%;height: 216px;background:#333;position: relative;overflow: hidden;} diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index 0a73476e..ccc19d0f 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -8,7 +8,7 @@ a.pop-logo img { margin-right: 10px; } .btn-go-top.mo-go-top { bottom: 86px; } #mo-member-btn { display: none; width: calc(100% - 32px); height: 50px; background: #376795; border-radius: 5px; position: absolute; right: 16px; top: -65px; z-index: 19; position: fixed; top: inherit; bottom: 20px; font-weight: 500; font-size: 14px; color: #ffffff; } .mo-nav-wrap { width: 0; height: 100vh; background: #fff; position: fixed; top: 0; right: 0; z-index: 100; transition: all 0.2s ease-in; display:none;} -.mo-nav-wrap.show { width: 286px;display:inline-block; } +.mo-nav-wrap.show { width: 286px;display:inline-block;} .mo-nav-wrap .menu_bg { display: none; width: 100vw; height: 100vh; position: fixed; top: 0; left: 0; background: rgba(0, 0, 0, 0.6); z-index: -1; transition: all 0.2s ease-in; } .mo-nav-wrap.show .menu_bg { display: block; } .mo-nav-wrap .login_box { width: 100%; height: 267px; background: linear-gradient(90deg, #275f95 0%, #427cae 62.5%); padding: 135px 16px 18px; box-sizing: border-box; } @@ -1323,6 +1323,8 @@ footer .family_site {right:10px;} footer .family_site .site_depth { width: 89%;margin:0% 5.5%; left: 0; top:auto;bottom: 40px; } footer .family_site .site_name:after {background: url(/images/icon/icon-up-arr.png) no-repeat right top;} footer .family_site.on .site_name:after {background: url(/images/icon/icon-down-arr.png) no-repeat right top;} + + .wrap .nav-wrap #primary-nav {display:none !important;opacity:0 !important;} } @media all and (max-width: 350px) { diff --git a/src/main/webapp/js/default.js b/src/main/webapp/js/default.js index 43ee8a60..0a900186 100644 --- a/src/main/webapp/js/default.js +++ b/src/main/webapp/js/default.js @@ -438,7 +438,7 @@ $(document).ready(function(){ $("#primary-nav-button").on("click", function () { $(".mo-nav-wrap").toggleClass("show"); $(".wrap .nav-wrap .inner").toggleClass("mo_show"); - $(".wrap .nav-wrap .inner .left").fadeToggle(); + $(".wrap .nav-wrap .inner .left").fadeToggle(0); $("#mo_search_icon").fadeToggle(0); });