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

Finish upgrade to Preview9

Browse Source
This commit is contained in:
Shaun Walker 2019-09-15 18:36:39 -04:00
parent add3728a84
commit 61dc27cf32
38 changed files with 77 additions and 39 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
@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.Services
@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 Microsoft.JSInterop
@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.Web
@using Oqtane.Modules.Controls
@using Oqtane.Modules
@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.Modules
@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.Web
@using Oqtane.Services
@using Oqtane.Models
@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.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

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

@ -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;

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

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Modules.Controls
@using Oqtane.Models
@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.Models
@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.Web
@using Oqtane.Modules.Controls
@using Oqtane.Modules
@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.Web
@using Oqtane.Modules
@using Oqtane.Models
@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.Modules
@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.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()
{

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

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

@ -1,4 +1,5 @@
@using Oqtane.Modules
@using Microsoft.AspNetCore.Components.Web
@namespace Oqtane.Modules.Controls
@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)
{

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
@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.Models
@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" />

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

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

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

@ -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

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.HtmlText.Models
@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.Weather.Services
@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.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>

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.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.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()
{

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.Providers
@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
@inherits ThemeObjectBase

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

@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Oqtane.Themes
@using Oqtane.Services
@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.Web
@using Oqtane.Themes
@using Oqtane.Services
@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.Models
@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
@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
@inherits ThemeObjectBase
@inject NavigationManager NavigationManager

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

@ -107,12 +107,11 @@ namespace Oqtane.Controllers
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)
{