diff --git a/Portfolio.WebUI.Server/Components/Component/Crochet Components/TemperatureBlanketVisualizer.razor b/Portfolio.WebUI.Server/Components/Component/Crochet Components/TemperatureBlanketVisualizer.razor index 7ff48a2..d5125a5 100644 --- a/Portfolio.WebUI.Server/Components/Component/Crochet Components/TemperatureBlanketVisualizer.razor +++ b/Portfolio.WebUI.Server/Components/Component/Crochet Components/TemperatureBlanketVisualizer.razor @@ -8,10 +8,8 @@ } else { - -

Temperature Blanket Visualizer

- -
+
+

Temperature Blanket Visualizer

@@ -26,7 +24,7 @@
-
+
diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor index 70af53a..e610eab 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor @@ -22,11 +22,8 @@
-
-
- - -
+
+
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 029031a..1e15e88 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonCard.razor.css @@ -1,4 +1,11 @@ -.pokemon-card { +.card-wrapper { + display: flex; + flex-direction: column; + align-items: center; + width: 100%; +} + +.pokemon-card { position: relative; width: 100%; max-width: 350px; /* Prevent it from getting too huge */ @@ -20,14 +27,6 @@ transform: translateY(-13px); } -.card-wrapper { - display: flex; - flex-direction: column; - align-items: center; - width: 100%; -} - - .pokemon-name { position: absolute; top: 5%; @@ -53,14 +52,6 @@ height: clamp(1.5rem, 2.5vw, 2.5rem); } -.pokemon-image { - width: 100%; /* Look to flip-container for the width/height of image */ - height: 100%; - position: absolute; - top: 0; - left: 0; -} - .pokemon-flavor-text { position: absolute; top: 60% !important; @@ -95,45 +86,18 @@ hyphens: auto; } -.flip-container { - position: absolute !important; - top: 40% !important; - left: 50% !important; - transform: translate(-50%, -50%) !important; - perspective: 1000px; - display: inline-block; - width: 80%; - aspect-ratio: 1 / 1; - max-width: 280px; - margin: 0 auto; - cursor: pointer; -} - -.flipper { - transition: transform 0.6s; - transform-style: preserve-3d; - width: 100%; - height: 100%; - position: relative; -} - -.flipped { - transform: rotateY(180deg); -} - - -.front, .back { - width: 100%; - height: 100%; +/* Position the image area within the card */ +.card-image-slot { position: absolute; - top: 0; - left: 0; - backface-visibility: hidden; + top: 50%; + left: 50%; + transform: translate(-50%, -20%); + width: 100%; + aspect-ratio: 1 / 1; + max-width: 300px; } -.back { - transform: rotateY(180deg); -} + /* Type Card Styling */ diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor.cs b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor.cs index 5a3da64..5d91666 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor.cs +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonEditButton.razor.cs @@ -9,7 +9,7 @@ namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components private void EditPokemon(int PokemonId) { - Navigation.NavigateTo($"/pokemonsleep/edit/{PokemonId}"); + Navigation.NavigateTo($"/pokemonsleep/edit-pokemon/{PokemonId}"); } } } diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonForm.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonForm.razor index 688f09d..54d861e 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonForm.razor +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonForm.razor @@ -131,6 +131,15 @@ }
+ @if (mostRecentForm) {
-
-
diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonNavMenu.razor.cs b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonNavMenu.razor.cs new file mode 100644 index 0000000..e2c8dc0 --- /dev/null +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonNavMenu.razor.cs @@ -0,0 +1,6 @@ +namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components +{ + public partial class PokemonNavMenu + { + } +} diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonNavMenu.razor.css b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonNavMenu.razor.css new file mode 100644 index 0000000..46800d1 --- /dev/null +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonNavMenu.razor.css @@ -0,0 +1,2 @@ +body { +} diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor index 1eca116..590e05f 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor @@ -7,11 +7,11 @@ -
+
-
- -
+
+ +
@@ -21,14 +21,14 @@ @oninput="HandleSearch" /> -

+

Available Pokémon

-
-

@(pokemons.Count()) Pokémon

+
+

@(pokemons.Count()) Pokémon

@@ -36,7 +36,7 @@
- +
@@ -50,7 +50,7 @@ @if (adminToggle) { - + } @@ -66,38 +66,14 @@ { - @if (FilteredPokemon != null && FilteredPokemon.Any()) { - @foreach (var pokemon in FilteredPokemon) { - - - @{ - string baseUrl = pokemon.PokemonImageUrl; - string shinyUrl = pokemon.PokemonShinyImageUrl; - } - + + @@ -105,10 +81,7 @@ - - - - + + @if (adminToggle) { } - } } @@ -174,68 +151,68 @@ -
- -
-
-
-

Pokémon

-

@(pokemons.Count()) Pokémon

-
-
-
- -
-
SpecialityEditAdmin
- @if (shinyUrl == null) - { -
-
- -
-
- - } - else - { -
-
- - -
-
- - } +
+ @(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) @@ -132,17 +105,21 @@ -
+
- @**@ +
+ @*
+ +
+
+
+

Pokémon

+

@(pokemons.Count()) Pokémon

+
+
+
+ +
+
- - @if (pokemons == null) - { - - } - else - { + + @if (pokemons == null) + { + + } + else + { - @foreach (var pokemon in pokemons) - { - -
+ @foreach (var pokemon in pokemons) + { +
+
- -
-
-
- - @if (pokemon.PokemonShinyImageUrl != null) - { - - } -
-
-
+ +
+
+
+ + @if (pokemon.PokemonShinyImageUrl != null) + { + + } +
+
+
-
- -
- @pokemon.PokemonId - - - @(pokemon.IsVariation && ToggleVariationName(pokemon.Id, pokemon.PokemonId) ? $"{pokemon.VariationName} {pokemon.PokemonName}" : pokemon.PokemonName) - -
- -
- - - -
-
+
+ +
+ @pokemon.PokemonId - + + @(pokemon.IsVariation && ToggleVariationName(pokemon.Id, pokemon.PokemonId) ? $"{pokemon.VariationName} {pokemon.PokemonName}" : pokemon.PokemonName) + +
+ +
+ + + +
+
-
- - } - } - -
-
-
+
+ + } + } + + +
+
*@ diff --git a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.cs b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.cs index 1ccbbca..1fa3ca3 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.cs +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.cs @@ -11,9 +11,7 @@ namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components [Parameter] public List AllPokemon { get; set; } - private List pokemons = new List(); - private Dictionary isShiny = new Dictionary(); private bool adminToggle = false; @@ -23,10 +21,6 @@ namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components if (AllPokemon != null) { pokemons = AllPokemon.ToList(); - foreach (var pokemon in pokemons) - { - isShiny[pokemon.Id] = false; - } } } private string SearchTerm { get; set; } = string.Empty; @@ -41,13 +35,6 @@ namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components { SearchTerm = e?.Value?.ToString() ?? ""; } - private void ToggleImage(int Id) - { - if (isShiny.ContainsKey(Id)) - { - isShiny[Id] = !isShiny[Id]; - } - } private bool ToggleVariationName(int Id, int PokemonId) { @@ -96,6 +83,7 @@ namespace Portfolio.WebUI.Server.Components.Component.Pokemon_Components return $"https://www.serebii.net/pokemonsleep/pokemon/type/{pokemonType.ToLower()}.png"; } + private void HandleToggleChange(ChangeEventArgs e) { Console.WriteLine($"Admin Toggle is now: {adminToggle}"); 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 070dd03..3454cf6 100644 --- a/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.css +++ b/Portfolio.WebUI.Server/Components/Component/Pokemon Components/PokemonTable.razor.css @@ -1,12 +1,13 @@ .five-percent { width: 5%; } + .ten-percent { width: 10%; } .pokemontable { - height: 69vh; + height: 65vh; } .tableFixHead { @@ -25,7 +26,7 @@ } .pokemon-name-style { - cursor:pointer; + cursor: pointer; font-size: 1.3rem; } @@ -87,28 +88,6 @@ } -.pokeimage { - width: 100%; - height: 100%; - position: absolute; - top: 0; - left: 0; -} - -.front, .back { - width: 100%; - height: 100%; - position: absolute; - top: 0; - left: 0; - backface-visibility: hidden; -} - -.back { - transform: rotateY(180deg); -} - - .badge { width: 100px; @@ -129,5 +108,13 @@ cursor: default; } +.pokeimage { + width: 100px; + height: 130px; +} + + + + diff --git a/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor b/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor new file mode 100644 index 0000000..29c460b --- /dev/null +++ b/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor @@ -0,0 +1,35 @@ +
+
+
+
+
+ + + + Kira Jiroux +
+
+ +
+ + + + + Home + + + + + + Crochet + + + + + Pokémon Sleep + +
+
+
+
+
\ No newline at end of file diff --git a/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor.cs b/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor.cs new file mode 100644 index 0000000..5305713 --- /dev/null +++ b/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor.cs @@ -0,0 +1,7 @@ +namespace Portfolio.WebUI.Server.Components.Layout +{ + public partial class BaseNavMenu + { + private string _primaryColor = "#593196"; + } +} diff --git a/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor.css b/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor.css new file mode 100644 index 0000000..a7cb40d --- /dev/null +++ b/Portfolio.WebUI.Server/Components/Layout/BaseNavMenu.razor.css @@ -0,0 +1,13 @@ +body { +} + +::deep .nav-active { + font-weight: bold; + background-color: #f2eaff; + color: black; + padding-left: 15px; + padding-right: 15px; + padding-top: 5px; + padding-bottom: 5px; + border: 1px dashed #593196; +} diff --git a/Portfolio.WebUI.Server/Components/Layout/MadeWithLoveFooter.razor b/Portfolio.WebUI.Server/Components/Layout/MadeWithLoveFooter.razor index f63b35b..fe5cb89 100644 --- a/Portfolio.WebUI.Server/Components/Layout/MadeWithLoveFooter.razor +++ b/Portfolio.WebUI.Server/Components/Layout/MadeWithLoveFooter.razor @@ -1,11 +1,14 @@ -
-
-
-

- Made with Love - - - -

-
-
+ +
+
+
+ +

+ Made with Love + + + +

+
+
+ diff --git a/Portfolio.WebUI.Server/Components/Layout/MainLayout.razor b/Portfolio.WebUI.Server/Components/Layout/MainLayout.razor index 1a12d1b..b3d8236 100644 --- a/Portfolio.WebUI.Server/Components/Layout/MainLayout.razor +++ b/Portfolio.WebUI.Server/Components/Layout/MainLayout.razor @@ -1,11 +1,9 @@ @inherits LayoutComponentBase -
-
- -
- @Body -
+
+ +
+ @Body
- @* *@ +
diff --git a/Portfolio.WebUI.Server/Components/Layout/MainLayout.razor.css b/Portfolio.WebUI.Server/Components/Layout/MainLayout.razor.css index 038baf1..958e48c 100644 --- a/Portfolio.WebUI.Server/Components/Layout/MainLayout.razor.css +++ b/Portfolio.WebUI.Server/Components/Layout/MainLayout.razor.css @@ -1,8 +1,4 @@ -.page { - position: relative; - display: flex; - flex-direction: column; -} + main { flex: 1; @@ -12,6 +8,10 @@ main { background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); } +.container { + max-width: 1920px; +} + .top-row { background-color: #f7f7f7; border-bottom: 1px solid #d6d5d5; @@ -47,9 +47,6 @@ main { } @media (min-width: 641px) { - .page { - flex-direction: row; - } .sidebar { width: 250px; @@ -76,21 +73,3 @@ main { } } -#blazor-error-ui { - background: lightyellow; - bottom: 0; - box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); - display: none; - left: 0; - padding: 0.6rem 1.25rem 0.7rem 1.25rem; - position: fixed; - width: 100%; - z-index: 1000; -} - - #blazor-error-ui .dismiss { - cursor: pointer; - position: absolute; - right: 0.75rem; - top: 0.5rem; - } diff --git a/Portfolio.WebUI.Server/Components/Layout/NavMenu.razor b/Portfolio.WebUI.Server/Components/Layout/NavMenu.razor index 6539c19..aceb33d 100644 --- a/Portfolio.WebUI.Server/Components/Layout/NavMenu.razor +++ b/Portfolio.WebUI.Server/Components/Layout/NavMenu.razor @@ -1,35 +1,35 @@ -
-
- Portfolio.WebUI.Server +
+
+ + + + Kira Jiroux
-
+
    - - -
    - -
    - + + +
+
\ No newline at end of file diff --git a/Portfolio.WebUI.Server/Components/Layout/NavMenu.razor.css b/Portfolio.WebUI.Server/Components/Layout/NavMenu.razor.css deleted file mode 100644 index 4e15395..0000000 --- a/Portfolio.WebUI.Server/Components/Layout/NavMenu.razor.css +++ /dev/null @@ -1,105 +0,0 @@ -.navbar-toggler { - appearance: none; - cursor: pointer; - width: 3.5rem; - height: 2.5rem; - color: white; - position: absolute; - top: 0.5rem; - right: 1rem; - border: 1px solid rgba(255, 255, 255, 0.1); - background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1); -} - -.navbar-toggler:checked { - background-color: rgba(255, 255, 255, 0.5); -} - -.top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); -} - -.navbar-brand { - font-size: 1.1rem; -} - -.bi { - display: inline-block; - position: relative; - width: 1.25rem; - height: 1.25rem; - margin-right: 0.75rem; - top: -1px; - background-size: cover; -} - -.bi-house-door-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E"); -} - -.bi-plus-square-fill-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E"); -} - -.bi-list-nested-nav-menu { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E"); -} - -.nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; -} - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item ::deep .nav-link { - color: #d7d7d7; - background: none; - border: none; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - width: 100%; - } - -.nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; -} - -.nav-item ::deep .nav-link:hover { - background-color: rgba(255,255,255,0.1); - color: white; -} - -.nav-scrollable { - display: none; -} - -.navbar-toggler:checked ~ .nav-scrollable { - display: block; -} - -@media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .nav-scrollable { - /* Never collapse the sidebar for wide screens */ - display: block; - - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } -} diff --git a/Portfolio.WebUI.Server/Components/Layout/NavMenu2.razor b/Portfolio.WebUI.Server/Components/Layout/NavMenu2.razor deleted file mode 100644 index 8dc0b29..0000000 --- a/Portfolio.WebUI.Server/Components/Layout/NavMenu2.razor +++ /dev/null @@ -1,41 +0,0 @@ - \ No newline at end of file diff --git a/Portfolio.WebUI.Server/Components/Layout/NavMenu3.razor b/Portfolio.WebUI.Server/Components/Layout/NavMenu3.razor deleted file mode 100644 index aceb33d..0000000 --- a/Portfolio.WebUI.Server/Components/Layout/NavMenu3.razor +++ /dev/null @@ -1,35 +0,0 @@ -
-
- - - - Kira Jiroux -
-
    - -
  • - - - - - Home - -
    • -
  • - - - - - Crochet - -
    • -
  • - - - - Pokémon Sleep - -
    • - -
-
\ No newline at end of file diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonAdmin.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonAdmin.razor index 077cba4..d14d513 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonAdmin.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonAdmin.razor @@ -5,7 +5,7 @@
- +
diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor index 375af21..3421dbf 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor @@ -10,7 +10,7 @@ Add New Pokémon - + @if (isSubmitting) @@ -19,9 +19,9 @@ } else { -
-
-
+
+
+
@@ -41,6 +41,7 @@ else
} + else if (pokemon2FormView && !pokemon3FormView) {
@@ -56,6 +57,7 @@ else
} + else if (!pokemon2FormView && pokemon3FormView) {
@@ -76,11 +78,12 @@ else
} -
+
-
+ +
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 554cd80..0003e99 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonCreate.razor.cs @@ -26,7 +26,7 @@ namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages } - private Pokemon pokemon1, pokemon2, pokemon3 = new Pokemon + private Pokemon pokemon1 = new Pokemon { PokemonId = 0, // Or any default ID logic PokemonName = string.Empty, // Required fields cannot be null @@ -34,6 +34,23 @@ namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages Speciality = string.Empty, IsVariation = false }; + private Pokemon pokemon2 = new Pokemon + { + PokemonId = 0, // Or any default ID logic + PokemonName = string.Empty, // Required fields cannot be null + SleepType = string.Empty, + Speciality = string.Empty, + IsVariation = false + }; + private Pokemon pokemon3 = new Pokemon + { + PokemonId = 0, // Or any default ID logic + PokemonName = string.Empty, // Required fields cannot be null + SleepType = string.Empty, + Speciality = string.Empty, + IsVariation = false + }; + private bool isSubmitting = false; private bool ToggleVariationName { get; set; } @@ -42,68 +59,7 @@ namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages { this.ToggleVariationName = true; } - private bool IsComplete(Pokemon NewPokemon) => - NewPokemon.PokemonId > 0 && - !string.IsNullOrWhiteSpace(NewPokemon.PokemonName) && - !string.IsNullOrWhiteSpace(NewPokemon.PokemonType) && - !string.IsNullOrWhiteSpace(NewPokemon.SleepType) && - !string.IsNullOrWhiteSpace(NewPokemon.Speciality) && - (!NewPokemon.IsVariation || !string.IsNullOrWhiteSpace(NewPokemon.VariationName)); - private async Task HandleAdd() - { - /* - Okay there are three versions of submits which need to be checked - 1. Single submit, only one, if both pokemon#FormView is false - 2. 2 Submit, if pokemon2FormView is true - 3. 3 Submit, if pokemon3FormView is true - */ - if (!pokemon2FormView && !pokemon3FormView) - { - //if(IsComplete(pokemon1)) - //{ - await HandleSubmit(pokemon1); - Navigation.NavigateTo("/pokemon"); - //} - } - else if (pokemon2FormView) - { - //if (IsComplete(pokemon1) && IsComplete(pokemon2)) - //{ - await HandleSubmit(pokemon1); - await HandleSubmit(pokemon2); - Navigation.NavigateTo("/pokemon"); - - // } - } - else if (pokemon3FormView) - { - //if (IsComplete(pokemon1) && IsComplete(pokemon2) && IsComplete(pokemon3)) - //{ - await HandleSubmit(pokemon1); - await HandleSubmit(pokemon2); - await HandleSubmit(pokemon3); - Navigation.NavigateTo("/pokemon"); - - //} - } - - } - - private async Task HandleSubmit(Pokemon NewPokemon) - { - isSubmitting = true; - - await PokemonService.AddPokemonAsync(NewPokemon); - isSubmitting = false; - - } - - protected void Cancel(MouseEventArgs e) - { - Console.WriteLine("Testing in Cancel"); - Navigation.NavigateTo("/pokemon"); - } private async Task ReceivePokemon1(Pokemon p) { @@ -140,6 +96,67 @@ namespace Portfolio.WebUI.Server.Components.Pages.Pokemon_Pages // Browser console await JS.InvokeVoidAsync("console.log", "Pokemon 3:", pokemon3); } + private bool IsComplete(Pokemon NewPokemon) => + NewPokemon.PokemonId > 0 && + !string.IsNullOrWhiteSpace(NewPokemon.PokemonName) && + !string.IsNullOrWhiteSpace(NewPokemon.PokemonType) && + !string.IsNullOrWhiteSpace(NewPokemon.SleepType) && + !string.IsNullOrWhiteSpace(NewPokemon.Speciality) && + (!NewPokemon.IsVariation || !string.IsNullOrWhiteSpace(NewPokemon.VariationName)); + private async Task HandleAdd() + { + /* + Okay there are three versions of submits which need to be checked + 1. Single submit, only one, if both pokemon#FormView is false + 2. 2 Submit, if pokemon2FormView is true + 3. 3 Submit, if pokemon3FormView is true + */ + if (!pokemon2FormView && !pokemon3FormView) + { + //if(IsComplete(pokemon1)) + //{ + await HandleSubmit(pokemon1); + Navigation.NavigateTo("/pokemon"); + //} + } + else if (pokemon2FormView) + { + //if (IsComplete(pokemon1) && IsComplete(pokemon2)) + //{ + await HandleSubmit(pokemon1); + await HandleSubmit(pokemon2); + Navigation.NavigateTo("/pokemon"); + + // } + } + else if (pokemon3FormView) + { + //if (IsComplete(pokemon1) && IsComplete(pokemon2) && IsComplete(pokemon3)) + //{ + await HandleSubmit(pokemon1); + await HandleSubmit(pokemon2); + await HandleSubmit(pokemon3); + Navigation.NavigateTo("/pokemon"); + + //} + } + + } + + private async Task HandleSubmit(Pokemon NewPokemon) + { + isSubmitting = true; + + await PokemonService.AddPokemonAsync(NewPokemon); + isSubmitting = false; + + } + + protected void Cancel(MouseEventArgs e) + { + Console.WriteLine("Testing in Cancel"); + 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 c04951e..b6773ff 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonEdit.razor @@ -1,4 +1,4 @@ -@page "/pokemonsleep/edit/{id:int}" +@page "/pokemonsleep/edit-pokemon/{id:int}" @inject IPokemonService PokemonService @inject NavigationManager Navigation @inject IJSRuntime JS @@ -7,7 +7,7 @@ @rendermode InteractiveServer Edit Pokémon - + @if (pokemon == null) diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonIndividualView.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonIndividualView.razor index d38ad02..0377c82 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonIndividualView.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonIndividualView.razor @@ -6,7 +6,7 @@ @rendermode InteractiveServer - + diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor index 58c7385..651cc02 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonRate.razor @@ -1,4 +1,4 @@ -@page "/rate-pokemon" +@page "/pokemonsleep/rate-pokemon" @inject IPokemonService PokemonService @inject IPokemonNatureService PokemonNatureService @@ -12,9 +12,9 @@ Rate Pokémon - + -
+
@if (PokemonList == null || NatureList == null || SubskillList == null) { @@ -60,5 +60,4 @@ }
-
diff --git a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor index 63e0916..56425ba 100644 --- a/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor +++ b/Portfolio.WebUI.Server/Components/Pages/Pokemon Pages/PokemonSleep.razor @@ -8,16 +8,16 @@ Pokémon Sleep - + -
+
- +
@@ -44,7 +44,7 @@