Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #53 from sbwalker/master

Browse Source 
Upgrade to Preview8
This commit is contained in:
Shaun Walker
2019-08-14 13:33:24 -04:00
committed by GitHub
parent 49c852b80e 03c7a99906
commit 182df4b40c
26 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/App.razor
View File

@ -20,7 +20,7 @@ else
private bool Installed = false;
private PageState PageState { get; set; }
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
var response = await InstallationService.IsInstalled();
Installed = response.Success;

2
Oqtane.Client/Modules/Admin/Admin/Index.razor
View File

@ -26,7 +26,7 @@
@code {
List<Page> pages;
protected override void OnInit()
protected override void OnInitialized()
{
// display list of pages which are children of current page
pages = PageState.Pages.Where(item => item.ParentId == PageState.Page.PageId).ToList();

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

@ -34,7 +34,7 @@ else
List<ModuleDefinition> moduledefinitions;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync();
}

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

@ -84,7 +84,7 @@
RenderFragment DynamicComponent { get; set; }
object settings;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
title = ModuleState.Title;
containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync());

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

@ -131,7 +131,7 @@
string viewpermissions = "All Users";
string editpermissions = "Administrators";
protected override void OnInit()
protected override void OnInitialized()
{
themes = ThemeService.GetThemeTypes(PageState.Themes);
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes);

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

@ -132,7 +132,7 @@
string viewpermissions;
string editpermissions;
protected override void OnInit()
protected override void OnInitialized()
{
themes = ThemeService.GetThemeTypes(PageState.Themes);
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes);

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

@ -133,7 +133,7 @@
string viewpermissions;
string editpermissions;
protected override void OnInit()
protected override void OnInitialized()
{
themes = ThemeService.GetThemeTypes(PageState.Themes);
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes);

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

@ -68,7 +68,7 @@ else
string url;
string logo;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
tenants = await TenantService.GetTenantsAsync();
}

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

@ -35,7 +35,7 @@ else
List<Site> sites;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
sites = await SiteService.GetSitesAsync();
}

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

@ -33,7 +33,7 @@ else
List<Theme> Themes;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
Themes = await ThemeService.GetThemesAsync();
}

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

@ -34,7 +34,7 @@ else
List<User> Users;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
Users = await UserService.GetUsersAsync();
}

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

@ -29,7 +29,7 @@
string buttonClass = "btn btn-primary";
bool authorized = false;
protected override void OnInit()
protected override void OnInitialized()
{
text = Action;
if (!String.IsNullOrEmpty(Text))

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

@ -18,7 +18,7 @@
string type = "alert alert-success"; // optional
bool authorized = false;
protected override void OnInit()
protected override void OnInitialized()
{
if (PageState.User != null)
{

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

@ -31,7 +31,7 @@
HtmlTextInfo htmltext;
string content;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
HtmlTextService htmltextservice = new HtmlTextService(http, sitestate, UriHelper);
List<HtmlTextInfo> htmltextlist = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);

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

@ -34,7 +34,7 @@ else
@code {
WeatherForecast[] forecasts;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
WeatherForecastService forecastservice = new WeatherForecastService();
forecasts = await forecastservice.GetForecastAsync(DateTime.Now);

5
Oqtane.Client/Oqtane.Client.csproj
View File

@ -27,8 +27,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview8.19405.7" />
</ItemGroup>
<ItemGroup>

2
Oqtane.Client/Shared/Container.razor
View File

@ -18,7 +18,7 @@
RenderFragment DynamicComponent { get; set; }
protected override void OnInit()
protected override void OnInitialized()
{
DynamicComponent = builder =>
{

2
Oqtane.Client/Shared/ModuleInstance.razor
View File

@ -13,7 +13,7 @@
RenderFragment DynamicComponent { get; set; }
protected override void OnInit()
protected override void OnInitialized()
{
DynamicComponent = builder =>
{

2
Oqtane.Client/Shared/Pane.razor
View File

@ -25,7 +25,7 @@
string paneadminborder = "";
string panetitle = "";
protected override void OnInit()
protected override void OnInitialized()
{
if (UserService.IsAuthorized(PageState.User, PageState.Page.EditPermissions) && Name != Constants.AdminPane)
{

2
Oqtane.Client/Shared/PaneLayout.razor
View File

@ -9,7 +9,7 @@
RenderFragment DynamicComponent { get; set; }
protected override void OnInit()
protected override void OnInitialized()
{
DynamicComponent = builder =>
{

2
Oqtane.Client/Shared/SiteRouter.razor
View File

@ -34,7 +34,7 @@
string _absoluteUri;
bool _navigationInterceptionEnabled;
protected override void OnInit()
protected override void OnInitialized()
{
_absoluteUri = UriHelper.GetAbsoluteUri();
UriHelper.OnLocationChanged += OnLocationChanged;

2
Oqtane.Client/Shared/Theme.razor
View File

@ -8,7 +8,7 @@
RenderFragment DynamicComponent { get; set; }
protected override void OnInit()
protected override void OnInitialized()
{
DynamicComponent = builder =>
{

2
Oqtane.Client/Themes/AdminContainer.razor
View File

@ -23,7 +23,7 @@
@code {
string closeurl;
protected override void OnInit()
protected override void OnInitialized()
{
closeurl = NavigateUrl();
}

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

@ -80,7 +80,7 @@
string title = "";
string containertype;
protected override async Task OnInitAsync()
protected override async Task OnInitializedAsync()
{
moduledefinitions = PageState.ModuleDefinitions;
containers = ThemeService.GetContainerTypes(PageState.Themes);

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

@ -21,7 +21,7 @@
string display = "display: none";
List<ActionViewModel> actions;
protected override void OnInit()
protected override void OnInitialized()
{
actions = new List<ActionViewModel>();
if (ModuleState.PaneModuleIndex > 0)

10
Oqtane.Server/Oqtane.Server.csproj
View File

@ -38,11 +38,11 @@
<ItemGroup>
<PackageReference Include="dbup" Version="4.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview6.19304.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview6.19304.10" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview8.19405.7" />
</ItemGroup>
<ItemGroup>