Merge pull request 'Wired up CartDrawel and ProductView to cart service and local storage' (#53 ) from cart into main

Reviewed-on: #53
Merge pull request 'cart' (#52 ) from cart into main
2026-06-10 23:02:07 +02:00 · 2026-06-09 23:41:28 +02:00 · 2026-06-07 16:51:40 +02:00 · 2026-06-07 16:39:15 +02:00 · 2026-06-05 09:26:44 +02:00 · 2026-06-05 09:08:18 +02:00
31 changed files with 538 additions and 1033 deletions
@@ -23,7 +23,7 @@ trigger:
 kind: pipeline
 type: docker
 name: package
- 
+
 steps:
  - name: docker-build
    image: plugins/docker
@@ -31,10 +31,6 @@ steps:
      registry: nexus.khongisa.co.za
      repo: nexus.khongisa.co.za/midrandbooks
      tags: [ latest, "1.${DRONE_BUILD_NUMBER}" ]
-      use_cache: true
-      cache_from: nexus.khongisa.co.za/midrandbooks:latest
-      build_args:
-        - BUILDKIT_INLINE_CACHE=1
      custom_labels:
        - org.opencontainers.image.source=https://gitea.khongisa.co.za/litecharms/midrandbooks
        - org.opencontainers.image.version=1.${DRONE_BUILD_NUMBER}
@@ -1,7 +1,6 @@
 <Solution>
  <Folder Name="/Solution Items/">
    <File Path=".drone.yml" />
-    <File Path=".editorconfig" />
    <File Path="Dockerfile" />
    <File Path="midrandbooks-uat.yml" />
    <File Path="README.md" />
@@ -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,16 @@
        </div>

    </div>
-</div>
+</div>
+
+@code {
+    [Parameter] public long Id { get; set; }
+    [Parameter] public string Title { get; set; } = string.Empty;
+    [Parameter] public string Author { get; set; } = string.Empty;
+    [Parameter] public decimal Price { get; set; }
+    [Parameter] public string Category { get; set; } = string.Empty;
+    [Parameter] public bool IsNew { get; set; }
+    [Parameter] public string BookImageUrl { get; set; } = string.Empty;
+
+    [Parameter] public EventCallback OnCardClick { get; set; }
+}
@@ -1,44 +0,0 @@
-using LiteCharms.Features.MidrandBooks.AuthorBooks;
-using LiteCharms.Features.MidrandBooks.Authors;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Products;
-
-namespace MidrandBookshop.Components;
-
-public partial class BookCard
-{
-    [Parameter] public long Id { get; set; }
-    [Parameter] public string Title { get; set; } = string.Empty;
-    [Parameter] public string Author { get; set; } = string.Empty;
-    [Parameter] public decimal Price { get; set; }
-    [Parameter] public string Category { get; set; } = string.Empty;
-    [Parameter] public bool IsNew { get; set; }
-    [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.");
-        }
-    }
-}
@@ -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 />
@@ -1,17 +1,17 @@
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Payments.Models;
+using MidrandBookshop.Services.ShoppingCart;
+using MidrandBookshop.Services.ShoppingCart.Models;

 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;
@@ -27,11 +27,15 @@ public partial class MainLayout(CartService cartService) : IDisposable
        Navigation.LocationChanged += OnLocationChanged;
        cartService.OnCartChanged += CartService_OnCartChanged;

-        await cartService.LoadCartFromStorageAsync();
-
        SyncSearchQueryFromUrl();
    }

+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender) 
+            await cartService.LoadCartFromStorageAsync();
+    }
+
    private async void CartService_OnCartChanged() => await InvokeAsync(StateHasChanged);

    private void OnLocationChanged(object? sender, LocationChangedEventArgs e)
@@ -100,7 +104,7 @@ public partial class MainLayout(CartService cartService) : IDisposable

    private void ToggleCart() => IsCartOpen = !IsCartOpen;

-    private async Task ChangeQuantity(CartItem item, int delta)
+    private async void ChangeQuantity(CartItem item, int delta)
    {
        var peekQuantity = item.Quantity + delta;

@@ -111,16 +115,14 @@ public partial class MainLayout(CartService cartService) : IDisposable
        await cartService.SaveCartToStorageAsync();
    }

-    private async Task RemoveFromCart(CartItem item)
+    private async void RemoveFromCart(CartItem item)
    {
        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;
+    private decimal GetCartTotal() => ShoppingCart?.TotalPrice ?? 0.00m;

    private void RedirectToCart()
    {
@@ -0,0 +1,106 @@
+@page "/cart"
+
+<div class="container py-5" style="max-width: 900px;">
+    <div class="d-flex align-items-center justify-content-between mb-5">
+        <h2 class="fw-bold m-0">Your Cart</h2>
+        <a href="/" class="text-dark text-decoration-none small fw-bold tracking-widest">CONTINUE SHOPPING</a>
+    </div>
+
+    @if (!CartItems.Any())
+    {
+        <div class="text-center py-5 border rounded-3 bg-white">
+            <p class="text-muted mb-4">Your collection is currently empty.</p>
+            <a href="/" class="btn btn-dark rounded-pill px-4">Browse Catalog</a>
+        </div>
+    }
+    else
+    {
+        <div class="card border-0 shadow-sm p-4 mb-4">
+            @foreach (var item in CartItems)
+            {
+                <div class="row align-items-center py-4 @(item != CartItems.Last() ? "border-bottom" : "")">
+                    <!-- Item Detail -->
+                    <div class="col-12 col-md-6 d-flex align-items-center gap-4">
+                        <div class="bg-light d-flex align-items-center justify-content-center" style="width: 70px; height: 95px;">
+                            <span class="text-muted" style="font-size: 0.5rem;">[COVER]</span>
+                        </div>
+                        <div>
+                            <h5 class="fw-bold mb-1">@item.Title</h5>
+                            <p class="text-muted small mb-0">by @item.Author</p>
+                        </div>
+                    </div>
+
+                    <!-- Quantity -->
+                    <div class="col-6 col-md-3 d-flex justify-content-center">
+                        <div class="d-flex align-items-center border rounded-pill bg-light px-2">
+                            <button class="btn btn-sm border-0 text-dark" @onclick="() => ChangeQuantity(item, -1)">-</button>
+                            <span class="px-3 fw-bold">@item.Quantity</span>
+                            <button class="btn btn-sm border-0 text-dark" @onclick="() => ChangeQuantity(item, 1)">+</button>
+                        </div>
+                    </div>
+
+                    <!-- Price & Remove -->
+                    <div class="col-6 col-md-3 text-end d-flex align-items-center justify-content-end gap-3">
+                        <span class="fw-bold">R @(item.Price * item.Quantity)</span>
+                        <button class="btn btn-sm p-1 text-muted" @onclick="() => RemoveFromCart(item)">
+                            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>
+                        </button>
+                    </div>
+                </div>
+            }
+        </div>
+
+        <!-- Cart Totals Section -->
+        <div class="row justify-content-end">
+            <div class="col-md-5">
+                <div class="bg-white p-4 rounded-3 border">
+                    <div class="d-flex justify-content-between mb-3">
+                        <span class="text-muted">Subtotal</span>
+                        <span class="fw-bold">R @Subtotal.ToString("F2")</span>
+                    </div>
+                    <div class="d-flex justify-content-between mb-4">
+                        <span class="text-muted">VAT (15%)</span>
+                        <span class="fw-bold">R @VatAmount.ToString("F2")</span>
+                    </div>
+                    <hr />
+                    <div class="d-flex justify-content-between align-items-center mb-4">
+                        <span class="fw-bold h5 mb-0">Total</span>
+                        <span class="fw-bold h4 mb-0">R @Total.ToString("F2")</span>
+                    </div>
+                    <a href="/checkout" class="btn btn-dark w-100 rounded-pill py-3">Proceed to Checkout</a>
+                </div>
+            </div>
+        </div>
+    }
+</div>
+
+@code {
+    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; }
+    }
+
+    private List<CartItem> 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 }
+    };
+
+    // Computed Properties for Calculations
+    private decimal Subtotal => CartItems.Sum(i => (decimal)i.Price * i.Quantity);
+    private decimal VatAmount => Subtotal * 0.15m;
+    private decimal Total => Subtotal + VatAmount;
+
+    private void ChangeQuantity(CartItem item, int delta)
+    {
+        item.Quantity += delta;
+        if (item.Quantity <= 0) CartItems.Remove(item);
+    }
+
+    private void RemoveFromCart(CartItem item) => CartItems.Remove(item);
+}
@@ -1,98 +0,0 @@
-@page "/cart"
-@rendermode InteractiveServer
-
-<div class="container py-5" style="max-width: 1000px; font-family: system-ui, -apple-system, sans-serif;">
-
-    <div class="d-flex align-items-baseline justify-content-between mb-5 border-bottom pb-3">
-        <h1 class="ff-serif mb-0" style="font-size: 2.25rem; font-family: 'Playfair Display', Georgia, serif; font-weight: 400; letter-spacing: -0.5px;">Your Cart</h1>
-        <a href="/" class="text-dark text-decoration-none small fw-semibold tracking-widest text-uppercase" style="font-size: 0.75rem; letter-spacing: 1.5px;">Continue Shopping</a>
-    </div>
-
-    @if (!ShoppingCart.Items.Any())
-    {
-        <div class="text-center py-5 my-4">
-            <div class="mb-4 text-muted-50">
-                <svg width="64" height="64" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" class="text-secondary opacity-50"><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>
-            </div>
-            <h3 class="ff-serif mb-2" style="font-family: 'Playfair Display', Georgia, serif; font-weight: 400;">Your collection is currently vacant.</h3>
-            <p class="text-muted small mb-4" style="letter-spacing: 0.2px;">Even with careful scrutiny, the requested shelf remains empty.</p>
-            <a href="/" class="btn btn-dark rounded-pill px-4 py-2 text-uppercase fw-semibold tracking-widest" style="font-size: 0.75rem; letter-spacing: 1px; background-color: #1c1f22;">Browse Catalog</a>
-        </div>
-    }
-    else
-    {
-        <div class="row g-5">
-            <div class="col-12 col-lg-7">
-                <div class="d-flex flex-column gap-1">
-                    @foreach (var item in ShoppingCart.Items)
-                    {
-                        <div class="row align-items-center py-4 border-bottom position-relative">
-
-                            <div class="col-12 col-md-7 d-flex align-items-center gap-4 mb-3 mb-md-0">
-                                <div class="bg-light d-flex align-items-center justify-content-center p-2 rounded-1 state-card-shadow"
-                                     style="width: 70px; height: 95px; background-color: #f8f9fa; box-shadow: 0 4px 12px rgba(0,0,0,0.06), 0 1px 3px rgba(0,0,0,0.04);">
-                                    @if (!string.IsNullOrWhiteSpace(item.Product!.ImageUrl))
-                                    {
-                                        <img src="@item.Product!.ImageUrl" class="img-fluid" style="max-height: 80px; object-fit: contain; filter: drop-shadow(2px 4px 6px rgba(0,0,0,0.15));" alt="@item.Product.Name" />
-                                    }
-                                    else
-                                    {
-                                        <span class="text-muted fw-bold font-monospace" style="font-size: 0.6rem; letter-spacing: 1px;">[COVER]</span>
-                                    }
-                                </div>
-                                <div style="max-width: 75%;">
-                                    <h5 class="fw-semibold mb-1 text-dark" style="font-size: 0.95rem; line-height: 1.4; letter-spacing: -0.1px;">@item.Product!.Name</h5>
-                                    <p class="text-muted small mb-0" style="font-size: 0.8rem; letter-spacing: 0.1px;">by @($"{item.Author!.Name} {item.Author!.LastName}")</p>
-                                </div>
-                            </div>
-
-                            <div class="col-6 col-md-3 d-flex justify-content-md-center align-items-center">
-                                <div class="d-flex align-items-center border rounded-pill bg-white px-1 py-1" style="border-color: #e9ecef !important;">
-                                    <button class="btn btn-sm border-0 bg-transparent text-muted px-2 py-0" style="font-size: 0.9rem;" @onclick="() => DecreaseQty(item, -1)">—</button>
-                                    <span class="px-2 fw-semibold text-dark" style="font-size: 0.85rem; min-width: 20px; text-align: center;">@item.Quantity</span>
-                                    <button class="btn btn-sm border-0 bg-transparent text-muted px-2 py-0" style="font-size: 0.9rem;" @onclick="() => IncreaseQty(item)">+</button>
-                                </div>
-                            </div>
-
-                            <div class="col-6 col-md-2 text-end d-flex align-items-center justify-content-end gap-3">
-                                <span class="fw-semibold text-dark" style="font-size: 0.95rem; letter-spacing: -0.2px;">R @(item.Amount.ToString("N2", System.Globalization.CultureInfo.GetCultureInfo("js")))</span>
-                                <button class="btn btn-sm p-1 text-muted opacity-50 hover-opacity-100 border-0 bg-transparent" style="transition: opacity 0.2s;" @onclick="() => RemoveFromCart(item)" title="Remove item">
-                                    <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>
-                                </button>
-                            </div>
-
-                        </div>
-                    }
-                </div>
-            </div>
-
-            <div class="col-12 col-lg-5">
-                <div class="bg-white p-4 rounded-3 border-0 sticky-top" style="top: 2rem; box-shadow: 0 10px 30px rgba(0,0,0,0.04); border: 1px solid #f1f3f5 !important;">
-                    <h4 class="ff-serif mb-4" style="font-family: 'Playfair Display', Georgia, serif; font-weight: 400; font-size: 1.3rem;">Order Summary</h4>
-
-                    <div class="d-flex justify-content-between mb-3" style="font-size: 0.9rem;">
-                        <span class="text-muted">Subtotal</span>
-                        <span class="fw-normal text-dark">R @(ShoppingCart.TotalAmount.ToString("N2", System.Globalization.CultureInfo.GetCultureInfo("js")))</span>
-                    </div>
-
-                    <div class="d-flex justify-content-between mb-4" style="font-size: 0.9rem;">
-                        <span class="text-muted">VAT (15%)</span>
-                        <span class="fw-normal text-dark">R @(ShoppingCart.TotalVat.ToString("N2", System.Globalization.CultureInfo.GetCultureInfo("js")))</span>
-                    </div>
-
-                    <hr style="border-color: #f1f3f5;" />
-
-                    <div class="d-flex justify-content-between align-items-baseline mb-4 mt-2">
-                        <span class="fw-semibold h6 mb-0 text-dark" style="font-size: 1rem;">Total</span>
-                        <span class="fw-bold text-dark" style="font-size: 1.4rem; letter-spacing: -0.5px;">R @((ShoppingCart.TotalAmount + ShoppingCart.TotalVat).ToString("N2", System.Globalization.CultureInfo.GetCultureInfo("js")))</span>
-                    </div>
-
-                    <a href="/checkout" class="btn btn-dark w-100 rounded-pill py-3 text-uppercase fw-semibold tracking-widest border-0"
-                       style="font-size: 0.75rem; letter-spacing: 1.5px; background-color: #1c1f22; transition: background-color 0.2s;">
-                        Proceed to Checkout
-                    </a>
-                </div>
-            </div>
-        </div>
-    }
-</div>
@@ -1,40 +0,0 @@
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Payments.Models;
-
-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)
-    {
-        if (item is not null)
-        {
-            cartService.UpdateQuantity(item!.Price!.Id, 1);
-
-            await cartService.SaveCartToStorageAsync();
-        }
-    }
-    protected async void DecreaseQty(CartItem item, int delta)
-    {
-        var peekQuantity = item.Quantity + delta;
-
-        if (peekQuantity < 1) return;
-
-        cartService.UpdateQuantity(item!.Price!.Id, delta);
-
-        await cartService.SaveCartToStorageAsync();
-    }
-
-    private async void RemoveFromCart(CartItem item)
-    {
-        cartService.RemoveOneItem(item.Price!.Id);
-
-        await cartService.SaveCartToStorageAsync();
-
-        ToastService.ShowSuccess($"Removed {item.Product!.Name} from cart", "Cart Changed");
-    }
-}
@@ -1,2 +0,0 @@
-body {
-}
@@ -1,18 +1,19 @@
@page "/checkout"
@inject NavigationManager Navigation
-@rendermode InteractiveServer
-@attribute [Authorize]

 <div class="container py-5">
    <h2 class="fw-bold mb-4">Checkout</h2>
    <div class="row g-5">
+
+        <!-- LEFT COLUMN: SHIPPING & CART -->
        <div class="col-lg-8">
+            <!-- 1. Cart Items -->
            <div class="card border-0 shadow-sm p-4 mb-4">
                <h5 class="fw-bold mb-3">Your Items</h5>
-                @foreach (var item in ShoppingCart.Items)
+                @foreach (var item in CartItems)
                {
                    <div class="d-flex align-items-center justify-content-between pb-3 border-bottom mb-3">
-                        <div><h6 class="mb-0">@item.Product!.Name</h6><small class="text-muted">@($"{item.Author!.Name} {item.Author.LastName}")</small></div>
+                        <div><h6 class="mb-0">@item.Title</h6><small class="text-muted">@item.Author</small></div>
                        <div class="d-flex align-items-center gap-3">
                            <div class="d-flex border rounded-pill">
                                <button class="btn btn-sm px-2" @onclick="() => ChangeQuantity(item, -1)">-</button>
@@ -25,6 +26,7 @@
                }
            </div>

+            <!-- 2. Shipping Options -->
            <div class="card border-0 shadow-sm p-4 mb-4">
                <h5 class="fw-bold mb-3">Shipping Method</h5>
                <div class="form-check mb-2">
@@ -39,38 +41,70 @@
                </div>
            </div>

+            <!-- 3. Address Fields -->
            <div class="card border-0 shadow-sm p-4">
                <h5 class="fw-bold mb-3">Shipping Address</h5>
                <div class="form-check mb-3">
                    <input class="form-check-input" type="checkbox" id="sameAsBilling" @bind="IsSameAddress">
                    <label class="form-check-label" for="sameAsBilling">Billing address same as shipping</label>
                </div>
+                <!-- Add text inputs for address here, show/hide based on IsSameAddress -->
            </div>
        </div>

+        <!-- RIGHT COLUMN: STICKY SUMMARY -->
        <div class="col-lg-4">
            <div class="card border-0 shadow-sm p-4 sticky-top" style="top: 100px;">
                <h5 class="fw-bold mb-3">Order Summary</h5>
-                <div class="d-flex justify-content-between mb-2"><span>Subtotal</span><span>R @ShoppingCart.TotalAmount.ToString("F2")</span></div>
-                <div class="d-flex justify-content-between mb-2"><span>VAT (15%)</span><span>R @ShoppingCart.TotalVat.ToString("F2")</span></div>
-                <div class="d-flex justify-content-between mb-2"><span>Shipping</span><span>R @($"{ShippingCost:F2}")</span></div>
+                <div class="d-flex justify-content-between mb-2"><span>Subtotal</span><span>R @Subtotal.ToString("F2")</span></div>
+                <div class="d-flex justify-content-between mb-2"><span>VAT (15%)</span><span>R @VatAmount.ToString("F2")</span></div>
+                <div class="d-flex justify-content-between mb-2"><span>Shipping</span><span>R @ShippingCost.ToString("F2")</span></div>
                <hr />
                <div class="d-flex justify-content-between mb-4">
                    <span class="fw-bold">Total Due</span>
-                    <h4 class="fw-bold">R @($"{ShoppingCart.TotalAmount + ShoppingCart.TotalVat + ShippingCost:F2}")</h4>
+                    <h4 class="fw-bold">R @((Subtotal + VatAmount + ShippingCost).ToString("F2"))</h4>
                </div>
-                <button class="btn btn-dark w-100 py-3 rounded-pill" @onclick="PayNow">Complete Purchase</button>
+                <button class="btn btn-dark w-100 py-3 rounded-pill" @onclick="CompletePurchase">Complete Purchase</button>
            </div>
        </div>
-
-        @if (IsProcessing == true && CheckoutPayload?.Count > 0)
-        {
-            <form id="payfastForm" action="@PayfastOptions.Value.CheckoutUrl" method="POST">
-                @foreach (var field in CheckoutPayload)
-                {
-                    <input type="hidden" name="@field.Key" value="@field.Value" />
-                }
-            </form>
-        }
    </div>
-</div>
+</div>
+
+@code {
+    private decimal ShippingCost = 0;
+    private bool IsSameAddress = true;
+
+    // Calculations
+    private decimal Subtotal => CartItems.Sum(i => (decimal)i.Price * i.Quantity);
+    private decimal VatAmount => Subtotal * 0.15m;
+
+    // Assuming your CartItems list is managed via a Service or cascading parameter
+    // Here it is locally mocked for this example
+    private List<CartItem> 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 }
+    };
+
+    private void ChangeQuantity(CartItem item, int delta)
+    {
+        item.Quantity += delta;
+        if (item.Quantity <= 0) CartItems.Remove(item);
+    }
+
+    private void RemoveFromCart(CartItem item) => CartItems.Remove(item);
+    private int GetCartTotal() => CartItems.Sum(i => i.Price * i.Quantity);
+
+    public class CartItem
+    {
+        public int Id { get; set; }
+        public string Title { get; set; } = "";
+        public string Author { get; set; } = "";
+        public int Price { get; set; }
+        public int Quantity { get; set; }
+    }
+    private void CompletePurchase(MouseEventArgs args)
+    {
+        Navigation.NavigateTo("/payment-confirmation");
+    }
+}
@@ -1,172 +0,0 @@
-using LiteCharms.Features.Api.Configuration;
-using LiteCharms.Features.Hasher;
-using LiteCharms.Features.MidrandBooks.AuthorBooks;
-using LiteCharms.Features.MidrandBooks.Orders;
-using LiteCharms.Features.MidrandBooks.Orders.Models;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Payments.Models;
-
-namespace MidrandBookshop.Components.Pages;
-
-public partial class Checkout()
-{
-    [Inject] public HashService HashService { get; set; } = default!;
-    [Inject] public PaymentService PaymentService { get; set; } = default!;
-    [Inject] public OrderService OrderService { get; set; } = default!;
-    [Inject] public BooksService BooksService { get; set; } = default!;
-    [Inject] public CartService CartService { get; set; } = default!;
-    [Inject] public PayfastService PayfastService { get; set; } = default!;
-    [Inject] public IOptions<PayfastSettings> PayfastOptions { get; set; } = default!;
-    [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; }
-    private bool IsProcessing { get; set; }
-
-    private decimal ShippingCost = 0;
-    private bool IsSameAddress = true;
-
-    private Dictionary<string, string> CheckoutPayload { get; set; } = [];
-
-    protected override async Task OnInitializedAsync()
-    {
-        var authState = await AuthStateProvider.GetAuthenticationStateAsync();
-        User = authState!.User;
-
-        Navigation.LocationChanged += OnLocationChanged;
-        CartService.OnCartChanged += CartService_OnCartChanged;
-    }
-
-    private async void CartService_OnCartChanged() => await InvokeAsync(StateHasChanged);
-
-    private void OnLocationChanged(object? sender, LocationChangedEventArgs e) => StateHasChanged();
-
-    private async Task ChangeQuantity(CartItem item, int delta)
-    {
-        var peekQuantity = item.Quantity + delta;
-
-        if (peekQuantity < 1) return;
-
-        CartService.UpdateQuantity(item.Price!.Id, delta);
-
-        await CartService.SaveCartToStorageAsync();
-    }
-
-    private async Task RemoveFromCart(CartItem item)
-    {
-        CartService.RemoveOneItem(item.Price!.Id);
-
-        await CartService.SaveCartToStorageAsync();
-    }
-
-    private async Task PayNow(MouseEventArgs args)
-    {
-        if (IsProcessing)
-        {
-            ToastService.ShowWarning("Please wait, completing your payment", "Busy...");
-
-            return;
-        }
-
-        try
-        {
-            IsProcessing = true;
-
-            StateHasChanged();
-
-            Result<long> orderResult;
-
-            var customerId = (long)ShoppingCart.CustomerId!;
-
-            if (!ShoppingCart.OrderId.HasValue)
-            {
-                CreateOrder request = new(ShoppingCart.TotalAmount, null);
-
-                orderResult = await OrderService.CreateOrderAsync(customerId, request, CancellationToken);
-                ShoppingCart.OrderId = orderResult.Value;
-            }
-
-            List<CreateOrderItem> orderItems = [];
-
-            var orderId = (long)ShoppingCart.OrderId;
-
-            await OrderService.ClearOrderItemsAsync(orderId, CancellationToken);
-
-            foreach (var item in ShoppingCart.Items)
-            {
-                var bookRequest = await BooksService.GetBookByProductIdAsync(item.Price!.Id, CancellationToken);
-
-                if (bookRequest.IsSuccess)
-                {
-                    var orderItem = new CreateOrderItem(bookRequest.Value.Id, item.Price.Id, item.Quantity);
-                    orderItems.Add(orderItem);
-                }
-            }
-
-            var orderHash = HashService.HashEncodeLongId(orderId).Value;
-            var paymentGen = await PaymentService.CreatePaymentAsync(ShoppingCart.TotalAmount, orderId, orderHash, CancellationToken);
-
-            long paymentId = 0;
-
-            if (paymentGen.IsSuccess) paymentId = paymentGen.Value;
-
-            if(paymentGen.IsFailed)
-            {
-                var paymentFetch = await PaymentService.GetOrderPaymentAsync(orderId, CancellationToken);
-
-                if (paymentFetch.IsFailed)
-                {
-                    ToastService.ShowError("Failed to get fetch your previously made payment", "Payment Check");
-
-                    return;
-                }
-
-                paymentId = paymentFetch.Value.Id;
-            }
-
-            CreateLedgerEntry ledgerRequest = new()
-            {
-                OrderId = orderId,
-                CustomerId = customerId,
-                PaymentGatewayId = 1,
-                PaymentGatewayReference = orderHash,
-                PaymentId = paymentId,
-                Status = LiteCharms.Features.LedgerStatuses.Sent,
-            };
-            await PaymentService.WriteLedgerEntryAsync(ledgerRequest, CancellationToken);
-
-            var addItemsResult = await OrderService.AddItemsToOrderAsync(orderId, [.. orderItems], CancellationToken);
-            var hostAddress = Navigation.BaseUri.TrimEnd('/');
-
-            CheckoutPayload = new Dictionary<string, string>
-            {
-                { "merchant_id", PayfastOptions.Value.MerchantId! },
-                { "merchant_key", PayfastOptions.Value.MerchantKey! },
-                { "return_url", $"{hostAddress}/payment-success?reference={orderHash}" },
-                { "cancel_url", $"{hostAddress}/payment-failed?reference={orderHash}" },
-                { "notify_url", "https://api.uat.midrandbooks.co.za/v1/payments/payfast/confirm" },
-                { "email_address", User?.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value! },
-                { "m_payment_id", orderHash },
-                { "amount", ShoppingCart.TotalAmount.ToString("F2", CultureInfo.InvariantCulture) },
-                { "item_name", "MidrandBooks Sale" },
-            };
-
-            var signature = PayfastService.GenerateSignature(CheckoutPayload!, PayfastOptions.Value.Passphrase).Value;
-            CheckoutPayload.Add("signature", signature);
-
-            StateHasChanged();
-
-            await JSRuntime.InvokeVoidAsync("eval", "document.getElementById('payfastForm').submit();");
-        }
-        catch(Exception ex)
-        {
-            ToastService.ShowError($"Failed to perform checkout: {ex.Message}", "Checkout");
-
-            IsProcessing = false;
-            StateHasChanged();
-        }
-    }
-}
@@ -2,7 +2,6 @@
 using LiteCharms.Features.MidrandBooks.AuthorBooks;
 using LiteCharms.Features.MidrandBooks.Authors;
 using LiteCharms.Features.MidrandBooks.Categories;
-using LiteCharms.Features.MidrandBooks.Payments;
 using LiteCharms.Features.MidrandBooks.Products;
 using LiteCharms.Features.MidrandBooks.Products.Models;
 using LiteCharms.Features.Models;
@@ -16,9 +15,6 @@ public partial class Home : ComponentBase
    [Inject] private AuthorService AuthorService { get; set; } = default!;
    [Inject] private CategoryService CategoryService { get; set; } = default!;
    [Inject] private NavigationManager Navigation { get; set; } = default!;
-    [Inject] private HydrationService HydrationService { get; set; } = default!;
-    [Inject] private CancellationToken CancellationToken { get; set; } = default!;
-    [Inject] private CartService CartService { get; set; } = default!;

    [SupplyParameterFromQuery(Name = "q")] public string? SharedSearchQuery { get; set; }
    [SupplyParameterFromQuery] public long? AuthorId { get; set; }
@@ -99,21 +95,6 @@ public partial class Home : ComponentBase

    private bool HasMoreItems => FilteredData.Count() > VisibleCount;

-    protected override async Task OnInitializedAsync()
-    {
-        if (CartService.ShoppingCart.Items.Count == 0)
-            await CartService.LoadCartFromStorageAsync();
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender == false && HydrationService.CartHydrated == false)
-        {
-            if(!CartService.ShoppingCart.CustomerId.HasValue)
-                await HydrationService.EnsureCustomerExistsAsync(CancellationToken);
-        }
-    }
-
    protected override async Task OnParametersSetAsync() => await LoadCatalogDataAsync();

    private async Task LoadCatalogDataAsync()
@@ -1,11 +1,10 @@
-@page "/payment-success"
-@rendermode InteractiveServer
-@inject NavigationManager Navigation
-@attribute [Authorize]
+@page "/payment-confirmation"

 <div class="container py-5">
    <div class="row justify-content-center">
        <div class="col-md-8 col-lg-6 text-center">
+
+            <!-- Success Icon & Message -->
            <div class="mb-4">
                <div class="d-inline-block p-4 rounded-circle bg-success bg-opacity-10 text-success mb-3">
                    <svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -17,23 +16,25 @@
                <p class="text-muted fs-5">Thank you for shopping with Midrand Books. Your order has been received and is being processed.</p>
                <div class="bg-light p-3 rounded mt-4">
                    <p class="mb-0 text-muted small text-uppercase fw-bold">Order Number</p>
-                    <h5 class="fw-bold mb-0">@PaymentReference</h5>
+                    <h5 class="fw-bold mb-0">#MB-2026-8834</h5>
                </div>
            </div>

+            <!-- Calls to Action -->
            <div class="d-grid gap-3 mt-5">
                <a href="/" class="btn btn-dark btn-lg rounded-pill py-3">Continue Shopping</a>
                <div class="row g-3">
                    <div class="col-6">
-                        <a href="/account" class="btn btn-outline-dark w-100 rounded-pill py-3">Order History</a>
+                        <a href="/order-history" class="btn btn-outline-dark w-100 rounded-pill py-3">Order History</a>
                    </div>
                    <div class="col-6">
-                        <a href="/account" class="btn btn-outline-dark w-100 rounded-pill py-3">Track Order</a>
+                        <a href="/track-order" class="btn btn-outline-dark w-100 rounded-pill py-3">Track Order</a>
                    </div>
                </div>
            </div>

-            <p class="mt-5 text-muted small">You will receive a confirmation email shortly at <strong>@CustomerEmail</strong>.</p>
+            <!-- Optional Trust Footer -->
+            <p class="mt-5 text-muted small">You will receive a confirmation email shortly at <strong>user@email.com</strong>.</p>
        </div>
    </div>
 </div>
@@ -1,40 +0,0 @@
-@page "/payment-failed"
-@rendermode InteractiveServer
-@inject NavigationManager Navigation
-@attribute [Authorize]
-
-<div class="container py-5">
-    <div class="row justify-content-center">
-        <div class="col-md-8 col-lg-6 text-center">
-            <div class="mb-4">
-                <div class="d-inline-block p-4 rounded-circle bg-danger bg-opacity-10 text-danger mb-3">
-                    <svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                        <circle cx="12" cy="12" r="10"></circle>
-                        <line x1="12" y1="8" x2="12" y2="12"></line>
-                        <line x1="12" y1="16" x2="12.01" y2="16"></line>
-                    </svg>
-                </div>
-                <h1 class="fw-bold mb-3">Payment Cancelled</h1>
-                <p class="text-muted fs-5">We couldn't process your transaction. Don't worry, no money was deducted from your account.</p>
-
-                <div class="bg-light p-3 rounded mt-4">
-                    <p class="mb-0 text-muted small text-uppercase fw-bold">Common Causes</p>
-                    <p class="mb-0 fs-6 text-dark mt-1">The order was cancelled / insufficient funds, incorrect card details, or a temporary bank gateway timeout.</p>
-                </div>
-            </div>
-
-            <div class="d-grid gap-3 mt-5">                
-                <div class="row g-3">
-                    <div class="col-6">
-                        <a href="/" class="btn btn-outline-dark w-100 rounded-pill py-3">View Store</a>
-                    </div>
-                    <div class="col-6">
-                        <a href="/support" class="btn btn-outline-dark w-100 rounded-pill py-3">Get Help</a>
-                    </div>
-                </div>
-            </div>
-
-            <p class="mt-5 text-muted small">If you noticed a charge or have any order questions, please contact our support desk with your account email <strong>shop@litecharms.co.za</strong>.</p>
-        </div>
-    </div>
-</div>
@@ -1,72 +0,0 @@
-using LiteCharms.Features;
-using LiteCharms.Features.Hasher;
-using LiteCharms.Features.MidrandBooks.Customers;
-using LiteCharms.Features.MidrandBooks.Orders;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Payments.Models;
-
-namespace MidrandBookshop.Components.Pages;
-
-public partial class PaymentFailed
-{
-    [Inject] public CartService CartService { get; set; } = default!;
-    [Inject] public OrderService OrderService { get; set; } = default!;
-    [Inject] private CustomerService CustomerService { get; set; } = default!;
-    [Inject] public PaymentService PaymentService { get; set; } = default!;
-    [Inject] public HashService HashService { get; set; } = default!;
-    [Inject] private AuthenticationStateProvider AuthStateProvider { get; set; } = default!;
-    [Inject] private CancellationToken CancellationToken { get; set; } = default!;
-
-    private ClaimsPrincipal? User { get; set; }
-
-    [Parameter]
-    [SupplyParameterFromQuery(Name = "reference")]
-    public string? PaymentReference { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        var authState = await AuthStateProvider.GetAuthenticationStateAsync();
-        User = authState!.User;
-
-        if (User?.Identity?.IsAuthenticated == false) Navigation.NavigateTo("/login");
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (!firstRender) return;
-
-        long orderId = HashService.DecodeLongIdHash(PaymentReference!).Value;
-
-        var customerEmail = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
-
-        var customerFetch = await CustomerService.GetCustomerAsync(customerEmail, CancellationToken);
-
-        if (customerFetch.IsFailed) return;
-
-        long customerId = customerFetch.Value.Id;
-
-        var orderUpdateResult = await OrderService.UpdateOrderStatusAsync(orderId, OrderStatus.Cancelled, CancellationToken);
-
-        if (orderUpdateResult.IsFailed) return;
-
-        var paymentIdFetch = await PaymentService.GetOrderPaymentAsync(orderId, CancellationToken);
-
-        if (paymentIdFetch.IsFailed) return;
-
-        await PaymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
-        {
-            CustomerId = customerId,
-            OrderId = orderId,
-            PaymentGatewayId = 1,
-            PaymentGatewayReference = PaymentReference,
-            PaymentId = paymentIdFetch.Value.Id,
-            Status = LedgerStatuses.Cancelled
-
-        }, CancellationToken);
-
-        CartService.Clear();
-        CartService.ShoppingCart.OrderId = null;
-        await CartService.SaveCartToStorageAsync();
-        CartService.NotifyStateChanged();
-    }
-}
@@ -1,70 +0,0 @@
-using LiteCharms.Features;
-using LiteCharms.Features.Hasher;
-using LiteCharms.Features.MidrandBooks.Customers;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Payments.Models;
-
-namespace MidrandBookshop.Components.Pages;
-
-public partial class PaymentSuccess
-{
-    [Inject] private CartService CartService { get; set; } = default!;
-    [Inject] private CustomerService CustomerService { get; set; } = default!;
-    [Inject] private PaymentService PaymentService { get; set; } = default!;
-    [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")]
-    public string? PaymentReference { get; set; }
-
-    private ClaimsPrincipal? User { get; set; }
-
-    private string? CustomerEmail { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        var authState = await AuthStateProvider.GetAuthenticationStateAsync();
-        User = authState!.User;
-
-        if (User?.Identity?.IsAuthenticated == false) Navigation.NavigateTo("/login");
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (!firstRender) return;
-
-        long orderId = HashService.DecodeLongIdHash(PaymentReference!).Value;
-        string orderHash = HashService.HashEncodeLongId(orderId).Value;
-
-        CustomerEmail = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
-
-        var customerFetch = await CustomerService.GetCustomerAsync(CustomerEmail, CancellationToken);
-
-        if (customerFetch.IsFailed) return;
-
-        long customerId = customerFetch.Value.Id;
-
-        var paymentIdFetch = await PaymentService.GetOrderPaymentAsync(orderId, CancellationToken);
-
-        if (paymentIdFetch.IsFailed) return;
-
-        await PaymentService.WriteLedgerEntryAsync(new CreateLedgerEntry
-        {
-            CustomerId = customerId,
-            OrderId = orderId,
-            PaymentGatewayId = 1,
-            PaymentGatewayReference = orderHash,
-            PaymentId = paymentIdFetch.Value.Id,
-            Status = LedgerStatuses.Changed
-
-        }, CancellationToken);
-
-        CartService.Clear();
-        CartService.ShoppingCart.OrderId = null;
-        await CartService.SaveCartToStorageAsync();
-        CartService.NotifyStateChanged();
-    }
-}
@@ -1,10 +1,10 @@
 using LiteCharms.Features;
 using LiteCharms.Features.MidrandBooks.Authors;
 using LiteCharms.Features.MidrandBooks.Authors.Models;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Payments.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;

@@ -17,7 +17,7 @@ public partial class ProductView : ComponentBase
    [Inject] private NavigationManager Navigation { get; set; } = default!;
    [Inject] private CartService CartService { get; set; } = default!;

-    protected Cart ShoppingCart => CartService?.ShoppingCart!;
+    protected Services.ShoppingCart.Models.Cart ShoppingCart => CartService?.ShoppingCart!;

    protected bool IsLoading { get; private set; } = true;
    protected Product? CurrentProduct { get; private set; }
@@ -32,6 +32,9 @@ public partial class ProductView : ComponentBase

    protected Author? CurrentAuthor { get; private set; }

+    private static Func<Services.ShoppingCart.Models.Cart, long, int> getCartItemQuantity = (shoppingCart, productPriceId) => 
+        shoppingCart.Items.FirstOrDefault(p => p.Price!.Id == productPriceId)?.Quantity ?? 1;
+
    protected override async Task OnParametersSetAsync()
    {
        try
@@ -94,7 +97,7 @@ public partial class ProductView : ComponentBase
        {
            CartService.UpdateQuantity(CurrentPrice!.Id, 1);
                        
-            Quantity = CartService.GetCartItemQuantity(ShoppingCart, CurrentPrice.Id);
+            Quantity = getCartItemQuantity(ShoppingCart, CurrentPrice.Id);

            await CartService.SaveCartToStorageAsync();
        }
@@ -105,7 +108,7 @@ public partial class ProductView : ComponentBase
        {
            CartService.UpdateQuantity(CurrentPrice!.Id, -1);

-            Quantity = CartService.GetCartItemQuantity(ShoppingCart, CurrentPrice.Id);
+            Quantity = getCartItemQuantity(ShoppingCart, CurrentPrice.Id);

            await CartService.SaveCartToStorageAsync();
        }
@@ -128,7 +131,7 @@ public partial class ProductView : ComponentBase

            CartService.AddItem(CurrentPrice, CurrentProduct, CurrentAuthor!);

-            Quantity = CartService.GetCartItemQuantity(ShoppingCart, CurrentPrice.Id);
+            Quantity = getCartItemQuantity(ShoppingCart, CurrentPrice.Id);

            await CartService.SaveCartToStorageAsync();
        }
@@ -31,3 +31,12 @@
        </div>
    </div>
 </div>
+
+@code {
+    protected override void OnInitialized()
+    {
+        var returnUrl = Navigation.ToBaseRelativePath(Navigation.Uri);
+
+        Navigation.NavigateTo($"/login?returnUrl={Uri.EscapeDataString(returnUrl)}", forceLoad: true);
+    }
+}
@@ -1,12 +0,0 @@
-namespace MidrandBookshop.Components;
-
-public partial class RedirectToLogin
-{
-    protected override void OnInitialized()
-    {
-        var relativePath = Navigation.ToBaseRelativePath(Navigation.Uri);
-        var sanitizedRedirectPath = relativePath.StartsWith('/') ? relativePath : $"/{relativePath}";
-
-        Navigation.NavigateTo($"/login?redirectUri={Uri.EscapeDataString(sanitizedRedirectPath)}", forceLoad: true);
-    }
-}
@@ -1,116 +0,0 @@
-using LiteCharms.Features.MidrandBooks.AuthorBooks;
-using LiteCharms.Features.MidrandBooks.Authors;
-using LiteCharms.Features.MidrandBooks.Customers;
-using LiteCharms.Features.MidrandBooks.Customers.Models;
-using LiteCharms.Features.MidrandBooks.Orders;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.MidrandBooks.Payments.Models;
-using LiteCharms.Features.MidrandBooks.Products;
-
-namespace MidrandBookshop;
-
-public sealed class HydrationService(AuthenticationStateProvider authStateProvider, CustomerService customerService,
-    ProductService productService, OrderService orderService, BooksService booksService, AuthorService authorService, 
-    CartService cartService)
-{
-    private Cart ShoppingCart => cartService.ShoppingCart;
-
-    private AuthenticationState? AuthState { get; set; }
-    private ClaimsPrincipal? User { get; set; }
-
-    public bool CartHydrated { get; set; }
-
-    public async Task EnsureCustomerExistsAsync(CancellationToken cancellationToken = default)
-    {
-        if (ShoppingCart.CustomerId > 0) return;
-
-        AuthState = await authStateProvider.GetAuthenticationStateAsync();
-        User = AuthState!.User;
-
-        if (User?.Identity?.IsAuthenticated == false) return;
-
-        var email = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)!.Value!;
-
-        var existingCustomer = await customerService.GetCustomerAsync(email, cancellationToken);
-
-        if (existingCustomer.IsSuccess)
-            ShoppingCart.CustomerId = existingCustomer.Value.Id;
-
-        if (existingCustomer.IsFailed)
-        {
-            var name = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value ?? string.Empty;
-            var lastname = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Surname)?.Value ?? string.Empty;
-            var mobile = User!.Claims.FirstOrDefault(c => c.Type == ClaimTypes.MobilePhone)?.Value ?? string.Empty;
-
-            var customerCreate = await customerService.CreateCustomerAsync(new CreateCustomer { Email = email }, cancellationToken);
-
-            if (customerCreate.IsSuccess && !string.IsNullOrWhiteSpace(name))
-            {
-                ShoppingCart.CustomerId = customerCreate.Value;
-
-                if (!string.IsNullOrWhiteSpace(name))
-                    await customerService.CreateCustomerContactAsync((long)ShoppingCart.CustomerId, new CreateCustomerContact
-                    {
-                        Email = email,
-                        Name = name,
-                        LastName = lastname,
-                        Phone = mobile,
-                        Type = LiteCharms.Features.ContactTypes.Personal
-                    }, cancellationToken);
-            }
-        }
-    }
-
-    public async Task RehydrateCartFromPendingOrderAsync(CancellationToken cancellationToken = default)
-    {
-        if (User?.Identity?.IsAuthenticated == false) return;
-
-        if (ShoppingCart.OrderId.HasValue && ShoppingCart.CustomerId.HasValue)
-        {
-            cartService.CalculateTotalPrice();
-            CartHydrated = true;
-
-            return;
-        }
-
-        var orderResult = await orderService.GetPendingOrderAsync((long)ShoppingCart.CustomerId!, cancellationToken);
-
-        if (orderResult.IsFailed) return;
-
-        if(orderResult.Value.Id == ShoppingCart.OrderId)
-        {
-            cartService.CalculateTotalPrice();
-            CartHydrated = true;
-
-            return;
-        }
-
-        var orderItemsResult = await orderService.GetOrderItemsAsync((long)orderResult.Value.Id!, cancellationToken);
-
-        ShoppingCart.OrderId = orderResult.Value.Id;
-
-        if(orderItemsResult.IsFailed) return;
-
-        foreach (var item in orderItemsResult.Value)
-        {
-            var priceFetchResult = await productService.GetProductPriceAsync(item.ProductPriceId, cancellationToken);
-
-            if (priceFetchResult.IsFailed) continue;
-
-            var bookFetchResult = await booksService.GetBookByProductIdAsync(priceFetchResult.Value.ProductId, cancellationToken);
-
-            if (bookFetchResult.IsFailed) continue;
-
-            var authorFetchResult = await authorService.GetAuthorAsync(bookFetchResult.Value.AuthorId, cancellationToken);
-
-            if (authorFetchResult.IsFailed) continue;
-            
-            if(!ShoppingCart.Items.Any(i => i.Price!.Id == item.ProductPriceId))
-                cartService.AddItem(priceFetchResult.Value, bookFetchResult.Value.Product!, authorFetchResult.Value);
-        }
-
-        CartHydrated = true;
-
-        await cartService.SaveCartToStorageAsync();
-    }
-}
@@ -18,13 +18,13 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.137.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.101.0" />
  </ItemGroup>

  <!-- UI -->
  <ItemGroup>
    <PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
-    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.137.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.101.0" />
    
    <!-- Global Usings -->
    <Using Include="Blazored.Toast.Services" />
@@ -51,18 +51,11 @@
  <!-- Shared Global Usings -->
  <ItemGroup>
    <Using Include="Blazored.Toast" />
-    <Using Include="Microsoft.JSInterop" />
-    <Using Include="System.Globalization" />
-    <Using Include="System.Security.Claims" />
-    <Using Include="Microsoft.Extensions.Options" />
-    <Using Include="Microsoft.EntityFrameworkCore" />
-    <Using Include="Microsoft.AspNetCore.HttpOverrides" />
    <Using Include="Microsoft.AspNetCore.Components.Authorization" />
    <Using Include="Microsoft.AspNetCore.Components.Routing" />
    <Using Include="Microsoft.AspNetCore.Components.Web" />
    <Using Include="Microsoft.AspNetCore.WebUtilities" />
    <Using Include="Microsoft.AspNetCore.Components" />
-    <Using Include="System.Security.Cryptography.X509Certificates" />
  </ItemGroup>

 </Project>
@@ -1,51 +1,74 @@
 using LiteCharms.Features.Extensions;
-using LiteCharms.Features.Postgres;
-using MidrandBookshop;
+using LiteCharms.Features.Mediator;
+using LiteCharms.Features.MidrandBooks.Extensions;
+using Microsoft.AspNetCore.HttpOverrides;
 using MidrandBookshop.Components;
+using MidrandBookshop.Services.ShoppingCart;
 using static LiteCharms.Features.Extensions.Quartz;

 var builder = WebApplication.CreateBuilder(args);

+builder.Services.AddRazorComponents()
+    .AddInteractiveServerComponents();
+
 builder.AddMonitoring();
-builder.Services.RegisterServices(builder.Configuration);
+builder.Services.AddEndpointsApiExplorer();
+
+builder.Services.AddMediator();
+builder.Services.AddLiteCharmsWebSecurity(builder.Configuration);
+
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
+builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
+
+builder.Services.AddQuartzSchedulerClient(MidrandShopSchedulerName, builder.Configuration);
+
+builder.Services.AddEmailServices(builder.Configuration);
+builder.Services.AddEmailServiceBus();
+
+builder.Services.AddHttpClient();
+builder.Services.AddShopServices();
+builder.Services.AddScoped<CartService>();
+builder.Services.AddHashServices(builder.Configuration);
+builder.Services.AddMidrandShopDatabase(builder.Configuration);
+
+builder.Services.AddMidrandShopPostgresHealthCheck();
+builder.Services.AddMidrandShopQuartzHealthCheck();
+builder.Services.AddHealthChecksSupport(builder.Configuration);
+
+builder.Services.Configure<ForwardedHeadersOptions>(options =>
+{
+    options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
+    options.KnownProxies.Clear();
+});

 var app = builder.Build();

+app.UseForwardedHeaders();
+app.AddSecurityEndpoints();
+
+var schedulerFactory = app.Services.GetRequiredService<ISchedulerFactory>();
+var scheduler = await schedulerFactory.GetScheduler(MidrandShopSchedulerName);
+
+if (!scheduler!.IsStarted)
+    await scheduler.Start();
+
 if (!app.Environment.IsDevelopment())
 {
    app.UseExceptionHandler("/Error", createScopeForErrors: true);
    app.UseHsts();
 }

-app.UseForwardedHeaders();
-app.UseHttpsRedirection();
-
-app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true);
 app.UseHealthChecks("/health", new HealthCheckOptions
 {
    ResponseWriter = HealthChecks.UI.Client.UIResponseWriter.WriteHealthCheckUIResponse
 });

-app.MapStaticAssets();
-app.UseCookiePolicy();
+app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true);
+app.UseHttpsRedirection();

-app.UseAuthentication();
-app.UseAuthorization();
 app.UseAntiforgery();
-app.AddSecurityEndpoints();
-
-using (var security = app.Services.CreateScope())
-{
-    var dataProtectionContext = security.ServiceProvider.GetRequiredService<DataProtectionDbContext>();
-
-    await dataProtectionContext.Database.MigrateAsync();
-}
-
-var schedulerFactory = app.Services.GetRequiredService<ISchedulerFactory>();
-var scheduler = await schedulerFactory.GetScheduler(MidrandShopSchedulerName);
-
-if (!scheduler!.IsStarted) await scheduler.Start();

+app.MapStaticAssets();
 app.MapRazorComponents<App>()
    .AddInteractiveServerRenderMode();

@@ -14,7 +14,7 @@
        "commandName": "Project",
        "dotnetRunMessages": true,
        "launchBrowser": false,
-        "applicationUrl": "https://localhost:8443;http://localhost:8080",
+        "applicationUrl": "https://localhost:7021;http://localhost:5053",
        "environmentVariables": {
          "ASPNETCORE_ENVIRONMENT": "Development"
        }
@@ -0,0 +1,150 @@
+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;
+
+namespace MidrandBookshop.Services.ShoppingCart;
+
+public sealed class CartService(LocalStorageService localStorage)
+{
+    private readonly string CartStorageKey = HashService.ToMd5Hash(nameof(Cart)).Value;
+
+    public Cart ShoppingCart { get; private set; } = new();
+
+    public event Action? OnCartChanged;
+
+    public Cart GetCart() => ShoppingCart;
+
+    public void NotifyStateChanged() => OnCartChanged?.Invoke();
+
+    public async Task LoadCartFromStorageAsync()
+    {
+        var loadResult = await localStorage.GetAsync<Cart>(CartStorageKey);
+
+        if (loadResult.IsFailed) await localStorage.SaveAsync(CartStorageKey, ShoppingCart);
+
+        if (loadResult.IsSuccess) ShoppingCart = loadResult.Value;
+
+        NotifyStateChanged();
+    }
+
+    public async Task SaveCartToStorageAsync() => await localStorage.SaveAsync(CartStorageKey, ShoppingCart);
+
+    public void AddItem(ProductPrice productPrice, Product product, Author author)
+    {
+        var itemExists = false;
+
+        for (var i = 0; i < ShoppingCart.Items.Count; i++)
+        {
+            if (ShoppingCart.Items[i].Price!.Id == productPrice.Id)
+            {
+                ShoppingCart.Items[i].Quantity++;
+                ShoppingCart.Items[i].Amount += productPrice.Amount;
+
+                itemExists = true;
+
+                break;
+            }
+        }
+
+        if (!itemExists)
+            ShoppingCart.Items.Add(new CartItem
+            {
+                Product = product,
+                Author = author,
+                Price = productPrice,
+                Amount = productPrice.Amount,
+                Quantity = 1,
+            });
+
+        CalculateTotalPrice();
+        NotifyStateChanged();
+    }
+
+    public void UpdateQuantity(long productPriceId, int delta)
+    {
+        for (var i = 0; i < ShoppingCart.Items.Count; i++)
+        {
+            if (ShoppingCart.Items[i].Price!.Id == productPriceId)
+            {
+                var oldQuantity = ShoppingCart.Items[i].Quantity;
+                var pricePerUnit = ShoppingCart.Items[i].Price!.Amount;
+
+                ShoppingCart.Items[i].Quantity += delta;
+                ShoppingCart.Items[i].Amount = pricePerUnit * ShoppingCart.Items[i].Quantity;
+                break;
+            }
+        }
+
+        CalculateTotalPrice();
+        NotifyStateChanged();
+    }
+
+    public void RemoveOneItem(long productPriceId)
+    {
+        for (var i = 0; i < ShoppingCart.Items.Count; i++)
+        {
+            if (ShoppingCart.Items[i].Price!.Id == productPriceId)
+            {
+                if (ShoppingCart.Items[i].Quantity <= 1)
+                {
+                    ShoppingCart.Items.Remove(ShoppingCart.Items[i]);
+
+                    break;
+                }
+                else
+                {
+                    ShoppingCart.Items[i].Quantity--;
+                    ShoppingCart.Items[i].Amount -= ShoppingCart.Items[i].Price!.Amount;
+                }
+
+                break;
+            }
+        }
+
+        CalculateTotalPrice();
+        NotifyStateChanged();
+    }
+
+    public void RemoveAllSameItem(long productPriceId)
+    {
+        if (ShoppingCart.Items.Count == 0) return;
+
+        var item = ShoppingCart.Items.FirstOrDefault(i => i.Price?.Id == productPriceId);
+
+        if (item is not null) ShoppingCart.Items.Remove(item);
+
+        CalculateTotalPrice();
+        NotifyStateChanged();
+    }
+
+    public void Clear()
+    {
+        if(ShoppingCart.CustomerId is not null || ShoppingCart.OrderId is not null)
+        {
+            ShoppingCart.TotalPrice = 0;
+            ShoppingCart.TotalVat = 0;
+            ShoppingCart.Items.Clear();
+
+            return;
+        }
+
+        ShoppingCart = new Cart();
+
+        NotifyStateChanged();
+    }
+
+    public decimal CalculateTotalPrice()
+    {
+        if (ShoppingCart.Items.Count == 0) return 0;
+
+        var gross = ShoppingCart.Items.Sum(i => i.Amount);
+
+        if (!ShoppingCart.IsVatInclusive) ShoppingCart.TotalVat = gross * ShoppingCart.VatRate;
+
+        ShoppingCart.TotalPrice = gross + ShoppingCart.TotalVat;
+
+        return ShoppingCart.TotalPrice;
+    }
+}
@@ -0,0 +1,18 @@
+namespace MidrandBookshop.Services.ShoppingCart.Models;
+
+public sealed class Cart
+{
+    public long? CustomerId { get; set; }
+
+    public long? OrderId { get; set; }
+
+    public decimal TotalPrice { get; set; }
+
+    public decimal TotalVat { get; set; }
+
+    public decimal VatRate { get; set; } = 0.15m;
+
+    public bool IsVatInclusive { get; set; } = true;
+
+    public IList<CartItem> Items { get; set; } = [];
+}
@@ -0,0 +1,17 @@
+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 int Quantity { get; set; }
+
+    public decimal Amount { get; set; }
+}
@@ -1,62 +0,0 @@
-using LiteCharms.Features.Mediator;
-using LiteCharms.Features.MidrandBooks.Payments;
-using LiteCharms.Features.Extensions;
-using LiteCharms.Features.MidrandBooks.Extensions;
-using static LiteCharms.Features.Extensions.Quartz;
-
-namespace MidrandBookshop;
-
-public static class Setup
-{
-    public static IServiceCollection RegisterServices(this IServiceCollection services, IConfiguration configuration)
-    {
-        services.AddCancellationToken();
-        services.AddAntiforgery();
-
-        services.AddRazorComponents()
-            .AddInteractiveServerComponents();
-
-        services.AddBlazoredToast();
-        
-        services.AddEndpointsApiExplorer();
-
-        services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
-        services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
-
-        services.AddQuartzSchedulerClient(MidrandShopSchedulerName, configuration);
-
-        services.AddMediator();
-        services.AddEmailServices(configuration);
-        services.AddEmailServiceBus();
-
-        services.AddHttpClient();
-        services.AddScoped<CartService>();
-        services.AddScoped<HydrationService>();
-        services.AddShopServices(includeLocalStorage: true);
-        services.AddHashServices(configuration);
-        services.AddPayfastServices(configuration);
-
-        services.AddDataProtectionDatabase(configuration);
-        services.AddMidrandShopDatabase(configuration);
-
-        services.AddSecurityApiSdk(configuration);
-        services.AddLiteCharmsWebSecurity(configuration);
-
-        services.AddMidrandShopPostgresHealthCheck();
-        services.AddMidrandShopQuartzHealthCheck();
-        services.AddHealthChecksSupport(configuration);
-
-        services.Configure<ForwardedHeadersOptions>(options =>
-        {
-            options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-
-            options.KnownProxies.Clear();
-            options.KnownIPNetworks.Clear();
-
-            options.ForwardLimit = null;
-            options.RequireHeaderSymmetry = false;
-        });
-
-        return services;
-    }
-}
@@ -1,22 +1,7 @@
 {
-  "PayfastSettings": {
-    "CheckoutUrl": "https://sandbox.payfast.co.za/eng/process",
-    "ValidHosts": [
-      "www.payfast.co.za",
-      "sandbox.payfast.co.za",
-      "ips.payfast.co.za",
-      "api.payfast.co.za",
-      "payment.payfast.io"
-    ]
-  },
  "LiteCharmsSettings": {
    "Authority": "https://sts.security.khongisa.co.za"
  },
-  "LiteCharmsClientSettings": {
-    "Authority": "https://sts.security.khongisa.co.za",
-    "GrantType": "client_credentials",
-    "Scope": "midrandbooks-api"
-  },
  "HasherSettings": {
    "MinHashLength": 11
  },
@@ -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;
-}
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -9,8 +10,8 @@ metadata:
  name: midrandbooks-config
  namespace: midrandbooks-uat
 data:
-  ASPNETCORE_ENVIRONMENT: "Development"  
-  ASPNETCORE_URLS: "http://0.0.0.0:8443"
+  ASPNETCORE_ENVIRONMENT: "Development"
+  ASPNETCORE_URLS: "http://0.0.0.0:8080"
  Monitoring__Address: "http://aspire-dashboard-service.aspire.svc.cluster.local:18889"
  Monitoring__ServiceName: "MidrandBooks.Uat"
  HasherSettings__MinHashLength: "11"
@@ -18,17 +19,33 @@ data:
  BookshopS3Settings__Region: "garage"
  BookshopS3Settings__BucketName: "bookshop"
  BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za"
-  PayfastSettings__CheckoutUrl: "https://sandbox.payfast.co.za/eng/process"
-  PayfastSettings__ValidHosts__0: "www.payfast.co.za"
-  PayfastSettings__ValidHosts__1: "sandbox.payfast.co.za"
-  PayfastSettings__ValidHosts__2: "ips.payfast.co.za"
-  PayfastSettings__ValidHosts__3: "api.payfast.co.za"
-  PayfastSettings__ValidHosts__4: "payment.payfast.io"
+  ValidPayfastHosts__0: "www.payfast.co.za"
+  ValidPayfastHosts__1: "sandbox.payfast.co.za"
+  ValidPayfastHosts__2: "w1w.payfast.co.za"
+  ValidPayfastHosts__3: "w2w.payfast.co.za"
+  ValidPayfastHosts__4: "ips.payfast.co.za"
+  ValidPayfastHosts__5: "api.payfast.co.za"
+  ValidPayfastHosts__6: "payment.payfast.io"
  LiteCharmsSettings__Authority: "https://sts.security.khongisa.co.za"
  LiteCharmsSettings__Audience: "midrandbooks-api"
-  LiteCharmsClientSettings__Authority: "https://sts.security.khongisa.co.za"
-  LiteCharmsClientSettings__GrantType: "client_credentials"
-  LiteCharmsClientSettings__Scope: "midrandbooks-api"
+  ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: midrandbooks-secrets
+  namespace: midrandbooks-uat
+type: Opaque
+data:  
+  connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
+  connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
+  aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
+  hasher-salt: VEdsbmFIUWdRMmhoY20xekxDQk5hV1J5WVc1a1FtOXZhM01nYldGclpTQnNiM1J6SUc5bUlHMXZibVY1SUdGdVpDQmhjbVVnWVNCemRXTmpaWE56Wm5Wc0lIWnBjbUZzSUhOMGIzSjVJR2x1SUZOdmRYUm9JRUZtY21sallRPT0=
+  hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
+  bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
+  bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
+  litecharms-clientid: bWlkcmFuZGJvb2tzLXVhdA==
+  litecharms-clientsecret: c2VjcmV0Xzc3OGJkODM3NWFjNGE3Mzg2N2QxZDdhNjcwODJlZTJjNGU4NmUwODYwYmI0Y2ZlZWI5NDExOTQ5OTk2ZThhOGU=
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -49,7 +66,6 @@ metadata:
  namespace: midrandbooks-uat
 spec:
  replicas: 2
-  revisionHistoryLimit: 0
  selector:
    matchLabels:
      app: midrandbooks
@@ -77,60 +93,76 @@ spec:
              memory: "256Mi"
              cpu: "100m"
          ports:
-            - containerPort: 8443
+            - containerPort: 8080
          envFrom:
            - configMapRef:
                name: midrandbooks-config
-            - secretRef:
-                name: midrandbooks-secrets          
          env:
-            - name: DataProtection__Certificate
+            - name: LiteCharmsSettings__ClientId
              valueFrom:
                secretKeyRef:
-                  name: litecharms-certs
-                  key: litecharms.pfx
-            - name: DataProtection__Password
+                  name: midrandbooks-secrets
+                  key: litecharms-clientid
+            - name: LiteCharmsSettings__ClientSecret
              valueFrom:
                secretKeyRef:
-                  name: litecharms-certs
-                  key: passphrase
+                  name: midrandbooks-secrets
+                  key: litecharms-clientsecret
+            - name: BookshopS3Settings__AccessKey
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: bookshop-s3-accesskey
+            - name: BookshopS3Settings__SecretKey
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: bookshop-s3-secretkey
+            - name: HasherSettings__Salt
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: hasher-salt
+            - name: HasherSettings__PayfastPassphrase
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: hasher-payfastpassphrase
+            - name: ConnectionStrings__PostgresScheduler
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: connection-string-quartz
+            - name: ConnectionStrings__PostgresMidrandBooks
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: connection-string
+            - name: Monitoring__ApiKey
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: aspire-apikey
          volumeMounts:
-            - name: cluster-certs-volume
-              mountPath: /tmp/litecharms-raw-certs
-              readOnly: true
            - name: data
-              mountPath: /app/content
-              subPath: bookshop-content
-          lifecycle:
-            postStart:
-              exec:
-                command:
-                  - /bin/sh
-                  - -c
-                  - |
-                    cp /tmp/litecharms-raw-certs/litecharms.crt /usr/local/share/ca-certificates/litecharms.crt
-                    update-ca-certificates
+              mountPath: /app/wwwroot/content
+              resources:          
          livenessProbe:
            httpGet:
              path: /health
-              port: 8443
-              scheme: HTTP
+              port: 8080
            initialDelaySeconds: 5
            periodSeconds: 10
          readinessProbe:
            httpGet:
              path: /health
-              port: 8443
-              scheme: HTTP
+              port: 8080
            initialDelaySeconds: 3
            periodSeconds: 5
      volumes:
        - name: data
          persistentVolumeClaim:
            claimName: midrandbooks-pvc
-        - name: cluster-certs-volume
-          secret:
-            secretName: litecharms-certs
 ---
 apiVersion: v1
 kind: Service
@@ -138,12 +170,14 @@ metadata:
  name: midrandbooks-service
  namespace: midrandbooks-uat
 spec:
-  ports:
-    - name: https
-      port: 443
-      targetPort: 8443
+  type: ClusterIP
  selector:
    app: midrandbooks
+  ports:
+    - name: http
+      protocol: TCP
+      port: 80
+      targetPort: 8080
 ---
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
@@ -158,11 +192,10 @@ spec:
      kind: Rule
      services:
        - name: midrandbooks-service
-          port: 443
+          port: 80
          sticky:
            cookie:
              name: "lp-sticky-session"
              httpOnly: true
              secure: true
-          scheme: http
  tls: {}
Author	SHA1	Message	Date
khwezi	9629d9ddf9	Merge pull request 'Wired up CartDrawel and ProductView to cart service and local storage' (#53 ) from cart into main Reviewed-on: #53	2026-06-10 23:02:07 +02:00
khwezi	7a11572294	Merge pull request 'cart' (#52 ) from cart into main Reviewed-on: #52	2026-06-09 23:41:28 +02:00
khwezi	a75bf5951d	Merge pull request 'Fixed manifest secret name' (#51 ) from mock-data into main Reviewed-on: #51	2026-06-07 16:51:40 +02:00
khwezi	bbcf64aa65	Merge pull request 'Stable user session management' (#50 ) from mock-data into main Reviewed-on: #50	2026-06-07 16:39:15 +02:00
khwezi	a688bc816a	Merge pull request 'Updated packages' (#49 ) from mock-data into main Reviewed-on: #49	2026-06-05 09:26:44 +02:00
khwezi	4fe801583e	Merge pull request 'Build trigger' (#48 ) from mock-data into main Reviewed-on: #48	2026-06-05 09:08:18 +02:00
khwezi	af3d40531b	Merge pull request 'Removd proto handling from login process' (#47 ) from mock-data into main Reviewed-on: #47	2026-06-05 09:00:10 +02:00
khwezi	bc2b9f81e0	Merge pull request 'Simplified logn and logout process' (#46 ) from mock-data into main Reviewed-on: #46	2026-06-05 08:22:30 +02:00
khwezi	49279c0cec	Merge pull request 'Added port stripping' (#45 ) from mock-data into main Reviewed-on: #45	2026-06-05 07:40:24 +02:00
khwezi	edabe266e5	Merge pull request 'Refactored https logni proto handling' (#44 ) from mock-data into main Reviewed-on: #44	2026-06-05 06:44:12 +02:00
khwezi	248dd32b1b	Merge pull request 'Added support for forwarded headers' (#43 ) from mock-data into main Reviewed-on: #43	2026-06-05 06:30:37 +02:00
khwezi	1645b6bbae	Merge pull request 'Fixed secrets mappings' (#42 ) from mock-data into main Reviewed-on: #42	2026-06-05 06:17:30 +02:00
khwezi	72725a302a	Merge pull request 'mock-data' (#41 ) from mock-data into main Reviewed-on: #41	2026-06-05 05:58:44 +02:00
khwezi	f3d79174be	Merge pull request 'Upgraded quartz' (#40 ) from mock-data into main Reviewed-on: #40	2026-06-03 11:54:17 +02:00
khwezi	c086aa60e4	Merge pull request 'Updated backend' (#39 ) from mock-data into main Reviewed-on: #39	2026-06-02 00:31:16 +02:00
khwezi	66b377bf69	Merge pull request 'Fixed event service discovery issue' (#38 ) from mock-data into main Reviewed-on: #38	2026-06-01 23:39:37 +02:00
khwezi	82389a9304	Merge pull request 'Updated backend' (#37 ) from mock-data into main Reviewed-on: #37	2026-06-01 22:58:55 +02:00
khwezi	4bf1d2e77a	Merge pull request 'Ensured appsettings aligns with k8s config' (#36 ) from mock-data into main Reviewed-on: #36	2026-06-01 16:37:57 +02:00
khwezi	2b6576de85	Merge pull request 'Refactored app k8s manifest' (#35 ) from mock-data into main Reviewed-on: #35	2026-06-01 11:16:54 +02:00
khwezi	7de957ed6f	Merge pull request 'Refactored manifest to include s3 bucket and HasherService configs and secrets' (#34 ) from mock-data into main Reviewed-on: #34	2026-06-01 09:50:59 +02:00
khwezi	16fdcc8005	Merge pull request 'Authors now showing on the listing' (#31 ) from mock-data into main Reviewed-on: #31	2026-05-30 22:23:09 +02:00
khwezi	a614d14da5	Merge pull request 'mock-data' (#30 ) from mock-data into main Reviewed-on: #30	2026-05-30 21:01:05 +02:00
khwezi	b722ea2cd0	Merge pull request 'mock-data' (#29 ) from mock-data into main Reviewed-on: #29	2026-05-30 19:06:49 +02:00
khwezi	73145fd360	Merge pull request 'Upgraded backend services' (#28 ) from ui-design into main Reviewed-on: #28	2026-05-30 00:32:23 +02:00
khwezi	7f29680993	Merge pull request 'ui-design' (#18 ) from ui-design into main Reviewed-on: #18	2026-05-24 11:30:13 +02:00
khwezi	56626d2693	Merge pull request 'ui-design' (#17 ) from ui-design into main Reviewed-on: #17	2026-05-24 10:48:55 +02:00
khwezi	f9f6788c79	Merge pull request 'Updated UAT url' (#16 ) from project-setup into main Reviewed-on: #16	2026-05-23 12:17:28 +02:00
khwezi	249ad319d9	Merge pull request 'Fixed dependencies and config' (#15 ) from project-setup into main Reviewed-on: #15	2026-05-23 12:06:13 +02:00
khwezi	4a476febf4	Merge pull request 'Basic project setup' (#14 ) from project-setup into main Reviewed-on: #14	2026-05-23 10:56:41 +02:00