Merge pull request 'Upgraded quartz' (#40 ) from mock-data into main

Reviewed-on: #40
Upgraded quartz
2026-06-03 11:54:17 +02:00 · 2026-06-03 11:53:31 +02:00 · 2026-06-02 00:31:16 +02:00 · 2026-06-02 00:30:47 +02:00 · 2026-06-01 23:39:37 +02:00 · 2026-06-01 23:39:05 +02:00
9 changed files with 58 additions and 38 deletions
@@ -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; }
-    }
@@ -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"
-   onclick="window.scrollTo({top: 0, behavior: 'smooth'}); return false;">
+   href="#top-target">
    <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>
@@ -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";
@@ -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;
+}
@@ -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);

@@ -18,13 +18,13 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.57.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.71.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.71.0" />
    
    <!-- Global Usings -->
    <Using Include="Blazored.Toast.Services" />
@@ -22,7 +22,9 @@ 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();
@@ -1,4 +1,7 @@
 {
+  "HasherSettings": {    
+    "MinHashLength": 11
+  },
  "BookshopS3Settings": {
    "ServiceUrl": "http://192.168.1.177:30900",
    "Region": "garage",
@@ -14,6 +14,18 @@ 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"
 ---
 apiVersion: v1
 kind: Secret
@@ -25,6 +37,10 @@ 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==
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -77,6 +93,26 @@ spec:
            - configMapRef:
                name: midrandbooks-config
          env:
+            - 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 +122,7 @@ spec:
              valueFrom:
                secretKeyRef:
                  name: midrandbooks-secrets
-                  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
+                  key: connection-string
            - name: Monitoring__ApiKey
              valueFrom:
                secretKeyRef:
Author	SHA1	Message	Date
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 Mngoma	9b3e889d89	Upgraded quartz continuous-integration/drone/pr Build is passing Details	2026-06-03 11:53:31 +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 Mngoma	e35a68f7e8	Updated backend continuous-integration/drone/pr Build is passing Details	2026-06-02 00:30:47 +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 Mngoma	b70ecab9ea	Fixed event service discovery issue continuous-integration/drone/pr Build is passing Details	2026-06-01 23:39:05 +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 Mngoma	209947d70f	Updated backend continuous-integration/drone/pr Build is passing Details	2026-06-01 22:58:10 +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 Mngoma	edb9c281ef	Ensured appsettings aligns with k8s config continuous-integration/drone/pr Build is passing Details	2026-06-01 11:57:44 +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 Mngoma	b189b26b62	Refactored app k8s manifest continuous-integration/drone/pr Build is passing Details	2026-06-01 11:15: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 Mngoma	52e3ab16bf	Refactored manifest to include s3 bucket and HasherService configs and secrets continuous-integration/drone/pr Build is failing Details Upgraded nuget packages to bring in new Payment and Product service functionality	2026-06-01 09:50:14 +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 Mngoma	26cd12532c	Authors now showing on the listing continuous-integration/drone/pr Build is passing Details Back to the top works	2026-05-30 22:19:35 +02:00