diff --git a/src/components/app-menu/content.tsx b/src/components/app-menu/content.tsx index 61008f0..a7d8914 100644 --- a/src/components/app-menu/content.tsx +++ b/src/components/app-menu/content.tsx @@ -11,9 +11,15 @@ import { cn } from '@/lib/utils'; import { menuOpenAtom } from '@/app/store'; import { SECTIONS } from '@/containers/header'; +import Newsletter from '@/containers/newsletter'; -import Newsletter from '../../containers/newsletter'; -import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '../ui/dialog'; +import { + Dialog, + DialogContent, + DialogHeader, + DialogTitle, + DialogTrigger, +} from '@/components/ui/dialog'; const navItemContainerClass = 'hover:text-navy-500 relative inline-flex items-center space-x-6 text-xl text-grey-800 2xl:text-4xl' as const; @@ -40,7 +46,7 @@ const NavItem = (props: PropsWithChildren - + Interested in our work? diff --git a/src/containers/about/description/index.tsx b/src/containers/about/description/index.tsx index d6fa909..1e75558 100644 --- a/src/containers/about/description/index.tsx +++ b/src/containers/about/description/index.tsx @@ -39,7 +39,7 @@ export default function AboutDescription() {

- more4nature (10.3030/101133983) is structured into work packages that reflect the  + more4nature is structured into work packages that reflect the  socio-technical approach of the project.

diff --git a/src/containers/about/partners/index.tsx b/src/containers/about/partners/index.tsx index 5e26f82..2ff9138 100644 --- a/src/containers/about/partners/index.tsx +++ b/src/containers/about/partners/index.tsx @@ -21,10 +21,6 @@ export default function Partners() { return (

Partners

-

- The more4nature activities are focused on three key thematic areas in environmental - protection: -

The multidisciplinary more4nature consortium brings together a unique combination of collaborations, with scientific experts from the social sciences, data science and diff --git a/src/containers/case-detail/sidebar/index.tsx b/src/containers/case-detail/sidebar/index.tsx index bef1976..bc2a910 100644 --- a/src/containers/case-detail/sidebar/index.tsx +++ b/src/containers/case-detail/sidebar/index.tsx @@ -77,6 +77,35 @@ export default function CaseDetailSidebar() { if (!isSuccess) return null; + const accordionItems = [ + { + value: 'citizenScienceData', + title: 'Citizen Science Data', + data: data?.citizenScienceData || [], + }, + { + value: 'complianceNeed', + title: 'Compliance Need', + data: data?.complianceNeed || [], + }, + // Add these when needed: + // { + // value: 'citizenScienceInitiatives', + // title: 'Citizen Science Initiatives', + // data: data?.citizenScienceInitiatives, + // }, + // { + // value: 'stakeholders', + // title: 'Stakeholders', + // data: data?.stakeholders, + // }, + // { + // value: 'authorities', + // title: 'Authorities', + // data: data?.authorities, + // }, + ]; + return (

- - -
- Citizen Science Initiatives -
- - -
    - {data?.citizenScienceInitiatives.map((item, index) => ( -
  • {renderItem(item)}
    • - ))} -
- - - - -
- Citizen Science Data -
- - -
    - {data?.citizenScienceData.map((item, index) => ( -
  • {renderItem(item)}
    • - ))} -
- - - - -
- Compliance Need -
- - -
    - {data?.complianceNeed.map((item, index) => ( -
  • - {typeof item === 'object' && 'impact' in item ? ( - <> -

    {item.impact.name}

    -
      - {item.impact.list.map((subItem, index) => ( -
    • {renderItem(subItem)}
      • - ))} -
    - - ) : ( - renderItem(item) - )} -
    • - ))} -
- - - - -
- Stakeholders -
- - -
    - {data?.stakeholders.map((item, index) => ( -
  • - {typeof item === 'object' && 'impact' in item ? ( - <> -

    {item.impact.name}

    -
      - {item.impact.list.map((subItem, index) => ( -
    • {renderItem(subItem)}
      • - ))} -
    - - ) : ( - renderItem(item) - )} -
    • - ))} -
- - - - -
- Authorities -
- - -
    - {data?.authorities.map((item, index) => ( -
  • - {typeof item === 'object' && 'impact' in item ? ( - <> -

    {item.impact.name}

    -
      - {item.impact.list.map((subItem, index) => ( -
    • {renderItem(subItem)}
      • - ))} -
    - - ) : ( - renderItem(item) - )} -
    • - ))} -
- - + {accordionItems.map((item) => ( + + + {item.title} + + +
    + {item.data.map((dataItem, index) => ( +
  • + {typeof dataItem === 'object' && 'impact' in dataItem ? ( + <> +

    {dataItem.impact.name}

    +
      + {dataItem.impact.list.map((subItem, subIndex) => ( +
    • {renderItem(subItem)}
      • + ))} +
    + + ) : ( + renderItem(dataItem) + )} +
    • + ))} +
+ + + ))}
diff --git a/src/containers/footer/index.tsx b/src/containers/footer/index.tsx index a8eb0e5..63bf8dc 100644 --- a/src/containers/footer/index.tsx +++ b/src/containers/footer/index.tsx @@ -60,8 +60,10 @@ export default function Footer() {

- This project has received funding from the European Union’s Horizon Europe research - and innovation programme under grant agreement No. 101133983. + Co-Funded by the European Union. Views and opinions expressed are however those of + the author(s) only and do not necessarily reflect those of the European Union. + Neither the European Union nor the granting authority can be held responsible for + them.

diff --git a/src/lib/events.service.ts b/src/lib/events.service.ts index d6112ee..37e2b7a 100644 --- a/src/lib/events.service.ts +++ b/src/lib/events.service.ts @@ -2,8 +2,7 @@ import { URLink } from '@/lib/case-studies.service'; import { Paginator } from '@/lib/paginator'; - -import { sortByDateDescending } from './utils'; +import { sortByDateDescending } from '@/lib/utils'; export type Event = { id: string; diff --git a/src/lib/news.service.ts b/src/lib/news.service.ts index 16a4950..4416741 100644 --- a/src/lib/news.service.ts +++ b/src/lib/news.service.ts @@ -1,7 +1,6 @@ import { ThematicArea } from '@/lib/case-studies.service'; import { Paginator, SearchParams, PaginatedResult } from '@/lib/paginator'; - -import { sortByDateDescending } from './utils'; +import { sortByDateDescending } from '@/lib/utils'; export type News = { name: string;