From cc65555c3dcc6e51dd04512f041615911a55ef75 Mon Sep 17 00:00:00 2001
From: Mark Davis <markd@trifoia.com>
Date: Tue, 5 Dec 2023 12:17:02 -0800
Subject: [PATCH 1/2] minor fix to routing

---
 Oqtane.Server/Pages/_Host.cshtml.cs | 2 +-
 Oqtane.Server/appsettings.json      | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index 50fb2575..a451f5a0 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -505,7 +505,7 @@ namespace Oqtane.Pages
                 {
                     if (resource.Url.StartsWith("~"))
                     {
-                        resource.Url = resource.Url.Replace("~", "/Themes/" + name + "/").Replace("//", "/");
+                        resource.Url = resource.Url.Replace("~", "/Themes/" + Utilities.GetTypeName(name) + "/").Replace("//", "/");
                     }
                     if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl))
                     {
diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
index ccf00c5c..2c4c7f58 100644
--- a/Oqtane.Server/appsettings.json
+++ b/Oqtane.Server/appsettings.json
@@ -2,10 +2,10 @@
   "Runtime": "Server",
   "RenderMode": "ServerPrerendered",
   "Database": {
-    "DefaultDBType": ""
+    "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"
   },
   "ConnectionStrings": {
-    "DefaultConnection": ""
+    "DefaultConnection": "Data Source=pmc-sql.database.windows.net;Initial Catalog=pmc-cart-dev-sqldb;User ID=sql-dev-pmc;Password=1PwdCartCode!;Encrypt=false;TrustServerCertificate=false;"
   },
   "Installation": {
     "DefaultAlias": "",
@@ -54,5 +54,6 @@
     "LogLevel": {
       "Default": "Information"
     }
-  }
-}
+  },
+  "InstallationId": "c6f298a3-7a64-419e-89ca-4d73946a53fe"
+}
\ No newline at end of file

From 7b7e64576f44206896402fc3735cf85b89d8f730 Mon Sep 17 00:00:00 2001
From: Mark Davis <311063+markdav-is@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:30:20 -0800
Subject: [PATCH 2/2] Update appsettings.json

---
 Oqtane.Server/appsettings.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
index 2c4c7f58..6d3d01af 100644
--- a/Oqtane.Server/appsettings.json
+++ b/Oqtane.Server/appsettings.json
@@ -5,7 +5,7 @@
     "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer"
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=pmc-sql.database.windows.net;Initial Catalog=pmc-cart-dev-sqldb;User ID=sql-dev-pmc;Password=1PwdCartCode!;Encrypt=false;TrustServerCertificate=false;"
+    "DefaultConnection": ""
   },
   "Installation": {
     "DefaultAlias": "",
@@ -56,4 +56,4 @@
     }
   },
   "InstallationId": "c6f298a3-7a64-419e-89ca-4d73946a53fe"
-}
\ No newline at end of file
+}