diff --git a/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json index 26f8ff37..03adfad1 100644 --- a/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json +++ b/backend/src/extensions/documentation/documentation/1.0.0/full_documentation.json @@ -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": [ diff --git a/frontend/public/images/marty-2.svg b/frontend/public/images/marty-2.svg deleted file mode 100644 index 951cd894..00000000 --- a/frontend/public/images/marty-2.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/frontend/public/images/marty.png b/frontend/public/images/marty.png new file mode 100644 index 00000000..6f43ed23 Binary files /dev/null and b/frontend/public/images/marty.png differ diff --git a/frontend/src/app/[locale]/_partials/header.tsx b/frontend/src/app/[locale]/_partials/header.tsx index 3b2cfa92..07e613ae 100644 --- a/frontend/src/app/[locale]/_partials/header.tsx +++ b/frontend/src/app/[locale]/_partials/header.tsx @@ -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}`)} + {t(`header.nav.top.${link}`)} diff --git a/frontend/src/app/[locale]/donations/donation.tsx b/frontend/src/app/[locale]/donations/donation.tsx index 6b294d16..9f603ac5 100644 --- a/frontend/src/app/[locale]/donations/donation.tsx +++ b/frontend/src/app/[locale]/donations/donation.tsx @@ -65,11 +65,11 @@ export default function DonationsPage({ data }: DonationProps) { <> } - background="purple" className="my-lg" internalClassName='min-h-[850px]' /> diff --git a/frontend/src/app/[locale]/donations/page.tsx b/frontend/src/app/[locale]/donations/page.tsx index 9c189ead..6d22d4c9 100644 --- a/frontend/src/app/[locale]/donations/page.tsx +++ b/frontend/src/app/[locale]/donations/page.tsx @@ -33,13 +33,13 @@ async function fetchDonationData() { }, } }, - donation_cta: { - populate: "*" - }, - seo_meta: { - populate: "*" - } - } + donation_cta: { + populate: "*" + }, + seo_meta: { + populate: "*" + } + } } } }); @@ -55,5 +55,5 @@ export default async function Page() { } const introduction_text = await getMarkdownContent(data.data.introduction_text); - return ; + return ; }; diff --git a/frontend/src/app/[locale]/projects/page.tsx b/frontend/src/app/[locale]/projects/page.tsx index 8e5cea42..81084a5f 100644 --- a/frontend/src/app/[locale]/projects/page.tsx +++ b/frontend/src/app/[locale]/projects/page.tsx @@ -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: '*', diff --git a/frontend/src/app/[locale]/projects/projects.tsx b/frontend/src/app/[locale]/projects/projects.tsx index 786b3e73..b9f5cfad 100644 --- a/frontend/src/app/[locale]/projects/projects.tsx +++ b/frontend/src/app/[locale]/projects/projects.tsx @@ -133,7 +133,7 @@ export default function ProjectsPage({ data }: ProjectListProps) { /> diff --git a/frontend/src/components/molecules/BaseCard/BaseCard.tsx b/frontend/src/components/molecules/BaseCard/BaseCard.tsx index 261d7c42..c433f63a 100644 --- a/frontend/src/components/molecules/BaseCard/BaseCard.tsx +++ b/frontend/src/components/molecules/BaseCard/BaseCard.tsx @@ -31,7 +31,7 @@ const BaseCard: React.FC = ({ return ( = ({ id, title, titleLevel = 2, - content, + subtitle, iframe, - citation, - citationAuthor, - citationAuthorImage, - background = "gray", internalClassName, className, ...props @@ -44,6 +36,7 @@ const LargeTextImageDonation: React.FC = ({ >
{title && {title}} + {subtitle &&

{subtitle}

}
diff --git a/frontend/src/components/molecules/PartnerCard/PartnerCard.stories.tsx b/frontend/src/components/molecules/PartnerCard/PartnerCard.stories.tsx index b4595a9a..13c7b174 100644 --- a/frontend/src/components/molecules/PartnerCard/PartnerCard.stories.tsx +++ b/frontend/src/components/molecules/PartnerCard/PartnerCard.stories.tsx @@ -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', }, }; diff --git a/frontend/src/components/organisms/HeroBlock/HeroBlock.tsx b/frontend/src/components/organisms/HeroBlock/HeroBlock.tsx index c923e653..7d301e84 100644 --- a/frontend/src/components/organisms/HeroBlock/HeroBlock.tsx +++ b/frontend/src/components/organisms/HeroBlock/HeroBlock.tsx @@ -25,7 +25,7 @@ const HeroBlock: React.FC = ({ return (
= ({ {categories.map((category, index) => (
- {category.title && ( - + {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} )} diff --git a/frontend/src/components/organisms/NewsletterBlock/NewsletterBlock.tsx b/frontend/src/components/organisms/NewsletterBlock/NewsletterBlock.tsx index 1963ec03..139d4cbf 100644 --- a/frontend/src/components/organisms/NewsletterBlock/NewsletterBlock.tsx +++ b/frontend/src/components/organisms/NewsletterBlock/NewsletterBlock.tsx @@ -33,9 +33,9 @@ const NewsletterBlock: React.FC = ({ >
- +
- + {componentTitle}

{componentContent}

diff --git a/frontend/src/components/organisms/PartnersBlock/PartnersBlock.stories.tsx b/frontend/src/components/organisms/PartnersBlock/PartnersBlock.stories.tsx index b3f2636f..9124a532 100644 --- a/frontend/src/components/organisms/PartnersBlock/PartnersBlock.stories.tsx +++ b/frontend/src/components/organisms/PartnersBlock/PartnersBlock.stories.tsx @@ -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', }, ]; diff --git a/frontend/src/components/organisms/ResultsCard/ResultsCard.tsx b/frontend/src/components/organisms/ResultsCard/ResultsCard.tsx index e9033fbf..d30efb0d 100644 --- a/frontend/src/components/organisms/ResultsCard/ResultsCard.tsx +++ b/frontend/src/components/organisms/ResultsCard/ResultsCard.tsx @@ -45,7 +45,7 @@ const ResultsCard: React.FC = ({
; + banner_subtitle: Schema.Attribute.String; banner_title: Schema.Attribute.String; - banner_video: Schema.Attribute.Media< - 'images' | 'files' | 'videos' | 'audios' - >; + banner_video: Schema.Attribute.Text; createdAt: Schema.Attribute.DateTime; createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> & Schema.Attribute.Private; @@ -1151,6 +1150,7 @@ export interface ApiPositionPosition extends Struct.SingleTypeSchema { 'call-to-action.call-to-action', false >; + manifesto: Schema.Attribute.Media<'images' | 'files' | 'videos' | 'audios'>; press_releases: Schema.Attribute.Relation< 'oneToMany', 'api::press-release.press-release' @@ -1524,6 +1524,7 @@ export interface ApiProjectsListProjectsList extends Struct.SingleTypeSchema { 'information.information-block', true >; + informations_title: Schema.Attribute.String; introduction: Schema.Attribute.Text; introduction_cta: Schema.Attribute.Component< 'call-to-action.call-to-action-with-image',