diff --git a/frontend/__tests__/Home.test.tsx b/frontend/__tests__/Home.test.tsx index 679e2e5..6a3bf9e 100644 --- a/frontend/__tests__/Home.test.tsx +++ b/frontend/__tests__/Home.test.tsx @@ -54,17 +54,10 @@ describe('pages/index.tsx', () => { expect(page).toBeInTheDocument() }) - it('renders counts on KIN Home page', () => { + it('renders Our Programs section on KIN Home page', () => { render(WrappedComponentWithProps(Home,{props})) - // software_cnt - // const software = screen.getByText(`${props.counts.software_cnt} Software`) - // expect(software).toBeInTheDocument() - // project_cnt - const project = screen.getByText(`${props.counts.project_cnt} Projects`) + const project = screen.getByText('Our Programs') expect(project).toBeInTheDocument() - // organisation_cnt - const organisation = screen.getByText(`${props.counts.organisation_cnt} Organisations`) - expect(organisation).toBeInTheDocument() }) // it('renders Helmholtz Home page when host=helmholtz', () => { diff --git a/frontend/components/AppFooter/OrganisationLogo.tsx b/frontend/components/AppFooter/OrganisationLogo.tsx index 6e86265..902029c 100644 --- a/frontend/components/AppFooter/OrganisationLogo.tsx +++ b/frontend/components/AppFooter/OrganisationLogo.tsx @@ -13,8 +13,7 @@ export default function OrganisationLogo({host}: { host: RsdHost }) { const {name,logo_url,website}=host return (
- + - + {/*
*/} -
+
diff --git a/frontend/components/home/kin/StatsSection.tsx b/frontend/components/home/kin/StatsSection.tsx deleted file mode 100644 index c9642df..0000000 --- a/frontend/components/home/kin/StatsSection.tsx +++ /dev/null @@ -1,42 +0,0 @@ -// SPDX-FileCopyrightText: 2024 Dusan Mijatovic (Netherlands eScience Center) -// SPDX-FileCopyrightText: 2024 Netherlands eScience Center -// -// SPDX-License-Identifier: Apache-2.0 - -type StarsSectionProps={ - project_cnt: number, - organisation_cnt: number, - contributor_cnt: number, - software_mention_cnt: number, -} - - -export default function StarsSection({ - project_cnt,organisation_cnt, - contributor_cnt,software_mention_cnt -}:StarsSectionProps) { - return ( -
- -
-
{project_cnt} Projects
-
registered
-
- -
-
{organisation_cnt} Organisations
-
contributed
-
- -
-
{contributor_cnt} Contributors
-
to research software
-
- -
-
{software_mention_cnt} Mentions
-
of research software
-
-
- ) -} diff --git a/frontend/components/home/kin/TopNewsSection.tsx b/frontend/components/home/kin/TopNewsSection.tsx deleted file mode 100644 index 72a33a3..0000000 --- a/frontend/components/home/kin/TopNewsSection.tsx +++ /dev/null @@ -1,72 +0,0 @@ -// SPDX-FileCopyrightText: 2024 Dusan Mijatovic (Netherlands eScience Center) -// SPDX-FileCopyrightText: 2024 Netherlands eScience Center -// -// SPDX-License-Identifier: Apache-2.0 - -import Link from 'next/link' -import {TopNewsProps} from '~/components/news/apiNews' -import GradientBorderButton from './GradientBorderButton' -import {config} from './config' - -const {button} = config - -function TopNewsItem({item}:{item:TopNewsProps}){ - return ( - -
- {/* */} -
-

{item.title}

-

{item.summary}

-
- -
- - ) -} -/** - * Top news items including the homepage divider. - * If there are no news items it returns null. - * */ -export default function TopNewsSection({news}:{news:TopNewsProps[]}) { - - // console.group('TopNewsSection') - // console.log('news...',news) - // console.groupEnd() - - if (news?.length > 0){ - return ( - <> -
- -

- Latest news -

- -
- {news.map(item=>{ - return - })} -
- -
-
-
- - ) - } - return null -} diff --git a/frontend/components/home/kin/index.tsx b/frontend/components/home/kin/index.tsx index c15bfbb..4e8d5cc 100644 --- a/frontend/components/home/kin/index.tsx +++ b/frontend/components/home/kin/index.tsx @@ -13,32 +13,14 @@ import 'aos/dist/aos.css' import AppHeader from '~/components/AppHeader' import AppFooter from '~/components/AppFooter' -import {TopNewsProps} from '~/components/news/apiNews' import Arc from '~/components/home/rsd/arc.svg' -import StatsSection from './StatsSection' import JumboBanner from './JumboBanner' -import TopNewsSection from './TopNewsSection' import HomepageDivider from './HomepageDivider' import AboutUsSection from './AboutUsSection' import OurProgramsSection from './OurProgramsSection' - - import ContributeSection from './ContributeSection' -export type RsdHomeProps = { - software_cnt: number, - open_software_cnt: number, - project_cnt: number, - organisation_cnt: number, - contributor_cnt: number, - software_mention_cnt: number, - news: TopNewsProps[] -} - -export default function RsdHome({ - project_cnt, organisation_cnt, - contributor_cnt, software_mention_cnt,news -}: RsdHomeProps) { +export default function RsdHome() { // Initialize AOS library useEffect(() => { AOS.init({offset: 16}) @@ -52,23 +34,9 @@ export default function RsdHome({ {/* Jumbo Banner */} - {/* KIN stats */} - -
{/* Arc separator */} - {/* Get started section */} - {/* */} - {/* Top news items, ONLY if there are some */} - - {/* Divider */} - {/* Our Programs Section */} {/* Divider */} @@ -79,11 +47,6 @@ export default function RsdHome({ {/* About us section */} - {/* Divider */} - {/* */} - {/* Logos */} - {/* */} - {/* Footer */}
diff --git a/frontend/pages/index.tsx b/frontend/pages/index.tsx index 3ff896e..e73e071 100644 --- a/frontend/pages/index.tsx +++ b/frontend/pages/index.tsx @@ -21,7 +21,7 @@ export type HomeProps = { } const pageTitle = `Home | ${app.title}` -const pageDesc = 'The Research Project Directory is designed to show the impact research software has on research and society. We stimulate the reuse of research software and encourage proper citation of research software to ensure researchers and RSEs get credit for their work.' +const pageDesc = 'KIN connects, broadens, deepens, and unlocks knowledge for transitions towards a climate-neutral and climate-resilient society.' export default function Home({counts,news}: HomeProps) { const {host} = useRsdSettings() @@ -42,7 +42,7 @@ export default function Home({counts,news}: HomeProps) { /> {/* canonical url meta tag */} - + ) } diff --git a/frontend/pages/organisations/index.tsx b/frontend/pages/organisations/index.tsx index 2c40f9e..dba1f45 100644 --- a/frontend/pages/organisations/index.tsx +++ b/frontend/pages/organisations/index.tsx @@ -39,7 +39,7 @@ type OrganisationsOverviewPageProps = { } const pageTitle = `Organisations | ${app.title}` -const pageDesc = 'List of organizations involved in the development of research software.' +const pageDesc = 'List of organizations involved in KIN projects.' export default function OrganisationsOverviewPage({ organisations = [], count, page, rows, search diff --git a/frontend/pages/projects/index.tsx b/frontend/pages/projects/index.tsx index 963b392..f5f10f3 100644 --- a/frontend/pages/projects/index.tsx +++ b/frontend/pages/projects/index.tsx @@ -67,7 +67,7 @@ export type ProjectOverviewPageProps = { } const pageTitle = `Projects | ${app.title}` -const pageDesc = 'The list of research projects in the Research Software Directory.' +const pageDesc = 'The list of research projects in the KIN RPD.' export default function ProjectsOverviewPage({ search, order, diff --git a/frontend/public/data/settings.json b/frontend/public/data/settings.json index 947446f..38adb34 100644 --- a/frontend/public/data/settings.json +++ b/frontend/public/data/settings.json @@ -3,7 +3,7 @@ "name": "kin-rpd", "emailHeaders": [], "logo_url": "/images/logo-KIN.svg", - "website": "https://hetkin.nl", + "website": "https://hetkin.nl/en/home-en/", "feedback": { "enabled": true, "url": "rsd@esciencecenter.nl", @@ -31,14 +31,9 @@ "target": "_blank" }, { - "label": "Het KIN website", + "label": "Het KIN", "url": "https://hetkin.nl/", "target": "_blank" - }, - { - "label": "News", - "url": "/news", - "target": "_self" } ], "theme": {