From 89a0599669715f6ef9fad8fcbc988d652133d837 Mon Sep 17 00:00:00 2001 From: Wilson Neto Date: Tue, 25 Feb 2025 13:53:28 -0300 Subject: [PATCH] refactor: move all the routes one leve so we can have pages without layout right now the layout is in the root of the app, so a solution to create routes without the layout is to move all routes one level deeper Closes #1010 --- dashboard/src/api/hardware.ts | 2 +- dashboard/src/api/issue.ts | 2 +- dashboard/src/api/tree.ts | 4 +- dashboard/src/api/treeDetails.ts | 2 +- .../components/BuildDetails/BuildDetails.tsx | 4 +- .../components/Cards/CompatibleHardware.tsx | 2 +- .../src/components/Cards/HardwareUsed.tsx | 2 +- .../src/components/InputTime/InputTime.tsx | 4 +- .../components/IssueDetails/IssueDetails.tsx | 2 +- .../components/TestDetails/TestDetails.tsx | 6 +- dashboard/src/components/ui/badge.tsx | 6 +- dashboard/src/index.css | 33 +- .../src/pages/BuildDetails/BuildDetails.tsx | 2 +- dashboard/src/pages/Hardware/Hardware.tsx | 2 +- .../pages/Hardware/HardwareListingPage.tsx | 2 +- .../HardwareBuildDetails.tsx | 2 +- .../HardwareTestDetails.tsx | 2 +- .../src/pages/IssueDetails/IssueDetails.tsx | 6 +- .../TreeBuildDetails/TreeBuildDetails.tsx | 2 +- .../pages/TreeDetails/Tabs/Boots/BootsTab.tsx | 4 +- .../pages/TreeDetails/Tabs/Build/BuildTab.tsx | 4 +- .../Tabs/Build/TreeDetailsBuildsTable.tsx | 4 +- .../pages/TreeDetails/Tabs/Tests/TestsTab.tsx | 4 +- .../Tabs/TreeCommitNavigationGraph.tsx | 4 +- .../pages/TreeDetails/Tabs/TreeDetailsTab.tsx | 2 +- .../src/pages/TreeDetails/TreeDetails.tsx | 4 +- dashboard/src/pages/TreeLatest.tsx | 6 +- .../pages/TreeTestDetails/TreeTestDetails.tsx | 2 +- .../pages/hardwareDetails/HardwareDetails.tsx | 4 +- .../HardwareDetailsHeaderTable.tsx | 2 +- .../hardwareDetails/Tabs/Boots/BootsTab.tsx | 2 +- .../hardwareDetails/Tabs/Build/BuildTab.tsx | 2 +- .../Tabs/Build/HardwareDetailsBuildsTable.tsx | 2 +- .../Tabs/HardwareCommitNavigationGraph.tsx | 2 +- .../Tabs/HardwareDetailsTabs.tsx | 2 +- .../hardwareDetails/Tabs/Tests/TestsTab.tsx | 2 +- dashboard/src/routeTree.gen.ts | 1569 ++++++++--------- dashboard/src/routes/__root.tsx | 47 +- .../(alternatives)/b/$buildId/index.tsx | 2 +- .../(alternatives)/b/$buildId/route.tsx | 4 +- .../(alternatives)/i/$issueId/index.tsx | 2 +- .../(alternatives)/i/$issueId/route.tsx | 4 +- .../{ => _main}/(alternatives)/i/index.tsx | 2 +- .../{ => _main}/(alternatives)/i/route.tsx | 4 +- .../(alternatives)/t/$testId/index.tsx | 2 +- .../(alternatives)/t/$testId/route.tsx | 4 +- .../{ => _main}/build/$buildId/index.tsx | 2 +- .../{ => _main}/build/$buildId/route.tsx | 2 +- .../$hardwareId/boot/$bootId/index.tsx | 4 +- .../hardware/$hardwareId/boot/index.tsx | 2 +- .../$hardwareId/build/$buildId/index.tsx | 4 +- .../hardware/$hardwareId/build/index.tsx | 2 +- .../hardware/$hardwareId/index.tsx | 2 +- .../hardware/$hardwareId/route.tsx | 2 +- .../$hardwareId/test/$testId/index.tsx | 4 +- .../hardware/$hardwareId/test/index.tsx | 2 +- .../src/routes/{ => _main}/hardware/index.tsx | 2 +- .../src/routes/{ => _main}/hardware/route.tsx | 2 +- dashboard/src/routes/{ => _main}/index.tsx | 2 +- .../{ => _main}/issue/$issueId/index.tsx | 2 +- .../{ => _main}/issue/$issueId/route.tsx | 2 +- .../src/routes/{ => _main}/issue/index.tsx | 2 +- .../src/routes/{ => _main}/issue/route.tsx | 2 +- dashboard/src/routes/_main/route.tsx | 53 + .../routes/{ => _main}/test/$testId/index.tsx | 2 +- .../routes/{ => _main}/test/$testId/route.tsx | 2 +- .../tree/$treeId/build/$buildId/index.tsx | 2 +- .../routes/{ => _main}/tree/$treeId/index.tsx | 2 +- .../routes/{ => _main}/tree/$treeId/route.tsx | 2 +- .../tree/$treeId/test/$testId/index.tsx | 2 +- .../tree/$treeName/$branch/index.tsx | 2 +- .../src/routes/{ => _main}/tree/index.tsx | 2 +- .../src/routes/{ => _main}/tree/route.tsx | 2 +- .../hardware/$hardwareId/boot/route.tsx | 3 - .../hardware/$hardwareId/build/route.tsx | 3 - .../hardware/$hardwareId/test/route.tsx | 3 - .../tree/$treeId/test/$testId/route.tsx | 3 - 77 files changed, 914 insertions(+), 988 deletions(-) rename dashboard/src/routes/{ => _main}/(alternatives)/b/$buildId/index.tsx (77%) rename dashboard/src/routes/{ => _main}/(alternatives)/b/$buildId/route.tsx (79%) rename dashboard/src/routes/{ => _main}/(alternatives)/i/$issueId/index.tsx (77%) rename dashboard/src/routes/{ => _main}/(alternatives)/i/$issueId/route.tsx (79%) rename dashboard/src/routes/{ => _main}/(alternatives)/i/index.tsx (78%) rename dashboard/src/routes/{ => _main}/(alternatives)/i/route.tsx (81%) rename dashboard/src/routes/{ => _main}/(alternatives)/t/$testId/index.tsx (77%) rename dashboard/src/routes/{ => _main}/(alternatives)/t/$testId/route.tsx (79%) rename dashboard/src/routes/{ => _main}/build/$buildId/index.tsx (70%) rename dashboard/src/routes/{ => _main}/build/$buildId/route.tsx (94%) rename dashboard/src/routes/{ => _main}/hardware/$hardwareId/boot/$bootId/index.tsx (60%) rename dashboard/src/routes/{ => _main}/hardware/$hardwareId/boot/index.tsx (62%) rename dashboard/src/routes/{ => _main}/hardware/$hardwareId/build/$buildId/index.tsx (81%) rename dashboard/src/routes/{ => _main}/hardware/$hardwareId/build/index.tsx (62%) rename dashboard/src/routes/{ => _main}/hardware/$hardwareId/index.tsx (69%) rename dashboard/src/routes/{ => _main}/hardware/$hardwareId/route.tsx (93%) rename dashboard/src/routes/{ => _main}/hardware/$hardwareId/test/$testId/index.tsx (81%) rename dashboard/src/routes/{ => _main}/hardware/$hardwareId/test/index.tsx (62%) rename dashboard/src/routes/{ => _main}/hardware/index.tsx (68%) rename dashboard/src/routes/{ => _main}/hardware/route.tsx (93%) rename dashboard/src/routes/{ => _main}/index.tsx (91%) rename dashboard/src/routes/{ => _main}/issue/$issueId/index.tsx (71%) rename dashboard/src/routes/{ => _main}/issue/$issueId/route.tsx (94%) rename dashboard/src/routes/{ => _main}/issue/index.tsx (73%) rename dashboard/src/routes/{ => _main}/issue/route.tsx (93%) create mode 100644 dashboard/src/routes/_main/route.tsx rename dashboard/src/routes/{ => _main}/test/$testId/index.tsx (72%) rename dashboard/src/routes/{ => _main}/test/$testId/route.tsx (94%) rename dashboard/src/routes/{ => _main}/tree/$treeId/build/$buildId/index.tsx (83%) rename dashboard/src/routes/{ => _main}/tree/$treeId/index.tsx (70%) rename dashboard/src/routes/{ => _main}/tree/$treeId/route.tsx (93%) rename dashboard/src/routes/{ => _main}/tree/$treeId/test/$testId/index.tsx (83%) rename dashboard/src/routes/{ => _main}/tree/$treeName/$branch/index.tsx (65%) rename dashboard/src/routes/{ => _main}/tree/index.tsx (80%) rename dashboard/src/routes/{ => _main}/tree/route.tsx (92%) delete mode 100644 dashboard/src/routes/hardware/$hardwareId/boot/route.tsx delete mode 100644 dashboard/src/routes/hardware/$hardwareId/build/route.tsx delete mode 100644 dashboard/src/routes/hardware/$hardwareId/test/route.tsx delete mode 100644 dashboard/src/routes/tree/$treeId/test/$testId/route.tsx diff --git a/dashboard/src/api/hardware.ts b/dashboard/src/api/hardware.ts index b5c225b1e..f28f16e3c 100644 --- a/dashboard/src/api/hardware.ts +++ b/dashboard/src/api/hardware.ts @@ -32,7 +32,7 @@ export const useHardwareListing = ( startTimestampInSeconds: number, endTimestampInSeconds: number, ): UseQueryResult => { - const { origin } = useSearch({ from: '/hardware' }); + const { origin } = useSearch({ from: '/_main/hardware' }); const queryKey = [ 'hardwareListing', diff --git a/dashboard/src/api/issue.ts b/dashboard/src/api/issue.ts index c237ca384..5c3cae535 100644 --- a/dashboard/src/api/issue.ts +++ b/dashboard/src/api/issue.ts @@ -18,7 +18,7 @@ const fetchIssueListing = async ( }; export const useIssueListing = (): UseQueryResult => { - const { origin, intervalInDays } = useSearch({ from: '/issue' }); + const { origin, intervalInDays } = useSearch({ from: '/_main/issue' }); const queryKey = ['issueTable', origin, intervalInDays]; diff --git a/dashboard/src/api/tree.ts b/dashboard/src/api/tree.ts index 0325eb8d4..3a09c9fa4 100644 --- a/dashboard/src/api/tree.ts +++ b/dashboard/src/api/tree.ts @@ -27,7 +27,7 @@ export const useTreeTable = ({ }: { enabled: boolean; }): UseQueryResult => { - const { origin, intervalInDays } = useSearch({ from: '/tree' }); + const { origin, intervalInDays } = useSearch({ from: '/_main/tree' }); const queryKey = ['treeTable', origin, intervalInDays]; @@ -49,7 +49,7 @@ const fetchTreeFastCheckoutData = async ( }; export const useTreeTableFast = (): UseQueryResult => { - const { origin, intervalInDays } = useSearch({ from: '/tree' }); + const { origin, intervalInDays } = useSearch({ from: '/_main/tree' }); const queryKey = ['treeTableFast', origin, intervalInDays]; diff --git a/dashboard/src/api/treeDetails.ts b/dashboard/src/api/treeDetails.ts index 91c9cd9d0..99cabbecf 100644 --- a/dashboard/src/api/treeDetails.ts +++ b/dashboard/src/api/treeDetails.ts @@ -30,7 +30,7 @@ const useTreeSearchParameters = (): TreeSearchParameters => { const { origin, treeInfo: { gitUrl, gitBranch }, - } = useSearch({ from: '/tree/$treeId' }); + } = useSearch({ from: '/_main/tree/$treeId' }); return { origin, gitUrl, gitBranch }; }; diff --git a/dashboard/src/components/BuildDetails/BuildDetails.tsx b/dashboard/src/components/BuildDetails/BuildDetails.tsx index ac5f3900b..9f9a55bfa 100644 --- a/dashboard/src/components/BuildDetails/BuildDetails.tsx +++ b/dashboard/src/components/BuildDetails/BuildDetails.tsx @@ -62,7 +62,7 @@ const BuildDetails = ({ tableFilter, getTestTableRowLink, }: BuildDetailsProps): JSX.Element => { - const { buildId } = useParams({ from: '/build/$buildId' }); + const { buildId } = useParams({ from: '/_main/build/$buildId' }); const { data, isLoading, status, error } = useBuildDetails(buildId); const { data: issueData, @@ -70,7 +70,7 @@ const BuildDetails = ({ error: issueError, } = useBuildIssues(buildId); - const { logOpen } = useSearch({ from: '/build/$buildId' }); + const { logOpen } = useSearch({ from: '/_main/build/$buildId' }); const navigate = useNavigate({ from: '/build/$buildId' }); const { formatMessage } = useIntl(); diff --git a/dashboard/src/components/Cards/CompatibleHardware.tsx b/dashboard/src/components/Cards/CompatibleHardware.tsx index 0fb99304e..f57070d63 100644 --- a/dashboard/src/components/Cards/CompatibleHardware.tsx +++ b/dashboard/src/components/Cards/CompatibleHardware.tsx @@ -23,7 +23,7 @@ const CompatibleLink = ({ compatible: string; diffFilter: TFilter; }): JSX.Element => { - const { currentPageTab } = useSearch({ from: '/hardware/$hardwareId' }); + const { currentPageTab } = useSearch({ from: '/_main/hardware/$hardwareId' }); return ( { - const { currentPageTab } = useSearch({ from: '/tree/$treeId' }); + const { currentPageTab } = useSearch({ from: '/_main/tree/$treeId' }); return ( { const { formatMessage } = useIntl(); const navigate = useNavigate({ from: navigateFrom }); - const { intervalInDays: interval } = useSearch({ from: navigateFrom }); + const { intervalInDays: interval } = useSearch({ + from: `/_main${navigateFrom}`, + }); const InputTimeSchema = z.object({ intervalInDays: z.string().refine(validateStringToNumber, { diff --git a/dashboard/src/components/IssueDetails/IssueDetails.tsx b/dashboard/src/components/IssueDetails/IssueDetails.tsx index 9a7d122bb..904ca09b7 100644 --- a/dashboard/src/components/IssueDetails/IssueDetails.tsx +++ b/dashboard/src/components/IssueDetails/IssueDetails.tsx @@ -67,7 +67,7 @@ export const IssueDetails = ({ getBuildTableRowLink, breadcrumb, }: IIssueDetails): JSX.Element => { - const { issueId } = useParams({ from: '/issue/$issueId' }); + const { issueId } = useParams({ from: '/_main/issue/$issueId' }); const { data, isLoading, status, error } = useIssueDetails( issueId, versionNumber, diff --git a/dashboard/src/components/TestDetails/TestDetails.tsx b/dashboard/src/components/TestDetails/TestDetails.tsx index e850d519b..e271a1579 100644 --- a/dashboard/src/components/TestDetails/TestDetails.tsx +++ b/dashboard/src/components/TestDetails/TestDetails.tsx @@ -70,7 +70,7 @@ const TestDetailsSections = ({ }): JSX.Element => { const { formatMessage } = useIntl(); const historyState = useRouterState({ select: s => s.location.state }); - const searchParams = useSearch({ from: '/test/$testId' }); + const searchParams = useSearch({ from: '/_main/test/$testId' }); const hardware: string = useMemo(() => { return getTestHardware({ misc: test.environment_misc, @@ -301,10 +301,10 @@ interface TestsDetailsProps { } const TestDetails = ({ breadcrumb }: TestsDetailsProps): JSX.Element => { - const { testId } = useParams({ from: '/test/$testId' }); + const { testId } = useParams({ from: '/_main/test/$testId' }); const { formatMessage } = useIntl(); - const { logOpen } = useSearch({ from: '/test/$testId' }); + const { logOpen } = useSearch({ from: '/_main/test/$testId' }); const navigate = useNavigate({ from: '/test/$testId' }); const { data, isLoading, status, error } = useTestDetails(testId ?? ''); diff --git a/dashboard/src/components/ui/badge.tsx b/dashboard/src/components/ui/badge.tsx index e66e8f650..033aa2b13 100644 --- a/dashboard/src/components/ui/badge.tsx +++ b/dashboard/src/components/ui/badge.tsx @@ -15,8 +15,10 @@ const badgeVariants = cva( destructive: 'border-transparent bg-red-500 text-slate-50 hover:bg-red-500/80 dark:bg-red-900 dark:text-slate-50 dark:hover:bg-red-900/80', outline: 'text-slate-950 dark:text-slate-50', - blueTag: 'text-dark-blue outline-medium-light-blue border-none bg-light-blue font-medium capitalize outline-1', - greenTag: 'text-dark-green outline-medium-light-green border-none bg-light-green font-medium capitalize outline-1', + blueTag: + 'text-dark-blue outline-medium-light-blue border-none bg-light-blue font-medium capitalize outline-1', + greenTag: + 'text-dark-green outline-medium-light-green border-none bg-light-green font-medium capitalize outline-1', }, }, defaultVariants: { diff --git a/dashboard/src/index.css b/dashboard/src/index.css index d5e2a1250..a299f5d01 100644 --- a/dashboard/src/index.css +++ b/dashboard/src/index.css @@ -1,18 +1,35 @@ @import 'tailwindcss'; @import './tailwindcss-animate.css'; - @custom-variant dark (&:is(.dark *)); @layer components { .starburst { clip-path: polygon( - 100% 50%, 78.98% 57.76%, 93.3% 75%, 71.21% 71.21%, - 75% 93.3%, 57.76% 78.98%, 50% 100%, 42.24% 78.98%, - 25% 93.3%, 28.79% 71.21%, 6.7% 75%, 21.02% 57.76%, - 0% 50%, 21.02% 42.24%, 6.7% 25%, 28.79% 28.79%, - 25% 6.7%, 42.24% 21.02%, 50% 0%, 57.76% 21.02%, - 75% 6.7%, 71.21% 28.79%, 93.3% 25%, 78.98% 42.24% + 100% 50%, + 78.98% 57.76%, + 93.3% 75%, + 71.21% 71.21%, + 75% 93.3%, + 57.76% 78.98%, + 50% 100%, + 42.24% 78.98%, + 25% 93.3%, + 28.79% 71.21%, + 6.7% 75%, + 21.02% 57.76%, + 0% 50%, + 21.02% 42.24%, + 6.7% 25%, + 28.79% 28.79%, + 25% 6.7%, + 42.24% 21.02%, + 50% 0%, + 57.76% 21.02%, + 75% 6.7%, + 71.21% 28.79%, + 93.3% 25%, + 78.98% 42.24% ); } } @@ -91,7 +108,7 @@ border-color: var(--color-gray-200, currentColor); } button:not(:disabled), - [role="button"]:not(:disabled) { + [role='button']:not(:disabled) { cursor: pointer; } } diff --git a/dashboard/src/pages/BuildDetails/BuildDetails.tsx b/dashboard/src/pages/BuildDetails/BuildDetails.tsx index 72916f815..8fafe89cf 100644 --- a/dashboard/src/pages/BuildDetails/BuildDetails.tsx +++ b/dashboard/src/pages/BuildDetails/BuildDetails.tsx @@ -15,7 +15,7 @@ import TreeBuildDetails from '@/pages/TreeBuildDetails'; import HardwareBuildDetails from '@/pages/HardwareBuildDetails'; const BuildDetailsPage = (): JSX.Element => { - const searchParams = useSearch({ from: '/build/$buildId' }); + const searchParams = useSearch({ from: '/_main/build/$buildId' }); const navigate = useNavigate({ from: '/build/$buildId' }); const historyState = useRouterState({ select: s => s.location.state }); diff --git a/dashboard/src/pages/Hardware/Hardware.tsx b/dashboard/src/pages/Hardware/Hardware.tsx index e61e419df..05162ef4a 100644 --- a/dashboard/src/pages/Hardware/Hardware.tsx +++ b/dashboard/src/pages/Hardware/Hardware.tsx @@ -12,7 +12,7 @@ import { MemoizedListingOGTags } from '@/components/OpenGraphTags/ListingOGTags' const Hardware = (): JSX.Element => { const { hardwareSearch } = useSearch({ - from: '/hardware', + from: '/_main/hardware', }); const navigate = useNavigate({ from: '/hardware' }); diff --git a/dashboard/src/pages/Hardware/HardwareListingPage.tsx b/dashboard/src/pages/Hardware/HardwareListingPage.tsx index 4ff8a2dc4..dbe974981 100644 --- a/dashboard/src/pages/Hardware/HardwareListingPage.tsx +++ b/dashboard/src/pages/Hardware/HardwareListingPage.tsx @@ -49,7 +49,7 @@ const useHardwareListingTime = (): { startTimestampInSeconds: number; endTimestampInSeconds: number; } => { - const { intervalInDays } = useSearch({ from: '/hardware' }); + const { intervalInDays } = useSearch({ from: '/_main/hardware' }); const [timestamps, setTimeStamps] = useState(() => { return calculateTimeStamp(intervalInDays); }); diff --git a/dashboard/src/pages/HardwareBuildDetails/HardwareBuildDetails.tsx b/dashboard/src/pages/HardwareBuildDetails/HardwareBuildDetails.tsx index 9975ad51a..fcf0f1e76 100644 --- a/dashboard/src/pages/HardwareBuildDetails/HardwareBuildDetails.tsx +++ b/dashboard/src/pages/HardwareBuildDetails/HardwareBuildDetails.tsx @@ -12,7 +12,7 @@ import { RedirectFrom } from '@/types/general'; import { MemoizedHardwareBreadcrumb } from '@/components/Breadcrumb/HardwareBreadcrumb'; const HardwareBuildDetails = (): JSX.Element => { - const searchParams = useSearch({ from: '/build/$buildId' }); + const searchParams = useSearch({ from: '/_main/build/$buildId' }); const historyState = useRouterState({ select: s => s.location.state }); const hardwareId = historyState.id; diff --git a/dashboard/src/pages/HardwareTestDetails/HardwareTestDetails.tsx b/dashboard/src/pages/HardwareTestDetails/HardwareTestDetails.tsx index 16de03348..acd9a4025 100644 --- a/dashboard/src/pages/HardwareTestDetails/HardwareTestDetails.tsx +++ b/dashboard/src/pages/HardwareTestDetails/HardwareTestDetails.tsx @@ -6,7 +6,7 @@ import TestDetails from '@/components/TestDetails/TestDetails'; import { MemoizedHardwareBreadcrumb } from '@/components/Breadcrumb/HardwareBreadcrumb'; const HardwareTestDetails = (): JSX.Element => { - const searchParams = useSearch({ from: '/test/$testId/' }); + const searchParams = useSearch({ from: '/_main/test/$testId/' }); return ( ({ to: '/build/$buildId', params: { @@ -31,8 +29,8 @@ const getTestTableRowLink = (testId: string): LinkProps => ({ }); const IssueDetailsPage = (): JSX.Element => { - const searchParams = useSearch({ from: ISSUE_ROUTE }); - const navigate = useNavigate({ from: ISSUE_ROUTE }); + const searchParams = useSearch({ from: '/_main/issue/$issueId' }); + const navigate = useNavigate({ from: '/issue/$issueId' }); const historyState = useRouterState({ select: s => s.location.state }); const breadcrumbComponent = useMemo(() => { diff --git a/dashboard/src/pages/TreeBuildDetails/TreeBuildDetails.tsx b/dashboard/src/pages/TreeBuildDetails/TreeBuildDetails.tsx index ed94bf168..706874f9f 100644 --- a/dashboard/src/pages/TreeBuildDetails/TreeBuildDetails.tsx +++ b/dashboard/src/pages/TreeBuildDetails/TreeBuildDetails.tsx @@ -12,7 +12,7 @@ import { RedirectFrom } from '@/types/general'; import { MemoizedTreeBreadcrumb } from '@/components/Breadcrumb/TreeBreadcrumb'; const TreeBuildDetails = (): JSX.Element => { - const searchParams = useSearch({ from: '/build/$buildId' }); + const searchParams = useSearch({ from: '/_main/build/$buildId' }); const historyState = useRouterState({ select: s => s.location.state }); const treeId = historyState.id; diff --git a/dashboard/src/pages/TreeDetails/Tabs/Boots/BootsTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/Boots/BootsTab.tsx index b5a6e4ce5..9587d8aa9 100644 --- a/dashboard/src/pages/TreeDetails/Tabs/Boots/BootsTab.tsx +++ b/dashboard/src/pages/TreeDetails/Tabs/Boots/BootsTab.tsx @@ -38,11 +38,11 @@ interface BootsTabProps { const BootsTab = ({ treeDetailsLazyLoaded }: BootsTabProps): JSX.Element => { const { treeId } = useParams({ - from: '/tree/$treeId', + from: '/_main/tree/$treeId', }); const { tableFilter, diffFilter } = useSearch({ - from: '/tree/$treeId', + from: '/_main/tree/$treeId', }); const currentPathFilter = diffFilter.bootPath diff --git a/dashboard/src/pages/TreeDetails/Tabs/Build/BuildTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/Build/BuildTab.tsx index 8f74a130b..908c60a85 100644 --- a/dashboard/src/pages/TreeDetails/Tabs/Build/BuildTab.tsx +++ b/dashboard/src/pages/TreeDetails/Tabs/Build/BuildTab.tsx @@ -67,10 +67,10 @@ const BuildTab = ({ treeDetailsLazyLoaded }: BuildTab): JSX.Element => { }); const { diffFilter } = useSearch({ - from: '/tree/$treeId', + from: '/_main/tree/$treeId', }); - const { treeId } = useParams({ from: '/tree/$treeId' }); + const { treeId } = useParams({ from: '/_main/tree/$treeId' }); const summaryData = treeDetailsLazyLoaded.summary?.data?.summary.builds; const { data: fullData, status: fullStatus } = treeDetailsLazyLoaded.full; diff --git a/dashboard/src/pages/TreeDetails/Tabs/Build/TreeDetailsBuildsTable.tsx b/dashboard/src/pages/TreeDetails/Tabs/Build/TreeDetailsBuildsTable.tsx index aba6c4940..fd176db29 100644 --- a/dashboard/src/pages/TreeDetails/Tabs/Build/TreeDetailsBuildsTable.tsx +++ b/dashboard/src/pages/TreeDetails/Tabs/Build/TreeDetailsBuildsTable.tsx @@ -17,8 +17,8 @@ export interface TTreeDetailsBuildsTable { export function TreeDetailsBuildsTable({ buildItems, }: TTreeDetailsBuildsTable): JSX.Element { - const { treeId } = useParams({ from: '/tree/$treeId' }); - const { tableFilter } = useSearch({ from: '/tree/$treeId' }); + const { treeId } = useParams({ from: '/_main/tree/$treeId' }); + const { tableFilter } = useSearch({ from: '/_main/tree/$treeId' }); const navigate = useNavigate({ from: '/tree/$treeId' }); const getRowLink = useCallback( diff --git a/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx index 6d5f60dc5..77bf8843c 100644 --- a/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx +++ b/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx @@ -39,7 +39,7 @@ interface TestsTabProps { } const TestsTab = ({ treeDetailsLazyLoaded }: TestsTabProps): JSX.Element => { - const { treeId } = useParams({ from: '/tree/$treeId' }); + const { treeId } = useParams({ from: '/_main/tree/$treeId' }); const { full: fullQuery, summary: summaryQuery } = treeDetailsLazyLoaded; const { data, status, isLoading: fullIsLoading } = fullQuery; @@ -47,7 +47,7 @@ const TestsTab = ({ treeDetailsLazyLoaded }: TestsTabProps): JSX.Element => { const summaryData = treeDetailsLazyLoaded.summary.data?.summary.tests; const { tableFilter, diffFilter } = useSearch({ - from: '/tree/$treeId', + from: '/_main/tree/$treeId', }); const currentPathFilter = diffFilter.testPath diff --git a/dashboard/src/pages/TreeDetails/Tabs/TreeCommitNavigationGraph.tsx b/dashboard/src/pages/TreeDetails/Tabs/TreeCommitNavigationGraph.tsx index e6bba772d..c942e9bd6 100644 --- a/dashboard/src/pages/TreeDetails/Tabs/TreeCommitNavigationGraph.tsx +++ b/dashboard/src/pages/TreeDetails/Tabs/TreeCommitNavigationGraph.tsx @@ -10,10 +10,10 @@ const TreeCommitNavigationGraph = (): React.ReactNode => { currentPageTab, diffFilter, treeInfo: { gitUrl, gitBranch, headCommitHash }, - } = useSearch({ from: '/tree/$treeId' }); + } = useSearch({ from: '/_main/tree/$treeId' }); const { treeId } = useParams({ - from: '/tree/$treeId', + from: '/_main/tree/$treeId', }); const navigate = useNavigate({ diff --git a/dashboard/src/pages/TreeDetails/Tabs/TreeDetailsTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/TreeDetailsTab.tsx index 0768da0c9..f899a14de 100644 --- a/dashboard/src/pages/TreeDetails/Tabs/TreeDetailsTab.tsx +++ b/dashboard/src/pages/TreeDetails/Tabs/TreeDetailsTab.tsx @@ -31,7 +31,7 @@ const TreeDetailsTab = ({ treeDetailsLazyLoaded, }: ITreeDetailsTab): JSX.Element => { const { currentPageTab } = useSearch({ - from: '/tree/$treeId', + from: '/_main/tree/$treeId', }); const navigate = useNavigate({ from: '/tree/$treeId' }); const treeDetailsTab: ITabItem[] = useMemo( diff --git a/dashboard/src/pages/TreeDetails/TreeDetails.tsx b/dashboard/src/pages/TreeDetails/TreeDetails.tsx index 275abe0c2..81f531a86 100644 --- a/dashboard/src/pages/TreeDetails/TreeDetails.tsx +++ b/dashboard/src/pages/TreeDetails/TreeDetails.tsx @@ -151,8 +151,8 @@ const TreeHeader = ({ function TreeDetails(): JSX.Element { const { formatMessage } = useIntl(); - const { treeId } = useParams({ from: '/tree/$treeId' }); - const searchParams = useSearch({ from: '/tree/$treeId' }); + const { treeId } = useParams({ from: '/_main/tree/$treeId' }); + const searchParams = useSearch({ from: '/_main/tree/$treeId' }); const { diffFilter, treeInfo } = searchParams; const navigate = useNavigate({ from: '/tree/$treeId' }); diff --git a/dashboard/src/pages/TreeLatest.tsx b/dashboard/src/pages/TreeLatest.tsx index b182a0c9f..925f06fd8 100644 --- a/dashboard/src/pages/TreeLatest.tsx +++ b/dashboard/src/pages/TreeLatest.tsx @@ -17,9 +17,11 @@ import { MemoizedSectionError } from '@/components/DetailsPages/SectionError'; import { Skeleton } from '@/components/Skeleton'; export const TreeLatest = (): JSX.Element | void => { - const searchParams = useSearch({ from: '/tree/$treeName/$branch/' }); + const searchParams = useSearch({ from: '/_main/tree/$treeName/$branch/' }); const navigate = useNavigate(); - const { treeName, branch } = useParams({ from: '/tree/$treeName/$branch/' }); + const { treeName, branch } = useParams({ + from: '/_main/tree/$treeName/$branch/', + }); const { isLoading, data, error } = useTreeLatest( treeName, branch, diff --git a/dashboard/src/pages/TreeTestDetails/TreeTestDetails.tsx b/dashboard/src/pages/TreeTestDetails/TreeTestDetails.tsx index 047b32f22..976689d91 100644 --- a/dashboard/src/pages/TreeTestDetails/TreeTestDetails.tsx +++ b/dashboard/src/pages/TreeTestDetails/TreeTestDetails.tsx @@ -6,7 +6,7 @@ import TestDetails from '@/components/TestDetails/TestDetails'; import { MemoizedTreeBreadcrumb } from '@/components/Breadcrumb/TreeBreadcrumb'; const TreeTestDetails = (): JSX.Element => { - const searchParams = useSearch({ from: '/test/$testId/' }); + const searchParams = useSearch({ from: '/_main/test/$testId/' }); return ( { const navigate = useNavigate({ from: '/hardware/$hardwareId/' }); - const { treeCommits } = useSearch({ from: '/hardware/$hardwareId' }); + const { treeCommits } = useSearch({ from: '/_main/hardware/$hardwareId' }); const navigateToThePast = useCallback( (commitHash: string) => { diff --git a/dashboard/src/pages/hardwareDetails/Tabs/Boots/BootsTab.tsx b/dashboard/src/pages/hardwareDetails/Tabs/Boots/BootsTab.tsx index 257b92e4a..441c16a65 100644 --- a/dashboard/src/pages/hardwareDetails/Tabs/Boots/BootsTab.tsx +++ b/dashboard/src/pages/hardwareDetails/Tabs/Boots/BootsTab.tsx @@ -53,7 +53,7 @@ const BootsTab = ({ fullDataResult, }: IBootsTab): JSX.Element => { const { tableFilter, diffFilter } = useSearch({ - from: '/hardware/$hardwareId', + from: '/_main/hardware/$hardwareId', }); const currentPathFilter = diffFilter.bootPath diff --git a/dashboard/src/pages/hardwareDetails/Tabs/Build/BuildTab.tsx b/dashboard/src/pages/hardwareDetails/Tabs/Build/BuildTab.tsx index 7ebaa084a..e62bac5e2 100644 --- a/dashboard/src/pages/hardwareDetails/Tabs/Build/BuildTab.tsx +++ b/dashboard/src/pages/hardwareDetails/Tabs/Build/BuildTab.tsx @@ -52,7 +52,7 @@ const BuildTab = ({ }); const { diffFilter } = useSearch({ - from: '/hardware/$hardwareId', + from: '/_main/hardware/$hardwareId', }); const toggleFilterBySection = useCallback( diff --git a/dashboard/src/pages/hardwareDetails/Tabs/Build/HardwareDetailsBuildsTable.tsx b/dashboard/src/pages/hardwareDetails/Tabs/Build/HardwareDetailsBuildsTable.tsx index 4c438b2e8..88ff5bdd2 100644 --- a/dashboard/src/pages/hardwareDetails/Tabs/Build/HardwareDetailsBuildsTable.tsx +++ b/dashboard/src/pages/hardwareDetails/Tabs/Build/HardwareDetailsBuildsTable.tsx @@ -36,7 +36,7 @@ export function HardwareDetailsBuildsTable({ buildsData, hardwareId, }: THardwareDetailsBuildsTable): JSX.Element { - const { tableFilter } = useSearch({ from: '/hardware/$hardwareId' }); + const { tableFilter } = useSearch({ from: '/_main/hardware/$hardwareId' }); const navigate = useNavigate({ from: '/hardware/$hardwareId' }); diff --git a/dashboard/src/pages/hardwareDetails/Tabs/HardwareCommitNavigationGraph.tsx b/dashboard/src/pages/hardwareDetails/Tabs/HardwareCommitNavigationGraph.tsx index 414361677..f1b2b1376 100644 --- a/dashboard/src/pages/hardwareDetails/Tabs/HardwareCommitNavigationGraph.tsx +++ b/dashboard/src/pages/hardwareDetails/Tabs/HardwareCommitNavigationGraph.tsx @@ -22,7 +22,7 @@ const HardwareCommitNavigationGraph = ({ startTimestampInSeconds, endTimestampInSeconds, } = useSearch({ - from: '/hardware/$hardwareId', + from: '/_main/hardware/$hardwareId', }); const navigate = useNavigate({ from: '/hardware/$hardwareId' }); diff --git a/dashboard/src/pages/hardwareDetails/Tabs/HardwareDetailsTabs.tsx b/dashboard/src/pages/hardwareDetails/Tabs/HardwareDetailsTabs.tsx index f0c1b5379..dfb996676 100644 --- a/dashboard/src/pages/hardwareDetails/Tabs/HardwareDetailsTabs.tsx +++ b/dashboard/src/pages/hardwareDetails/Tabs/HardwareDetailsTabs.tsx @@ -40,7 +40,7 @@ const HardwareDetailsTabs = ({ summaryData, }: IHardwareDetailsTab): JSX.Element => { const { currentPageTab } = useSearch({ - from: '/hardware/$hardwareId', + from: '/_main/hardware/$hardwareId', }); const navigate = useNavigate({ from: '/hardware/$hardwareId' }); diff --git a/dashboard/src/pages/hardwareDetails/Tabs/Tests/TestsTab.tsx b/dashboard/src/pages/hardwareDetails/Tabs/Tests/TestsTab.tsx index 0d1caed6f..b963b68ea 100644 --- a/dashboard/src/pages/hardwareDetails/Tabs/Tests/TestsTab.tsx +++ b/dashboard/src/pages/hardwareDetails/Tabs/Tests/TestsTab.tsx @@ -52,7 +52,7 @@ const TestsTab = ({ fullDataResult, }: ITestsTab): JSX.Element => { const { tableFilter, diffFilter } = useSearch({ - from: '/hardware/$hardwareId', + from: '/_main/hardware/$hardwareId', }); const currentPathFilter = diffFilter.testPath diff --git a/dashboard/src/routeTree.gen.ts b/dashboard/src/routeTree.gen.ts index 44109aa08..1e6aa6167 100644 --- a/dashboard/src/routeTree.gen.ts +++ b/dashboard/src/routeTree.gen.ts @@ -11,912 +11,849 @@ // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as TreeRouteImport } from './routes/tree/route' -import { Route as IssueRouteImport } from './routes/issue/route' -import { Route as HardwareRouteImport } from './routes/hardware/route' -import { Route as IndexImport } from './routes/index' -import { Route as TreeIndexImport } from './routes/tree/index' -import { Route as IssueIndexImport } from './routes/issue/index' -import { Route as HardwareIndexImport } from './routes/hardware/index' -import { Route as TreeTreeIdRouteImport } from './routes/tree/$treeId/route' -import { Route as TestTestIdRouteImport } from './routes/test/$testId/route' -import { Route as IssueIssueIdRouteImport } from './routes/issue/$issueId/route' -import { Route as HardwareHardwareIdRouteImport } from './routes/hardware/$hardwareId/route' -import { Route as BuildBuildIdRouteImport } from './routes/build/$buildId/route' -import { Route as alternativesIRouteImport } from './routes/(alternatives)/i/route' -import { Route as TreeTreeIdIndexImport } from './routes/tree/$treeId/index' -import { Route as TestTestIdIndexImport } from './routes/test/$testId/index' -import { Route as IssueIssueIdIndexImport } from './routes/issue/$issueId/index' -import { Route as HardwareHardwareIdIndexImport } from './routes/hardware/$hardwareId/index' -import { Route as BuildBuildIdIndexImport } from './routes/build/$buildId/index' -import { Route as alternativesIIndexImport } from './routes/(alternatives)/i/index' -import { Route as HardwareHardwareIdTestRouteImport } from './routes/hardware/$hardwareId/test/route' -import { Route as HardwareHardwareIdBuildRouteImport } from './routes/hardware/$hardwareId/build/route' -import { Route as HardwareHardwareIdBootRouteImport } from './routes/hardware/$hardwareId/boot/route' -import { Route as alternativesTTestIdRouteImport } from './routes/(alternatives)/t/$testId/route' -import { Route as alternativesIIssueIdRouteImport } from './routes/(alternatives)/i/$issueId/route' -import { Route as alternativesBBuildIdRouteImport } from './routes/(alternatives)/b/$buildId/route' -import { Route as TreeTreeNameBranchIndexImport } from './routes/tree/$treeName/$branch/index' -import { Route as HardwareHardwareIdTestIndexImport } from './routes/hardware/$hardwareId/test/index' -import { Route as HardwareHardwareIdBuildIndexImport } from './routes/hardware/$hardwareId/build/index' -import { Route as HardwareHardwareIdBootIndexImport } from './routes/hardware/$hardwareId/boot/index' -import { Route as alternativesTTestIdIndexImport } from './routes/(alternatives)/t/$testId/index' -import { Route as alternativesIIssueIdIndexImport } from './routes/(alternatives)/i/$issueId/index' -import { Route as alternativesBBuildIdIndexImport } from './routes/(alternatives)/b/$buildId/index' -import { Route as TreeTreeIdTestTestIdRouteImport } from './routes/tree/$treeId/test/$testId/route' -import { Route as TreeTreeIdTestTestIdIndexImport } from './routes/tree/$treeId/test/$testId/index' -import { Route as TreeTreeIdBuildBuildIdIndexImport } from './routes/tree/$treeId/build/$buildId/index' -import { Route as HardwareHardwareIdTestTestIdIndexImport } from './routes/hardware/$hardwareId/test/$testId/index' -import { Route as HardwareHardwareIdBuildBuildIdIndexImport } from './routes/hardware/$hardwareId/build/$buildId/index' -import { Route as HardwareHardwareIdBootBootIdIndexImport } from './routes/hardware/$hardwareId/boot/$bootId/index' +import { Route as MainRouteImport } from './routes/_main/route' +import { Route as MainIndexImport } from './routes/_main/index' +import { Route as MainTreeRouteImport } from './routes/_main/tree/route' +import { Route as MainIssueRouteImport } from './routes/_main/issue/route' +import { Route as MainHardwareRouteImport } from './routes/_main/hardware/route' +import { Route as MainTreeIndexImport } from './routes/_main/tree/index' +import { Route as MainIssueIndexImport } from './routes/_main/issue/index' +import { Route as MainHardwareIndexImport } from './routes/_main/hardware/index' +import { Route as MainTreeTreeIdRouteImport } from './routes/_main/tree/$treeId/route' +import { Route as MainTestTestIdRouteImport } from './routes/_main/test/$testId/route' +import { Route as MainIssueIssueIdRouteImport } from './routes/_main/issue/$issueId/route' +import { Route as MainHardwareHardwareIdRouteImport } from './routes/_main/hardware/$hardwareId/route' +import { Route as MainBuildBuildIdRouteImport } from './routes/_main/build/$buildId/route' +import { Route as MainalternativesIRouteImport } from './routes/_main/(alternatives)/i/route' +import { Route as MainTreeTreeIdIndexImport } from './routes/_main/tree/$treeId/index' +import { Route as MainTestTestIdIndexImport } from './routes/_main/test/$testId/index' +import { Route as MainIssueIssueIdIndexImport } from './routes/_main/issue/$issueId/index' +import { Route as MainHardwareHardwareIdIndexImport } from './routes/_main/hardware/$hardwareId/index' +import { Route as MainBuildBuildIdIndexImport } from './routes/_main/build/$buildId/index' +import { Route as MainalternativesIIndexImport } from './routes/_main/(alternatives)/i/index' +import { Route as MainalternativesTTestIdRouteImport } from './routes/_main/(alternatives)/t/$testId/route' +import { Route as MainalternativesIIssueIdRouteImport } from './routes/_main/(alternatives)/i/$issueId/route' +import { Route as MainalternativesBBuildIdRouteImport } from './routes/_main/(alternatives)/b/$buildId/route' +import { Route as MainTreeTreeNameBranchIndexImport } from './routes/_main/tree/$treeName/$branch/index' +import { Route as MainHardwareHardwareIdTestIndexImport } from './routes/_main/hardware/$hardwareId/test/index' +import { Route as MainHardwareHardwareIdBuildIndexImport } from './routes/_main/hardware/$hardwareId/build/index' +import { Route as MainHardwareHardwareIdBootIndexImport } from './routes/_main/hardware/$hardwareId/boot/index' +import { Route as MainalternativesTTestIdIndexImport } from './routes/_main/(alternatives)/t/$testId/index' +import { Route as MainalternativesIIssueIdIndexImport } from './routes/_main/(alternatives)/i/$issueId/index' +import { Route as MainalternativesBBuildIdIndexImport } from './routes/_main/(alternatives)/b/$buildId/index' +import { Route as MainTreeTreeIdTestTestIdIndexImport } from './routes/_main/tree/$treeId/test/$testId/index' +import { Route as MainTreeTreeIdBuildBuildIdIndexImport } from './routes/_main/tree/$treeId/build/$buildId/index' +import { Route as MainHardwareHardwareIdTestTestIdIndexImport } from './routes/_main/hardware/$hardwareId/test/$testId/index' +import { Route as MainHardwareHardwareIdBuildBuildIdIndexImport } from './routes/_main/hardware/$hardwareId/build/$buildId/index' +import { Route as MainHardwareHardwareIdBootBootIdIndexImport } from './routes/_main/hardware/$hardwareId/boot/$bootId/index' // Create/Update Routes -const TreeRouteRoute = TreeRouteImport.update({ +const MainRouteRoute = MainRouteImport.update({ + id: '/_main', + getParentRoute: () => rootRoute, +} as any) + +const MainIndexRoute = MainIndexImport.update({ + id: '/', + path: '/', + getParentRoute: () => MainRouteRoute, +} as any) + +const MainTreeRouteRoute = MainTreeRouteImport.update({ id: '/tree', path: '/tree', - getParentRoute: () => rootRoute, + getParentRoute: () => MainRouteRoute, } as any) -const IssueRouteRoute = IssueRouteImport.update({ +const MainIssueRouteRoute = MainIssueRouteImport.update({ id: '/issue', path: '/issue', - getParentRoute: () => rootRoute, + getParentRoute: () => MainRouteRoute, } as any) -const HardwareRouteRoute = HardwareRouteImport.update({ +const MainHardwareRouteRoute = MainHardwareRouteImport.update({ id: '/hardware', path: '/hardware', - getParentRoute: () => rootRoute, + getParentRoute: () => MainRouteRoute, } as any) -const IndexRoute = IndexImport.update({ +const MainTreeIndexRoute = MainTreeIndexImport.update({ id: '/', path: '/', - getParentRoute: () => rootRoute, + getParentRoute: () => MainTreeRouteRoute, } as any) -const TreeIndexRoute = TreeIndexImport.update({ +const MainIssueIndexRoute = MainIssueIndexImport.update({ id: '/', path: '/', - getParentRoute: () => TreeRouteRoute, + getParentRoute: () => MainIssueRouteRoute, } as any) -const IssueIndexRoute = IssueIndexImport.update({ +const MainHardwareIndexRoute = MainHardwareIndexImport.update({ id: '/', path: '/', - getParentRoute: () => IssueRouteRoute, + getParentRoute: () => MainHardwareRouteRoute, } as any) -const HardwareIndexRoute = HardwareIndexImport.update({ - id: '/', - path: '/', - getParentRoute: () => HardwareRouteRoute, -} as any) - -const TreeTreeIdRouteRoute = TreeTreeIdRouteImport.update({ +const MainTreeTreeIdRouteRoute = MainTreeTreeIdRouteImport.update({ id: '/$treeId', path: '/$treeId', - getParentRoute: () => TreeRouteRoute, + getParentRoute: () => MainTreeRouteRoute, } as any) -const TestTestIdRouteRoute = TestTestIdRouteImport.update({ +const MainTestTestIdRouteRoute = MainTestTestIdRouteImport.update({ id: '/test/$testId', path: '/test/$testId', - getParentRoute: () => rootRoute, + getParentRoute: () => MainRouteRoute, } as any) -const IssueIssueIdRouteRoute = IssueIssueIdRouteImport.update({ +const MainIssueIssueIdRouteRoute = MainIssueIssueIdRouteImport.update({ id: '/$issueId', path: '/$issueId', - getParentRoute: () => IssueRouteRoute, + getParentRoute: () => MainIssueRouteRoute, } as any) -const HardwareHardwareIdRouteRoute = HardwareHardwareIdRouteImport.update({ - id: '/$hardwareId', - path: '/$hardwareId', - getParentRoute: () => HardwareRouteRoute, -} as any) +const MainHardwareHardwareIdRouteRoute = + MainHardwareHardwareIdRouteImport.update({ + id: '/$hardwareId', + path: '/$hardwareId', + getParentRoute: () => MainHardwareRouteRoute, + } as any) -const BuildBuildIdRouteRoute = BuildBuildIdRouteImport.update({ +const MainBuildBuildIdRouteRoute = MainBuildBuildIdRouteImport.update({ id: '/build/$buildId', path: '/build/$buildId', - getParentRoute: () => rootRoute, + getParentRoute: () => MainRouteRoute, } as any) -const alternativesIRouteRoute = alternativesIRouteImport.update({ +const MainalternativesIRouteRoute = MainalternativesIRouteImport.update({ id: '/(alternatives)/i', path: '/i', - getParentRoute: () => rootRoute, + getParentRoute: () => MainRouteRoute, } as any) -const TreeTreeIdIndexRoute = TreeTreeIdIndexImport.update({ +const MainTreeTreeIdIndexRoute = MainTreeTreeIdIndexImport.update({ id: '/', path: '/', - getParentRoute: () => TreeTreeIdRouteRoute, + getParentRoute: () => MainTreeTreeIdRouteRoute, } as any) -const TestTestIdIndexRoute = TestTestIdIndexImport.update({ +const MainTestTestIdIndexRoute = MainTestTestIdIndexImport.update({ id: '/', path: '/', - getParentRoute: () => TestTestIdRouteRoute, + getParentRoute: () => MainTestTestIdRouteRoute, } as any) -const IssueIssueIdIndexRoute = IssueIssueIdIndexImport.update({ +const MainIssueIssueIdIndexRoute = MainIssueIssueIdIndexImport.update({ id: '/', path: '/', - getParentRoute: () => IssueIssueIdRouteRoute, + getParentRoute: () => MainIssueIssueIdRouteRoute, } as any) -const HardwareHardwareIdIndexRoute = HardwareHardwareIdIndexImport.update({ - id: '/', - path: '/', - getParentRoute: () => HardwareHardwareIdRouteRoute, -} as any) +const MainHardwareHardwareIdIndexRoute = + MainHardwareHardwareIdIndexImport.update({ + id: '/', + path: '/', + getParentRoute: () => MainHardwareHardwareIdRouteRoute, + } as any) -const BuildBuildIdIndexRoute = BuildBuildIdIndexImport.update({ +const MainBuildBuildIdIndexRoute = MainBuildBuildIdIndexImport.update({ id: '/', path: '/', - getParentRoute: () => BuildBuildIdRouteRoute, + getParentRoute: () => MainBuildBuildIdRouteRoute, } as any) -const alternativesIIndexRoute = alternativesIIndexImport.update({ +const MainalternativesIIndexRoute = MainalternativesIIndexImport.update({ id: '/', path: '/', - getParentRoute: () => alternativesIRouteRoute, + getParentRoute: () => MainalternativesIRouteRoute, } as any) -const HardwareHardwareIdTestRouteRoute = - HardwareHardwareIdTestRouteImport.update({ - id: '/test', - path: '/test', - getParentRoute: () => HardwareHardwareIdRouteRoute, +const MainalternativesTTestIdRouteRoute = + MainalternativesTTestIdRouteImport.update({ + id: '/(alternatives)/t/$testId', + path: '/t/$testId', + getParentRoute: () => MainRouteRoute, } as any) -const HardwareHardwareIdBuildRouteRoute = - HardwareHardwareIdBuildRouteImport.update({ - id: '/build', - path: '/build', - getParentRoute: () => HardwareHardwareIdRouteRoute, +const MainalternativesIIssueIdRouteRoute = + MainalternativesIIssueIdRouteImport.update({ + id: '/$issueId', + path: '/$issueId', + getParentRoute: () => MainalternativesIRouteRoute, } as any) -const HardwareHardwareIdBootRouteRoute = - HardwareHardwareIdBootRouteImport.update({ - id: '/boot', - path: '/boot', - getParentRoute: () => HardwareHardwareIdRouteRoute, +const MainalternativesBBuildIdRouteRoute = + MainalternativesBBuildIdRouteImport.update({ + id: '/(alternatives)/b/$buildId', + path: '/b/$buildId', + getParentRoute: () => MainRouteRoute, } as any) -const alternativesTTestIdRouteRoute = alternativesTTestIdRouteImport.update({ - id: '/(alternatives)/t/$testId', - path: '/t/$testId', - getParentRoute: () => rootRoute, -} as any) +const MainTreeTreeNameBranchIndexRoute = + MainTreeTreeNameBranchIndexImport.update({ + id: '/$treeName/$branch/', + path: '/$treeName/$branch/', + getParentRoute: () => MainTreeRouteRoute, + } as any) -const alternativesIIssueIdRouteRoute = alternativesIIssueIdRouteImport.update({ - id: '/$issueId', - path: '/$issueId', - getParentRoute: () => alternativesIRouteRoute, -} as any) +const MainHardwareHardwareIdTestIndexRoute = + MainHardwareHardwareIdTestIndexImport.update({ + id: '/test/', + path: '/test/', + getParentRoute: () => MainHardwareHardwareIdRouteRoute, + } as any) -const alternativesBBuildIdRouteRoute = alternativesBBuildIdRouteImport.update({ - id: '/(alternatives)/b/$buildId', - path: '/b/$buildId', - getParentRoute: () => rootRoute, -} as any) +const MainHardwareHardwareIdBuildIndexRoute = + MainHardwareHardwareIdBuildIndexImport.update({ + id: '/build/', + path: '/build/', + getParentRoute: () => MainHardwareHardwareIdRouteRoute, + } as any) -const TreeTreeNameBranchIndexRoute = TreeTreeNameBranchIndexImport.update({ - id: '/$treeName/$branch/', - path: '/$treeName/$branch/', - getParentRoute: () => TreeRouteRoute, -} as any) +const MainHardwareHardwareIdBootIndexRoute = + MainHardwareHardwareIdBootIndexImport.update({ + id: '/boot/', + path: '/boot/', + getParentRoute: () => MainHardwareHardwareIdRouteRoute, + } as any) -const HardwareHardwareIdTestIndexRoute = - HardwareHardwareIdTestIndexImport.update({ +const MainalternativesTTestIdIndexRoute = + MainalternativesTTestIdIndexImport.update({ id: '/', path: '/', - getParentRoute: () => HardwareHardwareIdTestRouteRoute, + getParentRoute: () => MainalternativesTTestIdRouteRoute, } as any) -const HardwareHardwareIdBuildIndexRoute = - HardwareHardwareIdBuildIndexImport.update({ +const MainalternativesIIssueIdIndexRoute = + MainalternativesIIssueIdIndexImport.update({ id: '/', path: '/', - getParentRoute: () => HardwareHardwareIdBuildRouteRoute, + getParentRoute: () => MainalternativesIIssueIdRouteRoute, } as any) -const HardwareHardwareIdBootIndexRoute = - HardwareHardwareIdBootIndexImport.update({ +const MainalternativesBBuildIdIndexRoute = + MainalternativesBBuildIdIndexImport.update({ id: '/', path: '/', - getParentRoute: () => HardwareHardwareIdBootRouteRoute, + getParentRoute: () => MainalternativesBBuildIdRouteRoute, } as any) -const alternativesTTestIdIndexRoute = alternativesTTestIdIndexImport.update({ - id: '/', - path: '/', - getParentRoute: () => alternativesTTestIdRouteRoute, -} as any) - -const alternativesIIssueIdIndexRoute = alternativesIIssueIdIndexImport.update({ - id: '/', - path: '/', - getParentRoute: () => alternativesIIssueIdRouteRoute, -} as any) - -const alternativesBBuildIdIndexRoute = alternativesBBuildIdIndexImport.update({ - id: '/', - path: '/', - getParentRoute: () => alternativesBBuildIdRouteRoute, -} as any) - -const TreeTreeIdTestTestIdRouteRoute = TreeTreeIdTestTestIdRouteImport.update({ - id: '/test/$testId', - path: '/test/$testId', - getParentRoute: () => TreeTreeIdRouteRoute, -} as any) - -const TreeTreeIdTestTestIdIndexRoute = TreeTreeIdTestTestIdIndexImport.update({ - id: '/', - path: '/', - getParentRoute: () => TreeTreeIdTestTestIdRouteRoute, -} as any) +const MainTreeTreeIdTestTestIdIndexRoute = + MainTreeTreeIdTestTestIdIndexImport.update({ + id: '/test/$testId/', + path: '/test/$testId/', + getParentRoute: () => MainTreeTreeIdRouteRoute, + } as any) -const TreeTreeIdBuildBuildIdIndexRoute = - TreeTreeIdBuildBuildIdIndexImport.update({ +const MainTreeTreeIdBuildBuildIdIndexRoute = + MainTreeTreeIdBuildBuildIdIndexImport.update({ id: '/build/$buildId/', path: '/build/$buildId/', - getParentRoute: () => TreeTreeIdRouteRoute, + getParentRoute: () => MainTreeTreeIdRouteRoute, } as any) -const HardwareHardwareIdTestTestIdIndexRoute = - HardwareHardwareIdTestTestIdIndexImport.update({ - id: '/$testId/', - path: '/$testId/', - getParentRoute: () => HardwareHardwareIdTestRouteRoute, +const MainHardwareHardwareIdTestTestIdIndexRoute = + MainHardwareHardwareIdTestTestIdIndexImport.update({ + id: '/test/$testId/', + path: '/test/$testId/', + getParentRoute: () => MainHardwareHardwareIdRouteRoute, } as any) -const HardwareHardwareIdBuildBuildIdIndexRoute = - HardwareHardwareIdBuildBuildIdIndexImport.update({ - id: '/$buildId/', - path: '/$buildId/', - getParentRoute: () => HardwareHardwareIdBuildRouteRoute, +const MainHardwareHardwareIdBuildBuildIdIndexRoute = + MainHardwareHardwareIdBuildBuildIdIndexImport.update({ + id: '/build/$buildId/', + path: '/build/$buildId/', + getParentRoute: () => MainHardwareHardwareIdRouteRoute, } as any) -const HardwareHardwareIdBootBootIdIndexRoute = - HardwareHardwareIdBootBootIdIndexImport.update({ - id: '/$bootId/', - path: '/$bootId/', - getParentRoute: () => HardwareHardwareIdBootRouteRoute, +const MainHardwareHardwareIdBootBootIdIndexRoute = + MainHardwareHardwareIdBootBootIdIndexImport.update({ + id: '/boot/$bootId/', + path: '/boot/$bootId/', + getParentRoute: () => MainHardwareHardwareIdRouteRoute, } as any) // Populate the FileRoutesByPath interface declare module '@tanstack/react-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexImport + '/_main': { + id: '/_main' + path: '' + fullPath: '' + preLoaderRoute: typeof MainRouteImport parentRoute: typeof rootRoute } - '/hardware': { - id: '/hardware' + '/_main/hardware': { + id: '/_main/hardware' path: '/hardware' fullPath: '/hardware' - preLoaderRoute: typeof HardwareRouteImport - parentRoute: typeof rootRoute + preLoaderRoute: typeof MainHardwareRouteImport + parentRoute: typeof MainRouteImport } - '/issue': { - id: '/issue' + '/_main/issue': { + id: '/_main/issue' path: '/issue' fullPath: '/issue' - preLoaderRoute: typeof IssueRouteImport - parentRoute: typeof rootRoute + preLoaderRoute: typeof MainIssueRouteImport + parentRoute: typeof MainRouteImport } - '/tree': { - id: '/tree' + '/_main/tree': { + id: '/_main/tree' path: '/tree' fullPath: '/tree' - preLoaderRoute: typeof TreeRouteImport - parentRoute: typeof rootRoute + preLoaderRoute: typeof MainTreeRouteImport + parentRoute: typeof MainRouteImport + } + '/_main/': { + id: '/_main/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof MainIndexImport + parentRoute: typeof MainRouteImport } - '/(alternatives)/i': { - id: '/(alternatives)/i' + '/_main/(alternatives)/i': { + id: '/_main/(alternatives)/i' path: '/i' fullPath: '/i' - preLoaderRoute: typeof alternativesIRouteImport - parentRoute: typeof rootRoute + preLoaderRoute: typeof MainalternativesIRouteImport + parentRoute: typeof MainRouteImport } - '/build/$buildId': { - id: '/build/$buildId' + '/_main/build/$buildId': { + id: '/_main/build/$buildId' path: '/build/$buildId' fullPath: '/build/$buildId' - preLoaderRoute: typeof BuildBuildIdRouteImport - parentRoute: typeof rootRoute + preLoaderRoute: typeof MainBuildBuildIdRouteImport + parentRoute: typeof MainRouteImport } - '/hardware/$hardwareId': { - id: '/hardware/$hardwareId' + '/_main/hardware/$hardwareId': { + id: '/_main/hardware/$hardwareId' path: '/$hardwareId' fullPath: '/hardware/$hardwareId' - preLoaderRoute: typeof HardwareHardwareIdRouteImport - parentRoute: typeof HardwareRouteImport + preLoaderRoute: typeof MainHardwareHardwareIdRouteImport + parentRoute: typeof MainHardwareRouteImport } - '/issue/$issueId': { - id: '/issue/$issueId' + '/_main/issue/$issueId': { + id: '/_main/issue/$issueId' path: '/$issueId' fullPath: '/issue/$issueId' - preLoaderRoute: typeof IssueIssueIdRouteImport - parentRoute: typeof IssueRouteImport + preLoaderRoute: typeof MainIssueIssueIdRouteImport + parentRoute: typeof MainIssueRouteImport } - '/test/$testId': { - id: '/test/$testId' + '/_main/test/$testId': { + id: '/_main/test/$testId' path: '/test/$testId' fullPath: '/test/$testId' - preLoaderRoute: typeof TestTestIdRouteImport - parentRoute: typeof rootRoute + preLoaderRoute: typeof MainTestTestIdRouteImport + parentRoute: typeof MainRouteImport } - '/tree/$treeId': { - id: '/tree/$treeId' + '/_main/tree/$treeId': { + id: '/_main/tree/$treeId' path: '/$treeId' fullPath: '/tree/$treeId' - preLoaderRoute: typeof TreeTreeIdRouteImport - parentRoute: typeof TreeRouteImport + preLoaderRoute: typeof MainTreeTreeIdRouteImport + parentRoute: typeof MainTreeRouteImport } - '/hardware/': { - id: '/hardware/' + '/_main/hardware/': { + id: '/_main/hardware/' path: '/' fullPath: '/hardware/' - preLoaderRoute: typeof HardwareIndexImport - parentRoute: typeof HardwareRouteImport + preLoaderRoute: typeof MainHardwareIndexImport + parentRoute: typeof MainHardwareRouteImport } - '/issue/': { - id: '/issue/' + '/_main/issue/': { + id: '/_main/issue/' path: '/' fullPath: '/issue/' - preLoaderRoute: typeof IssueIndexImport - parentRoute: typeof IssueRouteImport + preLoaderRoute: typeof MainIssueIndexImport + parentRoute: typeof MainIssueRouteImport } - '/tree/': { - id: '/tree/' + '/_main/tree/': { + id: '/_main/tree/' path: '/' fullPath: '/tree/' - preLoaderRoute: typeof TreeIndexImport - parentRoute: typeof TreeRouteImport + preLoaderRoute: typeof MainTreeIndexImport + parentRoute: typeof MainTreeRouteImport } - '/(alternatives)/b/$buildId': { - id: '/(alternatives)/b/$buildId' + '/_main/(alternatives)/b/$buildId': { + id: '/_main/(alternatives)/b/$buildId' path: '/b/$buildId' fullPath: '/b/$buildId' - preLoaderRoute: typeof alternativesBBuildIdRouteImport - parentRoute: typeof rootRoute + preLoaderRoute: typeof MainalternativesBBuildIdRouteImport + parentRoute: typeof MainRouteImport } - '/(alternatives)/i/$issueId': { - id: '/(alternatives)/i/$issueId' + '/_main/(alternatives)/i/$issueId': { + id: '/_main/(alternatives)/i/$issueId' path: '/$issueId' fullPath: '/i/$issueId' - preLoaderRoute: typeof alternativesIIssueIdRouteImport - parentRoute: typeof alternativesIRouteImport + preLoaderRoute: typeof MainalternativesIIssueIdRouteImport + parentRoute: typeof MainalternativesIRouteImport } - '/(alternatives)/t/$testId': { - id: '/(alternatives)/t/$testId' + '/_main/(alternatives)/t/$testId': { + id: '/_main/(alternatives)/t/$testId' path: '/t/$testId' fullPath: '/t/$testId' - preLoaderRoute: typeof alternativesTTestIdRouteImport - parentRoute: typeof rootRoute - } - '/hardware/$hardwareId/boot': { - id: '/hardware/$hardwareId/boot' - path: '/boot' - fullPath: '/hardware/$hardwareId/boot' - preLoaderRoute: typeof HardwareHardwareIdBootRouteImport - parentRoute: typeof HardwareHardwareIdRouteImport - } - '/hardware/$hardwareId/build': { - id: '/hardware/$hardwareId/build' - path: '/build' - fullPath: '/hardware/$hardwareId/build' - preLoaderRoute: typeof HardwareHardwareIdBuildRouteImport - parentRoute: typeof HardwareHardwareIdRouteImport - } - '/hardware/$hardwareId/test': { - id: '/hardware/$hardwareId/test' - path: '/test' - fullPath: '/hardware/$hardwareId/test' - preLoaderRoute: typeof HardwareHardwareIdTestRouteImport - parentRoute: typeof HardwareHardwareIdRouteImport + preLoaderRoute: typeof MainalternativesTTestIdRouteImport + parentRoute: typeof MainRouteImport } - '/(alternatives)/i/': { - id: '/(alternatives)/i/' + '/_main/(alternatives)/i/': { + id: '/_main/(alternatives)/i/' path: '/' fullPath: '/i/' - preLoaderRoute: typeof alternativesIIndexImport - parentRoute: typeof alternativesIRouteImport + preLoaderRoute: typeof MainalternativesIIndexImport + parentRoute: typeof MainalternativesIRouteImport } - '/build/$buildId/': { - id: '/build/$buildId/' + '/_main/build/$buildId/': { + id: '/_main/build/$buildId/' path: '/' fullPath: '/build/$buildId/' - preLoaderRoute: typeof BuildBuildIdIndexImport - parentRoute: typeof BuildBuildIdRouteImport + preLoaderRoute: typeof MainBuildBuildIdIndexImport + parentRoute: typeof MainBuildBuildIdRouteImport } - '/hardware/$hardwareId/': { - id: '/hardware/$hardwareId/' + '/_main/hardware/$hardwareId/': { + id: '/_main/hardware/$hardwareId/' path: '/' fullPath: '/hardware/$hardwareId/' - preLoaderRoute: typeof HardwareHardwareIdIndexImport - parentRoute: typeof HardwareHardwareIdRouteImport + preLoaderRoute: typeof MainHardwareHardwareIdIndexImport + parentRoute: typeof MainHardwareHardwareIdRouteImport } - '/issue/$issueId/': { - id: '/issue/$issueId/' + '/_main/issue/$issueId/': { + id: '/_main/issue/$issueId/' path: '/' fullPath: '/issue/$issueId/' - preLoaderRoute: typeof IssueIssueIdIndexImport - parentRoute: typeof IssueIssueIdRouteImport + preLoaderRoute: typeof MainIssueIssueIdIndexImport + parentRoute: typeof MainIssueIssueIdRouteImport } - '/test/$testId/': { - id: '/test/$testId/' + '/_main/test/$testId/': { + id: '/_main/test/$testId/' path: '/' fullPath: '/test/$testId/' - preLoaderRoute: typeof TestTestIdIndexImport - parentRoute: typeof TestTestIdRouteImport + preLoaderRoute: typeof MainTestTestIdIndexImport + parentRoute: typeof MainTestTestIdRouteImport } - '/tree/$treeId/': { - id: '/tree/$treeId/' + '/_main/tree/$treeId/': { + id: '/_main/tree/$treeId/' path: '/' fullPath: '/tree/$treeId/' - preLoaderRoute: typeof TreeTreeIdIndexImport - parentRoute: typeof TreeTreeIdRouteImport + preLoaderRoute: typeof MainTreeTreeIdIndexImport + parentRoute: typeof MainTreeTreeIdRouteImport } - '/tree/$treeId/test/$testId': { - id: '/tree/$treeId/test/$testId' - path: '/test/$testId' - fullPath: '/tree/$treeId/test/$testId' - preLoaderRoute: typeof TreeTreeIdTestTestIdRouteImport - parentRoute: typeof TreeTreeIdRouteImport - } - '/(alternatives)/b/$buildId/': { - id: '/(alternatives)/b/$buildId/' + '/_main/(alternatives)/b/$buildId/': { + id: '/_main/(alternatives)/b/$buildId/' path: '/' fullPath: '/b/$buildId/' - preLoaderRoute: typeof alternativesBBuildIdIndexImport - parentRoute: typeof alternativesBBuildIdRouteImport + preLoaderRoute: typeof MainalternativesBBuildIdIndexImport + parentRoute: typeof MainalternativesBBuildIdRouteImport } - '/(alternatives)/i/$issueId/': { - id: '/(alternatives)/i/$issueId/' + '/_main/(alternatives)/i/$issueId/': { + id: '/_main/(alternatives)/i/$issueId/' path: '/' fullPath: '/i/$issueId/' - preLoaderRoute: typeof alternativesIIssueIdIndexImport - parentRoute: typeof alternativesIIssueIdRouteImport + preLoaderRoute: typeof MainalternativesIIssueIdIndexImport + parentRoute: typeof MainalternativesIIssueIdRouteImport } - '/(alternatives)/t/$testId/': { - id: '/(alternatives)/t/$testId/' + '/_main/(alternatives)/t/$testId/': { + id: '/_main/(alternatives)/t/$testId/' path: '/' fullPath: '/t/$testId/' - preLoaderRoute: typeof alternativesTTestIdIndexImport - parentRoute: typeof alternativesTTestIdRouteImport + preLoaderRoute: typeof MainalternativesTTestIdIndexImport + parentRoute: typeof MainalternativesTTestIdRouteImport } - '/hardware/$hardwareId/boot/': { - id: '/hardware/$hardwareId/boot/' - path: '/' - fullPath: '/hardware/$hardwareId/boot/' - preLoaderRoute: typeof HardwareHardwareIdBootIndexImport - parentRoute: typeof HardwareHardwareIdBootRouteImport + '/_main/hardware/$hardwareId/boot/': { + id: '/_main/hardware/$hardwareId/boot/' + path: '/boot' + fullPath: '/hardware/$hardwareId/boot' + preLoaderRoute: typeof MainHardwareHardwareIdBootIndexImport + parentRoute: typeof MainHardwareHardwareIdRouteImport } - '/hardware/$hardwareId/build/': { - id: '/hardware/$hardwareId/build/' - path: '/' - fullPath: '/hardware/$hardwareId/build/' - preLoaderRoute: typeof HardwareHardwareIdBuildIndexImport - parentRoute: typeof HardwareHardwareIdBuildRouteImport + '/_main/hardware/$hardwareId/build/': { + id: '/_main/hardware/$hardwareId/build/' + path: '/build' + fullPath: '/hardware/$hardwareId/build' + preLoaderRoute: typeof MainHardwareHardwareIdBuildIndexImport + parentRoute: typeof MainHardwareHardwareIdRouteImport } - '/hardware/$hardwareId/test/': { - id: '/hardware/$hardwareId/test/' - path: '/' - fullPath: '/hardware/$hardwareId/test/' - preLoaderRoute: typeof HardwareHardwareIdTestIndexImport - parentRoute: typeof HardwareHardwareIdTestRouteImport + '/_main/hardware/$hardwareId/test/': { + id: '/_main/hardware/$hardwareId/test/' + path: '/test' + fullPath: '/hardware/$hardwareId/test' + preLoaderRoute: typeof MainHardwareHardwareIdTestIndexImport + parentRoute: typeof MainHardwareHardwareIdRouteImport } - '/tree/$treeName/$branch/': { - id: '/tree/$treeName/$branch/' + '/_main/tree/$treeName/$branch/': { + id: '/_main/tree/$treeName/$branch/' path: '/$treeName/$branch' fullPath: '/tree/$treeName/$branch' - preLoaderRoute: typeof TreeTreeNameBranchIndexImport - parentRoute: typeof TreeRouteImport + preLoaderRoute: typeof MainTreeTreeNameBranchIndexImport + parentRoute: typeof MainTreeRouteImport } - '/hardware/$hardwareId/boot/$bootId/': { - id: '/hardware/$hardwareId/boot/$bootId/' - path: '/$bootId' + '/_main/hardware/$hardwareId/boot/$bootId/': { + id: '/_main/hardware/$hardwareId/boot/$bootId/' + path: '/boot/$bootId' fullPath: '/hardware/$hardwareId/boot/$bootId' - preLoaderRoute: typeof HardwareHardwareIdBootBootIdIndexImport - parentRoute: typeof HardwareHardwareIdBootRouteImport + preLoaderRoute: typeof MainHardwareHardwareIdBootBootIdIndexImport + parentRoute: typeof MainHardwareHardwareIdRouteImport } - '/hardware/$hardwareId/build/$buildId/': { - id: '/hardware/$hardwareId/build/$buildId/' - path: '/$buildId' + '/_main/hardware/$hardwareId/build/$buildId/': { + id: '/_main/hardware/$hardwareId/build/$buildId/' + path: '/build/$buildId' fullPath: '/hardware/$hardwareId/build/$buildId' - preLoaderRoute: typeof HardwareHardwareIdBuildBuildIdIndexImport - parentRoute: typeof HardwareHardwareIdBuildRouteImport + preLoaderRoute: typeof MainHardwareHardwareIdBuildBuildIdIndexImport + parentRoute: typeof MainHardwareHardwareIdRouteImport } - '/hardware/$hardwareId/test/$testId/': { - id: '/hardware/$hardwareId/test/$testId/' - path: '/$testId' + '/_main/hardware/$hardwareId/test/$testId/': { + id: '/_main/hardware/$hardwareId/test/$testId/' + path: '/test/$testId' fullPath: '/hardware/$hardwareId/test/$testId' - preLoaderRoute: typeof HardwareHardwareIdTestTestIdIndexImport - parentRoute: typeof HardwareHardwareIdTestRouteImport + preLoaderRoute: typeof MainHardwareHardwareIdTestTestIdIndexImport + parentRoute: typeof MainHardwareHardwareIdRouteImport } - '/tree/$treeId/build/$buildId/': { - id: '/tree/$treeId/build/$buildId/' + '/_main/tree/$treeId/build/$buildId/': { + id: '/_main/tree/$treeId/build/$buildId/' path: '/build/$buildId' fullPath: '/tree/$treeId/build/$buildId' - preLoaderRoute: typeof TreeTreeIdBuildBuildIdIndexImport - parentRoute: typeof TreeTreeIdRouteImport + preLoaderRoute: typeof MainTreeTreeIdBuildBuildIdIndexImport + parentRoute: typeof MainTreeTreeIdRouteImport } - '/tree/$treeId/test/$testId/': { - id: '/tree/$treeId/test/$testId/' - path: '/' - fullPath: '/tree/$treeId/test/$testId/' - preLoaderRoute: typeof TreeTreeIdTestTestIdIndexImport - parentRoute: typeof TreeTreeIdTestTestIdRouteImport + '/_main/tree/$treeId/test/$testId/': { + id: '/_main/tree/$treeId/test/$testId/' + path: '/test/$testId' + fullPath: '/tree/$treeId/test/$testId' + preLoaderRoute: typeof MainTreeTreeIdTestTestIdIndexImport + parentRoute: typeof MainTreeTreeIdRouteImport } } } // Create and export the route tree -interface HardwareHardwareIdBootRouteRouteChildren { - HardwareHardwareIdBootIndexRoute: typeof HardwareHardwareIdBootIndexRoute - HardwareHardwareIdBootBootIdIndexRoute: typeof HardwareHardwareIdBootBootIdIndexRoute +interface MainHardwareHardwareIdRouteRouteChildren { + MainHardwareHardwareIdIndexRoute: typeof MainHardwareHardwareIdIndexRoute + MainHardwareHardwareIdBootIndexRoute: typeof MainHardwareHardwareIdBootIndexRoute + MainHardwareHardwareIdBuildIndexRoute: typeof MainHardwareHardwareIdBuildIndexRoute + MainHardwareHardwareIdTestIndexRoute: typeof MainHardwareHardwareIdTestIndexRoute + MainHardwareHardwareIdBootBootIdIndexRoute: typeof MainHardwareHardwareIdBootBootIdIndexRoute + MainHardwareHardwareIdBuildBuildIdIndexRoute: typeof MainHardwareHardwareIdBuildBuildIdIndexRoute + MainHardwareHardwareIdTestTestIdIndexRoute: typeof MainHardwareHardwareIdTestTestIdIndexRoute } -const HardwareHardwareIdBootRouteRouteChildren: HardwareHardwareIdBootRouteRouteChildren = +const MainHardwareHardwareIdRouteRouteChildren: MainHardwareHardwareIdRouteRouteChildren = { - HardwareHardwareIdBootIndexRoute: HardwareHardwareIdBootIndexRoute, - HardwareHardwareIdBootBootIdIndexRoute: - HardwareHardwareIdBootBootIdIndexRoute, + MainHardwareHardwareIdIndexRoute: MainHardwareHardwareIdIndexRoute, + MainHardwareHardwareIdBootIndexRoute: MainHardwareHardwareIdBootIndexRoute, + MainHardwareHardwareIdBuildIndexRoute: + MainHardwareHardwareIdBuildIndexRoute, + MainHardwareHardwareIdTestIndexRoute: MainHardwareHardwareIdTestIndexRoute, + MainHardwareHardwareIdBootBootIdIndexRoute: + MainHardwareHardwareIdBootBootIdIndexRoute, + MainHardwareHardwareIdBuildBuildIdIndexRoute: + MainHardwareHardwareIdBuildBuildIdIndexRoute, + MainHardwareHardwareIdTestTestIdIndexRoute: + MainHardwareHardwareIdTestTestIdIndexRoute, } -const HardwareHardwareIdBootRouteRouteWithChildren = - HardwareHardwareIdBootRouteRoute._addFileChildren( - HardwareHardwareIdBootRouteRouteChildren, +const MainHardwareHardwareIdRouteRouteWithChildren = + MainHardwareHardwareIdRouteRoute._addFileChildren( + MainHardwareHardwareIdRouteRouteChildren, ) -interface HardwareHardwareIdBuildRouteRouteChildren { - HardwareHardwareIdBuildIndexRoute: typeof HardwareHardwareIdBuildIndexRoute - HardwareHardwareIdBuildBuildIdIndexRoute: typeof HardwareHardwareIdBuildBuildIdIndexRoute +interface MainHardwareRouteRouteChildren { + MainHardwareHardwareIdRouteRoute: typeof MainHardwareHardwareIdRouteRouteWithChildren + MainHardwareIndexRoute: typeof MainHardwareIndexRoute } -const HardwareHardwareIdBuildRouteRouteChildren: HardwareHardwareIdBuildRouteRouteChildren = - { - HardwareHardwareIdBuildIndexRoute: HardwareHardwareIdBuildIndexRoute, - HardwareHardwareIdBuildBuildIdIndexRoute: - HardwareHardwareIdBuildBuildIdIndexRoute, - } - -const HardwareHardwareIdBuildRouteRouteWithChildren = - HardwareHardwareIdBuildRouteRoute._addFileChildren( - HardwareHardwareIdBuildRouteRouteChildren, - ) - -interface HardwareHardwareIdTestRouteRouteChildren { - HardwareHardwareIdTestIndexRoute: typeof HardwareHardwareIdTestIndexRoute - HardwareHardwareIdTestTestIdIndexRoute: typeof HardwareHardwareIdTestTestIdIndexRoute +const MainHardwareRouteRouteChildren: MainHardwareRouteRouteChildren = { + MainHardwareHardwareIdRouteRoute: + MainHardwareHardwareIdRouteRouteWithChildren, + MainHardwareIndexRoute: MainHardwareIndexRoute, } -const HardwareHardwareIdTestRouteRouteChildren: HardwareHardwareIdTestRouteRouteChildren = - { - HardwareHardwareIdTestIndexRoute: HardwareHardwareIdTestIndexRoute, - HardwareHardwareIdTestTestIdIndexRoute: - HardwareHardwareIdTestTestIdIndexRoute, - } +const MainHardwareRouteRouteWithChildren = + MainHardwareRouteRoute._addFileChildren(MainHardwareRouteRouteChildren) -const HardwareHardwareIdTestRouteRouteWithChildren = - HardwareHardwareIdTestRouteRoute._addFileChildren( - HardwareHardwareIdTestRouteRouteChildren, - ) - -interface HardwareHardwareIdRouteRouteChildren { - HardwareHardwareIdBootRouteRoute: typeof HardwareHardwareIdBootRouteRouteWithChildren - HardwareHardwareIdBuildRouteRoute: typeof HardwareHardwareIdBuildRouteRouteWithChildren - HardwareHardwareIdTestRouteRoute: typeof HardwareHardwareIdTestRouteRouteWithChildren - HardwareHardwareIdIndexRoute: typeof HardwareHardwareIdIndexRoute +interface MainIssueIssueIdRouteRouteChildren { + MainIssueIssueIdIndexRoute: typeof MainIssueIssueIdIndexRoute } -const HardwareHardwareIdRouteRouteChildren: HardwareHardwareIdRouteRouteChildren = - { - HardwareHardwareIdBootRouteRoute: - HardwareHardwareIdBootRouteRouteWithChildren, - HardwareHardwareIdBuildRouteRoute: - HardwareHardwareIdBuildRouteRouteWithChildren, - HardwareHardwareIdTestRouteRoute: - HardwareHardwareIdTestRouteRouteWithChildren, - HardwareHardwareIdIndexRoute: HardwareHardwareIdIndexRoute, - } +const MainIssueIssueIdRouteRouteChildren: MainIssueIssueIdRouteRouteChildren = { + MainIssueIssueIdIndexRoute: MainIssueIssueIdIndexRoute, +} -const HardwareHardwareIdRouteRouteWithChildren = - HardwareHardwareIdRouteRoute._addFileChildren( - HardwareHardwareIdRouteRouteChildren, +const MainIssueIssueIdRouteRouteWithChildren = + MainIssueIssueIdRouteRoute._addFileChildren( + MainIssueIssueIdRouteRouteChildren, ) -interface HardwareRouteRouteChildren { - HardwareHardwareIdRouteRoute: typeof HardwareHardwareIdRouteRouteWithChildren - HardwareIndexRoute: typeof HardwareIndexRoute +interface MainIssueRouteRouteChildren { + MainIssueIssueIdRouteRoute: typeof MainIssueIssueIdRouteRouteWithChildren + MainIssueIndexRoute: typeof MainIssueIndexRoute } -const HardwareRouteRouteChildren: HardwareRouteRouteChildren = { - HardwareHardwareIdRouteRoute: HardwareHardwareIdRouteRouteWithChildren, - HardwareIndexRoute: HardwareIndexRoute, +const MainIssueRouteRouteChildren: MainIssueRouteRouteChildren = { + MainIssueIssueIdRouteRoute: MainIssueIssueIdRouteRouteWithChildren, + MainIssueIndexRoute: MainIssueIndexRoute, } -const HardwareRouteRouteWithChildren = HardwareRouteRoute._addFileChildren( - HardwareRouteRouteChildren, +const MainIssueRouteRouteWithChildren = MainIssueRouteRoute._addFileChildren( + MainIssueRouteRouteChildren, ) -interface IssueIssueIdRouteRouteChildren { - IssueIssueIdIndexRoute: typeof IssueIssueIdIndexRoute +interface MainTreeTreeIdRouteRouteChildren { + MainTreeTreeIdIndexRoute: typeof MainTreeTreeIdIndexRoute + MainTreeTreeIdBuildBuildIdIndexRoute: typeof MainTreeTreeIdBuildBuildIdIndexRoute + MainTreeTreeIdTestTestIdIndexRoute: typeof MainTreeTreeIdTestTestIdIndexRoute } -const IssueIssueIdRouteRouteChildren: IssueIssueIdRouteRouteChildren = { - IssueIssueIdIndexRoute: IssueIssueIdIndexRoute, +const MainTreeTreeIdRouteRouteChildren: MainTreeTreeIdRouteRouteChildren = { + MainTreeTreeIdIndexRoute: MainTreeTreeIdIndexRoute, + MainTreeTreeIdBuildBuildIdIndexRoute: MainTreeTreeIdBuildBuildIdIndexRoute, + MainTreeTreeIdTestTestIdIndexRoute: MainTreeTreeIdTestTestIdIndexRoute, } -const IssueIssueIdRouteRouteWithChildren = - IssueIssueIdRouteRoute._addFileChildren(IssueIssueIdRouteRouteChildren) +const MainTreeTreeIdRouteRouteWithChildren = + MainTreeTreeIdRouteRoute._addFileChildren(MainTreeTreeIdRouteRouteChildren) -interface IssueRouteRouteChildren { - IssueIssueIdRouteRoute: typeof IssueIssueIdRouteRouteWithChildren - IssueIndexRoute: typeof IssueIndexRoute +interface MainTreeRouteRouteChildren { + MainTreeTreeIdRouteRoute: typeof MainTreeTreeIdRouteRouteWithChildren + MainTreeIndexRoute: typeof MainTreeIndexRoute + MainTreeTreeNameBranchIndexRoute: typeof MainTreeTreeNameBranchIndexRoute } -const IssueRouteRouteChildren: IssueRouteRouteChildren = { - IssueIssueIdRouteRoute: IssueIssueIdRouteRouteWithChildren, - IssueIndexRoute: IssueIndexRoute, +const MainTreeRouteRouteChildren: MainTreeRouteRouteChildren = { + MainTreeTreeIdRouteRoute: MainTreeTreeIdRouteRouteWithChildren, + MainTreeIndexRoute: MainTreeIndexRoute, + MainTreeTreeNameBranchIndexRoute: MainTreeTreeNameBranchIndexRoute, } -const IssueRouteRouteWithChildren = IssueRouteRoute._addFileChildren( - IssueRouteRouteChildren, +const MainTreeRouteRouteWithChildren = MainTreeRouteRoute._addFileChildren( + MainTreeRouteRouteChildren, ) -interface TreeTreeIdTestTestIdRouteRouteChildren { - TreeTreeIdTestTestIdIndexRoute: typeof TreeTreeIdTestTestIdIndexRoute +interface MainalternativesIIssueIdRouteRouteChildren { + MainalternativesIIssueIdIndexRoute: typeof MainalternativesIIssueIdIndexRoute } -const TreeTreeIdTestTestIdRouteRouteChildren: TreeTreeIdTestTestIdRouteRouteChildren = +const MainalternativesIIssueIdRouteRouteChildren: MainalternativesIIssueIdRouteRouteChildren = { - TreeTreeIdTestTestIdIndexRoute: TreeTreeIdTestTestIdIndexRoute, + MainalternativesIIssueIdIndexRoute: MainalternativesIIssueIdIndexRoute, } -const TreeTreeIdTestTestIdRouteRouteWithChildren = - TreeTreeIdTestTestIdRouteRoute._addFileChildren( - TreeTreeIdTestTestIdRouteRouteChildren, +const MainalternativesIIssueIdRouteRouteWithChildren = + MainalternativesIIssueIdRouteRoute._addFileChildren( + MainalternativesIIssueIdRouteRouteChildren, ) -interface TreeTreeIdRouteRouteChildren { - TreeTreeIdIndexRoute: typeof TreeTreeIdIndexRoute - TreeTreeIdTestTestIdRouteRoute: typeof TreeTreeIdTestTestIdRouteRouteWithChildren - TreeTreeIdBuildBuildIdIndexRoute: typeof TreeTreeIdBuildBuildIdIndexRoute +interface MainalternativesIRouteRouteChildren { + MainalternativesIIssueIdRouteRoute: typeof MainalternativesIIssueIdRouteRouteWithChildren + MainalternativesIIndexRoute: typeof MainalternativesIIndexRoute } -const TreeTreeIdRouteRouteChildren: TreeTreeIdRouteRouteChildren = { - TreeTreeIdIndexRoute: TreeTreeIdIndexRoute, - TreeTreeIdTestTestIdRouteRoute: TreeTreeIdTestTestIdRouteRouteWithChildren, - TreeTreeIdBuildBuildIdIndexRoute: TreeTreeIdBuildBuildIdIndexRoute, -} - -const TreeTreeIdRouteRouteWithChildren = TreeTreeIdRouteRoute._addFileChildren( - TreeTreeIdRouteRouteChildren, -) - -interface TreeRouteRouteChildren { - TreeTreeIdRouteRoute: typeof TreeTreeIdRouteRouteWithChildren - TreeIndexRoute: typeof TreeIndexRoute - TreeTreeNameBranchIndexRoute: typeof TreeTreeNameBranchIndexRoute -} - -const TreeRouteRouteChildren: TreeRouteRouteChildren = { - TreeTreeIdRouteRoute: TreeTreeIdRouteRouteWithChildren, - TreeIndexRoute: TreeIndexRoute, - TreeTreeNameBranchIndexRoute: TreeTreeNameBranchIndexRoute, -} - -const TreeRouteRouteWithChildren = TreeRouteRoute._addFileChildren( - TreeRouteRouteChildren, -) - -interface alternativesIIssueIdRouteRouteChildren { - alternativesIIssueIdIndexRoute: typeof alternativesIIssueIdIndexRoute -} - -const alternativesIIssueIdRouteRouteChildren: alternativesIIssueIdRouteRouteChildren = +const MainalternativesIRouteRouteChildren: MainalternativesIRouteRouteChildren = { - alternativesIIssueIdIndexRoute: alternativesIIssueIdIndexRoute, + MainalternativesIIssueIdRouteRoute: + MainalternativesIIssueIdRouteRouteWithChildren, + MainalternativesIIndexRoute: MainalternativesIIndexRoute, } -const alternativesIIssueIdRouteRouteWithChildren = - alternativesIIssueIdRouteRoute._addFileChildren( - alternativesIIssueIdRouteRouteChildren, +const MainalternativesIRouteRouteWithChildren = + MainalternativesIRouteRoute._addFileChildren( + MainalternativesIRouteRouteChildren, ) -interface alternativesIRouteRouteChildren { - alternativesIIssueIdRouteRoute: typeof alternativesIIssueIdRouteRouteWithChildren - alternativesIIndexRoute: typeof alternativesIIndexRoute +interface MainBuildBuildIdRouteRouteChildren { + MainBuildBuildIdIndexRoute: typeof MainBuildBuildIdIndexRoute } -const alternativesIRouteRouteChildren: alternativesIRouteRouteChildren = { - alternativesIIssueIdRouteRoute: alternativesIIssueIdRouteRouteWithChildren, - alternativesIIndexRoute: alternativesIIndexRoute, +const MainBuildBuildIdRouteRouteChildren: MainBuildBuildIdRouteRouteChildren = { + MainBuildBuildIdIndexRoute: MainBuildBuildIdIndexRoute, } -const alternativesIRouteRouteWithChildren = - alternativesIRouteRoute._addFileChildren(alternativesIRouteRouteChildren) +const MainBuildBuildIdRouteRouteWithChildren = + MainBuildBuildIdRouteRoute._addFileChildren( + MainBuildBuildIdRouteRouteChildren, + ) -interface BuildBuildIdRouteRouteChildren { - BuildBuildIdIndexRoute: typeof BuildBuildIdIndexRoute +interface MainTestTestIdRouteRouteChildren { + MainTestTestIdIndexRoute: typeof MainTestTestIdIndexRoute } -const BuildBuildIdRouteRouteChildren: BuildBuildIdRouteRouteChildren = { - BuildBuildIdIndexRoute: BuildBuildIdIndexRoute, +const MainTestTestIdRouteRouteChildren: MainTestTestIdRouteRouteChildren = { + MainTestTestIdIndexRoute: MainTestTestIdIndexRoute, } -const BuildBuildIdRouteRouteWithChildren = - BuildBuildIdRouteRoute._addFileChildren(BuildBuildIdRouteRouteChildren) +const MainTestTestIdRouteRouteWithChildren = + MainTestTestIdRouteRoute._addFileChildren(MainTestTestIdRouteRouteChildren) -interface TestTestIdRouteRouteChildren { - TestTestIdIndexRoute: typeof TestTestIdIndexRoute +interface MainalternativesBBuildIdRouteRouteChildren { + MainalternativesBBuildIdIndexRoute: typeof MainalternativesBBuildIdIndexRoute } -const TestTestIdRouteRouteChildren: TestTestIdRouteRouteChildren = { - TestTestIdIndexRoute: TestTestIdIndexRoute, -} +const MainalternativesBBuildIdRouteRouteChildren: MainalternativesBBuildIdRouteRouteChildren = + { + MainalternativesBBuildIdIndexRoute: MainalternativesBBuildIdIndexRoute, + } -const TestTestIdRouteRouteWithChildren = TestTestIdRouteRoute._addFileChildren( - TestTestIdRouteRouteChildren, -) +const MainalternativesBBuildIdRouteRouteWithChildren = + MainalternativesBBuildIdRouteRoute._addFileChildren( + MainalternativesBBuildIdRouteRouteChildren, + ) -interface alternativesBBuildIdRouteRouteChildren { - alternativesBBuildIdIndexRoute: typeof alternativesBBuildIdIndexRoute +interface MainalternativesTTestIdRouteRouteChildren { + MainalternativesTTestIdIndexRoute: typeof MainalternativesTTestIdIndexRoute } -const alternativesBBuildIdRouteRouteChildren: alternativesBBuildIdRouteRouteChildren = +const MainalternativesTTestIdRouteRouteChildren: MainalternativesTTestIdRouteRouteChildren = { - alternativesBBuildIdIndexRoute: alternativesBBuildIdIndexRoute, + MainalternativesTTestIdIndexRoute: MainalternativesTTestIdIndexRoute, } -const alternativesBBuildIdRouteRouteWithChildren = - alternativesBBuildIdRouteRoute._addFileChildren( - alternativesBBuildIdRouteRouteChildren, +const MainalternativesTTestIdRouteRouteWithChildren = + MainalternativesTTestIdRouteRoute._addFileChildren( + MainalternativesTTestIdRouteRouteChildren, ) -interface alternativesTTestIdRouteRouteChildren { - alternativesTTestIdIndexRoute: typeof alternativesTTestIdIndexRoute +interface MainRouteRouteChildren { + MainHardwareRouteRoute: typeof MainHardwareRouteRouteWithChildren + MainIssueRouteRoute: typeof MainIssueRouteRouteWithChildren + MainTreeRouteRoute: typeof MainTreeRouteRouteWithChildren + MainIndexRoute: typeof MainIndexRoute + MainalternativesIRouteRoute: typeof MainalternativesIRouteRouteWithChildren + MainBuildBuildIdRouteRoute: typeof MainBuildBuildIdRouteRouteWithChildren + MainTestTestIdRouteRoute: typeof MainTestTestIdRouteRouteWithChildren + MainalternativesBBuildIdRouteRoute: typeof MainalternativesBBuildIdRouteRouteWithChildren + MainalternativesTTestIdRouteRoute: typeof MainalternativesTTestIdRouteRouteWithChildren } -const alternativesTTestIdRouteRouteChildren: alternativesTTestIdRouteRouteChildren = - { - alternativesTTestIdIndexRoute: alternativesTTestIdIndexRoute, - } +const MainRouteRouteChildren: MainRouteRouteChildren = { + MainHardwareRouteRoute: MainHardwareRouteRouteWithChildren, + MainIssueRouteRoute: MainIssueRouteRouteWithChildren, + MainTreeRouteRoute: MainTreeRouteRouteWithChildren, + MainIndexRoute: MainIndexRoute, + MainalternativesIRouteRoute: MainalternativesIRouteRouteWithChildren, + MainBuildBuildIdRouteRoute: MainBuildBuildIdRouteRouteWithChildren, + MainTestTestIdRouteRoute: MainTestTestIdRouteRouteWithChildren, + MainalternativesBBuildIdRouteRoute: + MainalternativesBBuildIdRouteRouteWithChildren, + MainalternativesTTestIdRouteRoute: + MainalternativesTTestIdRouteRouteWithChildren, +} -const alternativesTTestIdRouteRouteWithChildren = - alternativesTTestIdRouteRoute._addFileChildren( - alternativesTTestIdRouteRouteChildren, - ) +const MainRouteRouteWithChildren = MainRouteRoute._addFileChildren( + MainRouteRouteChildren, +) export interface FileRoutesByFullPath { - '/': typeof IndexRoute - '/hardware': typeof HardwareRouteRouteWithChildren - '/issue': typeof IssueRouteRouteWithChildren - '/tree': typeof TreeRouteRouteWithChildren - '/i': typeof alternativesIRouteRouteWithChildren - '/build/$buildId': typeof BuildBuildIdRouteRouteWithChildren - '/hardware/$hardwareId': typeof HardwareHardwareIdRouteRouteWithChildren - '/issue/$issueId': typeof IssueIssueIdRouteRouteWithChildren - '/test/$testId': typeof TestTestIdRouteRouteWithChildren - '/tree/$treeId': typeof TreeTreeIdRouteRouteWithChildren - '/hardware/': typeof HardwareIndexRoute - '/issue/': typeof IssueIndexRoute - '/tree/': typeof TreeIndexRoute - '/b/$buildId': typeof alternativesBBuildIdRouteRouteWithChildren - '/i/$issueId': typeof alternativesIIssueIdRouteRouteWithChildren - '/t/$testId': typeof alternativesTTestIdRouteRouteWithChildren - '/hardware/$hardwareId/boot': typeof HardwareHardwareIdBootRouteRouteWithChildren - '/hardware/$hardwareId/build': typeof HardwareHardwareIdBuildRouteRouteWithChildren - '/hardware/$hardwareId/test': typeof HardwareHardwareIdTestRouteRouteWithChildren - '/i/': typeof alternativesIIndexRoute - '/build/$buildId/': typeof BuildBuildIdIndexRoute - '/hardware/$hardwareId/': typeof HardwareHardwareIdIndexRoute - '/issue/$issueId/': typeof IssueIssueIdIndexRoute - '/test/$testId/': typeof TestTestIdIndexRoute - '/tree/$treeId/': typeof TreeTreeIdIndexRoute - '/tree/$treeId/test/$testId': typeof TreeTreeIdTestTestIdRouteRouteWithChildren - '/b/$buildId/': typeof alternativesBBuildIdIndexRoute - '/i/$issueId/': typeof alternativesIIssueIdIndexRoute - '/t/$testId/': typeof alternativesTTestIdIndexRoute - '/hardware/$hardwareId/boot/': typeof HardwareHardwareIdBootIndexRoute - '/hardware/$hardwareId/build/': typeof HardwareHardwareIdBuildIndexRoute - '/hardware/$hardwareId/test/': typeof HardwareHardwareIdTestIndexRoute - '/tree/$treeName/$branch': typeof TreeTreeNameBranchIndexRoute - '/hardware/$hardwareId/boot/$bootId': typeof HardwareHardwareIdBootBootIdIndexRoute - '/hardware/$hardwareId/build/$buildId': typeof HardwareHardwareIdBuildBuildIdIndexRoute - '/hardware/$hardwareId/test/$testId': typeof HardwareHardwareIdTestTestIdIndexRoute - '/tree/$treeId/build/$buildId': typeof TreeTreeIdBuildBuildIdIndexRoute - '/tree/$treeId/test/$testId/': typeof TreeTreeIdTestTestIdIndexRoute + '': typeof MainRouteRouteWithChildren + '/hardware': typeof MainHardwareRouteRouteWithChildren + '/issue': typeof MainIssueRouteRouteWithChildren + '/tree': typeof MainTreeRouteRouteWithChildren + '/': typeof MainIndexRoute + '/i': typeof MainalternativesIRouteRouteWithChildren + '/build/$buildId': typeof MainBuildBuildIdRouteRouteWithChildren + '/hardware/$hardwareId': typeof MainHardwareHardwareIdRouteRouteWithChildren + '/issue/$issueId': typeof MainIssueIssueIdRouteRouteWithChildren + '/test/$testId': typeof MainTestTestIdRouteRouteWithChildren + '/tree/$treeId': typeof MainTreeTreeIdRouteRouteWithChildren + '/hardware/': typeof MainHardwareIndexRoute + '/issue/': typeof MainIssueIndexRoute + '/tree/': typeof MainTreeIndexRoute + '/b/$buildId': typeof MainalternativesBBuildIdRouteRouteWithChildren + '/i/$issueId': typeof MainalternativesIIssueIdRouteRouteWithChildren + '/t/$testId': typeof MainalternativesTTestIdRouteRouteWithChildren + '/i/': typeof MainalternativesIIndexRoute + '/build/$buildId/': typeof MainBuildBuildIdIndexRoute + '/hardware/$hardwareId/': typeof MainHardwareHardwareIdIndexRoute + '/issue/$issueId/': typeof MainIssueIssueIdIndexRoute + '/test/$testId/': typeof MainTestTestIdIndexRoute + '/tree/$treeId/': typeof MainTreeTreeIdIndexRoute + '/b/$buildId/': typeof MainalternativesBBuildIdIndexRoute + '/i/$issueId/': typeof MainalternativesIIssueIdIndexRoute + '/t/$testId/': typeof MainalternativesTTestIdIndexRoute + '/hardware/$hardwareId/boot': typeof MainHardwareHardwareIdBootIndexRoute + '/hardware/$hardwareId/build': typeof MainHardwareHardwareIdBuildIndexRoute + '/hardware/$hardwareId/test': typeof MainHardwareHardwareIdTestIndexRoute + '/tree/$treeName/$branch': typeof MainTreeTreeNameBranchIndexRoute + '/hardware/$hardwareId/boot/$bootId': typeof MainHardwareHardwareIdBootBootIdIndexRoute + '/hardware/$hardwareId/build/$buildId': typeof MainHardwareHardwareIdBuildBuildIdIndexRoute + '/hardware/$hardwareId/test/$testId': typeof MainHardwareHardwareIdTestTestIdIndexRoute + '/tree/$treeId/build/$buildId': typeof MainTreeTreeIdBuildBuildIdIndexRoute + '/tree/$treeId/test/$testId': typeof MainTreeTreeIdTestTestIdIndexRoute } export interface FileRoutesByTo { - '/': typeof IndexRoute - '/hardware': typeof HardwareIndexRoute - '/issue': typeof IssueIndexRoute - '/tree': typeof TreeIndexRoute - '/i': typeof alternativesIIndexRoute - '/build/$buildId': typeof BuildBuildIdIndexRoute - '/hardware/$hardwareId': typeof HardwareHardwareIdIndexRoute - '/issue/$issueId': typeof IssueIssueIdIndexRoute - '/test/$testId': typeof TestTestIdIndexRoute - '/tree/$treeId': typeof TreeTreeIdIndexRoute - '/b/$buildId': typeof alternativesBBuildIdIndexRoute - '/i/$issueId': typeof alternativesIIssueIdIndexRoute - '/t/$testId': typeof alternativesTTestIdIndexRoute - '/hardware/$hardwareId/boot': typeof HardwareHardwareIdBootIndexRoute - '/hardware/$hardwareId/build': typeof HardwareHardwareIdBuildIndexRoute - '/hardware/$hardwareId/test': typeof HardwareHardwareIdTestIndexRoute - '/tree/$treeName/$branch': typeof TreeTreeNameBranchIndexRoute - '/hardware/$hardwareId/boot/$bootId': typeof HardwareHardwareIdBootBootIdIndexRoute - '/hardware/$hardwareId/build/$buildId': typeof HardwareHardwareIdBuildBuildIdIndexRoute - '/hardware/$hardwareId/test/$testId': typeof HardwareHardwareIdTestTestIdIndexRoute - '/tree/$treeId/build/$buildId': typeof TreeTreeIdBuildBuildIdIndexRoute - '/tree/$treeId/test/$testId': typeof TreeTreeIdTestTestIdIndexRoute + '/': typeof MainIndexRoute + '/hardware': typeof MainHardwareIndexRoute + '/issue': typeof MainIssueIndexRoute + '/tree': typeof MainTreeIndexRoute + '/i': typeof MainalternativesIIndexRoute + '/build/$buildId': typeof MainBuildBuildIdIndexRoute + '/hardware/$hardwareId': typeof MainHardwareHardwareIdIndexRoute + '/issue/$issueId': typeof MainIssueIssueIdIndexRoute + '/test/$testId': typeof MainTestTestIdIndexRoute + '/tree/$treeId': typeof MainTreeTreeIdIndexRoute + '/b/$buildId': typeof MainalternativesBBuildIdIndexRoute + '/i/$issueId': typeof MainalternativesIIssueIdIndexRoute + '/t/$testId': typeof MainalternativesTTestIdIndexRoute + '/hardware/$hardwareId/boot': typeof MainHardwareHardwareIdBootIndexRoute + '/hardware/$hardwareId/build': typeof MainHardwareHardwareIdBuildIndexRoute + '/hardware/$hardwareId/test': typeof MainHardwareHardwareIdTestIndexRoute + '/tree/$treeName/$branch': typeof MainTreeTreeNameBranchIndexRoute + '/hardware/$hardwareId/boot/$bootId': typeof MainHardwareHardwareIdBootBootIdIndexRoute + '/hardware/$hardwareId/build/$buildId': typeof MainHardwareHardwareIdBuildBuildIdIndexRoute + '/hardware/$hardwareId/test/$testId': typeof MainHardwareHardwareIdTestTestIdIndexRoute + '/tree/$treeId/build/$buildId': typeof MainTreeTreeIdBuildBuildIdIndexRoute + '/tree/$treeId/test/$testId': typeof MainTreeTreeIdTestTestIdIndexRoute } export interface FileRoutesById { __root__: typeof rootRoute - '/': typeof IndexRoute - '/hardware': typeof HardwareRouteRouteWithChildren - '/issue': typeof IssueRouteRouteWithChildren - '/tree': typeof TreeRouteRouteWithChildren - '/(alternatives)/i': typeof alternativesIRouteRouteWithChildren - '/build/$buildId': typeof BuildBuildIdRouteRouteWithChildren - '/hardware/$hardwareId': typeof HardwareHardwareIdRouteRouteWithChildren - '/issue/$issueId': typeof IssueIssueIdRouteRouteWithChildren - '/test/$testId': typeof TestTestIdRouteRouteWithChildren - '/tree/$treeId': typeof TreeTreeIdRouteRouteWithChildren - '/hardware/': typeof HardwareIndexRoute - '/issue/': typeof IssueIndexRoute - '/tree/': typeof TreeIndexRoute - '/(alternatives)/b/$buildId': typeof alternativesBBuildIdRouteRouteWithChildren - '/(alternatives)/i/$issueId': typeof alternativesIIssueIdRouteRouteWithChildren - '/(alternatives)/t/$testId': typeof alternativesTTestIdRouteRouteWithChildren - '/hardware/$hardwareId/boot': typeof HardwareHardwareIdBootRouteRouteWithChildren - '/hardware/$hardwareId/build': typeof HardwareHardwareIdBuildRouteRouteWithChildren - '/hardware/$hardwareId/test': typeof HardwareHardwareIdTestRouteRouteWithChildren - '/(alternatives)/i/': typeof alternativesIIndexRoute - '/build/$buildId/': typeof BuildBuildIdIndexRoute - '/hardware/$hardwareId/': typeof HardwareHardwareIdIndexRoute - '/issue/$issueId/': typeof IssueIssueIdIndexRoute - '/test/$testId/': typeof TestTestIdIndexRoute - '/tree/$treeId/': typeof TreeTreeIdIndexRoute - '/tree/$treeId/test/$testId': typeof TreeTreeIdTestTestIdRouteRouteWithChildren - '/(alternatives)/b/$buildId/': typeof alternativesBBuildIdIndexRoute - '/(alternatives)/i/$issueId/': typeof alternativesIIssueIdIndexRoute - '/(alternatives)/t/$testId/': typeof alternativesTTestIdIndexRoute - '/hardware/$hardwareId/boot/': typeof HardwareHardwareIdBootIndexRoute - '/hardware/$hardwareId/build/': typeof HardwareHardwareIdBuildIndexRoute - '/hardware/$hardwareId/test/': typeof HardwareHardwareIdTestIndexRoute - '/tree/$treeName/$branch/': typeof TreeTreeNameBranchIndexRoute - '/hardware/$hardwareId/boot/$bootId/': typeof HardwareHardwareIdBootBootIdIndexRoute - '/hardware/$hardwareId/build/$buildId/': typeof HardwareHardwareIdBuildBuildIdIndexRoute - '/hardware/$hardwareId/test/$testId/': typeof HardwareHardwareIdTestTestIdIndexRoute - '/tree/$treeId/build/$buildId/': typeof TreeTreeIdBuildBuildIdIndexRoute - '/tree/$treeId/test/$testId/': typeof TreeTreeIdTestTestIdIndexRoute + '/_main': typeof MainRouteRouteWithChildren + '/_main/hardware': typeof MainHardwareRouteRouteWithChildren + '/_main/issue': typeof MainIssueRouteRouteWithChildren + '/_main/tree': typeof MainTreeRouteRouteWithChildren + '/_main/': typeof MainIndexRoute + '/_main/(alternatives)/i': typeof MainalternativesIRouteRouteWithChildren + '/_main/build/$buildId': typeof MainBuildBuildIdRouteRouteWithChildren + '/_main/hardware/$hardwareId': typeof MainHardwareHardwareIdRouteRouteWithChildren + '/_main/issue/$issueId': typeof MainIssueIssueIdRouteRouteWithChildren + '/_main/test/$testId': typeof MainTestTestIdRouteRouteWithChildren + '/_main/tree/$treeId': typeof MainTreeTreeIdRouteRouteWithChildren + '/_main/hardware/': typeof MainHardwareIndexRoute + '/_main/issue/': typeof MainIssueIndexRoute + '/_main/tree/': typeof MainTreeIndexRoute + '/_main/(alternatives)/b/$buildId': typeof MainalternativesBBuildIdRouteRouteWithChildren + '/_main/(alternatives)/i/$issueId': typeof MainalternativesIIssueIdRouteRouteWithChildren + '/_main/(alternatives)/t/$testId': typeof MainalternativesTTestIdRouteRouteWithChildren + '/_main/(alternatives)/i/': typeof MainalternativesIIndexRoute + '/_main/build/$buildId/': typeof MainBuildBuildIdIndexRoute + '/_main/hardware/$hardwareId/': typeof MainHardwareHardwareIdIndexRoute + '/_main/issue/$issueId/': typeof MainIssueIssueIdIndexRoute + '/_main/test/$testId/': typeof MainTestTestIdIndexRoute + '/_main/tree/$treeId/': typeof MainTreeTreeIdIndexRoute + '/_main/(alternatives)/b/$buildId/': typeof MainalternativesBBuildIdIndexRoute + '/_main/(alternatives)/i/$issueId/': typeof MainalternativesIIssueIdIndexRoute + '/_main/(alternatives)/t/$testId/': typeof MainalternativesTTestIdIndexRoute + '/_main/hardware/$hardwareId/boot/': typeof MainHardwareHardwareIdBootIndexRoute + '/_main/hardware/$hardwareId/build/': typeof MainHardwareHardwareIdBuildIndexRoute + '/_main/hardware/$hardwareId/test/': typeof MainHardwareHardwareIdTestIndexRoute + '/_main/tree/$treeName/$branch/': typeof MainTreeTreeNameBranchIndexRoute + '/_main/hardware/$hardwareId/boot/$bootId/': typeof MainHardwareHardwareIdBootBootIdIndexRoute + '/_main/hardware/$hardwareId/build/$buildId/': typeof MainHardwareHardwareIdBuildBuildIdIndexRoute + '/_main/hardware/$hardwareId/test/$testId/': typeof MainHardwareHardwareIdTestTestIdIndexRoute + '/_main/tree/$treeId/build/$buildId/': typeof MainTreeTreeIdBuildBuildIdIndexRoute + '/_main/tree/$treeId/test/$testId/': typeof MainTreeTreeIdTestTestIdIndexRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath fullPaths: - | '/' + | '' | '/hardware' | '/issue' | '/tree' + | '/' | '/i' | '/build/$buildId' | '/hardware/$hardwareId' @@ -929,28 +866,24 @@ export interface FileRouteTypes { | '/b/$buildId' | '/i/$issueId' | '/t/$testId' - | '/hardware/$hardwareId/boot' - | '/hardware/$hardwareId/build' - | '/hardware/$hardwareId/test' | '/i/' | '/build/$buildId/' | '/hardware/$hardwareId/' | '/issue/$issueId/' | '/test/$testId/' | '/tree/$treeId/' - | '/tree/$treeId/test/$testId' | '/b/$buildId/' | '/i/$issueId/' | '/t/$testId/' - | '/hardware/$hardwareId/boot/' - | '/hardware/$hardwareId/build/' - | '/hardware/$hardwareId/test/' + | '/hardware/$hardwareId/boot' + | '/hardware/$hardwareId/build' + | '/hardware/$hardwareId/test' | '/tree/$treeName/$branch' | '/hardware/$hardwareId/boot/$bootId' | '/hardware/$hardwareId/build/$buildId' | '/hardware/$hardwareId/test/$testId' | '/tree/$treeId/build/$buildId' - | '/tree/$treeId/test/$testId/' + | '/tree/$treeId/test/$testId' fileRoutesByTo: FileRoutesByTo to: | '/' @@ -977,69 +910,50 @@ export interface FileRouteTypes { | '/tree/$treeId/test/$testId' id: | '__root__' - | '/' - | '/hardware' - | '/issue' - | '/tree' - | '/(alternatives)/i' - | '/build/$buildId' - | '/hardware/$hardwareId' - | '/issue/$issueId' - | '/test/$testId' - | '/tree/$treeId' - | '/hardware/' - | '/issue/' - | '/tree/' - | '/(alternatives)/b/$buildId' - | '/(alternatives)/i/$issueId' - | '/(alternatives)/t/$testId' - | '/hardware/$hardwareId/boot' - | '/hardware/$hardwareId/build' - | '/hardware/$hardwareId/test' - | '/(alternatives)/i/' - | '/build/$buildId/' - | '/hardware/$hardwareId/' - | '/issue/$issueId/' - | '/test/$testId/' - | '/tree/$treeId/' - | '/tree/$treeId/test/$testId' - | '/(alternatives)/b/$buildId/' - | '/(alternatives)/i/$issueId/' - | '/(alternatives)/t/$testId/' - | '/hardware/$hardwareId/boot/' - | '/hardware/$hardwareId/build/' - | '/hardware/$hardwareId/test/' - | '/tree/$treeName/$branch/' - | '/hardware/$hardwareId/boot/$bootId/' - | '/hardware/$hardwareId/build/$buildId/' - | '/hardware/$hardwareId/test/$testId/' - | '/tree/$treeId/build/$buildId/' - | '/tree/$treeId/test/$testId/' + | '/_main' + | '/_main/hardware' + | '/_main/issue' + | '/_main/tree' + | '/_main/' + | '/_main/(alternatives)/i' + | '/_main/build/$buildId' + | '/_main/hardware/$hardwareId' + | '/_main/issue/$issueId' + | '/_main/test/$testId' + | '/_main/tree/$treeId' + | '/_main/hardware/' + | '/_main/issue/' + | '/_main/tree/' + | '/_main/(alternatives)/b/$buildId' + | '/_main/(alternatives)/i/$issueId' + | '/_main/(alternatives)/t/$testId' + | '/_main/(alternatives)/i/' + | '/_main/build/$buildId/' + | '/_main/hardware/$hardwareId/' + | '/_main/issue/$issueId/' + | '/_main/test/$testId/' + | '/_main/tree/$treeId/' + | '/_main/(alternatives)/b/$buildId/' + | '/_main/(alternatives)/i/$issueId/' + | '/_main/(alternatives)/t/$testId/' + | '/_main/hardware/$hardwareId/boot/' + | '/_main/hardware/$hardwareId/build/' + | '/_main/hardware/$hardwareId/test/' + | '/_main/tree/$treeName/$branch/' + | '/_main/hardware/$hardwareId/boot/$bootId/' + | '/_main/hardware/$hardwareId/build/$buildId/' + | '/_main/hardware/$hardwareId/test/$testId/' + | '/_main/tree/$treeId/build/$buildId/' + | '/_main/tree/$treeId/test/$testId/' fileRoutesById: FileRoutesById } export interface RootRouteChildren { - IndexRoute: typeof IndexRoute - HardwareRouteRoute: typeof HardwareRouteRouteWithChildren - IssueRouteRoute: typeof IssueRouteRouteWithChildren - TreeRouteRoute: typeof TreeRouteRouteWithChildren - alternativesIRouteRoute: typeof alternativesIRouteRouteWithChildren - BuildBuildIdRouteRoute: typeof BuildBuildIdRouteRouteWithChildren - TestTestIdRouteRoute: typeof TestTestIdRouteRouteWithChildren - alternativesBBuildIdRouteRoute: typeof alternativesBBuildIdRouteRouteWithChildren - alternativesTTestIdRouteRoute: typeof alternativesTTestIdRouteRouteWithChildren + MainRouteRoute: typeof MainRouteRouteWithChildren } const rootRouteChildren: RootRouteChildren = { - IndexRoute: IndexRoute, - HardwareRouteRoute: HardwareRouteRouteWithChildren, - IssueRouteRoute: IssueRouteRouteWithChildren, - TreeRouteRoute: TreeRouteRouteWithChildren, - alternativesIRouteRoute: alternativesIRouteRouteWithChildren, - BuildBuildIdRouteRoute: BuildBuildIdRouteRouteWithChildren, - TestTestIdRouteRoute: TestTestIdRouteRouteWithChildren, - alternativesBBuildIdRouteRoute: alternativesBBuildIdRouteRouteWithChildren, - alternativesTTestIdRouteRoute: alternativesTTestIdRouteRouteWithChildren, + MainRouteRoute: MainRouteRouteWithChildren, } export const routeTree = rootRoute @@ -1052,220 +966,207 @@ export const routeTree = rootRoute "__root__": { "filePath": "__root.tsx", "children": [ - "/", - "/hardware", - "/issue", - "/tree", - "/(alternatives)/i", - "/build/$buildId", - "/test/$testId", - "/(alternatives)/b/$buildId", - "/(alternatives)/t/$testId" + "/_main" ] }, - "/": { - "filePath": "index.tsx" - }, - "/hardware": { - "filePath": "hardware/route.tsx", + "/_main": { + "filePath": "_main/route.tsx", "children": [ - "/hardware/$hardwareId", - "/hardware/" + "/_main/hardware", + "/_main/issue", + "/_main/tree", + "/_main/", + "/_main/(alternatives)/i", + "/_main/build/$buildId", + "/_main/test/$testId", + "/_main/(alternatives)/b/$buildId", + "/_main/(alternatives)/t/$testId" ] }, - "/issue": { - "filePath": "issue/route.tsx", + "/_main/hardware": { + "filePath": "_main/hardware/route.tsx", + "parent": "/_main", "children": [ - "/issue/$issueId", - "/issue/" + "/_main/hardware/$hardwareId", + "/_main/hardware/" ] }, - "/tree": { - "filePath": "tree/route.tsx", + "/_main/issue": { + "filePath": "_main/issue/route.tsx", + "parent": "/_main", "children": [ - "/tree/$treeId", - "/tree/", - "/tree/$treeName/$branch/" + "/_main/issue/$issueId", + "/_main/issue/" ] }, - "/(alternatives)/i": { - "filePath": "(alternatives)/i/route.tsx", + "/_main/tree": { + "filePath": "_main/tree/route.tsx", + "parent": "/_main", "children": [ - "/(alternatives)/i/$issueId", - "/(alternatives)/i/" + "/_main/tree/$treeId", + "/_main/tree/", + "/_main/tree/$treeName/$branch/" ] }, - "/build/$buildId": { - "filePath": "build/$buildId/route.tsx", - "children": [ - "/build/$buildId/" - ] + "/_main/": { + "filePath": "_main/index.tsx", + "parent": "/_main" }, - "/hardware/$hardwareId": { - "filePath": "hardware/$hardwareId/route.tsx", - "parent": "/hardware", + "/_main/(alternatives)/i": { + "filePath": "_main/(alternatives)/i/route.tsx", + "parent": "/_main", "children": [ - "/hardware/$hardwareId/boot", - "/hardware/$hardwareId/build", - "/hardware/$hardwareId/test", - "/hardware/$hardwareId/" + "/_main/(alternatives)/i/$issueId", + "/_main/(alternatives)/i/" ] }, - "/issue/$issueId": { - "filePath": "issue/$issueId/route.tsx", - "parent": "/issue", + "/_main/build/$buildId": { + "filePath": "_main/build/$buildId/route.tsx", + "parent": "/_main", "children": [ - "/issue/$issueId/" + "/_main/build/$buildId/" ] }, - "/test/$testId": { - "filePath": "test/$testId/route.tsx", + "/_main/hardware/$hardwareId": { + "filePath": "_main/hardware/$hardwareId/route.tsx", + "parent": "/_main/hardware", "children": [ - "/test/$testId/" + "/_main/hardware/$hardwareId/", + "/_main/hardware/$hardwareId/boot/", + "/_main/hardware/$hardwareId/build/", + "/_main/hardware/$hardwareId/test/", + "/_main/hardware/$hardwareId/boot/$bootId/", + "/_main/hardware/$hardwareId/build/$buildId/", + "/_main/hardware/$hardwareId/test/$testId/" ] }, - "/tree/$treeId": { - "filePath": "tree/$treeId/route.tsx", - "parent": "/tree", + "/_main/issue/$issueId": { + "filePath": "_main/issue/$issueId/route.tsx", + "parent": "/_main/issue", "children": [ - "/tree/$treeId/", - "/tree/$treeId/test/$testId", - "/tree/$treeId/build/$buildId/" + "/_main/issue/$issueId/" ] }, - "/hardware/": { - "filePath": "hardware/index.tsx", - "parent": "/hardware" - }, - "/issue/": { - "filePath": "issue/index.tsx", - "parent": "/issue" - }, - "/tree/": { - "filePath": "tree/index.tsx", - "parent": "/tree" - }, - "/(alternatives)/b/$buildId": { - "filePath": "(alternatives)/b/$buildId/route.tsx", + "/_main/test/$testId": { + "filePath": "_main/test/$testId/route.tsx", + "parent": "/_main", "children": [ - "/(alternatives)/b/$buildId/" + "/_main/test/$testId/" ] }, - "/(alternatives)/i/$issueId": { - "filePath": "(alternatives)/i/$issueId/route.tsx", - "parent": "/(alternatives)/i", + "/_main/tree/$treeId": { + "filePath": "_main/tree/$treeId/route.tsx", + "parent": "/_main/tree", "children": [ - "/(alternatives)/i/$issueId/" + "/_main/tree/$treeId/", + "/_main/tree/$treeId/build/$buildId/", + "/_main/tree/$treeId/test/$testId/" ] }, - "/(alternatives)/t/$testId": { - "filePath": "(alternatives)/t/$testId/route.tsx", - "children": [ - "/(alternatives)/t/$testId/" - ] + "/_main/hardware/": { + "filePath": "_main/hardware/index.tsx", + "parent": "/_main/hardware" }, - "/hardware/$hardwareId/boot": { - "filePath": "hardware/$hardwareId/boot/route.tsx", - "parent": "/hardware/$hardwareId", + "/_main/issue/": { + "filePath": "_main/issue/index.tsx", + "parent": "/_main/issue" + }, + "/_main/tree/": { + "filePath": "_main/tree/index.tsx", + "parent": "/_main/tree" + }, + "/_main/(alternatives)/b/$buildId": { + "filePath": "_main/(alternatives)/b/$buildId/route.tsx", + "parent": "/_main", "children": [ - "/hardware/$hardwareId/boot/", - "/hardware/$hardwareId/boot/$bootId/" + "/_main/(alternatives)/b/$buildId/" ] }, - "/hardware/$hardwareId/build": { - "filePath": "hardware/$hardwareId/build/route.tsx", - "parent": "/hardware/$hardwareId", + "/_main/(alternatives)/i/$issueId": { + "filePath": "_main/(alternatives)/i/$issueId/route.tsx", + "parent": "/_main/(alternatives)/i", "children": [ - "/hardware/$hardwareId/build/", - "/hardware/$hardwareId/build/$buildId/" + "/_main/(alternatives)/i/$issueId/" ] }, - "/hardware/$hardwareId/test": { - "filePath": "hardware/$hardwareId/test/route.tsx", - "parent": "/hardware/$hardwareId", + "/_main/(alternatives)/t/$testId": { + "filePath": "_main/(alternatives)/t/$testId/route.tsx", + "parent": "/_main", "children": [ - "/hardware/$hardwareId/test/", - "/hardware/$hardwareId/test/$testId/" + "/_main/(alternatives)/t/$testId/" ] }, - "/(alternatives)/i/": { - "filePath": "(alternatives)/i/index.tsx", - "parent": "/(alternatives)/i" - }, - "/build/$buildId/": { - "filePath": "build/$buildId/index.tsx", - "parent": "/build/$buildId" + "/_main/(alternatives)/i/": { + "filePath": "_main/(alternatives)/i/index.tsx", + "parent": "/_main/(alternatives)/i" }, - "/hardware/$hardwareId/": { - "filePath": "hardware/$hardwareId/index.tsx", - "parent": "/hardware/$hardwareId" + "/_main/build/$buildId/": { + "filePath": "_main/build/$buildId/index.tsx", + "parent": "/_main/build/$buildId" }, - "/issue/$issueId/": { - "filePath": "issue/$issueId/index.tsx", - "parent": "/issue/$issueId" + "/_main/hardware/$hardwareId/": { + "filePath": "_main/hardware/$hardwareId/index.tsx", + "parent": "/_main/hardware/$hardwareId" }, - "/test/$testId/": { - "filePath": "test/$testId/index.tsx", - "parent": "/test/$testId" + "/_main/issue/$issueId/": { + "filePath": "_main/issue/$issueId/index.tsx", + "parent": "/_main/issue/$issueId" }, - "/tree/$treeId/": { - "filePath": "tree/$treeId/index.tsx", - "parent": "/tree/$treeId" + "/_main/test/$testId/": { + "filePath": "_main/test/$testId/index.tsx", + "parent": "/_main/test/$testId" }, - "/tree/$treeId/test/$testId": { - "filePath": "tree/$treeId/test/$testId/route.tsx", - "parent": "/tree/$treeId", - "children": [ - "/tree/$treeId/test/$testId/" - ] + "/_main/tree/$treeId/": { + "filePath": "_main/tree/$treeId/index.tsx", + "parent": "/_main/tree/$treeId" }, - "/(alternatives)/b/$buildId/": { - "filePath": "(alternatives)/b/$buildId/index.tsx", - "parent": "/(alternatives)/b/$buildId" + "/_main/(alternatives)/b/$buildId/": { + "filePath": "_main/(alternatives)/b/$buildId/index.tsx", + "parent": "/_main/(alternatives)/b/$buildId" }, - "/(alternatives)/i/$issueId/": { - "filePath": "(alternatives)/i/$issueId/index.tsx", - "parent": "/(alternatives)/i/$issueId" + "/_main/(alternatives)/i/$issueId/": { + "filePath": "_main/(alternatives)/i/$issueId/index.tsx", + "parent": "/_main/(alternatives)/i/$issueId" }, - "/(alternatives)/t/$testId/": { - "filePath": "(alternatives)/t/$testId/index.tsx", - "parent": "/(alternatives)/t/$testId" + "/_main/(alternatives)/t/$testId/": { + "filePath": "_main/(alternatives)/t/$testId/index.tsx", + "parent": "/_main/(alternatives)/t/$testId" }, - "/hardware/$hardwareId/boot/": { - "filePath": "hardware/$hardwareId/boot/index.tsx", - "parent": "/hardware/$hardwareId/boot" + "/_main/hardware/$hardwareId/boot/": { + "filePath": "_main/hardware/$hardwareId/boot/index.tsx", + "parent": "/_main/hardware/$hardwareId" }, - "/hardware/$hardwareId/build/": { - "filePath": "hardware/$hardwareId/build/index.tsx", - "parent": "/hardware/$hardwareId/build" + "/_main/hardware/$hardwareId/build/": { + "filePath": "_main/hardware/$hardwareId/build/index.tsx", + "parent": "/_main/hardware/$hardwareId" }, - "/hardware/$hardwareId/test/": { - "filePath": "hardware/$hardwareId/test/index.tsx", - "parent": "/hardware/$hardwareId/test" + "/_main/hardware/$hardwareId/test/": { + "filePath": "_main/hardware/$hardwareId/test/index.tsx", + "parent": "/_main/hardware/$hardwareId" }, - "/tree/$treeName/$branch/": { - "filePath": "tree/$treeName/$branch/index.tsx", - "parent": "/tree" + "/_main/tree/$treeName/$branch/": { + "filePath": "_main/tree/$treeName/$branch/index.tsx", + "parent": "/_main/tree" }, - "/hardware/$hardwareId/boot/$bootId/": { - "filePath": "hardware/$hardwareId/boot/$bootId/index.tsx", - "parent": "/hardware/$hardwareId/boot" + "/_main/hardware/$hardwareId/boot/$bootId/": { + "filePath": "_main/hardware/$hardwareId/boot/$bootId/index.tsx", + "parent": "/_main/hardware/$hardwareId" }, - "/hardware/$hardwareId/build/$buildId/": { - "filePath": "hardware/$hardwareId/build/$buildId/index.tsx", - "parent": "/hardware/$hardwareId/build" + "/_main/hardware/$hardwareId/build/$buildId/": { + "filePath": "_main/hardware/$hardwareId/build/$buildId/index.tsx", + "parent": "/_main/hardware/$hardwareId" }, - "/hardware/$hardwareId/test/$testId/": { - "filePath": "hardware/$hardwareId/test/$testId/index.tsx", - "parent": "/hardware/$hardwareId/test" + "/_main/hardware/$hardwareId/test/$testId/": { + "filePath": "_main/hardware/$hardwareId/test/$testId/index.tsx", + "parent": "/_main/hardware/$hardwareId" }, - "/tree/$treeId/build/$buildId/": { - "filePath": "tree/$treeId/build/$buildId/index.tsx", - "parent": "/tree/$treeId" + "/_main/tree/$treeId/build/$buildId/": { + "filePath": "_main/tree/$treeId/build/$buildId/index.tsx", + "parent": "/_main/tree/$treeId" }, - "/tree/$treeId/test/$testId/": { - "filePath": "tree/$treeId/test/$testId/index.tsx", - "parent": "/tree/$treeId/test/$testId" + "/_main/tree/$treeId/test/$testId/": { + "filePath": "_main/tree/$treeId/test/$testId/index.tsx", + "parent": "/_main/tree/$treeId" } } } diff --git a/dashboard/src/routes/__root.tsx b/dashboard/src/routes/__root.tsx index d43c52fae..abd8fd388 100644 --- a/dashboard/src/routes/__root.tsx +++ b/dashboard/src/routes/__root.tsx @@ -1,53 +1,10 @@ -import { z } from 'zod'; - -import { - createRootRoute, - Outlet, - stripSearchParams, -} from '@tanstack/react-router'; - -// Uncomment for TanStack Router devtools - -// import { TanStackRouterDevtools } from '@tanstack/router-devtools'; - -import { useIntl } from 'react-intl'; - +import { createRootRoute, Outlet } from '@tanstack/react-router'; import type { JSX } from 'react'; -import SideMenu from '@/components/SideMenu/SideMenu'; -import TopBar from '@/components/TopBar/TopBar'; -import { DEFAULT_ORIGIN, type SearchSchema, zOrigin } from '@/types/general'; - -const defaultValues = { - origin: DEFAULT_ORIGIN, -}; - -const RouteSchema = z.object({ - origin: zOrigin, -} satisfies SearchSchema); - const RouteComponent = (): JSX.Element => { - const { formatMessage } = useIntl(); - - return ( - <> - {formatMessage({ id: 'title.default' })} -
-
- - -
- -
-
-
- {/* */} - - ); + return ; }; export const Route = createRootRoute({ - validateSearch: RouteSchema, - search: { middlewares: [stripSearchParams(defaultValues)] }, component: RouteComponent, }); diff --git a/dashboard/src/routes/(alternatives)/b/$buildId/index.tsx b/dashboard/src/routes/_main/(alternatives)/b/$buildId/index.tsx similarity index 77% rename from dashboard/src/routes/(alternatives)/b/$buildId/index.tsx rename to dashboard/src/routes/_main/(alternatives)/b/$buildId/index.tsx index 2172145f6..177e6c35a 100644 --- a/dashboard/src/routes/(alternatives)/b/$buildId/index.tsx +++ b/dashboard/src/routes/_main/(alternatives)/b/$buildId/index.tsx @@ -1,6 +1,6 @@ import { createFileRoute, redirect } from '@tanstack/react-router'; -export const Route = createFileRoute('/(alternatives)/b/$buildId/')({ +export const Route = createFileRoute('/_main/(alternatives)/b/$buildId/')({ loaderDeps: ({ search }) => ({ search }), loader: ({ deps, params }) => { throw redirect({ diff --git a/dashboard/src/routes/(alternatives)/b/$buildId/route.tsx b/dashboard/src/routes/_main/(alternatives)/b/$buildId/route.tsx similarity index 79% rename from dashboard/src/routes/(alternatives)/b/$buildId/route.tsx rename to dashboard/src/routes/_main/(alternatives)/b/$buildId/route.tsx index 97c82cb61..a8cd13d19 100644 --- a/dashboard/src/routes/(alternatives)/b/$buildId/route.tsx +++ b/dashboard/src/routes/_main/(alternatives)/b/$buildId/route.tsx @@ -7,9 +7,9 @@ import { import { buildDetailsDefaultValues, buildDetailsSearchSchema, -} from '@/routes/build/$buildId/route'; +} from '@/routes/_main/build/$buildId/route'; -export const Route = createFileRoute('/(alternatives)/b/$buildId')({ +export const Route = createFileRoute('/_main/(alternatives)/b/$buildId')({ loaderDeps: ({ search }) => ({ search }), loader: ({ deps, params }) => { throw redirect({ diff --git a/dashboard/src/routes/(alternatives)/i/$issueId/index.tsx b/dashboard/src/routes/_main/(alternatives)/i/$issueId/index.tsx similarity index 77% rename from dashboard/src/routes/(alternatives)/i/$issueId/index.tsx rename to dashboard/src/routes/_main/(alternatives)/i/$issueId/index.tsx index b840f02c3..ba4aede3a 100644 --- a/dashboard/src/routes/(alternatives)/i/$issueId/index.tsx +++ b/dashboard/src/routes/_main/(alternatives)/i/$issueId/index.tsx @@ -1,6 +1,6 @@ import { createFileRoute, redirect } from '@tanstack/react-router'; -export const Route = createFileRoute('/(alternatives)/i/$issueId/')({ +export const Route = createFileRoute('/_main/(alternatives)/i/$issueId/')({ loaderDeps: ({ search }) => ({ search }), loader: ({ deps, params }) => { throw redirect({ diff --git a/dashboard/src/routes/(alternatives)/i/$issueId/route.tsx b/dashboard/src/routes/_main/(alternatives)/i/$issueId/route.tsx similarity index 79% rename from dashboard/src/routes/(alternatives)/i/$issueId/route.tsx rename to dashboard/src/routes/_main/(alternatives)/i/$issueId/route.tsx index 854f7a8e6..28c717d26 100644 --- a/dashboard/src/routes/(alternatives)/i/$issueId/route.tsx +++ b/dashboard/src/routes/_main/(alternatives)/i/$issueId/route.tsx @@ -7,9 +7,9 @@ import { import { issueDetailsDefaultValues, issueDetailsSearchSchema, -} from '@/routes/issue/$issueId/route'; +} from '@/routes/_main/issue/$issueId/route'; -export const Route = createFileRoute('/(alternatives)/i/$issueId')({ +export const Route = createFileRoute('/_main/(alternatives)/i/$issueId')({ loaderDeps: ({ search }) => ({ search }), loader: ({ deps, params }) => { throw redirect({ diff --git a/dashboard/src/routes/(alternatives)/i/index.tsx b/dashboard/src/routes/_main/(alternatives)/i/index.tsx similarity index 78% rename from dashboard/src/routes/(alternatives)/i/index.tsx rename to dashboard/src/routes/_main/(alternatives)/i/index.tsx index 0c6ca0e14..1ca1c90d0 100644 --- a/dashboard/src/routes/(alternatives)/i/index.tsx +++ b/dashboard/src/routes/_main/(alternatives)/i/index.tsx @@ -1,6 +1,6 @@ import { createFileRoute, redirect } from '@tanstack/react-router'; -export const Route = createFileRoute('/(alternatives)/i/')({ +export const Route = createFileRoute('/_main/(alternatives)/i/')({ loaderDeps: ({ search }) => ({ search }), loader: ({ deps, params }) => { throw redirect({ diff --git a/dashboard/src/routes/(alternatives)/i/route.tsx b/dashboard/src/routes/_main/(alternatives)/i/route.tsx similarity index 81% rename from dashboard/src/routes/(alternatives)/i/route.tsx rename to dashboard/src/routes/_main/(alternatives)/i/route.tsx index 321168e9c..22b85e2d2 100644 --- a/dashboard/src/routes/(alternatives)/i/route.tsx +++ b/dashboard/src/routes/_main/(alternatives)/i/route.tsx @@ -7,9 +7,9 @@ import { import { issueListingDefaultValues, issueListingSearchSchema, -} from '@/routes/issue/route'; +} from '@/routes/_main/issue/route'; -export const Route = createFileRoute('/(alternatives)/i')({ +export const Route = createFileRoute('/_main/(alternatives)/i')({ loaderDeps: ({ search }) => ({ search }), loader: ({ deps, params }) => { throw redirect({ diff --git a/dashboard/src/routes/(alternatives)/t/$testId/index.tsx b/dashboard/src/routes/_main/(alternatives)/t/$testId/index.tsx similarity index 77% rename from dashboard/src/routes/(alternatives)/t/$testId/index.tsx rename to dashboard/src/routes/_main/(alternatives)/t/$testId/index.tsx index 92dd70e4a..4e0d05028 100644 --- a/dashboard/src/routes/(alternatives)/t/$testId/index.tsx +++ b/dashboard/src/routes/_main/(alternatives)/t/$testId/index.tsx @@ -1,6 +1,6 @@ import { createFileRoute, redirect } from '@tanstack/react-router'; -export const Route = createFileRoute('/(alternatives)/t/$testId/')({ +export const Route = createFileRoute('/_main/(alternatives)/t/$testId/')({ loaderDeps: ({ search }) => ({ search }), loader: ({ deps, params }) => { throw redirect({ diff --git a/dashboard/src/routes/(alternatives)/t/$testId/route.tsx b/dashboard/src/routes/_main/(alternatives)/t/$testId/route.tsx similarity index 79% rename from dashboard/src/routes/(alternatives)/t/$testId/route.tsx rename to dashboard/src/routes/_main/(alternatives)/t/$testId/route.tsx index 50103eebd..f11866da8 100644 --- a/dashboard/src/routes/(alternatives)/t/$testId/route.tsx +++ b/dashboard/src/routes/_main/(alternatives)/t/$testId/route.tsx @@ -7,9 +7,9 @@ import { import { testDetailsDefaultValues, testDetailsSearchSchema, -} from '@/routes/test/$testId/route'; +} from '@/routes/_main/test/$testId/route'; -export const Route = createFileRoute('/(alternatives)/t/$testId')({ +export const Route = createFileRoute('/_main/(alternatives)/t/$testId')({ validateSearch: testDetailsSearchSchema, search: { middlewares: [stripSearchParams(testDetailsDefaultValues)] }, loaderDeps: ({ search }) => ({ search }), diff --git a/dashboard/src/routes/build/$buildId/index.tsx b/dashboard/src/routes/_main/build/$buildId/index.tsx similarity index 70% rename from dashboard/src/routes/build/$buildId/index.tsx rename to dashboard/src/routes/_main/build/$buildId/index.tsx index e0cd45cb6..8d7d24cf7 100644 --- a/dashboard/src/routes/build/$buildId/index.tsx +++ b/dashboard/src/routes/_main/build/$buildId/index.tsx @@ -2,6 +2,6 @@ import { createFileRoute } from '@tanstack/react-router'; import BuildDetailsPage from '@/pages/BuildDetails'; -export const Route = createFileRoute('/build/$buildId/')({ +export const Route = createFileRoute('/_main/build/$buildId/')({ component: () => , }); diff --git a/dashboard/src/routes/build/$buildId/route.tsx b/dashboard/src/routes/_main/build/$buildId/route.tsx similarity index 94% rename from dashboard/src/routes/build/$buildId/route.tsx rename to dashboard/src/routes/_main/build/$buildId/route.tsx index b6d0e7f38..caf40f77c 100644 --- a/dashboard/src/routes/build/$buildId/route.tsx +++ b/dashboard/src/routes/_main/build/$buildId/route.tsx @@ -34,7 +34,7 @@ export const buildDetailsSearchSchema = z.object({ logOpen: zLogOpen, } satisfies SearchSchema); -export const Route = createFileRoute('/build/$buildId')({ +export const Route = createFileRoute('/_main/build/$buildId')({ validateSearch: buildDetailsSearchSchema, search: { middlewares: [stripSearchParams(buildDetailsDefaultValues)] }, }); diff --git a/dashboard/src/routes/hardware/$hardwareId/boot/$bootId/index.tsx b/dashboard/src/routes/_main/hardware/$hardwareId/boot/$bootId/index.tsx similarity index 60% rename from dashboard/src/routes/hardware/$hardwareId/boot/$bootId/index.tsx rename to dashboard/src/routes/_main/hardware/$hardwareId/boot/$bootId/index.tsx index 428a5305b..28d6871b2 100644 --- a/dashboard/src/routes/hardware/$hardwareId/boot/$bootId/index.tsx +++ b/dashboard/src/routes/_main/hardware/$hardwareId/boot/$bootId/index.tsx @@ -1,5 +1,7 @@ import { createFileRoute } from '@tanstack/react-router'; -export const Route = createFileRoute('/hardware/$hardwareId/boot/$bootId/')({ +export const Route = createFileRoute( + '/_main/hardware/$hardwareId/boot/$bootId/', +)({ component: () =>
Hello /hardware/$hardware/boot/$bootId/!
, }); diff --git a/dashboard/src/routes/hardware/$hardwareId/boot/index.tsx b/dashboard/src/routes/_main/hardware/$hardwareId/boot/index.tsx similarity index 62% rename from dashboard/src/routes/hardware/$hardwareId/boot/index.tsx rename to dashboard/src/routes/_main/hardware/$hardwareId/boot/index.tsx index 6670f7868..e94d5e4fa 100644 --- a/dashboard/src/routes/hardware/$hardwareId/boot/index.tsx +++ b/dashboard/src/routes/_main/hardware/$hardwareId/boot/index.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router'; -export const Route = createFileRoute('/hardware/$hardwareId/boot/')({ +export const Route = createFileRoute('/_main/hardware/$hardwareId/boot/')({ component: () =>
Hello /hardware/$hardware/boot/!
, }); diff --git a/dashboard/src/routes/hardware/$hardwareId/build/$buildId/index.tsx b/dashboard/src/routes/_main/hardware/$hardwareId/build/$buildId/index.tsx similarity index 81% rename from dashboard/src/routes/hardware/$hardwareId/build/$buildId/index.tsx rename to dashboard/src/routes/_main/hardware/$hardwareId/build/$buildId/index.tsx index 458b9d9c5..b7e8c7021 100644 --- a/dashboard/src/routes/hardware/$hardwareId/build/$buildId/index.tsx +++ b/dashboard/src/routes/_main/hardware/$hardwareId/build/$buildId/index.tsx @@ -2,7 +2,9 @@ import { createFileRoute, redirect } from '@tanstack/react-router'; import { RedirectFrom } from '@/types/general'; -export const Route = createFileRoute('/hardware/$hardwareId/build/$buildId/')({ +export const Route = createFileRoute( + '/_main/hardware/$hardwareId/build/$buildId/', +)({ loaderDeps: ({ search }) => ({ search }), loader: async ({ params, deps }) => { throw redirect({ diff --git a/dashboard/src/routes/hardware/$hardwareId/build/index.tsx b/dashboard/src/routes/_main/hardware/$hardwareId/build/index.tsx similarity index 62% rename from dashboard/src/routes/hardware/$hardwareId/build/index.tsx rename to dashboard/src/routes/_main/hardware/$hardwareId/build/index.tsx index fc5b4c1e2..d9e64e064 100644 --- a/dashboard/src/routes/hardware/$hardwareId/build/index.tsx +++ b/dashboard/src/routes/_main/hardware/$hardwareId/build/index.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router'; -export const Route = createFileRoute('/hardware/$hardwareId/build/')({ +export const Route = createFileRoute('/_main/hardware/$hardwareId/build/')({ component: () =>
Hello /hardware/$hardware/build/!
, }); diff --git a/dashboard/src/routes/hardware/$hardwareId/index.tsx b/dashboard/src/routes/_main/hardware/$hardwareId/index.tsx similarity index 69% rename from dashboard/src/routes/hardware/$hardwareId/index.tsx rename to dashboard/src/routes/_main/hardware/$hardwareId/index.tsx index d8a6532bf..5eac37630 100644 --- a/dashboard/src/routes/hardware/$hardwareId/index.tsx +++ b/dashboard/src/routes/_main/hardware/$hardwareId/index.tsx @@ -2,6 +2,6 @@ import { createFileRoute } from '@tanstack/react-router'; import HardwareDetails from '@/pages/hardwareDetails/HardwareDetails'; -export const Route = createFileRoute('/hardware/$hardwareId/')({ +export const Route = createFileRoute('/_main/hardware/$hardwareId/')({ component: HardwareDetails, }); diff --git a/dashboard/src/routes/hardware/$hardwareId/route.tsx b/dashboard/src/routes/_main/hardware/$hardwareId/route.tsx similarity index 93% rename from dashboard/src/routes/hardware/$hardwareId/route.tsx rename to dashboard/src/routes/_main/hardware/$hardwareId/route.tsx index ecbf12311..31858c8b2 100644 --- a/dashboard/src/routes/hardware/$hardwareId/route.tsx +++ b/dashboard/src/routes/_main/hardware/$hardwareId/route.tsx @@ -33,7 +33,7 @@ const hardwareDetailsSearchSchema = z.object({ diffFilter: zDiffFilter, } satisfies SearchSchema); -export const Route = createFileRoute('/hardware/$hardwareId')({ +export const Route = createFileRoute('/_main/hardware/$hardwareId')({ validateSearch: hardwareDetailsSearchSchema, search: { middlewares: [stripSearchParams(defaultValues)] }, }); diff --git a/dashboard/src/routes/hardware/$hardwareId/test/$testId/index.tsx b/dashboard/src/routes/_main/hardware/$hardwareId/test/$testId/index.tsx similarity index 81% rename from dashboard/src/routes/hardware/$hardwareId/test/$testId/index.tsx rename to dashboard/src/routes/_main/hardware/$hardwareId/test/$testId/index.tsx index 09eca35d0..0db3d6b5c 100644 --- a/dashboard/src/routes/hardware/$hardwareId/test/$testId/index.tsx +++ b/dashboard/src/routes/_main/hardware/$hardwareId/test/$testId/index.tsx @@ -2,7 +2,9 @@ import { createFileRoute, redirect } from '@tanstack/react-router'; import { RedirectFrom } from '@/types/general'; -export const Route = createFileRoute('/hardware/$hardwareId/test/$testId/')({ +export const Route = createFileRoute( + '/_main/hardware/$hardwareId/test/$testId/', +)({ loaderDeps: ({ search }) => ({ search }), loader: async ({ params, deps }) => { throw redirect({ diff --git a/dashboard/src/routes/hardware/$hardwareId/test/index.tsx b/dashboard/src/routes/_main/hardware/$hardwareId/test/index.tsx similarity index 62% rename from dashboard/src/routes/hardware/$hardwareId/test/index.tsx rename to dashboard/src/routes/_main/hardware/$hardwareId/test/index.tsx index b464bb26b..54be56eb8 100644 --- a/dashboard/src/routes/hardware/$hardwareId/test/index.tsx +++ b/dashboard/src/routes/_main/hardware/$hardwareId/test/index.tsx @@ -1,5 +1,5 @@ import { createFileRoute } from '@tanstack/react-router'; -export const Route = createFileRoute('/hardware/$hardwareId/test/')({ +export const Route = createFileRoute('/_main/hardware/$hardwareId/test/')({ component: () =>
Hello /hardware/$hardware/test/!
, }); diff --git a/dashboard/src/routes/hardware/index.tsx b/dashboard/src/routes/_main/hardware/index.tsx similarity index 68% rename from dashboard/src/routes/hardware/index.tsx rename to dashboard/src/routes/_main/hardware/index.tsx index 82ae95a43..6e8e466c7 100644 --- a/dashboard/src/routes/hardware/index.tsx +++ b/dashboard/src/routes/_main/hardware/index.tsx @@ -2,6 +2,6 @@ import { createFileRoute } from '@tanstack/react-router'; import Hardware from '@/pages/Hardware'; -export const Route = createFileRoute('/hardware/')({ +export const Route = createFileRoute('/_main/hardware/')({ component: Hardware, }); diff --git a/dashboard/src/routes/hardware/route.tsx b/dashboard/src/routes/_main/hardware/route.tsx similarity index 93% rename from dashboard/src/routes/hardware/route.tsx rename to dashboard/src/routes/_main/hardware/route.tsx index e82bee3ab..c60751e17 100644 --- a/dashboard/src/routes/hardware/route.tsx +++ b/dashboard/src/routes/_main/hardware/route.tsx @@ -21,7 +21,7 @@ const zHardwareSchema = z.object({ listingSize: zListingSize, } satisfies SearchSchema); -export const Route = createFileRoute('/hardware')({ +export const Route = createFileRoute('/_main/hardware')({ validateSearch: zHardwareSchema, search: { middlewares: [stripSearchParams(defaultValues)] }, }); diff --git a/dashboard/src/routes/index.tsx b/dashboard/src/routes/_main/index.tsx similarity index 91% rename from dashboard/src/routes/index.tsx rename to dashboard/src/routes/_main/index.tsx index 5b177e371..2e65f5628 100644 --- a/dashboard/src/routes/index.tsx +++ b/dashboard/src/routes/_main/index.tsx @@ -9,7 +9,7 @@ export const HomeSearchSchema = z.object({ intervalInDays: makeZIntervalInDays(DEFAULT_TIME_SEARCH), } satisfies SearchSchema); -export const Route = createFileRoute('/')({ +export const Route = createFileRoute('/_main/')({ validateSearch: HomeSearchSchema, loaderDeps: ({ search }) => ({ search }), loader: ({ deps }) => { diff --git a/dashboard/src/routes/issue/$issueId/index.tsx b/dashboard/src/routes/_main/issue/$issueId/index.tsx similarity index 71% rename from dashboard/src/routes/issue/$issueId/index.tsx rename to dashboard/src/routes/_main/issue/$issueId/index.tsx index 951b56497..b348df7e8 100644 --- a/dashboard/src/routes/issue/$issueId/index.tsx +++ b/dashboard/src/routes/_main/issue/$issueId/index.tsx @@ -2,6 +2,6 @@ import { createFileRoute } from '@tanstack/react-router'; import IssueDetailsPage from '@/pages/IssueDetails/IssueDetails'; -export const Route = createFileRoute('/issue/$issueId/')({ +export const Route = createFileRoute('/_main/issue/$issueId/')({ component: IssueDetailsPage, }); diff --git a/dashboard/src/routes/issue/$issueId/route.tsx b/dashboard/src/routes/_main/issue/$issueId/route.tsx similarity index 94% rename from dashboard/src/routes/issue/$issueId/route.tsx rename to dashboard/src/routes/_main/issue/$issueId/route.tsx index 50bb83e9b..aad4a6377 100644 --- a/dashboard/src/routes/issue/$issueId/route.tsx +++ b/dashboard/src/routes/_main/issue/$issueId/route.tsx @@ -32,7 +32,7 @@ export const issueDetailsSearchSchema = z.object({ issueVersion: z.number().optional(), } satisfies SearchSchema); -export const Route = createFileRoute('/issue/$issueId')({ +export const Route = createFileRoute('/_main/issue/$issueId')({ validateSearch: issueDetailsSearchSchema, search: { middlewares: [stripSearchParams(issueDetailsDefaultValues)] }, }); diff --git a/dashboard/src/routes/issue/index.tsx b/dashboard/src/routes/_main/issue/index.tsx similarity index 73% rename from dashboard/src/routes/issue/index.tsx rename to dashboard/src/routes/_main/issue/index.tsx index 715ef7c4d..0a78072ce 100644 --- a/dashboard/src/routes/issue/index.tsx +++ b/dashboard/src/routes/_main/issue/index.tsx @@ -2,6 +2,6 @@ import { createFileRoute } from '@tanstack/react-router'; import IssueListing from '@/pages/IssueListing/IssueListing'; -export const Route = createFileRoute('/issue/')({ +export const Route = createFileRoute('/_main/issue/')({ component: IssueListing, }); diff --git a/dashboard/src/routes/issue/route.tsx b/dashboard/src/routes/_main/issue/route.tsx similarity index 93% rename from dashboard/src/routes/issue/route.tsx rename to dashboard/src/routes/_main/issue/route.tsx index 4ef466f67..c64c83c64 100644 --- a/dashboard/src/routes/issue/route.tsx +++ b/dashboard/src/routes/_main/issue/route.tsx @@ -24,7 +24,7 @@ export const issueListingSearchSchema = z.object({ listingSize: zListingSize, } satisfies SearchSchema); -export const Route = createFileRoute('/issue')({ +export const Route = createFileRoute('/_main/issue')({ validateSearch: issueListingSearchSchema, search: { middlewares: [stripSearchParams(issueListingDefaultValues)] }, }); diff --git a/dashboard/src/routes/_main/route.tsx b/dashboard/src/routes/_main/route.tsx new file mode 100644 index 000000000..0a143458f --- /dev/null +++ b/dashboard/src/routes/_main/route.tsx @@ -0,0 +1,53 @@ +import { z } from 'zod'; + +import { + createFileRoute, + Outlet, + stripSearchParams, +} from '@tanstack/react-router'; + +// Uncomment for TanStack Router devtools + +// import { TanStackRouterDevtools } from '@tanstack/router-devtools'; + +import { useIntl } from 'react-intl'; + +import type { JSX } from 'react'; + +import SideMenu from '@/components/SideMenu/SideMenu'; +import TopBar from '@/components/TopBar/TopBar'; +import { DEFAULT_ORIGIN, type SearchSchema, zOrigin } from '@/types/general'; + +const defaultValues = { + origin: DEFAULT_ORIGIN, +}; + +const RouteSchema = z.object({ + origin: zOrigin, +} satisfies SearchSchema); + +const RouteComponent = (): JSX.Element => { + const { formatMessage } = useIntl(); + + return ( + <> + {formatMessage({ id: 'title.default' })} +
+
+ + +
+ +
+
+
+ {/* */} + + ); +}; + +export const Route = createFileRoute('/_main')({ + validateSearch: RouteSchema, + search: { middlewares: [stripSearchParams(defaultValues)] }, + component: RouteComponent, +}); diff --git a/dashboard/src/routes/test/$testId/index.tsx b/dashboard/src/routes/_main/test/$testId/index.tsx similarity index 72% rename from dashboard/src/routes/test/$testId/index.tsx rename to dashboard/src/routes/_main/test/$testId/index.tsx index 51c89eb72..94925f7f5 100644 --- a/dashboard/src/routes/test/$testId/index.tsx +++ b/dashboard/src/routes/_main/test/$testId/index.tsx @@ -2,6 +2,6 @@ import { createFileRoute } from '@tanstack/react-router'; import TestDetailsPage from '@/pages/TestDetails/TestDetails'; -export const Route = createFileRoute('/test/$testId/')({ +export const Route = createFileRoute('/_main/test/$testId/')({ component: () => , }); diff --git a/dashboard/src/routes/test/$testId/route.tsx b/dashboard/src/routes/_main/test/$testId/route.tsx similarity index 94% rename from dashboard/src/routes/test/$testId/route.tsx rename to dashboard/src/routes/_main/test/$testId/route.tsx index 88cc9684a..740cb4e38 100644 --- a/dashboard/src/routes/test/$testId/route.tsx +++ b/dashboard/src/routes/_main/test/$testId/route.tsx @@ -31,7 +31,7 @@ export const testDetailsSearchSchema = z.object({ logOpen: zLogOpen, } satisfies SearchSchema); -export const Route = createFileRoute('/test/$testId')({ +export const Route = createFileRoute('/_main/test/$testId')({ validateSearch: testDetailsSearchSchema, search: { middlewares: [stripSearchParams(testDetailsDefaultValues)] }, }); diff --git a/dashboard/src/routes/tree/$treeId/build/$buildId/index.tsx b/dashboard/src/routes/_main/tree/$treeId/build/$buildId/index.tsx similarity index 83% rename from dashboard/src/routes/tree/$treeId/build/$buildId/index.tsx rename to dashboard/src/routes/_main/tree/$treeId/build/$buildId/index.tsx index f213898cd..a824f0f0e 100644 --- a/dashboard/src/routes/tree/$treeId/build/$buildId/index.tsx +++ b/dashboard/src/routes/_main/tree/$treeId/build/$buildId/index.tsx @@ -2,7 +2,7 @@ import { createFileRoute, redirect } from '@tanstack/react-router'; import { RedirectFrom } from '@/types/general'; -export const Route = createFileRoute('/tree/$treeId/build/$buildId/')({ +export const Route = createFileRoute('/_main/tree/$treeId/build/$buildId/')({ loaderDeps: ({ search }) => ({ search }), loader: async ({ params, deps }) => { throw redirect({ diff --git a/dashboard/src/routes/tree/$treeId/index.tsx b/dashboard/src/routes/_main/tree/$treeId/index.tsx similarity index 70% rename from dashboard/src/routes/tree/$treeId/index.tsx rename to dashboard/src/routes/_main/tree/$treeId/index.tsx index 6ac30ee70..99ccb627d 100644 --- a/dashboard/src/routes/tree/$treeId/index.tsx +++ b/dashboard/src/routes/_main/tree/$treeId/index.tsx @@ -2,6 +2,6 @@ import { createFileRoute } from '@tanstack/react-router'; import TreeDetails from '@/pages/TreeDetails/TreeDetails'; -export const Route = createFileRoute('/tree/$treeId/')({ +export const Route = createFileRoute('/_main/tree/$treeId/')({ component: TreeDetails, }); diff --git a/dashboard/src/routes/tree/$treeId/route.tsx b/dashboard/src/routes/_main/tree/$treeId/route.tsx similarity index 93% rename from dashboard/src/routes/tree/$treeId/route.tsx rename to dashboard/src/routes/_main/tree/$treeId/route.tsx index 8495a9a4e..69d41e07a 100644 --- a/dashboard/src/routes/tree/$treeId/route.tsx +++ b/dashboard/src/routes/_main/tree/$treeId/route.tsx @@ -35,7 +35,7 @@ const treeDetailsSearchSchema = z.object({ tableFilter: zTableFilterInfoValidator, } satisfies SearchSchema); -export const Route = createFileRoute('/tree/$treeId')({ +export const Route = createFileRoute('/_main/tree/$treeId')({ validateSearch: treeDetailsSearchSchema, search: { middlewares: [stripSearchParams(defaultValues)] }, }); diff --git a/dashboard/src/routes/tree/$treeId/test/$testId/index.tsx b/dashboard/src/routes/_main/tree/$treeId/test/$testId/index.tsx similarity index 83% rename from dashboard/src/routes/tree/$treeId/test/$testId/index.tsx rename to dashboard/src/routes/_main/tree/$treeId/test/$testId/index.tsx index 790a1b148..1c5ab032d 100644 --- a/dashboard/src/routes/tree/$treeId/test/$testId/index.tsx +++ b/dashboard/src/routes/_main/tree/$treeId/test/$testId/index.tsx @@ -2,7 +2,7 @@ import { createFileRoute, redirect } from '@tanstack/react-router'; import { RedirectFrom } from '@/types/general'; -export const Route = createFileRoute('/tree/$treeId/test/$testId/')({ +export const Route = createFileRoute('/_main/tree/$treeId/test/$testId/')({ loaderDeps: ({ search }) => ({ search }), loader: async ({ params, deps }) => { throw redirect({ diff --git a/dashboard/src/routes/tree/$treeName/$branch/index.tsx b/dashboard/src/routes/_main/tree/$treeName/$branch/index.tsx similarity index 65% rename from dashboard/src/routes/tree/$treeName/$branch/index.tsx rename to dashboard/src/routes/_main/tree/$treeName/$branch/index.tsx index 7c2415698..563e68c47 100644 --- a/dashboard/src/routes/tree/$treeName/$branch/index.tsx +++ b/dashboard/src/routes/_main/tree/$treeName/$branch/index.tsx @@ -2,6 +2,6 @@ import { createFileRoute } from '@tanstack/react-router'; import { TreeLatest } from '@/pages/TreeLatest'; -export const Route = createFileRoute('/tree/$treeName/$branch/')({ +export const Route = createFileRoute('/_main/tree/$treeName/$branch/')({ component: TreeLatest, }); diff --git a/dashboard/src/routes/tree/index.tsx b/dashboard/src/routes/_main/tree/index.tsx similarity index 80% rename from dashboard/src/routes/tree/index.tsx rename to dashboard/src/routes/_main/tree/index.tsx index 4c9005f2e..6c9943b26 100644 --- a/dashboard/src/routes/tree/index.tsx +++ b/dashboard/src/routes/_main/tree/index.tsx @@ -8,6 +8,6 @@ export const TreeSearchSchema = z.object({ treeSearch: z.string().catch(''), }); -export const Route = createFileRoute('/tree/')({ +export const Route = createFileRoute('/_main/tree/')({ component: Trees, }); diff --git a/dashboard/src/routes/tree/route.tsx b/dashboard/src/routes/_main/tree/route.tsx similarity index 92% rename from dashboard/src/routes/tree/route.tsx rename to dashboard/src/routes/_main/tree/route.tsx index 6777f3dd9..d82feb562 100644 --- a/dashboard/src/routes/tree/route.tsx +++ b/dashboard/src/routes/_main/tree/route.tsx @@ -24,7 +24,7 @@ export const RootSearchSchema = z.object({ listingSize: zListingSize, } satisfies SearchSchema); -export const Route = createFileRoute('/tree')({ +export const Route = createFileRoute('/_main/tree')({ validateSearch: RootSearchSchema, search: { middlewares: [stripSearchParams(defaultValues)] }, }); diff --git a/dashboard/src/routes/hardware/$hardwareId/boot/route.tsx b/dashboard/src/routes/hardware/$hardwareId/boot/route.tsx deleted file mode 100644 index b4094b223..000000000 --- a/dashboard/src/routes/hardware/$hardwareId/boot/route.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router'; - -export const Route = createFileRoute('/hardware/$hardwareId/boot')({}); diff --git a/dashboard/src/routes/hardware/$hardwareId/build/route.tsx b/dashboard/src/routes/hardware/$hardwareId/build/route.tsx deleted file mode 100644 index c7202ebda..000000000 --- a/dashboard/src/routes/hardware/$hardwareId/build/route.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router'; - -export const Route = createFileRoute('/hardware/$hardwareId/build')({}); diff --git a/dashboard/src/routes/hardware/$hardwareId/test/route.tsx b/dashboard/src/routes/hardware/$hardwareId/test/route.tsx deleted file mode 100644 index 88a15c276..000000000 --- a/dashboard/src/routes/hardware/$hardwareId/test/route.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router'; - -export const Route = createFileRoute('/hardware/$hardwareId/test')({}); diff --git a/dashboard/src/routes/tree/$treeId/test/$testId/route.tsx b/dashboard/src/routes/tree/$treeId/test/$testId/route.tsx deleted file mode 100644 index 652b123c6..000000000 --- a/dashboard/src/routes/tree/$treeId/test/$testId/route.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import { createFileRoute } from '@tanstack/react-router'; - -export const Route = createFileRoute('/tree/$treeId/test/$testId')();