From ef3e43234715e0b141a61f9f71ed6d8e14879e17 Mon Sep 17 00:00:00 2001 From: Kira Jiroux Date: Mon, 9 Jun 2025 22:43:33 -0400 Subject: [PATCH] Shouldn't have been on master, but everything is still working good. --- .../TemperatureBlanketVisualizer.razor.cs | 2 +- .../Pokemon Components/PokemonTable.razor | 116 ++++++++++-------- .../Pokemon Components/PokemonTable.razor.css | 8 +- .../Pages/Crochet Pages/CrochetHome.razor.cs | 51 +++++++- 4 files changed, 119 insertions(+), 58 deletions(-) diff --git a/Portfolio.WebUI.Server/Components/Component/Crochet Components/TemperatureBlanketVisualizer.razor.cs b/Portfolio.WebUI.Server/Components/Component/Crochet Components/TemperatureBlanketVisualizer.razor.cs index ef8bdeb..1a16be2 100644 --- a/Portfolio.WebUI.Server/Components/Component/Crochet Components/TemperatureBlanketVisualizer.razor.cs +++ b/Portfolio.WebUI.Server/Components/Component/Crochet Components/TemperatureBlanketVisualizer.razor.cs @@ -20,7 +20,7 @@ namespace Portfolio.WebUI.Server.Components.Component.Crochet_Components new() { Min = 35, Max = 42, Color = "#add8e6" }, new() { Min = 42, Max = 49, Color = "#00008b" }, new() { Min = 49, Max = 56, Color = "#006400" }, - new() { Min = 56, Max = 63, Color = "#90ee90" }, + new() { Min = 56, Max = 63, Color = "#07ed07" }, new() { Min = 63, Max = 70, Color = "#ffff00" }, new() { Min = 70, Max = 77, Color = "#ffa500" }, new() { Min = 77, Max = 84, Color = "#ff0000" }, diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor index 9b5b7c6..115a8ea 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor @@ -22,7 +22,7 @@ -
+
@@ -46,70 +46,84 @@ else { - + - @foreach (var pokemon in FilteredPokemon) + @if (FilteredPokemon != null && FilteredPokemon.Any()) { - - - @{ - string baseUrl = pokemon.PokemonImageUrl; - string shinyUrl = pokemon.PokemonShinyImageUrl; - } - + + @{ + string baseUrl = pokemon.PokemonImageUrl; + string shinyUrl = pokemon.PokemonShinyImageUrl; } - else - { -
-
- - +
+ } + else + { +
+
+ + +
+
- - + } + + + + - + - + - - + + + + + + + + + } + } + else + { + + - - - - - - - } diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.css b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.css index c6b2820..070dd03 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.css +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.css @@ -20,6 +20,10 @@ z-index: 10; } +.align-top-tbody { + vertical-align: top; +} + .pokemon-name-style { cursor:pointer; font-size: 1.3rem; @@ -78,7 +82,9 @@ transform: rotateY(180deg); } - +.fixed-row-height { + height: 90px; /* or any height that suits your card style */ +} .pokeimage { diff --git a/Portfolio.WebUI.Server/Components/Pages/Crochet Pages/CrochetHome.razor.cs b/Portfolio.WebUI.Server/Components/Pages/Crochet Pages/CrochetHome.razor.cs index 57a29a2..5958f01 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Crochet Pages/CrochetHome.razor.cs +++ b/Portfolio.WebUI.Server/Components/Pages/Crochet Pages/CrochetHome.razor.cs @@ -9,20 +9,61 @@ namespace Portfolio.WebUI.Server.Components.Pages.Crochet_Pages public partial class CrochetHome { public List temperatureDays { get; set; } + public int YEAR = 2025; protected override async Task OnInitializedAsync() { // Placeholder for loading temperature data // Replace with actual API call - temperatureDays = Enumerable.Range(0, 365).Select(i => new TemperatureDay - { - Date = new DateTime(DateTime.Now.Year - 1, 1, 1).AddDays(i), - AvgTemp = Random.Shared.Next(10, 95) - }).ToList(); + //temperatureDays = Enumerable.Range(0, 365).Select(i => new TemperatureDay + //{ + // Date = new DateTime(DateTime.Now.Year - 1, 1, 1).AddDays(i), + // AvgTemp = Random.Shared.Next(10, 95) + //}).ToList(); + + temperatureDays = GenerateRealisticTemperatureDays(YEAR); } + public static List GenerateRealisticTemperatureDays(int year) + { + var temperatureDays = new List(); + var startDate = new DateTime(year, 1, 1); + int daysInYear = DateTime.IsLeapYear(year) ? 366 : 365; + + // Adjusted parameters for desired range + double minAvgTemp = 20.0; + double maxAvgTemp = 84.0; + double amplitude = (maxAvgTemp - minAvgTemp) / 2.0; // 32.5 + double avgAnnualTemp = (maxAvgTemp + minAvgTemp) / 2.0; // 52.5 + double noiseMax = 4.0; // Small daily variation + + for (int i = 0; i < daysInYear; i++) + { + var date = startDate.AddDays(i); + double dayOfYearRatio = (2 * Math.PI * i) / daysInYear; + + // Peak is mid-summer, trough is mid-winter + double seasonalTemp = avgAnnualTemp + amplitude * Math.Sin(dayOfYearRatio - Math.PI / 2); + + // Add gentle noise + double dailyNoise = Random.Shared.NextDouble() * noiseMax * 2 - noiseMax; + + // Final temperature, clamped to min/max + double finalTemp = Math.Round(seasonalTemp + dailyNoise, 1); + finalTemp = Math.Clamp(finalTemp, minAvgTemp, maxAvgTemp); + + temperatureDays.Add(new TemperatureDay + { + Date = date, + AvgTemp = finalTemp + }); + } + + return temperatureDays; + } + } }
- @if (shinyUrl == null) - { -
-
- -
-
- + + @foreach (var pokemon in FilteredPokemon) + { +
+ @if (shinyUrl == null) + { +
+
+ +
- - } - 		@pokemon.PokemonId@pokemon.PokemonId@(pokemon.IsVariation && ToggleVariationName(pokemon.Id, pokemon.PokemonId) ? $"{pokemon.VariationName} {pokemon.PokemonName}" : pokemon.PokemonName)@(pokemon.IsVariation && ToggleVariationName(pokemon.Id, pokemon.PokemonId) ? $"{pokemon.VariationName} {pokemon.PokemonName}" : pokemon.PokemonName) -
- + +
+
+ +
+ 		+
+ +
+ 		+
+ + +
+
+
+

Pokémon could not be found.

 -
- -
- 		-
- - -
-