Cleanup

HopFrame.Web/Pages/Administration/Layout/AdminLayout.razor

@@ -2,7 +2,7 @@
 @using BlazorStrap.V5
 @inherits LayoutComponentBase
 
-<AuthorizedView Permission="@AdminPermissions.IsAdmin" RedirectIfUnauthorized="login?redirect=/administration" />
+<AuthorizedView Permission="@AdminPermissions.IsAdmin" RedirectIfUnauthorized="administration/login" />
 
 <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
 

HopFrame.Web/Pages/Administration/Layout/AdminMenu.razor

@@ -3,15 +3,16 @@
 @using BlazorStrap
 @using BlazorStrap.V5
 @using HopFrame.Security.Claims
-@using HopFrame.Web.Pages.Administration.Components
 @using HopFrame.Web.Services
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using HopFrame.Web.Components.Administration
+@using HopFrame.Web.Model
+@using HopFrame.Web.Components
 
 
 <BSNavbar Color="BSColor.Dark" IsDark="true" IsFixedTop="true">
     <BSContainer Container="Container.Fluid">
         <BSNavbarBrand>
-            <img src="/favicon.png" alt="logo" width="30" class="d-inline-block align-text-top"/>
             HopFrame
         </BSNavbarBrand>
         <BSCollapse IsInNavbar="true">
@@ -20,8 +21,12 @@
             </Toggler>
             <Content>
                 <BSNav MarginEnd="Margins.Auto" MarginBottom="Margins.Small" Class="mb-lg-0">
+                    <BSNavItem IsActive="IsDashboardActive()" OnClick="NavigateToDashboard">Dashboard</BSNavItem>
+                    
                     @foreach (var nav in Subpages) {
-                        <BSNavItem IsActive="IsNavItemActive(nav.Key)" OnClick="() => Navigate(nav.Key)">@nav.Value</BSNavItem>
+                        <AuthorizedView Permission="@nav.Permission">
+                            <BSNavItem IsActive="IsNavItemActive(nav.Url)" OnClick="() => Navigate(nav.Url)">@nav.Name</BSNavItem>
+                        </AuthorizedView>
                     }
                 </BSNav>
                 
@@ -43,20 +48,38 @@
 @inject IAuthService Auth
 
 @code {
-    public static IDictionary<string, string> Subpages = new Dictionary<string, string> {
-        { "administration/users", "Users" },
-        { "administration/groups", "Groups" }
+    public static IList<NavigationItem> Subpages = new List<NavigationItem> {
+        new () {
+            Name = "Users",
+            Url = "administration/users",
+            Description = "On this page you can manage all user accounts.",
+            Permission = AdminPermissions.ViewUsers
+        },
+        new () {
+            Name = "Groups",
+            Url = "administration/groups",
+            Description = "On this page you can view, create, edit and delete permission groups.",
+            Permission = AdminPermissions.ViewGroups
+        }
     };
 
-    public bool IsNavItemActive(string element) {
+    private bool IsNavItemActive(string element) {
         return Navigator.Uri.Contains(element);
     }
 
+    private bool IsDashboardActive() {
+        return Navigator.Uri.TrimEnd('/').EndsWith("administration");
+    }
+
+    private void NavigateToDashboard() {
+        Navigate("administration");
+    }
+
     private void Navigate(string url) {
         Navigator.NavigateTo(url, true);
     }
 
     private void Logout() {
-        Navigator.NavigateTo("login?redirect=/administration", true);
+        Navigator.NavigateTo("administration/login", true);
     }
 }

HopFrame.Web/Pages/Administration/Layout/EmptyLayout.razor

@@ -0,0 +1,9 @@
+@using BlazorStrap.V5
+@inherits LayoutComponentBase
+
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+
+@Body
+<BSCore/>
+
+<script src="_content/BlazorStrap/popper.min.js"></script>