From cfecfa5a3cdf35dda21bd65e0ef53d0f72bb33f4 Mon Sep 17 00:00:00 2001 From: fsimonjetz Date: Tue, 23 Apr 2024 09:54:15 +0000 Subject: [PATCH] rename Introduction to Home; add menuTitle --- src/research-projects/subpages/ResearchProjects.sass | 2 ++ .../subpages/caic/{Introduction.tsx => Home.tsx} | 4 ++-- src/research-projects/subpages/caic/PageContent.tsx | 7 +++++-- src/research-projects/subpages/caic/TableOfContents.tsx | 5 +++-- src/research-projects/subpages/subpages.test.tsx | 2 +- src/router/researchProjectRoutes.tsx | 6 +++--- 6 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 src/research-projects/subpages/ResearchProjects.sass rename src/research-projects/subpages/caic/{Introduction.tsx => Home.tsx} (95%) diff --git a/src/research-projects/subpages/ResearchProjects.sass b/src/research-projects/subpages/ResearchProjects.sass new file mode 100644 index 000000000..f85d6665e --- /dev/null +++ b/src/research-projects/subpages/ResearchProjects.sass @@ -0,0 +1,2 @@ +.project-page__sidebar + flex-direction: column diff --git a/src/research-projects/subpages/caic/Introduction.tsx b/src/research-projects/subpages/caic/Home.tsx similarity index 95% rename from src/research-projects/subpages/caic/Introduction.tsx rename to src/research-projects/subpages/caic/Home.tsx index 20aa96a63..27a016063 100644 --- a/src/research-projects/subpages/caic/Introduction.tsx +++ b/src/research-projects/subpages/caic/Home.tsx @@ -4,7 +4,7 @@ import SearchForm, { SearchFormProps } from 'fragmentarium/ui/SearchForm' import { SearchResult } from 'fragmentarium/ui/search/FragmentariumSearchResult' import PageContent from 'research-projects/subpages/caic/PageContent' -export default function Introduction({ +export default function Home({ fragmentService, fragmentSearchService, bibliographyService, @@ -19,7 +19,7 @@ export default function Introduction({ | 'fragmentQuery' >): JSX.Element { return ( - +

The cuneiform artifacts of the Iraq Museum in Baghdad are a central part of the cultural heritage of Mesopotamia, which is of great importance to diff --git a/src/research-projects/subpages/caic/PageContent.tsx b/src/research-projects/subpages/caic/PageContent.tsx index c09ea6746..eee7b9a02 100644 --- a/src/research-projects/subpages/caic/PageContent.tsx +++ b/src/research-projects/subpages/caic/PageContent.tsx @@ -7,15 +7,18 @@ import TableOfContents from 'research-projects/subpages/caic/TableOfContents' export default function PageContent({ title, + menuTitle, children, -}: { title: string } & PropsWithChildren): JSX.Element { +}: { title: string; menuTitle?: string } & PropsWithChildren< + unknown +>): JSX.Element { return ( diff --git a/src/research-projects/subpages/caic/TableOfContents.tsx b/src/research-projects/subpages/caic/TableOfContents.tsx index 0a8a5ac20..077dd2411 100644 --- a/src/research-projects/subpages/caic/TableOfContents.tsx +++ b/src/research-projects/subpages/caic/TableOfContents.tsx @@ -3,6 +3,7 @@ import React from 'react' import { Nav } from 'react-bootstrap' import { ResearchProjects } from 'research-projects/researchProject' import TocLink from 'research-projects/subpages/TocLink' +import 'research-projects/subpages/ResearchProjects.sass' function CaicTocLink({ isHome, @@ -19,8 +20,8 @@ function CaicTocLink({ export default function TableOfContents(): JSX.Element { return ( -