From b5014cae5b2f8333058a092e86328cb9ff8f0279 Mon Sep 17 00:00:00 2001
From: Jason Williams <jason@jnf.me>
Date: Sun, 25 Oct 2020 12:40:21 -0600
Subject: [PATCH] Final updates and tweaks in preparation for MVP launch -
 Removed unused items from the footer - Fixed language files to cover all
 variants of English - Added Google Analytics tracking code

---
 .../calgaryconditions/lang/{en-ca => en}/lang.php     |  0
 .../jasonwilliams/feed/lang/{en-ca => en}/lang.php    |  0
 .../jason-williamsca/assets/javascript/common.js      |  9 +++++++++
 www/themes/jason-williamsca/layouts/default.htm       |  5 +++--
 www/themes/jason-williamsca/pages/maintenance.htm     | 11 +++++------
 5 files changed, 17 insertions(+), 8 deletions(-)
 rename www/plugins/jasonwilliams/calgaryconditions/lang/{en-ca => en}/lang.php (100%)
 rename www/plugins/jasonwilliams/feed/lang/{en-ca => en}/lang.php (100%)

diff --git a/www/plugins/jasonwilliams/calgaryconditions/lang/en-ca/lang.php b/www/plugins/jasonwilliams/calgaryconditions/lang/en/lang.php
similarity index 100%
rename from www/plugins/jasonwilliams/calgaryconditions/lang/en-ca/lang.php
rename to www/plugins/jasonwilliams/calgaryconditions/lang/en/lang.php
diff --git a/www/plugins/jasonwilliams/feed/lang/en-ca/lang.php b/www/plugins/jasonwilliams/feed/lang/en/lang.php
similarity index 100%
rename from www/plugins/jasonwilliams/feed/lang/en-ca/lang.php
rename to www/plugins/jasonwilliams/feed/lang/en/lang.php
diff --git a/www/themes/jason-williamsca/assets/javascript/common.js b/www/themes/jason-williamsca/assets/javascript/common.js
index c3f46ea..1dd4d4c 100644
--- a/www/themes/jason-williamsca/assets/javascript/common.js
+++ b/www/themes/jason-williamsca/assets/javascript/common.js
@@ -14,4 +14,13 @@ $(() => {
     $('textarea').each(function() {
         $(this).height($(this)[0].scrollHeight)
     })
+    
+    // Use google analytics in production
+    if (!window.location.hostname.includes('dev')) {
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', 'UA-167178542-1');
+    }
 });
\ No newline at end of file
diff --git a/www/themes/jason-williamsca/layouts/default.htm b/www/themes/jason-williamsca/layouts/default.htm
index ecc9cf6..97da93a 100644
--- a/www/themes/jason-williamsca/layouts/default.htm
+++ b/www/themes/jason-williamsca/layouts/default.htm
@@ -51,14 +51,15 @@ description = "Default Layout"
                         <p>Made with <i class="fas fa-heart"></i> in #YYC<br><a href="https://www.madeinyyc.com/"><img src="{{ 'assets/images/madeinyyc.png'|theme }}"></a></p>
                     </div>
                     <div class="col-md-4">
-                        <p>Recent Projects</p>
+                        <!-- <p>Recent Projects</p> -->
                     </div>
                     <div class="col-md-4">
-                        <p>Recent Blog Posts</p>
+                        <!-- <p>Recent Blog Posts</p> -->
                     </div>
             </div>
         </footer>
 
+        {% if 'dev' not in url('/') %}<script async src="https://www.googletagmanager.com/gtag/js?id=UA-167178542-1"></script>{% endif %}
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js" integrity="sha256-x3YZWtRjM8bJqf48dFAv/qmgL68SI4jqNWeSLMZaMGA=" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha256-OFRAJNoaD8L3Br5lglV7VyLRf0itmoBzWUoM+Sji4/8=" crossorigin="anonymous"></script>
diff --git a/www/themes/jason-williamsca/pages/maintenance.htm b/www/themes/jason-williamsca/pages/maintenance.htm
index 6b4d0f3..2f5fc62 100644
--- a/www/themes/jason-williamsca/pages/maintenance.htm
+++ b/www/themes/jason-williamsca/pages/maintenance.htm
@@ -6,24 +6,23 @@ is_hidden = 0
 <html>
 <head>
 <meta charset="utf-8" />
-<title>son-williams.ca</title>
+<title>ja.son-williams.ca</title>
 <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro|Merriweather:300italic,300' rel='stylesheet' type='text/css'>
 <style type="text/css">
   * {margin: 0; padding: 0; box-sizing: border-box;}
   html, body {height: 100%; color: #000000;}
   #view {height: 100%; width: 100%; overflow: hidden;}
   #verticalcenter {margin: 0; position: absolute; top: 50%; width: 100%; transform: translateY(-50%);}
-  #verticalcenter p {font-family: 'Merriweather', serif; text-align: center; font-size: 24px; font-weight: 300; font-style: italic;}
-  #view p#pilink {position: absolute; bottom: 20px; right: 20px; font-size: 20px;}
-  #view p#pilink a {text-decoration: none; color: #BBC3D0;}
+  #verticalcenter p {font-family: 'Merriweather', serif; text-align: center; font-size: 16px; font-weight: 300; font-style: italic;}
+  #verticalcenter p.main {font-size: 36px;}
 </style>
 </head>
 <body>
   <div id="view">
     <div id="verticalcenter">
-      <p>ja.son-williams.ca</p>
+      <p class="main">ja.son-williams.ca</p>
+      <p>Under maintenance. Please check back later.</p>
     </div>
-    <p id="pilink"><a href="/backend">&pi;</a></p>
   </div>
 </body>
 </html>
\ No newline at end of file