Skip to content

Dev #2669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevanpo merged 2 commits into from
Apr 17, 2025
Merged

Dev #2669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95fde41
Manual cookie blocking by cookiebot
stevanpo Apr 17, 2025
81d707b
Merge pull request #2668 from codeeu/fix/issue-cookie-consent-key
stevanpo Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/views/layout/analytics.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

<!-- Analytics - only runs if user accepts statistics cookies -->

<!-- Matomo -->
<script type="text/javascript">
<script type="text/plain" data-cookieconsent="statistics">
var _paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
Expand Down
34 changes: 12 additions & 22 deletions resources/views/layout/base.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
@include('layout.analytics')
@endif
@else
<!-- DO NOT TRACK removed Analytics -->
@endif
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
Expand Down Expand Up @@ -113,21 +107,17 @@
</div>

<!-- Scripts -->
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script>(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s);
js.id = id;
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

@endif
@endif

<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script type="text/plain" data-cookieconsent="marketing">
(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s);
js.id = id;
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>

@vite('resources/js/app.js')
<script type="text/javascript" src="{{ asset('lib/jquery/jquery.js') }}"></script>
Expand Down
33 changes: 12 additions & 21 deletions resources/views/layout/guest.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
@include('layout.analytics')
@endif
@else
<!-- DO NOT TRACK removed Analytics -->
@endif
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
Expand Down Expand Up @@ -81,20 +75,17 @@
</div>

<!-- Scripts -->
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script>(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s);
js.id = id;
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

@endif
@endif
<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script type="text/plain" data-cookieconsent="marketing">
(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s);
js.id = id;
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>


@vite('resources/js/app.js')
Expand Down
35 changes: 12 additions & 23 deletions resources/views/layout/new_base.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
@include('layout.analytics')
@endif
@else
<!-- DO NOT TRACK removed Analytics -->
@endif
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
Expand Down Expand Up @@ -102,22 +96,17 @@
</div>

<!-- Scripts -->
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script>
(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s);
js.id = id;
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));

</script>
@endif
@endif
<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script type="text/plain" data-cookieconsent="marketing">
(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s);
js.id = id;
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>

{{-- Animation script --}}
<script type="text/javascript">
Expand Down
8 changes: 1 addition & 7 deletions resources/views/layout/simple.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
@include('layout.analytics')
@endif
@else
<!-- DO NOT TRACK removed Analytics -->
@endif
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
Expand Down
33 changes: 12 additions & 21 deletions resources/views/layout/tall.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<!DOCTYPE html>
<html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
<head>
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
@include('layout.analytics')
@endif
@else
<!-- DO NOT TRACK removed Analytics -->
@endif
@include('layout.analytics')
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
Expand Down Expand Up @@ -91,20 +85,17 @@
</div>

<!-- Scripts -->
@if(!isset(Request::header()["dnt"]))
@if (Cookie::get('codeweek_cookie_consent') == 1)
<script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script>(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s);
js.id = id;
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

@endif
@endif
<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
<script type="text/plain" data-cookieconsent="marketing">
(function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s);
js.id = id;
js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>

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