From bde971cf6e082ad875bdadf20b89ed50a10696d7 Mon Sep 17 00:00:00 2001 From: Dslak Date: Tue, 12 Oct 2021 16:15:28 +0200 Subject: [PATCH] fix header elements --- .env_prod | 4 ++-- components/checkout/checkout.js | 29 +++++---------------------- components/header/header.html | 4 +--- components/header/header.scss | 34 +++++++++++++++++++++++--------- pages/index.ejs | 2 +- src/fonts/icomoon.eot | Bin 1832 -> 1856 bytes src/fonts/icomoon.svg | 2 +- src/fonts/icomoon.ttf | Bin 1668 -> 1692 bytes src/fonts/icomoon.woff | Bin 1744 -> 1768 bytes src/fonts/selection.json | 2 +- src/scss/variables.scss | 7 ++++--- 11 files changed, 40 insertions(+), 44 deletions(-) diff --git a/.env_prod b/.env_prod index dbe1864..5d78c68 100644 --- a/.env_prod +++ b/.env_prod @@ -2,8 +2,8 @@ API_URL=https://www.iolovolio.com/api SITE_URL=https://www.iolovolio.com PP_ACCOUNT=villamarchesacilento@gmail.com -PP_CLIENTID=AbqqKkBugS-TH7qFIhxn-EQL9Z-VduKbPuOVnQimhvAQlbJ95qMJC85-vlfgIUEnRsRfcIfZm4BhrKYG -PP_SECRET=EHHzrA2Boa3kX1ARa7Ipd1SD5Ip8uPYXqecO_aGCMhTQqW1Uz43lL1TEs7lQzMt3BIIBEphqO6_FOQyw +PP_CLIENTID=AWu2qtnudDseQPQgzP8WjoWYgJ35RwVs5xGgnJaSUEy3GZBivJTDwpF1Iac48Ym9awFb_Q3hl30q0oX1 +PP_SECRET=EG4ocqai50hgZJ-033h2SVTnrc2QgBeeMg5Eclvrbb3Zw204wGEPmhfeag167tOMPAOpzwP5Cm8bFDmy PP_CANCEL=https://www.iolovolio.com/checkout PP_RETURN=https://www.iolovolio.com/thankyou diff --git a/components/checkout/checkout.js b/components/checkout/checkout.js index e208878..eeb7e7a 100644 --- a/components/checkout/checkout.js +++ b/components/checkout/checkout.js @@ -143,7 +143,7 @@ $(document).ready( () => { const placeOrder = (profile, isNewUser) => { - const inputs = component.find('.input') + const inputs = component.find('.input, .radio') inputs.attr('disabled', true) place.hide(0) window.Spinner('show') @@ -177,39 +177,20 @@ $(document).ready( () => { return actions.order.create({ intent: 'CAPTURE', application_context: { - brand_name: 'IoLovOlio', + brand_name: 'Iolovolio', locale: 'it-IT', shipping_preference: 'NO_SHIPPING' }, - purchase_units: [{ amount: { currency_code: 'EUR', value: 1 }}]//cart + purchase_units: cart }) }, onApprove: (data, actions) => { return actions.order.capture().then( (details) => { - console.log('Transaction completed by ', details) + console.log('Transaction completed by ', details, `${ENV.PP_RETURN}?token=${data.orderID}`) + window.location = `${ENV.PP_RETURN}?token=${data.orderID}` }) } }).render('#paypal-button-container') - - - - -/* - Apis.checkout(cart, token, uid).then( (data) => { - const capture = data.links.find(item => item.rel == 'capture') - const approve = data.links.find(item => item.rel == 'approve') - sessionStorage.setItem('order', JSON.stringify({ - profile: profile, - cartItems: cartItems, - token: data.id, - uid: uid, - amount: amount - })) - window.location = approve.href - }).catch( (error) => { - console.error(error) - window.Spinner('hide') - })*/ } Apis.getCart().then( (data) => { diff --git a/components/header/header.html b/components/header/header.html index 8f9ca36..68bbc0e 100644 --- a/components/header/header.html +++ b/components/header/header.html @@ -10,9 +10,7 @@ Carrello - - - + - + diff --git a/src/fonts/icomoon.eot b/src/fonts/icomoon.eot index d00b6296c0a4717a7b6384ab94308180a67aec87..c32e9b850ff633b21914b499b6a9368960deebff 100644 GIT binary patch delta 453 zcmZ3%cYu%8ft`V2&O}yo7F%79hm#9gMJ9$!sF$(Qp2@(#Si!)+v>_ukF-4B^YApi; ziv|M&gINYpfPFgiIUqj)$XCh8Eve9AU+fczamzD#anMFE2l zgEx?W1;|&(OUzB3>BadQ$o~SgqpcvnxP*ZjD8s;31CnQ8X5O64IDsi;;{QL)`OFCn z+zc8F77QLhwMJs1B5cY^YNjS;=1S~*jO=WpBI0t4;$p@|=5~zcW~L_UdW`C7%7R8< zQE^2xu&}WyRIwsdo{7OLE6WRnCkL=d)a&T!`OC@i{5`}gBjcl|XXNAToGdHLbWc_` z+1c5LSv1QNq|`IZTSUZFU(du;Pv2Dp2!L!;6EOSlCr(alGxO+Zb2DpBPFGQp1b_dM z5`X^$5mBJ4L0)5Ec<7;P8_#d^m4TZD%)i_1(EwuH?Pl_5n0$jJTX!N@oQpw(L5?AT nA&;SnVH(3KhJ6f|7+x_(fQ{j0@MM7KW|}O>F1)#!btxkN*i2tj delta 385 zcmX@Ww}OvVgPnn)Wg@FNOK>x9<3xug^}g%2H!?6VRxmIy&B#biOp)0%?;-;OivR-y zgINYpfPFgiIUwHy$XCh8Eve9AV5tZ4bAWu4oc!cOrYp?*fcynOzD#anMFE2lgA0(q z2gp~*OUzB3>BadQ$iD-$qpcvnxP*ZjD8s;(0+MH7X5O64IDtuiFM|TJGjjq14}&Iy zA%i1Ot&y0h2%EB!nyHDIvFT(%7P)#caYZ{uV^bw|K1OynQAHDVJw|mkWhMsqv@~}R zHr3N}6#)WQJv~!owtKJ0KLfFDcV}zs2uVq%Hc80{Yinm_zBD(GF1NHGpcZ{S6H`5X zh<1HFQxh=z?4=mY?dnd=RN^|;v)$=kqZEj#azz6^%yHx)G diff --git a/src/fonts/icomoon.svg b/src/fonts/icomoon.svg index da25eb6..b83c85c 100644 --- a/src/fonts/icomoon.svg +++ b/src/fonts/icomoon.svg @@ -15,5 +15,5 @@ - + \ No newline at end of file diff --git a/src/fonts/icomoon.ttf b/src/fonts/icomoon.ttf index 6fb6c01c17de28cd2a8f4f3eea03db4d6168243e..c6f303219f909e9a17edcb80af03b4733b295619 100644 GIT binary patch delta 372 zcmZqSox?l9pUgfh8EoZvpa6a`KZCnXWLO0`hkN`7*hQ6$K1J4BkNg6(C2~2Vm|NmjmXHHAJSA9JbQ$2lG5g-7vO-;b;zn?fctvQ%$&f$!=TAv$lwT6Y9uBq!ltaGW@=() zY&toYS*~78T+xov*i?y~kCB~CRMA9Tk5OGsnTf$YEzKQ-P4)C#MS#FnPtO#Y?cOW$ z&p@o(-PzhYLQ;~cO;R$#+S-|!FU<|4%PlPks6}7T#8gioqFrCl)CA1_d&!};)*(Vj zD8$V*Jzdk)EksC&ff3|*28Kr7=HPgKo39MqEMWef`)jp83=lophb3EeFIbq1L4-k$ hA%P)}p^0G{!zzY-43`*QG5UZ_;bm~ze23)#BLMEeRp9^t diff --git a/src/fonts/icomoon.woff b/src/fonts/icomoon.woff index 087bd7a2dde3ac271260af10dafe92ee6db54786..abe16550ba21911d04862a2ef380f6bd731d602f 100644 GIT binary patch delta 405 zcmcb>`+`@b+~3WOfsp|S*j_MjgXuXFMdIr>FfcG}kg?L9nUR{9!oa{%0+ccXVL8sL zwHZJ`px7E9Uj>BOr!$|+$StV=id_KmO+Z+Sfh9O6KN+Zwl?BL`0b!;q%%^e_D++*O z3P3&t3o&@-CFZ6A#T*zI7~4R2rWY6I?}GedprvdlHvXBPhy0-EBHeVUI lK>@(PaJSo|0Y*=5V992jIQb2WG-m`@JuidjW&zd%i~y)~R#gB1 delta 400 zcmaFCdx2M^+~3WOfsp|S*e)<|gXxyZ7um!oYJ1erU|?XH;k#~oV@7IX3IhX63{ct( zgk?6(yO;qK1d2@o@>M{XeLC~GjNFn6px6!|-vorU7+C6a@{>X8-T?VBAk1`yd0%c~ zMF9f?D+iFT0LDTLE_sQ$sX#Fe1_s795T5D9#reA+zqkbGvJD&m%x99{%b>vQ%$&f$ z!=TAv$lwT6WF#gk!ltaGW@=()Y&v--vz&sMxS}1Sv8fU}A0s=PsG^Cw9;3RNG82P) zTADiuPyWv=q3GT#^3Oo5+uhmPIzm#CsZCNc!rI!InJ>)^q{J;PXtD!~q}e5h+FFMQ zA)ydA*YtE(w-6yANH{StH1akF$Mf5KW#DE3x}JgI&i%DoFnaO~mTcX5e7Mi o1cp3@CWdJYs~Gk%Tw-{|=mR!|m%)hvqL~R8+QOTiS(h>b0IoMzpa1{> diff --git a/src/fonts/selection.json b/src/fonts/selection.json index c881a5f..1b5dfdc 100644 --- a/src/fonts/selection.json +++ b/src/fonts/selection.json @@ -1 +1 @@ -{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M511.999 177.555c94.616 0 172.93 78.305 172.93 172.93s-78.307 172.93-172.93 172.93c-94.616 0-172.93-78.304-172.93-172.93s78.304-172.93 172.93-172.93zM511.999 95.989c-140.299 0-254.496 114.197-254.496 254.496s114.197 254.496 254.496 254.496c140.3 0 254.497-114.197 254.497-254.496s-114.197-254.496-254.497-254.496z","M512.003 653.915c94.616 0 205.553 22.841 231.652 189.241h-463.307c29.361-166.4 137.038-189.241 231.653-189.241zM512.003 565.817c-179.45 0-323.009 88.098-323.009 362.164h646.029c0-274.072-143.559-362.164-323.008-362.164z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["user"]},"attrs":[{},{}],"properties":{"order":471,"id":8,"name":"user","prevSize":32,"code":59656},"setIdx":0,"setId":0,"iconIdx":0},{"icon":{"paths":["M498.102 56.824c-115.187 0-211.767 96.565-211.767 215.468h-167.207v78.016h0.363v538.852h-0.363v78.016h784.003v-7.693h1.742v-687.408h-78.016v0.218h-113.213c0-118.903-100.353-215.468-215.541-215.468zM498.102 131.139c78.030 0 141.226 63.124 141.226 141.154h-278.679c0-78.030 59.422-141.154 137.453-141.154zM197.579 350.308h88.756v55.736h74.314v-55.736h278.679v55.736h74.314v-55.736h113.213v538.852h-629.278z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["buy"],"grid":0},"attrs":[{}],"properties":{"order":117,"id":0,"name":"buy","prevSize":32,"code":59648},"setIdx":0,"setId":0,"iconIdx":1},{"icon":{"paths":["M976.53 470.996v81.976h-929.060v-81.976z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["minus"],"grid":0},"attrs":[{}],"properties":{"order":118,"id":1,"name":"minus","prevSize":32,"code":59649},"setIdx":0,"setId":0,"iconIdx":2},{"icon":{"paths":["M471.011 47.47h81.976v929.060h-81.976z","M976.53 470.996v81.976h-929.060v-81.976z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["plus"],"grid":0},"attrs":[{},{}],"properties":{"order":147,"id":2,"name":"plus","prevSize":32,"code":59650},"setIdx":0,"setId":0,"iconIdx":3},{"icon":{"paths":["M811.532 154.58l57.959 57.973-657.024 656.865-57.959-57.973z","M869.43 811.521l-57.973 57.959-656.865-657.024 57.973-57.959z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["close"],"grid":0},"attrs":[{},{}],"properties":{"order":148,"id":3,"prevSize":32,"code":59655,"name":"close"},"setIdx":0,"setId":0,"iconIdx":4},{"icon":{"paths":["M90.513 253.965l-47.292 47.292 468.778 468.778 468.778-468.778-47.292-47.292-421.487 421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-down"],"grid":0},"attrs":[{}],"properties":{"order":119,"id":4,"name":"angle-down","prevSize":32,"code":59651},"setIdx":0,"setId":0,"iconIdx":5},{"icon":{"paths":["M933.487 770.035l47.292-47.292-468.778-468.778-468.778 468.778 47.292 47.292 421.487-421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-top"],"grid":0},"attrs":[{}],"properties":{"order":122,"id":5,"prevSize":32,"code":59652,"name":"angle-top"},"setIdx":0,"setId":0,"iconIdx":6},{"icon":{"paths":["M253.965 933.487l47.292 47.292 468.778-468.778-468.778-468.778-47.292 47.292 421.487 421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-right"],"grid":0},"attrs":[{}],"properties":{"order":120,"id":6,"prevSize":32,"code":59653,"name":"angle-right"},"setIdx":0,"setId":0,"iconIdx":7},{"icon":{"paths":["M770.035 90.513l-47.292-47.292-468.778 468.778 468.778 468.778 47.292-47.292-421.487-421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-left"],"grid":0},"attrs":[{}],"properties":{"order":121,"id":7,"prevSize":32,"code":59654,"name":"angle-left"},"setIdx":0,"setId":0,"iconIdx":8}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showQuickUse":false,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false,"autoHost":true},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon"},"historySize":50,"showCodes":true,"gridSize":16,"quickUsageToken":{"UntitledProject":"ZjQ5ODNjZDkzZGRhNGRlZDg3YmQ2Njc5YTQyNWU2Y2QjMSMxNTY0MDUxMDkxIyMj"},"showGrid":false}} \ No newline at end of file +{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M511.999 170.62c98.41 0 179.865 81.445 179.865 179.865s-81.447 179.865-179.865 179.865c-98.41 0-179.865-81.444-179.865-179.865s81.444-179.865 179.865-179.865zM511.999 95.989c-140.299 0-254.496 114.197-254.496 254.496s114.197 254.496 254.496 254.496c140.3 0 254.497-114.197 254.497-254.496s-114.197-254.496-254.497-254.496z","M512.002 622.453c117.39 0 255.030 33.386 287.411 276.607h-574.827c36.428-243.221 154.135-276.607 287.413-276.607zM512.002 553.343c-203.703 0-366.665 100.005-366.665 411.112h733.343c0-311.114-162.962-411.112-366.664-411.112z"],"attrs":[{},{}],"tags":["user"],"grid":0,"isMulticolor":false,"isMulticolor2":false},"attrs":[{},{}],"properties":{"order":471,"id":0,"name":"user","prevSize":32,"code":59656},"setIdx":0,"setId":0,"iconIdx":0},{"icon":{"paths":["M498.102 56.824c-115.187 0-211.767 96.565-211.767 215.468h-167.207v78.016h0.363v538.852h-0.363v78.016h784.003v-7.693h1.742v-687.408h-78.016v0.218h-113.213c0-118.903-100.353-215.468-215.541-215.468zM498.102 131.139c78.030 0 141.226 63.124 141.226 141.154h-278.679c0-78.030 59.422-141.154 137.453-141.154zM197.579 350.308h88.756v55.736h74.314v-55.736h278.679v55.736h74.314v-55.736h113.213v538.852h-629.278z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["buy"],"grid":0},"attrs":[{}],"properties":{"order":117,"id":1,"name":"buy","prevSize":32,"code":59648},"setIdx":0,"setId":0,"iconIdx":1},{"icon":{"paths":["M976.53 470.996v81.976h-929.060v-81.976z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["minus"],"grid":0},"attrs":[{}],"properties":{"order":118,"id":2,"name":"minus","prevSize":32,"code":59649},"setIdx":0,"setId":0,"iconIdx":2},{"icon":{"paths":["M471.011 47.47h81.976v929.060h-81.976z","M976.53 470.996v81.976h-929.060v-81.976z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["plus"],"grid":0},"attrs":[{},{}],"properties":{"order":147,"id":3,"name":"plus","prevSize":32,"code":59650},"setIdx":0,"setId":0,"iconIdx":3},{"icon":{"paths":["M811.532 154.58l57.959 57.973-657.024 656.865-57.959-57.973z","M869.43 811.521l-57.973 57.959-656.865-657.024 57.973-57.959z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["close"],"grid":0},"attrs":[{},{}],"properties":{"order":148,"id":4,"prevSize":32,"code":59655,"name":"close"},"setIdx":0,"setId":0,"iconIdx":4},{"icon":{"paths":["M90.513 253.965l-47.292 47.292 468.778 468.778 468.778-468.778-47.292-47.292-421.487 421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-down"],"grid":0},"attrs":[{}],"properties":{"order":119,"id":5,"name":"angle-down","prevSize":32,"code":59651},"setIdx":0,"setId":0,"iconIdx":5},{"icon":{"paths":["M933.487 770.035l47.292-47.292-468.778-468.778-468.778 468.778 47.292 47.292 421.487-421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-top"],"grid":0},"attrs":[{}],"properties":{"order":122,"id":6,"prevSize":32,"code":59652,"name":"angle-top"},"setIdx":0,"setId":0,"iconIdx":6},{"icon":{"paths":["M253.965 933.487l47.292 47.292 468.778-468.778-468.778-468.778-47.292 47.292 421.487 421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-right"],"grid":0},"attrs":[{}],"properties":{"order":120,"id":7,"prevSize":32,"code":59653,"name":"angle-right"},"setIdx":0,"setId":0,"iconIdx":7},{"icon":{"paths":["M770.035 90.513l-47.292-47.292-468.778 468.778 468.778 468.778 47.292-47.292-421.487-421.487z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["angle-left"],"grid":0},"attrs":[{}],"properties":{"order":121,"id":8,"prevSize":32,"code":59654,"name":"angle-left"},"setIdx":0,"setId":0,"iconIdx":8}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showQuickUse":false,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false,"autoHost":true},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon"},"historySize":50,"showCodes":true,"gridSize":16,"quickUsageToken":{"UntitledProject":"ZjQ5ODNjZDkzZGRhNGRlZDg3YmQ2Njc5YTQyNWU2Y2QjMSMxNTY0MDUxMDkxIyMj"},"showGrid":false}} \ No newline at end of file diff --git a/src/scss/variables.scss b/src/scss/variables.scss index 09781de..8d9f256 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -51,10 +51,11 @@ $black-alpha: rgba(0, 0, 0, 0.2); //Hamburgers settings $hamburger-padding-x : 0; -$hamburger-padding-y : 6px; -$hamburger-layer-width : 30px; +$hamburger-padding-y : 5px; +$hamburger-layer-width : 25px; $hamburger-layer-height : 3px; -$hamburger-layer-spacing : 8px; +$hamburger-layer-spacing : 6px; + $hamburger-layer-color : $olive-dark; $hamburger-layer-border-radius : 0; $hamburger-hover-opacity : 1;