diff --git a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java index 9069f98e..5e6565b7 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java @@ -72,7 +72,7 @@ public class FrontSecurityConfig { .collect(Collectors.toList()); // front - 익명 사용자 접근 허용 URI 등록 (admin 과 달리 공개/비공개 URL 이 존재한다) - FrontPublicAccess.getInstance().setURIs(List.of("/", "/user/register")); + FrontPublicAccess.getInstance().setURIs(List.of("/", "/user/register", "/policy/**")); http.authorizeHttpRequests( (auth) -> diff --git a/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java b/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java index c01b6046..647090d4 100644 --- a/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java +++ b/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java @@ -12,13 +12,19 @@ import org.springframework.web.bind.annotation.RequestMapping; @RequestMapping(path = "/policy") public class PolicyUIController { + /** + * 이용약관 팝업 화면 + */ @GetMapping(path = "/terms") public String terms() { - return "policy/terms"; + return "policy/terms-wrap"; } + /** + * 개인정보처리방침 팝업 화면 + */ @GetMapping(path = "/privacy") public String privacy() { - return "policy/privacy"; + return "policy/privacy-wrap"; } } diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index 904e1503..54e8dba5 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -1589,6 +1589,234 @@ hr::before { border-radius: 3.2rem 0rem 0rem 0rem; } +/*약관 폰트 가이드 규칙*/ +.term-wrap .modal-content-inner { + margin-top: 3.2rem; +} +.term-wrap .terms-group { + margin-bottom: 3.2rem; +} +.term-wrap .terms-group a { + text-decoration: underline; +} +.term-wrap .terms-heading-h1 { + font-size: 2.8rem; + line-height: 140%; + font-weight: 700; + margin-bottom: 3.2rem; +} +.term-wrap .terms-heading-h2 { + font-size: 2rem; + line-height: 140%; + font-weight: 700; + margin-bottom: 2.4rem; +} +.term-wrap .terms-heading-h3 { + margin-bottom: 1.6rem; + font-size: 1.8rem; + line-height: 140%; + font-weight: 700; +} +.term-wrap .terms-paragraph { + font-size: 1.6rem; + line-height: 140%; + line-height: 1.6; + margin: 0.8rem 0rem; +} +.term-wrap .terms-paragraph + .terms-paragraph { + margin-bottom: 0.4rem; +} +.term-wrap .terms-list, +.term-wrap .terms-step-list { + margin: 1.6rem 0rem; +} +.term-wrap .terms-list.circle-number-type, +.term-wrap .terms-step-list.circle-number-type { + counter-reset: list-counter; /* 카운터 초기화 */ +} +.term-wrap .terms-list.circle-number-type > li, +.term-wrap .terms-step-list.circle-number-type > li { + position: relative; + margin-top: 0.8rem; + padding-left: 2rem; +} +.term-wrap .terms-list.circle-number-type > li::before, +.term-wrap .terms-step-list.circle-number-type > li::before { + content: counter(list-counter); + counter-increment: list-counter; /* 카운터 증가 */ + position: absolute; + left: 0; + top: 0.6rem; + width: 1.2rem; + height: 1.2rem; + background-color: transparent; + border: 0.1rem solid #262626; + color: #262626; + font-weight: 400; + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + justify-content: center; + border-radius: 50%; + font-size: 1.2rem; +} +.term-wrap .terms-list.bullet-type > li, +.term-wrap .terms-step-list.bullet-type > li { + position: relative; + padding-left: 1.3rem; + margin-top: 0.8rem; +} +.term-wrap .terms-list.bullet-type > li::before, +.term-wrap .terms-step-list.bullet-type > li::before { + content: ""; + display: block; + left: 0; + position: absolute; + top: 1.15rem; + width: 0.3rem; + height: 0.3rem; + background-color: #262626; + border-radius: 50%; +} +.term-wrap .terms-list-item { + margin-bottom: 0.8rem; + font-size: 1.6rem; + line-height: 140%; + line-height: 1.6; +} +.term-wrap .terms-list-item > sup { + color: #7b7b7b; +} +.term-wrap .terms-sublist { + margin-top: 0.4rem; + color: #555555; +} +.term-wrap .terms-sublist-item { + position: relative; +} +.term-wrap .terms-sublist-item.sup { + padding-left: 2.8rem; +} +.term-wrap .terms-sublist-item.sup > sup { + position: absolute; + left: 0; + top: 0.3rem; + font-size: 1.4rem; + line-height: 140%; +} +.term-wrap .terms-sublist-item.star { + padding-left: 2.4rem; + text-indent: -1.2rem; +} +.term-wrap .terms-step { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: start; + -webkit-align-items: flex-start; + align-items: flex-start; + margin-top: 2rem; +} +.term-wrap .terms-step-number { + font-size: 1.6rem; + line-height: 1.6; + font-weight: 500; + font-weight: bold; + color: #3a66c9; + background-color: #f0f3ff; + width: 4rem; + height: 4rem; + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-pack: center; + -webkit-justify-content: center; + justify-content: center; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + border-radius: 50%; + margin-right: 1.6rem; +} +.term-wrap .terms-step-content { + -webkit-box-flex: 1; + -webkit-flex: 1; + flex: 1; + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -webkit-flex-direction: column; + flex-direction: column; +} +.term-wrap .terms-step-content .tit { + font-size: 1.8rem; + line-height: 1.6; + font-weight: 700; + color: #434343; +} +.term-wrap .terms-step-content .desc { + font-size: 1.4rem; + line-height: 140%; + color: #9d9d9d; +} +.term-wrap .terms-step-content .desc + .desc { + margin-top: 0.4rem; +} +.term-wrap .terms-step-content .desc.black { + color: #555555; +} +.term-wrap .terms-step-content .desc.sup { + padding-left: 2.8rem; + position: relative; +} +.term-wrap .terms-step-content .desc.sup > sup { + position: absolute; + left: 0; + top: 0rem; + font-size: 1.4rem; + line-height: 140%; +} +.term-wrap .terms-table { + width: 100%; + border-collapse: collapse; + border-top: 1px solid #afb8d2; + margin-top: 1.6rem; +} +.term-wrap .terms-table tr { + border-bottom: 1px solid #afb8d2; +} +.term-wrap .terms-table th { + background-color: #f5f7ff; +} +.term-wrap .terms-table td { + color: #555555; +} +.term-wrap .terms-table th, +.term-wrap .terms-table td { + padding: 1.2rem; + text-align: left; + font-size: 1.4rem; + line-height: 140%; + border-right: 0.1rem solid #afb8d2; +} +.term-wrap .terms-table th:last-child, +.term-wrap .terms-table td:last-child { + border: 0; +} +.term-wrap .terms-note { + font-size: 1.4rem; + line-height: 140%; + color: #7b7b7b; + margin-top: 0.8rem; +} + @media (min-width: 768px) { .pc-show { display: block; @@ -6422,6 +6650,7 @@ button.swiper-pagination-bullet { .component-modal { display: none; position: absolute; + z-index: 99; } .component-modal .modal-dimm { position: fixed; diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index 9a361aa7..12224b15 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -5,13 +5,17 @@ kri.menu = new Object; kri.logger = new Object(); kri.form = new Object(); -/* kri.menu */ +/* kri.menu : 스크립트로 페이지 이동 */ /** - * 스크립트로 페이지 이동 + * 메인 페이지 이동 */ kri.menu.main = function() { location.href = '/'; } + +/** + * 로그아웃 팝업 오픈 + */ kri.menu.logout = function() { etUI.dialog.alert({ title: '로그아웃 확인', @@ -25,7 +29,7 @@ kri.menu.logout = function() { } /** - * 전체 메뉴 + * 전체 메뉴 팝업 오픈 */ kri.menu.open = function() { ajaxUtil._ajaxAsyncMethod( @@ -56,6 +60,59 @@ kri.menu.open = function() { ); }; +/** + * 이용약관 팝업 오픈 + */ +kri.menu.terms = function() { + const $modal = $('.commModal'); + $modal.addClass('term-wrap'); + $modal.find('.modal-tit').text('이용약관'); + $modal.find('.modal-content').empty(); + + ajaxUtil._ajaxAsyncMethod( + '/policy/terms', + {}, + function(rstData, status) { + $modal.find('.modal-content').html(rstData); + + const commModal = document.querySelector('.commModal').ui; + commModal.open(); + }, + function(code, rstData) { + kri.logger.error('Do nothing. code: '+ code, rstData); + }, + 'get', + 'html' + ); +} + +/** + * 개인정보처리방침 팝업 오픈 + */ +kri.menu.privacy = function() { + const $modal = $('.commModal'); + $modal.addClass('term-wrap'); + $modal.find('.modal-tit').text('개인정보처리방침'); + $modal.find('.modal-content').empty(); + + ajaxUtil._ajaxAsyncMethod( + '/policy/privacy', + {}, + function(rstData, status) { + $modal.find('.modal-content').html(rstData); + + const commModal = document.querySelector('.commModal').ui; + commModal.open(); + }, + function(code, rstData) { + kri.logger.error('Do nothing. code: '+ code, rstData); + }, + 'get', + 'html' + ); + +} + /** * 뒤로가기 */ diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 363ca747..96e9baa6 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -145,11 +145,10 @@ 02-3415-5187 - - +
+ 개인정보처리방침 + 이용약관 +
diff --git a/front/src/main/resources/templates/layout/layout-login.html b/front/src/main/resources/templates/layout/layout-login.html index f64ff356..4c4afc6f 100644 --- a/front/src/main/resources/templates/layout/layout-login.html +++ b/front/src/main/resources/templates/layout/layout-login.html @@ -1,14 +1,38 @@ - + +
-
-

Page content goes here

-
-
+
+

Page content goes here

+
+
+ + +
+
+ + +
+
+
+
+ diff --git a/front/src/main/resources/templates/layout/layout-none.html b/front/src/main/resources/templates/layout/layout-none.html index bb296782..5380ba43 100644 --- a/front/src/main/resources/templates/layout/layout-none.html +++ b/front/src/main/resources/templates/layout/layout-none.html @@ -12,15 +12,31 @@
+
+ +
+
+ + +
+
+ - - -
diff --git a/front/src/main/resources/templates/layout/layout-subar.html b/front/src/main/resources/templates/layout/layout-subar.html index e3ec0f09..09bdee4e 100644 --- a/front/src/main/resources/templates/layout/layout-subar.html +++ b/front/src/main/resources/templates/layout/layout-subar.html @@ -13,15 +13,31 @@
+
+ +
+
+ + +
+
+ - - -
diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index 9c63e234..7a6a7a66 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -13,15 +13,31 @@
+
+ +
+
+ + +
+
+ - - -
diff --git a/front/src/main/resources/templates/policy/privacy-wrap.html b/front/src/main/resources/templates/policy/privacy-wrap.html new file mode 100644 index 00000000..65e60ea2 --- /dev/null +++ b/front/src/main/resources/templates/policy/privacy-wrap.html @@ -0,0 +1,310 @@ + + \ No newline at end of file diff --git a/front/src/main/resources/templates/policy/privacy.html b/front/src/main/resources/templates/policy/privacy.html deleted file mode 100644 index e342c7ad..00000000 --- a/front/src/main/resources/templates/policy/privacy.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -
-
- -
-
- -
-
- - \ No newline at end of file diff --git a/front/src/main/resources/templates/policy/terms-wrap.html b/front/src/main/resources/templates/policy/terms-wrap.html new file mode 100644 index 00000000..254eb78c --- /dev/null +++ b/front/src/main/resources/templates/policy/terms-wrap.html @@ -0,0 +1,169 @@ + + \ No newline at end of file diff --git a/front/src/main/resources/templates/policy/terms.html b/front/src/main/resources/templates/policy/terms.html deleted file mode 100644 index 4163df61..00000000 --- a/front/src/main/resources/templates/policy/terms.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -
-
- -
-
- -
-
- - \ No newline at end of file