From 52bcdb12c5d112b0ebbdd73b4a33bd3ef49aa128 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Thu, 24 Jun 2021 18:02:01 -0400
Subject: [PATCH 1/4] package management modifications

---
 .../Modules/Admin/ModuleDefinitions/Add.razor | 92 ++++++++++---------
 Oqtane.Client/Modules/Admin/Themes/Add.razor  | 92 ++++++++++---------
 .../Modules/Admin/Upgrade/Index.razor         | 57 ++++++------
 Oqtane.Client/UI/SiteRouter.razor             |  9 +-
 Oqtane.Package/release.cmd                    |  1 +
 5 files changed, 126 insertions(+), 125 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 115294e7..6d31270f 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -7,57 +7,58 @@
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_packages != null)
-{
-    <TabStrip>
-        @if (_packages.Count > 0)
+<TabStrip>
+    <TabPanel Name="Download" ResourceKey="Download">
+        @if (_packages != null && _packages.Count > 0)
         {
-            <TabPanel Name="Download" ResourceKey="Download">
-                <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
+            <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
 
-                <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
-                    <tr>
-                        <td>
-                            <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
-                        </td>
-                        <td>
-                            <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
-                            <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
-                        </td>
-                    </tr>
-                </table>
-
-                <Pager Items="@_packages">
-                    <Row>
-                        <td>
-                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
-                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
-                        </td>
-                        <td style="vertical-align: middle;">
-                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>@Localizer["Download"]</button>
-                        </td>
-                    </Row>
-                </Pager>
-            </TabPanel>
-        }
-        <TabPanel Name="Upload" ResourceKey="Upload">
-            <table class="table table-borderless">
+            <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
                 <tr>
                     <td>
-                        <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
+                        <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
                     </td>
                     <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
+                        <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
+                        <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
                     </td>
                 </tr>
             </table>
-        </TabPanel>
-    </TabStrip>
 
-    <button type="button" class="btn btn-success" @onclick="InstallModules">@Localizer["Install"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-}
+            <Pager Items="@_packages">
+                <Row>
+                    <td>
+                        <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                        @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                        <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                    </td>
+                    <td style="vertical-align: middle;">
+                        <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>@Localizer["Download"]</button>
+                    </td>
+                </Row>
+            </Pager>
+        }
+        else
+        {
+            <ModuleMessage Type="MessageType.Info" Message="No Modules Available For Download "></ModuleMessage>
+        }
+    </TabPanel>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
+                </td>
+                <td>
+                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="true" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+</TabStrip>
+
+<button type="button" class="btn btn-success" @onclick="InstallModules">@Localizer["Install"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private List<Package> _packages;
@@ -83,11 +84,14 @@
         var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
         _packages = await PackageService.GetPackagesAsync("module", _search);
 
-        foreach (Package package in _packages.ToArray())
+        if (_packages != null)
         {
-            if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
+            foreach (Package package in _packages.ToArray())
             {
-                _packages.Remove(package);
+                if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
+                {
+                    _packages.Remove(package);
+                }
             }
         }
     }
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 0866821d..5b4d063e 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -7,57 +7,58 @@
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_packages != null)
-{
-    <TabStrip>
-        @if (_packages.Count > 0)
+<TabStrip>
+    <TabPanel Name="Download" ResourceKey="Download">
+        @if (_packages != null && _packages.Count > 0)
         {
-            <TabPanel Name="Download" ResourceKey="Download">
-                <ModuleMessage Type="MessageType.Info" Message="Download one or more themes from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
+            <ModuleMessage Type="MessageType.Info" Message="Download one or more themes from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
 
-                <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
-                    <tr>
-                        <td>
-                            <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
-                        </td>
-                        <td>
-                            <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
-                            <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
-                        </td>
-                    </tr>
-                </table>
-
-                <Pager Items="@_packages">
-                    <Row>
-                        <td>
-                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
-                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
-                        </td>
-                        <td style="vertical-align: middle;">
-                            <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadTheme(context.PackageId, context.Version))>@Localizer["Download"]</button>
-                        </td>
-                    </Row>
-                </Pager>
-            </TabPanel>
-        }
-        <TabPanel Name="Upload" ResourceKey="Upload">
-            <table class="table table-borderless">
+            <table class="table table-borderless" style=" margin: auto; width: 50% !important;">
                 <tr>
                     <td>
-                        <Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
+                        <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
                     </td>
                     <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
+                        <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>&nbsp;
+                        <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
                     </td>
                 </tr>
             </table>
-        </TabPanel>
-    </TabStrip>
 
-    <button type="button" class="btn btn-success" @onclick="InstallThemes">@Localizer["Install"]</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
-}
+            <Pager Items="@_packages">
+                <Row>
+                    <td>
+                        <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                        @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                        <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                    </td>
+                    <td style="vertical-align: middle;">
+                        <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadTheme(context.PackageId, context.Version))>@Localizer["Download"]</button>
+                    </td>
+                </Row>
+            </Pager>
+        }
+        else
+        {
+            <ModuleMessage Type="MessageType.Info" Message="No Themes Available For Download"></ModuleMessage>
+        }
+    </TabPanel>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
+                </td>
+                <td>
+                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" UploadMultiple="@true" />
+                </td>
+            </tr>
+        </table>
+    </TabPanel>
+</TabStrip>
+
+<button type="button" class="btn btn-success" @onclick="InstallThemes">@Localizer["Install"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
 
 @code {
     private List<Package> _packages;
@@ -83,11 +84,14 @@
         var themes = await ThemeService.GetThemesAsync();
         _packages = await PackageService.GetPackagesAsync("theme", _search);
 
-        foreach (Package package in _packages.ToArray())
+        if (_packages != null)
         {
-            if (themes.Exists(item => item.PackageName == package.PackageId))
+            foreach (Package package in _packages.ToArray())
             {
-                _packages.Remove(package);
+                if (themes.Exists(item => item.PackageName == package.PackageId))
+                {
+                    _packages.Remove(package);
+                }
             }
         }
     }
diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index ceb379d5..aabf6a5e 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -6,37 +6,34 @@
 @inject IInstallationService InstallationService
 @inject IStringLocalizer<Index> Localizer
 
-@if (_package != null)
-{
-    <TabStrip>
-        <TabPanel Name="Download" ResourceKey="Download">
-            @if (_upgradeavailable)
-            {
-                <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
-                <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@Localizer["Download"] @_package.Version</button>
-                <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Upgrade"]</button>
-            }
-            else
-            {
-                <ModuleMessage Type="MessageType.Info" Message="Framework Is Already Up To Date"></ModuleMessage>
-            }
-        </TabPanel>
-        <TabPanel Name="Upload" ResourceKey="Upload">
-            <ModuleMessage Type="MessageType.Info" Message="Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade"></ModuleMessage>
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
-                    </td>
-                    <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
-                    </td>
-                </tr>
-            </table>
+<TabStrip>
+    <TabPanel Name="Download" ResourceKey="Download">
+        @if (_package != null && _upgradeavailable)
+        {
+            <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
+            <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@Localizer["Download"] @_package.Version</button>
             <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Upgrade"]</button>
-        </TabPanel>
-    </TabStrip>
-}
+        }
+        else
+        {
+            <ModuleMessage Type="MessageType.Info" Message="Framework Is Already Up To Date"></ModuleMessage>
+        }
+    </TabPanel>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <ModuleMessage Type="MessageType.Info" Message="Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade"></ModuleMessage>
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
+                </td>
+                <td>
+                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
+                </td>
+            </tr>
+        </table>
+        <button type="button" class="btn btn-success" @onclick="Upgrade">@Localizer["Upgrade"]</button>
+    </TabPanel>
+</TabStrip>
 
 @code {
     private Package _package;
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index cbe7783a..629e6078 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -172,13 +172,8 @@
             }
 
             // format path and remove alias
-            path = path.Replace("//", "/");
-
-            if (!path.EndsWith("/"))
-            {
-                path += "/";
-            }
-
+            path = path.Replace("//", "/"); // in case of doubleslash at end
+            path += (!path.EndsWith("/")) ? "/" : "";
             if (SiteState.Alias.Path != "" && path.StartsWith(SiteState.Alias.Path))
             {
                 path = path.Substring(SiteState.Alias.Path.Length + 1);
diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd
index bd1b9784..1725d0a4 100644
--- a/Oqtane.Package/release.cmd
+++ b/Oqtane.Package/release.cmd
@@ -1,4 +1,5 @@
 del "*.nupkg"
+del "*.zip"
 dotnet clean -c Release ..\Oqtane.sln 
 dotnet build -c Release ..\Oqtane.sln
 copy /Y/B/V "..\Oqtane.Server\bin\Release\net5.0\System.Drawing.Common.dll" "..\Oqtane.Server\bin\Release\net5.0\publish\System.Drawing.Common.dll"

From 509f0549617ddb83c7a5d8a533cd4c4b4a1261e4 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Fri, 25 Jun 2021 08:10:15 -0400
Subject: [PATCH 2/4] package UI updates

---
 Oqtane.Client/Modules/Admin/Languages/Add.razor         | 2 +-
 Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor | 2 +-
 Oqtane.Client/Modules/Admin/SystemInfo/Index.razor      | 2 +-
 Oqtane.Client/Modules/Admin/Themes/Add.razor            | 2 +-
 Oqtane.Client/Modules/Admin/Upgrade/Index.razor         | 2 +-
 Oqtane.Client/Resources/SharedResources.resx            | 5 ++++-
 Oqtane.Server/Controllers/PackageController.cs          | 1 -
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor
index 0c936c33..24a90b6a 100644
--- a/Oqtane.Client/Modules/Admin/Languages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor
@@ -75,7 +75,7 @@ else
                         <td>
                             <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
                             @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
                         </td>
                         <td style="vertical-align: middle;">
                             <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadLanguage(context.PackageId, context.Version))>@Localizer["Download"]</button>
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index 6d31270f..f4cb7680 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -30,7 +30,7 @@
                     <td>
                         <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
                         @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                        <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                        <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
                     </td>
                     <td style="vertical-align: middle;">
                         <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>@Localizer["Download"]</button>
diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index 1d8fda36..a39d3fac 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -122,7 +122,7 @@
         {
             ShowProgressIndicator();
             var interop = new Interop(JSRuntime);
-            await interop.RedirectBrowser(NavigateUrl(""), 10);
+            await interop.RedirectBrowser(NavigateUrl(""), 20);
             await InstallationService.RestartAsync();
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 5b4d063e..1ef14328 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -30,7 +30,7 @@
                     <td>
                         <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
                         @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
-                        <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                        <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp; @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>&nbsp;&nbsp;|&nbsp;&nbsp;@SharedLocalizer["Search.Source"]: <strong>@context.PackageUrl</strong>
                     </td>
                     <td style="vertical-align: middle;">
                         <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadTheme(context.PackageId, context.Version))>@Localizer["Download"]</button>
diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index aabf6a5e..d396f1bd 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -72,7 +72,7 @@
             AddModuleMessage(Localizer["Info.Upgrade.Wait"], MessageType.Info);
             ShowProgressIndicator();
             var interop = new Interop(JSRuntime);
-            await interop.RedirectBrowser(NavigateUrl(), 30);
+            await interop.RedirectBrowser(NavigateUrl(), 20);
             await InstallationService.Upgrade();
         }
         catch (Exception ex)
diff --git a/Oqtane.Client/Resources/SharedResources.resx b/Oqtane.Client/Resources/SharedResources.resx
index 6f0687b7..980729e1 100644
--- a/Oqtane.Client/Resources/SharedResources.resx
+++ b/Oqtane.Client/Resources/SharedResources.resx
@@ -226,9 +226,12 @@
     <value>downloads</value>
   </data>
   <data name="Search.Released" xml:space="preserve">
-    <value>release date</value>
+    <value>released</value>
   </data>
   <data name="Search.Version" xml:space="preserve">
     <value>version</value>
   </data>
+  <data name="Search.Source" xml:space="preserve">
+    <value>source</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs
index f775f9b7..8887e42f 100644
--- a/Oqtane.Server/Controllers/PackageController.cs
+++ b/Oqtane.Server/Controllers/PackageController.cs
@@ -34,7 +34,6 @@ namespace Oqtane.Controllers
 
         // GET: api/<controller>?type=x&search=y
         [HttpGet]
-        [Authorize(Roles = RoleNames.Host)]
         public async Task<IEnumerable<Package>> Get(string type, string search)
         {
             // get packages

From e1e4d826849fdc0fc3b322212394c3dc7c4c6ee8 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Fri, 25 Jun 2021 08:22:36 -0400
Subject: [PATCH 3/4] resx file corrections

---
 Oqtane.Client/Modules/Admin/Languages/Add.razor               | 4 ----
 Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor       | 4 ----
 Oqtane.Client/Modules/Admin/Themes/Add.razor                  | 4 ----
 Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx      | 2 +-
 Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx    | 2 +-
 .../Resources/Modules/Admin/ModuleCreator/Index.resx          | 4 ++--
 .../Resources/Modules/Admin/ModuleDefinitions/Add.resx        | 2 +-
 .../Resources/Modules/Admin/ModuleDefinitions/Create.resx     | 4 ++--
 .../Resources/Modules/Admin/ModuleDefinitions/Index.resx      | 4 ++--
 Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx         | 2 +-
 Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx      | 4 ++--
 Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx       | 4 ++--
 12 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor
index 24a90b6a..2c3eea33 100644
--- a/Oqtane.Client/Modules/Admin/Languages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor
@@ -85,10 +85,6 @@ else
                 <button type="button" class="btn btn-success" @onclick="InstallLanguages">@Localizer["Install"]</button>
                 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
             }
-            else
-            {
-                <ModuleMessage Type="MessageType.Info" Message="No Translations Are Available To Download"></ModuleMessage>
-            }
         </TabPanel>
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <table class="table table-borderless">
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
index f4cb7680..803fd7ca 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -38,10 +38,6 @@
                 </Row>
             </Pager>
         }
-        else
-        {
-            <ModuleMessage Type="MessageType.Info" Message="No Modules Available For Download "></ModuleMessage>
-        }
     </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
         <table class="table table-borderless">
diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor
index 1ef14328..7c71b494 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor
@@ -38,10 +38,6 @@
                 </Row>
             </Pager>
         }
-        else
-        {
-            <ModuleMessage Type="MessageType.Info" Message="No Themes Available For Download"></ModuleMessage>
-        }
     </TabPanel>
     <TabPanel Name="Upload" ResourceKey="Upload">
         <table class="table table-borderless">
diff --git a/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx
index 5b11d69f..e3ea4a00 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx
@@ -166,6 +166,6 @@
     <value>Translation Downloaded Successfully. Click Install To Complete Installation.</value>
   </data>
   <data name="Success.Language.Install" xml:space="preserve">
-    <value>Translations Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Translations Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx
index e62f8156..8545439e 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx
@@ -145,7 +145,7 @@
     <value>Error Downloading Translation</value>
   </data>
   <data name="Success.Language.Install" xml:space="preserve">
-    <value>Translation Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Translation Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Upgrade" xml:space="preserve">
     <value>Upgrade</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx
index 61d8cda8..6f9d702f 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleCreator/Index.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -139,7 +139,7 @@
     <value>Once You Have Compiled The Module And Restarted The Application You Can Activate The Module Below</value>
   </data>
   <data name="Success.Module.Create" xml:space="preserve">
-    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Message.Require.ValidName" xml:space="preserve">
     <value>You Must Provide A Valid Owner Name And Module Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
index 58d2d1e8..e67f4e04 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx
@@ -133,7 +133,7 @@
     <value>Error Loading Packages</value>
   </data>
   <data name="Success.Module.Install" xml:space="preserve">
-    <value>Module Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Module Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Success.Module.Download" xml:space="preserve">
     <value>Module Downloaded Successfully. Click Install To Complete Installation.</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx
index b2924f9a..93bc475d 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -172,6 +172,6 @@
     <value>Location: </value>
   </data>
   <data name="Success.Module.Create" xml:space="preserve">
-    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
+    <value>The Source Code For Your Module Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
index 30fa708a..d42c19f1 100644
--- a/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Index.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -130,7 +130,7 @@
     <value>Version</value>
   </data>
   <data name="Success.Module.Install" xml:space="preserve">
-    <value>Module Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Module Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Error.Module.Download" xml:space="preserve">
     <value>Error Downloading Module</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
index c9e04ebd..60da0ef3 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Add.resx
@@ -133,7 +133,7 @@
     <value>Theme: </value>
   </data>
   <data name="Success.Theme.Install" xml:space="preserve">
-    <value>Theme Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Theme Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Success.Theme.Download" xml:space="preserve">
     <value>Theme Downloaded Successfully. Click Install To Complete Installation.</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx
index b076cd1d..53e55f09 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Create.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -148,7 +148,7 @@
     <value>Please Note That The Theme Creator Is Only Intended To Be Used In A Development Environment</value>
   </data>
   <data name="Success.Theme.Create" xml:space="preserve">
-    <value>The Source Code For Your Theme Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
+    <value>The Source Code For Your Theme Has Been Created At The Location Specified Below And Must Be Compiled In Order To Make It Functional. Once It Has Been Compiled You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Activate The Module.</value>
   </data>
   <data name="Message.Required.ValidName" xml:space="preserve">
     <value>You Must Provide A Valid Owner Name And Theme Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template</value>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
index 4ec76f5a..e9242f72 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Themes/Index.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -127,7 +127,7 @@
     <value>Upgrade</value>
   </data>
   <data name="Success.Theme.Install" xml:space="preserve">
-    <value>Theme Installed Successfully. You Must &lt;a href=\"{0}\"&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
+    <value>Theme Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
   </data>
   <data name="Error.Theme.Download" xml:space="preserve">
     <value>Error Downloading Theme</value>

From db1808d3e9aacf8d928a62a03df4f60a73455e7e Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Fri, 25 Jun 2021 15:06:52 -0400
Subject: [PATCH 4/4] additional system info

---
 .../Modules/Admin/SystemInfo/Index.razor      | 195 +++++++++++-------
 .../Modules/Admin/SystemInfo/Index.resx       |  62 +++++-
 .../Controllers/PackageController.cs          |  84 --------
 Oqtane.Server/Controllers/SystemController.cs |  23 ++-
 4 files changed, 201 insertions(+), 163 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index a39d3fac..173d9e2b 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -4,98 +4,149 @@
 @inject IInstallationService InstallationService
 @inject IStringLocalizer<Index> Localizer
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
-        </td>
-        <td>
-            <input id="version" class="form-control" @bind="@_version" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label>
-        </td>
-        <td>
-            <select id="runtime" class="form-control" @bind="@_runtime">
-                <option value="Server">@Localizer["Server"]</option>
-                <option value="WebAssembly">@Localizer["WebAssembly"]</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
-        </td>
-        <td>
-            <select id="rendermode" class="form-control" @bind="@_rendermode">
-                <option value="Server">@Localizer["Server"]</option>
-                <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="ClrVerion">CLR Version: </Label>
-        </td>
-        <td>
-            <input id="clrversion" class="form-control" @bind="@_clrversion" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="osversion" HelpText="Operating System Version" ResourceKey="OsVersion">OS Version: </Label>
-        </td>
-        <td>
-            <input id="osversion" class="form-control" @bind="@_osversion" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label>
-        </td>
-        <td>
-            <input id="serverpath" class="form-control" @bind="@_serverpath" readonly />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
-        </td>
-        <td>
-            <input id="servertime" class="form-control" @bind="@_servertime" readonly />
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveConfig">@Localizer["Save"]</button>&nbsp;
-<a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp;
-<ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+<TabStrip>
+    <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
+                </td>
+                <td>
+                    <input id="version" class="form-control" @bind="@_version" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label>
+                </td>
+                <td>
+                    <input id="clrversion" class="form-control" @bind="@_clrversion" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label>
+                </td>
+                <td>
+                    <input id="osversion" class="form-control" @bind="@_osversion" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="serverpath" HelpText="Server Path" ResourceKey="ServerPath">Server Path: </Label>
+                </td>
+                <td>
+                    <input id="serverpath" class="form-control" @bind="@_serverpath" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
+                </td>
+                <td>
+                    <input id="servertime" class="form-control" @bind="@_servertime" readonly />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label>
+                </td>
+                <td>
+                    <input id="installationid" class="form-control" @bind="@_installationid" readonly />
+                </td>
+            </tr>
+        </table>
+        <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp;
+        <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+    </TabPanel>
+    <TabPanel Name="Options" Heading="Options" ResourceKey="Options">
+        <table class="table table-borderless">
+            <tr>
+                <td>
+                    <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)" ResourceKey="BlazorRuntime">Blazor Runtime: </Label>
+                </td>
+                <td>
+                    <select id="runtime" class="form-control" @bind="@_runtime">
+                        <option value="Server">@Localizer["Server"]</option>
+                        <option value="WebAssembly">@Localizer["WebAssembly"]</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="rendermode" HelpText="Blazor Server Render Mode" ResourceKey="RenderMode">Render Mode: </Label>
+                </td>
+                <td>
+                    <select id="rendermode" class="form-control" @bind="@_rendermode">
+                        <option value="Server">@Localizer["Server"]</option>
+                        <option value="ServerPrerendered">@Localizer["ServerPrerendered"]</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label>
+                </td>
+                <td>
+                    <select id="detailederrors" class="form-control" @bind="@_detailederrors">
+                        <option value="true">@Localizer["True"]</option>
+                        <option value="false">@Localizer["False"]</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <Label For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label>
+                </td>
+                <td>
+                    <select id="logginglevel" class="form-control" @bind="@_logginglevel">
+                        <option value="Trace">@Localizer["Trace"]</option>
+                        <option value="Debug">@Localizer["Debug"]</option>
+                        <option value="Information">@Localizer["Information"]</option>
+                        <option value="Warning">@Localizer["Warning"]</option>
+                        <option value="Error">@Localizer["Error"]</option>
+                        <option value="Critical">@Localizer["Critical"]</option>
+                    </select>
+                </td>
+            </tr>
+        </table>
+        <button type="button" class="btn btn-success" @onclick="SaveConfig">@Localizer["Save"]</button>&nbsp;
+        <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+    </TabPanel>
+</TabStrip>
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     private string _version = string.Empty;
-    private string _runtime = string.Empty;
-    private string _rendermode = string.Empty;
     private string _clrversion = string.Empty;
     private string _osversion = string.Empty;
     private string _serverpath = string.Empty;
     private string _servertime = string.Empty;
+    private string _installationid = string.Empty;
+
+    private string _runtime = string.Empty;
+    private string _rendermode = string.Empty;
+    private string _detailederrors = string.Empty;
+    private string _logginglevel = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
         _version = Constants.Version;
-        _runtime = PageState.Runtime.ToString();
 
         Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
         if (systeminfo != null)
         {
-            _rendermode = systeminfo["rendermode"];
             _clrversion = systeminfo["clrversion"];
             _osversion = systeminfo["osversion"];
             _serverpath = systeminfo["serverpath"];
             _servertime = systeminfo["servertime"];
+            _installationid = systeminfo["installationid"];
+
+            _runtime = systeminfo["runtime"];
+            _rendermode = systeminfo["rendermode"];
+            _detailederrors = systeminfo["detailederrors"];
+            _logginglevel = systeminfo["logginglevel"];
         }
     }
 
@@ -106,6 +157,8 @@
             var settings = new Dictionary<string, string>();
             settings.Add("runtime", _runtime);
             settings.Add("rendermode", _rendermode);
+            settings.Add("detailederrors", _detailederrors);
+            settings.Add("logginglevel", _logginglevel);
             await SystemService.UpdateSystemInfoAsync(settings);
             AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
         }
diff --git a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
index 6a7a3172..a94fa5c7 100644
--- a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -123,13 +123,13 @@
   <data name="FrameworkVersion.HelpText" xml:space="preserve">
     <value>Framework Version</value>
   </data>
-  <data name="BlazorRunime.HelpText" xml:space="preserve">
+  <data name="BlazorRuntime.HelpText" xml:space="preserve">
     <value>Blazor Runtime (Server or WebAssembly)</value>
   </data>
-  <data name="ClrVerion.HelpText" xml:space="preserve">
+  <data name="CLRVersion.HelpText" xml:space="preserve">
     <value>Common Language Runtime Version</value>
   </data>
-  <data name="OsVersion.HelpText" xml:space="preserve">
+  <data name="OSVersion.HelpText" xml:space="preserve">
     <value>Operating System Version</value>
   </data>
   <data name="ServerPath.HelpText" xml:space="preserve">
@@ -141,13 +141,13 @@
   <data name="FrameworkVersion.Text" xml:space="preserve">
     <value>Framework Version: </value>
   </data>
-  <data name="BlazorRunime.Text" xml:space="preserve">
+  <data name="BlazorRuntime.Text" xml:space="preserve">
     <value>Blazor Runtime: </value>
   </data>
-  <data name="ClrVerion.Text" xml:space="preserve">
+  <data name="CLRVersion.Text" xml:space="preserve">
     <value>CLR Version: </value>
   </data>
-  <data name="OsVersion.Text" xml:space="preserve">
+  <data name="OSVersion.Text" xml:space="preserve">
     <value>OS Version: </value>
   </data>
   <data name="ServerPath.Text" xml:space="preserve">
@@ -180,4 +180,52 @@
   <data name="WebAssembly" xml:space="preserve">
     <value>WebAssembly</value>
   </data>
+  <data name="InstallationId.Text" xml:space="preserve">
+    <value>Installation ID: </value>
+  </data>
+  <data name="InstallationId.HelpText" xml:space="preserve">
+    <value>The Unique Identifier For Your Installation</value>
+  </data>
+  <data name="DetailedErrors.Text" xml:space="preserve">
+    <value>Detailed Errors? </value>
+  </data>
+  <data name="DetailedErrors.HelpText" xml:space="preserve">
+    <value>Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production.</value>
+  </data>
+  <data name="True" xml:space="preserve">
+    <value>True</value>
+  </data>
+  <data name="False" xml:space="preserve">
+    <value>False</value>
+  </data>
+  <data name="LoggingLevel.Text" xml:space="preserve">
+    <value>Logging Level: </value>
+  </data>
+  <data name="LoggingLevel.HelpText" xml:space="preserve">
+    <value>The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log.</value>
+  </data>
+    <data name="Trace" xml:space="preserve">
+    <value>Trace</value>
+  </data>
+    <data name="Debug" xml:space="preserve">
+    <value>Debug</value>
+  </data>
+    <data name="Information" xml:space="preserve">
+    <value>Information</value>
+  </data>
+    <data name="Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="Critical" xml:space="preserve">
+    <value>Critical</value>
+  </data>
+  <data name="Info" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="Options" xml:space="preserve">
+    <value>Options</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs
index 8887e42f..8cc1c458 100644
--- a/Oqtane.Server/Controllers/PackageController.cs
+++ b/Oqtane.Server/Controllers/PackageController.cs
@@ -124,88 +124,4 @@ namespace Oqtane.Controllers
             _installationManager.InstallPackages();
         }
     }
-
-    public partial class SearchResult
-    {
-        [JsonProperty("@context")]
-        public Context Context { get; set; }
-
-        [JsonProperty("totalHits")]
-        public long TotalHits { get; set; }
-
-        [JsonProperty("data")]
-        public Data[] Data { get; set; }
-    }
-
-    public partial class Context
-    {
-        [JsonProperty("@vocab")]
-        public Uri Vocab { get; set; }
-
-        [JsonProperty("@base")]
-        public Uri Base { get; set; }
-    }
-
-    public partial class Data
-    {
-        [JsonProperty("@id")]
-        public Uri Url { get; set; }
-
-        [JsonProperty("@type")]
-        public string Type { get; set; }
-
-        [JsonProperty("registration")]
-        public Uri Registration { get; set; }
-
-        [JsonProperty("id")]
-        public string Id { get; set; }
-
-        [JsonProperty("version")]
-        public string Version { get; set; }
-
-        [JsonProperty("description")]
-        public string Description { get; set; }
-
-        [JsonProperty("summary")]
-        public string Summary { get; set; }
-
-        [JsonProperty("title")]
-        public string Title { get; set; }
-
-        [JsonProperty("iconUrl")]
-        public Uri IconUrl { get; set; }
-
-        [JsonProperty("licenseUrl")]
-        public Uri LicenseUrl { get; set; }
-
-        [JsonProperty("projectUrl")]
-        public Uri ProjectUrl { get; set; }
-
-        [JsonProperty("tags")]
-        public string[] Tags { get; set; }
-
-        [JsonProperty("authors")]
-        public string[] Authors { get; set; }
-
-        [JsonProperty("totalDownloads")]
-        public long TotalDownloads { get; set; }
-
-        [JsonProperty("verified")]
-        public bool Verified { get; set; }
-
-        [JsonProperty("versions")]
-        public Version[] Versions { get; set; }
-    }
-
-    public partial class Version
-    {
-        [JsonProperty("version")]
-        public string Number { get; set; }
-
-        [JsonProperty("downloads")]
-        public long Downloads { get; set; }
-
-        [JsonProperty("@id")]
-        public Uri Url { get; set; }
-    }
 }
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
index 19dae995..ab0ddc50 100644
--- a/Oqtane.Server/Controllers/SystemController.cs
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -27,12 +27,17 @@ namespace Oqtane.Controllers
         {
             Dictionary<string, string> systeminfo = new Dictionary<string, string>();
 
-            systeminfo.Add("rendermode", _configManager.GetSetting("RenderMode", "Server"));
             systeminfo.Add("clrversion", Environment.Version.ToString());
             systeminfo.Add("osversion", Environment.OSVersion.ToString());
             systeminfo.Add("machinename", Environment.MachineName);
             systeminfo.Add("serverpath", _environment.ContentRootPath);
             systeminfo.Add("servertime", DateTime.Now.ToString());
+            systeminfo.Add("installationid", GetInstallationId());
+
+            systeminfo.Add("runtime", _configManager.GetSetting("Runtime", "Server"));
+            systeminfo.Add("rendermode", _configManager.GetSetting("RenderMode", "ServerPrerendered"));
+            systeminfo.Add("detailederrors", _configManager.GetSetting("DetailedErrors", "false"));
+            systeminfo.Add("logginglevel", _configManager.GetSetting("Logging:LogLevel:Default", "Information"));
 
             return systeminfo;
         }
@@ -51,9 +56,25 @@ namespace Oqtane.Controllers
                     case "rendermode":
                         _configManager.AddOrUpdateSetting("RenderMode", kvp.Value, false);
                         break;
+                    case "detailederrors":
+                        _configManager.AddOrUpdateSetting("DetailedErrors", kvp.Value, false);
+                        break;
+                    case "logginglevel":
+                        _configManager.AddOrUpdateSetting("Logging:LogLevel:Default", kvp.Value, false);
+                        break;
                 }
             }
         }
 
+        private string GetInstallationId()
+        {
+            var installationid = _configManager.GetSetting("InstallationId", "");
+            if (installationid == "")
+            {
+                installationid = Guid.NewGuid().ToString();
+                _configManager.AddOrUpdateSetting("InstallationId", installationid, true);
+            }
+            return installationid;
+        }
     }
 }