diff --git a/components/NavBar.js b/components/NavBar.js index 085aa69f..57b19280 100644 --- a/components/NavBar.js +++ b/components/NavBar.js @@ -92,16 +92,16 @@ const SubMenu = () => { href: '/news-media', umami: 'navigation-news-media', }, - // { - // label: , - // href: '/human-rights', - // umami: 'navigation-human-rights', - // }, { label: , href: '/circumvention', umami: 'navigation-circumvention', }, + // { + // label: , + // href: '/human-rights', + // umami: 'navigation-human-rights', + // }, { label: , href: '/domains', diff --git a/pages/human-rights.js b/pages/human-rights.js index 29e5e268..d01afca8 100644 --- a/pages/human-rights.js +++ b/pages/human-rights.js @@ -1,15 +1,9 @@ -import ChartWrapper from 'components/ChartWrapper' -import Form from 'components/domain/Form' -import FindingsSection from 'components/FindingsSection' -import ReportsSection from 'components/ReportsSection' -import { - StickySubMenuUpdated, - StyledStickySubMenu, -} from 'components/SharedStyledComponents' -import { getCountries, getReports } from 'lib/api' import { useRouter } from 'next/router' import { useIntl } from 'react-intl' +import ThematicPage from 'components/ThematicPage' +import { getCountries, getReports } from 'lib/api' + export const getServerSideProps = async () => { try { const reports = await getReports('theme-human_rights') @@ -39,7 +33,7 @@ const HUMAN_RIGHTS_DOMAINS = [ 'www.fidh.org', ] -const HumanRights = ({ countries, reports }) => { +const HumanRights = (props) => { const intl = useIntl() const router = useRouter() const { query } = router @@ -66,41 +60,38 @@ const HumanRights = ({ countries, reports }) => { } } + const domains = HUMAN_RIGHTS_DOMAINS.sort((a, b) => { + return a.replace('www.', '').localeCompare(b.replace('www.', '')) + }) + return ( -
- - Findings - Reports - Websites - - } - /> - - - -
-
c.alpha_2)} - /> -
-
- {HUMAN_RIGHTS_DOMAINS.map((domain) => ( -
- -
- ))} -
+ + Findings + Reports + Websites + + } + text={ + <> + {/* */} +
    + {domains.map((d) => ( +
  • + {d} +
  • + ))} +
+ + } + /> ) }