Skip to content

Commit fdc85df

Browse files
authored
Merge pull request #351 from dataforgoodfr/feat/dynamise-suite
Feat/dynamise suite
2 parents 5754832 + bf18030 commit fdc85df

19 files changed

Lines changed: 62 additions & 167 deletions

File tree

backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"name": "Apache 2.0",
1515
"url": "https://www.apache.org/licenses/LICENSE-2.0.html"
1616
},
17-
"x-generation-date": "2025-09-30T20:01:18.840Z"
17+
"x-generation-date": "2025-10-01T08:09:20.342Z"
1818
},
1919
"x-strapi-config": {
2020
"plugins": [

frontend/public/images/marty-2.svg

Lines changed: 0 additions & 27 deletions
This file was deleted.

frontend/public/images/marty.png

49.2 KB
Loading

frontend/src/app/[locale]/_partials/header.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ const Header = () => {
228228
onClick={() => toggleNav(false)}
229229
role="menuitem"
230230
className={clsx(
231-
'inline-flex items-center gap-2 px-4 py-2',
231+
'inline-flex items-center gap-2 px-4 py-2 lg:py-0.5',
232232
link === 'financier' ? 'bg-resistance' : 'bg-alive',
233-
'font-primary font-black tracking-widest uppercase text-black text-[12px] shadow-block shadow-block--black',
233+
'font-primary font-black tracking-widest uppercase text-black text-[12px] shadow-base',
234234
)}
235235
>
236-
{t(`header.nav.top.${link}`)}
236+
<span className='lg:pr-9'>{t(`header.nav.top.${link}`)}</span>
237237
<ArrowIcon />
238238
</Link>
239239
</li>

frontend/src/app/[locale]/donations/donation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ export default function DonationsPage({ data }: DonationProps) {
6565
<>
6666
<LargeTextImageDonation
6767
title={data.banner_title ?? t('title')}
68+
subtitle={data.banner_subtitle}
6869
titleLevel={1}
6970
iframe={<div className='p-4 [&>iframe]:rounded-2xl' ref={donationSectionRef}>
7071
<a href="https://soutenir.dataforgood.fr/native-/#iraiser_native"></a>
7172
</div>}
72-
background="purple"
7373
className="my-lg"
7474
internalClassName='min-h-[850px]'
7575
/>

frontend/src/app/[locale]/donations/page.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ async function fetchDonationData() {
3333
},
3434
}
3535
},
36-
donation_cta: {
37-
populate: "*"
38-
},
39-
seo_meta: {
40-
populate: "*"
41-
}
42-
}
36+
donation_cta: {
37+
populate: "*"
38+
},
39+
seo_meta: {
40+
populate: "*"
41+
}
42+
}
4343
}
4444
}
4545
});
@@ -55,5 +55,5 @@ export default async function Page() {
5555
}
5656

5757
const introduction_text = await getMarkdownContent(data.data.introduction_text);
58-
return <DonationsPage data={{...data.data, introduction_text}} />;
58+
return <DonationsPage data={{ ...data.data, introduction_text }} />;
5959
};

frontend/src/app/[locale]/projects/page.tsx

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,31 @@ async function fetchProjectListPageData() {
2626
populate: '*',
2727
},
2828
thematics: {
29-
populate: '*',
29+
fields: ["name", "short_id", "color", "id", "short_description", "cta_text", "cta_link"],
30+
populate: 'thumbnail',
3031
},
3132
informations: {
3233
populate: '*',
3334
},
3435
seasons: {
35-
populate: '*',
36+
fields: ["title"]
3637
},
3738
projects: {
38-
populate: '*',
39+
fields: ["title", "short_description", "category", "slug", "start_date"],
40+
populate: {
41+
thumbnail: {
42+
fields: ["url"]
43+
},
44+
seasons: {
45+
fields: ["title"]
46+
},
47+
thematics: {
48+
fields: ["short_id"]
49+
},
50+
related_partners: {
51+
fields: ["name"]
52+
}
53+
}
3954
},
4055
join_cta: {
4156
populate: '*',

frontend/src/app/[locale]/projects/projects.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export default function ProjectsPage({ data }: ProjectListProps) {
133133
/>
134134

135135
<InformationsBlock
136-
title={t('information.title')}
136+
title={data.informations_title}
137137
informations={informations ?? []}
138138
className="mt-lg"
139139
/>

frontend/src/components/molecules/BaseCard/BaseCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const BaseCard: React.FC<BaseCardProps> = ({
3131
return (
3232
<Link
3333
className={clsx(
34-
'relative block shadow-block shadow-block--building h-full',
34+
'relative block max-sm:mx-5 shadow-block shadow-block--building h-full',
3535
className,
3636
)}
3737
target={isBlank ? '_blank' : undefined}

frontend/src/components/molecules/LargeTextImageDonation/LargeTextImageDonation.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@ export type LargeTextImageDonationProps = {
55
id?: string;
66
title?: string;
77
titleLevel?: TitleProps['level'];
8-
content?: React.ReactNode;
8+
subtitle?: string;
99
iframe?: React.ReactNode;
10-
citation?: string;
11-
citationAuthor?: string;
12-
citationAuthorImage?: string;
13-
background?: "gray" | "purple";
1410
internalClassName?: string;
1511
className?: string;
1612
};
@@ -19,12 +15,8 @@ const LargeTextImageDonation: React.FC<LargeTextImageDonationProps> = ({
1915
id,
2016
title,
2117
titleLevel = 2,
22-
content,
18+
subtitle,
2319
iframe,
24-
citation,
25-
citationAuthor,
26-
citationAuthorImage,
27-
background = "gray",
2820
internalClassName,
2921
className,
3022
...props
@@ -44,6 +36,7 @@ const LargeTextImageDonation: React.FC<LargeTextImageDonationProps> = ({
4436
>
4537
<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")}>
4638
{title && <Title level={titleLevel} variant="medium">{title}</Title>}
39+
{subtitle && <p className="mx-sm text-left h3-like"> {subtitle} </p>}
4740
</div>
4841

4942
<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")}>

0 commit comments

Comments
 (0)