Merge pull request 'cart' (#98) from cart into main

Reviewed-on: #98

MidrandBookshop/Components/BookCard.razor

@@ -14,29 +14,12 @@
                 {
                     <div></div>
                 }
-
-                <div class="d-flex align-items-center gap-2">
-                    <button class="btn bg-white rounded-circle d-flex align-items-center justify-content-center p-2 shadow-sm border-0 btn-cart-icon"
-                            style="width: 32px; height: 32px; transition: all 0.2s ease;"
-                            title="Add to Cart"
-                            data-bs-toggle="tooltip"
-                            data-bs-placement="top"
-                            @onclick="HandleAddToCart" @onclick:stopPropagation>
-                        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--mb-text-dark)" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
-                            <circle cx="9" cy="21" r="1"></circle>
-                            <circle cx="20" cy="21" r="1"></circle>
-                            <path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"></path>
-                        </svg>
-                    </button>
-
-                    <button class="btn bg-white rounded-circle d-flex align-items-center justify-content-center p-2 shadow-sm border-0"
-                            style="width: 32px; height: 32px;">
-                        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--mb-text-dark)" stroke-width="2.5">
-                            <line x1="7" y1="17" x2="17" y2="7" />
-                            <polyline points="7,7 17,7 17,17" />
-                        </svg>
-                    </button>
-                </div>
+                <button class="btn bg-white rounded-circle d-flex align-items-center justify-content-center p-2 shadow-sm border-0" style="width: 32px; height: 32px;">
+                    <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--mb-text-dark)" stroke-width="2.5">
+                        <line x1="7" y1="17" x2="17" y2="7" />
+                        <polyline points="7,7 17,7 17,17" />
+                    </svg>
+                </button>
             </div>
 
             <div class="d-flex justify-content-center align-items-center flex-grow-1 my-2">
@@ -66,4 +49,4 @@
         </div>
 
     </div>
-</div>
+</div>

MidrandBookshop/Components/BookCard.razor.cs

@@ -1,9 +1,4 @@
-using LiteCharms.Features.MidrandBooks.AuthorBooks;
-using LiteCharms.Features.MidrandBooks.Authors;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Products;
-
-namespace MidrandBookshop.Components;
+namespace MidrandBookshop.Components;
 
 public partial class BookCard
 {
@@ -16,29 +11,4 @@ public partial class BookCard
     [Parameter] public string BookImageUrl { get; set; } = string.Empty;
 
     [Parameter] public EventCallback OnCardClick { get; set; }
-
-    [Inject] private CartService CartService { get; set; } = default!;
-    [Inject] private ProductService ProductService { get; set; } = default!;
-    [Inject] private AuthorService AuthorService { get; set; } = default!;
-    [Inject] private BooksService BooksService { get; set; } = default!;
-    [Inject] private IToastService ToastService { get; set; } = default!;
-    [Inject] private CancellationToken CancellationToken { get; set; } = default!;
-
-    private async Task HandleAddToCart()
-    {
-        try
-        {
-            var bookFetch = await BooksService.GetBookByProductIdAsync(Id, CancellationToken);            
-            var authorFetch = await AuthorService.GetAuthorAsync(bookFetch.Value.AuthorId, CancellationToken);
-            var productPriceFetch = await ProductService.GetProductPriceAsync(Id, CancellationToken);
-
-            CartService.AddItem(productPriceFetch.Value, bookFetch.Value.Product!, authorFetch.Value);
-
-            ToastService.ShowSuccess($"Added '{Title}' to your order.", "Cart Changed");
-        }
-        catch
-        {
-            ToastService.ShowError("Could not update cart. Please try again.");
-        }
-    }
 }

MidrandBookshop/Components/Layout/MainLayout.razor

@@ -1,5 +1,4 @@
-@using Blazored.Toast
-@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 @inject NavigationManager Navigation
 
 <div class="position-relative vh-100 d-flex flex-column justify-content-between overflow-hidden" style="background-color: #F9F9F9;">
@@ -296,4 +295,3 @@
     </div>
 </div>
 
-<BlazoredToasts />

MidrandBookshop/Components/Layout/MainLayout.razor.cs

@@ -5,13 +5,13 @@ namespace MidrandBookshop.Components.Layout;
 
 public partial class MainLayout(CartService cartService) : IDisposable
 {
-    [Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
-    [Inject] public IToastService ToastService { get; set; } = default!;
+    [Inject]
+    private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
 
     private Cart ShoppingCart => cartService.ShoppingCart;
 
     private AuthenticationState? AuthState { get; set; }
-    private ClaimsPrincipal? User { get; set; }
+    private System.Security.Claims.ClaimsPrincipal? User { get; set; }
     private bool IsAuthenticated => User?.Identity?.IsAuthenticated ?? false;
 
     private string SearchInputBuffer { get; set; } = string.Empty;
@@ -116,8 +116,6 @@ public partial class MainLayout(CartService cartService) : IDisposable
         cartService.RemoveOneItem(item.Price!.Id);
 
         await cartService.SaveCartToStorageAsync();
-
-        ToastService.ShowSuccess($"Removed {item.Product!.Name} from cart", "Cart Changed");
     }
 
     private decimal GetCartTotal() => ShoppingCart?.TotalAmount ?? 0.00m;

MidrandBookshop/Components/Pages/CartReview.razor.cs

@@ -5,8 +5,6 @@ namespace MidrandBookshop.Components.Pages;
 
 public partial class CartReview(CartService cartService)
 {
-    [Inject] public IToastService ToastService { get; set; } = default!;
-
     protected Cart ShoppingCart => cartService?.ShoppingCart!;
 
     protected async void IncreaseQty(CartItem item)
@@ -34,7 +32,5 @@ public partial class CartReview(CartService cartService)
         cartService.RemoveOneItem(item.Price!.Id);
 
         await cartService.SaveCartToStorageAsync();
-
-        ToastService.ShowSuccess($"Removed {item.Product!.Name} from cart", "Cart Changed");
     }
 }

MidrandBookshop/Components/Pages/Checkout.razor.cs

@@ -20,7 +20,6 @@ public partial class Checkout()
     [Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
     [Inject] public IJSRuntime JSRuntime { get; set; } = default!;
     [Inject] private CancellationToken CancellationToken { get; set; } = default!;
-    [Inject] public IToastService ToastService { get; set; } = default!;
 
     private Cart ShoppingCart => CartService.ShoppingCart;
     private ClaimsPrincipal? User { get; set; }
@@ -64,12 +63,7 @@ public partial class Checkout()
 
     private async Task PayNow(MouseEventArgs args)
     {
-        if (IsProcessing)
-        {
-            ToastService.ShowWarning("Please wait, completing your payment", "Busy...");
-
-            return;
-        }
+        if (IsProcessing) return;
 
         try
         {
@@ -117,12 +111,7 @@ public partial class Checkout()
             {
                 var paymentFetch = await PaymentService.GetOrderPaymentAsync(orderId, CancellationToken);
 
-                if (paymentFetch.IsFailed)
-                {
-                    ToastService.ShowError("Failed to get fetch your previously made payment", "Payment Check");
-
-                    return;
-                }
+                if (paymentFetch.IsFailed) return;
 
                 paymentId = paymentFetch.Value.Id;
             }
@@ -161,10 +150,8 @@ public partial class Checkout()
 
             await JSRuntime.InvokeVoidAsync("eval", "document.getElementById('payfastForm').submit();");
         }
-        catch(Exception ex)
+        catch
         {
-            ToastService.ShowError($"Failed to perform checkout: {ex.Message}", "Checkout");
-
             IsProcessing = false;
             StateHasChanged();
         }

MidrandBookshop/Components/Pages/PaymentSuccess.razor.cs

@@ -14,7 +14,6 @@ public partial class PaymentSuccess
     [Inject] private HashService HashService { get; set; } = default!;
     [Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
     [Inject] private CancellationToken CancellationToken { get; set; } = default!;
-    [Inject] public IToastService ToastService { get; set; } = default!;
 
     [Parameter]
     [SupplyParameterFromQuery(Name = "reference")]

MidrandBookshop/Setup.cs

@@ -15,8 +15,6 @@ public static class Setup
 
         services.AddRazorComponents()
             .AddInteractiveServerComponents();
-
-        services.AddBlazoredToast();
         
         services.AddEndpointsApiExplorer();
 

MidrandBookshop/wwwroot/app.css

@@ -112,113 +112,3 @@ h1:focus, h2:focus, h3:focus, h4:focus, p:focus, div:focus, span:focus {
 [tabindex="-1"]:focus {
     outline: none !important;
 }
-
-/* ==========================================================================
-   Global Toast Notification Framework Extensions
-   ========================================================================== */
-
-.blazored-toast-container {
-    position: fixed;
-    /* 🛠️ Shift anchors from top-right to bottom-left */
-    bottom: 24px;
-    left: 24px;
-    top: auto;
-    right: auto;
-    z-index: 2000 !important;
-    display: flex;
-    flex-direction: column-reverse; /* 💡 Newest toasts will now stack cleanly on top of old ones */
-    gap: 12px;
-    max-width: 400px;
-    width: 100%;
-    pointer-events: none;
-}
-
-.blazored-toast {
-    display: flex;
-    align-items: center;
-    padding: 16px 20px;
-    border-radius: var(--mb-radius);
-    background-color: var(--mb-card-bg);
-    color: var(--mb-text-dark);
-    box-shadow: 0 12px 32px rgba(0, 0, 0, 0.12), 0 2px 4px rgba(0, 0, 0, 0.04);
-    border: 1px solid rgba(0, 0, 0, 0.05);
-    font-family: var(--font-ui);
-    font-size: 0.9rem;
-    font-weight: 500;
-    animation: toastFadeIn 0.35s cubic-bezier(0.175, 0.885, 0.32, 1.125) forwards;
-}
-
-/* Success Toast Core Variants */
-.blazored-toast-success {
-    border-left: 4px solid var(--mb-text-dark);
-}
-
-/* Error Toast Core Variants */
-.blazored-toast-error {
-    border-left: 4px solid var(--mb-accent-red);
-    color: var(--mb-accent-red);
-}
-
-.blazored-toast-icon {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: 12px;
-    flex-shrink: 0;
-}
-
-/* Entry Transition Keyframes */
-@keyframes toastFadeIn {
-    from {
-        opacity: 0;
-        transform: translateY(-12px) scale(0.96);
-    }
-
-    to {
-        opacity: 1;
-        transform: translateY(0) scale(1);
-    }
-}
-
-.book-shadow {
-    filter: drop-shadow(5px 10px 15px rgba(0, 0, 0, 0.15)) drop-shadow(1px 2px 4px rgba(0, 0, 0, 0.1));
-}
-
-.sm-icon {
-    width: 14px;
-    height: 14px;
-    vertical-align: middle;
-}
-
-/* 🛠️ Micro-interactions for the header icon placement */
-.btn-cart-icon:hover {
-    transform: scale(1.08);
-    background-color: var(--mb-text-dark) !important;
-}
-
-    .btn-cart-icon:hover svg {
-        stroke: #FFFFFF !important;
-    }
-
-@keyframes toastFadeIn {
-    from {
-        opacity: 0;
-        transform: translateX(-24px) scale(0.95); /* Slide rightward into view */
-    }
-
-    to {
-        opacity: 1;
-        transform: translateX(0) scale(1);
-    }
-}
-
-.blazored-toast button.blazored-toast-close,
-.blazored-toast-close-icon {
-    display: none !important;
-    visibility: hidden !important;
-    opacity: 0 !important;
-    width: 0 !important;
-    height: 0 !important;
-    padding: 0 !important;
-    margin: 0 !important;
-}