diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor index 8deaf8a0..ac3d1e75 100644 --- a/Oqtane.Client/App.razor +++ b/Oqtane.Client/App.razor @@ -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; diff --git a/Oqtane.Client/Modules/Admin/Admin/Index.razor b/Oqtane.Client/Modules/Admin/Admin/Index.razor index 3c38f89a..9065812c 100644 --- a/Oqtane.Client/Modules/Admin/Admin/Index.razor +++ b/Oqtane.Client/Modules/Admin/Admin/Index.razor @@ -26,7 +26,7 @@ @code { List 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(); diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index 475c5e2a..4d3f8de3 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -34,7 +34,7 @@ else List moduledefinitions; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(); } diff --git a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor index c0c9925f..ca8cef80 100644 --- a/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleSettings/Index.razor @@ -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()); diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index d808e08b..7ceb31cc 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -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); diff --git a/Oqtane.Client/Modules/Admin/Pages/Delete.razor b/Oqtane.Client/Modules/Admin/Pages/Delete.razor index e3ef602a..ad6efa47 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Delete.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Delete.razor @@ -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); diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index c5734f56..568cfad0 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -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); diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index e67505c0..32612845 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -68,7 +68,7 @@ else string url; string logo; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { tenants = await TenantService.GetTenantsAsync(); } diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor index 264f3987..8c57d292 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor @@ -35,7 +35,7 @@ else List sites; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { sites = await SiteService.GetSitesAsync(); } diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor index c06f1ba4..743215ee 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Index.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor @@ -33,7 +33,7 @@ else List Themes; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { Themes = await ThemeService.GetThemesAsync(); } diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index cb0ca1a6..ea748d40 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -34,7 +34,7 @@ else List Users; - protected override async Task OnInitAsync() + protected override async Task OnInitializedAsync() { Users = await UserService.GetUsersAsync(); } diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor index 0954b864..459b6f7b 100644 --- a/Oqtane.Client/Modules/Controls/ActionLink.razor +++ b/Oqtane.Client/Modules/Controls/ActionLink.razor @@ -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)) diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor index 3aec02f3..78b6205f 100644 --- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor +++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor @@ -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) { diff --git a/Oqtane.Client/Modules/HtmlText/Edit.razor b/Oqtane.Client/Modules/HtmlText/Edit.razor index 5f34a2a6..591c436d 100644 --- a/Oqtane.Client/Modules/HtmlText/Edit.razor +++ b/Oqtane.Client/Modules/HtmlText/Edit.razor @@ -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 htmltextlist = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId); diff --git a/Oqtane.Client/Modules/Weather/Index.razor b/Oqtane.Client/Modules/Weather/Index.razor index 5ca38bc8..200b279e 100644 --- a/Oqtane.Client/Modules/Weather/Index.razor +++ b/Oqtane.Client/Modules/Weather/Index.razor @@ -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); diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index 12c8fdef..63384937 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -27,8 +27,9 @@ - - + + + diff --git a/Oqtane.Client/Shared/Container.razor b/Oqtane.Client/Shared/Container.razor index a1b17bb5..b3b4a633 100644 --- a/Oqtane.Client/Shared/Container.razor +++ b/Oqtane.Client/Shared/Container.razor @@ -18,7 +18,7 @@ RenderFragment DynamicComponent { get; set; } - protected override void OnInit() + protected override void OnInitialized() { DynamicComponent = builder => { diff --git a/Oqtane.Client/Shared/ModuleInstance.razor b/Oqtane.Client/Shared/ModuleInstance.razor index 5f75ac6c..3c8e3e37 100644 --- a/Oqtane.Client/Shared/ModuleInstance.razor +++ b/Oqtane.Client/Shared/ModuleInstance.razor @@ -13,7 +13,7 @@ RenderFragment DynamicComponent { get; set; } - protected override void OnInit() + protected override void OnInitialized() { DynamicComponent = builder => { diff --git a/Oqtane.Client/Shared/Pane.razor b/Oqtane.Client/Shared/Pane.razor index 42d41431..4c26d40a 100644 --- a/Oqtane.Client/Shared/Pane.razor +++ b/Oqtane.Client/Shared/Pane.razor @@ -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) { diff --git a/Oqtane.Client/Shared/PaneLayout.razor b/Oqtane.Client/Shared/PaneLayout.razor index d07d5920..74310b60 100644 --- a/Oqtane.Client/Shared/PaneLayout.razor +++ b/Oqtane.Client/Shared/PaneLayout.razor @@ -9,7 +9,7 @@ RenderFragment DynamicComponent { get; set; } - protected override void OnInit() + protected override void OnInitialized() { DynamicComponent = builder => { diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor index 8bc36116..c0f99db1 100644 --- a/Oqtane.Client/Shared/SiteRouter.razor +++ b/Oqtane.Client/Shared/SiteRouter.razor @@ -34,7 +34,7 @@ string _absoluteUri; bool _navigationInterceptionEnabled; - protected override void OnInit() + protected override void OnInitialized() { _absoluteUri = UriHelper.GetAbsoluteUri(); UriHelper.OnLocationChanged += OnLocationChanged; diff --git a/Oqtane.Client/Shared/Theme.razor b/Oqtane.Client/Shared/Theme.razor index 0d41a0b9..3f83b411 100644 --- a/Oqtane.Client/Shared/Theme.razor +++ b/Oqtane.Client/Shared/Theme.razor @@ -8,7 +8,7 @@ RenderFragment DynamicComponent { get; set; } - protected override void OnInit() + protected override void OnInitialized() { DynamicComponent = builder => { diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor index 57f1f1a0..ff2f67f1 100644 --- a/Oqtane.Client/Themes/AdminContainer.razor +++ b/Oqtane.Client/Themes/AdminContainer.razor @@ -23,7 +23,7 @@ @code { string closeurl; - protected override void OnInit() + protected override void OnInitialized() { closeurl = NavigateUrl(); } diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor index b0e675f8..7a51c3db 100644 --- a/Oqtane.Client/Themes/Controls/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor @@ -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); diff --git a/Oqtane.Client/Themes/Controls/ModuleActions.razor b/Oqtane.Client/Themes/Controls/ModuleActions.razor index 0c9d9aad..66c4c451 100644 --- a/Oqtane.Client/Themes/Controls/ModuleActions.razor +++ b/Oqtane.Client/Themes/Controls/ModuleActions.razor @@ -21,7 +21,7 @@ string display = "display: none"; List actions; - protected override void OnInit() + protected override void OnInitialized() { actions = new List(); if (ModuleState.PaneModuleIndex > 0) diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 05779e3f..c3a1dce1 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -38,11 +38,11 @@ - - - - - + + + + +