From 275eaece26539105bed86c76b0199f3f421672c6 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@Heribook.local>
Date: Thu, 2 Jul 2020 17:01:56 +0200
Subject: [PATCH] suite

---
 app/views/layouts/public.html.haml   |  4 +++-
 app/views/public/shared/_ga.html.erb | 15 +++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 7800283..509b8e3 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -20,6 +20,9 @@
 
 %html{:lang => "fr", "xml:lang" => "fr", :xmlns => "http://www.w3.org/1999/xhtml"}
   %head
+    =render :partial => "public/shared/ga"
+    
+    
     -@title = strip_tags(@title.to_s)
     %title=@title.to_s
 
@@ -64,7 +67,6 @@
     = javascript_include_tag "public"
     
     = csrf_meta_tag 
-    =render :partial => "public/shared/ga"
     
     = stylesheet_link_tag 'public', :media => :all
     
diff --git a/app/views/public/shared/_ga.html.erb b/app/views/public/shared/_ga.html.erb
index 26ecb92..ebf2461 100644
--- a/app/views/public/shared/_ga.html.erb
+++ b/app/views/public/shared/_ga.html.erb
@@ -1,10 +1,9 @@
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-86733824-40"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
 
-  ga('create', 'UA--1', 'auto');
-  ga('send', 'pageview');
-
-</script>
\ No newline at end of file
+  gtag('config', 'UA-86733824-40');
+</script>