diff --git a/Groceries/Common/_LayoutSidebar.cshtml b/Groceries/Common/_LayoutSidebar.cshtml
index 7a88e55..09a3ab2 100644
--- a/Groceries/Common/_LayoutSidebar.cshtml
+++ b/Groceries/Common/_LayoutSidebar.cshtml
@@ -11,30 +11,40 @@
diff --git a/Groceries/Components/Layout.razor b/Groceries/Components/Layout.razor
new file mode 100644
index 0000000..f250da7
--- /dev/null
+++ b/Groceries/Components/Layout.razor
@@ -0,0 +1,30 @@
+@inherits LayoutComponentBase
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @**@
+ @Body
+ @**@
+
+
+
+
+
diff --git a/Groceries/Components/SearchForm.razor b/Groceries/Components/SearchForm.razor
new file mode 100644
index 0000000..8381cd5
--- /dev/null
+++ b/Groceries/Components/SearchForm.razor
@@ -0,0 +1,24 @@
+
+
+@code {
+ [SupplyParameterFromQuery]
+ public string? Search { get; set; }
+
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ [Parameter(CaptureUnmatchedValues = true)]
+ public Dictionary? AdditionalAttributes { get; set; }
+}
diff --git a/Groceries/Components/Sidebar.razor b/Groceries/Components/Sidebar.razor
new file mode 100644
index 0000000..287778b
--- /dev/null
+++ b/Groceries/Components/Sidebar.razor
@@ -0,0 +1,59 @@
+
+
+
+
diff --git a/Groceries/Components/TablePaginator.razor b/Groceries/Components/TablePaginator.razor
new file mode 100644
index 0000000..1f76c48
--- /dev/null
+++ b/Groceries/Components/TablePaginator.razor
@@ -0,0 +1,34 @@
+@inject NavigationManager Navigation
+
+
+
+ Showing @FirstItem to @LastItem of @Model.Total results
+
+
+
-
-
-
-
-
-
-
-
-
- @foreach (var store in Model.Stores)
- {
-
- | @store.Retailer |
- @store.Name |
- @store.TotalTransactions |
-
- Edit
- |
-
- }
-
-
-
-
-
diff --git a/Groceries/Stores/StoreListModel.cs b/Groceries/Stores/StoreListModel.cs
deleted file mode 100644
index c78e60d..0000000
--- a/Groceries/Stores/StoreListModel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Groceries.Stores;
-
-public record StoreListModel(string? Search, ListPageModel Stores)
-{
- public record Store(Guid Id, string Retailer, string Name)
- {
- public int TotalTransactions { get; init; }
- }
-}
diff --git a/Groceries/Stores/StoresController.cs b/Groceries/Stores/StoresController.cs
index 455ae2c..8be27b9 100644
--- a/Groceries/Stores/StoresController.cs
+++ b/Groceries/Stores/StoresController.cs
@@ -2,6 +2,7 @@ namespace Groceries.Stores;
using Groceries.Common;
using Groceries.Data;
+using Microsoft.AspNetCore.Http.HttpResults;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
@@ -16,31 +17,9 @@ public class StoresController : Controller
}
[HttpGet]
- public async Task Index(int page, string? search)
+ public IResult Index()
{
- var storesQuery = dbContext.Stores.AsQueryable();
- if (!string.IsNullOrEmpty(search))
- {
- var searchPattern = $"%{search}%";
- storesQuery = storesQuery.Where(store => EF.Functions.ILike(store.Retailer!.Name + ' ' + store.Name, searchPattern));
- }
-
- var stores = await storesQuery
- .OrderBy(store => store.Retailer!.Name)
- .ThenBy(store => store.Name)
- .Select(store => new StoreListModel.Store(store.Id, store.Retailer!.Name, store.Name)
- {
- TotalTransactions = store.Transactions!.Count(),
- })
- .ToListPageModelAsync(page, cancellationToken: HttpContext.RequestAborted);
-
- if (stores.Page != page)
- {
- return RedirectToAction(nameof(Index), new { page = stores.Page, search });
- }
-
- var model = new StoreListModel(search, stores);
- return View(model);
+ return new RazorComponentResult();
}
[HttpGet("new")]
diff --git a/Groceries/Stores/StoresPage.razor b/Groceries/Stores/StoresPage.razor
new file mode 100644
index 0000000..40d6a2e
--- /dev/null
+++ b/Groceries/Stores/StoresPage.razor
@@ -0,0 +1,80 @@
+@using Groceries.Data
+@using Microsoft.EntityFrameworkCore
+
+@layout Layout
+
+@inject AppDbContext DbContext
+@inject NavigationManager Navigation
+@inject IHttpContextAccessor HttpContextAccessor
+
+Groceries – Stores
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @foreach (var store in stores)
+ {
+
+ | @store.Retailer |
+ @store.Name |
+ @store.TransactionsCount |
+
+ Edit
+ |
+
+ }
+
+
+
+
+
+
+@code {
+ [SupplyParameterFromQuery]
+ public int? Page { get; set; }
+
+ [SupplyParameterFromQuery]
+ public string? Search { get; set; }
+
+ private record StoreModel(Guid Id, string Retailer, string Name, int TransactionsCount);
+
+ private ListPageModel stores = ListPageModel.Empty();
+
+ protected override async Task OnParametersSetAsync()
+ {
+ var storesQuery = DbContext.Stores.AsQueryable();
+ if (!string.IsNullOrEmpty(Search))
+ {
+ var searchPattern = $"%{Search}%";
+ storesQuery = storesQuery.Where(store => EF.Functions.ILike(store.Retailer!.Name + ' ' + store.Name, searchPattern));
+ }
+
+ stores = await storesQuery
+ .OrderBy(store => store.Retailer!.Name)
+ .ThenBy(store => store.Name)
+ .Select(store => new StoreModel(store.Id, store.Retailer!.Name, store.Name, store.Transactions!.Count()))
+ .ToListPageModelAsync(Page.GetValueOrDefault(), cancellationToken: HttpContextAccessor.HttpContext!.RequestAborted);
+
+ if (stores.Page != Page)
+ {
+ Navigation.NavigateTo(Navigation.GetUriWithQueryParameter("page", stores.Page));
+ }
+ }
+}
diff --git a/Groceries/_Imports.razor b/Groceries/_Imports.razor
new file mode 100644
index 0000000..2f5b3ae
--- /dev/null
+++ b/Groceries/_Imports.razor
@@ -0,0 +1,3 @@
+@using Groceries.Components
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
diff --git a/Groceries/wwwroot/css/main.css b/Groceries/wwwroot/css/main.css
index 65c3bd5..a38faca 100644
--- a/Groceries/wwwroot/css/main.css
+++ b/Groceries/wwwroot/css/main.css
@@ -201,18 +201,14 @@ h1, h2, h3, h4, h5, h6 {
border-radius: 0.375rem;
color: rgb(107, 114, 128);
font-weight: 500;
+ text-decoration: none;
}
-.sidebar__item--active {
+.sidebar__item--active, .sidebar__item.active {
background-color: rgb(243, 244, 246);
color: rgb(75, 85, 99);
}
-.sidebar__link {
- color: inherit;
- text-decoration: none;
-}
-
/*@media (prefers-color-scheme: dark) {
.sidebar {
border-color: rgb(75, 85, 99);