From 77099113efb6968f24f98d1588f166d6e7b5eceb Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 11:58:14 +0900 Subject: [PATCH 01/10] =?UTF-8?q?refactor:=20ESM=20=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.js | 337 ------------------------------------ index.html | 5 +- js/jquery.js | 2 - js/common.js => src/App.js | 58 +------ {js => src}/localStorage.js | 43 +++-- {js => src}/snow.js | 0 src/storage/index.js | 21 +++ src/utils/index.js | 42 +++++ 8 files changed, 91 insertions(+), 417 deletions(-) delete mode 100644 common.js delete mode 100644 js/jquery.js rename js/common.js => src/App.js (91%) rename {js => src}/localStorage.js (71%) rename {js => src}/snow.js (100%) create mode 100644 src/storage/index.js create mode 100644 src/utils/index.js diff --git a/common.js b/common.js deleted file mode 100644 index b13f7f9..0000000 --- a/common.js +++ /dev/null @@ -1,337 +0,0 @@ -var hexcl,time=new Date(),blsp,bltf,bg,x,dop=true -let winw=window.innerWidth,winh=window.innerHeight -$(document).ready(function(){ - window.scrollTo(0,1) - // console.log(time) - setInterval(function(){ - time=new Date() - $(".clock>span").eq(0).html(num(time.getHours(),2)) - $(".clock>span").eq(2).html(num(time.getMinutes(),2)) - $(".clock>span").eq(4).html(num(time.getSeconds(),2)) - $(".date>span").eq(0).html(time.getFullYear()) - $(".date>span").eq(2).html(num(time.getMonth()+1,2)) - $(".date>span").eq(4).html(num(time.getDate(),2)) - }) - setTimeout(function(){ - $(".alert").animate({"opacity":0},500,function(){ - $(".alert").css({"display":"none"}) - }) - },2000) - function setime(){ - var tms=Math.floor(Math.random()*10) - if($(".time span").eq(tms).is(".cl_sp")){ - setime() - return - } - if($(".time").is(".nobl"))return - setTimeout(function(){ - $(".time span").eq(tms).css({"opacity":"0.5"}) - console.log("sdfsdf") - setTimeout(function(){ - if($(".time span").eq(tms).is(".cl_sp")){ - setime() - return - } - $(".time span").eq(tms).css({"opacity":""}) - setime() - },(Math.floor(Math.random()*7)+3)*10) - },(Math.floor(Math.random()*(blsp-(blsp/10)))+(blsp/10))*100) - } - setime() - setime() - setime() - $(document).on("mousedown",".time span",function(){ - var tms_cl=$(this) - $(tms_cl).css({"opacity":"0.5"}).addClass("cl_sp") - }) - $(document).on("mouseup",function(){ - $(".cl_sp").css({"opacity":""}).removeClass("cl_sp") - }) - // menu - $("#text-color").on("change keyup paste mouseup",function(){ - $("#text-color-text").val($(this).val()) - $(".time").css({"color":$(this).val()}) - localStorage.setItem("text-color",[$(this).val(),localStorage.getItem("text-color")==null?"t":localStorage.getItem("text-color").substr(-2,2)==",t"||",f"?localStorage.getItem("text-color").substr(-1,1):"t"]) - }) - $("#text-color-text").on("change keyup paste mouseup",function(){ - hexcor($(this).val(),$("#text-color"),"text-color") - $(".time").css({"color":hexcl}) - }) - $("#text-color-text").on("blur",function(){ - $("#text-color-text").val($("#text-color").val()) - }) - $("#text-shadow").on("change keyup paste mouseup",function(){ - $("#text-shadow-text").val($(this).val()) - $(".time").css({"text-shadow":`${$(this).val()} 0 0 5px,${$(this).val()} 0 0 5px,${$(this).val()} 0 0 5px`}) - localStorage.setItem("text-shadow",[$(this).val(),localStorage.getItem("text-shadow")==null?"t":localStorage.getItem("text-shadow").substr(-2,2)==",t"||",f"?localStorage.getItem("text-shadow").substr(-1,1):"t"]) - }) - $("#text-shadow-text").on("change keyup paste mouseup",function(){ - hexcor($(this).val(),$("#text-shadow"),"text-shadow") - $(".time").css({"text-shadow":`${hexcl} 0 0 5px,${hexcl} 0 0 5px,${hexcl} 0 0 5px`}) - }) - $("#text-shadow-text").on("blur",function(){ - $("#text-shadow-text").val($("#text-shadow").val()) - }) - $("#circle-color").on("change keyup paste mouseup",function(){ - $("#circle-color-text").val($(this).val()) - $(".c_line").css({"border-color":$(this).val()}) - localStorage.setItem("circle-color",[$(this).val(),localStorage.getItem("circle-color")==null?"t":localStorage.getItem("circle-color").substr(-2,2)==",t"||",f"?localStorage.getItem("circle-color").substr(-1,1):"t"]) - }) - $("#circle-color-text").on("change keyup paste mouseup",function(){ - hexcor($(this).val(),$("#circle-color"),"circle-color") - $(".c_line").css({"border-color":hexcl}) - }) - $("#circle-color-text").on("blur",function(){ - $("#circle-color-text").val($("#circle-color").val()) - }) - $("#circle-shadow").on("change keyup paste mouseup",function(){ - $("#circle-shadow-text").val($(this).val()) - $(".c_line").css({"box-shadow":`${$(this).val()} 0 0 20px 5px,${$(this).val()} 0 0 20px 5px inset`}) - localStorage.setItem("circle-shadow",[$(this).val(),localStorage.getItem("circle-shadow")==null?"t":localStorage.getItem("circle-shadow").substr(-2,2)==",t"||",f"?localStorage.getItem("circle-shadow").substr(-1,1):"t"]) - }) - $("#circle-shadow-text").on("change keyup paste mouseup",function(){ - hexcor($(this).val(),$("#circle-shadow"),"circle-shadow") - $(".c_line").css({"box-shadow":`${hexcl} 0 0 20px 5px,${hexcl} 0 0 20px 5px inset`}) - }) - $("#circle-shadow-text").on("blur",function(){ - $("#circle-shadow-text").val($("#circle-shadow").val()) - }) - - $("#blink_speed").on("change keyup paste mouseup",function(){ - $("#blink_speed_ran").val($(this).val()) - blsp=$(this).val() - localStorage.setItem("blsp",[blsp,localStorage.getItem("blsp")==null?"t":localStorage.getItem("blsp").substr(-2,2)==",t"||",f"?localStorage.getItem("blsp").substr(-1,1):"t"]) - }) - $("#blink_speed_ran").on("change keyup paste mouseup",function(){ - $("#blink_speed").val($(this).val()) - blsp=$(this).val() - localStorage.setItem("blsp",[blsp,localStorage.getItem("blsp")==null?"t":localStorage.getItem("blsp").substr(-2,2)==",t"||",f"?localStorage.getItem("blsp").substr(-1,1):"t"]) - }) - $("#circle_wh").on("change keyup paste mouseup",function(){ - if($(this).val()<0){ - $("#circle_wh").val(0) - $("#circle_wh_ran").val(0) - $(".c_line").css({"width":`0px`,"height":`0px`}) - localStorage.setItem("circle-wh",0) - }else{ - $("#circle_wh_ran").val($(this).val()) - $(".c_line").css({"width":`${$(this).val()}px`,"height":`${$(this).val()}px`}) - localStorage.setItem("circle-wh",$(this).val()) - } - }) - $("#circle_wh_ran").on("change keyup paste mouseup",function(){ - $("#circle_wh").val($(this).val()) - $(".c_line").css({"width":`${$(this).val()}px`,"height":`${$(this).val()}px`}) - localStorage.setItem("circle-wh",$(this).val()) - }) - $("#bg_blur").on("change keyup paste mouseup",function(){ - if($(this).val()<0){ - $("#bg_blur").val(0) - $("#bg_blur_ran").val(0) - $(".c_line").css({"width":`0px`,"height":`0px`}) - localStorage.setItem("bg-blur",0) - }else{ - $("#bg_blur_ran").val($(this).val()) - $(".bg").css({"filter":`blur(${$(this).val()}px)`}) - localStorage.setItem("bg-blur",$(this).val()) - } - }) - $("#bg_blur_ran").on("change keyup paste mouseup",function(){ - $("#bg_blur").val($(this).val()) - $(".bg").css({"filter":`blur(${$(this).val()}px)`}) - localStorage.setItem("bg-blur",$(this).val()) - }) - $("#bg-color").on("change keyup paste mouseup",function(){ - $("#bg-color-text").val($(this).val()) - $("body").css({"background-color":$(this).val()}) - localStorage.setItem("bg-color",[$(this).val(),localStorage.getItem("bg-color")==null?"t":localStorage.getItem("bg-color").substr(-2,2)==",t"||",f"?localStorage.getItem("bg-color").substr(-1,1):"t"]) - }) - $("#bg-color-text").on("change keyup paste mouseup",function(){ - hexcor($(this).val(),$("#bg-color"),"bg-color") - $("body").css({"background-color":`${hexcl}`}) - }) - $(".bg-img").on("click",function(){ - bg=$(this).index() - $(".bg,.bg-image").css({"background-image":`url(./images/bg-${bg}.jpg)`}) - localStorage.setItem("bg",[$(this).index(),localStorage.getItem("bg")==null?"t":localStorage.getItem("bg").substr(-2,2)==",t"||",f"?localStorage.getItem("bg").substr(-1,1):"t"]) - }) - // toggle - $(document).on("click",".toggle",function(){ - if($(this).is(".toggle_false")){ - $(this).removeClass("toggle_false") - switch($(this).index()){ - case 0: - $("#snow").css({"display":"block"}) - settf("flakeCount",2000,"t") - break - case 7: - $(".time").css({"display":""}) - settf("text-color","#ffffff","t") - break - case 10: - hexcl=$("#text-shadow").val() - $(".time").css({"text-shadow":`${hexcl} 0 0 5px,${hexcl} 0 0 5px,${hexcl} 0 0 5px`}) - settf("text-shadow","#77ffbb","t") - break - case 12: - $(".time").removeClass("nobl") - setime() - setime() - setime() - settf("blsp",10,"t") - break - case 14: - $(".c_line").css({"display":""}) - settf("circle-color","#ffffff","t") - break - case 19: - hexcl=$("#circle-shadow").val() - $(".c_line").css({"box-shadow":`${hexcl} 0 0 20px 5px,${hexcl} 0 0 20px 5px inset`}) - settf("circle-shadow","#77ffbb","t") - break - case 21: - $(".bg").css({"display":`block`}) - settf("bg","0","t") - break - } - }else{ - $(this).addClass("toggle_false") - switch($(this).index()){ - case 0: - $("#snow").css({"display":"none"}) - settf("flakeCount",2000,"f") - break - case 7: - $(".time").css({"display":"none"}) - settf("text-color","#ffffff","f") - break - case 10: - $(".time").css({"text-shadow":"none"}) - settf("text-shadow","#77ffbb","f") - break - case 12: - $(".time").addClass("nobl") - settf("blsp",10,"f") - break - case 14: - $(".c_line").css({"display":"none"}) - settf("circle-color","#ffffff","f") - break - case 19: - $(".c_line").css({"box-shadow":"none"}) - settf("circle-shadow","#77ffbb","f") - break - case 21: - $(".bg").css({"display":"none"}) - settf("bg","0","f") - break - } - } - }) - .on("click",".reset",function(){ - if(confirm("설정한 값을 초기화 하시겠습니까?")){ - var num_p=$(".menu .num"),color_p=$(".menu .color") - $(num_p[0]).children("input").val(2000) - $(num_p[1]).children("input").val(1.5) - $(num_p[2]).children("input").val(200) - $(color_p[0]).children("input").val("#ffffff") - $(color_p[1]).children("input").val("#77ffbb") - $(num_p[3]).children("input").val(10) - $(num_p[4]).children("input").val(Math.floor((winw/100)*40)) - $(color_p[2]).children("input").val("#ffffff") - $(color_p[3]).children("input").val("#77ffbb") - $(color_p[4]).children("input").val("#ffffff") - $(num_p[5]).children("input").val(5) - flakeCount=2000 - snowSpeed=1.5 - mouseMoveR=200 - $(".time").css({"color":"#ffffff"}) - $(".time").css({"text-shadow":`#77ffbb 0 0 5px,#77ffbb 0 0 5px,#77ffbb 0 0 5px`}) - blsp=10 - $(".c_line").css({"width":`${Math.floor((winw/100)*40)}px`,"height":`${Math.floor((winw/100)*40)}px`}) - $(".c_line").css({"border-color":"#ffffff"}) - $(".c_line").css({"box-shadow":`#77ffbb 0 0 20px 5px,#77ffbb 0 0 20px 5px inset`}) - $("body").css({"background":"#ffffff"}) - $(".bg").css({"filter":`blur(5px)`}) - localStorage.clear() - $(".toggle").removeClass("toggle_false") - $(".blink_t").addClass("toggle_false") - $("#snow").css({"display":`block`}) - $(".time").css({"display":`block`}) - $(".time").addClass("nobl") - $(".c_line").css({"display":`block`}) - $(".bg").css({"display":`block`}) - $(".bg,.bg-image").css({"background-image":`url(./images/bg-0.jpg)`}) - } - }) -}) -function num(n,w){ - n=n+"" - return n.length>=w?n:new Array(w-n.length+1).join("0")+n -} -$(document) -.on("keydown",function(key){ - if(key.keyCode==9){ - key.preventDefault(); - $(".menu").toggleClass("tab") - $("#sub_menu").toggleClass("toggletab") - $(".sub_menu").removeClass("tab") - } -}) -.on("mousedown",function(e){ - if($(e.target).is("input")){ - dop=false - console.log("sadfdsfafsa") - }else{ - x=e.pageX - } -}) -.on("mouseup",function(e){ - if(dop==true){ - if(e.pageX-x>0){ - if($(".menu").is(".tab")){ - $(".sub_menu").addClass("tab") - }else{ - $(".menu").addClass("tab") - $("#sub_menu").addClass("toggletab") - } - }else if(x-e.pageX>0){ - if($(".sub_menu").is(".tab")){ - $(".sub_menu").removeClass("tab") - }else{ - $(".menu").removeClass("tab") - $("#sub_menu").removeClass("toggletab") - } - - } - }else{ - dop=true - } -}) -.on("click",".bg-image",function(){ - $(".sub_menu").toggleClass("tab") -}) -function hexcor(c,r,l){ - if(c.length==7&&c[0]=="#"){ - sethexcor(c,r,l) - }else if(c.length==6&&c[0]!="#"){ - c="#"+c - sethexcor(c,r,l) - }else if(c.length==4&&c[0]=="#"){ - var hex=["#",c[1],c[1],c[2],c[2],c[3],c[3]] - c=hex.join("") - sethexcor(c,r,l) - }else if(c.length==3&&c[0]!="#"){ - var hex=["#",c[0],c[0],c[1],c[1],c[2],c[2]] - c=hex.join("") - sethexcor(c,r,l) - } -} -function sethexcor(c,r,l){ - r.val(c) - hexcl=c - localStorage.setItem(l,[c,localStorage.getItem(l)==null?"t":localStorage.getItem(l).substr(-2,2)==",t"||",f"?localStorage.getItem(l).substr(-1,1):"t"]) -} -function settf(l,c,t){ - localStorage.setItem(l,[localStorage.getItem(l)==null?c:localStorage.getItem(l).substr(-2,2)==",t"||",f"?localStorage.getItem(l).substr(0,localStorage.getItem(l).length-2):localStorage.getItem(l),t]) -} diff --git a/index.html b/index.html index 54ea0f3..af90d9d 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,6 @@ wallpaper engin - -
@@ -96,7 +94,6 @@

reset

- - + \ No newline at end of file diff --git a/js/jquery.js b/js/jquery.js deleted file mode 100644 index eb1d01d..0000000 --- a/js/jquery.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.4.1 | (c) JS 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(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(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&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(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&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(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 ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);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&&E){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=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(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(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===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]||se.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]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(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(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(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=se.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 j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.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 k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;nx",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r").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)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.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),m(t)&&(t=t.call(e,n,k.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)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.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"===k.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"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(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)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(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?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.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){k.fn[n]=function(e,t){return 0 { @@ -342,59 +344,3 @@ document.addEventListener("mouseup", function (e) { dop = true } }) - -function hexcor(c, r, l) { - if (c.length == 7 && c[0] == "#") { - sethexcor(c, r, l) - } else if (c.length == 6 && c[0] != "#") { - c = "#" + c - sethexcor(c, r, l) - } else if (c.length == 4 && c[0] == "#") { - var hex = ["#", c[1], c[1], c[2], c[2], c[3], c[3]] - c = hex.join("") - sethexcor(c, r, l) - } else if (c.length == 3 && c[0] != "#") { - var hex = ["#", c[0], c[0], c[1], c[1], c[2], c[2]] - c = hex.join("") - sethexcor(c, r, l) - } -} - -function sethexcor(c, r, l) { - r.value = c - hexcl = c - localStorage.setItem(l, [c, localStorage.getItem(l) == null ? "t" : localStorage.getItem(l).substr(-2, 2) == ",t" || ",f" ? localStorage.getItem(l).substr(-1, 1) : "t"]) -} - -function settf(l, c, t) { - localStorage.setItem(l, [localStorage.getItem(l) == null ? c : localStorage.getItem(l).substr(-2, 2) == ",t" || ",f" ? localStorage.getItem(l).substr(0, localStorage.getItem(l).length - 2) : localStorage.getItem(l), t]) -} - -function fClass(i, c) { - if (i.classList == null) { - return false; - } - let result = i.classList.value.indexOf(c) != -1 ? true : false; - return result; -} - -function idSel(id) { - return document.getElementById(id); -} - -function querySel(query) { - return document.querySelector(query); -} - -function querySelAll(query) { - return document.querySelectorAll(query); -} - -function idx(el) { - if (!el) return -1; - var i = 0; - do { - i++; - } while (el = el.previousElementSibling); - return i - 1; -} diff --git a/js/localStorage.js b/src/localStorage.js similarity index 71% rename from js/localStorage.js rename to src/localStorage.js index d67d3cf..2dc5984 100644 --- a/js/localStorage.js +++ b/src/localStorage.js @@ -1,21 +1,28 @@ -function local() { +import storage from './storage'; + +export function local() { flakeCount=lotf("flakeCount",2000) - mouseMoveR=localStorage.getItem("mouseMoveR")==null?200:localStorage.getItem("mouseMoveR") + mouseMoveR = storage.get("mouseMoveR") || 200; + flsp=lotf("flsp",10) bg=lotf("bg",0) - let winw=window.innerWidth,winh=window.innerHeight - var num_pa=querySelAll(".menu .num"),color_pa=querySelAll(".menu .color") - num_pa[0].querySelectorAll("input").forEach(i => i.value = flakeCount); - num_pa[1].querySelectorAll("input").forEach(i => i.value = snowSpeed); - num_pa[2].querySelectorAll("input").forEach(i => i.value = mouseMoveR); - color_pa[0].querySelectorAll("input").forEach(i => i.value = lotf("text-color","#ffffff")); - color_pa[1].querySelectorAll("input").forEach(i => i.value = lotf("text-shadow","#77ffbb")); - num_pa[3].querySelectorAll("input").forEach(i => i.value = flsp); - num_pa[4].querySelectorAll("input").forEach(i => i.value = localStorage.getItem("circle-wh")==null?Math.floor((winw/100)*40):localStorage.getItem("circle-wh")); - color_pa[2].querySelectorAll("input").forEach(i => i.value = lotf("circle-color","#ffffff")); - color_pa[3].querySelectorAll("input").forEach(i => i.value = lotf("circle-shadow","#77ffbb")); - num_pa[5].querySelectorAll("input").forEach(i => i.value = localStorage.getItem("bg-blur")==null?5:localStorage.getItem("bg-blur")); - color_pa[4].querySelectorAll("input").forEach(i => i.value = lotf("bg-color","#ffffff")); + + const winw = window.innerWidth, + winh = window.innerHeight; + const numPa = querySelAll(".menu .num"), + colorPa = querySelAll(".menu .color"); + + numPa[0].querySelectorAll("input").forEach(i => i.value = flakeCount); + numPa[1].querySelectorAll("input").forEach(i => i.value = snowSpeed); + numPa[2].querySelectorAll("input").forEach(i => i.value = mouseMoveR); + colorPa[0].querySelectorAll("input").forEach(i => i.value = lotf("text-color","#ffffff")); + colorPa[1].querySelectorAll("input").forEach(i => i.value = lotf("text-shadow","#77ffbb")); + numPa[3].querySelectorAll("input").forEach(i => i.value = flsp); + numPa[4].querySelectorAll("input").forEach(i => i.value = localStorage.getItem("circle-wh")==null?Math.floor((winw/100)*40):localStorage.getItem("circle-wh")); + colorPa[2].querySelectorAll("input").forEach(i => i.value = lotf("circle-color","#ffffff")); + colorPa[3].querySelectorAll("input").forEach(i => i.value = lotf("circle-shadow","#77ffbb")); + numPa[5].querySelectorAll("input").forEach(i => i.value = localStorage.getItem("bg-blur")==null?5:localStorage.getItem("bg-blur")); + colorPa[4].querySelectorAll("input").forEach(i => i.value = lotf("bg-color","#ffffff")); querySelAll(".time").forEach(i => i.style.color = idSel("text-color").value); querySelAll(".time").forEach(i => i.style.textShadow = `${idSel("text-shadow").value} 0 0 5px,${idSel("text-shadow").value} 0 0 5px,${idSel("text-shadow").value} 0 0 5px`); querySelAll(".c_line").forEach(i => { @@ -68,14 +75,14 @@ function local() { querySelAll(".time").forEach(i => i.style.width = `${winw}px`); } -function lotf(l,n){ +export function lotf(l,n){ return localStorage.getItem(l)==null?n:localStorage.getItem(l).substr(-2,2)==",t"||",f"?localStorage.getItem(l).substr(0,localStorage.getItem(l).length-2):localStorage.getItem(l) } -function lotrfa(l){ +export function lotrfa(l){ // console.log(localStorage.getItem(l)==null?"block":localStorage.getItem(l).substr(-2,2)) return localStorage.getItem(l)==null?"block":localStorage.getItem(l).substr(-2,2)==",t"?"block":"none" } -function fn(s){ +export function fn(s){ let result result = s.replace(/[^0-9]/g,"") return result diff --git a/js/snow.js b/src/snow.js similarity index 100% rename from js/snow.js rename to src/snow.js diff --git a/src/storage/index.js b/src/storage/index.js new file mode 100644 index 0000000..a83e53c --- /dev/null +++ b/src/storage/index.js @@ -0,0 +1,21 @@ +export default Object.freeze({ + + /** + * 저장소의 아이템을 가져옴 + * @param key {string} + * @returns {*} + */ + get (key) { + return JSON.parse(localStorage.getItem(key) || 'null'); + }, + + /** + * 저장소의 아이템을 교체함 + * @param key {string} + * @param value {*} + */ + set (key, value) { + localStorage.setItem(key, JSON.stringify(value)); + }, + +}); \ No newline at end of file diff --git a/src/utils/index.js b/src/utils/index.js new file mode 100644 index 0000000..75071d4 --- /dev/null +++ b/src/utils/index.js @@ -0,0 +1,42 @@ +import localStorage from "../localStorage"; + +export function hexcor(c, r, l) { + if (c.length === 7 && c[0] === "#") { + sethexcor(c, r, l) + } else if (c.length === 6 && c[0] != "#") { + c = "#" + c + sethexcor(c, r, l) + } else if (c.length === 4 && c[0] === "#") { + const hex = ["#", c[1], c[1], c[2], c[2], c[3], c[3]] + c = hex.join("") + sethexcor(c, r, l) + } else if (c.length === 3 && c[0] != "#") { + const hex = ["#", c[0], c[0], c[1], c[1], c[2], c[2]] + c = hex.join("") + sethexcor(c, r, l) + } +} + +export function sethexcor(c, r, l) { + r.value = c + hexcl = c + localStorage.setItem(l, [c, localStorage.getItem(l) === null ? "t" : localStorage.getItem(l).substr(-2, 2) === ",t" || ",f" ? localStorage.getItem(l).substr(-1, 1) : "t"]) +} + +export function settf(l, c, t) { + localStorage.setItem(l, [localStorage.getItem(l) === null ? c : localStorage.getItem(l).substr(-2, 2) === ",t" || ",f" ? localStorage.getItem(l).substr(0, localStorage.getItem(l).length - 2) : localStorage.getItem(l), t]) +} + +export const fClass = (i, c) => i.classList !== null && i.classList.value.indexOf(c) !== -1; +export const idSel = id => document.getElementById(id); +export const querySel = query => document.querySelector(query); +export const querySelAll = query => document.querySelectorAll(query); + +export function idx(el) { + let i = 0, temp = el; + while (temp) { + i++; + temp = temp.previousElementSibling; + } + return i - 1; +} \ No newline at end of file From 37163cdcc871958b7635e8e65371b87fb265f34b Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 12:01:04 +0900 Subject: [PATCH 02/10] =?UTF-8?q?refactor:=20fClass=20=3D>=20hasClass?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 14 +++++++------- src/utils/index.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/App.js b/src/App.js index b092936..c4709be 100644 --- a/src/App.js +++ b/src/App.js @@ -33,11 +33,11 @@ window.onload = e => { setime() return } - if (fClass(document.getElementsByClassName("time")[0], "nofl")) return + if (hasClass(document.getElementsByClassName("time")[0], "nofl")) return setTimeout(e => { time_sp[tms].style.opacity = "0.5"; setTimeout(e => { - if (fClass(time_sp[tms], "cl_sp")) { + if (hasClass(time_sp[tms], "cl_sp")) { setime() return } @@ -56,7 +56,7 @@ window.onload = e => { })) document.addEventListener("mouseup", e => { time_sp.forEach(i => { - if (fClass(i, "cl_sp")) { + if (hasClass(i, "cl_sp")) { i.classList.remove("cl_sp"); i.style.opacity = ""; } @@ -185,7 +185,7 @@ window.onload = e => { })) // toggle querySelAll(".toggle").forEach(i => i.addEventListener("click", e => { - if (fClass(e.target, "toggle_false")) { + if (hasClass(e.target, "toggle_false")) { e.target.classList.remove("toggle_false"); switch (idx(e.target)) { case 0: @@ -317,7 +317,7 @@ document.addEventListener("keydown", function (key) { } }) document.addEventListener("mousedown", function (e) { - if (e.target.localName == "input" || fClass(e.target, "toggle") || fClass(e.target, "bg-image")) { + if (e.target.localName == "input" || hasClass(e.target, "toggle") || hasClass(e.target, "bg-image")) { dop = false } else { x = e.pageX @@ -326,14 +326,14 @@ document.addEventListener("mousedown", function (e) { document.addEventListener("mouseup", function (e) { if (dop == true) { if (e.pageX - x > 0) { - if (fClass(querySelAll(".menu")[0], "tab")) { + if (hasClass(querySelAll(".menu")[0], "tab")) { querySelAll(".sub_menu").forEach(i => i.classList.add("tab")); } else { querySelAll(".menu").forEach(i => i.classList.add("tab")); idSel("sub_menu").classList.add("toggletab"); } } else if (x - e.pageX > 0) { - if (fClass(querySelAll(".sub_menu")[0], "tab")) { + if (hasClass(querySelAll(".sub_menu")[0], "tab")) { querySelAll(".sub_menu").forEach(i => i.classList.remove("tab")); } else { querySelAll(".menu").forEach(i => i.classList.remove("tab")); diff --git a/src/utils/index.js b/src/utils/index.js index 75071d4..c68dc02 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -27,7 +27,7 @@ export function settf(l, c, t) { localStorage.setItem(l, [localStorage.getItem(l) === null ? c : localStorage.getItem(l).substr(-2, 2) === ",t" || ",f" ? localStorage.getItem(l).substr(0, localStorage.getItem(l).length - 2) : localStorage.getItem(l), t]) } -export const fClass = (i, c) => i.classList !== null && i.classList.value.indexOf(c) !== -1; +export const hasClass = (element, className) => element.classList.contains(className); export const idSel = id => document.getElementById(id); export const querySel = query => document.querySelector(query); export const querySelAll = query => document.querySelectorAll(query); From 878fbe5eec066da051439b930c8ef50b7f2bff07 Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 12:13:52 +0900 Subject: [PATCH 03/10] =?UTF-8?q?refactor:=20settf=EB=A5=BC=20toggle=20met?= =?UTF-8?q?hod=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/storage/index.js | 19 +++++++++++++++++-- src/utils/index.js | 9 +++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/storage/index.js b/src/storage/index.js index a83e53c..d5814bc 100644 --- a/src/storage/index.js +++ b/src/storage/index.js @@ -5,7 +5,7 @@ export default Object.freeze({ * @param key {string} * @returns {*} */ - get (key) { + get(key) { return JSON.parse(localStorage.getItem(key) || 'null'); }, @@ -14,8 +14,23 @@ export default Object.freeze({ * @param key {string} * @param value {*} */ - set (key, value) { + set(key, value) { localStorage.setItem(key, JSON.stringify(value)); }, + /** + * key에 value를 할당하고, toogle 시킴 + * @param key {string} + * @param value {string} + * @param toggle {'t'|'f'} + */ + toggle(key, value, toggle) { + if (this.get(key) === null) { + this.set(key, [value, toggle]); + return; + } + const before = this.get(key).split(',')[0]; + this.set(key, [value, before === 't' ? 'f' : 't']); + } + }); \ No newline at end of file diff --git a/src/utils/index.js b/src/utils/index.js index c68dc02..f022ea2 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,4 +1,4 @@ -import localStorage from "../localStorage"; +import storage from '../storage'; export function hexcor(c, r, l) { if (c.length === 7 && c[0] === "#") { @@ -24,7 +24,12 @@ export function sethexcor(c, r, l) { } export function settf(l, c, t) { - localStorage.setItem(l, [localStorage.getItem(l) === null ? c : localStorage.getItem(l).substr(-2, 2) === ",t" || ",f" ? localStorage.getItem(l).substr(0, localStorage.getItem(l).length - 2) : localStorage.getItem(l), t]) + storage.set(l, [ + localStorage.getItem(l) === null ? c : + localStorage.getItem(l).substr(-2, 2) === ",t" || + ",f" ? localStorage.getItem(l).substr(0, localStorage.getItem(l).length - 2) : + localStorage.getItem(l), t + ]) } export const hasClass = (element, className) => element.classList.contains(className); From 2f28d11579b5068d08cc5cffbac51084e1ebbe46 Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 12:35:39 +0900 Subject: [PATCH 04/10] =?UTF-8?q?refactor:=20ColorService=EB=A1=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 35 +++++++++++++++++++---------------- src/localStorage.js | 2 +- src/services/ColorService.js | 29 +++++++++++++++++++++++++++++ src/services/index.js | 1 + src/storage/index.js | 2 +- src/utils/index.js | 11 ----------- 6 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 src/services/ColorService.js create mode 100644 src/services/index.js diff --git a/src/App.js b/src/App.js index c4709be..740dad6 100644 --- a/src/App.js +++ b/src/App.js @@ -1,4 +1,7 @@ import localStorage from './localStorage'; +import storage from './storage'; +import { idSel, querySel, querySelAll } from "./utils"; +import { ColorService } from "./services"; var hexcl, time = new Date(), flsp, bltf, bg, x, dop = true; let winw = window.innerWidth, winh = window.innerHeight; @@ -6,7 +9,7 @@ window.onload = e => { snow_js(); local(); window.scrollTo(0, 1); - let + const clock_sp = querySelAll(".clock>span"), date_sp = querySelAll(".date>span"), time_sp = querySelAll(".time span"); @@ -29,7 +32,7 @@ window.onload = e => { function setime() { var tms = Math.floor(Math.random() * 10) - if (time_sp[tms].classList == ".cl_sp") { + if (time_sp[tms].classList === ".cl_sp") { setime() return } @@ -190,36 +193,36 @@ window.onload = e => { switch (idx(e.target)) { case 0: idSel("snow").style.display = "block"; - settf("flakeCount", 2000, "t") + storage.toggle("flakeCount", 2000, "t") break case 7: querySelAll(".time").forEach(i => i.style.display = ""); - settf("text-color", "#ffffff", "t") + storage.toggle("text-color", "#ffffff", "t") break case 10: hexcl = idSel("text-shadow").value querySelAll(".time").forEach(i => i.style.textShadow = `${hexcl} 0 0 5px,${hexcl} 0 0 5px,${hexcl} 0 0 5px`); - settf("text-shadow", "#77ffbb", "t") + storage.toggle("text-shadow", "#77ffbb", "t") break case 12: querySelAll(".time").forEach(i => i.classList.remove("nofl")); setime() setime() setime() - settf("flsp", 10, "t") + storage.toggle("flsp", 10, "t") break case 14: querySelAll(".c_line").forEach(i => i.style.display = ""); - settf("circle-color", "#ffffff", "t") + storage.toggle("circle-color", "#ffffff", "t") break case 19: hexcl = idSel("circle-shadow").value querySelAll(".c_line").forEach(i => i.style.boxShadow = `${hexcl} 0 0 20px 5px,${hexcl} 0 0 20px 5px inset`); - settf("circle-shadow", "#77ffbb", "t") + storage.toggle("circle-shadow", "#77ffbb", "t") break case 21: querySelAll(".bg").forEach(i => i.style.display = `block`); - settf("bg", "0", "t") + storage.toggle("bg", "0", "t") break } } else { @@ -227,31 +230,31 @@ window.onload = e => { switch (idx(e.target)) { case 0: idSel("snow").style.display = "none"; - settf("flakeCount", 2000, "f") + storage.toggle("flakeCount", 2000, "f") break case 7: querySelAll(".time").forEach(i => i.style.display = "none"); - settf("text-color", "#ffffff", "f") + storage.toggle("text-color", "#ffffff", "f") break case 10: querySelAll(".time").forEach(i => i.style.textShadow = "none"); - settf("text-shadow", "#77ffbb", "f") + storage.toggle("text-shadow", "#77ffbb", "f") break case 12: querySelAll(".time").forEach(i => i.classList.add("nofl")); - settf("flsp", 10, "f") + storage.toggle("flsp", 10, "f") break case 14: querySelAll(".c_line").forEach(i => i.style.display = "none"); - settf("circle-color", "#ffffff", "f") + storage.toggle("circle-color", "#ffffff", "f") break case 19: querySelAll(".c_line").forEach(i => i.style.boxShadow = "none"); - settf("circle-shadow", "#77ffbb", "f") + storage.toggle("circle-shadow", "#77ffbb", "f") break case 21: querySelAll(".bg").forEach(i => i.style.display = "none"); - settf("bg", "0", "f") + storage.toggle("bg", "0", "f") break } } diff --git a/src/localStorage.js b/src/localStorage.js index 2dc5984..7c7f234 100644 --- a/src/localStorage.js +++ b/src/localStorage.js @@ -1,4 +1,4 @@ -import storage from './storage'; +import storage from './storage/Storage'; export function local() { flakeCount=lotf("flakeCount",2000) diff --git a/src/services/ColorService.js b/src/services/ColorService.js new file mode 100644 index 0000000..2af6993 --- /dev/null +++ b/src/services/ColorService.js @@ -0,0 +1,29 @@ +import storage from '../storage'; + +export default Object.freeze({ + + setColor(value, element, id) { + element.value = value; + storage.set('color', value); + storage.toggle(id, value, 't'); + }, + + getColor () { + return storage.get('color'); + }, + + setHexColor(value, element, id) { + const len = value.length; + const first = value[0]; + const newValue = len === 7 && first === "#" ? value : + len === 6 && first !== "#" ? `#${value}` : + len === 4 && first === "#" ? value.replace(/^#(.)(.)(.)$/, '#$1$1$2$2$3$3') : + len === 3 && first !== "#" ? value.replace(/^(.)(.)(.)$/, '#$1$1$2$2$3$3') : + null; + + if (newValue === null) return; + + this.setColor(newValue, element, id); + } + +}) \ No newline at end of file diff --git a/src/services/index.js b/src/services/index.js new file mode 100644 index 0000000..ce91c51 --- /dev/null +++ b/src/services/index.js @@ -0,0 +1 @@ +export { default as ColorService } from './ColorService'; \ No newline at end of file diff --git a/src/storage/index.js b/src/storage/index.js index d5814bc..7656c7b 100644 --- a/src/storage/index.js +++ b/src/storage/index.js @@ -31,6 +31,6 @@ export default Object.freeze({ } const before = this.get(key).split(',')[0]; this.set(key, [value, before === 't' ? 'f' : 't']); - } + }, }); \ No newline at end of file diff --git a/src/utils/index.js b/src/utils/index.js index f022ea2..0ef6aea 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,5 +1,3 @@ -import storage from '../storage'; - export function hexcor(c, r, l) { if (c.length === 7 && c[0] === "#") { sethexcor(c, r, l) @@ -23,15 +21,6 @@ export function sethexcor(c, r, l) { localStorage.setItem(l, [c, localStorage.getItem(l) === null ? "t" : localStorage.getItem(l).substr(-2, 2) === ",t" || ",f" ? localStorage.getItem(l).substr(-1, 1) : "t"]) } -export function settf(l, c, t) { - storage.set(l, [ - localStorage.getItem(l) === null ? c : - localStorage.getItem(l).substr(-2, 2) === ",t" || - ",f" ? localStorage.getItem(l).substr(0, localStorage.getItem(l).length - 2) : - localStorage.getItem(l), t - ]) -} - export const hasClass = (element, className) => element.classList.contains(className); export const idSel = id => document.getElementById(id); export const querySel = query => document.querySelector(query); From ed324da76ad792f9830418e42020974cb5de8424 Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 12:39:22 +0900 Subject: [PATCH 05/10] =?UTF-8?q?refactor:=20ColorService=EB=A1=9C=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 125 ++++++++++++++++++++++----------------------- src/utils/index.js | 24 --------- 2 files changed, 62 insertions(+), 87 deletions(-) diff --git a/src/App.js b/src/App.js index 740dad6..a2f278d 100644 --- a/src/App.js +++ b/src/App.js @@ -1,10 +1,10 @@ import localStorage from './localStorage'; import storage from './storage'; -import { idSel, querySel, querySelAll } from "./utils"; +import { querySel, querySelAll } from "./utils"; import { ColorService } from "./services"; -var hexcl, time = new Date(), flsp, bltf, bg, x, dop = true; -let winw = window.innerWidth, winh = window.innerHeight; +let time = new Date(), flsp, bltf, bg, x, dop = true; +const winw = window.innerWidth, winh = window.innerHeight; window.onload = e => { snow_js(); local(); @@ -66,77 +66,76 @@ window.onload = e => { }) }) // menu - let input_event = "input"; - idSel("text-color").addEventListener("input", e => { - idSel("text-color-text").value = e.target.value; + querySel("#text-color").addEventListener("input", e => { + querySel("#text-color-text").value = e.target.value; querySelAll(".time").forEach(i => i.style.color = e.target.value); localStorage.setItem("text-color", [e.target.value, localStorage.getItem("text-color") == null ? "t" : localStorage.getItem("text-color").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("text-color").substr(-1, 1) : "t"]); }) - idSel("text-color-text").addEventListener("input", e => { - hexcor(e.target.value, idSel("text-color"), "text-color"); - querySelAll(".time").forEach(i => i.style.color = hexcl); + querySel("#text-color-text").addEventListener("input", e => { + ColorService.setHexColor(e.target.value, querySel("#text-color"), "text-color"); + querySelAll(".time").forEach(i => i.style.color = ColorService.getColor()); }) - idSel("text-color-text").addEventListener("blur", e => { - idSel("text-color-text").value = idSel("text-color").value; + querySel("#text-color-text").addEventListener("blur", e => { + querySel("#text-color-text").value = querySel("#text-color").value; }) - idSel("text-shadow").addEventListener("input", e => { - idSel("text-shadow-text").value = e.target.value; + querySel("#text-shadow").addEventListener("input", e => { + querySel("#text-shadow-text").value = e.target.value; querySelAll(".time").forEach(i => i.style.textShadow = `${e.target.value} 0 0 5px,${e.target.value} 0 0 5px,${e.target.value} 0 0 5px`); localStorage.setItem("text-shadow", [e.target.value, localStorage.getItem("text-shadow") == null ? "t" : localStorage.getItem("text-shadow").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("text-shadow").substr(-1, 1) : "t"]) }) - idSel("text-shadow-text").addEventListener("input", e => { - hexcor(e.target.value, idSel("text-shadow"), "text-shadow") - querySelAll(".time").forEach(i => i.style.textShadow = `${hexcl} 0 0 5px,${hexcl} 0 0 5px,${hexcl} 0 0 5px`); + querySel("#text-shadow-text").addEventListener("input", e => { + ColorService.setHexColor(e.target.value, querySel("#text-shadow"), "text-shadow") + querySelAll(".time").forEach(i => i.style.textShadow = `${ColorService.getColor()} 0 0 5px,${ColorService.getColor()} 0 0 5px,${ColorService.getColor()} 0 0 5px`); }) - idSel("text-shadow-text").addEventListener("blur", e => { - idSel("text-shadow-text").value = idSel("text-shadow").value; + querySel("#text-shadow-text").addEventListener("blur", e => { + querySel("#text-shadow-text").value = querySel("#text-shadow").value; }) - idSel("circle-color").addEventListener("input", e => { - idSel("circle-color-text").value = e.target.value; + querySel("#circle-color").addEventListener("input", e => { + querySel("#circle-color-text").value = e.target.value; querySelAll(".c_line").forEach(i => i.style.borderColor = e.target.value); localStorage.setItem("circle-color", [e.target.value, localStorage.getItem("circle-color") == null ? "t" : localStorage.getItem("circle-color").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("circle-color").substr(-1, 1) : "t"]) }) - idSel("circle-color-text").addEventListener("input", e => { - hexcor(e.target.value, idSel("circle-color"), "circle-color") - querySelAll(".c_line").forEach(i => i.style.borderColor = hexcl); + querySel("#circle-color-text").addEventListener("input", e => { + ColorService.setHexColor(e.target.value, querySel("#circle-color"), "circle-color") + querySelAll(".c_line").forEach(i => i.style.borderColor = ColorService.getColor()); }) - idSel("circle-color-text").addEventListener("blur", e => { - idSel("circle-color-text").value = idSel("circle-color").value; + querySel("#circle-color-text").addEventListener("blur", e => { + querySel("#circle-color-text").value = querySel("#circle-color").value; }) - idSel("circle-shadow").addEventListener("input", e => { - idSel("circle-shadow-text").value = e.target.value; + querySel("#circle-shadow").addEventListener("input", e => { + querySel("#circle-shadow-text").value = e.target.value; querySelAll(".c_line").forEach(i => i.style.boxShadow = `${e.target.value} 0 0 20px 5px,${e.target.value} 0 0 20px 5px inset`); localStorage.setItem("circle-shadow", [e.target.value, localStorage.getItem("circle-shadow") == null ? "t" : localStorage.getItem("circle-shadow").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("circle-shadow").substr(-1, 1) : "t"]) }) - idSel("circle-shadow-text").addEventListener("input", e => { - hexcor(e.target.value, idSel("circle-shadow"), "circle-shadow") - querySelAll(".c_line").forEach(i => i.style.boxShadow = `${hexcl} 0 0 20px 5px,${hexcl} 0 0 20px 5px inset`); + querySel("#circle-shadow-text").addEventListener("input", e => { + ColorService.setHexColor(e.target.value, querySel("#circle-shadow"), "circle-shadow") + querySelAll(".c_line").forEach(i => i.style.boxShadow = `${ColorService.getColor()} 0 0 20px 5px,${ColorService.getColor()} 0 0 20px 5px inset`); }) - idSel("circle-shadow-text").addEventListener("blur", e => { - idSel("circle-shadow-text").value = idSel("circle-shadow").value + querySel("#circle-shadow-text").addEventListener("blur", e => { + querySel("#circle-shadow-text").value = querySel("#circle-shadow").value }) - idSel("flickers_speed").addEventListener("input", e => { - idSel("flickers_speed_ran").value = e.target.value; + querySel("#flickers_speed").addEventListener("input", e => { + querySel("#flickers_speed_ran").value = e.target.value; flsp = e.target.value; localStorage.setItem("flsp", [flsp, localStorage.getItem("flsp") == null ? "t" : localStorage.getItem("flsp").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("flsp").substr(-1, 1) : "t"]) }) - idSel("flickers_speed_ran").addEventListener("input", e => { - idSel("flickers_speed").value = e.target.value; + querySel("#flickers_speed_ran").addEventListener("input", e => { + querySel("#flickers_speed").value = e.target.value; flsp = e.target.value; localStorage.setItem("flsp", [flsp, localStorage.getItem("flsp") == null ? "t" : localStorage.getItem("flsp").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("flsp").substr(-1, 1) : "t"]) }) - idSel("circle_wh").addEventListener("input", e => { + querySel("#circle_wh").addEventListener("input", e => { if (e.target.value < 0) { - idSel("circle_wh").value = 0; - idSel("circle_wh_ran").value = 0; + querySel("#circle_wh").value = 0; + querySel("#circle_wh_ran").value = 0; querySelAll(".c_line").forEach(i => { i.style.width = `0px`; i.style.height = `0px`; }); localStorage.setItem("circle-wh", 0); } else { - idSel("circle_wh_ran").value = e.target.value; + querySel("#circle_wh_ran").value = e.target.value; querySelAll(".c_line").forEach(i => { i.style.width = `${e.target.value}px`; i.style.height = `${e.target.value}px`; @@ -144,42 +143,42 @@ window.onload = e => { localStorage.setItem("circle-wh", e.target.value); } }) - idSel("circle_wh_ran").addEventListener("input", e => { - idSel("circle_wh").value = e.target.value; + querySel("#circle_wh_ran").addEventListener("input", e => { + querySel("#circle_wh").value = e.target.value; querySelAll(".c_line").forEach(i => { i.style.width = `${e.target.value}px`; i.style.height = `${e.target.value}px`; }); localStorage.setItem("circle-wh", e.target.value); }) - idSel("bg_blur").addEventListener("input", e => { + querySel("#bg_blur").addEventListener("input", e => { if (e.target.value < 0) { - idSel("bg_blur").value = 0; - idSel("bg_blur_ran").value = 0; + querySel("#bg_blur").value = 0; + querySel("#bg_blur_ran").value = 0; querySelAll(".c_line").forEach(i => { i.style.width = `0px`; i.style.height = `0px`; }); localStorage.setItem("bg-blur", 0); } else { - idSel("bg_blur_ran").value = e.target.value; + querySel("#bg_blur_ran").value = e.target.value; querySelAll(".bg").forEach(i => i.style.filter = `blur(${e.target.value}px)`); localStorage.setItem("bg-blur", e.target.value) } }) - idSel("bg_blur_ran").addEventListener("input", e => { - idSel("bg_blur").value = e.target.value; + querySel("#bg_blur_ran").addEventListener("input", e => { + querySel("#bg_blur").value = e.target.value; querySelAll(".bg").forEach(i => i.style.filter = `blur(${e.target.value}px)`); localStorage.setItem("bg-blur", e.target.value) }) - idSel("bg-color").addEventListener("input", e => { - idSel("bg-color-text").value = e.target.value; + querySel("#bg-color").addEventListener("input", e => { + querySel("#bg-color-text").value = e.target.value; querySel("body").style.backgroundColor = e.target.value; localStorage.setItem("bg-color", [e.target.value, localStorage.getItem("bg-color") == null ? "t" : localStorage.getItem("bg-color").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("bg-color").substr(-1, 1) : "t"]) }) - idSel("bg-color-text").addEventListener("input", e => { - hexcor(e.target.value, idSel("bg-color"), "bg-color") - querySel("body").style.backgroundColor = hexcl; + querySel("#bg-color-text").addEventListener("input", e => { + ColorService.setHexColor(e.target.value, querySel("#bg-color"), "bg-color") + querySel("body").style.backgroundColor = ColorService.getColor(); }) querySelAll(".bg-img").forEach(i => i.addEventListener("click", e => { bg = idx(e.target); @@ -192,7 +191,7 @@ window.onload = e => { e.target.classList.remove("toggle_false"); switch (idx(e.target)) { case 0: - idSel("snow").style.display = "block"; + querySel("#snow").style.display = "block"; storage.toggle("flakeCount", 2000, "t") break case 7: @@ -200,8 +199,8 @@ window.onload = e => { storage.toggle("text-color", "#ffffff", "t") break case 10: - hexcl = idSel("text-shadow").value - querySelAll(".time").forEach(i => i.style.textShadow = `${hexcl} 0 0 5px,${hexcl} 0 0 5px,${hexcl} 0 0 5px`); + ColorService.setColor(querySel("#text-shadow").value); + querySelAll(".time").forEach(i => i.style.textShadow = `${ColorService.getColor()} 0 0 5px,${ColorService.getColor()} 0 0 5px,${ColorService.getColor()} 0 0 5px`); storage.toggle("text-shadow", "#77ffbb", "t") break case 12: @@ -216,8 +215,8 @@ window.onload = e => { storage.toggle("circle-color", "#ffffff", "t") break case 19: - hexcl = idSel("circle-shadow").value - querySelAll(".c_line").forEach(i => i.style.boxShadow = `${hexcl} 0 0 20px 5px,${hexcl} 0 0 20px 5px inset`); + ColorService.setColor(querySel("#circle-shadow").value); + querySelAll(".c_line").forEach(i => i.style.boxShadow = `${ColorService.getColor()} 0 0 20px 5px,${ColorService.getColor()} 0 0 20px 5px inset`); storage.toggle("circle-shadow", "#77ffbb", "t") break case 21: @@ -229,7 +228,7 @@ window.onload = e => { e.target.classList.add("toggle_false"); switch (idx(e.target)) { case 0: - idSel("snow").style.display = "none"; + querySel("#snow").style.display = "none"; storage.toggle("flakeCount", 2000, "f") break case 7: @@ -293,7 +292,7 @@ window.onload = e => { querySelAll(".bg").forEach(i => i.style.filter = `blur(5px)`); querySelAll(".toggle").forEach(i => i.classList.remove("toggle_false")); querySelAll(".flickers_t").forEach(i => i.classList.add("toggle_false")); - idSel("snow").style.display = `block`; + querySel("#snow").style.display = `block`; querySelAll(".time").forEach(i => i.style.display = `block`); querySelAll(".time").forEach(i => i.classList.add("nofl")); querySelAll(".c_line").forEach(i => i.style.display = `block`); @@ -315,7 +314,7 @@ document.addEventListener("keydown", function (key) { if (key.keyCode == 9) { key.preventDefault(); querySelAll(".menu").forEach(i => i.classList.toggle("tab")); - idSel("sub_menu").classList.toggle("toggletab"); + querySel("#sub_menu").classList.toggle("toggletab"); querySelAll(".sub_menu").forEach(i => i.classList.remove("tab")); } }) @@ -333,14 +332,14 @@ document.addEventListener("mouseup", function (e) { querySelAll(".sub_menu").forEach(i => i.classList.add("tab")); } else { querySelAll(".menu").forEach(i => i.classList.add("tab")); - idSel("sub_menu").classList.add("toggletab"); + querySel("#sub_menu").classList.add("toggletab"); } } else if (x - e.pageX > 0) { if (hasClass(querySelAll(".sub_menu")[0], "tab")) { querySelAll(".sub_menu").forEach(i => i.classList.remove("tab")); } else { querySelAll(".menu").forEach(i => i.classList.remove("tab")); - idSel("sub_menu").classList.remove("toggletab"); + querySel("#sub_menu").classList.remove("toggletab"); } } } else { diff --git a/src/utils/index.js b/src/utils/index.js index 0ef6aea..5a0d961 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,28 +1,4 @@ -export function hexcor(c, r, l) { - if (c.length === 7 && c[0] === "#") { - sethexcor(c, r, l) - } else if (c.length === 6 && c[0] != "#") { - c = "#" + c - sethexcor(c, r, l) - } else if (c.length === 4 && c[0] === "#") { - const hex = ["#", c[1], c[1], c[2], c[2], c[3], c[3]] - c = hex.join("") - sethexcor(c, r, l) - } else if (c.length === 3 && c[0] != "#") { - const hex = ["#", c[0], c[0], c[1], c[1], c[2], c[2]] - c = hex.join("") - sethexcor(c, r, l) - } -} - -export function sethexcor(c, r, l) { - r.value = c - hexcl = c - localStorage.setItem(l, [c, localStorage.getItem(l) === null ? "t" : localStorage.getItem(l).substr(-2, 2) === ",t" || ",f" ? localStorage.getItem(l).substr(-1, 1) : "t"]) -} - export const hasClass = (element, className) => element.classList.contains(className); -export const idSel = id => document.getElementById(id); export const querySel = query => document.querySelector(query); export const querySelAll = query => document.querySelectorAll(query); From 39eaa4aed3d257f97c2f43629d73eeae5a0a75e3 Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 14:16:22 +0900 Subject: [PATCH 06/10] =?UTF-8?q?refactor:=20StyleService,=20BlockService?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/ColorService.js | 29 ------------------ src/services/DisplayService.js | 56 ++++++++++++++++++++++++++++++++++ src/services/StyleService.js | 55 +++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 29 deletions(-) delete mode 100644 src/services/ColorService.js create mode 100644 src/services/DisplayService.js create mode 100644 src/services/StyleService.js diff --git a/src/services/ColorService.js b/src/services/ColorService.js deleted file mode 100644 index 2af6993..0000000 --- a/src/services/ColorService.js +++ /dev/null @@ -1,29 +0,0 @@ -import storage from '../storage'; - -export default Object.freeze({ - - setColor(value, element, id) { - element.value = value; - storage.set('color', value); - storage.toggle(id, value, 't'); - }, - - getColor () { - return storage.get('color'); - }, - - setHexColor(value, element, id) { - const len = value.length; - const first = value[0]; - const newValue = len === 7 && first === "#" ? value : - len === 6 && first !== "#" ? `#${value}` : - len === 4 && first === "#" ? value.replace(/^#(.)(.)(.)$/, '#$1$1$2$2$3$3') : - len === 3 && first !== "#" ? value.replace(/^(.)(.)(.)$/, '#$1$1$2$2$3$3') : - null; - - if (newValue === null) return; - - this.setColor(newValue, element, id); - } - -}) \ No newline at end of file diff --git a/src/services/DisplayService.js b/src/services/DisplayService.js new file mode 100644 index 0000000..b6fdb67 --- /dev/null +++ b/src/services/DisplayService.js @@ -0,0 +1,56 @@ +import storage from '../storage'; + +const KEY = 'display'; + +/** @typedef {Object.} DisplayMap **/ + +export default Object.freeze({ + + /** + * @returns {DisplayMap} + */ + fetchAll () { + return storage.get(KEY) || {}; + }, + + /** + * @param displayMap {DisplayMap} + */ + put (displayMap) { + storage.set(KEY, displayMap); + }, + + /** + * @param key {string} + * @returns {boolean} + */ + get (key) { + const data = this.fetchAll()[key]; + if (data === undefined) return false; + return data; + }, + + /** + * @param key {string} + * @param value {boolean} + * @returns {boolean} + */ + set (key, value) { + const displayMap = this.fetchAll(); + displayMap[key] = value; + this.put(displayMap); + return displayMap[key]; + }, + + /** + * @param key {string} + * @returns {boolean} + */ + toggle (key) { + const displayMap = this.fetchAll(); + displayMap[key] = !displayMap[key]; + this.put(displayMap); + return displayMap[key]; + } + +}) \ No newline at end of file diff --git a/src/services/StyleService.js b/src/services/StyleService.js new file mode 100644 index 0000000..7d051b8 --- /dev/null +++ b/src/services/StyleService.js @@ -0,0 +1,55 @@ +import storage from '../storage'; + +const KEY = 'style'; + +/** @typedef {Object.} StyleMap **/ + +export default Object.freeze({ + + /** + * @returns {StyleMap} + */ + fetchAll () { + return storage.get(KEY) || {}; + }, + + /** + * @param key {string} + * @returns {string|number} + */ + get (key) { + const styleMap = this.fetchAll(); + return styleMap[key]; + }, + + /** + * @param value {string|number} + * @param element {HTMLElement} + * @param id {string} + */ + set (value, element, id) { + const styleMap = this.fetchAll(); + styleMap[id] = value; + element.value = value; + }, + + /** + * @param value {string|number} + * @param element {HTMLElement} + * @param id {string} + */ + setHexColor(value, element, id) { + const len = value.length; + const first = value[0]; + const newValue = len === 7 && first === "#" ? value : + len === 6 && first !== "#" ? `#${value}` : + len === 4 && first === "#" ? value.replace(/^#(.)(.)(.)$/, '#$1$1$2$2$3$3') : + len === 3 && first !== "#" ? value.replace(/^(.)(.)(.)$/, '#$1$1$2$2$3$3') : + null; + + if (newValue === null) return; + + this.set(newValue, element, id); + } + +}) \ No newline at end of file From 8c00d45194045ae1eb387b700c2b9855d07cb9f9 Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 14:16:36 +0900 Subject: [PATCH 07/10] =?UTF-8?q?refactor:=20Domain=20file=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/domain/index.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/domain/index.js diff --git a/src/domain/index.js b/src/domain/index.js new file mode 100644 index 0000000..4b3853a --- /dev/null +++ b/src/domain/index.js @@ -0,0 +1,4 @@ +export const color = { + WHITE: '#ffffff', + LIME: '#77ffbb', +} \ No newline at end of file From 47ba6b526e2fbbe1e17c968f8da9c7f10faefeb8 Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 14:16:55 +0900 Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20Toggle=20Method=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/storage/index.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/storage/index.js b/src/storage/index.js index 7656c7b..b0f4257 100644 --- a/src/storage/index.js +++ b/src/storage/index.js @@ -18,19 +18,4 @@ export default Object.freeze({ localStorage.setItem(key, JSON.stringify(value)); }, - /** - * key에 value를 할당하고, toogle 시킴 - * @param key {string} - * @param value {string} - * @param toggle {'t'|'f'} - */ - toggle(key, value, toggle) { - if (this.get(key) === null) { - this.set(key, [value, toggle]); - return; - } - const before = this.get(key).split(',')[0]; - this.set(key, [value, before === 't' ? 'f' : 't']); - }, - }); \ No newline at end of file From 96a2f7313272ec301741fb368ba5c7ab579423c9 Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 14:17:23 +0900 Subject: [PATCH 09/10] =?UTF-8?q?refactor:=20StyleService,=20BlockService?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 2 +- src/App.js | 32 +++---- src/localStorage.js | 136 ++++++++++++++++-------------- src/services/FlakeSpeedService.js | 16 ++++ src/services/index.js | 4 +- src/utils/index.js | 3 +- 6 files changed, 111 insertions(+), 82 deletions(-) create mode 100644 src/services/FlakeSpeedService.js diff --git a/index.html b/index.html index af90d9d..3897100 100644 --- a/index.html +++ b/index.html @@ -94,6 +94,6 @@

reset

- + \ No newline at end of file diff --git a/src/App.js b/src/App.js index a2f278d..57d6802 100644 --- a/src/App.js +++ b/src/App.js @@ -1,13 +1,15 @@ import localStorage from './localStorage'; import storage from './storage'; import { querySel, querySelAll } from "./utils"; -import { ColorService } from "./services"; +import { StyleService } from "./services"; let time = new Date(), flsp, bltf, bg, x, dop = true; const winw = window.innerWidth, winh = window.innerHeight; window.onload = e => { + snow_js(); local(); + window.scrollTo(0, 1); const clock_sp = querySelAll(".clock>span"), @@ -72,8 +74,8 @@ window.onload = e => { localStorage.setItem("text-color", [e.target.value, localStorage.getItem("text-color") == null ? "t" : localStorage.getItem("text-color").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("text-color").substr(-1, 1) : "t"]); }) querySel("#text-color-text").addEventListener("input", e => { - ColorService.setHexColor(e.target.value, querySel("#text-color"), "text-color"); - querySelAll(".time").forEach(i => i.style.color = ColorService.getColor()); + StyleService.setHexColor(e.target.value, querySel("#text-color"), "text-color"); + querySelAll(".time").forEach(i => i.style.color = StyleService.get()); }) querySel("#text-color-text").addEventListener("blur", e => { querySel("#text-color-text").value = querySel("#text-color").value; @@ -84,8 +86,8 @@ window.onload = e => { localStorage.setItem("text-shadow", [e.target.value, localStorage.getItem("text-shadow") == null ? "t" : localStorage.getItem("text-shadow").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("text-shadow").substr(-1, 1) : "t"]) }) querySel("#text-shadow-text").addEventListener("input", e => { - ColorService.setHexColor(e.target.value, querySel("#text-shadow"), "text-shadow") - querySelAll(".time").forEach(i => i.style.textShadow = `${ColorService.getColor()} 0 0 5px,${ColorService.getColor()} 0 0 5px,${ColorService.getColor()} 0 0 5px`); + StyleService.setHexColor(e.target.value, querySel("#text-shadow"), "text-shadow") + querySelAll(".time").forEach(i => i.style.textShadow = `${StyleService.get()} 0 0 5px,${StyleService.get()} 0 0 5px,${StyleService.get()} 0 0 5px`); }) querySel("#text-shadow-text").addEventListener("blur", e => { querySel("#text-shadow-text").value = querySel("#text-shadow").value; @@ -96,8 +98,8 @@ window.onload = e => { localStorage.setItem("circle-color", [e.target.value, localStorage.getItem("circle-color") == null ? "t" : localStorage.getItem("circle-color").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("circle-color").substr(-1, 1) : "t"]) }) querySel("#circle-color-text").addEventListener("input", e => { - ColorService.setHexColor(e.target.value, querySel("#circle-color"), "circle-color") - querySelAll(".c_line").forEach(i => i.style.borderColor = ColorService.getColor()); + StyleService.setHexColor(e.target.value, querySel("#circle-color"), "circle-color") + querySelAll(".c_line").forEach(i => i.style.borderColor = StyleService.get()); }) querySel("#circle-color-text").addEventListener("blur", e => { querySel("#circle-color-text").value = querySel("#circle-color").value; @@ -108,8 +110,8 @@ window.onload = e => { localStorage.setItem("circle-shadow", [e.target.value, localStorage.getItem("circle-shadow") == null ? "t" : localStorage.getItem("circle-shadow").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("circle-shadow").substr(-1, 1) : "t"]) }) querySel("#circle-shadow-text").addEventListener("input", e => { - ColorService.setHexColor(e.target.value, querySel("#circle-shadow"), "circle-shadow") - querySelAll(".c_line").forEach(i => i.style.boxShadow = `${ColorService.getColor()} 0 0 20px 5px,${ColorService.getColor()} 0 0 20px 5px inset`); + StyleService.setHexColor(e.target.value, querySel("#circle-shadow"), "circle-shadow") + querySelAll(".c_line").forEach(i => i.style.boxShadow = `${StyleService.get()} 0 0 20px 5px,${StyleService.get()} 0 0 20px 5px inset`); }) querySel("#circle-shadow-text").addEventListener("blur", e => { querySel("#circle-shadow-text").value = querySel("#circle-shadow").value @@ -177,8 +179,8 @@ window.onload = e => { localStorage.setItem("bg-color", [e.target.value, localStorage.getItem("bg-color") == null ? "t" : localStorage.getItem("bg-color").substr(-2, 2) == ",t" || ",f" ? localStorage.getItem("bg-color").substr(-1, 1) : "t"]) }) querySel("#bg-color-text").addEventListener("input", e => { - ColorService.setHexColor(e.target.value, querySel("#bg-color"), "bg-color") - querySel("body").style.backgroundColor = ColorService.getColor(); + StyleService.setHexColor(e.target.value, querySel("#bg-color"), "bg-color") + querySel("body").style.backgroundColor = StyleService.get(); }) querySelAll(".bg-img").forEach(i => i.addEventListener("click", e => { bg = idx(e.target); @@ -199,8 +201,8 @@ window.onload = e => { storage.toggle("text-color", "#ffffff", "t") break case 10: - ColorService.setColor(querySel("#text-shadow").value); - querySelAll(".time").forEach(i => i.style.textShadow = `${ColorService.getColor()} 0 0 5px,${ColorService.getColor()} 0 0 5px,${ColorService.getColor()} 0 0 5px`); + StyleService.setColor(querySel("#text-shadow").value); + querySelAll(".time").forEach(i => i.style.textShadow = `${StyleService.get()} 0 0 5px,${StyleService.get()} 0 0 5px,${StyleService.get()} 0 0 5px`); storage.toggle("text-shadow", "#77ffbb", "t") break case 12: @@ -215,8 +217,8 @@ window.onload = e => { storage.toggle("circle-color", "#ffffff", "t") break case 19: - ColorService.setColor(querySel("#circle-shadow").value); - querySelAll(".c_line").forEach(i => i.style.boxShadow = `${ColorService.getColor()} 0 0 20px 5px,${ColorService.getColor()} 0 0 20px 5px inset`); + StyleService.setColor(querySel("#circle-shadow").value); + querySelAll(".c_line").forEach(i => i.style.boxShadow = `${StyleService.get()} 0 0 20px 5px,${StyleService.get()} 0 0 20px 5px inset`); storage.toggle("circle-shadow", "#77ffbb", "t") break case 21: diff --git a/src/localStorage.js b/src/localStorage.js index 7c7f234..62f25c5 100644 --- a/src/localStorage.js +++ b/src/localStorage.js @@ -1,89 +1,99 @@ import storage from './storage/Storage'; +import {DisplayService, StyleService} from "./services"; +import { color } from './domain'; +import {querySel, querySelAll} from "./utils"; -export function local() { - flakeCount=lotf("flakeCount",2000) - mouseMoveR = storage.get("mouseMoveR") || 200; +const styleBy = (key, value = null) => { + const style = value === null ? 'block' : StyleService.get(key); + return DisplayService.get(key) ? style : 'none'; +} +const styleByBlock = (key, value = null) => { + return styleBy(key, 'block'); +} - flsp=lotf("flsp",10) - bg=lotf("bg",0) +export function local() { + const flakeCount = StyleService.get("flakeCount") || 2000; + const mouseMoveR = StyleService.get("mouseMoveR") || 200; + const flsp = StyleService.get("flsp") || 10; + const bg = StyleService.get("bg") || 0; const winw = window.innerWidth, winh = window.innerHeight; const numPa = querySelAll(".menu .num"), colorPa = querySelAll(".menu .color"); + const timeElements = querySelAll(".time"); numPa[0].querySelectorAll("input").forEach(i => i.value = flakeCount); numPa[1].querySelectorAll("input").forEach(i => i.value = snowSpeed); numPa[2].querySelectorAll("input").forEach(i => i.value = mouseMoveR); - colorPa[0].querySelectorAll("input").forEach(i => i.value = lotf("text-color","#ffffff")); - colorPa[1].querySelectorAll("input").forEach(i => i.value = lotf("text-shadow","#77ffbb")); + colorPa[0].querySelectorAll("input").forEach(i => i.value = StyleService.get("text-color") || color.WHITE); + colorPa[1].querySelectorAll("input").forEach(i => i.value = StyleService.get("text-shadow") || color.LIME); numPa[3].querySelectorAll("input").forEach(i => i.value = flsp); - numPa[4].querySelectorAll("input").forEach(i => i.value = localStorage.getItem("circle-wh")==null?Math.floor((winw/100)*40):localStorage.getItem("circle-wh")); - colorPa[2].querySelectorAll("input").forEach(i => i.value = lotf("circle-color","#ffffff")); - colorPa[3].querySelectorAll("input").forEach(i => i.value = lotf("circle-shadow","#77ffbb")); - numPa[5].querySelectorAll("input").forEach(i => i.value = localStorage.getItem("bg-blur")==null?5:localStorage.getItem("bg-blur")); - colorPa[4].querySelectorAll("input").forEach(i => i.value = lotf("bg-color","#ffffff")); - querySelAll(".time").forEach(i => i.style.color = idSel("text-color").value); - querySelAll(".time").forEach(i => i.style.textShadow = `${idSel("text-shadow").value} 0 0 5px,${idSel("text-shadow").value} 0 0 5px,${idSel("text-shadow").value} 0 0 5px`); + numPa[4].querySelectorAll("input").forEach(i => i.value = StyleService.get("circle-wh") || Math.floor((winw / 100 ) * 40 )); + colorPa[2].querySelectorAll("input").forEach(i => i.value = StyleService.get("circle-color") || color.WHITE ); + colorPa[3].querySelectorAll("input").forEach(i => i.value = StyleService.get("circle-shadow") || color.LIME ); + numPa[5].querySelectorAll("input").forEach(i => i.value = StyleService.get("bg-blur") || 5); + colorPa[4].querySelectorAll("input").forEach(i => i.value = StyleService.get("bg-color") || color.WHITE); + + timeElements.forEach(i => i.style.color = querySel("#text-color").value); + timeElements.forEach(i => { + const val = querySel("#text-shadow").value; + const iterable = `${val} 0 0 5px`; + i.style.textShadow = `${iterable},${iterable},${iterable}`; + }); + querySelAll(".c_line").forEach(i => { - i.style.width = `${idSel("circle_wh").value}px`; - i.style.height = `${idSel("circle_wh").value}px`; + i.style.width = `${querySel("#circle_wh").value}px`; + i.style.height = `${querySel("#circle_wh").value}px`; }); - querySelAll(".c_line").forEach(i => i.style.borderColor = idSel("circle-color").value); - querySelAll(".c_line").forEach(i => i.style.boxShadow = `${idSel("circle-shadow").value} 0 0 20px 5px,${idSel("circle-shadow").value} 0 0 20px 5px inset`); - querySelAll(".bg").forEach(i => i.style.filter = `blur(${idSel("bg_blur").value}px)`); - querySel("body").style.background = idSel("bg-color").value + querySelAll(".c_line").forEach(i => i.style.borderColor = querySel("#circle-color").value); + querySelAll(".c_line").forEach(i => { + const val = querySel("#circle-shadow").value; + const iterable = `${val} 0 0 20px 5px`; + i.style.boxShadow = `${iterable},${iterable} inset`; + }); + querySelAll(".bg").forEach(i => i.style.filter = `blur(${querySel("#bg_blur").value}px)`); + querySel("body").style.background = querySel("#bg-color").value querySelAll(".bg,.bg-image").forEach(i => i.style.backgroundImage = `url(./images/bg-${bg}.jpg)`); - idSel("snow").style.display = lotrfa("flakeCount") - querySelAll(".time").forEach(i => i.style.display = lotrfa("text-color")); - querySelAll(".time").forEach(i => i.style.textShadow = lotrfa("text-shadow")); - if(lotrfa("flsp")){ - querySelAll(".time").forEach(i => i.classList.add("nofl")); + querySel("#snow").style.display = DisplayService.get("flakeCount") ? 'block' : 'none'; + timeElements.forEach(i => i.style.display = DisplayService.get("text-color") ? 'block' : 'none'); + timeElements.forEach(i => i.style.textShadow = DisplayService.get("text-shadow") ? StyleService.get("text-shadow") : 'none'); + + if(DisplayService.get("flsp")){ + timeElements.forEach(i => i.classList.add("nofl")); } - querySelAll(".c_line").forEach(i => i.style.display = lotrfa("circle-color")); - querySelAll(".c_line").forEach(i => i.style.boxShadow = lotrfa("circle-shadow")); - if(lotrfa("flakeCount")=="none"){ - idSel("rain").style.display = lotrfa("flakeCount") - querySelAll(".toggle").forEach(i => i.eq(0).classList.add("toggle_false")); + + querySelAll(".c_line").forEach(i => i.style.display = styleByBlock("circle-color")); + querySelAll(".c_line").forEach(i => i.style.boxShadow = styleBy("circle-shadow")); + if(!DisplayService.get("flakeCount")){ + querySel("#rain").style.display = styleBy("flakeCount") + querySelAll(".toggle").forEach(i => i[0].classList.add("toggle_false")); } - if(lotrfa("text-color")=="none"){ - querySelAll(".time").forEach(i => i.style.display = lotrfa("text-color")); - querySelAll(".toggle").forEach(i => i.eq(1).classList.add("toggle_false")); + if(!DisplayService.get("text-c")){ + timeElements.forEach(i => i.style.display = styleByBlock("text-color")); + querySelAll(".toggle").forEach(i => i[1].classList.add("toggle_false")); } - if(lotrfa("text-shadow")=="none"){ - querySelAll(".time").forEach(i => i.style.textShadow = lotrfa("text-shadow")); - querySelAll(".toggle").forEach(i => i.eq(2).classList.add("toggle_false")); + if(!DisplayService.get("text-s")){ + timeElements.forEach(i => i.style.textShadow = styleBy("text-shadow")); + querySelAll(".toggle").forEach(i => i[2].classList.add("toggle_false")); } - if(lotrfa("flsp")=="none"){ - querySelAll(".time").forEach(i => i.classList.add("nofl")); - querySelAll(".toggle").forEach(i => i.eq(3).classList.add("toggle_false")); + if(!DisplayService.get("flsp")){ + timeElements.forEach(i => i.classList.add("nofl")); + querySelAll(".toggle").forEach(i => i[3].classList.add("toggle_false")); } - if(lotrfa("circle-color")=="none"){ - querySelAll(".c_line").forEach(i => i.style.display = lotrfa("circle-color")); - querySelAll(".toggle").forEach(i => i.eq(4).classList.add("toggle_false")); + if(!DisplayService.get("circle-c")){ + querySelAll(".c_line").forEach(i => i.style.display = styleByBlock("circle-color")); + querySelAll(".toggle").forEach(i => i[4].classList.add("toggle_false")); } - if(lotrfa("circle-shadow")=="none"){ - querySelAll(".c_line").forEach(i => i.style.boxShadow = lotrfa("circle-shadow")); - querySelAll(".toggle").forEach(i => i.eq(5).classList.add("toggle_false")); + if(!DisplayService.get("circle-s")){ + querySelAll(".c_line").forEach(i => i.style.boxShadow = styleBy("circle-shadow")); + querySelAll(".toggle").forEach(i => i[5].classList.add("toggle_false")); } - if(lotrfa("bg")=="none"){ - querySelAll(".bg").forEach(i => i.style.display = lotrfa("bg")); - querySelAll(".toggle").forEach(i => i.eq(6).classList.add("toggle_false")); + if(!DisplayService.get("bg")){ + querySelAll(".bg").forEach(i => i.style.display = styleByBlock("bg")); + querySelAll(".toggle").forEach(i => i[6].classList.add("toggle_false")); } - querySelAll(".time").forEach(i => i.style.fontSize = `${Math.floor(winh/10)}px`); - querySelAll(".time").forEach(i => i.style.width = `${winw}px`); -} - -export function lotf(l,n){ - return localStorage.getItem(l)==null?n:localStorage.getItem(l).substr(-2,2)==",t"||",f"?localStorage.getItem(l).substr(0,localStorage.getItem(l).length-2):localStorage.getItem(l) -} -export function lotrfa(l){ - // console.log(localStorage.getItem(l)==null?"block":localStorage.getItem(l).substr(-2,2)) - return localStorage.getItem(l)==null?"block":localStorage.getItem(l).substr(-2,2)==",t"?"block":"none" -} -export function fn(s){ - let result - result = s.replace(/[^0-9]/g,"") - return result + timeElements.forEach(i => i.style.fontSize = `${Math.floor(winh/10)}px`); + timeElements.forEach(i => i.style.width = `${winw}px`); } \ No newline at end of file diff --git a/src/services/FlakeSpeedService.js b/src/services/FlakeSpeedService.js new file mode 100644 index 0000000..21fd63c --- /dev/null +++ b/src/services/FlakeSpeedService.js @@ -0,0 +1,16 @@ +import storage from '../storage'; + + + +export default Object.freeze({ + + getFlask (key, defaultValue){ + const data = storage.get(key); + if (data === null) { + return defaultValue; + } + const [value, toggle] = data.split(','); + return toggle === 't' ? value : data; + }, + +}) \ No newline at end of file diff --git a/src/services/index.js b/src/services/index.js index ce91c51..b4dd4de 100644 --- a/src/services/index.js +++ b/src/services/index.js @@ -1 +1,3 @@ -export { default as ColorService } from './ColorService'; \ No newline at end of file +export { default as StyleService } from './StyleService'; +export { default as DisplayService } from './DisplayService'; +export { default as FlakeSpeedService } from './FlakeSpeedService'; \ No newline at end of file diff --git a/src/utils/index.js b/src/utils/index.js index 5a0d961..3bb7091 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,8 +1,7 @@ export const hasClass = (element, className) => element.classList.contains(className); export const querySel = query => document.querySelector(query); export const querySelAll = query => document.querySelectorAll(query); - -export function idx(el) { +export const idx = el => { let i = 0, temp = el; while (temp) { i++; From 06d6cc51db5a0be8839a14a84165c6f8a12cfb59 Mon Sep 17 00:00:00 2001 From: rsj2003 Date: Fri, 21 Aug 2020 14:21:52 +0900 Subject: [PATCH 10/10] =?UTF-8?q?refactor:=20localStorage=20->=20Initializ?= =?UTF-8?q?e=EB=A1=9C=20=ED=8C=8C=EC=9D=BC=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 8 ++-- src/{localStorage.js => initialize.js} | 55 ++++++++++++++------------ 2 files changed, 33 insertions(+), 30 deletions(-) rename src/{localStorage.js => initialize.js} (66%) diff --git a/src/App.js b/src/App.js index 57d6802..a9f756e 100644 --- a/src/App.js +++ b/src/App.js @@ -1,14 +1,14 @@ -import localStorage from './localStorage'; +import { init } from './initialize'; import storage from './storage'; import { querySel, querySelAll } from "./utils"; import { StyleService } from "./services"; let time = new Date(), flsp, bltf, bg, x, dop = true; -const winw = window.innerWidth, winh = window.innerHeight; -window.onload = e => { +const winw = window.innerWidth; +window.onload = e => { snow_js(); - local(); + init(); window.scrollTo(0, 1); const diff --git a/src/localStorage.js b/src/initialize.js similarity index 66% rename from src/localStorage.js rename to src/initialize.js index 62f25c5..455d6bb 100644 --- a/src/localStorage.js +++ b/src/initialize.js @@ -1,4 +1,3 @@ -import storage from './storage/Storage'; import {DisplayService, StyleService} from "./services"; import { color } from './domain'; import {querySel, querySelAll} from "./utils"; @@ -11,17 +10,20 @@ const styleByBlock = (key, value = null) => { return styleBy(key, 'block'); } -export function local() { +export function init() { const flakeCount = StyleService.get("flakeCount") || 2000; const mouseMoveR = StyleService.get("mouseMoveR") || 200; const flsp = StyleService.get("flsp") || 10; const bg = StyleService.get("bg") || 0; - const winw = window.innerWidth, - winh = window.innerHeight; + const windowWidth = window.innerWidth, + windowHeight = window.innerHeight; const numPa = querySelAll(".menu .num"), - colorPa = querySelAll(".menu .color"); - const timeElements = querySelAll(".time"); + colorPa = querySelAll(".menu .color"), + timeElements = querySelAll(".time"), + cLine = querySelAll(".c_line"), + bgs = querySelAll(".bg"), + toggles = querySelAll(".toggle"); numPa[0].querySelectorAll("input").forEach(i => i.value = flakeCount); numPa[1].querySelectorAll("input").forEach(i => i.value = snowSpeed); @@ -29,7 +31,7 @@ export function local() { colorPa[0].querySelectorAll("input").forEach(i => i.value = StyleService.get("text-color") || color.WHITE); colorPa[1].querySelectorAll("input").forEach(i => i.value = StyleService.get("text-shadow") || color.LIME); numPa[3].querySelectorAll("input").forEach(i => i.value = flsp); - numPa[4].querySelectorAll("input").forEach(i => i.value = StyleService.get("circle-wh") || Math.floor((winw / 100 ) * 40 )); + numPa[4].querySelectorAll("input").forEach(i => i.value = StyleService.get("circle-wh") || Math.floor((windowWidth / 100 ) * 40 )); colorPa[2].querySelectorAll("input").forEach(i => i.value = StyleService.get("circle-color") || color.WHITE ); colorPa[3].querySelectorAll("input").forEach(i => i.value = StyleService.get("circle-shadow") || color.LIME ); numPa[5].querySelectorAll("input").forEach(i => i.value = StyleService.get("bg-blur") || 5); @@ -42,19 +44,19 @@ export function local() { i.style.textShadow = `${iterable},${iterable},${iterable}`; }); - querySelAll(".c_line").forEach(i => { + cLine.forEach(i => { i.style.width = `${querySel("#circle_wh").value}px`; i.style.height = `${querySel("#circle_wh").value}px`; }); - querySelAll(".c_line").forEach(i => i.style.borderColor = querySel("#circle-color").value); - querySelAll(".c_line").forEach(i => { + cLine.forEach(i => i.style.borderColor = querySel("#circle-color").value); + cLine.forEach(i => { const val = querySel("#circle-shadow").value; const iterable = `${val} 0 0 20px 5px`; i.style.boxShadow = `${iterable},${iterable} inset`; }); - querySelAll(".bg").forEach(i => i.style.filter = `blur(${querySel("#bg_blur").value}px)`); + bgs.forEach(i => i.style.filter = `blur(${querySel("#bg_blur").value}px)`); querySel("body").style.background = querySel("#bg-color").value - querySelAll(".bg,.bg-image").forEach(i => i.style.backgroundImage = `url(./images/bg-${bg}.jpg)`); + querySelAll(".bg, .bg-image").forEach(i => i.style.backgroundImage = `url(./images/bg-${bg}.jpg)`); querySel("#snow").style.display = DisplayService.get("flakeCount") ? 'block' : 'none'; timeElements.forEach(i => i.style.display = DisplayService.get("text-color") ? 'block' : 'none'); @@ -64,36 +66,37 @@ export function local() { timeElements.forEach(i => i.classList.add("nofl")); } - querySelAll(".c_line").forEach(i => i.style.display = styleByBlock("circle-color")); - querySelAll(".c_line").forEach(i => i.style.boxShadow = styleBy("circle-shadow")); + cLine.forEach(i => i.style.display = styleByBlock("circle-color")); + cLine.forEach(i => i.style.boxShadow = styleBy("circle-shadow")); if(!DisplayService.get("flakeCount")){ querySel("#rain").style.display = styleBy("flakeCount") - querySelAll(".toggle").forEach(i => i[0].classList.add("toggle_false")); + toggles.forEach(i => i[0].classList.add("toggle_false")); } if(!DisplayService.get("text-c")){ timeElements.forEach(i => i.style.display = styleByBlock("text-color")); - querySelAll(".toggle").forEach(i => i[1].classList.add("toggle_false")); + toggles.forEach(i => i[1].classList.add("toggle_false")); } if(!DisplayService.get("text-s")){ timeElements.forEach(i => i.style.textShadow = styleBy("text-shadow")); - querySelAll(".toggle").forEach(i => i[2].classList.add("toggle_false")); + toggles.forEach(i => i[2].classList.add("toggle_false")); } if(!DisplayService.get("flsp")){ timeElements.forEach(i => i.classList.add("nofl")); - querySelAll(".toggle").forEach(i => i[3].classList.add("toggle_false")); + toggles.forEach(i => i[3].classList.add("toggle_false")); } if(!DisplayService.get("circle-c")){ - querySelAll(".c_line").forEach(i => i.style.display = styleByBlock("circle-color")); - querySelAll(".toggle").forEach(i => i[4].classList.add("toggle_false")); + cLine.forEach(i => i.style.display = styleByBlock("circle-color")); + toggles.forEach(i => i[4].classList.add("toggle_false")); } if(!DisplayService.get("circle-s")){ - querySelAll(".c_line").forEach(i => i.style.boxShadow = styleBy("circle-shadow")); - querySelAll(".toggle").forEach(i => i[5].classList.add("toggle_false")); + cLine.forEach(i => i.style.boxShadow = styleBy("circle-shadow")); + toggles.forEach(i => i[5].classList.add("toggle_false")); } if(!DisplayService.get("bg")){ - querySelAll(".bg").forEach(i => i.style.display = styleByBlock("bg")); - querySelAll(".toggle").forEach(i => i[6].classList.add("toggle_false")); + bgs.forEach(i => i.style.display = styleByBlock("bg")); + toggles.forEach(i => i[6].classList.add("toggle_false")); } - timeElements.forEach(i => i.style.fontSize = `${Math.floor(winh/10)}px`); - timeElements.forEach(i => i.style.width = `${winw}px`); + + timeElements.forEach(i => i.style.fontSize = `${Math.floor(windowHeight/10)}px`); + timeElements.forEach(i => i.style.width = `${windowWidth}px`); } \ No newline at end of file