Merge pull request #153

Development/Main
kaizendevsio · Jul 10, 2024 · 6bb1b1f · 6bb1b1f
2 parents 8197ae4 + 811dd7f
commit 6bb1b1f
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 24 deletions.
diff --git a/src/Modules/XFramework.Blazor/Components/GenericPreloader.razor b/src/Modules/XFramework.Blazor/Components/GenericPreloader.razor
@@ -1,6 +1,6 @@
 @inherits XComponentsBase
 
-@if (ApplicationState.IsBusy && !ApplicationState.NoSpinner)
+@if (ApplicationState is { IsBusy: true, NoSpinner: false })
 {
     <MudPaper Class="pa-6 ma-2 generic-preloader" Elevation="3">
         <MudStack Justify="Justify.Center" AlignItems="AlignItems.Center">

diff --git a/src/Modules/XFramework.Community/Community.Api/appsettings.Development.json b/src/Modules/XFramework.Community/Community.Api/appsettings.Development.json
@@ -14,9 +14,6 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    "DefaultDatabaseConnection": "Host=localhost;Database=XnelSystems;Username=xnelsystems-migration;Password=BqzX}V~,/p:7]K(FRH-bun!6PG?_g^<#h2EdtAQM[35x8;Pooling=true;MinPoolSize=2;MaxPoolSize=900;Timeout=300;CommandTimeout=300;"
-  },
   "Application": {
     "DefaultUID": "3902761a-822d-4c6b-8e2d-323fd501bcd6",
     "MemoryLimit": "512MB"

diff --git a/src/Modules/XFramework.Community/Community.Api/appsettings.Staging.json b/src/Modules/XFramework.Community/Community.Api/appsettings.Staging.json
@@ -14,9 +14,6 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    "DefaultDatabaseConnection": "Host=xnelsystems-production.postgres.database.azure.com;Database=XnelSystems;Username=dbAdmin;Password=(DzNaw#N+mr?xg4$;Pooling=true;MinPoolSize=2;MaxPoolSize=900;Timeout=300;CommandTimeout=300;"
-  },
   "Application": {
     "DefaultUID": "3902761a-822d-4c6b-8e2d-323fd501bcd6",
     "MemoryLimit": "2048MB"
@@ -29,7 +26,6 @@
     "RefreshTokenLifespan": "00:30:00"
   },
   "StreamFlowConfiguration": {
-    "ServerUrls": ["http://localhost:7000/stream-flow/queue"],
     "Targets": {
       "IdentityServerService": "3902761a-822d-4c6b-8e2d-323fd501bcd6",
       "BillsPaymentService": "fc449d3e-4e78-4c95-8826-970a5dd9d88b",

diff --git a/src/Modules/XFramework.IdentityServer/IdentityServer.Api/appsettings.Staging.json b/src/Modules/XFramework.IdentityServer/IdentityServer.Api/appsettings.Staging.json
@@ -14,9 +14,7 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    "DefaultDatabaseConnection": "Host=100.98.161.54;Database=XnelSystems;Username=dbAdmin;Password=4*5WD-K8%f*NqmPY;Pooling=true;MinPoolSize=2;MaxPoolSize=900;Timeout=300;CommandTimeout=300;"
-  },
+
   "Application": {
     "MemoryLimit": "2048MB"
   },
@@ -31,7 +29,6 @@
     "RefreshTokenLifespan": "00:30:00"
   },
   "StreamFlowConfiguration": {
-    "ServerUrls": ["http://localhost:7000/stream-flow/queue"],
     "Targets": {
       "IdentityServerService": "3902761a-822d-4c6b-8e2d-323fd501bcd6",
       "BillsPaymentService": "fc449d3e-4e78-4c95-8826-970a5dd9d88b",

diff --git a/src/Modules/XFramework.Messaging/Messaging.Api/appsettings.Staging.json b/src/Modules/XFramework.Messaging/Messaging.Api/appsettings.Staging.json
@@ -14,9 +14,7 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    "DefaultDatabaseConnection": "Host=100.98.161.54;Database=XnelSystems;Username=dbAdmin;Password=4*5WD-K8%f*NqmPY;Pooling=true;MinPoolSize=2;MaxPoolSize=900;Timeout=300;CommandTimeout=300;"
-  },
+
   "Application": {
     "MemoryLimit": "2048MB"
   },
@@ -31,7 +29,6 @@
     "RefreshTokenLifespan": "00:30:00"
   },
   "StreamFlowConfiguration": {
-    "ServerUrls": ["http://localhost:7000/stream-flow/queue"],
     "Targets": {
       "IdentityServerService": "3902761a-822d-4c6b-8e2d-323fd501bcd6",
       "BillsPaymentService": "fc449d3e-4e78-4c95-8826-970a5dd9d88b",

diff --git a/src/Modules/XFramework.SmsGateway/SmsGateway.Api/appsettings.Staging.json b/src/Modules/XFramework.SmsGateway/SmsGateway.Api/appsettings.Staging.json
@@ -14,9 +14,7 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    "DefaultDatabaseConnection": "Host=100.98.161.54;Database=XnelSystems;Username=dbAdmin;Password=4*5WD-K8%f*NqmPY;Pooling=true;MinPoolSize=2;MaxPoolSize=900;Timeout=300;CommandTimeout=300;"
-  },
+
   "Application": {
     "MemoryLimit": "2048MB"
   },
@@ -31,7 +29,6 @@
     "RefreshTokenLifespan": "00:30:00"
   },
   "StreamFlowConfiguration": {
-    "ServerUrls": ["http://localhost:7000/stream-flow/queue"],
     "Targets": {
       "IdentityServerService": "3902761a-822d-4c6b-8e2d-323fd501bcd6",
       "BillsPaymentService": "fc449d3e-4e78-4c95-8826-970a5dd9d88b",

diff --git a/src/Modules/XFramework.Wallets/Wallets.Api/appsettings.Staging.json b/src/Modules/XFramework.Wallets/Wallets.Api/appsettings.Staging.json
@@ -14,9 +14,7 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    "DefaultDatabaseConnection": "Host=100.98.161.54;Database=XnelSystems;Username=dbAdmin;Password=4*5WD-K8%f*NqmPY;Pooling=true;MinPoolSize=2;MaxPoolSize=900;Timeout=300;CommandTimeout=300;"
-  },
+
   "Application": {
     "DefaultUID": "ec57bc89-914d-4d92-a36f-12a1ce3b221c",
     "MemoryLimit": "2048MB"
@@ -32,7 +30,6 @@
     "RefreshTokenLifespan": "00:30:00"
   },
   "StreamFlowConfiguration": {
-    "ServerUrls": ["http://localhost:7000/stream-flow/queue"],
     "Targets": {
       "IdentityServerService": "3902761a-822d-4c6b-8e2d-323fd501bcd6",
       "BillsPaymentService": "fc449d3e-4e78-4c95-8826-970a5dd9d88b",