Merge pull request #40 from Ian-Inizias/master

NavMenu.razor reforged
Ian-Liceranzu · Jul 27, 2023 · 222b634 · 222b634
2 parents 9d22cf6 + 20ae65f
commit 222b634
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 64 deletions.
diff --git a/BasketLeague2.App/Pages/Leaderboards/LeaderboardList.razor b/BasketLeague2.App/Pages/Leaderboards/LeaderboardList.razor
diff --git a/BasketLeague2.App/Pages/Results/ResultList.razor b/BasketLeague2.App/Pages/Results/ResultList.razor
diff --git a/BasketLeague2.App/Pages/Results/Results.razor b/BasketLeague2.App/Pages/Results/Results.razor
@@ -158,23 +158,32 @@
     private DataGrid<AdvancedResult> _dataGrid = new();
     private string _customFilterValue;
 
+    protected override async Task OnParametersSetAsync()
+    {
+        await OnInitializedAsync();
+    }
+
     protected override async Task OnInitializedAsync()
     {
         await GetTeams();
 
         await GetResults();
 
         await GetPlayers();
+
+        StateHasChanged();
     }
 
     private async Task GetTeams()
     {
+        _teams = new Team[] { };
         var t = await Http.GetFromJsonAsync<IEnumerable<Team>>("data/teams.json");
         _teams = _teams.Concat(t.OrderBy(t => t.NombreCompleto));
     }
 
     private async Task GetResults()
     {
+        _resultados = new AdvancedResult[] { };
         var r = await Http.GetFromJsonAsync<IEnumerable<AdvancedResult>>($"data/results/R_{Season}.json");
 
         foreach (var result in r)
@@ -188,6 +197,7 @@
 
     private async Task GetPlayers()
     {
+        _players = new Player[] { };
         var p = await Http.GetFromJsonAsync<IEnumerable<Player>>("data/players.json");
         _players = _players.Concat(p.OrderBy(p => p.Codigo));
     }

diff --git a/BasketLeague2.App/Pages/Timetables/TimetableList.razor b/BasketLeague2.App/Pages/Timetables/TimetableList.razor
diff --git a/BasketLeague2.App/Shared/NavMenu.razor b/BasketLeague2.App/Shared/NavMenu.razor
@@ -15,14 +15,27 @@
             </NavLink>
         </div>
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="LeaderboardList">
+            <NavLink class="nav-link" @onclick="() => expandSubNavLeaderboard = !expandSubNavLeaderboard">
                 <span class="oi oi-clipboard" aria-hidden="true"></span> Leaderboard
             </NavLink>
+            @if (expandSubNavLeaderboard)
+            {
+                <NavLink class="nav-link" href="Leaderboard/S2">
+                    Temporada 2 (2022-2023)
+                </NavLink>
+            }
         </div>
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="TimetableList">
+            <NavLink class="nav-link" @onclick="() => expandSubNavTimetables = !expandSubNavTimetables">
                 <span class="oi oi-clock" aria-hidden="true"></span> Timetables
             </NavLink>
+            @if (expandSubNavTimetables)
+            {
+                <NavLink class="nav-link" href="timetable/S2">
+                    Temporada 2 (2022-2023)
+                </NavLink>
+            }
+
         </div>
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="teams">
@@ -40,15 +53,30 @@
             </NavLink>
         </div>
         <div class="nav-item px-3">
-            <NavLink class="nav-link" href="ResultList">
+            <NavLink class="nav-link" @onclick="() => expandSubNavResults = !expandSubNavResults">
                 <span class="oi oi-file" aria-hidden="true"></span> Results
             </NavLink>
+            @if (expandSubNavResults)
+            {
+                <NavLink class="nav-link" href="results/S2">
+                    Temporada 2 (2022-2023)
+                </NavLink>
+                <NavLink class="nav-link" href="results/S2-PO">
+                    Temporada 2 (Playoffs)
+                </NavLink>
+                <NavLink class="nav-link" href="results/S3">
+                    Temporada 3 (PRUEBAS)
+                </NavLink>
+            }
         </div>
     </nav>
 </div>
 
 @code {
     private bool collapseNavMenu = true;
+    private bool expandSubNavResults;
+    private bool expandSubNavLeaderboard;
+    private bool expandSubNavTimetables;
 
     private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;