Compare commits

...

12 Commits

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
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
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
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
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
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
2026-06-01 11:15:54 +02:00
4 changed files with 18 additions and 7 deletions
+2 -2
View File
@@ -18,13 +18,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LiteCharms.Features" Version="1.59.0" /> <PackageReference Include="LiteCharms.Features" Version="1.71.0" />
</ItemGroup> </ItemGroup>
<!-- UI --> <!-- UI -->
<ItemGroup> <ItemGroup>
<PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" /> <PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
<PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.59.0" /> <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.71.0" />
<!-- Global Usings --> <!-- Global Usings -->
<Using Include="Blazored.Toast.Services" /> <Using Include="Blazored.Toast.Services" />
+1
View File
@@ -22,6 +22,7 @@ builder.Services.AddQuartzSchedulerClient(MidrandShopSchedulerName, builder.Conf
builder.Services.AddEmailServices(builder.Configuration); builder.Services.AddEmailServices(builder.Configuration);
builder.Services.AddEmailServiceBus(); builder.Services.AddEmailServiceBus();
builder.Services.AddHttpClient();
builder.Services.AddShopServices(); builder.Services.AddShopServices();
builder.Services.AddHashServices(builder.Configuration); builder.Services.AddHashServices(builder.Configuration);
builder.Services.AddMidrandShopDatabase(builder.Configuration); builder.Services.AddMidrandShopDatabase(builder.Configuration);
+3
View File
@@ -1,4 +1,7 @@
{ {
"HasherSettings": {
"MinHashLength": 11
},
"BookshopS3Settings": { "BookshopS3Settings": {
"ServiceUrl": "http://192.168.1.177:30900", "ServiceUrl": "http://192.168.1.177:30900",
"Region": "garage", "Region": "garage",
+12 -5
View File
@@ -19,6 +19,13 @@ data:
BookshopS3Settings__Region: "garage" BookshopS3Settings__Region: "garage"
BookshopS3Settings__BucketName: "bookshop" BookshopS3Settings__BucketName: "bookshop"
BookshopS3Settings__CdnBaseUrl: "https://bookshop.cdn.khongisa.co.za" 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 apiVersion: v1
kind: Secret kind: Secret
@@ -30,7 +37,7 @@ data:
connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ== connection-string: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPW1pZHJhbmRzaG9wLWRldjtVc2VybmFtZT1taWRyYW5kc2hvcC1kZXYtdXNlcjtQYXNzd29yZD1hUFh5a0tnM3RTOWNtRDtQZXJzaXN0IFNlY3VyaXR5IEluZm89VHJ1ZQ==
connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl connection-string-quartz: SG9zdD0xOTIuMTY4LjEuMTcwO0RhdGFiYXNlPXNjaGVkdWxlci1kZXY7VXNlcm5hbWU9c2NoZWR1bGVyLWRldi11c2VyO1Bhc3N3b3JkPWtWVm1vV0tKM3h6Z1FYO1BlcnNpc3QgU2VjdXJpdHkgSW5mbz1UcnVl
aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw== aspire-apikey: bWMzRzYzSzJqNVpPRXNpMEFqTW9qTFRYbTFLRVpGY3R6SUlqU3dEaVRHdXQ4cUdTa1B1V3d4R1AxUmJzY0pVbw==
hasher-salt: TGlnaHQgQ2hhcm1zLCBNaWRyYW5kQm9va3MgbWFrZSBsb3RzIG9mIG1vbmV5IGFuZCBhcmUgYSBzdWNjZXNzZnVsIHZpcmFsIHN0b3J5IGluIFNvdXRoIEFmcmljYQ== hasher-salt: VEdsbmFIUWdRMmhoY20xekxDQk5hV1J5WVc1a1FtOXZhM01nYldGclpTQnNiM1J6SUc5bUlHMXZibVY1SUdGdVpDQmhjbVVnWVNCemRXTmpaWE56Wm5Wc0lIWnBjbUZzSUhOMGIzSjVJR2x1SUZOdmRYUm9JRUZtY21sallRPT0=
hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8= hasher-payfastpassphrase: OUdBSVIwdFdwaFgwcU8=
bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY= bookshop-s3-accesskey: R0s1MTRkMmNlOGRjNjkyMzdhMDVjMDFlZWY=
bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ== bookshop-s3-secretkey: ZWFhZmVkYTFhZWQ0MDllY2ZlNjA3MTRlY2RhNTQ5YjgyYmRmNWEzZGFmOWYxOGRkNjFmNjZiNDk3M2E2NDgyZQ==
@@ -90,22 +97,22 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: midrandbooks-secrets name: midrandbooks-secrets
value: bookshop-s3-accesskey key: bookshop-s3-accesskey
- name: BookshopS3Settings__SecretKey - name: BookshopS3Settings__SecretKey
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: midrandbooks-secrets name: midrandbooks-secrets
value: bookshop-s3-secretkey key: bookshop-s3-secretkey
- name: HasherSettings__Salt - name: HasherSettings__Salt
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: midrandbooks-secrets name: midrandbooks-secrets
value: hasher-salt key: hasher-salt
- name: HasherSettings__PayfastPassphrase - name: HasherSettings__PayfastPassphrase
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: midrandbooks-secrets name: midrandbooks-secrets
value: hasher-payfastpassphrase key: hasher-payfastpassphrase
- name: ConnectionStrings__PostgresScheduler - name: ConnectionStrings__PostgresScheduler
valueFrom: valueFrom:
secretKeyRef: secretKeyRef: