Move GA4 tracking code to <head>

artefactual · Sep 10, 2024 · bad10ee · bad10ee
1 parent e503a1f
commit bad10ee
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 14 deletions.
diff --git a/apps/qubit/modules/default/templates/_googleAnalytics.php b/apps/qubit/modules/default/templates/_googleAnalytics.php
@@ -0,0 +1,11 @@
+<?php $gaKey = sfConfig::get('app_google_analytics_api_key', ''); ?>
+<?php if (!empty($gaKey)) { ?>
+    <script <?php echo __(sfConfig::get('csp_nonce', '')); ?> async src="https://www.googletagmanager.com/gtag/js?id=<?php echo $gaKey; ?>"></script>
+    <script <?php echo __(sfConfig::get('csp_nonce', '')); ?>>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+    <?php include_slot('google_analytics'); ?>
+    gtag('config', '<?php echo $gaKey; ?>');
+    </script>
+<?php } ?>
diff --git a/apps/qubit/templates/_footer.php b/apps/qubit/templates/_footer.php
@@ -18,15 +18,3 @@
   </div>
 
 </footer>
-
-<?php $gaKey = sfConfig::get('app_google_analytics_api_key', ''); ?>
-<?php if (!empty($gaKey)) { ?>
-  <script <?php echo __(sfConfig::get('csp_nonce', '')); ?> async src="https://www.googletagmanager.com/gtag/js?id=<?php echo $gaKey; ?>"></script>
-  <script <?php echo __(sfConfig::get('csp_nonce', '')); ?>>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-    <?php include_slot('google_analytics'); ?>
-    gtag('config', '<?php echo $gaKey; ?>');
-  </script>
-<?php } ?>
diff --git a/apps/qubit/templates/layout.php b/apps/qubit/templates/layout.php
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<?php echo $sf_user->getCulture(); ?>" dir="<?php echo sfCultureInfo::getInstance($sf_user->getCulture())->direction; ?>">
   <head>
+    <?php echo get_component('default', 'googleAnalytics'); ?>
     <?php echo get_component('default', 'tagManager', ['code' => 'script']); ?>
     <?php include_http_metas(); ?>
     <?php include_metas(); ?>

diff --git a/apps/qubit/templates/layout_1col.php b/apps/qubit/templates/layout_1col.php
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<?php echo $sf_user->getCulture(); ?>" dir="<?php echo sfCultureInfo::getInstance($sf_user->getCulture())->direction; ?>">
   <head>
+    <?php echo get_component('default', 'googleAnalytics'); ?>
     <?php echo get_component('default', 'tagManager', ['code' => 'script']); ?>
     <?php include_http_metas(); ?>
     <?php include_metas(); ?>

diff --git a/apps/qubit/templates/layout_2col.php b/apps/qubit/templates/layout_2col.php
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<?php echo $sf_user->getCulture(); ?>" dir="<?php echo sfCultureInfo::getInstance($sf_user->getCulture())->direction; ?>">
   <head>
+    <?php echo get_component('default', 'googleAnalytics'); ?>
     <?php echo get_component('default', 'tagManager', ['code' => 'script']); ?>
     <?php include_http_metas(); ?>
     <?php include_metas(); ?>

diff --git a/apps/qubit/templates/layout_3col.php b/apps/qubit/templates/layout_3col.php
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<?php echo $sf_user->getCulture(); ?>" dir="<?php echo sfCultureInfo::getInstance($sf_user->getCulture())->direction; ?>">
   <head>
+    <?php echo get_component('default', 'googleAnalytics'); ?>
     <?php echo get_component('default', 'tagManager', ['code' => 'script']); ?>
     <?php include_http_metas(); ?>
     <?php include_metas(); ?>

diff --git a/apps/qubit/templates/layout_basic.php b/apps/qubit/templates/layout_basic.php
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<?php echo $sf_user->getCulture(); ?>" dir="<?php echo sfCultureInfo::getInstance($sf_user->getCulture())->direction; ?>">
   <head>
+    <?php echo get_component('default', 'googleAnalytics'); ?>
     <?php echo get_component('default', 'tagManager', ['code' => 'script']); ?>
     <?php include_http_metas(); ?>
     <?php include_metas(); ?>

diff --git a/apps/qubit/templates/layout_wide.php b/apps/qubit/templates/layout_wide.php
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="<?php echo $sf_user->getCulture(); ?>" dir="<?php echo sfCultureInfo::getInstance($sf_user->getCulture())->direction; ?>">
   <head>
+    <?php echo get_component('default', 'googleAnalytics'); ?>
     <?php echo get_component('default', 'tagManager', ['code' => 'script']); ?>
     <?php include_http_metas(); ?>
     <?php include_metas(); ?>

diff --git a/config/app.yml b/config/app.yml
@@ -23,7 +23,7 @@ all:
   # Google Analitycs:
   # Set a GA property API key to track page view hits.
   # E.g.: UA-1234567-89
-  google_analytics_api_key:
+  google_analytics_api_key: test_12354
   # Set a GA custom dimension index numver (from the same property)
   # to track the repository name as a dimension in page view hits
   # of IOs, actors and repos index pages.

diff --git a/plugins/arDominionB5Plugin/templates/_layout_start_webpack.php b/plugins/arDominionB5Plugin/templates/_layout_start_webpack.php
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="<?php echo $sf_user->getCulture(); ?>" dir="<?php echo sfCultureInfo::getInstance($sf_user->getCulture())->direction; ?>">
   <head>
+    <?php echo get_component('default', 'googleAnalytics'); ?>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <?php include_title(); ?>
     <?php echo get_component('default', 'tagManager', ['code' => 'script']); ?>
     <link rel="shortcut icon" href="<?php echo public_path('favicon.ico'); ?>">
     <%= htmlWebpackPlugin.tags.headTags %>