From 93cdaec42ecc3f95c6692b768a41eb42df167b0a Mon Sep 17 00:00:00 2001 From: geonhos Date: Fri, 10 May 2024 17:26:15 +0900 Subject: [PATCH] =?UTF-8?q?jquery=20=EC=9D=98=EC=A1=B4=EC=84=B1=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 --- .../poc/admin/security/CsrfCookieFilter.java | 22 --- .../poc/admin/security/SecurityConfig.java | 14 -- .../main/resources/static/js/eventrouter.js | 19 +-- .../resources/static/js/httpinterceptor.js | 26 ++++ .../static/js/jquery/jquery-3.7.1.min.js | 2 - .../src/main/resources/static/js/motion.js | 68 ++++----- .../main/resources/static/js/pagehelper.js | 63 ++++---- .../src/main/resources/static/js/reqhelper.js | 142 +++++++++--------- .../templates/fragment/csrf/csrf.html | 27 ---- .../templates/fragment/modal/alert-modal.html | 24 +-- .../fragment/modal/confirm-modal.html | 30 ++-- .../templates/fragment/modal/page-modal.html | 20 ++- .../resources/templates/layout/common.html | 4 +- .../main/resources/templates/login/login.html | 13 +- .../templates/main/admin/management/list.html | 117 +++++++-------- 15 files changed, 278 insertions(+), 313 deletions(-) delete mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/security/CsrfCookieFilter.java create mode 100644 poc/admin/src/main/resources/static/js/httpinterceptor.js delete mode 100644 poc/admin/src/main/resources/static/js/jquery/jquery-3.7.1.min.js diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/CsrfCookieFilter.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/CsrfCookieFilter.java deleted file mode 100644 index 97a43e3..0000000 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/CsrfCookieFilter.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bpgroup.poc.admin.security; - -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.security.web.csrf.CsrfToken; -import org.springframework.web.filter.OncePerRequestFilter; - -import java.io.IOException; - -public class CsrfCookieFilter extends OncePerRequestFilter { - @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - CsrfToken csrfToken = (CsrfToken) request.getAttribute(CsrfToken.class.getName()); - if (csrfToken != null) { - response.setHeader(csrfToken.getHeaderName(), csrfToken.getToken()); - } - - filterChain.doFilter(request, response); - } -} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java index 04a2ead..46a10e6 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/SecurityConfig.java @@ -8,9 +8,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; -import org.springframework.security.web.csrf.CookieCsrfTokenRepository; -import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import java.util.Objects; @@ -25,17 +22,6 @@ public class SecurityConfig { @Bean SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { - // CSRF 설정 - CsrfTokenRequestAttributeHandler csrfTokenRequestAttributeHandler = new CsrfTokenRequestAttributeHandler(); - csrfTokenRequestAttributeHandler.setCsrfRequestAttributeName("_csrf"); - - http.csrf(c -> { - c.csrfTokenRequestHandler(csrfTokenRequestAttributeHandler) - .ignoringRequestMatchers("/common/modal/**") - .ignoringRequestMatchers(LOGIN_PATH, LOGOUT_PATH, ERROR_PATH) // CSRF 무시 URL 설정 - .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()); // CSRF 토큰을 쿠키에 저장 및 사용 가능 - }).addFilterAfter(new CsrfCookieFilter(), BasicAuthenticationFilter.class); // 로그인이 완료된 후 CSRF Filter 를 실행 - // 인증 설정 http.authorizeHttpRequests(c -> c .requestMatchers("/css/**", "/images/**", "/js/**").permitAll() diff --git a/poc/admin/src/main/resources/static/js/eventrouter.js b/poc/admin/src/main/resources/static/js/eventrouter.js index b0d3caa..4297c70 100644 --- a/poc/admin/src/main/resources/static/js/eventrouter.js +++ b/poc/admin/src/main/resources/static/js/eventrouter.js @@ -1,5 +1,5 @@ const EventRouter = { - _eventRouter: $({}), + _eventRouter: new EventTarget(), /** * 이벤트 발생 @@ -8,7 +8,8 @@ const EventRouter = { * @param {*=} data */ trigger(eventName, data) { - this._eventRouter.trigger(eventName, data); + const event = new CustomEvent(eventName, { detail: data }); + this._eventRouter.dispatchEvent(event); }, /** @@ -23,15 +24,7 @@ const EventRouter = { return; } - this._eventRouter.off(eventName); - this._eventRouter.on(eventName, func); + this._eventRouter.removeEventListener(eventName, func); + this._eventRouter.addEventListener(eventName, func); }, - - /** - * 현재 등록된 이벤트 조회 (디버깅용) - */ - logCurrentRegistered() { - const events = $._data(this._eventRouter[0], "events"); - console.log(events); - } -}; +}; \ No newline at end of file diff --git a/poc/admin/src/main/resources/static/js/httpinterceptor.js b/poc/admin/src/main/resources/static/js/httpinterceptor.js new file mode 100644 index 0000000..7bea4db --- /dev/null +++ b/poc/admin/src/main/resources/static/js/httpinterceptor.js @@ -0,0 +1,26 @@ +const originalFetch = window.fetch; + +/** + * csrf token 없을 경우 추가하는 fetch interceptor + * @param url + * @param options + * @returns {Promise} + */ +window.fetch = function(url, options) { + // CSRF 토큰 + const csrfToken = document.querySelector('meta[name="_csrf"]').getAttribute('content'); + const csrfHeader = document.querySelector('meta[name="_csrf_header"]').getAttribute('content'); + + if (options.headers) { + options.headers[csrfHeader] = csrfToken; + } else { + options.headers = { + [csrfHeader]: csrfToken, + ContentType: 'application/json', + method: options.method ? options.method : 'POST' + }; + } + + // 원래의 fetch 함수 호출 + return originalFetch.apply(this, arguments); +}; \ No newline at end of file diff --git a/poc/admin/src/main/resources/static/js/jquery/jquery-3.7.1.min.js b/poc/admin/src/main/resources/static/js/jquery/jquery-3.7.1.min.js deleted file mode 100644 index 7f37b5d..0000000 --- a/poc/admin/src/main/resources/static/js/jquery/jquery-3.7.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="
",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0 { document.documentElement.style.setProperty('--vh', `${window.innerHeight}px`) }; window.addEventListener('resize', setVh); setVh(); -$(document).on('touchstart', function () { +document.addEventListener('touchstart', function () { }); - // 콘텐츠영역 자동 높이 조절 -$(document).ready(function () { - // var headerHeight = $('header').outerHeight(); - // $('.wrapper').css('padding-top', headerHeight + 'px'); -}); - -$(document).ready(function () { +document.addEventListener('DOMContentLoaded', function () { setupAccordion(); // navigation 모바일 처리 - $('#toggleLink').click(function () { + document.querySelector('#toggleLink').addEventListener('click', function () { toggleMenu('.menu_wrap'); }); - $('.closeButton').click(function () { + document.querySelector('.closeButton').addEventListener('click', function () { closeMenu('.menu_wrap'); }); - //modal - $("#openModalBtn").click(function () { - openModal(); - }); - - $(".modal .close, .modal").click(function (e) { - if (e.target !== this) return; // 모달 내부를 클릭한 경우에는 닫히지 않도록 처리 - closeModal(); + document.querySelectorAll('.modal .close, .modal').forEach(function (element) { + element.addEventListener('click', function (e) { + if (e.target !== this) return; // 모달 내부를 클릭한 경우에는 닫히지 않도록 처리 + closeModal(); + }); }); }); - // 아코디언 function setupAccordion() { - $('.nav_tit').on('click', function () { - $(this).next('.nav_section').slideToggle(150); - $(this).toggleClass('active'); - $('.nav_section').not($(this).next('.nav_section')).slideUp(150); - $('.nav_tit').not($(this)).removeClass('active'); + document.querySelectorAll('.nav_tit').forEach(function (element) { + element.addEventListener('click', function () { + this.nextElementSibling.classList.toggle('active'); + document.querySelectorAll('.nav_section').forEach(function (section) { + if (section !== this.nextElementSibling) { + section.classList.remove('active'); + } else { + section.classList.toggle('active'); + } + }, this); + document.querySelectorAll('.nav_tit').forEach(function (tit) { + if (tit !== this) { + tit.classList.remove('active'); + } else { + tit.classList.toggle('active'); + } + }, this); + }); }); } - // navigation 모바일 처리 function toggleMenu(selector) { - $(selector).toggleClass('active'); + document.querySelector(selector).classList.toggle('active'); } function closeMenu(selector) { - $(selector).removeClass('active'); + document.querySelector(selector).classList.remove('active'); } - //modal 열기 닫기 function openModal() { - $(".modal").fadeIn(100); - $("body").css("overflow", "hidden"); + document.querySelector('.modal').style.display = 'block'; + document.body.style.overflow = 'hidden'; } function closeModal() { - $(".modal").fadeOut(100); - $("body").css("overflow", "auto"); -} + document.querySelector('.modal').style.display = 'none'; + document.body.style.overflow = 'auto'; +} \ No newline at end of file diff --git a/poc/admin/src/main/resources/static/js/pagehelper.js b/poc/admin/src/main/resources/static/js/pagehelper.js index 0032174..c282049 100644 --- a/poc/admin/src/main/resources/static/js/pagehelper.js +++ b/poc/admin/src/main/resources/static/js/pagehelper.js @@ -7,12 +7,12 @@ const PageHelper = { * @param confirmFunction */ showSimpleConfirmModal(message, confirmFunction) { - this.showConfirmModal({ - title: '확인', - message: message, - }, { - confirm: confirmFunction, - }) + this.showConfirmModal({ + title: '확인', + message: message, + }, { + confirm: confirmFunction, + }) }, /** @@ -52,7 +52,8 @@ const PageHelper = { */ showErrorModal(message, cancelFunction) { if (!cancelFunction) { - cancelFunction = () => {} + cancelFunction = () => { + } } this.showAlertModal({ @@ -71,7 +72,8 @@ const PageHelper = { */ showFinishModal(message, cancelFunction) { if (!cancelFunction) { - cancelFunction = () => {} + cancelFunction = () => { + } } this.showAlertModal({ @@ -117,7 +119,7 @@ const PageHelper = { * @param {string} params.contentSelector * @param {string} params.appendToSelector * @param {Object=} callbacks - * @param {function(jQuery)=} callbacks.success - modal body의 jquery 객체가 파라미터로 오는 success 콜백 함수 + * @param {function(Element)=} callbacks.success - 파라미터로 오는 success 콜백 함수 * @param {function(Object)=} callbacks.error - 에러 메세지가 파라미터로 오는 error 콜백 함수 * @param {function()=} callbacks.complete */ @@ -132,11 +134,19 @@ const PageHelper = { data: params.data, }, { success: function (res) { - const e = $(res); - const d = e.find(params.contentSelector); - d.appendTo(params.appendToSelector); - const s = e.find('script'); - s.appendTo('body'); + const p = new DOMParser(); + const e = p.parseFromString(res, 'text/html'); + + const d = e.querySelector(params.contentSelector); + document.body.appendChild(d); + + const sDiv = document.createElement('script'); + sDiv.setAttribute('data-page-modal', 'script'); + + const s = e.querySelector('script'); + sDiv.textContent = s.textContent; + document.body.appendChild(sDiv); + if (callbacks.success) callbacks.success(d); }, error: function (error) { @@ -163,20 +173,21 @@ const PageHelper = { callbacks = {}; } - $.ajax({ - url: params.url, - type: params.method, - data: params.data, - success: function (res) { - if (callbacks.success) callbacks.success(res); - }, - error: function (error) { + fetch(params.url, { + method: params.method, + body: new URLSearchParams(params.data) + }) + .then(response => response.text()) + .then(data => { + if (callbacks.success) callbacks.success(data); + }) + .catch(error => { console.error(error); if (callbacks.error) callbacks.error(error); - }, - complete: function () { + }) + .finally(() => { if (callbacks.complete) callbacks.complete(); - } - }); + }); + }, }; diff --git a/poc/admin/src/main/resources/static/js/reqhelper.js b/poc/admin/src/main/resources/static/js/reqhelper.js index 5a3c67d..5cbfbf4 100644 --- a/poc/admin/src/main/resources/static/js/reqhelper.js +++ b/poc/admin/src/main/resources/static/js/reqhelper.js @@ -1,81 +1,79 @@ -const ReqHelper = { +const Reqhelper = { /** - * - * @param {jQuery} form - * @param {Object=} callbacks - * @param {function(Object=)=} callbacks.success - * @param {function(Object)=} callbacks.error - * @param {function()=} callbacks.complete + * post json http request + * @param url request url + * @param data is not json stringify data + * @param sFunc success function + * @param eFunc error function + * @param fFunc finally function */ - reqByForm(form, callbacks) { - if (!(form instanceof jQuery)) { - throw new Error('form is not jQuery instance'); - } - if (!callbacks) { - callbacks = {}; - } - - const url = form.attr('action'); - const method = form.attr('method'); - const dataObj = form.serializeArray().reduce((obj, item) => { - obj[item.name] = item.value; - return obj; - }, {}); - - $.ajax({ - url: url, - type: method, - contentType: 'application/json', - data: JSON.stringify(dataObj), - success: function (res) { - if (!callbacks.success) return; - - res.isSuccess = () => res.resultCode === "0000"; - res.isFail = () => !res.isSuccess(); - res.getMessage = () => res.resultMsg || ''; - callbacks.success(res); - }, - error: function (error) { - if (callbacks.error) callbacks.error(error); - }, - complete: function () { - if (callbacks.complete) callbacks.complete(); + reqPostJson: function (url, data, sFunc, eFunc, fFunc) { + fetch(url, { + method: 'POST', + body: JSON.stringify(data), + headers: { + 'Content-Type': 'application/json' } - }); + }) + .then(response => { + if (!response.ok) { + throw new Error(response.statusText); + } + return response.text().then(text => text ? JSON.parse(text) : null); + }) + .then((data) => { + if (sFunc) { + sFunc(data); + } + }) + .catch((error) => { + if (eFunc) { + eFunc(error); + } + }) + .finally(() => { + if (fFunc) { + fFunc(); + } + }); }, - /** - * - * @param url - * @param sendData {Object=} - * @param {Object=} callbacks - * @param {function(Object=)=} callbacks.success - * @param {function(Object)=} callbacks.error - * @param {function()=} callbacks.complete + * get json http request + * @param url request url + * @param sFunc success function + * @param eFunc error function + * @param fFunc finally function */ - reqByObj(url, sendData, callbacks) { - if (!url) { - throw new Error('url is empty'); - } - if (!callbacks) { - callbacks = {}; - } - $.ajax({ - url: url, - type: "post", - contentType: 'application/json', - data: JSON.stringify(sendData), - success: function (res) { - if (callbacks.success) callbacks.success(res); - }, - error: function (error) { - if (callbacks.error) callbacks.error(error); - }, - complete: function () { - if (callbacks.complete) callbacks.complete(); + reqGetJson: function (url, sFunc, eFunc, fFunc) { + fetch(url, { + method: 'GET', + headers: { + 'Content-Type': 'application/json' } - }); - }, -}; + }) + .then(response => { + if (!response.ok) { + throw new Error(response.statusText); + } + return response.text().then(text => text ? JSON.parse(text) : null); + }) + .then((data) => { + if (sFunc) { + sFunc(data); + } + }) + .catch((error) => { + if (eFunc) { + eFunc(error); + } + }) + .finally(() => { + if (fFunc) { + fFunc(); + } + }); + } + +} \ No newline at end of file diff --git a/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html b/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html index 511db91..65e2368 100644 --- a/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html +++ b/poc/admin/src/main/resources/templates/fragment/csrf/csrf.html @@ -4,33 +4,6 @@ - diff --git a/poc/admin/src/main/resources/templates/fragment/modal/alert-modal.html b/poc/admin/src/main/resources/templates/fragment/modal/alert-modal.html index c26fa3c..cf38d83 100644 --- a/poc/admin/src/main/resources/templates/fragment/modal/alert-modal.html +++ b/poc/admin/src/main/resources/templates/fragment/modal/alert-modal.html @@ -21,21 +21,25 @@ diff --git a/poc/admin/src/main/resources/templates/fragment/modal/confirm-modal.html b/poc/admin/src/main/resources/templates/fragment/modal/confirm-modal.html index 2f444b9..fd6384f 100644 --- a/poc/admin/src/main/resources/templates/fragment/modal/confirm-modal.html +++ b/poc/admin/src/main/resources/templates/fragment/modal/confirm-modal.html @@ -22,12 +22,12 @@ diff --git a/poc/admin/src/main/resources/templates/fragment/modal/page-modal.html b/poc/admin/src/main/resources/templates/fragment/modal/page-modal.html index 60f247b..1bffd7f 100644 --- a/poc/admin/src/main/resources/templates/fragment/modal/page-modal.html +++ b/poc/admin/src/main/resources/templates/fragment/modal/page-modal.html @@ -21,10 +21,12 @@ diff --git a/poc/admin/src/main/resources/templates/layout/common.html b/poc/admin/src/main/resources/templates/layout/common.html index 64dd0c5..989f341 100644 --- a/poc/admin/src/main/resources/templates/layout/common.html +++ b/poc/admin/src/main/resources/templates/layout/common.html @@ -6,15 +6,15 @@ 관리자 시스템 - - + + diff --git a/poc/admin/src/main/resources/templates/login/login.html b/poc/admin/src/main/resources/templates/login/login.html index f61a296..19a06d3 100644 --- a/poc/admin/src/main/resources/templates/login/login.html +++ b/poc/admin/src/main/resources/templates/login/login.html @@ -5,13 +5,14 @@ 시스템 - - + + +