Skip to content

Commit 81d707b

Browse files
stevanpostevanpo
authored
Merge pull request #2668 from codeeu/fix/issue-cookie-consent-key
Manual cookie blocking by cookiebot
2 parents 24863f9 + 95fde41 commit 81d707b

6 files changed

Lines changed: 51 additions & 96 deletions

File tree

‎resources/views/layout/analytics.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
1+
<!-- Analytics - only runs if user accepts statistics cookies -->
22

33
<!-- Matomo -->
4-
<script type="text/javascript">
4+
<script type="text/plain" data-cookieconsent="statistics">
55
var _paq = window._paq || [];
66
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
77
_paq.push(['trackPageView']);

‎resources/views/layout/base.blade.php‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
<!DOCTYPE html>
22
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
33
<head>
4-
@if(!isset(Request::header()["dnt"]))
5-
@if (Cookie::get('codeweek_cookie_consent') == 1)
6-
@include('layout.analytics')
7-
@endif
8-
@else
9-
<!-- DO NOT TRACK removed Analytics -->
10-
@endif
4+
@include('layout.analytics')
115
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
126
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
137
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
@@ -113,21 +107,17 @@
113107
</div>
114108

115109
<!-- Scripts -->
116-
@if(!isset(Request::header()["dnt"]))
117-
@if (Cookie::get('codeweek_cookie_consent') == 1)
118-
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
119-
<script>(function (d, s, id) {
120-
var js, fjs = d.getElementsByTagName(s)[0];
121-
if (d.getElementById(id)) return;
122-
js = d.createElement(s);
123-
js.id = id;
124-
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
125-
fjs.parentNode.insertBefore(js, fjs);
126-
}(document, 'script', 'facebook-jssdk'));</script>
127-
128-
@endif
129-
@endif
130-
110+
<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
111+
<script type="text/plain" data-cookieconsent="marketing">
112+
(function (d, s, id) {
113+
var js, fjs = d.getElementsByTagName(s)[0];
114+
if (d.getElementById(id)) return;
115+
js = d.createElement(s);
116+
js.id = id;
117+
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
118+
fjs.parentNode.insertBefore(js, fjs);
119+
}(document, 'script', 'facebook-jssdk'));
120+
</script>
131121

132122
@vite('resources/js/app.js')
133123
<script type="text/javascript" src="{{ asset('lib/jquery/jquery.js') }}"></script>

‎resources/views/layout/guest.blade.php‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
<!DOCTYPE html>
22
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
33
<head>
4-
@if(!isset(Request::header()["dnt"]))
5-
@if (Cookie::get('codeweek_cookie_consent') == 1)
6-
@include('layout.analytics')
7-
@endif
8-
@else
9-
<!-- DO NOT TRACK removed Analytics -->
10-
@endif
4+
@include('layout.analytics')
115
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
126
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
137
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
@@ -81,20 +75,17 @@
8175
</div>
8276

8377
<!-- Scripts -->
84-
@if(!isset(Request::header()["dnt"]))
85-
@if (Cookie::get('codeweek_cookie_consent') == 1)
86-
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
87-
<script>(function (d, s, id) {
88-
var js, fjs = d.getElementsByTagName(s)[0];
89-
if (d.getElementById(id)) return;
90-
js = d.createElement(s);
91-
js.id = id;
92-
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
93-
fjs.parentNode.insertBefore(js, fjs);
94-
}(document, 'script', 'facebook-jssdk'));</script>
95-
96-
@endif
97-
@endif
78+
<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
79+
<script type="text/plain" data-cookieconsent="marketing">
80+
(function (d, s, id) {
81+
var js, fjs = d.getElementsByTagName(s)[0];
82+
if (d.getElementById(id)) return;
83+
js = d.createElement(s);
84+
js.id = id;
85+
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
86+
fjs.parentNode.insertBefore(js, fjs);
87+
}(document, 'script', 'facebook-jssdk'));
88+
</script>
9889

9990

10091
@vite('resources/js/app.js')

‎resources/views/layout/new_base.blade.php‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
<!DOCTYPE html>
22
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
33
<head>
4-
@if(!isset(Request::header()["dnt"]))
5-
@if (Cookie::get('codeweek_cookie_consent') == 1)
6-
@include('layout.analytics')
7-
@endif
8-
@else
9-
<!-- DO NOT TRACK removed Analytics -->
10-
@endif
4+
@include('layout.analytics')
115
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
126
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
137
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
@@ -102,22 +96,17 @@
10296
</div>
10397

10498
<!-- Scripts -->
105-
@if(!isset(Request::header()["dnt"]))
106-
@if (Cookie::get('codeweek_cookie_consent') == 1)
107-
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
108-
<script>
109-
(function(d, s, id) {
110-
var js, fjs = d.getElementsByTagName(s)[0];
111-
if (d.getElementById(id)) return;
112-
js = d.createElement(s);
113-
js.id = id;
114-
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
115-
fjs.parentNode.insertBefore(js, fjs);
116-
}(document, 'script', 'facebook-jssdk'));
117-
118-
</script>
119-
@endif
120-
@endif
99+
<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
100+
<script type="text/plain" data-cookieconsent="marketing">
101+
(function (d, s, id) {
102+
var js, fjs = d.getElementsByTagName(s)[0];
103+
if (d.getElementById(id)) return;
104+
js = d.createElement(s);
105+
js.id = id;
106+
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
107+
fjs.parentNode.insertBefore(js, fjs);
108+
}(document, 'script', 'facebook-jssdk'));
109+
</script>
121110

122111
{{-- Animation script --}}
123112
<script type="text/javascript">

‎resources/views/layout/simple.blade.php‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
<!DOCTYPE html>
22
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
33
<head>
4-
@if(!isset(Request::header()["dnt"]))
5-
@if (Cookie::get('codeweek_cookie_consent') == 1)
6-
@include('layout.analytics')
7-
@endif
8-
@else
9-
<!-- DO NOT TRACK removed Analytics -->
10-
@endif
4+
@include('layout.analytics')
115
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
126
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
137
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>

‎resources/views/layout/tall.blade.php‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
<!DOCTYPE html>
22
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
33
<head>
4-
@if(!isset(Request::header()["dnt"]))
5-
@if (Cookie::get('codeweek_cookie_consent') == 1)
6-
@include('layout.analytics')
7-
@endif
8-
@else
9-
<!-- DO NOT TRACK removed Analytics -->
10-
@endif
4+
@include('layout.analytics')
115
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
126
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
137
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
@@ -91,20 +85,17 @@
9185
</div>
9286

9387
<!-- Scripts -->
94-
@if(!isset(Request::header()["dnt"]))
95-
@if (Cookie::get('codeweek_cookie_consent') == 1)
96-
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
97-
<script>(function (d, s, id) {
98-
var js, fjs = d.getElementsByTagName(s)[0];
99-
if (d.getElementById(id)) return;
100-
js = d.createElement(s);
101-
js.id = id;
102-
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
103-
fjs.parentNode.insertBefore(js, fjs);
104-
}(document, 'script', 'facebook-jssdk'));</script>
105-
106-
@endif
107-
@endif
88+
<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
89+
<script type="text/plain" data-cookieconsent="marketing">
90+
(function (d, s, id) {
91+
var js, fjs = d.getElementsByTagName(s)[0];
92+
if (d.getElementById(id)) return;
93+
js = d.createElement(s);
94+
js.id = id;
95+
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
96+
fjs.parentNode.insertBefore(js, fjs);
97+
}(document, 'script', 'facebook-jssdk'));
98+
</script>
10899

109100
{{--@vite('resources/js/app.js')--}}
110101
<script type="text/javascript" src="{{ asset('lib/jquery/jquery.js') }}"></script>

0 commit comments

Comments
 (0)