diff --git a/MidrandBookshop/Components/Layout/MainLayout.razor b/MidrandBookshop/Components/Layout/MainLayout.razor index 3090d41..747a64e 100644 --- a/MidrandBookshop/Components/Layout/MainLayout.razor +++ b/MidrandBookshop/Components/Layout/MainLayout.razor @@ -6,7 +6,7 @@
- YOUR CART (@CartItems.Sum(i => i.Quantity)) + YOUR CART (@ShoppingCart.Items.Count())
- @if (!CartItems.Any()) + @if (!ShoppingCart.Items.Any()) {
@@ -29,22 +29,29 @@ else {
- @foreach (var item in CartItems) + @foreach (var item in ShoppingCart.Items) {
- [ COVER ] + @if (!string.IsNullOrWhiteSpace(item.Product!.ImageUrl)) + { + @item.Product.Name + } + else + { + @:[COVER] + }
-
@item.Title
-

by @item.Author

+
@item.Product!.Name
+

by @($"{item.Author!.Name} {item.Author.LastName}")

- @item.Quantity + @ShoppingCart.Items.FirstOrDefault(i => i.Price!.Id == item.Price!.Id)!.Quantity
- R @(item.Price * item.Quantity) + R @(item.Price!.Amount * item.Quantity)
- @if (CartItems.Any()) + @if (ShoppingCart.Items.Any()) {
@@ -156,7 +163,7 @@ - @if (CartItems.Any()) + @if (ShoppingCart.Items.Any()) { @ShoppingCart.Items.Count } diff --git a/MidrandBookshop/Components/Layout/MainLayout.razor.cs b/MidrandBookshop/Components/Layout/MainLayout.razor.cs index 015302b..158a5de 100644 --- a/MidrandBookshop/Components/Layout/MainLayout.razor.cs +++ b/MidrandBookshop/Components/Layout/MainLayout.razor.cs @@ -19,13 +19,6 @@ public partial class MainLayout(CartService cartService) : IDisposable private bool IsSearchActive { get; set; } = false; private bool IsCartOpen { get; set; } = false; - private List CartItems = new() - { - new CartItem { Id = 1, Title = "Letters from M/M (Paris)", Author = "M/M Paris", Price = 720, Quantity = 1 }, - new CartItem { Id = 2, Title = "Daan Paans: Floating Signifiers", Author = "Daan Paans", Price = 540, Quantity = 1 }, - new CartItem { Id = 3, Title = "Album Architectures, Maputo", Author = "Guedes Archive", Price = 350, Quantity = 1 } - }; - protected override async Task OnInitializedAsync() { AuthState = await AuthStateProvider.GetAuthenticationStateAsync(); @@ -111,16 +104,23 @@ public partial class MainLayout(CartService cartService) : IDisposable private void ToggleCart() => IsCartOpen = !IsCartOpen; - private void ChangeQuantity(CartItem item, int delta) + private async void ChangeQuantity(CartItem item, int delta) { - item.Quantity += delta; - if (item.Quantity <= 0) - { - CartItems.Remove(item); - } + var peekQuantity = item.Quantity + delta; + + if (peekQuantity < 1) return; + + cartService.UpdateQuantity(item.Price!.Id, delta); + + await cartService.SaveCartToStorageAsync(); } - private void RemoveFromCart(CartItem item) => CartItems.Remove(item); + private async void RemoveFromCart(CartItem item) + { + cartService.RemoveOneItem(item.Price!.Id); + + await cartService.SaveCartToStorageAsync(); + } private decimal GetCartTotal() => ShoppingCart?.TotalPrice ?? 0.00m; @@ -143,13 +143,4 @@ public partial class MainLayout(CartService cartService) : IDisposable GC.SuppressFinalize(this); } - - public class CartItem - { - public int Id { get; set; } - public string Title { get; set; } = string.Empty; - public string Author { get; set; } = string.Empty; - public int Price { get; set; } - public int Quantity { get; set; } - } } \ No newline at end of file diff --git a/MidrandBookshop/Components/Pages/ProductView.razor.cs b/MidrandBookshop/Components/Pages/ProductView.razor.cs index dcafa21..0b67338 100644 --- a/MidrandBookshop/Components/Pages/ProductView.razor.cs +++ b/MidrandBookshop/Components/Pages/ProductView.razor.cs @@ -3,6 +3,7 @@ using LiteCharms.Features.MidrandBooks.Authors; using LiteCharms.Features.MidrandBooks.Authors.Models; using LiteCharms.Features.MidrandBooks.Products; using LiteCharms.Features.MidrandBooks.Products.Models; +using Microsoft.AspNetCore.Cors.Infrastructure; using MidrandBookshop.Services.ShoppingCart; namespace MidrandBookshop.Components.Pages; @@ -13,8 +14,10 @@ public partial class ProductView : ComponentBase [Inject] private ProductService ProductService { get; set; } = default!; [Inject] private AuthorService AuthorService { get; set; } = default!; - [Inject] private CartService CartService { get; set; } = default!; [Inject] private NavigationManager Navigation { get; set; } = default!; + [Inject] private CartService CartService { get; set; } = default!; + + protected Services.ShoppingCart.Models.Cart ShoppingCart => CartService?.ShoppingCart!; protected bool IsLoading { get; private set; } = true; protected Product? CurrentProduct { get; private set; } @@ -29,6 +32,9 @@ public partial class ProductView : ComponentBase protected Author? CurrentAuthor { get; private set; } + private static Func getCartItemQuantity = (shoppingCart, productPriceId) => + shoppingCart.Items.FirstOrDefault(p => p.Price!.Id == productPriceId)?.Quantity ?? 1; + protected override async Task OnParametersSetAsync() { try @@ -85,20 +91,26 @@ public partial class ProductView : ComponentBase } } - protected void IncreaseQty() + protected async void IncreaseQty() { - Quantity++; - if (CurrentPrice is not null) - CartService.UpdateQuantity(CurrentPrice!.Id, Quantity); - } - protected void DecreaseQty() - { - if (Quantity > 1) { - Quantity--; + CartService.UpdateQuantity(CurrentPrice!.Id, 1); + + Quantity = getCartItemQuantity(ShoppingCart, CurrentPrice.Id); - CartService.UpdateQuantity(CurrentPrice!.Id, Quantity); + await CartService.SaveCartToStorageAsync(); + } + } + protected async void DecreaseQty() + { + if (Quantity >= 1) + { + CartService.UpdateQuantity(CurrentPrice!.Id, -1); + + Quantity = getCartItemQuantity(ShoppingCart, CurrentPrice.Id); + + await CartService.SaveCartToStorageAsync(); } } @@ -108,8 +120,20 @@ public partial class ProductView : ComponentBase if (CurrentPrice is not null) { - CartService.AddItem(CurrentPrice); - Quantity++; + if(ShoppingCart.Items.Any(p => p.Price!.Id == CurrentPrice.Id)) + { + CartService.UpdateQuantity(CurrentPrice.Id, 1); + + await CartService.SaveCartToStorageAsync(); + + return; + } + + CartService.AddItem(CurrentPrice, CurrentProduct, CurrentAuthor!); + + Quantity = getCartItemQuantity(ShoppingCart, CurrentPrice.Id); + + await CartService.SaveCartToStorageAsync(); } } diff --git a/MidrandBookshop/Services/ShoppingCart/CartService.cs b/MidrandBookshop/Services/ShoppingCart/CartService.cs index 0f84fb6..e8dfd0d 100644 --- a/MidrandBookshop/Services/ShoppingCart/CartService.cs +++ b/MidrandBookshop/Services/ShoppingCart/CartService.cs @@ -1,5 +1,6 @@ using LiteCharms.Features.Browser; using LiteCharms.Features.Hasher; +using LiteCharms.Features.MidrandBooks.Authors.Models; using LiteCharms.Features.MidrandBooks.Products.Models; using MidrandBookshop.Services.ShoppingCart.Models; @@ -30,7 +31,7 @@ public sealed class CartService(LocalStorageService localStorage) public async Task SaveCartToStorageAsync() => await localStorage.SaveAsync(CartStorageKey, ShoppingCart); - public void AddItem(ProductPrice productPrice) + public void AddItem(ProductPrice productPrice, Product product, Author author) { var itemExists = false; @@ -50,6 +51,8 @@ public sealed class CartService(LocalStorageService localStorage) if (!itemExists) ShoppingCart.Items.Add(new CartItem { + Product = product, + Author = author, Price = productPrice, Amount = productPrice.Amount, Quantity = 1, @@ -59,16 +62,8 @@ public sealed class CartService(LocalStorageService localStorage) NotifyStateChanged(); } - public void UpdateQuantity(long productPriceId, int newQuantity) + public void UpdateQuantity(long productPriceId, int delta) { - if (newQuantity <= 0) - { - RemoveAllSameItem(productPriceId); - NotifyStateChanged(); - - return; - } - for (var i = 0; i < ShoppingCart.Items.Count; i++) { if (ShoppingCart.Items[i].Price!.Id == productPriceId) @@ -76,8 +71,8 @@ public sealed class CartService(LocalStorageService localStorage) var oldQuantity = ShoppingCart.Items[i].Quantity; var pricePerUnit = ShoppingCart.Items[i].Price!.Amount; - ShoppingCart.Items[i].Quantity = newQuantity; - ShoppingCart.Items[i].Amount = pricePerUnit * newQuantity; + ShoppingCart.Items[i].Quantity += delta; + ShoppingCart.Items[i].Amount = pricePerUnit * ShoppingCart.Items[i].Quantity; break; } } @@ -94,7 +89,9 @@ public sealed class CartService(LocalStorageService localStorage) { if (ShoppingCart.Items[i].Quantity <= 1) { - ShoppingCart.Items.RemoveAt(i); + ShoppingCart.Items.Remove(ShoppingCart.Items[i]); + + break; } else { diff --git a/MidrandBookshop/Services/ShoppingCart/Models/CartItem.cs b/MidrandBookshop/Services/ShoppingCart/Models/CartItem.cs index 3c891d9..ca790a2 100644 --- a/MidrandBookshop/Services/ShoppingCart/Models/CartItem.cs +++ b/MidrandBookshop/Services/ShoppingCart/Models/CartItem.cs @@ -1,12 +1,17 @@ -using LiteCharms.Features.MidrandBooks.Products.Models; +using LiteCharms.Features.MidrandBooks.Authors.Models; +using LiteCharms.Features.MidrandBooks.Products.Models; namespace MidrandBookshop.Services.ShoppingCart.Models; public sealed class CartItem { + public Author? Author { get; set; } + + public Product? Product { get; set; } + public ProductPrice? Price { get; set; } - public long Quantity { get; set; } + public int Quantity { get; set; } public decimal Amount { get; set; } }