refactor: change rute info

zxyao145 · zxyao145 · commit 3a0938b5efb7 · 2023-08-15T00:04:21.000+08:00
diff --git a/src/BasicKube.Web/App.razor b/src/BasicKube.Web/App.razor
@@ -5,7 +5,9 @@
 <CascadingAuthenticationState>
     <Router AppAssembly="@typeof(App).Assembly" OnNavigateAsync="@OnNavigateAsync">
         <Found Context="routeData">
-            <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+            <CascadingValue Value="routeData">
+                <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+            </CascadingValue>
             <FocusOnNavigate RouteData="@routeData" Selector="h1" />
         </Found>
         <NotFound>
diff --git a/src/BasicKube.Web/Common/Routes.cs b/src/BasicKube.Web/Common/Routes.cs
@@ -2,16 +2,19 @@
 
 public static class Routes
 {
-    public static string DeployGrpPage { get; } = "pages/deployAppGrpList";
-    public static string DaemonSetAppGrpPage { get; } = "pages/daemonSetAppGrpList";
-    public static string JobGrpPage { get; } = "pages/jobGrpList";
-    public static string CronJobGrpPage { get; } = "pages/cronJobGrpList";
+    #region kube
 
+    public static string DeployGrpPage { get; } = "pages/kube/deployAppGrpList";
+    public static string DaemonSetAppGrpPage { get; } = "pages/kube/daemonSetAppGrpList";
+    public static string JobGrpPage { get; } = "pages/kube/jobGrpList";
+    public static string CronJobGrpPage { get; } = "pages/kube/cronJobGrpList";
 
-    public static string SvcGrpPage { get; } = "pages/svcGrpList";
+    public static string SvcGrpPage { get; } = "pages/kube/svcGrpList";
 
-    public static string IngGrpPage { get; } = "pages/ingressGrpList";
+    public static string IngGrpPage { get; } = "pages/kube/ingressGrpList";
 
+    public static string TerminalPage { get; } = "pages/kube/terminal";
+
+    #endregion
 
-    public static string TerminalPage { get; } = "pages/terminal";
 }
diff --git a/src/BasicKube.Web/Components/App/CronJobHistory.razor b/src/BasicKube.Web/Components/App/CronJobHistory.razor
@@ -30,7 +30,7 @@
 
 @code
 {
-    // /pages/jobGrpList/hello?from=cron
+    // /pages/kube/jobGrpList/hello?from=cron
 
     [CascadingParameter(Name = "IamId")]
     public int IamId { get; set; }
diff --git a/src/BasicKube.Web/Pages/Account/Login.razor b/src/BasicKube.Web/Pages/Account/Login.razor
@@ -1,5 +1,5 @@
 ﻿@namespace BasicKube.Web.Pages
-@page "/pages/login"
+@page "/pages/account/login"
 @layout EmptyLayout
 @inject NavigationManager _navigationManager
 @inject AccountHttp _accountHttp
diff --git a/src/BasicKube.Web/Pages/Account/RedirectToLogin.razor b/src/BasicKube.Web/Pages/Account/RedirectToLogin.razor
@@ -7,6 +7,6 @@
     protected override void OnInitialized()
     {
         Navigation.NavigateTo(
-            $"/pages/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
+            $"/pages/account/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
     }
 }
diff --git a/src/BasicKube.Web/Pages/CronJobGrpListPage.razor b/src/BasicKube.Web/Pages/CronJobGrpListPage.razor
@@ -1,4 +1,4 @@
-﻿@page "/pages/cronJobGrpList/{GrpName?}"
+﻿@page "/pages/kube/cronJobGrpList/{GrpName?}"
 @inject KubeHttpClient KubeHttp
 @inject NavigationManager NavigationManager
 
diff --git a/src/BasicKube.Web/Pages/DaemonSetAppGrpListPage.razor b/src/BasicKube.Web/Pages/DaemonSetAppGrpListPage.razor
@@ -1,4 +1,4 @@
-﻿@page "/pages/daemonSetAppGrpList/{DaempnAppName?}"
+﻿@page "/pages/kube/daemonSetAppGrpList/{DaempnAppName?}"
 @inject DaemonSetHttp DaemonSetHttp
 @inject NavigationManager NavigationManager
 
diff --git a/src/BasicKube.Web/Pages/DeployAppGrpListPage.razor b/src/BasicKube.Web/Pages/DeployAppGrpListPage.razor
@@ -1,5 +1,5 @@
 ﻿@page "/{AppName?}"
-@page "/pages/deployAppGrpList/{AppName?}"
+@page "/pages/kube/deployAppGrpList/{AppName?}"
 @inject KubeHttpClient KubeHttpClient
 @inject NavigationManager NavigationManager
 @attribute [Authorize]
diff --git a/src/BasicKube.Web/Pages/IngressGrpListPage.razor b/src/BasicKube.Web/Pages/IngressGrpListPage.razor
@@ -1,4 +1,4 @@
-﻿@page "/pages/ingressGrpList/{IngressName?}"
+﻿@page "/pages/kube/ingressGrpList/{IngressName?}"
 @inject KubeHttpClient KubeHttpClient
 @inject NavigationManager NavigationManager
 
diff --git a/src/BasicKube.Web/Pages/JobGrpListPage.razor b/src/BasicKube.Web/Pages/JobGrpListPage.razor
@@ -1,4 +1,4 @@
-﻿@page "/pages/jobGrpList/{GrpName?}"
+﻿@page "/pages/kube/jobGrpList/{GrpName?}"
 @inject KubeHttpClient KubeHttp
 @inject NavigationManager NavigationManager
 
diff --git a/src/BasicKube.Web/Pages/SvcGrpListPage.razor b/src/BasicKube.Web/Pages/SvcGrpListPage.razor
@@ -1,4 +1,4 @@
-﻿@page "/pages/svcGrpList/{SvcName?}"
+﻿@page "/pages/kube/svcGrpList/{SvcName?}"
 @inject SvcHttp SvcHttp
 @inject NavigationManager NavigationManager
 
diff --git a/src/BasicKube.Web/Pages/Terminal.razor b/src/BasicKube.Web/Pages/Terminal.razor
@@ -1,4 +1,4 @@
-﻿@page "/pages/terminal/{IamId:int}/{PodName}/{ContainerName}"
+﻿@page "/pages/kube/terminal/{IamId:int}/{PodName}/{ContainerName}"
 @inject IJSRuntime JsRuntime
 @inject IConfiguration configuration
 @layout EmptyLayout
diff --git a/src/BasicKube.Web/Shared/NavMenu.razor b/src/BasicKube.Web/Shared/NavMenu.razor
@@ -7,7 +7,7 @@
       SelectedKeys="@(new[]{_activeKey})"
       DefaultOpenKeys="@_openKeys"
       Mode="MenuMode.Inline">
-    <MenuItem Key="pages/deployappgrplist">
+    <MenuItem Key="pages/kube/deployappgrplist">
         <IconTemplate>
             <AllApplication />
         </IconTemplate>
@@ -17,7 +17,7 @@
             </NavLink>
         </ChildContent>
     </MenuItem>
-    <MenuItem Key="pages/svcgrplist">
+    <MenuItem Key="pages/kube/svcgrplist">
         <IconTemplate>
             <ConnectionPoint />
         </IconTemplate>
@@ -27,7 +27,7 @@
             </NavLink>
         </ChildContent>
     </MenuItem>
-    <MenuItem Key="pages/ingressgrplist">
+    <MenuItem Key="pages/kube/ingressgrplist">
         <IconTemplate>
             <LinkIn />
         </IconTemplate>
@@ -45,7 +45,7 @@
             </span>
         </TitleTemplate>
         <ChildContent>
-            <MenuItem Key="pages/daemonsetappgrplist">
+            <MenuItem Key="pages/kube/daemonsetappgrplist">
                 <IconTemplate>
                     <Shield />
 
@@ -56,7 +56,7 @@
                     </NavLink>
                 </ChildContent>
             </MenuItem>
-            <MenuItem Key="pages/jobgrplist">
+            <MenuItem Key="pages/kube/jobgrplist">
                 <IconTemplate>
                     <AlarmClock />
 
@@ -68,7 +68,7 @@
                 </ChildContent>
             </MenuItem>
 
-            <MenuItem Key="pages/cronjobgrplist">
+            <MenuItem Key="pages/kube/cronjobgrplist">
                 <IconTemplate>
                     <Timer />
 
@@ -91,9 +91,9 @@
 
     private static Dictionary<string, string> _openKeysDict = new Dictionary<string, string>()
         {
-            ["pages/deployappgrplist"] = "advanced",
-            ["pages/jobgrplist"] = "advanced",
-            ["pages/cronjobgrplist"] = "advanced",
+            ["pages/kube/deployappgrplist"] = "advanced",
+            ["pages/kube/jobgrplist"] = "advanced",
+            ["pages/kube/cronjobgrplist"] = "advanced",
         };
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -112,7 +112,7 @@
         };
     }
 
-    const string _defaultActiveKey = "pages/deployappgrplist";
+    const string _defaultActiveKey = "pages/kube/deployappgrplist";
 
     string _activeKey = _defaultActiveKey;
     private string[] _openKeys = new string[0];
diff --git a/src/BasicKube/configs/k8s-cluster-config-default b/src/BasicKube/configs/k8s-cluster-config-default
diff --git a/src/BasicKube/configs/k8s-cluster-config-default-vm b/src/BasicKube/configs/k8s-cluster-config-default-vm
diff --git a/src/BasicKube/configs/k8s-cluster-config-dev b/src/BasicKube/configs/k8s-cluster-config-dev
diff --git a/src/BasicKube/configs/k8s-cluster-config-dev - 复制 b/src/BasicKube/configs/k8s-cluster-config-dev - 复制
diff --git a/src/BasicKube/configs/test-config b/src/BasicKube/configs/test-config

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`	`@code`
`32`	`32`	`{`
`33`		`- // /pages/jobGrpList/hello?from=cron`
	`33`	`+ // /pages/kube/jobGrpList/hello?from=cron`
`34`	`34`
`35`	`35`	`[CascadingParameter(Name = "IamId")]`
`36`	`36`	`public int IamId { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`protected override void OnInitialized()`
`8`	`8`	`{`
`9`	`9`	`Navigation.NavigateTo(`
`10`		`- $"/pages/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");`
	`10`	`+ $"/pages/account/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@page "/pages/cronJobGrpList/{GrpName?}"`
	`1`	`+@page "/pages/kube/cronJobGrpList/{GrpName?}"`
`2`	`2`	`@inject KubeHttpClient KubeHttp`
`3`	`3`	`@inject NavigationManager NavigationManager`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@page "/pages/daemonSetAppGrpList/{DaempnAppName?}"`
	`1`	`+@page "/pages/kube/daemonSetAppGrpList/{DaempnAppName?}"`
`2`	`2`	`@inject DaemonSetHttp DaemonSetHttp`
`3`	`3`	`@inject NavigationManager NavigationManager`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@page "/pages/ingressGrpList/{IngressName?}"`
	`1`	`+@page "/pages/kube/ingressGrpList/{IngressName?}"`
`2`	`2`	`@inject KubeHttpClient KubeHttpClient`
`3`	`3`	`@inject NavigationManager NavigationManager`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@page "/pages/jobGrpList/{GrpName?}"`
	`1`	`+@page "/pages/kube/jobGrpList/{GrpName?}"`
`2`	`2`	`@inject KubeHttpClient KubeHttp`
`3`	`3`	`@inject NavigationManager NavigationManager`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@page "/pages/svcGrpList/{SvcName?}"`
	`1`	`+@page "/pages/kube/svcGrpList/{SvcName?}"`
`2`	`2`	`@inject SvcHttp SvcHttp`
`3`	`3`	`@inject NavigationManager NavigationManager`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@page "/pages/terminal/{IamId:int}/{PodName}/{ContainerName}"`
	`1`	`+@page "/pages/kube/terminal/{IamId:int}/{PodName}/{ContainerName}"`
`2`	`2`	`@inject IJSRuntime JsRuntime`
`3`	`3`	`@inject IConfiguration configuration`
`4`	`4`	`@layout EmptyLayout`