Merge pull request #3 from oqtane/master

completing preview 9 upgrade
oqtane · Sep 15, 2019 · 8e90a84 · 8e90a84
2 parents 7ea1d1f + 2d8c35c
commit 8e90a84
Show file tree

Hide file tree

Showing 39 changed files with 80 additions and 46 deletions.
diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Shared
+@using Microsoft.AspNetCore.Components.Authorization
+@using Oqtane.Shared
 @using Oqtane.Services
 @inject IInstallationService InstallationService
 

diff --git a/Oqtane.Client/Modules/Admin/Dashboard/Index.razor b/Oqtane.Client/Modules/Admin/Dashboard/Index.razor
@@ -1,4 +1,5 @@
-@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Routing
 @using Oqtane.Modules
 @using Oqtane.Services
 @using Oqtane.Models;

diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor
@@ -1,4 +1,6 @@
-@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Routing
 @using Oqtane.Modules
 @using Microsoft.JSInterop
 @using Oqtane.Models

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules.Controls
 @using Oqtane.Modules
 @using Oqtane.Services

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
 @using Oqtane.Modules.Controls

diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules

diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules.Controls
 @using Oqtane.Models
 @using Oqtane.Services
@@ -31,7 +32,7 @@
                 <option value="">&lt;Site Root&gt;</option>
                 @foreach (Page page in pages)
                 {
-                    <option value="@(page.PageId)">@(new string('-',page.Level * 2))@(page.Name)</option>
+                    <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
                 }
             </select>
         </td>
@@ -141,14 +142,14 @@
     Dictionary<string, string> panelayouts = new Dictionary<string, string>();
 
     List<Page> pages;
-    string name;
+    string name = "";
     string parentid;
-    string insert;
+    string insert = ">>";
     List<Page> children;
     int childid = -1;
     string isnavigation = "True";
     string editmode = "False";
-    string themetype;
+    string themetype = "";
     string layouttype = "";
     string icon = "";
     string permissions = ""; // need to set default permissions

diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules.Controls
 @using Oqtane.Models
 @using Oqtane.Services
@@ -128,7 +129,7 @@
     int PageId;
     string name;
     string path;
-    string parentid;
+    string parentid = "";
     string isnavigation;
     string editmode;
     string themetype;

diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules.Controls
 @using Oqtane.Models
 @using Oqtane.Services

diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Modules.Controls
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Modules.Controls
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules

diff --git a/Oqtane.Client/Modules/Admin/Profile/Index.razor b/Oqtane.Client/Modules/Admin/Profile/Index.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules.Controls
 @using Oqtane.Modules
 @using Oqtane.Models

diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules
 @using Oqtane.Models
 @using Oqtane.Services

diff --git a/Oqtane.Client/Modules/Admin/Roles/Index.razor b/Oqtane.Client/Modules/Admin/Roles/Index.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
 @using Oqtane.Modules.Controls

diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Models
 @using Oqtane.Services
 @using Oqtane.Modules
@@ -66,10 +67,10 @@ else
     public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
     List<Tenant> tenants;
-    string tenantid;
-    string name;
-    string url;
-    string logo;
+    string tenantid = "";
+    string name = "";
+    string url = "";
+    string logo = "";
 
     protected override async Task OnInitializedAsync()
     {

diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
 @using Oqtane.Modules.Controls

diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
 @namespace Oqtane.Modules.Admin.Themes

diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Modules
 @using Oqtane.Modules.Controls

diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules
 @using Oqtane.Services
 @using Oqtane.Shared

diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor
@@ -1,4 +1,5 @@
 @using Oqtane.Modules
+@using Microsoft.AspNetCore.Components.Web
 @namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 

diff --git a/Oqtane.Client/Modules/Controls/FileUpload.razor b/Oqtane.Client/Modules/Controls/FileUpload.razor
@@ -1,4 +1,5 @@
-@namespace Oqtane.Modules.Controls
+@using Microsoft.AspNetCore.Components.Web
+@namespace Oqtane.Modules.Controls
 
 @if (multiple)
 {

diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Modules
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Modules
 @namespace Oqtane.Modules.Controls
 @inherits ModuleBase
 

diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Services
 @using Oqtane.Modules
 @using Oqtane.Models
 @using Oqtane.Security

diff --git a/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor b/Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
@@ -1,4 +1,5 @@
-@namespace Oqtane.Modules.Controls
+@using Microsoft.AspNetCore.Components.Web
+@namespace Oqtane.Modules.Controls
 
 <img src="@src" title="@title" disabled=@Disabled @onclick="SetValue" />
 

diff --git a/Oqtane.Client/Modules/Counter/Index.razor b/Oqtane.Client/Modules/Counter/Index.razor
@@ -1,3 +1,4 @@
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules
 @namespace Oqtane.Modules.Counter
 @inherits ModuleBase

diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules
 @using Oqtane.Modules.Controls
 @using Oqtane.Modules.HtmlText.Services

diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Modules.HtmlText.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Modules.HtmlText.Services
 @using Oqtane.Modules
 @using Oqtane.Modules.HtmlText.Models
 @using System.Net.Http;

diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor
@@ -1,3 +1,4 @@
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Modules
 @using Oqtane.Modules.Weather.Services
 @namespace Oqtane.Modules.Weather

diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
@@ -29,6 +29,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19424.4" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19424.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.0.0-preview9.19424.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Shared
 @namespace Oqtane.Shared

diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Themes
@@ -93,10 +94,10 @@
     List<ModuleDefinition> moduledefinitions;
     Dictionary<string, string> containers = new Dictionary<string, string>();
     int pagemanagementmoduleid = -1;
-    string moduledefinitionname;
-    string pane;
+    string moduledefinitionname = "";
+    string pane = "";
     string title = "";
-    string containertype;
+    string containertype = "";
 
     protected override async Task OnInitializedAsync()
     {

diff --git a/Oqtane.Client/Themes/Controls/Login.razor b/Oqtane.Client/Themes/Controls/Login.razor
@@ -1,4 +1,6 @@
-@using Oqtane.Themes
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Themes
 @using Oqtane.Services
 @using Oqtane.Providers
 @using Oqtane.Shared

diff --git a/Oqtane.Client/Themes/Controls/Logo.razor b/Oqtane.Client/Themes/Controls/Logo.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Themes
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Themes
 @namespace Oqtane.Themes.Controls
 @inherits ThemeObjectBase
 

diff --git a/Oqtane.Client/Themes/Controls/Menu.razor b/Oqtane.Client/Themes/Controls/Menu.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Themes
 @using Oqtane.Services
 @using Oqtane.Models;

diff --git a/Oqtane.Client/Themes/Controls/Menu2.razor b/Oqtane.Client/Themes/Controls/Menu2.razor
@@ -1,4 +1,5 @@
 @using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
 @using Oqtane.Themes
 @using Oqtane.Services
 @using Oqtane.Models;

diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Themes
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Themes
 @using Oqtane.Services
 @using Oqtane.Models
 @using Oqtane.Shared

diff --git a/Oqtane.Client/Themes/Controls/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
@@ -1,4 +1,5 @@
-@using Oqtane.Themes
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Themes
 @namespace Oqtane.Themes.Controls
 @inherits ContainerBase
 

diff --git a/Oqtane.Client/Themes/Controls/Profile.razor b/Oqtane.Client/Themes/Controls/Profile.razor
@@ -1,5 +1,6 @@
-@using Oqtane.Themes
-@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Web
+@using Oqtane.Themes
 @namespace Oqtane.Themes.Controls
 @inherits ThemeObjectBase
 @inject NavigationManager NavigationManager

diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
@@ -107,12 +107,11 @@ public async Task<User> Post([FromBody] User User)
 
             if (ModelState.IsValid)
             {
-                bool installed = true;
-                if (!Users.GetUsers().Any())
-                {
-                    installed = false; // during initial installation we need to be able to create the host user
-                }
-
+                //bool installed = true;
+                //if (!Users.GetUsers().Any())
+                //{
+                //    installed = false; // during initial installation we need to be able to create the host user
+                //}
                 IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
                 if (identityuser == null)
                 {

diff --git a/README.md b/README.md
@@ -7,15 +7,11 @@ Oqtane uses Blazor, a new web framework for .NET Core that lets you build intera
 
 **To get started with Oqtane:**
 
-   1.&nbsp;Oqtane is currently compatible with **[.NET Core 3.0 Preview 8 SDK (3.0.0-preview8.19405.7)](https://dotnet.microsoft.com/download/dotnet-core/3.0)**. Microsoft continues to release new versions of .NET Core 3.0 on a regular basis and we do our best to keep up; however, for the best results you should use the most compatible .NET Core 3.0 version.
+   1.&nbsp;Oqtane is currently compatible with **[.NET Core 3.0 Preview 9 SDK (3.0.0-preview9.19424.4)](https://dotnet.microsoft.com/download/dotnet-core/3.0)**.
 
-   2.&nbsp;Install the latest **Preview** edition of [Visual Studio 2019](https://visualstudio.com/preview) with the **ASP.NET and web development** workload.
+   2.&nbsp;Install the latest **Preview** edition of [Visual Studio 2019](https://visualstudio.com/preview) with the **ASP.NET and web development** workload. Installing the latest **Preview** edition will also install the latest preview of .NET Core 3.
 
-   3.&nbsp;Install the latest [Blazor extension](https://go.microsoft.com/fwlink/?linkid=870389) from the Visual Studio Marketplace. 
-
-   4.&nbsp;Enable Visual Studio to use preview SDKs: Open **Tools** > **Options** in the menu bar. Open the **Environment** node. Open the **Preview Features** tab. Check the box for **Use previews of the .NET Core SDK**. Select **OK**. 
-
-   5.&nbsp;Download or Clone the Oqtane source code to your local system. Open the **Oqtane.sln** solution file. If you want to develop using **server-side** Blazor ( which includes a full debugging experience in Visual Studio ) you should choose to Build the solution using the default Debug configuration. If you want to develop using **client-side** Blazor ( WebAssembly ) you should first choose the "Wasm" configuration option in the Visual Studio toolbar and then Build.
+   3.&nbsp;Download or Clone the Oqtane source code to your local system. Open the **Oqtane.sln** solution file. If you want to develop using **server-side** Blazor ( which includes a full debugging experience in Visual Studio ) you should choose to Build the solution using the default Debug configuration. If you want to develop using **client-side** Blazor ( WebAssembly ) you should first choose the "Wasm" configuration option in the Visual Studio toolbar and then Build.
 
    NOTE: If you have already installed a previous version of Oqtane and you wish to install a newer version, there is currently no upgrade path from one version to the next. The recommended upgrade approach is to get the latest code and build it, and then reset the DefaultConnection value to "" in the appsettings.json file in the Oqtane.server project. This will trigger a re-install when you run the application which will execute the latest database scripts.