Merge pull request #56 from sbwalker/master

Installer improvements for client-side Blazor
This commit is contained in:
Shaun Walker 2019-08-15 12:34:42 -04:00 committed by GitHub
commit b1ca83a2cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 105 additions and 114 deletions

View File

@ -4,9 +4,10 @@
@inject IInstallationService InstallationService
@if (Initialized)
{
@if (!Installed)
{
<Installer Installed="@Installed" />
<Installer />
}
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;
}

View File

@ -4,9 +4,7 @@
@inject IInstallationService InstallationService
@inject IUserService UserService
@if (!Installed)
{
<div class="container">
<div class="container">
<div class="row">
<div class="mx-auto text-center">
<img src="oqtane.png" />
@ -109,13 +107,9 @@
</div>
<div class="loading" style="@LoadingDisplay"></div>
</div>
</div>
}
</div>
@code {
[Parameter]
public bool Installed { get; set; }
private string DatabaseType = "LocalDB";
private string ServerName = "(LocalDb)\\MSSQLLocalDB";
private string DatabaseName = "Oqtane-" + DateTime.Now.ToString("yyyyMMddHHmm");