small fixes

Author: gauffininteractive

src/Server/OneTrueError.App/Modules/Geolocation/EventHandlers/StorePositionFromNewReport.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
@@ -48,34 +49,36 @@ public async Task HandleAsync(ReportAddedToIncident e)
                 return;
 
             var request = WebRequest.CreateHttp("http://freegeoip.net/json/" + e.Report.RemoteAddress);
+            string json = "";
             try
             {
                 var response = await request.GetResponseAsync();
                 var stream = response.GetResponseStream();
                 var reader = new StreamReader(stream);
-                var json = await reader.ReadToEndAsync();
+                json = await reader.ReadToEndAsync();
                 var jsonObj = JObject.Parse(json);
 
                 /*    /*{"ip":"94.254.21.175","country_code":"SE","country_name":"Sweden","region_code":"10","region_name":"Dalarnas Lan","city":"Falun","zipcode":"",
                  * "latitude":60.6,"longitude":15.6333,
      * "metro_code":"","areacode":""}*/
 
-                var lat = double.Parse(jsonObj["latitude"].Value<string>());
-                var lon = double.Parse(jsonObj["longitude"].Value<string>());
-                var cmd = new ErrorOrigin(e.Report.RemoteAddress, lon, lat);
-                cmd.City = jsonObj["city"].ToString();
-                cmd.CountryName = jsonObj["city"].ToString();
-                cmd.CountryCode = jsonObj["country_code"].ToString();
-                cmd.CountryName = jsonObj["country_name"].ToString();
-                cmd.RegionCode = jsonObj["region_code"].ToString();
-                cmd.RegionName = jsonObj["region_name"].ToString();
-                cmd.ZipCode = jsonObj["zip_code"].ToString();
+                var lat = double.Parse(jsonObj["latitude"].Value<string>(), CultureInfo.InvariantCulture);
+                var lon = double.Parse(jsonObj["longitude"].Value<string>(), CultureInfo.InvariantCulture);
+                var cmd = new ErrorOrigin(e.Report.RemoteAddress, lon, lat)
+                {
+                    City = jsonObj["city"].ToString(),
+                    CountryCode = jsonObj["country_code"].ToString(),
+                    CountryName = jsonObj["country_name"].ToString(),
+                    RegionCode = jsonObj["region_code"].ToString(),
+                    RegionName = jsonObj["region_name"].ToString(),
+                    ZipCode = jsonObj["zip_code"].ToString()
+                };
 
                 await _repository.CreateAsync(cmd, e.Incident.ApplicationId, e.Incident.Id, e.Report.Id);
             }
             catch (Exception exception)
             {
-                _logger.Error("Failed to store location.", exception);
+                _logger.Error("Failed to store location: " + json, exception);
             }
         }
     }

src/Server/OneTrueError.Web/Areas/Admin/Views/Application/Deleted.cshtml

@@ -10,4 +10,4 @@
             <div class="panel panel-body panel-success">The application has been deleted.</div>
         </div>
     </div>
-</div>
+</div>

src/Server/OneTrueError.Web/Areas/Installation/InstallationAreaRegistration.cs

@@ -1,4 +1,5 @@
-using System.Web.Mvc;
+using System.Configuration;
+using System.Web.Mvc;
 
 namespace OneTrueError.Web.Areas.Installation
 {
@@ -11,6 +12,9 @@ public override string AreaName
 
         public override void RegisterArea(AreaRegistrationContext context)
         {
+            if (ConfigurationManager.AppSettings["Configured"] != "false")
+                return;
+
             context.MapRoute(
                 "Installation_default",
                 "Installation/{controller}/{action}/{id}",

src/Server/OneTrueError.Web/Areas/Installation/Views/Setup/Support.cshtml

@@ -7,7 +7,7 @@
 
         <h2>Free Support</h2>
         <p>Do you want to get 30 days of free email support?</p>
-        <p>No obligations attached, but you can purchase commercial support after that if you would like to support the project.</p>
+        <p>No strings attached. You can optionally extend support after the 30 days.</p>
         <form method="post" action="@Url.Action("Support")" style="width: 100%" class="form">
             @Html.ValidationSummary(false)
             <div>

src/Server/OneTrueError.Web/OneTrueError.Web.csproj

@@ -426,6 +426,7 @@
     <Content Include="Areas\Installation\Views\Setup\Support.cshtml" />
     <Content Include="Areas\Admin\Views\Application\Index.cshtml" />
     <Content Include="Areas\Admin\Views\Application\Edit.cshtml" />
+    <Content Include="Areas\Admin\Views\Application\Deleted.cshtml" />
     <None Include="compilerconfig.json" />
     <None Include="compilerconfig.json.defaults">
       <DependentUpon>compilerconfig.json</DependentUpon>

src/Server/OneTrueError.Web/Views/Application/_create.cshtml

@@ -3,7 +3,8 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span></button>
+                    <span aria-hidden="true">&times;</span>
+                </button>
                 <h4 class="modal-title">Create application</h4>
             </div>
             <div class="modal-body">
@@ -37,35 +38,34 @@
 
         var client = new Griffin.Net.HttpClient();
         client.get(window.API_URL + '/guid')
-            .done(function(response) {
+            .done(function (response) {
                 var appKey = response.body;
                 var cmd = new OneTrueError.Core.Applications.Commands.CreateApplication(name, hostType);
                 cmd.ApplicationKey = appKey;
                 Griffin.Cqs.CqsClient.command(cmd)
-                    .done(function() {
+                    .done(function () {
                         var query = new OneTrueError.Core.Applications.Queries.GetApplicationIdByKey(appKey);
                         Griffin.Cqs.CqsClient.query(query)
-                            .done(function(result) {
+                            .done(function (result) {
                                 $('#appName').val('');
-                                $('#applicationsMenu')
-                                    .append('<li><a href="#/application/' + result.Id + '">' + name + '</a></li>');
-                                window.location.hash = '#/application/' + result.Id;
+                                var appUrl = '#/application/' + result.Id;
+                                window.location = window.WEB_SITE + '/account/UpdateSession?returnUrl=' + encodeURIComponent(window.WEB_ROOT + appUrl);
                             });
+
                     })
-                    .fail(function(rejection) {
+                    .fail(function (rejection) {
                         console.log(rejection.message);
                     });
-                $.post(window.API_URL + '/account/UpdateSession');
             });
     }
 
     $('#create-application .btn-primary')
-        .click(function(e) {
+        .click(function (e) {
             e.preventDefault();
             $('#CreateAppForm').submit();
         });
     $('#CreateAppForm')
-        .submit(function(e) {
+        .submit(function (e) {
             e.preventDefault();
             createAppliction();
             $('#create-application').modal('hide');

src/Server/OneTrueError.Web/Views/Shared/_Layout.cshtml

@@ -152,6 +152,8 @@
 @Scripts.Render("~/bundles/app")
 <script type="text/javascript">
     var API_URL = '@ApiUrl';
+    var WEB_SITE = '@(new Uri(Request.Url, Url.Content("~")))';
+    var WEB_ROOT = '@Url.Content("~")';
     Griffin.Net.HttpClient.REDIRECT_401_TO = '@LoginUrl';
 </script>
 @RenderSection("scripts", false)