From 5d773fbf503ca5769008398e548ccfd3e5f4f6ec Mon Sep 17 00:00:00 2001
From: Joscha <34318751+josxha@users.noreply.github.com>
Date: Sat, 21 Oct 2023 22:47:30 +0200
Subject: [PATCH] update tab title, inject variable names

---
 OryAdmin/Components/App.razor                 |  4 +--
 .../Elements/RefreshPageButton.razor          |  4 +--
 OryAdmin/Components/Layout/NavbarMenu.razor   |  2 +-
 OryAdmin/Components/Layout/SideMenu.razor     | 16 +++++------
 OryAdmin/Components/Pages/Home.razor          | 28 +++++++++----------
 OryAdmin/Components/Pages/Home.razor.cs       |  8 +++---
 .../Pages/Identities/Messages/Index.razor     |  6 ++--
 .../Pages/Identities/Messages/Index.razor.cs  |  2 +-
 .../Pages/Identities/Messages/View.razor      |  5 +---
 .../Pages/Identities/Schemas/Index.razor      |  5 +---
 .../Pages/Identities/Users/Create.razor       |  6 ++--
 .../Pages/Identities/Users/Create.razor.cs    |  7 +++--
 .../Pages/Identities/Users/Edit.razor         |  6 ++--
 .../Pages/Identities/Users/Edit.razor.cs      |  4 +--
 .../Pages/Identities/Users/Index.razor        |  5 +---
 .../Pages/Identities/Users/View.razor         |  6 ++--
 .../Pages/Identities/Users/View.razor.cs      | 15 ++++------
 .../Pages/OAuth2/Clients/Create.razor         |  6 ++--
 .../Pages/OAuth2/Clients/Create.razor.cs      |  2 +-
 .../Pages/OAuth2/Clients/Edit.razor           |  7 ++---
 .../Pages/OAuth2/Clients/Edit.razor.cs        |  5 ++--
 .../Pages/OAuth2/Clients/Index.razor          |  5 +---
 .../Pages/OAuth2/Clients/View.razor           |  6 ++--
 .../Pages/OAuth2/Clients/View.razor.cs        |  6 ++--
 .../Pages/OAuth2/GrantIssuers/Create.razor    |  6 ++--
 .../Pages/OAuth2/GrantIssuers/Create.razor.cs |  2 +-
 .../Pages/OAuth2/GrantIssuers/Index.razor     |  5 +---
 OryAdmin/Components/Pages/OAuth2/Index.razor  |  5 +---
 .../Components/Pages/Permissions/Index.razor  |  5 +---
 .../Permissions/Relationships/Create.razor    |  6 ++--
 .../Permissions/Relationships/Create.razor.cs |  3 +-
 .../Permissions/Relationships/Index.razor     |  5 +---
 .../Components/Pages/Permissions/Tree.razor   |  5 +---
 33 files changed, 80 insertions(+), 128 deletions(-)
diff --git a/OryAdmin/Components/App.razor b/OryAdmin/Components/App.razor
index daab352..75f392b 100644
--- a/OryAdmin/Components/App.razor
+++ b/OryAdmin/Components/App.razor
@@ -1,7 +1,7 @@
-﻿@inject ICustomTranslator Translator
+﻿@inject ICustomTranslator translator
 
 <!DOCTYPE html>
-<html lang="@Translator.GetTranslation("en")">
+<html lang="@translator.GetTranslation("en")">
 
 <head>
     <meta charset="utf-8"/>
diff --git a/OryAdmin/Components/Elements/RefreshPageButton.razor b/OryAdmin/Components/Elements/RefreshPageButton.razor
index e6455a7..41b36ad 100644
--- a/OryAdmin/Components/Elements/RefreshPageButton.razor
+++ b/OryAdmin/Components/Elements/RefreshPageButton.razor
@@ -1,4 +1,4 @@
-﻿@inject NavigationManager Navigation
+﻿@inject NavigationManager nav
 
 <button class="button is-info" @onclick="@RefreshPage">
     Refresh Page
@@ -8,7 +8,7 @@
 
     private void RefreshPage()
     {
-        Navigation.Refresh(true);
+        nav.Refresh(true);
     }
 
 }
\ No newline at end of file
diff --git a/OryAdmin/Components/Layout/NavbarMenu.razor b/OryAdmin/Components/Layout/NavbarMenu.razor
index 2dcb1ff..e657d2a 100644
--- a/OryAdmin/Components/Layout/NavbarMenu.razor
+++ b/OryAdmin/Components/Layout/NavbarMenu.razor
@@ -1,4 +1,4 @@
-﻿@inject EnvService EnvService
+﻿@inject EnvService env
 <nav class="navbar is-fixed-top has-shadow is-info" role="navigation" aria-label="main navigation">
     <div class="navbar-brand">
         <a class="navbar-item" href="">
diff --git a/OryAdmin/Components/Layout/SideMenu.razor b/OryAdmin/Components/Layout/SideMenu.razor
index bc937c5..6b38380 100644
--- a/OryAdmin/Components/Layout/SideMenu.razor
+++ b/OryAdmin/Components/Layout/SideMenu.razor
@@ -1,4 +1,4 @@
-﻿@inject EnvService EnvService
+﻿@inject EnvService env
 
 <aside class="is-narrow-mobile is-fullheight">
     <p class="menu-label">Home</p>
@@ -14,14 +14,14 @@
     <p class="menu-label">Identities</p>
     <ul class="menu-list">
         <li>
-            <a href="identities/users" class="@(EnvService.EnabledKratos ? "" : "is-disabled")">
+            <a href="identities/users" class="@(env.EnabledKratos ? "" : "is-disabled")">
                 <span class="icon" style="height: 16px; width: 16px">
                     <i class="fa-solid fa-users"></i>
                 </span> Users
             </a>
         </li>
         <li>
-            <a href="identities/schemas" class="@(EnvService.EnabledKratos ? "" : "is-disabled")">
+            <a href="identities/schemas" class="@(env.EnabledKratos ? "" : "is-disabled")">
                 <span class="icon-text">
                     <span class="icon">
                         <i class="fas fa-receipt"></i>
@@ -31,7 +31,7 @@
             </a>
         </li>
         <li>
-            <a href="identities/messages" class="@(EnvService.EnabledKratos ? "" : "is-disabled")">
+            <a href="identities/messages" class="@(env.EnabledKratos ? "" : "is-disabled")">
                 <span class="icon" style="height: 16px; width: 16px">
                     <i class="fa-solid fa-envelope"></i>
                 </span> Message Log
@@ -41,21 +41,21 @@
     <p class="menu-label">OAuth2</p>
     <ul class="menu-list">
         <li>
-            <a href="oauth2" class="@(EnvService.EnabledHydra ? "" : "is-disabled")">
+            <a href="oauth2" class="@(env.EnabledHydra ? "" : "is-disabled")">
                 <span class="icon">
                     <i class="fa-solid fa-circle-info"></i>
                 </span> Information
             </a>
         </li>
         <li>
-            <a href="oauth2/clients" class="@(EnvService.EnabledHydra ? "" : "is-disabled")">
+            <a href="oauth2/clients" class="@(env.EnabledHydra ? "" : "is-disabled")">
                 <span class="icon" style="height: 16px; width: 16px">
                     <i class="fa-solid fa-window-restore"></i>
                 </span> Clients
             </a>
         </li>
         <li>
-            <a href="oauth2/issuers" class="@(EnvService.EnabledHydra ? "" : "is-disabled")">
+            <a href="oauth2/issuers" class="@(env.EnabledHydra ? "" : "is-disabled")">
                 <span class="icon" style="height: 16px; width: 16px">
                     <i class="fa-solid fa-address-card"></i>
                 </span> Grant Issuers
@@ -65,7 +65,7 @@
     <p class="menu-label">Permissions</p>
     <ul class="menu-list">
         <li>
-            <a href="permissions" class="@(EnvService.EnabledKeto ? "" : "is-disabled")">
+            <a href="permissions" class="@(env.EnabledKeto ? "" : "is-disabled")">
                 <span class="icon" style="height: 16px; width: 16px">
                     <i class="fa-solid fa-rectangle-list"></i>
                 </span> Permissions
diff --git a/OryAdmin/Components/Pages/Home.razor b/OryAdmin/Components/Pages/Home.razor
index c9993b3..03e0b8e 100644
--- a/OryAdmin/Components/Pages/Home.razor
+++ b/OryAdmin/Components/Pages/Home.razor
@@ -1,15 +1,13 @@
 ﻿@page "/"
-@inject EnvService EnvService
+@inject EnvService env
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
 
-<PageTitle>Services</PageTitle>
+<PageTitle>Services | OryAdmin</PageTitle>
 
 <h1 class="title">Services</h1>
 <section class="columns is-multiline">
-    @if (EnvService.EnabledKratos)
+    @if (env.EnabledKratos)
     {
         <div class="column is-half">
             <div class="box">
@@ -18,11 +16,11 @@
                     <tbody>
                     <tr>
                         <td>Admin URL</td>
-                        <td>@EnvService.KratosAdminUrl</td>
+                        <td>@env.KratosAdminUrl</td>
                     </tr>
                     <tr>
                         <td>Public URL</td>
-                        <td>@EnvService.KratosPublicUrl</td>
+                        <td>@env.KratosPublicUrl</td>
                     </tr>
                     <tr>
                         <td>Alive</td>
@@ -47,7 +45,7 @@
             </div>
         </div>
     }
-    @if (EnvService.EnabledHydra)
+    @if (env.EnabledHydra)
     {
         <div class="column is-half">
             <div class="box">
@@ -56,11 +54,11 @@
                     <tbody>
                     <tr>
                         <td>Admin URL</td>
-                        <td>@EnvService.HydraAdminUrl</td>
+                        <td>@env.HydraAdminUrl</td>
                     </tr>
                     <tr>
                         <td>Public URL</td>
-                        <td>@EnvService.HydraAdminUrl</td>
+                        <td>@env.HydraAdminUrl</td>
                     </tr>
                     <tr>
                         <td>Alive</td>
@@ -85,7 +83,7 @@
             </div>
         </div>
     }
-    @if (EnvService.EnabledOathkeeper)
+    @if (env.EnabledOathkeeper)
     {
         <div class="column is-half">
             <div class="box">
@@ -94,7 +92,7 @@
                     <tbody>
                     <tr>
                         <td>API URL</td>
-                        <td>@EnvService.OathKeeperApiUrl</td>
+                        <td>@env.OathKeeperApiUrl</td>
                     </tr>
                     <tr>
                         <td>Alive</td>
@@ -120,7 +118,7 @@
             </div>
         </div>
     }
-    @if (EnvService.EnabledKeto)
+    @if (env.EnabledKeto)
     {
         <div class="column is-half">
             <div class="box">
@@ -129,11 +127,11 @@
                     <tbody>
                     <tr>
                         <td>Read URL</td>
-                        <td>@EnvService.KetoReadUrl</td>
+                        <td>@env.KetoReadUrl</td>
                     </tr>
                     <tr>
                         <td>Write URL</td>
-                        <td>@EnvService.KetoWriteUrl</td>
+                        <td>@env.KetoWriteUrl</td>
                     </tr>
                     <tr>
                         <td>Alive</td>
diff --git a/OryAdmin/Components/Pages/Home.razor.cs b/OryAdmin/Components/Pages/Home.razor.cs
index b45b881..71a1fff 100644
--- a/OryAdmin/Components/Pages/Home.razor.cs
+++ b/OryAdmin/Components/Pages/Home.razor.cs
@@ -30,7 +30,7 @@ protected override async Task OnInitializedAsync()
         var tasks = new List<Task>();
 
         // kratos
-        if (EnvService.EnabledKratos)
+        if (env.EnabledKratos)
             tasks.AddRange(new[]
             {
                 Task.Run(async () =>
@@ -72,7 +72,7 @@ protected override async Task OnInitializedAsync()
             });
 
         // hydra
-        if (EnvService.EnabledHydra)
+        if (env.EnabledHydra)
             tasks.AddRange(new[]
             {
                 Task.Run(async () =>
@@ -114,7 +114,7 @@ protected override async Task OnInitializedAsync()
             });
 
         // oathkeeper
-        if (EnvService.EnabledOathkeeper)
+        if (env.EnabledOathkeeper)
             tasks.AddRange(new[]
             {
                 Task.Run(async () =>
@@ -156,7 +156,7 @@ protected override async Task OnInitializedAsync()
             });
 
         // keto
-        if (EnvService.EnabledKeto)
+        if (env.EnabledKeto)
             tasks.AddRange(new[]
             {
                 Task.Run(async () =>
diff --git a/OryAdmin/Components/Pages/Identities/Messages/Index.razor b/OryAdmin/Components/Pages/Identities/Messages/Index.razor
index 751268c..73b47ff 100644
--- a/OryAdmin/Components/Pages/Identities/Messages/Index.razor
+++ b/OryAdmin/Components/Pages/Identities/Messages/Index.razor
@@ -1,11 +1,9 @@
 ﻿@page "/identities/messages"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>Message Log</PageTitle>
+<PageTitle>Message Log | OryAdmin</PageTitle>
 
 <h1 class="title">Message Log</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/Identities/Messages/Index.razor.cs b/OryAdmin/Components/Pages/Identities/Messages/Index.razor.cs
index 3d7b6f7..329f7f5 100644
--- a/OryAdmin/Components/Pages/Identities/Messages/Index.razor.cs
+++ b/OryAdmin/Components/Pages/Identities/Messages/Index.razor.cs
@@ -28,6 +28,6 @@ protected override async Task OnInitializedAsync()
 
     private void RefreshPage(MouseEventArgs arg)
     {
-        Navigation.Refresh(true);
+        nav.Refresh(true);
     }
 }
\ No newline at end of file
diff --git a/OryAdmin/Components/Pages/Identities/Messages/View.razor b/OryAdmin/Components/Pages/Identities/Messages/View.razor
index 0abe345..4f9b803 100644
--- a/OryAdmin/Components/Pages/Identities/Messages/View.razor
+++ b/OryAdmin/Components/Pages/Identities/Messages/View.razor
@@ -2,11 +2,8 @@
 @using Ory.Kratos.Client.Model
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>View Message</PageTitle>
+<PageTitle>View Message | OryAdmin</PageTitle>
 
 <h1 class="title">View Message</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/Identities/Schemas/Index.razor b/OryAdmin/Components/Pages/Identities/Schemas/Index.razor
index eec1f61..b8789dd 100644
--- a/OryAdmin/Components/Pages/Identities/Schemas/Index.razor
+++ b/OryAdmin/Components/Pages/Identities/Schemas/Index.razor
@@ -1,11 +1,8 @@
 ﻿@page "/identities/schemas"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>Identity Schemas</PageTitle>
+<PageTitle>Identity Schemas | OryAdmin</PageTitle>
 
 <h1 class="title">Identity Schemas</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/Identities/Users/Create.razor b/OryAdmin/Components/Pages/Identities/Users/Create.razor
index 3773b17..e9c2256 100644
--- a/OryAdmin/Components/Pages/Identities/Users/Create.razor
+++ b/OryAdmin/Components/Pages/Identities/Users/Create.razor
@@ -1,11 +1,9 @@
 ﻿@page "/identities/users/create"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>Create Identity</PageTitle>
+<PageTitle>Create Identity | OryAdmin</PageTitle>
 
 <h1 class="title">Create Identity</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/Identities/Users/Create.razor.cs b/OryAdmin/Components/Pages/Identities/Users/Create.razor.cs
index 963c899..b45fa59 100644
--- a/OryAdmin/Components/Pages/Identities/Users/Create.razor.cs
+++ b/OryAdmin/Components/Pages/Identities/Users/Create.razor.cs
@@ -15,9 +15,12 @@ public partial class Create
     private bool _isLoading = true;
 
     private List<string>? _schemaIds;
-    [SupplyParameterFromQuery(Name = "schema")] private string? SchemaId { get; set; }
     private string? _selectedSchema;
     private List<TraitsSchemaData>? _traitsSchemas;
+
+    [SupplyParameterFromQuery(Name = "schema")]
+    private string? SchemaId { get; set; }
+
     [Inject] private ApiService ApiService { get; set; } = default!;
     [Inject] private IdentitySchemaService SchemaService { get; set; } = default!;
 
@@ -48,7 +51,7 @@ private async Task SubmitForm()
             return;
         }
 
-        Navigation.NavigateTo("identities/users");
+        nav.NavigateTo("identities/users");
     }
 
     private void UpdateValue(TraitsSchemaData schema, ChangeEventArgs args)
diff --git a/OryAdmin/Components/Pages/Identities/Users/Edit.razor b/OryAdmin/Components/Pages/Identities/Users/Edit.razor
index 7d78e1f..308af08 100644
--- a/OryAdmin/Components/Pages/Identities/Users/Edit.razor
+++ b/OryAdmin/Components/Pages/Identities/Users/Edit.razor
@@ -1,11 +1,9 @@
 ﻿@page "/identities/users/{UserId}/edit"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>Edit Identity</PageTitle>
+<PageTitle>Edit Identity | OryAdmin</PageTitle>
 
 <h1 class="title">Edit Identity</h1>
 
diff --git a/OryAdmin/Components/Pages/Identities/Users/Edit.razor.cs b/OryAdmin/Components/Pages/Identities/Users/Edit.razor.cs
index 4f7f0e3..37a0da4 100644
--- a/OryAdmin/Components/Pages/Identities/Users/Edit.razor.cs
+++ b/OryAdmin/Components/Pages/Identities/Users/Edit.razor.cs
@@ -29,7 +29,7 @@ protected override async Task OnInitializedAsync()
 
     private void Cancel()
     {
-        Navigation.NavigateTo($"identities/users/{UserId}");
+        nav.NavigateTo($"identities/users/{UserId}");
     }
 
     private async Task SubmitForm()
@@ -45,7 +45,7 @@ private async Task SubmitForm()
             return;
         }
 
-        Navigation.NavigateTo($"identities/users/{UserId}");
+        nav.NavigateTo($"identities/users/{UserId}");
     }
 
     private void UpdateValue(TraitsSchemaData schema, ChangeEventArgs args)
diff --git a/OryAdmin/Components/Pages/Identities/Users/Index.razor b/OryAdmin/Components/Pages/Identities/Users/Index.razor
index 88783a7..87f9b8c 100644
--- a/OryAdmin/Components/Pages/Identities/Users/Index.razor
+++ b/OryAdmin/Components/Pages/Identities/Users/Index.razor
@@ -1,11 +1,8 @@
 ﻿@page "/identities/users"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>Identities</PageTitle>
+<PageTitle>Identities | OryAdmin</PageTitle>
 
 <h1 class="title">Identities</h1>
 <div class="buttons">
diff --git a/OryAdmin/Components/Pages/Identities/Users/View.razor b/OryAdmin/Components/Pages/Identities/Users/View.razor
index 941e1f1..2deefd5 100644
--- a/OryAdmin/Components/Pages/Identities/Users/View.razor
+++ b/OryAdmin/Components/Pages/Identities/Users/View.razor
@@ -1,11 +1,9 @@
 ﻿@page "/identities/users/{UserId}"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>View Identity</PageTitle>
+<PageTitle>View Identity | OryAdmin</PageTitle>
 
 <h1 class="title">View Identity</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/Identities/Users/View.razor.cs b/OryAdmin/Components/Pages/Identities/Users/View.razor.cs
index 706a4a1..6637f8a 100644
--- a/OryAdmin/Components/Pages/Identities/Users/View.razor.cs
+++ b/OryAdmin/Components/Pages/Identities/Users/View.razor.cs
@@ -15,16 +15,13 @@ public partial class View
 
     protected override async Task OnInitializedAsync()
     {
-        var tasks = new List<Task>()
+        var tasks = new List<Task>
         {
-            Task.Run(async () =>
-            {
-                _identity = await ApiService.KratosIdentity.GetIdentityAsync(UserId);
-            }),
+            Task.Run(async () => { _identity = await ApiService.KratosIdentity.GetIdentityAsync(UserId); }),
             Task.Run(async () =>
             {
                 _activeSessions = await ApiService.KratosIdentity.ListIdentitySessionsAsync(UserId, active: true);
-            }),
+            })
         };
 
         await Task.WhenAll(tasks);
@@ -33,13 +30,13 @@ protected override async Task OnInitializedAsync()
 
     private void EditIdentity()
     {
-        Navigation.NavigateTo($"identities/users/{UserId}/edit");
+        nav.NavigateTo($"identities/users/{UserId}/edit");
     }
 
     private async Task DeleteIdentity()
     {
         await ApiService.KratosIdentity.DeleteIdentityAsync(UserId);
-        Navigation.NavigateTo("identities/users");
+        nav.NavigateTo("identities/users");
     }
 
     private void ShowDeleteModal()
@@ -56,6 +53,6 @@ private async Task UpdatePassword()
     {
         var body = new KratosCreateRecoveryLinkForIdentityBody(identityId: UserId);
         var link = await ApiService.KratosIdentity.CreateRecoveryLinkForIdentityAsync(body);
-        Navigation.NavigateTo(link.RecoveryLink);
+        nav.NavigateTo(link.RecoveryLink);
     }
 }
\ No newline at end of file
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor b/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor
index 44df8b0..95a6d5e 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor
@@ -1,11 +1,9 @@
 ﻿@page "/oauth2/clients/create"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>Create Client</PageTitle>
+<PageTitle>Create Client | OryAdmin</PageTitle>
 
 <h1 class="title">Create Client</h1>
 <form @onsubmit="SubmitForm">
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor.cs b/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor.cs
index ee5cff3..d26659a 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor.cs
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/Create.razor.cs
@@ -27,6 +27,6 @@ private async Task SubmitForm()
 
     private void GotoIndexPage()
     {
-        Navigation.NavigateTo("oauth2/clients");
+        nav.NavigateTo("oauth2/clients");
     }
 }
\ No newline at end of file
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor b/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor
index b7ad300..b97fc0a 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor
@@ -1,12 +1,9 @@
 ﻿@page "/oauth2/clients/{ClientId}/edit"
-@using Ory.Hydra.Client.Model
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>Edit Client</PageTitle>
+<PageTitle>Edit Client | OryAdmin</PageTitle>
 
 <h1 class="title">Edit Client</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor.cs b/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor.cs
index 4f6d429..12698da 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor.cs
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor.cs
@@ -11,8 +11,7 @@ public partial class Edit
     private string? _errorMessage;
     private bool _isLoading = true;
 
-    [Parameter]
-    public required string ClientId { get; set; }
+    [Parameter] public required string ClientId { get; set; }
 
     [Inject] private ApiService ApiService { get; set; } = default!;
 
@@ -34,6 +33,6 @@ private async Task SubmitForm()
             return;
         }
 
-        Navigation.NavigateTo($"oauth2/clients/{ClientId}");
+        nav.NavigateTo($"oauth2/clients/{ClientId}");
     }
 }
\ No newline at end of file
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Index.razor b/OryAdmin/Components/Pages/OAuth2/Clients/Index.razor
index 22f66ff..295dba6 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/Index.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/Index.razor
@@ -1,11 +1,8 @@
 ﻿@page "/oauth2/clients"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>OAuth 2 Clients</PageTitle>
+<PageTitle>OAuth 2 Clients | OryAdmin</PageTitle>
 
 <h1 class="title">OAuth 2 Clients</h1>
 <div class="buttons">
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/View.razor b/OryAdmin/Components/Pages/OAuth2/Clients/View.razor
index 4cb131a..38f94ed 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/View.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/View.razor
@@ -1,11 +1,9 @@
 ﻿@page "/oauth2/clients/{ClientId}"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>View OAuth 2 Client</PageTitle>
+<PageTitle>View OAuth 2 Client | OryAdmin</PageTitle>
 
 <h1 class="title">View OAuth 2 Client</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/View.razor.cs b/OryAdmin/Components/Pages/OAuth2/Clients/View.razor.cs
index 36595b5..9231541 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/View.razor.cs
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/View.razor.cs
@@ -7,9 +7,9 @@ namespace OryAdmin.Components.Pages.OAuth2.Clients;
 public partial class View
 {
     private HydraOAuth2Client? _client;
-    private bool _isLoading = true;
     private bool _confirmDeleteClientModal;
     private bool _confirmNewSecretModal;
+    private bool _isLoading = true;
     private bool _showNewSecretModal;
     [Parameter] public string? ClientId { get; set; }
     [Inject] private ApiService ApiService { get; set; } = default!;
@@ -22,13 +22,13 @@ protected override async Task OnInitializedAsync()
 
     private void EditClient()
     {
-        Navigation.NavigateTo($"oauth2/clients/{ClientId}/edit");
+        nav.NavigateTo($"oauth2/clients/{ClientId}/edit");
     }
 
     private async Task DeleteClient()
     {
         await ApiService.HydraOAuth2.DeleteOAuth2ClientAsync(ClientId);
-        Navigation.NavigateTo("oauth2/clients");
+        nav.NavigateTo("oauth2/clients");
     }
 
     private void ShowDeleteModal()
diff --git a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor
index 7b405e5..07cb6bd 100644
--- a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor
+++ b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor
@@ -1,11 +1,9 @@
 ﻿@page "/oauth2/issuers/create"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>Trust Grant Issuer</PageTitle>
+<PageTitle>Trust Grant Issuer | OryAdmin</PageTitle>
 
 <h1 class="title">Trust Grant Issuer</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor.cs b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor.cs
index 831fdb2..a526ff5 100644
--- a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor.cs
+++ b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor.cs
@@ -39,6 +39,6 @@ private async Task SubmitForm()
             return;
         }
 
-        Navigation.NavigateTo("oauth2/issuers");
+        nav.NavigateTo("oauth2/issuers");
     }
 }
\ No newline at end of file
diff --git a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Index.razor b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Index.razor
index d00b793..ee49014 100644
--- a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Index.razor
+++ b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Index.razor
@@ -1,11 +1,8 @@
 ﻿@page "/oauth2/issuers"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>OAuth 2 JWT Grant Issuers</PageTitle>
+<PageTitle>OAuth 2 JWT Grant Issuers | OryAdmin</PageTitle>
 
 <h1 class="title">OAuth 2 JWT Grant Issuers</h1>
 <div class="buttons">
diff --git a/OryAdmin/Components/Pages/OAuth2/Index.razor b/OryAdmin/Components/Pages/OAuth2/Index.razor
index 0a22c2d..8f5404e 100644
--- a/OryAdmin/Components/Pages/OAuth2/Index.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Index.razor
@@ -1,11 +1,8 @@
 ﻿@page "/oauth2"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>OAuth 2 Information</PageTitle>
+<PageTitle>OAuth 2 Information | OryAdmin</PageTitle>
 <h1 class="title">OAuth 2 Information</h1>
 
 <div class="box p-3">
diff --git a/OryAdmin/Components/Pages/Permissions/Index.razor b/OryAdmin/Components/Pages/Permissions/Index.razor
index bba2a4c..9f78bef 100644
--- a/OryAdmin/Components/Pages/Permissions/Index.razor
+++ b/OryAdmin/Components/Pages/Permissions/Index.razor
@@ -1,11 +1,8 @@
 ﻿@page "/permissions"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>Permission Namespaces</PageTitle>
+<PageTitle>Permission Namespaces | OryAdmin</PageTitle>
 
 <h1 class="title">Permission Namespaces</h1>
 @if (_isLoading)
diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor
index b903dbd..bcd854b 100644
--- a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor
+++ b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor
@@ -1,11 +1,9 @@
 ﻿@page "/permissions/{NamespaceName}/relationships/create"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
+@inject NavigationManager nav
 
-<PageTitle>Create Relationship</PageTitle>
+<PageTitle>Create Relationship | OryAdmin</PageTitle>
 
 <h1 class="title">Create Relationship</h1>
 <form @onsubmit="SubmitForm">
diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor.cs b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor.cs
index 8be87da..8eb65bf 100644
--- a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor.cs
+++ b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor.cs
@@ -27,6 +27,7 @@ private async Task SubmitForm()
             _errorMessage = exception.Message;
             return;
         }
-        Navigation.NavigateTo($"permissions/{NamespaceName}/relationships");
+
+        nav.NavigateTo($"permissions/{NamespaceName}/relationships");
     }
 }
\ No newline at end of file
diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor b/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor
index 3084fea..7d2df0c 100644
--- a/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor
+++ b/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor
@@ -1,11 +1,8 @@
 ﻿@page "/permissions/{NamespaceName}/relationships"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>Relationships</PageTitle>
+<PageTitle>Relationships | OryAdmin</PageTitle>
 
 <h1 class="title">Relationships for @NamespaceName</h1>
 <div class="buttons">
diff --git a/OryAdmin/Components/Pages/Permissions/Tree.razor b/OryAdmin/Components/Pages/Permissions/Tree.razor
index 698c741..b6ced9c 100644
--- a/OryAdmin/Components/Pages/Permissions/Tree.razor
+++ b/OryAdmin/Components/Pages/Permissions/Tree.razor
@@ -1,11 +1,8 @@
 ﻿@page "/permissions/{namespaceName}/tree"
 @attribute [StreamRendering]
 @attribute [RenderModeInteractiveServer]
-@inject ICustomTranslator Translator
-@inject ILogger<Home> Logger
-@inject NavigationManager Navigation
 
-<PageTitle>Permission Tree</PageTitle>
+<PageTitle>Permission Tree | OryAdmin</PageTitle>
 
 <h1 class="title">Permission Tree</h1>
 @if (_isLoading)
