update tab title, inject variable names

josxha · Oct 21, 2023 · 5d773fb · 5d773fb
1 parent 6657c6b
commit 5d773fb
Show file tree

Hide file tree

Showing 33 changed files with 80 additions and 128 deletions.
diff --git 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
@@ -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);
     }
 
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -28,6 +28,6 @@ protected override async Task OnInitializedAsync()
 
     private void RefreshPage(MouseEventArgs arg)
     {
-        Navigation.Refresh(true);
+        nav.Refresh(true);
     }
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)