From 7d6806ad0db151baeba6d7c4c0815b70bce15a77 Mon Sep 17 00:00:00 2001
From: Ayo <ramon.aycojr@gmail.com>
Date: Sun, 6 Oct 2019 19:42:29 +0800
Subject: [PATCH] update google analytics configuration

---
 _config.yml                     |  2 +-
 _includes/google-analytics.html | 13 +------------
 _includes/head.html             |  7 +++----
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/_config.yml b/_config.yml
index 1d9e9f1..411675d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -18,7 +18,7 @@ author: Ayo
 attribution: "AyoCart Online Marketing"
 attribution-url: "https://AyoAyco.com"
 bugreport_url: "https://github.com/fullhacker/fullhacker.github.io/issues/new"
-google_analytics: true
+google_analytics: 'UA-113797180-1'
 website: fullhacker.github.io
 email: fullhackerblog@gmail.com
 description: >- # this means to ignore newlines until "baseurl:"
diff --git a/_includes/google-analytics.html b/_includes/google-analytics.html
index a116559..b8d4f91 100644
--- a/_includes/google-analytics.html
+++ b/_includes/google-analytics.html
@@ -1,19 +1,8 @@
-<!--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','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', '{{ site.google_analytics }}', 'auto');
-  ga('send', 'pageview');
-
-</script-->
-
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-113797180-1"></script>
 <script>
     window.dataLayer = window.dataLayer || [];
     function gtag(){dataLayer.push(arguments);}
     gtag('js', new Date());
-    gtag('config', 'UA-113797180-1');
+    gtag('config', '{{ site.google_analytics }}');
 </script>
\ No newline at end of file
diff --git a/_includes/head.html b/_includes/head.html
index e626d8d..70b38a8 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -34,14 +34,13 @@
     <meta property="article:section" content="Article Section" />
     <meta property="article:tag" content="Article Tag" /-->
 
-
-    <link rel="stylesheet" href="{{ '/assets/main.css' | relative_url }}">
-    <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ '/feed.xml' | relative_url }}">
-    <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato" />
     {% if jekyll.environment == 'production' and site.google_analytics %}
     {% include google-analytics.html %}
     {% endif %}
 
+    <link rel="stylesheet" href="{{ '/assets/main.css' | relative_url }}">
+    <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ '/feed.xml' | relative_url }}">
+    <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato" />
     <link href="//cdn-images.mailchimp.com/embedcode/horizontal-slim-10_7.css" rel="stylesheet" type="text/css">
 
     <script