Fixed a few issues with the Follower UI & FollowerCountConfiguration.LoadDefaultSettings method (#226)

* Fixed issue in FollowersCountConfiguration model that overwrote any custom background or font color codes that were already set.

* Improved follower configuration UI to display based on a provided background & font color or display by default using values in the app.settings.

Author: Mike Jolley

Fritz.StreamTools/Controllers/FollowersController.cs

@@ -81,25 +81,22 @@ public IActionResult Count(FollowerCountConfiguration model)
 				return View("Docs_Count");
 			}
 
-			// TODO: Read this from AppSettings?
 			model.LoadDefaultSettings(CountConfiguration);
 
-				if (model.CurrentValue == 0)
-				{
-					model.CurrentValue = StreamService.CurrentFollowerCount;
-				}
-
-
-
+			if (model.CurrentValue == 0)
+			{
+				model.CurrentValue = StreamService.CurrentFollowerCount;
+			}
 
 			return View(model);
 
 		}
 
 		[Route("followers/count/configuration", Name ="ConfigurationFollowerCount")]
-		public IActionResult CountConfigurationAction()
+		public IActionResult CountConfigurationAction(FollowerCountConfiguration model)
 		{
-			return View("CountConfiguration");
+			model.LoadDefaultSettings(CountConfiguration);
+			return View("CountConfiguration", model);
 		}
 
 		[Route("followers/goal/{*stuff}")]

Fritz.StreamTools/Models/FollowerCountConfiguration.cs

@@ -16,9 +16,8 @@ public class FollowerCountConfiguration
 
 		internal void LoadDefaultSettings(FollowerCountConfiguration config)
 		{
-			this.BackgroundColor = string.IsNullOrWhiteSpace(this.BackgroundColor) ? config.BackgroundColor : "#000";
-			this.FontColor = string.IsNullOrWhiteSpace(this.FontColor) ? config.FontColor : "#32cd32";
-
+			this.BackgroundColor = string.IsNullOrWhiteSpace(this.BackgroundColor) ? config.BackgroundColor : this.BackgroundColor;
+			this.FontColor = string.IsNullOrWhiteSpace(this.FontColor) ? config.FontColor : this.FontColor;
 		}
 
 	}

Fritz.StreamTools/Views/Followers/CountConfiguration.cshtml

@@ -22,7 +22,7 @@
 	<div class="col-md-6 mb-3 form-inline">
 		<label asp-for="BackgroundColor"></label>
 		&nbsp;
-		<input type="color" asp-for="BackgroundColor" value="#CCCCCC" />
+		<input type="color" asp-for="BackgroundColor" value="@nameof(Model.FontColor)" />
 	</div>
 </div>
 
@@ -54,17 +54,15 @@
 			FontColor: "@nameof(Model.FontColor)"
 		};
 
-        var log = function (message, params) {
-            @if (HostingEnvironment.IsDevelopment())
-	{
-<text>console.log(message, params);</text>
-}
-        };
-
-		(function () {
-
-	    //document.getElementById('fontsPanel').style.display = 'none';
+    var log = function (message, params) {
+        @if (HostingEnvironment.IsDevelopment())
+				{
+					<text>console.log(message, params);</text>
+				}
+    };
 
+		(
+			function () {
 	        loadPreview();
 
 	        InitPreview();
@@ -83,33 +81,25 @@
 			}
 
 			document.getElementById(quickPreviewButton).onclick = loadPreview;
-
 		}
 
+		function loadPreview() {
 
-function loadPreview() {
-
-	const iframeWidth = document.getElementById("widgetPreview").clientWidth - 40;
-
-
-	var urlTemplate = "/followers/count?";
-	urlTemplate += `${ConfigurationModel.BackgroundColor}=${escape(document.getElementById(ConfigurationModel.BackgroundColor).value)}`;
-	urlTemplate += `&${ConfigurationModel.FontColor}=${escape(document.getElementById(ConfigurationModel.FontColor).value)}`;
-	//urlTemplate += `&fontName=${escape(fontName)}`;
-
-	document.getElementById("widgetPreview").src = urlTemplate + `&${ConfigurationModel.CurrentValue}=${document.getElementById(ConfigurationModel.CurrentValue).value}`
-	log(urlTemplate);
-
-	document.getElementById("outputUrl").textContent = urlTemplate;
-	document.getElementById("outputUrl").href = urlTemplate;
-	//saveValues();
-
-}
+			const iframeWidth = document.getElementById("widgetPreview").clientWidth - 40;
 
+			var urlTemplate = "/followers/count?";
+			urlTemplate += `${ConfigurationModel.BackgroundColor}=${escape(document.getElementById(ConfigurationModel.BackgroundColor).value)}`;
+			urlTemplate += `&${ConfigurationModel.FontColor}=${escape(document.getElementById(ConfigurationModel.FontColor).value)}`;
+			//urlTemplate += `&fontName=${escape(fontName)}`;
 
+			document.getElementById("widgetPreview").src = urlTemplate + `&${ConfigurationModel.CurrentValue}=${document.getElementById(ConfigurationModel.CurrentValue).value}`
+			log(urlTemplate);
 
+			document.getElementById("outputUrl").textContent = urlTemplate;
+			document.getElementById("outputUrl").href = urlTemplate;
+			//saveValues();
 
+		}
 
 </script>
-
 }