kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from oqtane/master

Browse Source 
completing preview 9 upgrade
This commit is contained in:
ADefWebserver 2019-09-15 16:06:59 -07:00 committed by GitHub
commit 8e90a84d11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 80 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Client/App.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Shared @using Microsoft.AspNetCore.Components.Authorization
@using Oqtane.Shared
@using Oqtane.Services @using Oqtane.Services
@inject IInstallationService InstallationService @inject IInstallationService InstallationService

3
Oqtane.Client/Modules/Admin/Dashboard/Index.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.Routing
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Services @using Oqtane.Services
@using Oqtane.Models; @using Oqtane.Models;

4
Oqtane.Client/Modules/Admin/Login/Index.razor
View File

@ -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 Oqtane.Modules
@using Microsoft.JSInterop @using Microsoft.JSInterop
@using Oqtane.Models @using Oqtane.Models

1
Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Services @using Oqtane.Services

3
Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Services @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls

1
Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Services @using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Modules @using Oqtane.Modules

9
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Services @using Oqtane.Services
@ -31,7 +32,7 @@
<option value="">&lt;Site Root&gt;</option> <option value="">&lt;Site Root&gt;</option>
@foreach (Page page in pages) @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> </select>
</td> </td>
@ -141,14 +142,14 @@
Dictionary<string, string> panelayouts = new Dictionary<string, string>(); Dictionary<string, string> panelayouts = new Dictionary<string, string>();
List<Page> pages; List<Page> pages;
string name; string name = "";
string parentid; string parentid;
string insert; string insert = ">>";
List<Page> children; List<Page> children;
int childid = -1; int childid = -1;
string isnavigation = "True"; string isnavigation = "True";
string editmode = "False"; string editmode = "False";
string themetype; string themetype = "";
string layouttype = ""; string layouttype = "";
string icon = ""; string icon = "";
string permissions = ""; // need to set default permissions string permissions = ""; // need to set default permissions

3
Oqtane.Client/Modules/Admin/Pages/Delete.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Services @using Oqtane.Services
@ -128,7 +129,7 @@
int PageId; int PageId;
string name; string name;
string path; string path;
string parentid; string parentid = "";
string isnavigation; string isnavigation;
string editmode; string editmode;
string themetype; string themetype;

1
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Services @using Oqtane.Services

3
Oqtane.Client/Modules/Admin/Pages/Index.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Modules.Controls @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules.Controls
@using Oqtane.Services @using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Modules @using Oqtane.Modules

1
Oqtane.Client/Modules/Admin/Profile/Index.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Models @using Oqtane.Models

1
Oqtane.Client/Modules/Admin/Register/Index.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Services @using Oqtane.Services

3
Oqtane.Client/Modules/Admin/Roles/Index.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Services @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls

9
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

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

3
Oqtane.Client/Modules/Admin/Sites/Index.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Services @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls

3
Oqtane.Client/Modules/Admin/Themes/Index.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Services @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Modules @using Oqtane.Modules
@namespace Oqtane.Modules.Admin.Themes @namespace Oqtane.Modules.Admin.Themes

3
Oqtane.Client/Modules/Admin/Users/Index.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Services @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls

1
Oqtane.Client/Modules/Controls/ActionLink.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Services @using Oqtane.Services
@using Oqtane.Shared @using Oqtane.Shared

1
Oqtane.Client/Modules/Controls/AuditInfo.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Modules @using Oqtane.Modules
@using Microsoft.AspNetCore.Components.Web
@namespace Oqtane.Modules.Controls @namespace Oqtane.Modules.Controls
@inherits ModuleBase @inherits ModuleBase

3
Oqtane.Client/Modules/Controls/FileUpload.razor
View File

@ -1,4 +1,5 @@
@namespace Oqtane.Modules.Controls @using Microsoft.AspNetCore.Components.Web
@namespace Oqtane.Modules.Controls
@if (multiple) @if (multiple)
{ {

3
Oqtane.Client/Modules/Controls/ModuleMessage.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Modules @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules
@namespace Oqtane.Modules.Controls @namespace Oqtane.Modules.Controls
@inherits ModuleBase @inherits ModuleBase

3
Oqtane.Client/Modules/Controls/PermissionGrid.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Services @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Services
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Security @using Oqtane.Security

3
Oqtane.Client/Modules/Controls/TriStateCheckBox.razor
View File

@ -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" /> <img src="@src" title="@title" disabled=@Disabled @onclick="SetValue" />

1
Oqtane.Client/Modules/Counter/Index.razor
View File

@ -1,3 +1,4 @@
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules @using Oqtane.Modules
@namespace Oqtane.Modules.Counter @namespace Oqtane.Modules.Counter
@inherits ModuleBase @inherits ModuleBase

1
Oqtane.Client/Modules/HtmlText/Edit.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Modules.Controls @using Oqtane.Modules.Controls
@using Oqtane.Modules.HtmlText.Services @using Oqtane.Modules.HtmlText.Services

3
Oqtane.Client/Modules/HtmlText/Index.razor
View File

@ -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
@using Oqtane.Modules.HtmlText.Models @using Oqtane.Modules.HtmlText.Models
@using System.Net.Http; @using System.Net.Http;

1
Oqtane.Client/Modules/Weather/Index.razor
View File

@ -1,3 +1,4 @@
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules @using Oqtane.Modules
@using Oqtane.Modules.Weather.Services @using Oqtane.Modules.Weather.Services
@namespace Oqtane.Modules.Weather @namespace Oqtane.Modules.Weather

1
Oqtane.Client/Oqtane.Client.csproj
View File

@ -29,6 +29,7 @@
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19424.4" /> <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.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.Blazor.HttpClient" Version="3.0.0-preview9.19424.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.0.0-preview9.19424.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
Oqtane.Client/Shared/Installer.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Services @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Shared @using Oqtane.Shared
@namespace Oqtane.Shared @namespace Oqtane.Shared

7
Oqtane.Client/Themes/Controls/ControlPanel.razor
View File

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

4
Oqtane.Client/Themes/Controls/Login.razor
View File

@ -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.Services
@using Oqtane.Providers @using Oqtane.Providers
@using Oqtane.Shared @using Oqtane.Shared

3
Oqtane.Client/Themes/Controls/Logo.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Themes @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Themes
@namespace Oqtane.Themes.Controls @namespace Oqtane.Themes.Controls
@inherits ThemeObjectBase @inherits ThemeObjectBase

1
Oqtane.Client/Themes/Controls/Menu.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Themes @using Oqtane.Themes
@using Oqtane.Services @using Oqtane.Services
@using Oqtane.Models; @using Oqtane.Models;

1
Oqtane.Client/Themes/Controls/Menu2.razor
View File

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Themes @using Oqtane.Themes
@using Oqtane.Services @using Oqtane.Services
@using Oqtane.Models; @using Oqtane.Models;

3
Oqtane.Client/Themes/Controls/ModuleActions.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Themes @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Themes
@using Oqtane.Services @using Oqtane.Services
@using Oqtane.Models @using Oqtane.Models
@using Oqtane.Shared @using Oqtane.Shared

3
Oqtane.Client/Themes/Controls/ModuleTitle.razor
View File

@ -1,4 +1,5 @@
@using Oqtane.Themes @using Microsoft.AspNetCore.Components.Web
@using Oqtane.Themes
@namespace Oqtane.Themes.Controls @namespace Oqtane.Themes.Controls
@inherits ContainerBase @inherits ContainerBase

5
Oqtane.Client/Themes/Controls/Profile.razor
View File

@ -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 @namespace Oqtane.Themes.Controls
@inherits ThemeObjectBase @inherits ThemeObjectBase
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager

11
Oqtane.Server/Controllers/UserController.cs
View File

@ -107,12 +107,11 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
bool installed = true; //bool installed = true;
if (!Users.GetUsers().Any()) //if (!Users.GetUsers().Any())
{ //{
installed = false; // during initial installation we need to be able to create the host user // installed = false; // during initial installation we need to be able to create the host user
} //}
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username); IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
if (identityuser == null) if (identityuser == null)
{ {

10
README.md
View File

@ -7,15 +7,11 @@ Oqtane uses Blazor, a new web framework for .NET Core that lets you build intera
**To get started with Oqtane:** **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. 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.
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.
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. 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.