Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"name": "Apache 2.0",
"url": "https://www.apache.org/licenses/LICENSE-2.0.html"
},
"x-generation-date": "2025-09-30T20:01:18.840Z"
"x-generation-date": "2025-10-01T08:09:20.342Z"
},
"x-strapi-config": {
"plugins": [
Expand Down
27 changes: 0 additions & 27 deletions frontend/public/images/marty-2.svg

This file was deleted.

Binary file added frontend/public/images/marty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions frontend/src/app/[locale]/_partials/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,12 @@ const Header = () => {
onClick={() => toggleNav(false)}
role="menuitem"
className={clsx(
'inline-flex items-center gap-2 px-4 py-2',
'inline-flex items-center gap-2 px-4 py-2 lg:py-0.5',
link === 'financier' ? 'bg-resistance' : 'bg-alive',
'font-primary font-black tracking-widest uppercase text-black text-[12px] shadow-block shadow-block--black',
'font-primary font-black tracking-widest uppercase text-black text-[12px] shadow-base',
)}
>
{t(`header.nav.top.${link}`)}
<span className='lg:pr-9'>{t(`header.nav.top.${link}`)}</span>
<ArrowIcon />
</Link>
</li>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/[locale]/donations/donation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ export default function DonationsPage({ data }: DonationProps) {
<>
<LargeTextImageDonation
title={data.banner_title ?? t('title')}
subtitle={data.banner_subtitle}
titleLevel={1}
iframe={<div className='p-4 [&>iframe]:rounded-2xl' ref={donationSectionRef}>
<a href="https://soutenir.dataforgood.fr/native-/#iraiser_native"></a>
</div>}
background="purple"
className="my-lg"
internalClassName='min-h-[850px]'
/>
Expand Down
16 changes: 8 additions & 8 deletions frontend/src/app/[locale]/donations/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ async function fetchDonationData() {
},
}
},
donation_cta: {
populate: "*"
},
seo_meta: {
populate: "*"
}
}
donation_cta: {
populate: "*"
},
seo_meta: {
populate: "*"
}
}
}
}
});
Expand All @@ -55,5 +55,5 @@ export default async function Page() {
}

const introduction_text = await getMarkdownContent(data.data.introduction_text);
return <DonationsPage data={{...data.data, introduction_text}} />;
return <DonationsPage data={{ ...data.data, introduction_text }} />;
};
21 changes: 18 additions & 3 deletions frontend/src/app/[locale]/projects/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,31 @@ async function fetchProjectListPageData() {
populate: '*',
},
thematics: {
populate: '*',
fields: ["name", "short_id", "color", "id", "short_description", "cta_text", "cta_link"],
populate: 'thumbnail',
},
informations: {
populate: '*',
},
seasons: {
populate: '*',
fields: ["title"]
},
projects: {
populate: '*',
fields: ["title", "short_description", "category", "slug", "start_date"],
populate: {
thumbnail: {
fields: ["url"]
},
seasons: {
fields: ["title"]
},
thematics: {
fields: ["short_id"]
},
related_partners: {
fields: ["name"]
}
}
},
join_cta: {
populate: '*',
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/[locale]/projects/projects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export default function ProjectsPage({ data }: ProjectListProps) {
/>

<InformationsBlock
title={t('information.title')}
title={data.informations_title}
informations={informations ?? []}
className="mt-lg"
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/molecules/BaseCard/BaseCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const BaseCard: React.FC<BaseCardProps> = ({
return (
<Link
className={clsx(
'relative block shadow-block shadow-block--building h-full',
'relative block max-sm:mx-5 shadow-block shadow-block--building h-full',
className,
)}
target={isBlank ? '_blank' : undefined}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@ export type LargeTextImageDonationProps = {
id?: string;
title?: string;
titleLevel?: TitleProps['level'];
content?: React.ReactNode;
subtitle?: string;
iframe?: React.ReactNode;
citation?: string;
citationAuthor?: string;
citationAuthorImage?: string;
background?: "gray" | "purple";
internalClassName?: string;
className?: string;
};
Expand All @@ -19,12 +15,8 @@ const LargeTextImageDonation: React.FC<LargeTextImageDonationProps> = ({
id,
title,
titleLevel = 2,
content,
subtitle,
iframe,
citation,
citationAuthor,
citationAuthorImage,
background = "gray",
internalClassName,
className,
...props
Expand All @@ -44,6 +36,7 @@ const LargeTextImageDonation: React.FC<LargeTextImageDonationProps> = ({
>
<div className={clsx("col-start-1 md:col-start-1 row-start-1 md:row-start-1 flex flex-col justify-center items-start md:pl-32 p-12 md:py-24 bg-cover bg-left")}>
{title && <Title level={titleLevel} variant="medium">{title}</Title>}
{subtitle && <p className="mx-sm text-left h3-like"> {subtitle} </p>}
</div>

<div className={clsx("col-start-1 md:col-start-2 row-start-2 md:row-start-1 flex flex-col justify-center items-start md:pl-32 md:px-12 px-6 pb-24 md:pt-24 bg-cover bg-left")}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const LongDescription: Story = {
args: {
name: 'Institut National de la Statistique et des Études Économiques',
description: 'L\'Insee collecte, produit, analyse et diffuse des informations sur l\'économie et la société françaises sur l\'ensemble du territoire national. Il coordonne le système statistique public et représente la France auprès des instances statistiques internationales.',
image: '/images/marty-2.svg',
image: '/images/marty.png',
link: 'https://insee.fr',
},
};
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/organisms/HeroBlock/HeroBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const HeroBlock: React.FC<HeroBlockProps> = ({
return (
<div
className={clsx(
'container grid grid-cols-1 grid-rows-[100px_1fr] md:grid-rows-[200px_1fr_200px] md:grid-cols-2 min-h-[850px] h-screen',
'container max-sm:px-0 grid grid-cols-1 grid-rows-[100px_1fr] md:grid-rows-[200px_1fr_200px] md:grid-cols-2 min-h-[850px] h-screen',
className,
)}
{...props}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ const MembersBlock: React.FC<MembersBlockProps> = ({

{categories.map((category, index) => (
<div key={index}>
{category.title && (
<Title variant="small" className="mb-sm" level={typeof titleLevel === 'number' ? (titleLevel + 1) as TitleProps['level'] : titleLevel}>
{category.title && category.members?.length > 0 && (
<Title variant="small" hasSeparator className="mb-sm" level={typeof titleLevel === 'number' ? (titleLevel + 1) as TitleProps['level'] : titleLevel}>
{category.title}
</Title>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ const NewsletterBlock: React.FC<NewsletterBlockProps> = ({
>
<div className="container flex flex-col lg:flex-row gap-md pb-md">
<div className="flex flex-col md:flex-row items-start gap-sm pt-xs max-w-full md:max-w-xl">
<Image src="/images/marty-2.svg" alt="" width={52} height={70} className='hidden md:block mb-xs self-center md:self-start'/>
<Image src="/images/marty.png" alt="" width={52} height={70} className='hidden md:block mb-xs self-center md:self-start'/>
<div>
<Image src="/images/marty-2.svg" alt="" width={52} height={70} className='md:hidden mb-xs self-center md:self-start'/>
<Image src="/images/marty.png" alt="" width={52} height={70} className='md:hidden mb-xs self-center md:self-start'/>
<Title level={titleLevel} className="mb-xs" variant="medium">{componentTitle}</Title>
<p className="lead">{componentContent}</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const samplePartners = [
{
name: 'Institut National de la Statistique',
description: 'L\'Insee collecte, produit, analyse et diffuse des informations sur l\'économie et la société françaises',
image: '/images/marty-2.svg',
image: '/images/marty.png',
link: 'https://insee.fr',
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const ResultsCard: React.FC<ResultsCardProps> = ({

<div className="relative z-10">
<Image
src="/images/marty-2.svg"
src="/images/marty.png"
alt=""
width={52}
height={70}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const sampleTalks = [
{
author: 'Jean Martin',
talk: 'Visualisation de données pour tous',
image: '/images/marty-2.svg',
image: '/images/marty.png',
ctaText: 'En savoir plus',
ctaLink: '/talks/visualisation',
},
Expand Down Expand Up @@ -147,7 +147,7 @@ export const TalksWithLongContent: Story = {
{
author: 'Prof. Marc Dubois - Université de Paris',
talk: 'Comment les données peuvent transformer notre compréhension des phénomènes sociaux complexes et améliorer les politiques publiques',
image: '/images/marty-2.svg',
image: '/images/marty.png',
ctaText: 'Voir la vidéo',
ctaLink: '/talks/politiques-publiques',
},
Expand Down
Loading