Merge pull request #2 from oqtane/dev

Pull from source
gjwalk · Apr 1, 2021 · 0a7fe5d · 0a7fe5d
2 parents 0e20cad + 46219df
commit 0a7fe5d
Show file tree

Hide file tree

Showing 20 changed files with 245 additions and 169 deletions.
diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
@@ -1,31 +1,39 @@
-@inject IInstallationService InstallationService
+@inject IInstallationService InstallationService
 
 @if (_initialized)
 {
-    @if (!_installed)
+    @if (!_installation.Success)
     {
         <Installer />
     }
     else
     {
-        <CascadingAuthenticationState>
-            <CascadingValue Value="@PageState">
-                <SiteRouter OnStateChange="@ChangeState" />
-            </CascadingValue>
-        </CascadingAuthenticationState>
+        @if (string.IsNullOrEmpty(_installation.Message))
+        {
+            <CascadingAuthenticationState>
+                <CascadingValue Value="@PageState">
+                    <SiteRouter OnStateChange="@ChangeState" />
+                </CascadingValue>
+            </CascadingAuthenticationState>
+        }
+        else
+        {
+            <div class="app-alert">
+                @_installation.Message
+            </div> 
+        }
     }
 }
 
 @code {
+    private Installation _installation;
     private bool _initialized;
-    private bool _installed;
 
     private PageState PageState { get; set; }
 
     protected override async Task OnParametersSetAsync()
     {
-        var installation = await InstallationService.IsInstalled();
-        _installed = installation.Success;
+        _installation = await InstallationService.IsInstalled();
         _initialized = true;
     }
 

diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -26,7 +26,7 @@ else
             <td>
                 @if (context.AssemblyName != "Oqtane.Client")
                 {
-                    <ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Module?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
+                    <ActionDialog Header="Delete Module" Message="@Localizer["Are You Sure You Wish To Delete The {0} Module?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
                 }
             </td>
             <td>@context.Name</td>

diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor
@@ -16,7 +16,7 @@
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.PageId.ToString())" ResourceKey="EditPage" /></td>
-            <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
+            <td><ActionDialog Header="Delete Page" Message="@Localizer["Are You Sure You Wish To Delete The {0} Page?", context.Name]" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
             <td>@(new string('-', context.Level * 2))@(context.Name)</td>
         </Row>
     </Pager>

diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor
@@ -19,7 +19,7 @@ else
         </Header>
         <Row>
             <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" ResourceKey="EditProfile" /></td>
-            <td><ActionDialog Header="Delete Profile" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
+            <td><ActionDialog Header="Delete Profile" Message="@Localizer["Are You Sure You Wish To Delete {0}?", context.Name]" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>

diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -34,7 +34,7 @@
             @if (_pages.Any())
             {
                 <div style="text-align:right;">
-                    <ActionDialog Header="Delete All Pages" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Pages?", "Delete All Pages"]" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
+                    <ActionDialog Header="Delete All Pages" Message="Are You Sure You Wish To Permanently Delete All Pages?" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
                 </div>
             }
         }
@@ -68,7 +68,7 @@
             @if (_modules.Any())
             {
                 <div style="text-align:right;">
-                    <ActionDialog Header="Delete All Modules" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Modules?", "Delete All Modules"]" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
+                    <ActionDialog Header="Delete All Modules" Message="Are You Sure You Wish To Permanently Delete All Modules?" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
                 </div>
             }