diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor index a95d3885..bb666be4 100644 --- a/Oqtane.Client/App.razor +++ b/Oqtane.Client/App.razor @@ -4,9 +4,10 @@ @inject IInstallationService InstallationService @if (Initialized) +{ @if (!Installed) { - + } else { @@ -23,14 +24,10 @@ private bool Installed = false; private PageState PageState { get; set; } - protected override async Task OnInitializedAsync() + protected override async Task OnParametersSetAsync() { var response = await InstallationService.IsInstalled(); Installed = response.Success; - } - - protected override void OnAfterRender() - { Initialized = true; } diff --git a/Oqtane.Client/Shared/Installer.razor b/Oqtane.Client/Shared/Installer.razor index 9b862ff7..f624b89a 100644 --- a/Oqtane.Client/Shared/Installer.razor +++ b/Oqtane.Client/Shared/Installer.razor @@ -4,118 +4,112 @@ @inject IInstallationService InstallationService @inject IUserService UserService -@if (!Installed) -{ -
-
-
- -
-
-
-

Database Configuration

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
-
-
-
-

Application Administrator

-
-
- - - - - - - - - - - -
- - - -
- - - -
-
-
-
-
-

- @((MarkupString)@Message) -
-
+
+
+
+
-} +
+

Database Configuration

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+
+
+
+

Application Administrator

+
+
+ + + + + + + + + + + +
+ + + +
+ + + +
+
+
+
+
+

+ @((MarkupString)@Message) +
+
+
+
@code { - [Parameter] - public bool Installed { get; set; } - private string DatabaseType = "LocalDB"; private string ServerName = "(LocalDb)\\MSSQLLocalDB"; private string DatabaseName = "Oqtane-" + DateTime.Now.ToString("yyyyMMddHHmm");