UI refactor (structure cleanup)

DiunaBI.UI.Shared/Pages/DataInbox/Details.razor

@@ -2,8 +2,6 @@
 @using DiunaBI.UI.Shared.Services
 @using DiunaBI.Application.DTOModels
 @using MudBlazor
-@inject DataInboxService DataInboxService
-@inject NavigationManager NavigationManager
 
 <MudCard>
     <MudCardHeader>

DiunaBI.UI.Shared/Pages/DataInbox/Details.razor.cs

@@ -1,15 +1,22 @@
 using DiunaBI.Application.DTOModels;
+using DiunaBI.UI.Shared.Services;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
 using System.Text;
 
-namespace DiunaBI.UI.Shared.Pages;
+namespace DiunaBI.UI.Shared.Pages.DataInbox;
 
-public partial class DataInboxDetailPage : ComponentBase
+public partial class Details : ComponentBase
 {
     [Parameter]
     public Guid Id { get; set; }
 
+    [Inject]
+    private DataInboxService DataInboxService { get; set; } = null!;
+
+    [Inject]
+    private NavigationManager NavigationManager { get; set; } = null!;
+
     [Inject]
     private ISnackbar Snackbar { get; set; } = null!;
 

DiunaBI.UI.Shared/Pages/DataInbox/Index.razor

@@ -1,4 +1,10 @@
+@page "/datainbox"
 @using MudBlazor.Internal
+@using DiunaBI.Application.DTOModels
+
+<PageTitle>Data Inbox</PageTitle>
+
+<MudContainer MaxWidth="MaxWidth.ExtraExtraLarge">
     <MudExpansionPanels Class="mb-4">
         <MudExpansionPanel Icon="@Icons.Material.Filled.FilterList"
                            Text="Filters"
@@ -76,3 +82,4 @@
             </MudItem>
         </MudGrid>
     }
+</MudContainer>

DiunaBI.UI.Shared/Pages/DataInbox/Index.razor.cs

@@ -6,9 +6,9 @@ using DiunaBI.Application.DTOModels.Common;
 using MudBlazor;
 using Microsoft.JSInterop;
 
-namespace DiunaBI.UI.Shared.Components;
+namespace DiunaBI.UI.Shared.Pages.DataInbox;
 
-public partial class DataInboxListComponent : ComponentBase
+public partial class Index : ComponentBase
 {
     [Inject] private DataInboxService DataInboxService { get; set; } = default!;
     [Inject] private ISnackbar Snackbar { get; set; } = default!;

DiunaBI.UI.Shared/Pages/DataInboxListPage.razor

@@ -1,8 +0,0 @@
-@page "/datainbox"
-@using DiunaBI.UI.Shared.Components
-
-<PageTitle>Data Inbox</PageTitle>
-
-<MudContainer MaxWidth="MaxWidth.ExtraExtraLarge">
-    <DataInboxListComponent />
-</MudContainer>

DiunaBI.UI.Shared/Pages/JobListPage.razor

@@ -1,8 +0,0 @@
-@page "/jobs"
-@using DiunaBI.UI.Shared.Components
-
-<PageTitle>Jobs</PageTitle>
-
-<MudContainer MaxWidth="MaxWidth.ExtraExtraLarge">
-    <JobListComponent />
-</MudContainer>

DiunaBI.UI.Shared/Pages/Jobs/Index.razor

@@ -1,5 +1,11 @@
+@page "/jobs"
 @using MudBlazor.Internal
 @using DiunaBI.Domain.Entities
+@implements IDisposable
+
+<PageTitle>Jobs</PageTitle>
+
+<MudContainer MaxWidth="MaxWidth.ExtraExtraLarge">
     <MudExpansionPanels Class="mb-4">
         <MudExpansionPanel Icon="@Icons.Material.Filled.FilterList"
                            Text="Filters"
@@ -139,3 +145,4 @@
             </MudItem>
         </MudGrid>
     }
+</MudContainer>

DiunaBI.UI.Shared/Pages/Jobs/Index.razor.cs

@@ -6,9 +6,9 @@ using DiunaBI.Domain.Entities;
 using MudBlazor;
 using Microsoft.JSInterop;
 
-namespace DiunaBI.UI.Shared.Components;
+namespace DiunaBI.UI.Shared.Pages.Jobs;
 
-public partial class JobListComponent : ComponentBase, IDisposable
+public partial class Index : ComponentBase, IDisposable
 {
     [Inject] private JobService JobService { get; set; } = default!;
     [Inject] private EntityChangeHubService HubService { get; set; } = default!;

DiunaBI.UI.Shared/Pages/LayerListPage.razor

@@ -1,8 +0,0 @@
-@page "/layers"
-@using DiunaBI.UI.Shared.Components
-
-<PageTitle>Layers</PageTitle>
-
-<MudContainer MaxWidth="MaxWidth.ExtraExtraLarge">
-    <LayerListComponent />
-</MudContainer>

DiunaBI.UI.Shared/Pages/Layers/Details.razor

@@ -2,10 +2,6 @@
 @using DiunaBI.UI.Shared.Services
 @using DiunaBI.Application.DTOModels
 @using MudBlazor
-@inject LayerService LayerService
-@inject JobService JobService
-@inject NavigationManager NavigationManager
-@inject ISnackbar Snackbar
 
 <MudCard>
     <MudCardHeader>

DiunaBI.UI.Shared/Pages/Layers/Details.razor.cs

@@ -1,11 +1,12 @@
 using DiunaBI.Application.DTOModels;
+using DiunaBI.UI.Shared.Services;
 using Microsoft.AspNetCore.Components;
 using MudBlazor;
 using System.Reflection;
 
-namespace DiunaBI.UI.Shared.Pages;
+namespace DiunaBI.UI.Shared.Pages.Layers;
 
-public partial class LayerDetailPage : ComponentBase
+public partial class Details : ComponentBase
 {
     [Parameter]
     public Guid Id { get; set; }
@@ -13,6 +14,18 @@ public partial class LayerDetailPage : ComponentBase
     [Inject]
     private IDialogService DialogService { get; set; } = null!;
 
+    [Inject]
+    private LayerService LayerService { get; set; } = null!;
+
+    [Inject]
+    private JobService JobService { get; set; } = null!;
+
+    [Inject]
+    private NavigationManager NavigationManager { get; set; } = null!;
+
+    [Inject]
+    private ISnackbar Snackbar { get; set; } = null!;
+
     private LayerDto? layer;
     private List<RecordDto> records = new();
     private List<string> displayedColumns = new();

DiunaBI.UI.Shared/Pages/Layers/Index.razor

@@ -1,5 +1,10 @@
+@page "/layers"
 @using MudBlazor.Internal
 @using DiunaBI.Application.DTOModels
+
+<PageTitle>Layers</PageTitle>
+
+<MudContainer MaxWidth="MaxWidth.ExtraExtraLarge">
     <MudExpansionPanels Class="mb-4">
         <MudExpansionPanel Icon="@Icons.Material.Filled.FilterList"
                            Text="Filters"
@@ -42,7 +47,7 @@
     </MudExpansionPanels>
 
     <MudDivider Class="my-4"></MudDivider>
-    
+
     <MudTable Items="layers.Items"
               Dense="true"
               Hover="true"
@@ -86,4 +91,5 @@
                                />
             </MudItem>
         </MudGrid>
-    }
+    }
+</MudContainer>

DiunaBI.UI.Shared/Pages/Layers/Index.razor.cs

@@ -6,9 +6,9 @@ using DiunaBI.Application.DTOModels.Common;
 using MudBlazor;
 using Microsoft.JSInterop;
 
-namespace DiunaBI.UI.Shared.Components;
+namespace DiunaBI.UI.Shared.Pages.Layers;
 
-public partial class LayerListComponent : ComponentBase
+public partial class Index : ComponentBase
 {
     [Inject] private LayerService LayerService { get; set; } = default!;
     [Inject] private ISnackbar Snackbar { get; set; } = default!;
@@ -51,7 +51,7 @@ public partial class LayerListComponent : ComponentBase
         filterRequest.Page = 1;
         await LoadLayers();
     }
-    
+
     private async Task OnPageChanged(int page)
     {
         filterRequest.Page = page;
@@ -89,4 +89,4 @@ public partial class LayerListComponent : ComponentBase
         var url = NavigationManager.ToAbsoluteUri($"/layers/{layer.Id}").ToString();
         await JSRuntime.InvokeVoidAsync("open", url, "_blank");
     }
-}
+}

DiunaBI.UI.Shared/_Imports.razor

@@ -8,5 +8,7 @@
 @using Microsoft.JSInterop
 @using DiunaBI.UI.Shared
 @using DiunaBI.UI.Shared.Components
+@using DiunaBI.UI.Shared.Components.Layout
+@using DiunaBI.UI.Shared.Components.Auth
 @using DiunaBI.Application.DTOModels
 @using MudBlazor