Consolidate identical layout components (#2007)
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import { Outlet } from "react-router-dom";
|
import { Outlet } from "react-router-dom";
|
||||||
|
|
||||||
function TasksPageLayout() {
|
function PageLayout() {
|
||||||
return (
|
return (
|
||||||
<div className="container mx-auto">
|
<div className="container mx-auto">
|
||||||
<main>
|
<main>
|
||||||
@@ -10,4 +10,4 @@ function TasksPageLayout() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export { TasksPageLayout };
|
export { PageLayout };
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
import { Navigate, Outlet, createBrowserRouter } from "react-router-dom";
|
import { Navigate, Outlet, createBrowserRouter } from "react-router-dom";
|
||||||
|
import { PageLayout } from "./components/PageLayout";
|
||||||
|
import { DiscoverPage } from "./routes/discover/DiscoverPage";
|
||||||
|
import { HistoryPage } from "./routes/history/HistoryPage";
|
||||||
import { RootLayout } from "./routes/root/RootLayout";
|
import { RootLayout } from "./routes/root/RootLayout";
|
||||||
import { Settings } from "./routes/settings/Settings";
|
import { Settings } from "./routes/settings/Settings";
|
||||||
import { SettingsPageLayout } from "./routes/settings/SettingsPageLayout";
|
|
||||||
import { TasksPageLayout } from "./routes/tasks/TasksPageLayout";
|
|
||||||
import { CreateNewTaskFormPage } from "./routes/tasks/create/CreateNewTaskFormPage";
|
import { CreateNewTaskFormPage } from "./routes/tasks/create/CreateNewTaskFormPage";
|
||||||
import { RetryTask } from "./routes/tasks/create/retry/RetryTask";
|
import { RetryTask } from "./routes/tasks/create/retry/RetryTask";
|
||||||
import { StepArtifactsLayout } from "./routes/tasks/detail/StepArtifactsLayout";
|
import { StepArtifactsLayout } from "./routes/tasks/detail/StepArtifactsLayout";
|
||||||
@@ -17,14 +18,10 @@ import { WorkflowRunParameters } from "./routes/workflows/WorkflowRunParameters"
|
|||||||
import { Workflows } from "./routes/workflows/Workflows";
|
import { Workflows } from "./routes/workflows/Workflows";
|
||||||
import { WorkflowsPageLayout } from "./routes/workflows/WorkflowsPageLayout";
|
import { WorkflowsPageLayout } from "./routes/workflows/WorkflowsPageLayout";
|
||||||
import { WorkflowEditor } from "./routes/workflows/editor/WorkflowEditor";
|
import { WorkflowEditor } from "./routes/workflows/editor/WorkflowEditor";
|
||||||
import { WorkflowRunOutput } from "./routes/workflows/workflowRun/WorkflowRunOutput";
|
|
||||||
import { WorkflowPostRunParameters } from "./routes/workflows/workflowRun/WorkflowPostRunParameters";
|
import { WorkflowPostRunParameters } from "./routes/workflows/workflowRun/WorkflowPostRunParameters";
|
||||||
import { WorkflowRunRecording } from "./routes/workflows/workflowRun/WorkflowRunRecording";
|
import { WorkflowRunOutput } from "./routes/workflows/workflowRun/WorkflowRunOutput";
|
||||||
import { WorkflowRunOverview } from "./routes/workflows/workflowRun/WorkflowRunOverview";
|
import { WorkflowRunOverview } from "./routes/workflows/workflowRun/WorkflowRunOverview";
|
||||||
import { DiscoverPageLayout } from "./routes/discover/DiscoverPageLayout";
|
import { WorkflowRunRecording } from "./routes/workflows/workflowRun/WorkflowRunRecording";
|
||||||
import { DiscoverPage } from "./routes/discover/DiscoverPage";
|
|
||||||
import { HistoryPageLayout } from "./routes/history/HistoryPageLayout";
|
|
||||||
import { HistoryPage } from "./routes/history/HistoryPage";
|
|
||||||
|
|
||||||
const router = createBrowserRouter([
|
const router = createBrowserRouter([
|
||||||
{
|
{
|
||||||
@@ -37,7 +34,7 @@ const router = createBrowserRouter([
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "tasks",
|
path: "tasks",
|
||||||
element: <TasksPageLayout />,
|
element: <PageLayout />,
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
index: true,
|
index: true,
|
||||||
@@ -150,7 +147,7 @@ const router = createBrowserRouter([
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "discover",
|
path: "discover",
|
||||||
element: <DiscoverPageLayout />,
|
element: <PageLayout />,
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
index: true,
|
index: true,
|
||||||
@@ -160,7 +157,7 @@ const router = createBrowserRouter([
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "history",
|
path: "history",
|
||||||
element: <HistoryPageLayout />,
|
element: <PageLayout />,
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
index: true,
|
index: true,
|
||||||
@@ -170,7 +167,7 @@ const router = createBrowserRouter([
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "settings",
|
path: "settings",
|
||||||
element: <SettingsPageLayout />,
|
element: <PageLayout />,
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
index: true,
|
index: true,
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
import { Outlet } from "react-router-dom";
|
|
||||||
|
|
||||||
function CredentialsPageLayout() {
|
|
||||||
return (
|
|
||||||
<div className="container mx-auto">
|
|
||||||
<main>
|
|
||||||
<Outlet />
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export { CredentialsPageLayout };
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { Outlet } from "react-router-dom";
|
|
||||||
|
|
||||||
function DiscoverPageLayout() {
|
|
||||||
return (
|
|
||||||
<div className="container mx-auto">
|
|
||||||
<main>
|
|
||||||
<Outlet />
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export { DiscoverPageLayout };
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { Outlet } from "react-router-dom";
|
|
||||||
|
|
||||||
function HistoryPageLayout() {
|
|
||||||
return (
|
|
||||||
<div className="container mx-auto">
|
|
||||||
<main>
|
|
||||||
<Outlet />
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export { HistoryPageLayout };
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { Outlet } from "react-router-dom";
|
|
||||||
|
|
||||||
function SettingsPageLayout() {
|
|
||||||
return (
|
|
||||||
<div className="container mx-auto">
|
|
||||||
<main>
|
|
||||||
<Outlet />
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export { SettingsPageLayout };
|
|
||||||
Reference in New Issue
Block a user