diff --git a/webapp/src/components/DataPage.tsx b/webapp/src/components/DataPage.tsx index 243cd2eaa2004ff0b972eb74cdd518081fccdd1c..b3f0f8984ebf644c826a096cbf384910b01b7541 100644 --- a/webapp/src/components/DataPage.tsx +++ b/webapp/src/components/DataPage.tsx @@ -1,5 +1,7 @@ import React, { ReactElement } from "react"; -import { Container, Row, Col } from "react-bootstrap"; +import { Container, Row } from "react-bootstrap"; +import { Link } from "react-router-dom"; + import OrganizationSidebar from "./OrganizationSidebar"; import PageHeader from "../components/global/PageHeader" import SectionLink from "../components/global/SectionLink"; @@ -19,7 +21,11 @@ function DataPage({ title, filter, children, category }: inputProps): ReactEleme <> {category === Sections.Organisation && <OrganizationSidebar />} {category === Sections.Policy && <PolicySidebar />} - <PageHeader type={'data'} header={'Compendium Data'}> + <PageHeader type={'data'} header={<h1 className={'bold-caps-30pt'}> + <Link to="/data" style={{ textDecoration: 'none', color: 'white' }}> + <span>Compendium Data</span> + </Link> + </h1>}> <SectionLink section={"Reports"} /> </PageHeader> <SectionNavigation activeCategory={category} /> diff --git a/webapp/src/components/global/ExternalPageNavBar.tsx b/webapp/src/components/global/ExternalPageNavBar.tsx index 943babbae3ecd662c30b3b63b9fe14219a24ac73..701d7f10813f0aa289c6eaf9a9f295c32a64c73f 100644 --- a/webapp/src/components/global/ExternalPageNavBar.tsx +++ b/webapp/src/components/global/ExternalPageNavBar.tsx @@ -15,7 +15,7 @@ function ExternalPageNavBar(): ReactElement { <Container> <Row> <nav> - <a href="/"><img src={GeantLogo} /></a> + <a href="https://geant.org/"><img src={GeantLogo} /></a> <ul> <li><a href="https://network.geant.org/">NETWORK</a></li> diff --git a/webapp/src/components/global/PageHeader.tsx b/webapp/src/components/global/PageHeader.tsx index a47561710c6f022f605a7dcd86bf62005cdba865..368b3d92cbd667f0d98461020b13f46303634b57 100644 --- a/webapp/src/components/global/PageHeader.tsx +++ b/webapp/src/components/global/PageHeader.tsx @@ -3,7 +3,7 @@ import { Container, Row, Col } from "react-bootstrap"; interface inputProps { type: string, - header: string, + header: ReactElement, children: ReactElement } @@ -20,10 +20,10 @@ function CompendiumHeader({ type, header, children }: inputProps): ReactElement <Container> <Row> <Col sm={8}> - <h1 className={'bold-caps-30pt '}>{header}</h1> + {header} </Col> <Col sm={4}> - {children} + {children} </Col> </Row> </Container> diff --git a/webapp/src/pages/CompendiumData.tsx b/webapp/src/pages/CompendiumData.tsx index c067a1f3db80ba4058c7b2c24b9139264b78a357..0ec005d6874caade886b60b31df2e51f39b5bbb7 100644 --- a/webapp/src/pages/CompendiumData.tsx +++ b/webapp/src/pages/CompendiumData.tsx @@ -10,7 +10,11 @@ import { Sections } from "../helpers/constants"; function CompendiumData(): ReactElement { return ( <main className="content" style={{ backgroundColor: "white" }}> - <PageHeader type={'data'} header={'Compendium Data'}> + <PageHeader type={'data'} header={<h1 className={'bold-caps-30pt'}> + <Link to="/data" style={{ textDecoration: 'none', color: 'white' }}> + <span>Compendium Data</span> + </Link> + </h1>}> <SectionLink section={"Reports"} /> </PageHeader> <Banner type={'data'}>