From f0fb0652377e9e29c3d9659a320066889e7e13d4 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 24 Jun 2016 12:49:04 +0100
Subject: [PATCH] Analytics and fixes

---
 PlexRequests.Helpers/Analytics/Action.cs    |  3 ++-
 PlexRequests.Helpers/Analytics/Category.cs  |  1 +
 PlexRequests.UI/Modules/CultureModule.cs    | 16 ++++++++++++----
 PlexRequests.UI/Views/Search/Index.cshtml   |  2 +-
 PlexRequests.UI/Views/Shared/_Layout.cshtml | 10 +++++++++-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/PlexRequests.Helpers/Analytics/Action.cs b/PlexRequests.Helpers/Analytics/Action.cs
index 6cbe2a737..d91356747 100644
--- a/PlexRequests.Helpers/Analytics/Action.cs
+++ b/PlexRequests.Helpers/Analytics/Action.cs
@@ -39,6 +39,7 @@ namespace PlexRequests.Helpers.Analytics
         Movie,
         TvShow,
         Album,
-        Request
+        Request,
+        Language
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Helpers/Analytics/Category.cs b/PlexRequests.Helpers/Analytics/Category.cs
index 7bedb16a5..252c6fdc8 100644
--- a/PlexRequests.Helpers/Analytics/Category.cs
+++ b/PlexRequests.Helpers/Analytics/Category.cs
@@ -37,5 +37,6 @@ namespace PlexRequests.Helpers.Analytics
         Issues,
         UserLogin,
         Services,
+        Navbar
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/CultureModule.cs b/PlexRequests.UI/Modules/CultureModule.cs
index 7944f3b0e..0574497f2 100644
--- a/PlexRequests.UI/Modules/CultureModule.cs
+++ b/PlexRequests.UI/Modules/CultureModule.cs
@@ -25,6 +25,7 @@
 //  ************************************************************************/
 #endregion
 using System;
+using System.Threading.Tasks;
 
 using Nancy;
 using Nancy.Extensions;
@@ -32,18 +33,24 @@ using Nancy.Responses;
 
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
+using PlexRequests.Helpers;
+using PlexRequests.Helpers.Analytics;
 using PlexRequests.UI.Helpers;
 
 namespace PlexRequests.UI.Modules
 {
     public class CultureModule : BaseModule
     {
-        public CultureModule(ISettingsService<PlexRequestSettings> pr) : base("culture",pr)
+        public CultureModule(ISettingsService<PlexRequestSettings> pr, IAnalytics a) : base("culture",pr)
         {
-            Get["/"] = x => SetCulture();
+            Analytics = a;
+
+            Get["/", true] = async(x,c) => await SetCulture();
         }
 
-        public RedirectResponse SetCulture()
+        private IAnalytics Analytics { get; }
+
+        public async Task<RedirectResponse> SetCulture()
         {
             var culture = (string)Request.Query["l"];
             var returnUrl = (string)Request.Query["u"];
@@ -60,10 +67,11 @@ namespace PlexRequests.UI.Modules
             {
                 Cookies.Add(CultureCookieName, culture);
             }
-            var cookie = Cookies["_culture"];
+            var cookie = Cookies[CultureCookieName];
             var response = Context.GetRedirect(returnUrl);
 
             response.WithCookie(CultureCookieName, cookie ?? culture, DateTime.Now.AddYears(1));
+            await Analytics.TrackEventAsync(Category.Navbar, PlexRequests.Helpers.Analytics.Action.Language, culture, Username, CookieHelper.GetAnalyticClientId(Cookies));
 
             return response;
         }
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index b1c401622..a37b099ae 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -9,7 +9,7 @@
     }
 }
 <div>
-    <h1>@UI.Seach_SearchTitle</h1>
+    <h1>@UI.Search_Title</h1>
     <h4>@UI.Search_Paragraph</h4>
     <br />
     <!-- Nav tabs -->
diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml
index 04604dcdf..57aa333fd 100644
--- a/PlexRequests.UI/Views/Shared/_Layout.cshtml
+++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml
@@ -43,7 +43,7 @@
                     @Html.GetNavbarUrl(Context, "/issues", UI.Layout_Issues, "exclamation", "<span id=\"issueCount\"></span>")
                     @if (Context.CurrentUser.IsAuthenticated()) // TODO replace with IsAdmin
                     {
-                        <li><a href="https://www.paypal.me/PlexRequestsNet" target="_blank"><i class="fa fa-heart" style="color: red"></i> @UI.Layout_Donate</a></li>
+                        <li><a id="donate" onclick="donateClick('https://www.paypal.me/PlexRequestsNet');"><i class="fa fa-heart" style="color: red"></i> @UI.Layout_Donate</a></li>
                     }
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
@@ -102,6 +102,12 @@
 </body>
 </html>
 <script>
+    
+    function donateClick(url) {
+        ga('send', 'event', 'Navbar', 'Donate', 'Donate Clicked');
+        var redirectWindow = window.open(url, '_blank');
+        redirectWindow.location;
+    }
 
     $(function () {
 
@@ -142,6 +148,8 @@
         // End Scroller
 
 
+
+
         // Get Issue count
         var issueUrl = createBaseUrl(urlBase, '/issues/issuecount');
         $.ajax({