Merge pull request 'Build trigger' (#48) from mock-data into main

Reviewed-on: #48

MidrandBookshop/Components/Layout/CartItem.cs

@@ -1,10 +0,0 @@
-namespace MidrandBookshop.Components.Layout;
-
-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; }
-    }

MidrandBookshop/Components/Layout/MainLayout.razor

@@ -167,7 +167,7 @@
                             <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2" />
                             <circle cx="12" cy="7" r="4" />
                         </svg>
-                        LogIn
+                        Account
                     </a>
 
                     <a href="/profile" class="btn btn-sm btn-dark rounded-circle d-inline-flex d-md-none align-items-center justify-content-center border-0 p-0 shadow-sm"

MidrandBookshop/Components/Pages/Home.razor

@@ -1,7 +1,9 @@
 @page "/"
 @rendermode InteractiveServer
 
-<div id="top-target" class="container text-center text-hero-wrapper">
+<div id="top-target" @ref="topTargetRef" class="container text-center text-hero-wrapper" />
+
+<div class="container text-center text-hero-wrapper">
     <h1 class="display-3 text-dark mb-3 px-2 master-headline">
         Discover thoughtfully curated<br>books for every reader.
     </h1>
@@ -147,7 +149,7 @@
             {
                 <BookCard Id="@book.Id"
                           Title="@book.Name"
-                          Author="@(ActiveAuthorFilterName ?? "Multiple Authors")"
+                          Author="@(ProductAuthorCache.TryGetValue(book.Id, out var authorName) ? authorName : "Unknown Author")"
                           Price="@ProductPriceCache[book.Id]"
                           Category="@ProductPrimaryCategoryCache[book.Id]"
                           IsNew="@book.Enabled"
@@ -166,7 +168,7 @@
                      @onclick="() => NavigateToProduct(book.Id)">
                     <div class="d-flex align-items-center gap-4 structural-list-left">
                         <span class="text-dark fw-medium list-item-title">@book.Name</span>
-                        <span class="text-muted small list-item-author">by @(ActiveAuthorFilterName ?? "Multiple Authors")</span>
+                        <span class="text-muted small list-item-author">by @(ProductAuthorCache.TryGetValue(book.Id, out var authorName) ? authorName : "Unknown Author")</span>
                         <span class="badge bg-light text-secondary border rounded-pill px-2.5 py-1 font-monospace list-item-tag">@ProductPrimaryCategoryCache[book.Id].ToUpper()</span>
                     </div>
                     <div class="d-flex align-items-center gap-4">
@@ -196,7 +198,6 @@
 
 <a class="back-to-top-btn d-flex align-items-center justify-content-center"
    aria-label="Back to top"
-   href="#top-target"
+   href="#top-target">
-   onclick="window.scrollTo({top: 0, behavior: 'smooth'}); return false;">
     <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5"><line x1="12" y1="19" x2="12" y2="5" /><polyline points="5,12 12,5 19,12" /></svg>
 </a>

MidrandBookshop/Components/Pages/Home.razor.cs

@@ -1,4 +1,4 @@
-using LiteCharms.Features.MidrandBooks;
+using LiteCharms.Features;
 using LiteCharms.Features.MidrandBooks.AuthorBooks;
 using LiteCharms.Features.MidrandBooks.Authors;
 using LiteCharms.Features.MidrandBooks.Categories;
@@ -19,6 +19,7 @@ public partial class Home : ComponentBase
     [SupplyParameterFromQuery(Name = "q")] public string? SharedSearchQuery { get; set; }
     [SupplyParameterFromQuery] public long? AuthorId { get; set; }
 
+    private ElementReference topTargetRef;
     public enum ViewMode { Grid, List }
     private ViewMode CurrentViewMode = ViewMode.Grid;
     private string ActiveCategory = "All";

MidrandBookshop/Components/Pages/Home.razor.css

@@ -170,3 +170,8 @@ html {
         border-color: #ffffff !important;
         box-shadow: 0 0 0 2px #1a1a1a, 0 6px 16px rgba(0, 0, 0, 0.25) !important;
     }
+
+/* Direct the smooth scroll action straight to the layout viewport boundary */
+#top-target {
+    scroll-margin-top: 100vh;
+}

MidrandBookshop/Components/Pages/ProductView.razor.cs

@@ -1,4 +1,4 @@
-using LiteCharms.Features.MidrandBooks;
+using LiteCharms.Features;
 using LiteCharms.Features.MidrandBooks.Authors;
 using LiteCharms.Features.MidrandBooks.Authors.Models;
 using LiteCharms.Features.MidrandBooks.Products;
@@ -35,7 +35,6 @@ public partial class ProductView : ComponentBase
             CurrentAuthor = null;
             Thumbnails.Clear();
 
-            // 1. Resolve product listing details
             var productResult = await ProductService.GetProductAsync(BookId);
 
             if (productResult.IsSuccess && productResult.Value != null)
@@ -43,31 +42,24 @@ public partial class ProductView : ComponentBase
                 CurrentProduct = productResult.Value;
                 AuthorName = CurrentProduct.Metadata?.Manufacturer ?? "Unknown Author";
 
-                // 2. Load pricing data
                 var priceResult = await ProductService.GetProductPriceAsync(BookId);
                 LivePrice = priceResult.IsSuccess ? priceResult.Value.Amount : 0m;
 
-                // 3. Extract active catalog categories
                 var categoryResult = await ProductService.GetProductCategoriesAsync(BookId);
                 if (categoryResult.IsSuccess && categoryResult.Value.Length > 0)
-                {
                     PrimaryCategory = categoryResult.Value[0].Name ?? "General";
-                }
 
-                // 4. Retrieve complete contextual model through the newly instantiated AuthorService lookup
                 var authorResult = await AuthorService.GetAuthorByProductIdAsync(BookId);
                 if (authorResult.IsSuccess && authorResult.Value != null)
                 {
                     CurrentAuthor = authorResult.Value;
 
-                    // Format fully qualified author text cleanly depending on their publisher model details
                     if (CurrentAuthor.PublisherType == PublisherTypes.Company && !string.IsNullOrWhiteSpace(CurrentAuthor.Company))
                         AuthorName = CurrentAuthor.Company;
                     else
                         AuthorName = $"{CurrentAuthor.Name} {CurrentAuthor.LastName}".Trim();
                 }
 
-                // 5. Build presentation image viewer variables
                 if (!string.IsNullOrWhiteSpace(CurrentProduct.ImageUrl))
                     Thumbnails.Add(CurrentProduct.ImageUrl);
 

MidrandBookshop/Components/Pages/Profile.razor

@@ -1,198 +1,209 @@
 @page "/profile"
+@using Microsoft.AspNetCore.Components.Authorization
+@inject NavigationManager Navigation
+@rendermode InteractiveServer
 
-<div class="container py-5">
+<AuthorizeView>
-    <h2 class="fw-bold mb-5 tracking-tight">My Account</h2>
+    <Authorized>
-    <div class="row g-5">
+        <div class="container py-5">
-        <div class="col-md-3">
+            <h2 class="fw-bold mb-5 tracking-tight">My Account</h2>
-            <div class="nav flex-column nav-pills" role="tablist">
+            <div class="row g-5">
-                <button class="nav-link active text-start" data-bs-toggle="pill" data-bs-target="#orders" role="tab">Order History</button>
+                <div class="col-md-3">
-                <button class="nav-link text-start" data-bs-toggle="pill" data-bs-target="#shipping" role="tab">Shipping Address</button>
+                    <div class="nav flex-column nav-pills" role="tablist">
-                <button class="nav-link text-start" data-bs-toggle="pill" data-bs-target="#profile" role="tab">Profile Settings</button>
+                        <button class="nav-link active text-start" data-bs-toggle="pill" data-bs-target="#orders" role="tab">Order History</button>
-                <hr />
+                        <button class="nav-link text-start" data-bs-toggle="pill" data-bs-target="#shipping" role="tab">Shipping Address</button>
-                <button class="nav-link text-danger text-start">Logout</button>
+                        <button class="nav-link text-start" data-bs-toggle="pill" data-bs-target="#profile" role="tab">Profile Settings</button>
-            </div>
+                        <hr />
-        </div>
+                        <button class="nav-link text-danger text-start" @onclick="TriggerLogout">Logout</button>
-
-        <div class="col-md-9">
-            <div class="tab-content">
-
-                <div class="tab-pane fade show active" id="orders" role="tabpanel">
-                    <div class="d-flex justify-content-between align-items-center mb-4">
-                        <h5 class="fw-bold m-0">Order History</h5>
                     </div>
+                </div>
 
-                    <div class="d-flex flex-column gap-3">
+                <div class="col-md-9">
-                        @if (orderHistory != null)
+                    <div class="tab-content">
-                        {
+
-                            @foreach (var order in orderHistory)
+                        <div class="tab-pane fade show active" id="orders" role="tabpanel">
+                            <div class="d-flex justify-content-between align-items-center mb-4">
+                                <h5 class="fw-bold m-0">Order History</h5>
+                            </div>
+
+                            <div class="d-flex flex-column gap-3">
+                                @if (orderHistory != null)
+                                {
+                                    @foreach (var order in orderHistory)
+                                    {
+                                        <div class="card p-4 shadow-sm order-history-card">
+                                            <div class="d-flex flex-column flex-sm-row justify-content-between align-items-start gap-3">
+
+                                                <div class="flex-grow-1 w-100">
+                                                    <div class="order-meta-track mb-2">
+                                                        <div class="meta-item-id">
+                                                            <span class="fw-bold text-dark">@order.OrderId</span>
+                                                        </div>
+                                                        <div class="meta-item-date">
+                                                            <span class="text-muted small">@order.OrderDate.ToString("MMM dd, yyyy")</span>
+                                                        </div>
+                                                        <div class="meta-item-status">
+                                                            <span class="badge @(order.Status?.ToLower() == "shipped" ? "status-shipped" : "status-delivered") text-uppercase">
+                                                                @order.Status
+                                                            </span>
+                                                        </div>
+                                                    </div>
+
+                                                    <h6 class="mb-2">
+                                                        <a href="/products/@order.ProductId" class="product-link fw-medium" title="@order.ProductTitle">
+                                                            @order.ProductTitle
+                                                        </a>
+                                                    </h6>
+
+                                                    <div class="d-flex align-items-center text-secondary small">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="12" height="12" fill="currentColor" class="me-1 text-muted flex-shrink-0">
+                                                            <path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
+                                                        </svg>
+                                                        <span class="text-muted">Shipped to:</span>&nbsp;@order.ShippingAddressName
+                                                    </div>
+                                                </div>
+
+                                                <div class="d-flex flex-row flex-sm-column align-items-center align-items-sm-end justify-content-between w-100 w-sm-auto pt-2 pt-sm-0 border-top border-sm-top-0 border-light">
+                                                    <div class="text-sm-end mb-sm-2">
+                                                        <span class="text-muted xx-small d-block text-uppercase font-monospace tracking-wider">Total Paid</span>
+                                                        <span class="fw-bold text-dark fs-5">R @order.Total.ToString("N2")</span>
+                                                    </div>
+
+                                                    <button class="btn btn-link p-0 text-dark action-btn mt-sm-1" title="Download Invoice" @onclick="() => DownloadInvoice(order.OrderId)">
+                                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="svg-icon">
+                                                            <path d="M19 12v7H5v-7H3v7c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zm-6 .67l2.59-2.58L17 11.5l-5 5-5-5 1.41-1.41L11 12.67V3h2v9.67z" />
+                                                        </svg>
+                                                    </button>
+                                                </div>
+
+                                            </div>
+                                        </div>
+                                    }
+                                }
+                                else
+                                {
+                                    <div class="card p-4 text-center text-muted">
+                                        Loading order history...
+                                    </div>
+                                }
+                            </div>
+                        </div>
+
+                        <div class="tab-pane fade" id="shipping" role="tabpanel">
+                            <div class="d-flex justify-content-between align-items-center mb-4">
+                                <h5 class="fw-bold m-0">Saved Addresses</h5>
+                                @if (!showAddForm && editingAddress == null)
+                                {
+                                    <button class="btn btn-dark btn-sm rounded-pill px-4" @onclick="OpenAddForm">+ Add New</button>
+                                }
+                            </div>
+
+                            @if (showAddForm)
                             {
-                                <div class="card p-4 shadow-sm order-history-card">
+                                <div class="card p-4 border shadow-sm mb-4 bg-light">
-                                    <div class="d-flex flex-column flex-sm-row justify-content-between align-items-start gap-3">
+                                    <div class="d-flex justify-content-between align-items-center mb-3">
-
+                                        <h6 class="fw-bold m-0">New Address</h6>
-                                        <div class="flex-grow-1 w-100">
+                                        <button type="button" class="btn-close" @onclick="() => showAddForm = false"></button>
-                                            <div class="order-meta-track mb-2">
+                                    </div>
-                                                <div class="meta-item-id">
+                                    <input type="text" class="form-control mb-2" placeholder="Address Name (e.g. Home, Office)" @bind="newAddressName" />
-                                                    <span class="fw-bold text-dark">@order.OrderId</span>
+                                    <input type="text" class="form-control mb-2" placeholder="Street Address" @bind="newStreetAddress" />
-                                                </div>
+                                    <div class="d-flex gap-2 mb-3">
-                                                <div class="meta-item-date">
+                                        <input type="text" class="form-control" placeholder="City" @bind="newCity" />
-                                                    <span class="text-muted small">@order.OrderDate.ToString("MMM dd, yyyy")</span>
+                                        <input type="text" class="form-control" placeholder="Postal Code" @bind="newPostalCode" />
-                                                </div>
+                                    </div>
-                                                <div class="meta-item-status">
+                                    <div class="mb-3 d-flex gap-3">
-                                                    <span class="badge @(order.Status?.ToLower() == "shipped" ? "status-shipped" : "status-delivered") text-uppercase">
+                                        <label class="pointer-label"><input type="checkbox" @bind="isBilling" /> Billing</label>
-                                                        @order.Status
+                                        <label class="pointer-label"><input type="checkbox" @bind="isShipping" /> Shipping</label>
-                                                    </span>
+                                    </div>
-                                                </div>
+                                    <div class="d-flex">
-                                            </div>
+                                        <button class="btn btn-dark btn-sm rounded-pill px-4" @onclick="SaveAddress">Save Address</button>
-
-                                            <h6 class="mb-2">
-                                                <a href="/products/@order.ProductId" class="product-link fw-medium" title="@order.ProductTitle">
-                                                    @order.ProductTitle
-                                                </a>
-                                            </h6>
-
-                                            <div class="d-flex align-items-center text-secondary small">
-                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="12" height="12" fill="currentColor" class="me-1 text-muted flex-shrink-0">
-                                                    <path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" />
-                                                </svg>
-                                                <span class="text-muted">Shipped to:</span>&nbsp;@order.ShippingAddressName
-                                            </div>
-                                        </div>
-
-                                        <div class="d-flex flex-row flex-sm-column align-items-center align-items-sm-end justify-content-between w-100 w-sm-auto pt-2 pt-sm-0 border-top border-sm-top-0 border-light">
-                                            <div class="text-sm-end mb-sm-2">
-                                                <span class="text-muted xx-small d-block text-uppercase font-monospace tracking-wider">Total Paid</span>
-                                                <span class="fw-bold text-dark fs-5">R @order.Total.ToString("N2")</span>
-                                            </div>
-
-                                            <button class="btn btn-link p-0 text-dark action-btn mt-sm-1" title="Download Invoice" @onclick="() => DownloadInvoice(order.OrderId)">
-                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="svg-icon">
-                                                    <path d="M19 12v7H5v-7H3v7c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zm-6 .67l2.59-2.58L17 11.5l-5 5-5-5 1.41-1.41L11 12.67V3h2v9.67z" />
-                                                </svg>
-                                            </button>
-                                        </div>
-
                                     </div>
                                 </div>
                             }
-                        }
-                        else
-                        {
-                            <div class="card p-4 text-center text-muted">
-                                Loading order history...
-                            </div>
-                        }
-                    </div>
-                </div>
 
-                <div class="tab-pane fade" id="shipping" role="tabpanel">
+                            @if (editingAddress != null)
-                    <div class="d-flex justify-content-between align-items-center mb-4">
+                            {
-                        <h5 class="fw-bold m-0">Saved Addresses</h5>
+                                <div class="card p-4 border shadow-sm mb-4 bg-light">
-                        @if (!showAddForm && editingAddress == null)
+                                    <div class="d-flex justify-content-between align-items-center mb-3">
-                        {
+                                        <h6 class="fw-bold m-0">Edit Address</h6>
-                            <button class="btn btn-dark btn-sm rounded-pill px-4" @onclick="OpenAddForm">+ Add New</button>
+                                        <button type="button" class="btn-close" @onclick="CancelEditing"></button>
-                        }
+                                    </div>
-                    </div>
+                                    <input type="text" class="form-control mb-2" placeholder="Address Name" @bind="editingAddress.Name" />
-
+                                    <input type="text" class="form-control mb-2" placeholder="Street Address" @bind="editingAddress.Street" />
-                    @if (showAddForm)
+                                    <div class="d-flex gap-2 mb-3">
-                    {
+                                        <input type="text" class="form-control" placeholder="City" @bind="editingAddress.City" />
-                        <div class="card p-4 border shadow-sm mb-4 bg-light">
+                                        <input type="text" class="form-control" placeholder="Postal Code" @bind="editingAddress.PostalCode" />
-                            <div class="d-flex justify-content-between align-items-center mb-3">
+                                    </div>
-                                <h6 class="fw-bold m-0">New Address</h6>
+                                    <div class="mb-3 d-flex gap-3">
-                                <button type="button" class="btn-close" @onclick="() => showAddForm = false"></button>
+                                        <label class="pointer-label"><input type="checkbox" @bind="editingAddress.IsBilling" /> Billing</label>
-                            </div>
+                                        <label class="pointer-label"><input type="checkbox" @bind="editingAddress.IsShipping" /> Shipping</label>
-                            <input type="text" class="form-control mb-2" placeholder="Address Name (e.g. Home, Office)" @bind="newAddressName" />
+                                    </div>
-                            <input type="text" class="form-control mb-2" placeholder="Street Address" @bind="newStreetAddress" />
+                                    <div class="d-flex">
-                            <div class="d-flex gap-2 mb-3">
+                                        <button class="btn btn-dark btn-sm rounded-pill px-4" @onclick="UpdateAddress">Update Address</button>
-                                <input type="text" class="form-control" placeholder="City" @bind="newCity" />
-                                <input type="text" class="form-control" placeholder="Postal Code" @bind="newPostalCode" />
-                            </div>
-                            <div class="mb-3 d-flex gap-3">
-                                <label class="pointer-label"><input type="checkbox" @bind="isBilling" /> Billing</label>
-                                <label class="pointer-label"><input type="checkbox" @bind="isShipping" /> Shipping</label>
-                            </div>
-                            <div class="d-flex">
-                                <button class="btn btn-dark btn-sm rounded-pill px-4" @onclick="SaveAddress">Save Address</button>
-                            </div>
-                        </div>
-                    }
-
-                    @if (editingAddress != null)
-                    {
-                        <div class="card p-4 border shadow-sm mb-4 bg-light">
-                            <div class="d-flex justify-content-between align-items-center mb-3">
-                                <h6 class="fw-bold m-0">Edit Address</h6>
-                                <button type="button" class="btn-close" @onclick="CancelEditing"></button>
-                            </div>
-                            <input type="text" class="form-control mb-2" placeholder="Address Name" @bind="editingAddress.Name" />
-                            <input type="text" class="form-control mb-2" placeholder="Street Address" @bind="editingAddress.Street" />
-                            <div class="d-flex gap-2 mb-3">
-                                <input type="text" class="form-control" placeholder="City" @bind="editingAddress.City" />
-                                <input type="text" class="form-control" placeholder="Postal Code" @bind="editingAddress.PostalCode" />
-                            </div>
-                            <div class="mb-3 d-flex gap-3">
-                                <label class="pointer-label"><input type="checkbox" @bind="editingAddress.IsBilling" /> Billing</label>
-                                <label class="pointer-label"><input type="checkbox" @bind="editingAddress.IsShipping" /> Shipping</label>
-                            </div>
-                            <div class="d-flex">
-                                <button class="btn btn-dark btn-sm rounded-pill px-4" @onclick="UpdateAddress">Update Address</button>
-                            </div>
-                        </div>
-                    }
-
-                    @foreach (var addr in savedAddresses)
-                    {
-                        <div class="card p-4 shadow-sm mb-3 address-card">
-                            <div class="d-flex justify-content-between align-items-start">
-                                <div>
-                                    <h6 class="fw-bold mb-1">@addr.Name</h6>
-                                    <p class="mb-2 text-muted">@addr.Street, @addr.City, @addr.PostalCode</p>
-                                    <div class="d-flex gap-2 text-uppercase font-monospace text-muted small">
-                                        @if (addr.IsBilling)
-                                        {
-                                            <span class="badge badge-tag">[Billing]</span>
-                                        }
-                                        @if (addr.IsShipping)
-                                        {
-                                            <span class="badge badge-tag">[Shipping]</span>
-                                        }
                                     </div>
                                 </div>
+                            }
 
-                                <div class="d-flex align-items-center gap-2 actions-container">
+                            @foreach (var addr in savedAddresses)
-                                    <label class="small text-muted d-flex align-items-center gap-1 m-0 pointer-label me-2">
+                            {
-                                        <input type="checkbox" checked="@addr.IsPrimary" @onchange="(e) => SetPrimary(addr, e)" /> Primary
+                                <div class="card p-4 shadow-sm mb-3 address-card">
-                                    </label>
+                                    <div class="d-flex justify-content-between align-items-start">
+                                        <div>
+                                            <h6 class="fw-bold mb-1">@addr.Name</h6>
+                                            <p class="mb-2 text-muted">@addr.Street, @addr.City, @addr.PostalCode</p>
+                                            <div class="d-flex gap-2 text-uppercase font-monospace text-muted small">
+                                                @if (addr.IsBilling)
+                                                {
+                                                    <span class="badge badge-tag">[Billing]</span>
+                                                }
+                                                @if (addr.IsShipping)
+                                                {
+                                                    <span class="badge badge-tag">[Shipping]</span>
+                                                }
+                                            </div>
+                                        </div>
 
-                                    <button class="btn btn-link p-0 text-dark action-btn" title="Edit Address" @onclick="() => StartEditing(addr)">
+                                        <div class="d-flex align-items-center gap-2 actions-container">
-                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="svg-icon">
+                                            <label class="small text-muted d-flex align-items-center gap-1 m-0 pointer-label me-2">
-                                            <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" />
+                                                <input type="checkbox" checked="@addr.IsPrimary" @onchange="(e) => SetPrimary(addr, e)" /> Primary
-                                        </svg>
+                                            </label>
-                                    </button>
 
-                                    <button class="btn btn-link p-0 text-danger action-btn" title="Delete Address" @onclick="() => DeleteAddress(addr)">
+                                            <button class="btn btn-link p-0 text-dark action-btn" title="Edit Address" @onclick="() => StartEditing(addr)">
-                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="svg-icon">
+                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="svg-icon">
-                                            <path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" />
+                                                    <path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" />
-                                        </svg>
+                                                </svg>
-                                    </button>
+                                            </button>
+
+                                            <button class="btn btn-link p-0 text-danger action-btn" title="Delete Address" @onclick="() => DeleteAddress(addr)">
+                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="svg-icon">
+                                                    <path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" />
+                                                </svg>
+                                            </button>
+                                        </div>
+                                    </div>
                                 </div>
+                            }
+                        </div>
+
+                        <div class="tab-pane fade" id="profile" role="tabpanel">
+                            <div class="d-flex justify-content-between align-items-center mb-4">
+                                <h5 class="fw-bold m-0">Profile Settings</h5>
+                            </div>
+                            <div class="card p-4 shadow-sm">
+                                <p class="text-muted mb-0">Manage your password and profile data here.</p>
                             </div>
                         </div>
-                    }
-                </div>
 
-                <div class="tab-pane fade" id="profile" role="tabpanel">
-                    <div class="d-flex justify-content-between align-items-center mb-4">
-                        <h5 class="fw-bold m-0">Profile Settings</h5>
-                    </div>
-                    <div class="card p-4 shadow-sm">
-                        <p class="text-muted mb-0">Manage your password and profile data here.</p>
                     </div>
                 </div>
-
             </div>
         </div>
-    </div>
+    </Authorized>
-</div>
+    
+    <NotAuthorized>
+        <RedirectToLogin />
+    </NotAuthorized>
+</AuthorizeView>
 
 @code {
     private bool showAddForm = false;
@@ -216,6 +227,8 @@
         new AddressItem { Id = 3, Name = "Midrand Books Warehouse", Street = "Unit 8, Corporate Park North", City = "Randjespark", PostalCode = "1683", IsBilling = false, IsShipping = true, IsPrimary = false }
     };
 
+    private void TriggerLogout() => Navigation.NavigateTo("/logout", forceLoad: true);
+
     private void DownloadInvoice(string orderId)
     {
         // Handle invoice downloading logic here

MidrandBookshop/Components/RedirectToLogin.razor

@@ -0,0 +1,10 @@
+@inject NavigationManager Navigation
+
+@code {
+    protected override void OnInitialized()
+    {
+        var returnUrl = Navigation.ToBaseRelativePath(Navigation.Uri);
+
+        Navigation.NavigateTo($"/login?redirectUri={Uri.EscapeDataString(returnUrl)}", forceLoad: true);
+    }
+}

MidrandBookshop/Components/Routes.razor

@@ -1,12 +1,20 @@
-@using MidrandBookshop.Components.Pages
+@using Microsoft.AspNetCore.Components.Authorization
-<Router AppAssembly="@typeof(Program).Assembly">
+@using MidrandBookshop.Components.Pages
-    <Found Context="routeData">
+
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+<CascadingAuthenticationState>
-        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+    <Router AppAssembly="@typeof(Program).Assembly">
-    </Found>
+        <Found Context="routeData">
-    <NotFound>
+            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
-        <LayoutView Layout="@typeof(MainLayout)">
+                <NotAuthorized>                    
-            <NotFound />
+                    <RedirectToLogin />
-        </LayoutView>
+                </NotAuthorized>
-    </NotFound>
+            </AuthorizeRouteView>
-</Router>
+            <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+        </Found>
+        <NotFound>
+            <LayoutView Layout="@typeof(MainLayout)">
+                <NotFound />
+            </LayoutView>
+        </NotFound>
+    </Router>
+</CascadingAuthenticationState>

MidrandBookshop/MidrandBookshop.csproj

@@ -18,13 +18,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.57.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.87.0" />
   </ItemGroup>
 
   <!-- UI -->
   <ItemGroup>
     <PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
-    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.57.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.87.0" />
     
     <!-- Global Usings -->
     <Using Include="Blazored.Toast.Services" />

MidrandBookshop/Program.cs

@@ -1,9 +1,12 @@
 using LiteCharms.Features.Extensions;
 using LiteCharms.Features.Mediator;
 using LiteCharms.Features.MidrandBooks.Extensions;
+using Microsoft.AspNetCore.HttpOverrides;
 using MidrandBookshop.Components;
 using static LiteCharms.Features.Extensions.Quartz;
 
+AppContext.SetSwitch("Microsoft.IdentityModel.DisableTelemetry", true);
+
 var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddRazorComponents()
@@ -13,6 +16,7 @@ builder.AddMonitoring();
 builder.Services.AddEndpointsApiExplorer();
 
 builder.Services.AddMediator();
+builder.Services.AddAuthentikUiSecurity(builder.Configuration);
 
 builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(TelemetryPipelineBehavior<,>));
 builder.Services.AddScoped(typeof(IPipelineBehavior<,>), typeof(LoggingPipelineBehavior<,>));
@@ -22,15 +26,27 @@ builder.Services.AddQuartzSchedulerClient(MidrandShopSchedulerName, builder.Conf
 builder.Services.AddEmailServices(builder.Configuration);
 builder.Services.AddEmailServiceBus();
 
+builder.Services.AddHttpClient();
 builder.Services.AddShopServices();
+builder.Services.AddHashServices(builder.Configuration);
 builder.Services.AddMidrandShopDatabase(builder.Configuration);
 
 builder.Services.AddMidrandShopPostgresHealthCheck();
 builder.Services.AddMidrandShopQuartzHealthCheck();
 builder.Services.AddHealthChecksSupport(builder.Configuration);
+builder.Services.AddCascadingAuthenticationState();
+
+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);
 

MidrandBookshop/appsettings.json

@@ -1,4 +1,12 @@
 {
+  "AuthentikSettings": { 
+    "Authority": "https://id.khongisa.co.za/application/o/midrand-books-uat/",
+    "MetadataEndpoint": "https://id.khongisa.co.za/application/o/midrand-books-uat/.well-known/openid-configuration",
+    "RevokationEndpoint": "https://id.khongisa.co.za/application/o/revoke/"
+  },
+  "HasherSettings": {
+    "MinHashLength": 11
+  },
   "BookshopS3Settings": {
     "ServiceUrl": "http://192.168.1.177:30900",
     "Region": "garage",

midrandbooks-uat.yml

@@ -14,6 +14,22 @@ data:
   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"
+  BookshopS3Settings__ServiceUrl: "http://garage.garage.svc.cluster.local:3900"
+  BookshopS3Settings__Region: "garage"
+  BookshopS3Settings__BucketName: "bookshop"
+  BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za"
+  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"
+  AuthentikSettings__Authority: "https://id.khongisa.co.za/application/o/midrand-books-api-uat/"
+  AuthentikSettings__MetadataEndpoint: "https://id.khongisa.co.za/application/o/midrand-books-uat/.well-known/openid-configuration"
+  AuthentikSettings__RevokationEndpoint: "https://id.khongisa.co.za/application/o/revoke/"
+  ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true"
 ---
 apiVersion: v1
 kind: Secret
@@ -25,6 +41,12 @@ 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==
+  authentik-clientid: Nm9oZk1lSndQNWR0YWY1RFMzZU9MY2NNSHF6WXlma1YzRTNGeE5Tbw==
+  authentik-clientsecret: TXV2a0FLQklHR3BkdEsyaFlabVU1dFRaUmNuM2FhRzhoMWhlVE1nazFYOGVwczYyMzNCS0REWGdpNXo0T01RalVzMGZEUEFmakpmVVRNN1h3ZjllMU01MTQyVGlvOXRycUdmZTM1THhPaExEUnp6N2gxSm5jVkNLYXZXUllndmQ=
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -77,6 +99,36 @@ spec:
             - configMapRef:
                 name: midrandbooks-config
           env:
+            - name: AuthentikSettings__ClientId
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: authentik-clientid
+            - name: AuthentikSettings__ClientSecret
+              valueFrom:
+                secretKeyRef:
+                  name: midrandbooks-secrets
+                  key: authentik-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:
@@ -86,17 +138,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: midrandbooks-secrets
-                  key: connection-string            
+                  key: connection-string
-            - name: Monitoring__Address
-              valueFrom:
-                configMapKeyRef:
-                  name: midrandbooks-config
-                  key: Monitoring__Address
-            - name: Monitoring__ServiceName
-              valueFrom:
-                configMapKeyRef:
-                  name: midrandbooks-config
-                  key: Monitoring__ServiceName
             - name: Monitoring__ApiKey
               valueFrom:
                 secretKeyRef: