From db42c28255fc1c86f1f517bde3bf46cf0ad69552 Mon Sep 17 00:00:00 2001 From: Carmine De Rosa Date: Sun, 21 Jan 2018 18:03:05 +0100 Subject: [PATCH] generalization --- css/styles.css | 70 +++++++++--------- header.php | 2 +- index.php | 9 +++ js/compatibility.js | 17 ++++- js/modules.js | 61 +++++++++++++++ js/plans.js | 1 + js/scripts.js | 62 ---------------- modules.php | 12 +-- plans.php | 1 + scripts/compatibility.php | 2 + scripts/modules.php | 1 + .../global.scssc | Bin 18319 -> 26686 bytes .../modules.scssc | Bin 59847 -> 51180 bytes .../sections.scssc | Bin 759 -> 858 bytes scss/global.scss | 36 +++++++++ scss/sections/modules.scss | 33 --------- scss/sections/plans.scss | 1 + scss/sections/sections.scss | 1 + 18 files changed, 166 insertions(+), 143 deletions(-) create mode 100644 js/modules.js create mode 100644 js/plans.js create mode 100644 plans.php create mode 100644 scss/sections/plans.scss diff --git a/css/styles.css b/css/styles.css index 78037a1..1bd2dbe 100644 --- a/css/styles.css +++ b/css/styles.css @@ -14574,6 +14574,41 @@ a:hover { padding: 10px; } +/* line 102, global.scss */ +#dropLoading { + display: none; + position: fixed; + left: 0; + top: 50px; + height: calc(100vh - 50px); + width: 100%; + background: rgba(0, 0, 0, 0.8); + overflow: hidden; +} +/* line 111, global.scss */ +#dropLoading #animation_container { + position: absolute; + height: 300px; + width: 300px; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} +/* line 120, global.scss */ +#dropLoading #countdown { + position: fixed; + height: 30px; + line-height: 30px; + width: 50px; + z-index: 9999; + top: calc(50% + 30px); + left: 50%; + transform: translate(-50%, -50%); + text-align: center; + font-size: 1.125rem; + color: white; +} + /* line 3, forms.scss */ input, button { border: none; @@ -14925,41 +14960,6 @@ header .container .row .menu ul li.active a:hover, header .container .row .menu font-weight: 700; } -/* line 239, sections/modules.scss */ -#dropLoading { - display: none; - position: fixed; - left: 0; - top: 50px; - height: calc(100vh - 50px); - width: 100%; - background: rgba(0, 0, 0, 0.8); - overflow: hidden; -} -/* line 248, sections/modules.scss */ -#dropLoading #animation_container { - position: absolute; - height: 300px; - width: 300px; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} -/* line 257, sections/modules.scss */ -#dropLoading #countdown { - position: fixed; - height: 30px; - line-height: 30px; - width: 50px; - z-index: 9999; - top: calc(50% + 30px); - left: 50%; - transform: translate(-50%, -50%); - text-align: center; - font-size: 1.125rem; - color: white; -} - /* line 2, sections/compatibility.scss */ .compatibility { min-height: calc(100vh - 50px); diff --git a/header.php b/header.php index bfaf234..62a4e66 100644 --- a/header.php +++ b/header.php @@ -10,7 +10,7 @@
  • ">Risultati
  • ">Piani attivi
  • ">Report
    • -
  • ">Moduli disponibili
    • +
  • ">Moduli disponibili
    • diff --git a/index.php b/index.php index e989ba4..bb4a3c8 100644 --- a/index.php +++ b/index.php @@ -45,6 +45,15 @@ + +
    +
    + +
    +
    +
    +
    + diff --git a/js/compatibility.js b/js/compatibility.js index c398966..c94c18b 100644 --- a/js/compatibility.js +++ b/js/compatibility.js @@ -4,15 +4,28 @@ $(document).ready(()=>{ const compatibility = $('.compatibility') const sheets = compatibility.find('.sheet-container') const values = sheets.find('.value') + const confirm = compatibility.find('.button.confirm') + const loading = $('#dropLoading') values.each((index,elem)=>{ const el = $(elem) const percent = el.find('.percent') const value = percent.data('percent')+'%' - - console.log(percent) + percent.animate({'width': value},500) }) + confirm.on('click', ()=>{ + + loadingInit() + loading.fadeIn() + setTimeout(()=>{ + loading.fadeOut(()=>{ + window.location='/plans' + }) + },7000) + + }) + }) diff --git a/js/modules.js b/js/modules.js new file mode 100644 index 0000000..35fcf40 --- /dev/null +++ b/js/modules.js @@ -0,0 +1,61 @@ + +function allowDrop(ev) { + ev.preventDefault(); +} + +function drag(ev) { + ev.dataTransfer.setData("ID", ev.target.id) + $('.drop-action').addClass('drop-inactive') + $('.droppable').removeClass('drop-inactive').addClass('drop-active') +} + +function drop(ev) { + + ev.preventDefault(); + + const target = $(ev.currentTarget).find('.modules-container') + const overlay = $('#dropConfirm') + const loading = $('#dropLoading') + const discard = overlay.find('.discard') + const confirm = overlay.find('.confirm') + const data = ev.dataTransfer.getData("ID") + + let once = true + + overlay.fadeIn() + + discard.on('click',()=>{ + if(once){ + overlay.fadeOut() + once = false + } + }) + + confirm.on('click', ()=>{ + + if(once){ + loadingInit() + overlay.fadeOut() + loading.fadeIn() + + setTimeout(()=>{ + const module = $('#'+data) + loading.fadeOut() + target.append('
    '+module.text()+'
    ') + },7000) + once = false + } + + }) + +} + +function dragLeave(ev) { + $('.drop-action').removeClass('drop-inactive') + $('.droppable').removeClass('drop-active') +} + + + + + diff --git a/js/plans.js b/js/plans.js new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/js/plans.js @@ -0,0 +1 @@ + diff --git a/js/scripts.js b/js/scripts.js index 8d95e13..8b13789 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -1,63 +1 @@ -function allowDrop(ev) { - ev.preventDefault(); -} - -function drag(ev) { - ev.dataTransfer.setData("ID", ev.target.id) - $('.drop-action').addClass('drop-inactive') - $('.droppable').removeClass('drop-inactive').addClass('drop-active') -} - -function drop(ev) { - - ev.preventDefault(); - - const target = $(ev.currentTarget).find('.modules-container') - const overlay = $('#dropConfirm') - const loading = $('#dropLoading') - const discard = overlay.find('.discard') - const confirm = overlay.find('.confirm') - const data = ev.dataTransfer.getData("ID") - - let once = true - - console.log('TARGET1:',target) - - overlay.fadeIn() - - discard.on('click',()=>{ - if(once){ - overlay.fadeOut() - once = false - } - }) - - confirm.on('click', ()=>{ - - if(once){ - loadingInit() - overlay.fadeOut() - loading.fadeIn() - - setTimeout(()=>{ - const module = $('#'+data) - loading.fadeOut() - target.append('
    '+module.text()+'
    ') - },7000) - once = false - } - - }) - -} - -function dragLeave(ev) { - $('.drop-action').removeClass('drop-inactive') - $('.droppable').removeClass('drop-active') -} - - - - - diff --git a/modules.php b/modules.php index bd89e8b..3ca7e49 100644 --- a/modules.php +++ b/modules.php @@ -1,6 +1,6 @@ -
    +
    -
    +

    Moduli disponibili

    @@ -152,11 +152,3 @@
    - -
    -
    - -
    -
    -
    -
    diff --git a/plans.php b/plans.php new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/plans.php @@ -0,0 +1 @@ + diff --git a/scripts/compatibility.php b/scripts/compatibility.php index 64f4b62..6d94806 100644 --- a/scripts/compatibility.php +++ b/scripts/compatibility.php @@ -1 +1,3 @@ + + diff --git a/scripts/modules.php b/scripts/modules.php index 790446d..509788b 100644 --- a/scripts/modules.php +++ b/scripts/modules.php @@ -1,3 +1,4 @@ + diff --git a/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc b/scss/.sass-cache/132087705a52dd1d0e0e4a761ce2b1b521d0d802/global.scssc index 0eb831a8536114432ac743fa8657b3760c9967ff..19297c1b20404d20d97bac260873650d765f3380 100644 GIT binary patch delta 5209 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 O7pyYdmnyk*e(E1PGS-Fw delta 109 zcmdmYfw8}zae|~qVsdJlxnYW-aaxMGWvX$Sg{hHIs;NnmSyGCbiDhDHl3}VrN=mZv zL`QW-k&T%`jEq{7_c2N`>Tj-LjC7dnmLSR$!n!#&A%vBM&6+!8@_lCU$#uGXJZ#n~ N4*b@t4g%ILApj6j9$o+d diff --git a/scss/.sass-cache/5f9cd8e8aad7f3f5cd444b9e1c83afcdd207f75c/modules.scssc b/scss/.sass-cache/5f9cd8e8aad7f3f5cd444b9e1c83afcdd207f75c/modules.scssc index 01ecc6fde3723cefae3791f1d1914fab5002b10c..4259de5bfa1248205dde96005ef10c0e805871c5 100644 GIT binary patch delta 73 zcmV-P0Ji_f(*x{}1CSagWH>W9Wi~K3F*h?fWMeitGBq<}H!)*3IXN~rWMwllVq`F6 fIW{tpK_>wRv1!<~lgHH+0$&lc-ql|blalE*VvHGn delta 4700 zcma)ATWniZ7R4vvBzEp~?8MH)ZsJE>=I>Y zMH>lzW=8Wd(C!aFLbRzmAWA!>;wAACe6$F`2Ngo%15m>^Qk%Bq1w`y~?!CS{zSo+` zk8^g`-fP``&sk^3KR;jd`8PE$w5M_t;}hcp`N1s{Tl#Xn6GMGHWBpqO#8Y#e<@}2h2mbAD@DWG>v-d6ype?6ynZM5 z7hIRYAKBa%;OjEHBO?PmV0_BI_B`FR{xT02+&og^?X@~0T)+gaop)$qzP@k+ckl8+ z_SM^CS9nW_x7PDE6M6+R{Z{4``1IApHb+z)L19v`TtA~%)Yt}PEyM>G^Q~TkL1QTe zGCMcH%(1rEe5H(etQfGe=i%(ZgfoiBn1_oqA!UHD&O^uXh}S5lu|WmSo$7-9$AihM zm5f)BQMDMw(g*WTb#8M+5>|<{Km0Z#LqHnj!y7Cb8&zOV+X#=%wkEGtO1Xw`k}Z~g zA!Vy0l1PzAyOc+0F<70Acnt=PJ&GN9xe2Zu^}#83Z`^ggQp`;m1H|gX@<{Ex%xn&(b26P4X2vB8eV}wCg!U z^azL|^%yJ~JFGzLE(YKjn`#v9Yk?=@NQ`Zj-;KW z6q3ea-I|{&wkXbd+9;;6j}`M}mw2s@*X?qT#@iCvV&SjZ=|ZWv2X_BG zozNY&)r#gy#p!IJI6h@M?UHobcFSp(45wWZrn&^^w9QNS07RNtMxg)D{jufBM_tx? zVH)i+JbpIejPh9RUxrP0hLkz-sLQgkMlp^3WFFvl=IMp(?oiydQpvosw#h5fOdU~# zc}1G(Rl>X?&D1ESv1{gWZ8MlRxPGl<{uPAPZ%s3c*4wliHxM^uoYP{&4yy_j;YM;fyV=gx$b9i$JdaPi5A zS3C(8)Yv^Lj6Bm6Su&qoW8aV+t)JGX?hAT-iCpP##p!(MKv9fe?YcRr<)C2+%;gfE z@IYhP6ELEig80Q>FqWNbhAI)HE}^e02eL+Z_SO_mL#;{1T&7;bEkr~*skMe3N8?qI zR*NtbE*%c3Pg^|_p~t(!O1Y@U4&aWJV?fx|3-@}1X;x#CfD!7|0wGTGYaQ zLXM$(??iI5sK#Da%k#*d*-(<*WD|f9>Tig^aXG%d8j=W*nGPfK8$^-B_`n}+Nr{S* zNn@u}vxz01Y~+pNZfkg^yHL!JAA}=QK|X{(a=VHlVI%M2w}_E|xozq(f(B%@&+WpC z0ozvvNz@|}CvEiuA{IllBiKH(sK!22al-AyvC^vqbJ=~loBK1#Xjc?3sS|B!R%?@k z5$e(c5iWEdtwlvuz(i3k()&Y!FNq?Vk9SnGMbT^F4WO~Fgg1|*S)Gj^Bh;P+LijW8 z@9ovlM1YPqUyXHReNPlg3~nl+$Yj&l4{L3@FVE_2+Au<$S|F-g_5YQQZatc;hO`VD z5$M<()76lcX$ypK?YZEFs&z@bur4~c>b7oWK{YpsJ4hCi=3VQ<0lW!(V*^R%vGoKa z=s(u>^`NVr#m!O$Nyrh2QuCE19wKTaMmo~%qN3qQ!@hDBei0#DN52P+Zx%E*NzQ=03IlNIl~C(t^OD16 zlS}zBY<_P&d#CB`hu_=dS3GOK899GEMCSPN#D2&FM?Q&kPL3D$PEHR;do!8+2e~JT zKL-l==}993$1dE_jL{j4;|IC&|8*feW+j`s`|zKEZhP1$*JWuvv>?Hectc~>ELU= diff --git a/scss/.sass-cache/5f9cd8e8aad7f3f5cd444b9e1c83afcdd207f75c/sections.scssc b/scss/.sass-cache/5f9cd8e8aad7f3f5cd444b9e1c83afcdd207f75c/sections.scssc index 5210c5af3264499664a1585426d44dbaac77fe64..66264858d96d9d52b0e1191fe95182b1b3f9054c 100644 GIT binary patch delta 156 zcmey)dW&s>q(-8JiAidzv5~pCp@pG=kzs10sj+FAiIJ&+ak81Ap^3R!vT>rBxzR*N zbw-YjnF361`PS^b)*PNnTm?CadBtqjoFUe1(G1pH2G-mTT-H1W*1VaV)_nQa{G8ST t`PPE$V7^c$pS3U&Pjqq~lNh7>7$nF36cPcd;bnohpPq(51l*%<)!#1u^c diff --git a/scss/global.scss b/scss/global.scss index 2af0d52..6aadcdc 100644 --- a/scss/global.scss +++ b/scss/global.scss @@ -95,3 +95,39 @@ a{ overflow: hidden; padding: 10px; } + + + + +#dropLoading{ + display: none; + position: fixed; + left: 0; + top: 50px; + height: calc(100vh - 50px); + width: 100%; + background: rgba(0,0,0,0.8); + overflow: hidden; + #animation_container{ + position: absolute; + height: 300px; + width: 300px; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + + } + #countdown{ + position: fixed; + height: 30px; + line-height: 30px; + width: 50px; + z-index: 9999; + top: calc(50% + 30px); + left: 50%; + transform: translate(-50%, -50%); + text-align: center; + font-size: $font-18; + color: white; + } +} diff --git a/scss/sections/modules.scss b/scss/sections/modules.scss index df10f65..4268b9d 100644 --- a/scss/sections/modules.scss +++ b/scss/sections/modules.scss @@ -235,36 +235,3 @@ } - -#dropLoading{ - display: none; - position: fixed; - left: 0; - top: 50px; - height: calc(100vh - 50px); - width: 100%; - background: rgba(0,0,0,0.8); - overflow: hidden; - #animation_container{ - position: absolute; - height: 300px; - width: 300px; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - - } - #countdown{ - position: fixed; - height: 30px; - line-height: 30px; - width: 50px; - z-index: 9999; - top: calc(50% + 30px); - left: 50%; - transform: translate(-50%, -50%); - text-align: center; - font-size: $font-18; - color: white; - } -} diff --git a/scss/sections/plans.scss b/scss/sections/plans.scss new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/scss/sections/plans.scss @@ -0,0 +1 @@ + diff --git a/scss/sections/sections.scss b/scss/sections/sections.scss index dacd585..e071508 100644 --- a/scss/sections/sections.scss +++ b/scss/sections/sections.scss @@ -1,4 +1,5 @@ @import "modules"; @import "compatibility"; +@import "plans";