From 1955a210aadee6ead5e6522452e05f8c9c657c51 Mon Sep 17 00:00:00 2001 From: Kira Jiroux Date: Mon, 9 Jun 2025 16:55:52 -0400 Subject: [PATCH] PokemonCard component visible in PokemonView now. Also added the search feature in PokemonSelector into the PokemonTable. Made other changes too but minor. --- Portfolio.WebUI.Server/Components/App.razor | 2 +- .../Pokemon Components/PokemonCard.razor | 11 ++- .../Pokemon Components/PokemonCard.razor.css | 3 +- .../Pokemon Components/PokemonHeader.razor | 8 +-- .../Pokemon Components/PokemonTable.razor | 6 +- .../Pokemon Components/PokemonTable.razor.cs | 11 +++ .../Pokemon Components/PokemonTable.razor.css | 4 ++ .../Pages/Pokemon Pages/PokemonCreate.razor | 7 ++ .../Pokemon Pages/PokemonCreate.razor.cs | 4 +- .../Pages/Pokemon Pages/PokemonEdit.razor | 3 + .../Pages/Pokemon Pages/PokemonRate.razor | 61 ++++++++-------- .../Pages/Pokemon Pages/PokemonSleep.razor | 4 ++ .../Pokemon Pages/PokemonSleepHome.razor | 10 +-- .../Pages/Pokemon Pages/PokemonView.razor | 70 +++++++++++-------- .../Pages/Pokemon Pages/PokemonView.razor.css | 4 +- 15 files changed, 129 insertions(+), 79 deletions(-) diff --git a/Portfolio.WebUI.Server/Components/App.razor b/Portfolio.WebUI.Server/Components/App.razor index 581ac1a..5a1a845 100644 --- a/Portfolio.WebUI.Server/Components/App.razor +++ b/Portfolio.WebUI.Server/Components/App.razor @@ -13,7 +13,7 @@ - + diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor index 79d4973..9eeadfc 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor @@ -32,12 +32,12 @@
@if (string.IsNullOrEmpty(_pokemon.FlavorText)) { -

[ Pokemon Flavor Text Placeholder ]

+

[ Pokemon Flavor Text Placeholder ]

} else { -

@_pokemon.FlavorText

+

@_pokemon.FlavorText

}
@@ -51,3 +51,10 @@ + +
+
+ + +
+
\ No newline at end of file diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css index df10e67..b29a012 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css @@ -71,7 +71,6 @@ justify-content: center; /* Horizontally centers text */ overflow: hidden; /* Ensures no scrollbar */ - border-width: 2px; border-radius: 5% / 13%; border-style: solid; @@ -83,7 +82,7 @@ margin: 0; width: 100%; text-align: start; - font-size: min(13px, 1.5vw); /* Scales font but won't exceed 13px */ + font-size: min(12.5px, 1.5vw); /* Scales font but won't exceed 12.5px */ line-height: 1.2; /* Adjust spacing for readability */ white-space: normal; /* Ensures wrapping */ word-wrap: break-word; diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor index 02cbc43..efc9290 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonHeader.razor @@ -13,7 +13,7 @@ diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs index 483f8e2..8299970 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs @@ -32,13 +32,13 @@ namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages isSubmitting = true; await PokemonService.AddPokemonAsync(NewPokemon); isSubmitting = false; - Navigation.NavigateTo("/pokemonsleep"); + Navigation.NavigateTo("/pokemon"); } protected void Cancel(MouseEventArgs e) { Console.WriteLine("Testing in Cancel"); - Navigation.NavigateTo("/pokemonsleep"); + Navigation.NavigateTo("/pokemon"); } } diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor index 4f86454..949ea4a 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor @@ -8,6 +8,9 @@ Edit Pokémon + + + @if (pokemon == null) { diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor index 77dd376..3ba4b1a 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor @@ -8,28 +8,33 @@ @attribute [StreamRendering] @rendermode InteractiveServer + + + + Rate Pokémon -@if (PokemonList == null || NatureList == null || SubskillList == null) -{ - -} -else -{ -
-
+
+
+ @if (PokemonList != null || NatureList == null || SubskillList == null) + { +
+ +
+ } + else + { + +
+ +
- -
- -
- - +
@@ -46,15 +51,15 @@ else
- -
- -
- + +
+
-
-} \ No newline at end of file + + } +
+
diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor index 1d60858..7ece9f0 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor @@ -9,6 +9,10 @@ Pokémon Sleep + + + +
diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleepHome.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleepHome.razor index 57bb295..53cf2b2 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleepHome.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleepHome.razor @@ -7,15 +7,7 @@ Pokémon Sleep -@* - - - *@ - -@* - - - *@ +
diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor index eada6f6..1cd7e72 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor @@ -8,6 +8,10 @@ + + + + @if (_pokemon == null) { @@ -17,14 +21,20 @@ else @_pokemon.PokemonName -
-
- -
+
+
+ + +
+ +
+ + +
@if (_variationPokemonId != null) { @if (_variationPokemonId != null && _pokemonVariant == null){ @@ -32,50 +42,54 @@ else } else { + @if(_pokemon.Id != _pokemonVariant.Id) { -
-
- -
- +
+
+
-
-
- -
- + +
+
-
+
} + else { -
- -
- +
+
+
+
} } } else{ -
- -
- + +
+
+
+
}
+ + +
+ +
+
} diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.css b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.css index 46800d1..cebd416 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.css +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonView.razor.css @@ -1,2 +1,4 @@ -body { +.pokemoncard { + width: 100%; + max-width: 350px; }