google analytics fix

This commit is contained in:
Čarodej
2022-06-27 11:07:52 +02:00
parent a26684df79
commit 178a8606b9
3 changed files with 3 additions and 2 deletions

View File

@@ -1,7 +1,7 @@
<?php <?php
return [ return [
'version' => '2.2.0.9', 'version' => '2.2.0.10',
'is_demo' => env('APP_DEMO', false), 'is_demo' => env('APP_DEMO', false),

View File

@@ -159,7 +159,7 @@
<script src="{{ asset('js/main.js') }}?v={{ get_version() }}"></script> <script src="{{ asset('js/main.js') }}?v={{ get_version() }}"></script>
{{--Global site tag (gtag.js) - Google Analytics--}} {{--Global site tag (gtag.js) - Google Analytics--}}
@if(isset($config->google_analytics) && $config->google_analytics) @if($config->google_analytics)
<script async src="https://www.googletagmanager.com/gtag/js?id={{ $config->google_analytics }}"></script> <script async src="https://www.googletagmanager.com/gtag/js?id={{ $config->google_analytics }}"></script>
<script> <script>
window.dataLayer = window.dataLayer || []; window.dataLayer = window.dataLayer || [];

View File

@@ -200,6 +200,7 @@ class GetConfigAction
'allowHomepage' => intval($settings->allow_homepage ?? 1), 'allowHomepage' => intval($settings->allow_homepage ?? 1),
'teamsDefaultMembers' => intval($settings->default_max_team_member ?? 10), 'teamsDefaultMembers' => intval($settings->default_max_team_member ?? 10),
'legal' => $pages ? json_encode($pages) : 'undefined', 'legal' => $pages ? json_encode($pages) : 'undefined',
'google_analytics' => optional($settings)->google_analytics ?? null,
]; ];
} }
} }