From 4c05334283a954678fe6ff17e5ce9d6cbd3a902d Mon Sep 17 00:00:00 2001 From: s8613 Date: Sun, 29 Jun 2025 21:29:39 +0200 Subject: [PATCH] routing ff --- .../frontend/src/components/ConfigTable.tsx | 2 +- .../src/components/KennzahlenTable.tsx | 2 +- .../src/components/PitchBooksTable.tsx | 2 +- .../frontend/src/components/UploadPage.tsx | 8 +- project/frontend/src/main.tsx | 8 +- project/frontend/src/routeTree.gen.ts | 290 +++++++++--------- .../src/routes/{ => ff}/config-add.tsx | 14 +- .../routes/{ => ff}/config-detail.$kpiId.tsx | 14 +- .../frontend/src/routes/{ => ff}/config.tsx | 14 +- .../{ => ff}/extractedResult.$pitchBook.tsx | 14 +- .../extractedResult_.$pitchBook.$kpi.tsx | 16 +- .../frontend/src/routes/{ => ff}/index.tsx | 4 +- .../src/routes/{ => ff}/pitchbooks.tsx | 10 +- project/frontend/vite.config.js | 2 +- 14 files changed, 204 insertions(+), 196 deletions(-) rename project/frontend/src/routes/{ => ff}/config-add.tsx (91%) rename project/frontend/src/routes/{ => ff}/config-detail.$kpiId.tsx (95%) rename project/frontend/src/routes/{ => ff}/config.tsx (96%) rename project/frontend/src/routes/{ => ff}/extractedResult.$pitchBook.tsx (94%) rename project/frontend/src/routes/{ => ff}/extractedResult_.$pitchBook.$kpi.tsx (97%) rename project/frontend/src/routes/{ => ff}/index.tsx (55%) rename project/frontend/src/routes/{ => ff}/pitchbooks.tsx (88%) diff --git a/project/frontend/src/components/ConfigTable.tsx b/project/frontend/src/components/ConfigTable.tsx index 1bfcb38..70cf7a9 100644 --- a/project/frontend/src/components/ConfigTable.tsx +++ b/project/frontend/src/components/ConfigTable.tsx @@ -181,7 +181,7 @@ export function ConfigTable({ from, trainingRunning }: ConfigTableProps) { } navigate({ - to: `/config-detail/$kpiId`, + to: `/ff/config-detail/$kpiId`, params: { kpiId: kennzahl.id.toString() }, search: from ? { from } : undefined, }); diff --git a/project/frontend/src/components/KennzahlenTable.tsx b/project/frontend/src/components/KennzahlenTable.tsx index 71091d2..95a7080 100644 --- a/project/frontend/src/components/KennzahlenTable.tsx +++ b/project/frontend/src/components/KennzahlenTable.tsx @@ -170,7 +170,7 @@ export default function KennzahlenTable({ const handleNavigateToDetail = (settingName: string) => { navigate({ - to: "/extractedResult/$pitchBook/$kpi", + to: "/ff/extractedResult/$pitchBook/$kpi", params: { pitchBook: pdfId, kpi: settingName, diff --git a/project/frontend/src/components/PitchBooksTable.tsx b/project/frontend/src/components/PitchBooksTable.tsx index 8eaf63f..b4785b2 100644 --- a/project/frontend/src/components/PitchBooksTable.tsx +++ b/project/frontend/src/components/PitchBooksTable.tsx @@ -59,7 +59,7 @@ export function PitchBooksTable() { const handleRowClick = (pitchBookId: number) => { navigate({ - to: "/extractedResult/$pitchBook", + to: "/ff/extractedResult/$pitchBook", params: { pitchBook: pitchBookId.toString() }, search: { from: "overview" }, }); diff --git a/project/frontend/src/components/UploadPage.tsx b/project/frontend/src/components/UploadPage.tsx index 4c79be0..dd4172f 100644 --- a/project/frontend/src/components/UploadPage.tsx +++ b/project/frontend/src/components/UploadPage.tsx @@ -47,7 +47,7 @@ export default function UploadPage() { setPageId(null); setLoadingState(null); navigate({ - to: "/extractedResult/$pitchBook", + to: "/ff/extractedResult/$pitchBook", params: { pitchBook: progress.id.toString() }, }); } @@ -109,7 +109,7 @@ export default function UploadPage() { /> - navigate({ to: "/config" })}> + navigate({ to: "/ff/config" })}> @@ -204,8 +204,8 @@ export default function UploadPage() { backgroundColor: "#383838", "&:hover": { backgroundColor: "#2e2e2e" }, }} - onMouseEnter={() => router.preloadRoute({ to: "/pitchbooks" })} - onClick={() => navigate({ to: "/pitchbooks" })} + onMouseEnter={() => router.preloadRoute({ to: "/ff/pitchbooks" })} + onClick={() => navigate({ to: "/ff/pitchbooks" })} > Alle Pitchbooks anzeigen diff --git a/project/frontend/src/main.tsx b/project/frontend/src/main.tsx index bffa8aa..3f7a854 100644 --- a/project/frontend/src/main.tsx +++ b/project/frontend/src/main.tsx @@ -1,6 +1,6 @@ import CssBaseline from "@mui/material/CssBaseline"; import { ThemeProvider, createTheme } from "@mui/material/styles"; -import { RouterProvider, createRouter } from "@tanstack/react-router"; +import {Link, RouterProvider, createRouter } from "@tanstack/react-router"; import { StrictMode } from "react"; import ReactDOM from "react-dom/client"; import "react-pdf/dist/Page/TextLayer.css"; @@ -27,6 +27,12 @@ const router = createRouter({ scrollRestoration: true, defaultStructuralSharing: true, defaultPreloadStaleTime: 0, + defaultNotFoundComponent: () => ( +
+

Not found!

+ Upload +
+ ), }); // Register the router instance for type safety diff --git a/project/frontend/src/routeTree.gen.ts b/project/frontend/src/routeTree.gen.ts index 5377387..0ee897a 100644 --- a/project/frontend/src/routeTree.gen.ts +++ b/project/frontend/src/routeTree.gen.ts @@ -11,56 +11,58 @@ // Import Routes import { Route as rootRoute } from './routes/__root' -import { Route as PitchbooksImport } from './routes/pitchbooks' -import { Route as ConfigAddImport } from './routes/config-add' -import { Route as ConfigImport } from './routes/config' -import { Route as IndexImport } from './routes/index' -import { Route as ExtractedResultPitchBookImport } from './routes/extractedResult.$pitchBook' -import { Route as ConfigDetailKpiIdImport } from './routes/config-detail.$kpiId' -import { Route as ExtractedResultPitchBookKpiImport } from './routes/extractedResult_.$pitchBook.$kpi' +import { Route as FfIndexImport } from './routes/ff/index' +import { Route as FfPitchbooksImport } from './routes/ff/pitchbooks' +import { Route as FfConfigAddImport } from './routes/ff/config-add' +import { Route as FfConfigImport } from './routes/ff/config' +import { Route as FfExtractedResultPitchBookImport } from './routes/ff/extractedResult.$pitchBook' +import { Route as FfConfigDetailKpiIdImport } from './routes/ff/config-detail.$kpiId' +import { Route as FfExtractedResultPitchBookKpiImport } from './routes/ff/extractedResult_.$pitchBook.$kpi' // Create/Update Routes -const PitchbooksRoute = PitchbooksImport.update({ - id: '/pitchbooks', - path: '/pitchbooks', +const FfIndexRoute = FfIndexImport.update({ + id: '/ff/', + path: '/ff/', getParentRoute: () => rootRoute, } as any) -const ConfigAddRoute = ConfigAddImport.update({ - id: '/config-add', - path: '/config-add', +const FfPitchbooksRoute = FfPitchbooksImport.update({ + id: '/ff/pitchbooks', + path: '/ff/pitchbooks', getParentRoute: () => rootRoute, } as any) -const ConfigRoute = ConfigImport.update({ - id: '/config', - path: '/config', +const FfConfigAddRoute = FfConfigAddImport.update({ + id: '/ff/config-add', + path: '/ff/config-add', getParentRoute: () => rootRoute, } as any) -const IndexRoute = IndexImport.update({ - id: '/', - path: '/', +const FfConfigRoute = FfConfigImport.update({ + id: '/ff/config', + path: '/ff/config', getParentRoute: () => rootRoute, } as any) -const ExtractedResultPitchBookRoute = ExtractedResultPitchBookImport.update({ - id: '/extractedResult/$pitchBook', - path: '/extractedResult/$pitchBook', +const FfExtractedResultPitchBookRoute = FfExtractedResultPitchBookImport.update( + { + id: '/ff/extractedResult/$pitchBook', + path: '/ff/extractedResult/$pitchBook', + getParentRoute: () => rootRoute, + } as any, +) + +const FfConfigDetailKpiIdRoute = FfConfigDetailKpiIdImport.update({ + id: '/ff/config-detail/$kpiId', + path: '/ff/config-detail/$kpiId', getParentRoute: () => rootRoute, } as any) -const ConfigDetailKpiIdRoute = ConfigDetailKpiIdImport.update({ - id: '/config-detail/$kpiId', - path: '/config-detail/$kpiId', - getParentRoute: () => rootRoute, -} as any) - -const ExtractedResultPitchBookKpiRoute = - ExtractedResultPitchBookKpiImport.update({ - id: '/extractedResult_/$pitchBook/$kpi', - path: '/extractedResult/$pitchBook/$kpi', +const FfExtractedResultPitchBookKpiRoute = + FfExtractedResultPitchBookKpiImport.update({ + id: '/ff/extractedResult_/$pitchBook/$kpi', + path: '/ff/extractedResult/$pitchBook/$kpi', getParentRoute: () => rootRoute, } as any) @@ -68,53 +70,53 @@ const ExtractedResultPitchBookKpiRoute = declare module '@tanstack/react-router' { interface FileRoutesByPath { - '/': { - id: '/' - path: '/' - fullPath: '/' - preLoaderRoute: typeof IndexImport + '/ff/config': { + id: '/ff/config' + path: '/ff/config' + fullPath: '/ff/config' + preLoaderRoute: typeof FfConfigImport parentRoute: typeof rootRoute } - '/config': { - id: '/config' - path: '/config' - fullPath: '/config' - preLoaderRoute: typeof ConfigImport + '/ff/config-add': { + id: '/ff/config-add' + path: '/ff/config-add' + fullPath: '/ff/config-add' + preLoaderRoute: typeof FfConfigAddImport parentRoute: typeof rootRoute } - '/config-add': { - id: '/config-add' - path: '/config-add' - fullPath: '/config-add' - preLoaderRoute: typeof ConfigAddImport + '/ff/pitchbooks': { + id: '/ff/pitchbooks' + path: '/ff/pitchbooks' + fullPath: '/ff/pitchbooks' + preLoaderRoute: typeof FfPitchbooksImport parentRoute: typeof rootRoute } - '/pitchbooks': { - id: '/pitchbooks' - path: '/pitchbooks' - fullPath: '/pitchbooks' - preLoaderRoute: typeof PitchbooksImport + '/ff/': { + id: '/ff/' + path: '/ff' + fullPath: '/ff' + preLoaderRoute: typeof FfIndexImport parentRoute: typeof rootRoute } - '/config-detail/$kpiId': { - id: '/config-detail/$kpiId' - path: '/config-detail/$kpiId' - fullPath: '/config-detail/$kpiId' - preLoaderRoute: typeof ConfigDetailKpiIdImport + '/ff/config-detail/$kpiId': { + id: '/ff/config-detail/$kpiId' + path: '/ff/config-detail/$kpiId' + fullPath: '/ff/config-detail/$kpiId' + preLoaderRoute: typeof FfConfigDetailKpiIdImport parentRoute: typeof rootRoute } - '/extractedResult/$pitchBook': { - id: '/extractedResult/$pitchBook' - path: '/extractedResult/$pitchBook' - fullPath: '/extractedResult/$pitchBook' - preLoaderRoute: typeof ExtractedResultPitchBookImport + '/ff/extractedResult/$pitchBook': { + id: '/ff/extractedResult/$pitchBook' + path: '/ff/extractedResult/$pitchBook' + fullPath: '/ff/extractedResult/$pitchBook' + preLoaderRoute: typeof FfExtractedResultPitchBookImport parentRoute: typeof rootRoute } - '/extractedResult_/$pitchBook/$kpi': { - id: '/extractedResult_/$pitchBook/$kpi' - path: '/extractedResult/$pitchBook/$kpi' - fullPath: '/extractedResult/$pitchBook/$kpi' - preLoaderRoute: typeof ExtractedResultPitchBookKpiImport + '/ff/extractedResult_/$pitchBook/$kpi': { + id: '/ff/extractedResult_/$pitchBook/$kpi' + path: '/ff/extractedResult/$pitchBook/$kpi' + fullPath: '/ff/extractedResult/$pitchBook/$kpi' + preLoaderRoute: typeof FfExtractedResultPitchBookKpiImport parentRoute: typeof rootRoute } } @@ -123,85 +125,85 @@ declare module '@tanstack/react-router' { // Create and export the route tree export interface FileRoutesByFullPath { - '/': typeof IndexRoute - '/config': typeof ConfigRoute - '/config-add': typeof ConfigAddRoute - '/pitchbooks': typeof PitchbooksRoute - '/config-detail/$kpiId': typeof ConfigDetailKpiIdRoute - '/extractedResult/$pitchBook': typeof ExtractedResultPitchBookRoute - '/extractedResult/$pitchBook/$kpi': typeof ExtractedResultPitchBookKpiRoute + '/ff/config': typeof FfConfigRoute + '/ff/config-add': typeof FfConfigAddRoute + '/ff/pitchbooks': typeof FfPitchbooksRoute + '/ff': typeof FfIndexRoute + '/ff/config-detail/$kpiId': typeof FfConfigDetailKpiIdRoute + '/ff/extractedResult/$pitchBook': typeof FfExtractedResultPitchBookRoute + '/ff/extractedResult/$pitchBook/$kpi': typeof FfExtractedResultPitchBookKpiRoute } export interface FileRoutesByTo { - '/': typeof IndexRoute - '/config': typeof ConfigRoute - '/config-add': typeof ConfigAddRoute - '/pitchbooks': typeof PitchbooksRoute - '/config-detail/$kpiId': typeof ConfigDetailKpiIdRoute - '/extractedResult/$pitchBook': typeof ExtractedResultPitchBookRoute - '/extractedResult/$pitchBook/$kpi': typeof ExtractedResultPitchBookKpiRoute + '/ff/config': typeof FfConfigRoute + '/ff/config-add': typeof FfConfigAddRoute + '/ff/pitchbooks': typeof FfPitchbooksRoute + '/ff': typeof FfIndexRoute + '/ff/config-detail/$kpiId': typeof FfConfigDetailKpiIdRoute + '/ff/extractedResult/$pitchBook': typeof FfExtractedResultPitchBookRoute + '/ff/extractedResult/$pitchBook/$kpi': typeof FfExtractedResultPitchBookKpiRoute } export interface FileRoutesById { __root__: typeof rootRoute - '/': typeof IndexRoute - '/config': typeof ConfigRoute - '/config-add': typeof ConfigAddRoute - '/pitchbooks': typeof PitchbooksRoute - '/config-detail/$kpiId': typeof ConfigDetailKpiIdRoute - '/extractedResult/$pitchBook': typeof ExtractedResultPitchBookRoute - '/extractedResult_/$pitchBook/$kpi': typeof ExtractedResultPitchBookKpiRoute + '/ff/config': typeof FfConfigRoute + '/ff/config-add': typeof FfConfigAddRoute + '/ff/pitchbooks': typeof FfPitchbooksRoute + '/ff/': typeof FfIndexRoute + '/ff/config-detail/$kpiId': typeof FfConfigDetailKpiIdRoute + '/ff/extractedResult/$pitchBook': typeof FfExtractedResultPitchBookRoute + '/ff/extractedResult_/$pitchBook/$kpi': typeof FfExtractedResultPitchBookKpiRoute } export interface FileRouteTypes { fileRoutesByFullPath: FileRoutesByFullPath fullPaths: - | '/' - | '/config' - | '/config-add' - | '/pitchbooks' - | '/config-detail/$kpiId' - | '/extractedResult/$pitchBook' - | '/extractedResult/$pitchBook/$kpi' + | '/ff/config' + | '/ff/config-add' + | '/ff/pitchbooks' + | '/ff' + | '/ff/config-detail/$kpiId' + | '/ff/extractedResult/$pitchBook' + | '/ff/extractedResult/$pitchBook/$kpi' fileRoutesByTo: FileRoutesByTo to: - | '/' - | '/config' - | '/config-add' - | '/pitchbooks' - | '/config-detail/$kpiId' - | '/extractedResult/$pitchBook' - | '/extractedResult/$pitchBook/$kpi' + | '/ff/config' + | '/ff/config-add' + | '/ff/pitchbooks' + | '/ff' + | '/ff/config-detail/$kpiId' + | '/ff/extractedResult/$pitchBook' + | '/ff/extractedResult/$pitchBook/$kpi' id: | '__root__' - | '/' - | '/config' - | '/config-add' - | '/pitchbooks' - | '/config-detail/$kpiId' - | '/extractedResult/$pitchBook' - | '/extractedResult_/$pitchBook/$kpi' + | '/ff/config' + | '/ff/config-add' + | '/ff/pitchbooks' + | '/ff/' + | '/ff/config-detail/$kpiId' + | '/ff/extractedResult/$pitchBook' + | '/ff/extractedResult_/$pitchBook/$kpi' fileRoutesById: FileRoutesById } export interface RootRouteChildren { - IndexRoute: typeof IndexRoute - ConfigRoute: typeof ConfigRoute - ConfigAddRoute: typeof ConfigAddRoute - PitchbooksRoute: typeof PitchbooksRoute - ConfigDetailKpiIdRoute: typeof ConfigDetailKpiIdRoute - ExtractedResultPitchBookRoute: typeof ExtractedResultPitchBookRoute - ExtractedResultPitchBookKpiRoute: typeof ExtractedResultPitchBookKpiRoute + FfConfigRoute: typeof FfConfigRoute + FfConfigAddRoute: typeof FfConfigAddRoute + FfPitchbooksRoute: typeof FfPitchbooksRoute + FfIndexRoute: typeof FfIndexRoute + FfConfigDetailKpiIdRoute: typeof FfConfigDetailKpiIdRoute + FfExtractedResultPitchBookRoute: typeof FfExtractedResultPitchBookRoute + FfExtractedResultPitchBookKpiRoute: typeof FfExtractedResultPitchBookKpiRoute } const rootRouteChildren: RootRouteChildren = { - IndexRoute: IndexRoute, - ConfigRoute: ConfigRoute, - ConfigAddRoute: ConfigAddRoute, - PitchbooksRoute: PitchbooksRoute, - ConfigDetailKpiIdRoute: ConfigDetailKpiIdRoute, - ExtractedResultPitchBookRoute: ExtractedResultPitchBookRoute, - ExtractedResultPitchBookKpiRoute: ExtractedResultPitchBookKpiRoute, + FfConfigRoute: FfConfigRoute, + FfConfigAddRoute: FfConfigAddRoute, + FfPitchbooksRoute: FfPitchbooksRoute, + FfIndexRoute: FfIndexRoute, + FfConfigDetailKpiIdRoute: FfConfigDetailKpiIdRoute, + FfExtractedResultPitchBookRoute: FfExtractedResultPitchBookRoute, + FfExtractedResultPitchBookKpiRoute: FfExtractedResultPitchBookKpiRoute, } export const routeTree = rootRoute @@ -214,35 +216,35 @@ export const routeTree = rootRoute "__root__": { "filePath": "__root.tsx", "children": [ - "/", - "/config", - "/config-add", - "/pitchbooks", - "/config-detail/$kpiId", - "/extractedResult/$pitchBook", - "/extractedResult_/$pitchBook/$kpi" + "/ff/config", + "/ff/config-add", + "/ff/pitchbooks", + "/ff/", + "/ff/config-detail/$kpiId", + "/ff/extractedResult/$pitchBook", + "/ff/extractedResult_/$pitchBook/$kpi" ] }, - "/": { - "filePath": "index.tsx" + "/ff/config": { + "filePath": "ff/config.tsx" }, - "/config": { - "filePath": "config.tsx" + "/ff/config-add": { + "filePath": "ff/config-add.tsx" }, - "/config-add": { - "filePath": "config-add.tsx" + "/ff/pitchbooks": { + "filePath": "ff/pitchbooks.tsx" }, - "/pitchbooks": { - "filePath": "pitchbooks.tsx" + "/ff/": { + "filePath": "ff/index.tsx" }, - "/config-detail/$kpiId": { - "filePath": "config-detail.$kpiId.tsx" + "/ff/config-detail/$kpiId": { + "filePath": "ff/config-detail.$kpiId.tsx" }, - "/extractedResult/$pitchBook": { - "filePath": "extractedResult.$pitchBook.tsx" + "/ff/extractedResult/$pitchBook": { + "filePath": "ff/extractedResult.$pitchBook.tsx" }, - "/extractedResult_/$pitchBook/$kpi": { - "filePath": "extractedResult_.$pitchBook.$kpi.tsx" + "/ff/extractedResult_/$pitchBook/$kpi": { + "filePath": "ff/extractedResult_.$pitchBook.$kpi.tsx" } } } diff --git a/project/frontend/src/routes/config-add.tsx b/project/frontend/src/routes/ff/config-add.tsx similarity index 91% rename from project/frontend/src/routes/config-add.tsx rename to project/frontend/src/routes/ff/config-add.tsx index 15db17a..b3947d6 100644 --- a/project/frontend/src/routes/config-add.tsx +++ b/project/frontend/src/routes/ff/config-add.tsx @@ -1,12 +1,12 @@ import { createFileRoute, useNavigate } from "@tanstack/react-router"; import { Box, Typography, IconButton } from "@mui/material"; import ArrowBackIcon from "@mui/icons-material/ArrowBack"; -import { KPIForm } from "../components/KPIForm"; -import type { Kennzahl } from "../types/kpi"; -import { API_HOST } from "../util/api"; +import { KPIForm } from "../../components/KPIForm"; +import type { Kennzahl } from "../../types/kpi"; +import { API_HOST } from "../../util/api"; -export const Route = createFileRoute("/config-add")({ +export const Route = createFileRoute("/ff/config-add")({ component: ConfigAddPage, validateSearch: (search: Record): { from?: string } => { return { @@ -21,7 +21,7 @@ function ConfigAddPage() { const handleBack = () => { navigate({ - to: "/config", + to: "/ff/config", search: from ? { from } : undefined, }); }; @@ -54,7 +54,7 @@ function ConfigAddPage() { } navigate({ - to: "/config", + to: "/ff/config", search: { success: "true", ...(from ? { from } : {}) }, }); @@ -67,7 +67,7 @@ function ConfigAddPage() { const handleCancel = () => { navigate({ - to: "/config", + to: "/ff/config", search: from ? { from } : undefined, }); }; diff --git a/project/frontend/src/routes/config-detail.$kpiId.tsx b/project/frontend/src/routes/ff/config-detail.$kpiId.tsx similarity index 95% rename from project/frontend/src/routes/config-detail.$kpiId.tsx rename to project/frontend/src/routes/ff/config-detail.$kpiId.tsx index 425ff0d..2898ffa 100644 --- a/project/frontend/src/routes/config-detail.$kpiId.tsx +++ b/project/frontend/src/routes/ff/config-detail.$kpiId.tsx @@ -4,12 +4,12 @@ import { } from "@mui/material"; import ArrowBackIcon from "@mui/icons-material/ArrowBack"; import { useEffect, useState } from "react"; -import type { Kennzahl } from "../types/kpi"; -import { KPIForm } from "../components/KPIForm"; -import { typeDisplayMapping } from "../types/kpi"; -import { API_HOST } from "../util/api"; +import type { Kennzahl } from "../../types/kpi"; +import { KPIForm } from "../../components/KPIForm"; +import { typeDisplayMapping } from "../../types/kpi"; +import { API_HOST } from "../../util/api"; -export const Route = createFileRoute("/config-detail/$kpiId")({ +export const Route = createFileRoute("/ff/config-detail/$kpiId")({ component: KPIDetailPage, validateSearch: (search: Record): { from?: string } => { return { @@ -29,7 +29,7 @@ function KPIDetailPage() { const handleBack = () => { navigate({ - to: "/config", + to: "/ff/config", search: from ? { from } : undefined }); }; @@ -121,7 +121,7 @@ function KPIDetailPage() { diff --git a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx b/project/frontend/src/routes/ff/extractedResult_.$pitchBook.$kpi.tsx similarity index 97% rename from project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx rename to project/frontend/src/routes/ff/extractedResult_.$pitchBook.$kpi.tsx index 1fbf5fd..8be54cb 100644 --- a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx +++ b/project/frontend/src/routes/ff/extractedResult_.$pitchBook.$kpi.tsx @@ -28,12 +28,12 @@ import { } from "@tanstack/react-query"; import { createFileRoute, useNavigate } from "@tanstack/react-router"; import { useEffect, useState, type KeyboardEvent } from "react"; -import PDFViewer from "../components/pdfViewer"; -import { fetchPutKPI } from "../util/api"; -import { kpiQueryOptions } from "../util/query"; +import PDFViewer from "../../components/pdfViewer"; +import { fetchPutKPI } from "../../util/api"; +import { kpiQueryOptions } from "../../util/query"; import { redirect } from "@tanstack/react-router"; -export const Route = createFileRoute("/extractedResult_/$pitchBook/$kpi")({ +export const Route = createFileRoute("/ff/extractedResult_/$pitchBook/$kpi")({ component: ExtractedResultsPage, validateSearch: (search: Record) => { return { @@ -45,7 +45,7 @@ export const Route = createFileRoute("/extractedResult_/$pitchBook/$kpi")({ return await queryClient.ensureQueryData(kpiQueryOptions(pitchBook)); } catch (err) { throw redirect({ - to: "/" + to: "/ff" }); } }, @@ -151,7 +151,7 @@ function ExtractedResultsPage() { queryKey: ["pitchBookKPI", pitchBook], }); navigate({ - to: "/extractedResult/$pitchBook", + to: "/ff/extractedResult/$pitchBook", params: { pitchBook }, search: from ? { from } : undefined }); @@ -216,7 +216,7 @@ function ExtractedResultsPage() { setShowConfirmDialog(true); } else { navigate({ - to: "/extractedResult/$pitchBook", + to: "/ff/extractedResult/$pitchBook", params: { pitchBook }, search: from ? { from } : undefined }); @@ -226,7 +226,7 @@ function ExtractedResultsPage() { const handleConfirmDiscard = () => { setShowConfirmDialog(false); navigate({ - to: "/extractedResult/$pitchBook", + to: "/ff/extractedResult/$pitchBook", params: { pitchBook }, search: from ? { from } : undefined }); diff --git a/project/frontend/src/routes/index.tsx b/project/frontend/src/routes/ff/index.tsx similarity index 55% rename from project/frontend/src/routes/index.tsx rename to project/frontend/src/routes/ff/index.tsx index 446d9e4..f4d6acc 100644 --- a/project/frontend/src/routes/index.tsx +++ b/project/frontend/src/routes/ff/index.tsx @@ -1,8 +1,8 @@ import { createFileRoute } from "@tanstack/react-router"; -import UploadPage from "../components/UploadPage"; +import UploadPage from "../../components/UploadPage"; -export const Route = createFileRoute("/")({ +export const Route = createFileRoute("/ff/")({ component: App, }); diff --git a/project/frontend/src/routes/pitchbooks.tsx b/project/frontend/src/routes/ff/pitchbooks.tsx similarity index 88% rename from project/frontend/src/routes/pitchbooks.tsx rename to project/frontend/src/routes/ff/pitchbooks.tsx index e0d2da0..c4005e8 100644 --- a/project/frontend/src/routes/pitchbooks.tsx +++ b/project/frontend/src/routes/ff/pitchbooks.tsx @@ -3,10 +3,10 @@ import { Box, Typography, IconButton } from "@mui/material"; import ArrowBackIcon from "@mui/icons-material/ArrowBack"; import SettingsIcon from "@mui/icons-material/Settings"; import { useNavigate } from "@tanstack/react-router"; -import { PitchBooksTable } from "../components/PitchBooksTable"; -import { pitchBooksQueryOptions } from "../util/query"; +import { PitchBooksTable } from "../../components/PitchBooksTable"; +import { pitchBooksQueryOptions } from "../../util/query"; -export const Route = createFileRoute("/pitchbooks")({ +export const Route = createFileRoute("/ff/pitchbooks")({ component: PitchBooksPage, loader: ({ context: { queryClient } }) => queryClient.ensureQueryData(pitchBooksQueryOptions()), @@ -35,7 +35,7 @@ function PitchBooksPage() { mb={4} > - navigate({ to: "/" })}> + navigate({ to: "/ff" })}> @@ -44,7 +44,7 @@ function PitchBooksPage() { navigate({ - to: "/config", + to: "/ff/config", search: { from: "pitchbooks" } })} > diff --git a/project/frontend/vite.config.js b/project/frontend/vite.config.js index 690ef60..f746af2 100644 --- a/project/frontend/vite.config.js +++ b/project/frontend/vite.config.js @@ -4,7 +4,7 @@ import { defineConfig } from "vite"; // https://vitejs.dev/config/ export default defineConfig({ - base: "./", + base: "/ff/", plugins: [TanStackRouterVite({ autoCodeSplitting: true }), viteReact()], build: { chunkSizeWarningLimit: 1000, // default ist 500