From 99275ab7a150534040547aa09c42647aeec4f95c Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Fri, 3 Nov 2023 15:58:13 +0530 Subject: [PATCH 1/9] add cookie policy in application layout Signed-off-by: ayush-billore --- src/supermarket/app/views/layouts/application.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/supermarket/app/views/layouts/application.html.erb b/src/supermarket/app/views/layouts/application.html.erb index 792c3d7e5f..e66280ce96 100644 --- a/src/supermarket/app/views/layouts/application.html.erb +++ b/src/supermarket/app/views/layouts/application.html.erb @@ -70,6 +70,7 @@

<%= link_to 'Code of Conduct', chef_docs_url('community_guidelines') %> <%= link_to 'Terms and Conditions of Use', progress_www_url('legal/terms-of-use') %> <%= link_to 'Privacy Policy', progress_www_url('legal/privacy-policy') %> + <%= link_to 'Cookie Policy', progress_www_url('legal/cookie-policy') %> <%= link_to 'Trademark Policy', progress_www_url('legal/trademarks') %> <%= link_to 'Status', chef_status_url %> From 6aa17a357bbfed8447912e6695c67acde7c315d3 Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Wed, 8 Nov 2023 13:53:20 +0530 Subject: [PATCH 2/9] add onetrust and gtm script Signed-off-by: ayush-billore --- .../app/views/application/_analytics.html.erb | 85 +++++++++++++++++-- .../app/views/layouts/application.html.erb | 4 + 2 files changed, 81 insertions(+), 8 deletions(-) diff --git a/src/supermarket/app/views/application/_analytics.html.erb b/src/supermarket/app/views/application/_analytics.html.erb index 5fae2dc63f..aa69ce3627 100644 --- a/src/supermarket/app/views/application/_analytics.html.erb +++ b/src/supermarket/app/views/application/_analytics.html.erb @@ -1,20 +1,89 @@ -<% if ENV['SEGMENT_WRITE_KEY'] %> +<% if ENV['GOOGLE_ANALYTICS_ID'] %> + + <%= javascript_tag nonce: content_security_policy_nonce do %> - !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t"); - analytics.page(); - }}(); + var oneTrustHelper = (function () { + function evalGTMScript() { + alert('nnnn...'); + var gtmScript = document.getElementById("GTMScript"); + gtmScript.type = "text/javascript"; + gtmScript.classList.remove("optanon-category-1"); + eval(gtmScript.innerHTML); + }; + + return { + gtmFallback: function () { + console.warn('OneTrust not loaded.'); + if (document.readyState !== 'loading') { + evalGTMScript(); + } else { + document.addEventListener('readystatechange', function () { + if (document.readyState === 'interactive') { + evalGTMScript(); + } + }); + }; + } + }; + })(); <% end %> -<% end %> -<% if ENV['GOOGLE_ANALYTICS_ID'] %> + + <%= javascript_tag nonce: content_security_policy_nonce do %> + var oneTrustHelper = (function () { + function evalGTagScript() { + var gtScript = document.getElementById("GTagScript"); + gtScript.type = "text/javascript"; + gtScript.classList.remove("optanon-category-2"); + eval(gtScript.innerHTML); + }; + + return { + gtagFallback: function () { + console.warn('OneTrust not loaded.'); + if (document.readyState !== 'loading') { + evalGTagScript(); + } else { + document.addEventListener('readystatechange', function () { + if (document.readyState === 'interactive') { + evalGTagScript(); + } + }); + }; + } + }; + })(); + <% end %> + + + + + <%= javascript_tag nonce: content_security_policy_nonce, id: "GTMScript", class: "optanon-category-1" do %> + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], + j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= + 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); + })(window,document,'script','dataLayer','GTM-WLLWWV53'); + <% end %> + + + + <%= javascript_tag nonce: content_security_policy_nonce do %> window.dataLayer = window.dataLayer || []; function gtag(){window.dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', '<%= ENV['GOOGLE_ANALYTICS_ID'] %>'); <% end %> +<% end %> + +<% if ENV['SEGMENT_WRITE_KEY'] %> + <%= javascript_tag nonce: content_security_policy_nonce do %> + !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t"); + analytics.page(); + }}(); + <% end %> <% end %> \ No newline at end of file diff --git a/src/supermarket/app/views/layouts/application.html.erb b/src/supermarket/app/views/layouts/application.html.erb index e66280ce96..64ef49d303 100644 --- a/src/supermarket/app/views/layouts/application.html.erb +++ b/src/supermarket/app/views/layouts/application.html.erb @@ -23,6 +23,10 @@ <% end %> + + +
From d87e9094b32e7c136334d5512090716a879b8cf7 Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Wed, 8 Nov 2023 15:27:42 +0530 Subject: [PATCH 3/9] remove gtag changes for testing Signed-off-by: ayush-billore --- .../app/views/application/_analytics.html.erb | 40 +------------------ 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/src/supermarket/app/views/application/_analytics.html.erb b/src/supermarket/app/views/application/_analytics.html.erb index aa69ce3627..70fd5f6217 100644 --- a/src/supermarket/app/views/application/_analytics.html.erb +++ b/src/supermarket/app/views/application/_analytics.html.erb @@ -28,33 +28,6 @@ })(); <% end %> - - <%= javascript_tag nonce: content_security_policy_nonce do %> - var oneTrustHelper = (function () { - function evalGTagScript() { - var gtScript = document.getElementById("GTagScript"); - gtScript.type = "text/javascript"; - gtScript.classList.remove("optanon-category-2"); - eval(gtScript.innerHTML); - }; - - return { - gtagFallback: function () { - console.warn('OneTrust not loaded.'); - if (document.readyState !== 'loading') { - evalGTagScript(); - } else { - document.addEventListener('readystatechange', function () { - if (document.readyState === 'interactive') { - evalGTagScript(); - } - }); - }; - } - }; - })(); - <% end %> - @@ -63,20 +36,9 @@ new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); - })(window,document,'script','dataLayer','GTM-WLLWWV53'); + })(window,document,'script','dataLayer','<%= ENV['GOOGLE_ANALYTICS_ID'] %>'); <% end %> - - - - - - <%= javascript_tag nonce: content_security_policy_nonce do %> - window.dataLayer = window.dataLayer || []; - function gtag(){window.dataLayer.push(arguments);} - gtag('js', new Date()); - gtag('config', '<%= ENV['GOOGLE_ANALYTICS_ID'] %>'); - <% end %> <% end %> <% if ENV['SEGMENT_WRITE_KEY'] %> From 663600fd0df028acdcfc6a49e360f1ef21e6fc3a Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Thu, 9 Nov 2023 20:14:38 +0530 Subject: [PATCH 4/9] keep gtag and gtm both, pass GTM id from env Signed-off-by: ayush-billore --- .../app/views/application/_analytics.html.erb | 98 +++++++++++++------ .../app/views/layouts/application.html.erb | 5 +- 2 files changed, 69 insertions(+), 34 deletions(-) diff --git a/src/supermarket/app/views/application/_analytics.html.erb b/src/supermarket/app/views/application/_analytics.html.erb index 70fd5f6217..7cc115abf6 100644 --- a/src/supermarket/app/views/application/_analytics.html.erb +++ b/src/supermarket/app/views/application/_analytics.html.erb @@ -1,44 +1,78 @@ -<% if ENV['GOOGLE_ANALYTICS_ID'] %> - - - <%= javascript_tag nonce: content_security_policy_nonce do %> - var oneTrustHelper = (function () { - function evalGTMScript() { - alert('nnnn...'); - var gtmScript = document.getElementById("GTMScript"); - gtmScript.type = "text/javascript"; - gtmScript.classList.remove("optanon-category-1"); - eval(gtmScript.innerHTML); - }; + +<%= javascript_tag nonce: content_security_policy_nonce do %> + var oneTrustHelper = (function () { + function evalGTMScript() { + var gtmScript = document.getElementById("GTMScript"); + gtmScript.type = "text/javascript"; + gtmScript.classList.remove("optanon-category-1"); + eval(gtmScript.innerHTML); + }; - return { - gtmFallback: function () { - console.warn('OneTrust not loaded.'); - if (document.readyState !== 'loading') { - evalGTMScript(); - } else { - document.addEventListener('readystatechange', function () { - if (document.readyState === 'interactive') { - evalGTMScript(); - } - }); - }; - } - }; - })(); - <% end %> + return { + gtmFallback: function () { + console.warn('OneTrust not loaded.'); + if (document.readyState !== 'loading') { + evalGTMScript(); + } else { + document.addEventListener('readystatechange', function () { + if (document.readyState === 'interactive') { + evalGTMScript(); + } + }); + }; + } + }; + })(); +<% end %> - + +<% if ENV['GTM_ID'] %> - <%= javascript_tag nonce: content_security_policy_nonce, id: "GTMScript", class: "optanon-category-1" do %> + <%= javascript_tag type: "text/plain", id: "GTMScript", class: "optanon-category-1" do %> (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); - })(window,document,'script','dataLayer','<%= ENV['GOOGLE_ANALYTICS_ID'] %>'); + })(window,document,'script','dataLayer','<%= ENV['GTM_ID'] %>'); <% end %> - +<% end %> + + +<%= javascript_tag nonce: content_security_policy_nonce do %> + var oneTrustHelper = (function () { + function evalGTagScript() { + var gtScript = document.getElementById("GTagScript"); + gtScript.type = "text/javascript"; + gtScript.classList.remove("optanon-category-2"); + eval(gtScript.innerHTML); + }; + return { + gtagFallback: function () { + console.warn('OneTrust not loaded.'); + if (document.readyState !== 'loading') { + evalGTagScript(); + } else { + document.addEventListener('readystatechange', function () { + if (document.readyState === 'interactive') { + evalGTagScript(); + } + }); + }; + } + }; + })(); +<% end %> + +<% if ENV['GOOGLE_ANALYTICS_ID'] %> + + + <%= javascript_tag nonce: content_security_policy_nonce do %> + window.dataLayer = window.dataLayer || []; + function gtag(){window.dataLayer.push(arguments);} + gtag('js', new Date()); + gtag('config', '<%= ENV['GOOGLE_ANALYTICS_ID'] %>'); + <% end %> <% end %> <% if ENV['SEGMENT_WRITE_KEY'] %> diff --git a/src/supermarket/app/views/layouts/application.html.erb b/src/supermarket/app/views/layouts/application.html.erb index 64ef49d303..18d2b500ec 100644 --- a/src/supermarket/app/views/layouts/application.html.erb +++ b/src/supermarket/app/views/layouts/application.html.erb @@ -24,8 +24,9 @@ - + <% if ENV['GTM_ID'] %> + + <% end %>
From d54656247fc2360118921c84be420a30769cd678 Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Thu, 9 Nov 2023 20:32:46 +0530 Subject: [PATCH 5/9] update supermarket logo Signed-off-by: ayush-billore --- .../app/assets/images/logo-supermarket.png | Bin 1809 -> 0 bytes .../app/assets/images/logo-supermarket.svg | 39 --------- .../assets/images/supermarket-chef-logo.png | Bin 0 -> 12200 bytes .../assets/images/supermarket-chef-logo.svg | 80 ++++++++++++++++++ .../assets/stylesheets/default_branding.scss | 4 +- 5 files changed, 82 insertions(+), 41 deletions(-) delete mode 100644 src/supermarket/app/assets/images/logo-supermarket.png delete mode 100644 src/supermarket/app/assets/images/logo-supermarket.svg create mode 100644 src/supermarket/app/assets/images/supermarket-chef-logo.png create mode 100644 src/supermarket/app/assets/images/supermarket-chef-logo.svg diff --git a/src/supermarket/app/assets/images/logo-supermarket.png b/src/supermarket/app/assets/images/logo-supermarket.png deleted file mode 100644 index 39e6155a38cd2681daaee50c0b0f7b9c3fdca05b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1809 zcmV+s2k!WZP)vI6=bpR|kN9}e1F+NV`bO16yPw8&}?sWj~b^s|lNisiAGeA!4a{%pj0PJ)C?sfp{ za{%dZ0Pc1GF+Wf-K2Pg%0O)Z5;c@^mKTk71PG3$mu4M=BcK|OvPBK4FFFs8%K2CdA zB${6oNJl|UNImRz0E}B3$!h>pOF6V>05d^R@OS_*KTz&=0PJ-D?{@$(KTt@;;1vJ> z08eyMPE!EB&o`d(q7R4GUF5UNiG$R?3#EFWbN8VP0g@uWif_#soTnkvkxBvhJZ%IT!R9M5smx)r^ zP!xs_6aj(Az7q&L$RazUbwTUW+LqkV_kWiD=Oz)z;MmTT`j2M0>vzvKgtn!oO9^)& z+|3U!6#8J5n}+_XUMWf+sOmR;SHFgP?Bo05jfX<br1`W;gC zHTK_vnH89z(0;sm?xX|D3cpQM$DrUstZbe7h;@v|BfI~EJ3dM3l|#zD#tiLOjh)ne zbYV9^P_#7B^`>J`Beb*Dr$f=y*fTG@vPBcq^QEH0G#STQqJJ2g87vci7QDmpX{!&4 z3Gi}`kO`R#anHcSUc76YUsh(kve9Er*?uG5e|`f5$$M;kkr`<`a&BWipJ1yV3Ps< zALqy|qCvccd0!FRPpef(T0xaDuI{A~aZ90HnxmAhlMPKgV(V@{jy47ff>gZx(wW95 z%-8QIK_M#-`!a-S4~;{6Gu%s#M#pLneQI697z|S^(H9I20dRo#uW;3Cv2pz;8XhT- z*2b71;7H>nbp6&^s%imHWN2sYngoVz zg&KeH`zG^;G!H0y*!>5Lqxfawjq#d54z+|dTYzkwo%N6VbO4$R!Wd<)E#PQbJxJ~8 z#cQ63Kh&Ty+3I^XKRFgE9fF2jC%!bS@ra?RD*+lReUIa1foJ$IL0f8^T!+N@eJbL! z8c-uWExY&51DW3p9*6pNV}#xpBBl3(kL-Q$-<=EuC-V^w($n=Z{dYwR_s{s}tDiFw}71_f5wX``gh8L*Ay##3ij7iF6cw&?&&G+2qgQ^+U^&!Vv zNSGOX3z(5g8zl+}qlA05j!PklOE~Oahc%+I;Vu@rO6JyGw=u$2QDcPNjXbfEhIy#r zx;rs=^314Gsqh(3l{qGMkT~wj+TFE^?}QDLHMl=0SgqdN+H0zwwU7IxBx>1!h*sg}5Of#)q64SgUNerEqw4x3zVPvKegPXd}d>U;l zJcq@dG-^-M#HP~=izaP!m}b};7P69Nw$|oTn`Uf8nI?y$Nt*0*I(E{Kn$=moe71Dk zPW+NDCB>0=&9D)(X)2P&U9S|POw%2Wrc7hZ!|*24d>$FKrle^vwb@ksm0Gr-nKb1rF%5iaKxw9#*On7i z($vyuae8V;>1@SDDP(8lRJk{-<=vb(Msu7GtEQ(QrkN&_Nkw`}owQ9FTqRA+t!Y}j zZhER(_-03OCCW5SOpNZKfs|P?)@;U-9onZ_BAmaJ4@K*tUbB4YW>wLHO*?K(*WA2C ztclAq$@_OTu!1w)E#o|Hm6SSrG{F;LX0!7*XoB#g>z)^(00000NkvXXu0mjfW@Ahr diff --git a/src/supermarket/app/assets/images/logo-supermarket.svg b/src/supermarket/app/assets/images/logo-supermarket.svg deleted file mode 100644 index ba87005bf5..0000000000 --- a/src/supermarket/app/assets/images/logo-supermarket.svg +++ /dev/null @@ -1,39 +0,0 @@ - - logo-supermarket - Created with Sketch (http://www.bohemiancoding.com/sketch) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/supermarket/app/assets/images/supermarket-chef-logo.png b/src/supermarket/app/assets/images/supermarket-chef-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..fb75b3951041009e9c81d1af16bc5645411d5d56 GIT binary patch literal 12200 zcmch7cUV(Rx9<)mw19L1(xr&B&D(v^-P zRX}=|s@&k~``+)I=R4<~=lpSbHn8{1nzeqb%$nJ=_CtMLb#hWBQUCzRH8oTW000k$ zyH6qpw;yQ`3`y}KPsD8SVN zM-2e73IQIr$h#;Xb~}`#lbamp)|)m?b|-r|PE!dTn2v`s>W-5}kQd4@NY@A%bQcM? z=Twkqmkp4?F>pos*s=$>y104E1jupz<|~7{zi1ZbWdBX#b61X2=|Uj8nT|fYvbz_G z9WEpyh=jpJ*rjlH;*z4$aJZC|lmNRZOjJx5CMhf`At)*)BOxUtBF_HjhZ85!%icl8 zKt=73JlvBU=N%s(4;f)$e}8`=e=#9E-0%qhe`NeyEUvEq zi17AN^~0(0#~}Zf+S@4510`&L@^<(2LZVdta4@f2XyYNH?1i%RarZKEcX#>QS^9rN zW*3zZg0WxKu|+z$T`0l#FGEl&wmv91&I`W@!r+1;a3c|%({Pt4KTJ#p2K$Rt$KBq^ zA@JXkio#_?Mg9XRE^zE^eQf`q#P&!T2X`-5Tb#;HuC|USVGlP)PWFEcDWmM};_ihL zj6)~(8-WBdUKi_O1q{(n_R_#$uq6=%Z#IRt(S7YQ}ywFpnQtj__`}p12 zrTujplJ7ws@WyAX&1P=Z59!dZjjXpOQwCR-R30>;PE(jka7 zPEv$81V3T5-n3rHR$q->y^k9Lg#am%jXqo~DjEC)={G{vKAWaSIzRZ+18#P?5j06{ zNqWHSgl{DHTRMQzpB26Dlfvu4HzJXb(tm#;ArgcLxu+#Hw3APGZ??c{Pg6bl^|R7H z!W*%@Kl1(YBDJ1RbGb&YM*YPcNh(y9w5i8vN$Shs1TAIxOM^HH%b=8BDi)UZ0Z!u$ z`NKwjHbx4645L}?Y&<(Heb3U&qDQqLi67}~HqyZlb3s&2dzS zxEkuxG;1Q{H~Jk(+vsefWWOufy00UA=vD-VTDjc2?ZrT_K=vArl?QQ=aXmcEq^!4a zD)E=;9)=9@2filte}BYUsrovy_WnrPGn;f4EbN^R*M{DSYzJixriSdW^9mVGS=6WF zY2%OG@=h`JX9Dn0b}zGOuOEVytf=mg*?5U zLcwlzGb1Gs{XC&XY{g@!O`}FLJvq(usyo9_Fn~b>VZ`aHuHe+RbCgcp3%89KMA?%9I5S2w?S#TDe#1Vg|zGSBMQ5dcEGH=<)~>UFb5hsYX9u$&xgSU}yW#(@JWl+31tMq&WL zy-ONn-LBs!l=AsC6aYl?YH}^xO`LXoAI)-VBS>5K&6eUtHu}Rg+Bkgo11e{BYiWSa zt(qMV+cW!Td;1B&tZ|?ynf0)IGW;dSz$fBEAp0>6IjbdLFG-04TIaF>9{LL2>wEB- zu8JRGax2?V!CG^uC!_bgB}N?kYQ2WW?#Fd9FtEpDZ3->7lPO%(sL^Oh zQTz7u+*q?A$zr594mBCvSu0|C!Zi0O%SMMkn;1=k2jdO8=C1{2Abef6eZDq$dbMQn zU>OR6_zqo8&WNS7*(F?2B-Be|AI|ilFZxAQx&g$L`=6L54XG#w)i%D3qWo=@~ zN#FV5k-8yS6(2P8V#-#8KdP_@uEWA$ijVdLWB77r16iFIhUiPHkUH~<8}0drUrwyhgKdHN4;};-JdA<^%AIi>b-3Po`t<9n3>(>k7;Q?*e{h1zYVCBym;2Vm_ z?e=|rmB7PN>C`yO>pt9tP#ngxI_tP ze}m^zX6@Mopln}OZ#@}_3K`#R`vP(hCE6_wpXmuV%;PD#{N#<6O6Ci%#{I#Mb@+%! zmta*XoeU$jf(tN|k{?UiE~0|G9kZxgXw&v+dK;j=(D~bS5Q{;}mEflh=eF=ge`>ji=}?bvA`3TZj0z-5q5RAi61^Hm*4}xI^T;;;5s> zRO*&rp`pGP+JXr+wOMN0_7L`CXVH88=yFAL;OJCEKA3I!)%IPdAp+gnAG`)vh+dX1 zFEg>ORyrQpa92PnSV^9~+Zuo~pUFg;x>)wNUd#2boy>lk05@z&Bn0-HgJB9KMCTjK zE2T6iUpH^vPP2ch493#3A>^F~@p4VsHne7i2Trp|xn?HrFiQB2sN=~MPT#bdU_4`OihO>GF{3TN+wp`8%SK^n>s_hDph!0;HKN(#9 zSwUHxVDxddwwdCKiZ{HWn_xzS#b{as9OW<2KzJ*urpZIO<6+i|He@^P(8gJ-%iFjBTVG=!ejhr4JhX0IZ1eE0r!1kr^j2%LGgYOn`L79S%uo2!$d|^KtLq0H z#VE076`{ff%_sU{!rv}^8eoQ0N+zwlrVyzK-kQ!9=T)Yxi5XE`B}BiHud+8k_)!mZ z2=9kPM)_Oa8|>XNUB1Lh{ey2;K|n>3BNd*pU!E5}m^`LIhG?Y9x;r~#5^?&hkeY%k zbTdGhe($Prc;c*ASZ?GSqHN~K{yo`5~{mD5|^4Oe96RCyCd^lUzHvGDq z-t&lElf-SLgPJ<63ee%vAV$P4Ol2=-dL^xlC@L*wx6u5tc%o9Ux9z0dajQznOSy1~ zxrU95V)zV!TP)FbaWhl)rmD>S^A^Eni8m%cr@3j|ak~M?C3DczG5|KV9IERv{ZJC< z$WGH#exoAAc_VzLpE4#tXv}_J-NUAcmP&)xGq#SY?mKGE)RFbpnS7GXaLR1tuX_2m+v-cp4z_I+3vI3f&1oszY&Qz< zU|D(Ja_J8(+jnwDpOmPFpL$f%epxmJwQKalPXfb!6cSgiS+Ke?(u;Tn%M0gOe5+!@k0|zC9omz%@RK_KWw>e9 z3AG%IrMg0$twoL);dwk2_o(onq&LNuQodX8vmjf7sQnF)QI)b?11Z8wuTBwL;%Tke?=Z);tLT+2(d zQ&Tw5$3X9?a`TWo%iVA&+^})ekbG@9i+1gsknNc!9nrVK#c^)D+_7(;bS17eq|M1$ z^UPAvX?U|ebi+5wz$_W0scBEvMfSl!FF`)~{%w~lQms}2X||H$c))@aS@@Dh;GYrn-%`z2)(J@qi=Y( zg?w|dCu;fV-sPI>(v6!OKi)h69L8hzd_KKjRe2{T_a4qBG+#9tzD?QC?QulhezmLj z?e4FR!G5+zvCj`pm)3hluJPQP+~V4J*=MMpOWb?%BzFZFxV)rU{xfhCqZ!w^0J=9j z60=9nFM@u``iV78BF-^`-g_%iV&8ofv$Ako$L{VCi!{#*IV*&L0*46)3JRnJiv(i<{PB6jB=>SB|+^9^Z=a6KozvC5aTZtNv6}Yf_dfbhY#e%O8rfu-^ zwqTwodHf4^Gr6nYVt2Ku6WXj{tD^5X>o?Ty*>r*NBHkuHE4m3mkeWX6^%6L*kMTOB zV+}SNaTdKaK83hmVMYa{5MBDI!H|>&ARdvyvWDC3kH0#4vcz*>Yio-lB)99zD61V- z(snzawAE1BRnj~;D1MezlxO!)e9?^^QvHJ*#+K|wf4Fa_G|6i&|Arb9D(FTVWh%kN z68yBlhJ{f(r6){eF2HKHc|q`}#myvOt5Q)>e?oG~;03VPymCGB6%xOI&&lMywc=1Gexn*(pigwXX|CRm-;6q%a~W!!1vB?zhf@T zl*yW(9api6(|!9Y*D2v^cY9T&1geb%0KZnxS}vz1z_@=oT-xzTXrp_gU~?$+apqF| z_FZJ6{05cCyet5uKxp11Ip8D80Un)}-2DSv0Cw4II#Hbf#kLSIc%2k!S17HmbCqRv z7MUu3XM_gp;=1CPU1(Xi?xWguVqpQ}JXppcZEE4V-%T$m$xc4QAblqv7Qv4srs&I= z2N>(l{G3Vf`iusbkF4IooyEJFO}0-@1}ycnGC3O3zg(5ZCfpL_b+t(lzcy#{D5TxD_j4>c8fT2D zy5!hn{CjXh<=u_-p9B$KFS$`-DYGVxb$_gvf``T4lvi(fL;x#wU0Xh8&bzYN+jxH_ zG4AN+5imY|wf{XK`WS8|3r2TyVYR7__(7NrfvpGjs7~{o&0xB&Pv2!4bma#~+jR!=Y*8-W6D3i6Gw>gFgG9D#tsF zKpzq`@QHW6Rr}`APfx0y7#94ay5OPCN&pII^MT@+0^v8lS5YA7Clivkqe2HV<(aa! z#4{&Ir&sC(3ldIGXaNUwf%_NYoU)vpP324N->1ICER0EnT-sd7j*13v%JMQE)y1Sw zY-RJucRJMlicC+v9F#dLmlc(NN9 zHSQ_tGsDcZJVYGekP>qudyhsV>SHvI z=8qmGgf#vZDC?d-Ezrr2?OROHc+qgIWM~t6=uvxoD@&r@6rKJ`U)?m(V4a=#n}C|0jv4X%sOm5+A>>ouakB7m960%$|-l&wq~w!iqzm z`_(k&8Z*Pr0-l}jv03Htb~zqkV!RUwurVM9QhZDv~V=6ncRi9;2E% z2oLAp(MGk@b*~c`YFrB5cdx?&Vw3F+lNYWKth9xNAIpCbv6C-K_490OP!3e?=auc+ z6cGQK+lO854{^u?W6#31KP~Y&A6FAWSFv3w4o)(GxM1t7wbX?4HGwLNxD_e4%5Y9r z=m7F=gPUV=(`$WF7g{!Z;bE2W#2R&<@YseWov-5!xob28F&&&ptDvhMy^4)lY`P3w z0b|}iA=z?V4@(uo>UYUyi5pII<0AlA;i4aXh|~1uv4sqoXt$&qv;P~nhp*My4trqO z@4ID|lh0M+_iD>~dsA|KG0v~MYizOujt`zvu{?Ung!i?9=*m3e#J)D61`K-tewKI)26iFaVla?W^?MJ*YK}D(&I=04;OF3tqOt0bG=(j2T&gb58F~wNLfE z;^N`I2PWLtTBMk?5j0==nWCL`+n;P!Z=`w~AAoV9Cx=Ya)*s=_Qe39-CRx7vJ1$aw z^S-=QQZ@UFwQ3P)Z<*nlZYri+Tq}Hl>~lu`}t?@j}u|`u$s7LECqe5SbBWWC_QS zomI)KXBNua>)K=^YGSO`7H!GOu|YD8$dbq%!rBx^*1 z5Z%-~dpJ(wmszm#e&Y?asR&9HBe{d!K-p1u}7r&Rm=djp;Ng@!zlm zdM=M2qX5Kf(t6V)k!Qx~)mgnpfu=%qX@O1crhd%tw6FL|H7;?yt)5AM{~~OEMJC-6 z;)vg7vbaHHKoZ4pB=%^oZu`uc;fUkjpj=F(T~Qho7x(5b+O7bd@-*%eD|SPV2 zYu!2OXmf3u*pcgt(Rct&XigdA`fm94NH0ZTaPZYTO&>hQzq#wA{o1uwow0B$KYRtF z=N$%8qz-udP2OPAU$Rw7GH_MA_tZqfr3M8foSyoHs#@^0SH+WWqWD*+6V^()iHPW8 z`ks|M?)=IFrE?xv0^3Y#mYf^k=-9cYWEXbEp!YCg>1WoaRB_}EUp-@+ZewKyezv#4 zv>zomAuOb?5p%0gQ1+xikrNwiwoPV z)MI|cKm;Sx=t_R=d$k&bP_Z#`QtXRQ(5flB-(;&TQDy{04UTIz(oP$T>7*$Z9WgVK zAMDY7e*5I?eeOkh@yeC<&qZiK#Nt{9Ld{v_Tn5_5W9uM zxmq!0Z`4t|yyUu9^Ax(KbrQD=yg)pcXrq!hApi_lI!cnceS))xRC1I(F);u;@uu*d z3N(EqRz=oKd-S@hi(*Am3DVVIj)#%OTvvMerm;dOF*AcI?t2R(lzLi9r?%Lnm_)|c zv}8(@-!Y$@k^RGi1?6jC2fGNir$m_MTQr*1SL>!uRDD^>mzt%YNq@E6!Fd~Ud*{wW zer)j>f4E8{JJ8IV2xtXlWdbu%;vOVtF6@e9sF5$({CIPFr&BC~a zFL2p9(eT6RdXh6s=xRIYRjizUn${6nLvDf1&p^^eqQS5d%tNt})0Fml_nP~B)Z=&M zZA=+(CqIFU+722!zPXiR-NJ@HaPOrbRT&UvAk4DHTJWwasLygpDPNaG^bP=B*sJGdyC1hiT&Dj>uh3uEY7L?>zD4r+V+z(ea)F4->PE# z3AOTU<|*!GY3^Q6G`vRY@MAVrhGCoe95pptx&~$PE_aLUZID==7UmyJ`)qRWFep%w zCb2qcFTeP-HnnP{1)3}4IsIJ0tD`cfV2fImH2j_B{D6^`zOoW*i>#h5F-P`Yw)fPN zDSt@m;qG3o=7(VVmqI5VKfaN{dkuu_@62}GIUw3X#&t(PETXx+6`m!iyk_WgCR)EOKHp{QaYsQPzlTk`2D~gjf zv$x}QZ9>U5BsRBg60{imee38QwKg%J8L-#7@f$E*uoMbBS3q{gWY#m-Fq=_!EHl28 zAJB2kSh5Q6he(3GtxIo(w545=>#t{O}{zflr1nSDiVXaaBkV0s+I&3MCAq-_x)T zylO)jw=0f-FN&YInj@d(x`0__V}$Z?3xU=%8+9FA+XW{vP@HYVr{uQD^0Zkx!Up0V z^)s?RLy#Xa+-L|PXDE5kx^Un8X||Rw(eGL+7LiH@Qzxsj3G18`Q-Akl_#us_j+h2r z7^5?A0Rw=+Fyz?%YK;}S#F{?&QoK;jDhrp`XVnuFisZlL0$^~>1I%YyzfnPL$2P%D z*$a^X4!>y(Tv!zir}St3n-Ok9K2QGrMnvztz{X7qTp<&HLd!!G9oUA_L9?pwyW`qf zaJ6FGRty56C$$^VZDL5K4+7HtHHqkg8SMYYi!V9~VLQBBDH;^(Bk#mqa%Ge2cRd>M z(yl$OXRn&cNj)kfXn@RHU##*oh->*G<(%lHV0~(4PhX_E!NO zfd20PPmk;XxRzg4D?_?OLu6s ztU9s}zABecsWds$uH@2pH?yY6;-{ah57<6h|~5h2^s zH@Kb>u?m7waz&C}uImitHm1blisin9Anh=9vyJC8mE_yyQpf8)$bnA?LpDYLntPD0 zMP_}m(O>ZRg}h(dYV2iJ zvxERX`rbAF&&A{bP4g$GN=5Vzp*wj_&Ve(??3)2P-_O{Q8DY65?5Ho?ubGE2&x|6( zD(XuDg{pgmWBL=6o{=fNWcLLe(M|$p_vi{3Gr(qEdXHt2l9ZZ-#=m|K`U+;z6MEpp zVzc~|qq*=k8c2C?(i@0QcerF|K0U+H%WiG+iz9|1;)q+@87LrECzpz;z`Yg1J5HaD z=+_le5kK_?B6CvMsCQI76ps;=)+P)qsOq4BR9t z<~1o8lW!IqB?`u@-sjU~>$SNp=)FGjrjs-f^SI&?)lACHNpAt6@WnJR3Iv9Y@^x#< zL2AQ_QmOpdJM-EZvV=ARu>B%6Owy<0FkabUF(^e`AzkmYUtaXvL#s)^r3*U)Fx$K- zeged*cHwdlF~S)iKkk+rG!kvW1`K1qxkm{5qAbGUk%wCE44bq)Y zAAXl0et9Y6*pn_r53PAbc}HZsqJVi#?`7L9s{#NIH~-Gsj7Fo%#4{KbodK9huiqNJ zy^)TAQ2g4M_92&UGVYCHg|VW6ME4K^Baia^I=?ezUfFh1J6nL+x|qI?$V8A34xaG9 zJ1l@2vnlNtD%!g(alz(cs0&~t0U z8Mm6VcTTi?#ctpZ0>F45Ms6o`)^_!L>wzE)R)~9`h}95@^^9kGmN#Tgm5aF&>YJ=W z7Vmcl{0!``B}0R-ib>)^h1NBOb-sC~&jG{C_nlI(my01%>lr0nJH=6#(4O6unXu7` ztYqCU>OTW}iy^-UxjGD}#ol@<1N0@bC{-vgjP+$#RID1bZkkXylh?<-oHKH)nDd&; zn!8hAED-DPx~woJyMFNGZf&-~0fbm-h69%cQ#*^bvz45Gn8dPo;%0=JljDa+oOq-vzst2PsB)WjFFQSHG(z!e@ zYW2X#@KJmwu7D&ocSz2MuU*HZrp0i&Knjb0ANTZH-H8^y-S5n``xG-EO)2(FxWe4c z@+LP;mBY6@$^N@~-;**4mutb$*l&sL5tdpdzrp$Mui|%S6+Rv>;uB^43=40xZqoARs15zGacKJ{yp<;MFjY?ue{$N z8eYAwaNohchyqyfJt>?X@4;;+2QO1m`G?g5dH3AEBs2{8MRpmKE3}Vs_d6wiyI8aJ zojNOzZVrvu6T{*`erUI97TgQ8S-gt)DTZ|0bHnlwerfPg<%0Wm_V7DL-5#7)C4`*yVI;LQKAHF}!zt6MzZI<0A+aXUr-Ocw@Mo z32qG)HSjOkW2&<7!Vr(qZqFUOmlbw!j7Dh zO4eD<85wRK@ZKTvy6^_UqTXCBJqdPE3DU?4!2Qe^NAx!j zmNULn02gZQV)ccO$=zPg~dX;u9sOg^QmJz4*M?&_3>?AwdSc3MWNh5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/supermarket/app/assets/stylesheets/default_branding.scss b/src/supermarket/app/assets/stylesheets/default_branding.scss index 6e271756e5..bed61f98e3 100644 --- a/src/supermarket/app/assets/stylesheets/default_branding.scss +++ b/src/supermarket/app/assets/stylesheets/default_branding.scss @@ -1,5 +1,5 @@ @import "variables"; $search_bar_background: $primary_blue; -$appheader_logo_svg: 'logo-supermarket.svg'; -$appheader_logo_png: 'logo-supermarket.png'; +$appheader_logo_svg: 'supermarket-chef-logo.svg'; +$appheader_logo_png: 'supermarket-chef-logo.png'; $search_input_bg_color: darken($primary_blue, 7%); \ No newline at end of file From 45a97bb59d124dddd821b776a76acd5a7dcf6eb3 Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Thu, 9 Nov 2023 20:45:21 +0530 Subject: [PATCH 6/9] add favicon Signed-off-by: ayush-billore --- src/supermarket/app/assets/images/favicon.ico | Bin 1218 -> 21142 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/supermarket/app/assets/images/favicon.ico b/src/supermarket/app/assets/images/favicon.ico index 58ea3b26318ffd5ff1ab39b5bd006831225b05ce..fa56c2d403b8ad12c005ae9e27e85d60a46752e0 100644 GIT binary patch literal 21142 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 PK3HEqRO>XRzR#Gym8PxM From b184da0ef3311a1ce648f32dda1ded8ef8debdf8 Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Fri, 10 Nov 2023 11:14:44 +0530 Subject: [PATCH 7/9] update conditional for google tag manager script insertion Signed-off-by: ayush-billore --- src/supermarket/app/views/layouts/application.html.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/supermarket/app/views/layouts/application.html.erb b/src/supermarket/app/views/layouts/application.html.erb index 18d2b500ec..73c2e91c8b 100644 --- a/src/supermarket/app/views/layouts/application.html.erb +++ b/src/supermarket/app/views/layouts/application.html.erb @@ -23,11 +23,12 @@ <% end %> - - <% if ENV['GTM_ID'] %> + <% if ENV['GTM_ID'] && air_gapped? %> + + <% end %> - +
From 2b8af230b517003b3e2eacbdc40e0371468730fe Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Tue, 14 Nov 2023 10:55:06 +0530 Subject: [PATCH 8/9] add feature flag changes Signed-off-by: ayush-billore --- .../app/helpers/feature_flag_helper.rb | 12 +- .../app/views/application/_analytics.html.erb | 110 +++++++++--------- .../app/views/layouts/application.html.erb | 6 +- 3 files changed, 70 insertions(+), 58 deletions(-) diff --git a/src/supermarket/app/helpers/feature_flag_helper.rb b/src/supermarket/app/helpers/feature_flag_helper.rb index 3fe0b81aba..313f20371a 100644 --- a/src/supermarket/app/helpers/feature_flag_helper.rb +++ b/src/supermarket/app/helpers/feature_flag_helper.rb @@ -1,5 +1,13 @@ module FeatureFlagHelper - def air_gapped? - ENV["AIR_GAPPED"] == "true" + def gtag_enabled? + ENV["ENABLE_GTAG"] == "true" + end + + def gtm_enabled? + ENV["ENABLE_GTM"] == "true" + end + + def onetrust_enabled? + ENV["ENABLE_ONETRUST"] == "true" end end diff --git a/src/supermarket/app/views/application/_analytics.html.erb b/src/supermarket/app/views/application/_analytics.html.erb index 7cc115abf6..5583c77bd3 100644 --- a/src/supermarket/app/views/application/_analytics.html.erb +++ b/src/supermarket/app/views/application/_analytics.html.erb @@ -1,33 +1,37 @@ - -<%= javascript_tag nonce: content_security_policy_nonce do %> - var oneTrustHelper = (function () { - function evalGTMScript() { - var gtmScript = document.getElementById("GTMScript"); - gtmScript.type = "text/javascript"; - gtmScript.classList.remove("optanon-category-1"); - eval(gtmScript.innerHTML); - }; +<% if gtm_enabled? %> + + <%= javascript_tag nonce: content_security_policy_nonce do %> + var oneTrustHelper = (function () { + function evalGTMScript() { + var gtmScript = document.getElementById("GTMScript"); + gtmScript.type = "text/javascript"; + gtmScript.classList.remove("optanon-category-1"); + eval(gtmScript.innerHTML); + }; - return { - gtmFallback: function () { - console.warn('OneTrust not loaded.'); - if (document.readyState !== 'loading') { - evalGTMScript(); - } else { - document.addEventListener('readystatechange', function () { - if (document.readyState === 'interactive') { - evalGTMScript(); - } - }); - }; - } - }; - })(); + return { + gtmFallback: function () { + console.warn('OneTrust not loaded.'); + if (document.readyState !== 'loading') { + evalGTMScript(); + } else { + document.addEventListener('readystatechange', function () { + if (document.readyState === 'interactive') { + evalGTMScript(); + } + }); + }; + } + }; + })(); + <% end %> <% end %> - +<% if onetrust_enabled? %> + +<% end %> -<% if ENV['GTM_ID'] %> +<% if gtm_enabled? && ENV['GTM_ID'] %> <%= javascript_tag type: "text/plain", id: "GTMScript", class: "optanon-category-1" do %> (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': @@ -35,36 +39,38 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','<%= ENV['GTM_ID'] %>'); - <% end %> + <% end %> <% end %> - -<%= javascript_tag nonce: content_security_policy_nonce do %> - var oneTrustHelper = (function () { - function evalGTagScript() { - var gtScript = document.getElementById("GTagScript"); - gtScript.type = "text/javascript"; - gtScript.classList.remove("optanon-category-2"); - eval(gtScript.innerHTML); - }; - return { - gtagFallback: function () { - console.warn('OneTrust not loaded.'); - if (document.readyState !== 'loading') { - evalGTagScript(); - } else { - document.addEventListener('readystatechange', function () { - if (document.readyState === 'interactive') { - evalGTagScript(); - } - }); - }; - } - }; - })(); +<% if gtag_enabled? %> + + <%= javascript_tag nonce: content_security_policy_nonce do %> + var oneTrustHelper = (function () { + function evalGTagScript() { + var gtScript = document.getElementById("GTagScript"); + gtScript.type = "text/javascript"; + gtScript.classList.remove("optanon-category-2"); + eval(gtScript.innerHTML); + }; + return { + gtagFallback: function () { + console.warn('OneTrust not loaded.'); + if (document.readyState !== 'loading') { + evalGTagScript(); + } else { + document.addEventListener('readystatechange', function () { + if (document.readyState === 'interactive') { + evalGTagScript(); + } + }); + }; + } + }; + })(); + <% end %> <% end %> -<% if ENV['GOOGLE_ANALYTICS_ID'] %> +<% if gtag_enabled? && ENV['GOOGLE_ANALYTICS_ID'] %> <%= javascript_tag nonce: content_security_policy_nonce do %> diff --git a/src/supermarket/app/views/layouts/application.html.erb b/src/supermarket/app/views/layouts/application.html.erb index 73c2e91c8b..024f7f1886 100644 --- a/src/supermarket/app/views/layouts/application.html.erb +++ b/src/supermarket/app/views/layouts/application.html.erb @@ -18,12 +18,10 @@ <%= stylesheet_link_tag "//fonts.googleapis.com/css?family=Montserrat:400,700" %> <% end %> <%= csrf_meta_tags %> - <% unless air_gapped? %> - <%= render 'application/analytics' %> - <% end %> + <%= render 'application/analytics' %> - <% if ENV['GTM_ID'] && air_gapped? %> + <% if gtm_enabled? && ENV['GTM_ID'] %> From d1a9a3269c6e3cd0b730bf0fc6f70b143c0f89cf Mon Sep 17 00:00:00 2001 From: ayush-billore Date: Wed, 15 Nov 2023 11:59:29 +0530 Subject: [PATCH 9/9] add cookie policy, privacy policy, logo and favicon changes Signed-off-by: ayush-billore --- .../app/helpers/feature_flag_helper.rb | 12 +-- .../app/views/application/_analytics.html.erb | 85 ++----------------- .../app/views/layouts/application.html.erb | 10 +-- 3 files changed, 12 insertions(+), 95 deletions(-) diff --git a/src/supermarket/app/helpers/feature_flag_helper.rb b/src/supermarket/app/helpers/feature_flag_helper.rb index 313f20371a..3fe0b81aba 100644 --- a/src/supermarket/app/helpers/feature_flag_helper.rb +++ b/src/supermarket/app/helpers/feature_flag_helper.rb @@ -1,13 +1,5 @@ module FeatureFlagHelper - def gtag_enabled? - ENV["ENABLE_GTAG"] == "true" - end - - def gtm_enabled? - ENV["ENABLE_GTM"] == "true" - end - - def onetrust_enabled? - ENV["ENABLE_ONETRUST"] == "true" + def air_gapped? + ENV["AIR_GAPPED"] == "true" end end diff --git a/src/supermarket/app/views/application/_analytics.html.erb b/src/supermarket/app/views/application/_analytics.html.erb index 5583c77bd3..5fae2dc63f 100644 --- a/src/supermarket/app/views/application/_analytics.html.erb +++ b/src/supermarket/app/views/application/_analytics.html.erb @@ -1,91 +1,20 @@ -<% if gtm_enabled? %> - - <%= javascript_tag nonce: content_security_policy_nonce do %> - var oneTrustHelper = (function () { - function evalGTMScript() { - var gtmScript = document.getElementById("GTMScript"); - gtmScript.type = "text/javascript"; - gtmScript.classList.remove("optanon-category-1"); - eval(gtmScript.innerHTML); - }; - - return { - gtmFallback: function () { - console.warn('OneTrust not loaded.'); - if (document.readyState !== 'loading') { - evalGTMScript(); - } else { - document.addEventListener('readystatechange', function () { - if (document.readyState === 'interactive') { - evalGTMScript(); - } - }); - }; - } - }; - })(); - <% end %> -<% end %> - -<% if onetrust_enabled? %> - -<% end %> - -<% if gtm_enabled? && ENV['GTM_ID'] %> - - <%= javascript_tag type: "text/plain", id: "GTMScript", class: "optanon-category-1" do %> - (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': - new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], - j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= - 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); - })(window,document,'script','dataLayer','<%= ENV['GTM_ID'] %>'); - <% end %> -<% end %> - -<% if gtag_enabled? %> - +<% if ENV['SEGMENT_WRITE_KEY'] %> <%= javascript_tag nonce: content_security_policy_nonce do %> - var oneTrustHelper = (function () { - function evalGTagScript() { - var gtScript = document.getElementById("GTagScript"); - gtScript.type = "text/javascript"; - gtScript.classList.remove("optanon-category-2"); - eval(gtScript.innerHTML); - }; - return { - gtagFallback: function () { - console.warn('OneTrust not loaded.'); - if (document.readyState !== 'loading') { - evalGTagScript(); - } else { - document.addEventListener('readystatechange', function () { - if (document.readyState === 'interactive') { - evalGTagScript(); - } - }); - }; - } - }; - })(); + !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t"); + analytics.page(); + }}(); <% end %> <% end %> -<% if gtag_enabled? && ENV['GOOGLE_ANALYTICS_ID'] %> +<% if ENV['GOOGLE_ANALYTICS_ID'] %> <%= javascript_tag nonce: content_security_policy_nonce do %> window.dataLayer = window.dataLayer || []; function gtag(){window.dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', '<%= ENV['GOOGLE_ANALYTICS_ID'] %>'); - <% end %> -<% end %> -<% if ENV['SEGMENT_WRITE_KEY'] %> - <%= javascript_tag nonce: content_security_policy_nonce do %> - !function(){var analytics=window.analytics=window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","reset","group","track","ready","alias","debug","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t"); - analytics.page(); - }}(); + gtag('config', '<%= ENV['GOOGLE_ANALYTICS_ID'] %>'); <% end %> <% end %> \ No newline at end of file diff --git a/src/supermarket/app/views/layouts/application.html.erb b/src/supermarket/app/views/layouts/application.html.erb index 024f7f1886..e66280ce96 100644 --- a/src/supermarket/app/views/layouts/application.html.erb +++ b/src/supermarket/app/views/layouts/application.html.erb @@ -18,15 +18,11 @@ <%= stylesheet_link_tag "//fonts.googleapis.com/css?family=Montserrat:400,700" %> <% end %> <%= csrf_meta_tags %> - <%= render 'application/analytics' %> + <% unless air_gapped? %> + <%= render 'application/analytics' %> + <% end %> - <% if gtm_enabled? && ENV['GTM_ID'] %> - - - - <% end %> -