added ability to specify a site home page, updated default template content to include .NET MAUI

Oqtane.Client/Modules/Admin/Languages/Add.razor

@@ -110,6 +110,10 @@ else
                 }
                 <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
                 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+
+				<br />
+				<br />
+				<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
             }
         </TabPanel>
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">

Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor

@@ -114,6 +114,10 @@
 <button type="button" class="btn btn-success" @onclick="InstallModules">@SharedLocalizer["Install"]</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
+<br />
+<br />
+<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
+
 @code {
 	private List<Package> _packages;
 	private string _price = "free";

Oqtane.Client/Modules/Admin/Site/Index.razor

@@ -70,6 +70,18 @@
                         }
                     </select>
                 </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="homepage" HelpText="Select the home page for the site (to be used if there is no page with a path of '/')" ResourceKey="HomePage">Home Page: </Label>
+                <div class="col-sm-9">
+                    <select id="homepage" class="form-select" @bind="@_homepageid" required>
+						<option value="-">&lt;@Localizer["Not Specified"]&gt;</option>
+                        @foreach (Page page in PageState.Pages)
+                        {
+                            <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                        }
+                    </select>
+                </div>
             </div>
 			<div class="row mb-1 align-items-center">
 				<Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
@@ -296,6 +308,7 @@
 	private string _themetype = "-";
 	private string _containertype = "-";
 	private string _admincontainertype = "-";
+	private string _homepageid = "-";
 	private string _smtphost = string.Empty;
 	private string _smtpport = string.Empty;
 	private string _smtpssl = "False";
@@ -354,6 +367,11 @@
 				_containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
 				_admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
 
+				if (site.HomePageId != null)
+				{
+					_homepageid = site.HomePageId.Value.ToString();
+				}
+
 				_pwaisenabled = site.PwaIsEnabled.ToString();
 				if (site.PwaAppIconFileId != null)
 				{
@@ -480,6 +498,7 @@
 							refresh = true; // needs to be refreshed on client
 						}
 						site.AdminContainerType = _admincontainertype;
+						site.HomePageId = (_homepageid != "-" ? int.Parse(_homepageid) : null);
 
 						if (site.PwaIsEnabled.ToString() != _pwaisenabled)
 						{

Oqtane.Client/Modules/Admin/Themes/Add.razor

@@ -114,6 +114,10 @@
 <button type="button" class="btn btn-success" @onclick="InstallThemes">@SharedLocalizer["Install"]</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
+<br />
+<br />
+<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
+
 @code {
     private List<Package> _packages;
     private string _price = "free";

Oqtane.Client/Resources/Modules/Admin/Site/Index.resx

@@ -333,4 +333,10 @@
   <data name="Confirm.Alias.Delete" xml:space="preserve">
     <value>Are You Sure You Wish To Delete {0}?</value>
   </data>
+  <data name="HomePage.HelpText" xml:space="preserve">
+    <value>Select the home page for the site (to be used if there is no page with a path of '/')</value>
+  </data>
+  <data name="HomePage.Text" xml:space="preserve">
+    <value>Home Page:</value>
+  </data>
 </root>

Oqtane.Client/Resources/SharedResources.resx

@@ -339,4 +339,7 @@
   <data name="Visitor Management" xml:space="preserve">
     <value>Visitor Management</value>
   </data>
+  <data name="Oqtane.Marketplace" xml:space="preserve">
+    <value>Please note that the third party extensions displayed above have been registered in the &lt;a href="https://www.oqtane.net" target="_new"&gt;Oqtane Marketplace&lt;/a&gt; which enables them to be seamlessly downloaded and installed into the framework.</value>
+  </data>
 </root>

Oqtane.Client/UI/SiteRouter.razor

@@ -171,25 +171,27 @@
 
 		if (site != null)
 		{
-			if (PageState == null || refresh == UI.Refresh.Site)
+			if (PageState == null || refresh == UI.Refresh.Site || PageState.Page.Path != route.PagePath)
 			{
 				page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
+				editmode = false;
 			}
 			else
 			{
 				page = PageState.Page;
 			}
 
-			// get the new page if the path has changed
+			if (page == null && route.PagePath == "") // naked path refers to site home page
-			if (page == null || page.Path != route.PagePath)
 			{
-				page = site.Pages.FirstOrDefault(item => item.Path.Equals(route.PagePath, StringComparison.OrdinalIgnoreCase));
+				if (site.HomePageId != null)
-				if (page == null && route.PagePath == "")
 				{
-					// if the home page path does not exist then use the first page in the collection
+					page = site.Pages.FirstOrDefault(item => item.PageId == site.HomePageId);
+				}
+				if (page == null)
+				{
+					// fallback to use the first page in the collection
 					page = site.Pages.FirstOrDefault();
 				}
-				editmode = false;
 			}
 
 			if (page != null)

Oqtane.Maui/Main.razor

@@ -9,7 +9,7 @@
 		Parameters = new Dictionary<string, object>();
 		Parameters.Add(new KeyValuePair<string, object>("AntiForgeryToken", ""));
 		Parameters.Add(new KeyValuePair<string, object>("Runtime", "Hybrid"));
-		Parameters.Add(new KeyValuePair<string, object>("RenderMode", ""));
+		Parameters.Add(new KeyValuePair<string, object>("RenderMode", "Hybrid"));
 		Parameters.Add(new KeyValuePair<string, object>("VisitorId", -1));
 		Parameters.Add(new KeyValuePair<string, object>("RemoteIPAddress", ""));
 		Parameters.Add(new KeyValuePair<string, object>("AuthorizationToken", ""));

Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs

@@ -57,9 +57,9 @@ namespace Oqtane.SiteTemplates
                             new Permission(PermissionNames.View, RoleNames.Admin, true),
                             new Permission(PermissionNames.Edit, RoleNames.Admin, true)
                         }.EncodePermissions(),
-                        Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> that provides advanced functionality for developing web and mobile applications on .NET Core. It leverages the Blazor component model to compose a <b>fully dynamic</b> web development experience which can be hosted either client-side or server-side. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
+                        Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> that provides advanced functionality for developing web, mobile, and desktop applications on .NET Core. It leverages the Blazor component model to compose a <b>fully dynamic</b> web development experience which can be hosted either client-side or server-side. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
                         "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane-glow.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" +
-                        "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is an open source and cross-platform web UI framework for building single-page apps using .NET and C# instead of JavaScript. Blazor WebAssembly relies on Wasm, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Blazor Server uses SignalR to host your application on a web server and provide a responsive and robust development experience. Blazor applications work in all modern web browsers, including mobile browsers.</p>" +
+                        "<p><a href=\"https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor\" target=\"_new\">Blazor</a> is an open source and cross-platform web UI framework for building single-page applications using .NET and C#. Blazor applications can be hosted in a variety of ways. Blazor Server uses SignalR (WebSockets) to host your application on a web server and provide a responsive and robust development experience. Blazor WebAssembly relies on Wasm, an open web standard that does not require plugins in order for applications to run natively in a web browser. Blazor Hybrid is part of .NET MAUI and uses a Web View to render components natively on mobile and desktop devices. Razor components can be used with all of the hosting models without any modification.</p>" +
                         "<p>Blazor is a feature of <a href=\"https://dotnet.microsoft.com/apps/aspnet\" target=\"_new\">.NET Core</a>, the popular cross platform web development framework from Microsoft that extends the <a href=\"https://dotnet.microsoft.com/learn/dotnet/what-is-dotnet\" target=\"_new\" >.NET developer platform</a> with tools and libraries for building web apps.</p>"
                     },
                     new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = PaneNames.Admin,

Oqtane.Server/Migrations/Tenant/03020001_AddSiteHomePage.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.03.02.00.01")]
+    public class AddSiteHomePage : MultiDatabaseMigration
+    {
+        public AddSiteHomePage(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase);
+            siteEntityBuilder.AddIntegerColumn("HomePageId", true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            var siteEntityBuilder = new SiteEntityBuilder(migrationBuilder, ActiveDatabase);
+            siteEntityBuilder.DropColumn("HomePageId");
+        }
+    }
+}

Oqtane.Server/Pages/_Host.cshtml.cs

@@ -152,6 +152,10 @@ namespace Oqtane.Pages
                         }
 
                         var page = _pages.GetPage(route.PagePath, site.SiteId);
+                        if (page == null && route.PagePath == "" && site.HomePageId != null)
+                        {
+                            page = _pages.GetPage(site.HomePageId.Value);
+                        }
                         if (page != null && !page.IsDeleted)
                         {
                             // set page title

Oqtane.Shared/Models/Site.cs

@@ -83,6 +83,11 @@ namespace Oqtane.Models
         /// </summary>
         public string Version { get; set; }
 
+        /// <summary>
+        /// The home page of the site which will be used as a fallback if no page has a path of "/" 
+        /// </summary>
+        public int? HomePageId { get; set; }
+
         [NotMapped]
         public Dictionary<string, string> Settings { get; set; }