Merge branch 'main' into feat-page-projet-ajout-module-vid-o-z55ap

DnzzL · web-flow · commit 8a28bba2604c · 2026-06-29T17:51:42.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 **node_modules/
 .DS_Store
 .factory/settings.json
+.pi/extensions/emdash-hook.ts
diff --git a/backend/package.json b/backend/package.json
@@ -36,15 +36,16 @@
     "react-router-dom": "^6.0.0",
     "sharp": "^0.34.4",
     "strapi-plugin-multi-select": "^2.1.1",
-    "strapi-v5-redirects": "^1.0.4",
     "strapi-plugin-tagsinput": "^2.0.2",
     "strapi-provider-email-brevo": "^1.0.4",
+    "strapi-v5-redirects": "^1.0.4",
     "styled-components": "^6.0.0"
   },
   "strapi": {
     "uuid": "23578308-9b2f-4525-aca3-db1c4f9e3b2d"
   },
   "devDependencies": {
-    "@types/qs": "^6.9.16"
+    "@types/qs": "^6.9.16",
+    "baseline-browser-mapping": "^2.10.23"
   }
 }
diff --git a/backend/src/api/press-release/content-types/press-release/schema.json b/backend/src/api/press-release/content-types/press-release/schema.json
@@ -97,6 +97,33 @@
       "type": "relation",
       "relation": "oneToMany",
       "target": "api::tag.tag"
+    },
+    "press_release_type": {
+      "type": "enumeration",
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "enum": [
+        "link",
+        "file"
+      ]
+    },
+    "article_file": {
+      "type": "media",
+      "pluginOptions": {
+        "i18n": {
+          "localized": true
+        }
+      },
+      "multiple": false,
+      "allowedTypes": [
+        "images",
+        "files",
+        "videos",
+        "audios"
+      ]
     }
   }
 }
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
diff --git a/backend/types/generated/contentTypes.d.ts b/backend/types/generated/contentTypes.d.ts
@@ -1190,6 +1190,14 @@ export interface ApiPressReleasePressRelease
     };
   };
   attributes: {
+    article_file: Schema.Attribute.Media<
+      'images' | 'files' | 'videos' | 'audios'
+    > &
+      Schema.Attribute.SetPluginOptions<{
+        i18n: {
+          localized: true;
+        };
+      }>;
     article_link: Schema.Attribute.String &
       Schema.Attribute.SetPluginOptions<{
         i18n: {
@@ -1228,6 +1236,12 @@ export interface ApiPressReleasePressRelease
           localized: true;
         };
       }>;
+    press_release_type: Schema.Attribute.Enumeration<['link', 'file']> &
+      Schema.Attribute.SetPluginOptions<{
+        i18n: {
+          localized: true;
+        };
+      }>;
     published_date: Schema.Attribute.Date &
       Schema.Attribute.SetPluginOptions<{
         i18n: {
diff --git a/frontend/messages/fr/layout.json b/frontend/messages/fr/layout.json
@@ -56,7 +56,9 @@
       },
       "social": {
         "bluesky": "Bluesky",
-        "linkedin": "LinkedIn"
+        "linkedin": "LinkedIn",
+        "instagram": "Instagram",
+        "mastodon": "Mastodon"
       }
     }
   },
diff --git a/frontend/src/app/[locale]/_partials/footer.tsx b/frontend/src/app/[locale]/_partials/footer.tsx
@@ -3,7 +3,7 @@
 import { useTranslations } from 'next-intl';
 import Image from 'next/image';
 import Link from 'next/link';
-import { FaBluesky, FaLinkedin } from 'react-icons/fa6';
+import { FaBluesky, FaInstagram, FaLinkedin, FaMastodon } from 'react-icons/fa6';
 import { Button, SocialLink } from '@/components/atoms';
 import { usePathLocale } from '@/hooks/usePathLocale';
 import { NewsletterForm } from '@/components';
@@ -14,13 +14,21 @@ const Footer = () => {
 
   const socialLinks: Record<string, { href: string; icon: React.ReactNode }> = {
     bluesky: {
-      href: 'https://bsky.app/profile/dataforgood.fr',
+      href: 'https://bsky.app/profile/dataforgoodfr.bsky.social',
       icon: <FaBluesky />,
     },
     linkedin: {
-      href: 'https://www.linkedin.com/company/dataforgoodfr/',
+      href: 'https://www.linkedin.com/company/dataforgood/',
       icon: <FaLinkedin />,
     },
+    instagram: {
+      href: 'https://www.instagram.com/dataforgoodfr/',
+      icon: <FaInstagram />,
+    },
+    mastodon: {
+      href: 'https://piaille.fr/@dataforgood',
+      icon: <FaMastodon />,
+    },
   };
 
   const communityNav: Record<string, string> = {
diff --git a/frontend/src/app/[locale]/about/about.tsx b/frontend/src/app/[locale]/about/about.tsx
@@ -26,11 +26,12 @@ function transformTestimonials(
 }
 
 function transformFunders(funders: NonNullable<AboutPageData['funders']>) {
-  return funders.map(partner => ({
-    id: partner.id,
-    name: partner.name,
-    image: partner.logo?.url,
-    link: partner.website_link ?? 'https://www.dataforgood.fr',
+  return funders.map(funder => ({
+    id: funder.id,
+    name: funder.name,
+    description: funder.description,
+    image: funder.logo?.url,
+    link: funder.website_link ?? 'https://www.dataforgood.fr',
   }));
 }
 
diff --git a/frontend/src/app/[locale]/blog/blog.tsx b/frontend/src/app/[locale]/blog/blog.tsx
@@ -6,6 +6,7 @@ import { Title, BaseCardsBlock, Pagination, SearchInput } from '@/components';
 import { BlogsPageMeta, BlogsPageData } from './page';
 import { usePagination } from '@/hooks/usePagination';
 import { useState, useEffect } from 'react';
+import { getPressReleaseLink } from '@/lib/utils';
 
 
 function transformBlogsData(resources: NonNullable<BlogsPageData>) {
@@ -19,7 +20,7 @@ function transformBlogsData(resources: NonNullable<BlogsPageData>) {
       rawDate: resource.published_date,
       date: new Date(resource.published_date).toLocaleString(undefined, {dateStyle: 'medium'}),
       image: element.thumbnail?.url ?? "/images/dataforgood.svg",
-      link: isBlog ? `/blog/${element.slug}` : element.article_link,
+      link: isBlog ? `/blog/${element.slug}` : getPressReleaseLink(element as { press_release_type: string; article_link: string; article_file: {url: string;}}),
       subInfos: element.tags ? element.tags.map(tag => tag.name) : [],
       tags: [new Date(element.published_date).toLocaleDateString(undefined, {dateStyle: 'long'}), element.media_name],
       isBlank: true,
diff --git a/frontend/src/app/[locale]/blog/page.tsx b/frontend/src/app/[locale]/blog/page.tsx
@@ -57,7 +57,7 @@ export default async function Page({
   searchParams: { [key: string]: string | string[] | undefined };
 }) {
   const page = typeof searchParams.page === 'string' ? Number(searchParams.page) : 1;
-  const pageSize = 8;
+  const pageSize = 12;
   const response = await fetchBlogsPageData(page, pageSize);
 
   if (!response?.data || !response?.data.meta?.pagination) {
diff --git a/frontend/src/app/[locale]/home.tsx b/frontend/src/app/[locale]/home.tsx
@@ -4,6 +4,7 @@ import { useTranslations } from 'next-intl';
 import { ThematicsBlock, ImagesCarousel, ResultsCard, NewsSmallBlock, TalksBlock, Title, TitleProps, HeroBlock } from '@/components';
 import { HomepageData } from './page';
 import Image from 'next/image'
+import { getPressReleaseLink } from '@/lib/utils';
 
 type HomepageProps = {
   data: HomepageData;
@@ -70,7 +71,7 @@ export default function Homepage({ data }: HomepageProps) {
       talk: isBlog ? (resource.blog as { title: string })?.title || '' : (resource.press_release as { title: string })?.title || '',
       image: isBlog ? resource.blog?.thumbnail?.url || '' : resource.press_release?.thumbnail?.url || '',
       ctaText: isBlog ? t('resources.articleCtaText') : t('resources.pressCtaText'),
-      ctaLink: isBlog ? `/articles/${resource.blog?.slug || ''}` : (resource.press_release as { article_link: string })?.article_link || '',
+      ctaLink: isBlog ? `/articles/${resource.blog?.slug || ''}` : getPressReleaseLink(resource.press_release as { press_release_type: string; article_link: string; article_file: {url: string;}}) || '',
     }
   }) ?? [];
 
diff --git a/frontend/src/app/[locale]/positions/page.tsx b/frontend/src/app/[locale]/positions/page.tsx
@@ -29,6 +29,9 @@ async function fetchPositionPageData() {
               },
               thumbnail: {
                 populate: '*'
+              },
+              article_file: {
+                fields: ['url']
               }
             }
           },
@@ -44,6 +47,9 @@ async function fetchPositionPageData() {
                   },
                   thumbnail: {
                     populate: '*'
+                  },
+                  article_file: {
+                    fields: ['url']
                   }
                 }
               }
diff --git a/frontend/src/app/[locale]/positions/positions.tsx b/frontend/src/app/[locale]/positions/positions.tsx
@@ -5,6 +5,7 @@ import { BaseCardsBlock, LargeTextImage } from '@/components';
 import Animation from './_partials/Animations';
 import { PositionsPageData } from './page';
 import { useRef } from 'react';
+import { getPressReleaseLink } from '@/lib/utils';
 
 type PositionPageProps = {
   data: PositionsPageData
@@ -15,7 +16,7 @@ function transformPressReleases(press_releases: NonNullable<PositionsPageData['p
     title: release.article_name,
     tags: [new Date(release.published_date || '').toLocaleString(undefined, { month: 'short', day: 'numeric', year: 'numeric' }), release.media_name],
     image: release.thumbnail?.url ?? '/images/dataforgood.svg',
-    link: release.article_link,
+    link: getPressReleaseLink(release as { press_release_type: string; article_link: string; article_file: {url: string;}}),
     subInfos: release.tags,
     isBlank: true,
   }))
@@ -43,7 +44,7 @@ function transformResources(resources: NonNullable<PositionsPageData['resources'
       title: isBlog ? (resource.blog as { title: string })?.title || '' : (resource.press_release as { title: string })?.title || '',
       tags: isBlog ? [new Date(resource.blog?.published_date || '').toLocaleString(undefined, { month: 'short', day: 'numeric', year: 'numeric' })] : [new Date(resource.press_release?.published_date || '').toLocaleString(undefined, { month: 'short', day: 'numeric', year: 'numeric' }), resource.press_release?.media_name],
       image: isBlog ? resource.blog?.thumbnail?.url || '/images/dataforgood.svg' : resource.press_release?.thumbnail?.url || "/images/dataforgood.svg",
-      link: isBlog ? `/blog/${resource.blog?.slug || ''}` : (resource.press_release as { article_link: string })?.article_link || '',
+      link: isBlog ? `/blog/${resource.blog?.slug || ''}` : getPressReleaseLink(resource.press_release as { press_release_type: string; article_link: string; article_file: {url: string;}}) || '',
       subInfos: isBlog ? (resource.blog as { tags: string[] })?.tags?.map((tag) => tag.name) || [] : (resource.press_release as { tags: string[] })?.tags || [],
       isBlank: true,
     }
diff --git a/frontend/src/app/[locale]/projects/[slug]/projectDetail.tsx b/frontend/src/app/[locale]/projects/[slug]/projectDetail.tsx
@@ -4,27 +4,41 @@ import { Banner, BannerVideo, MembersBlock, NewsSmallBlock, PartnersBlock, Proje
 import { IMembers, IProjectImpacts } from '@/lib/types';
 import { useTranslations } from 'next-intl';
 import { type ProjectPageData } from './page';
+import { getPressReleaseLink } from '@/lib/utils';
 
 type ProjectPageProps = {
   project: ProjectPageData;
 };
 
 function getProjectTags(project: ProjectPageData) {
+  const getTagColor = (tag?: string) => {
+      if(tag === "en cours") {
+        return 'bg-resistance'
+      } else if(tag === "terminé") {
+        return 'bg-alive'
+      } 
+      return "bg-back-green"
+    }
+
   return [
     ...(project.seasons?.map(season => ({
       "label": season.title,
-      "type": "temporal" as 'temporal' | 'subject'
+      "type": "temporal" as 'temporal' | 'subject',
+      "color": "bg-back-green" 
     })) || []),
     {
-      "label": `${project.start_date ? new Date(project.start_date).toLocaleDateString() : 'N/A'} / ${project.end_date ? new Date(project.end_date).toLocaleDateString() : 'N/A'}`,
-      "type": "temporal" as 'temporal' | 'subject'
+      "label": `${(project.start_date && project.end_date) ? `Du ${new Date(project.start_date).toLocaleDateString()} au ${new Date(project.end_date).toLocaleDateString()}` : (project.start_date ? `Depuis le ${new Date(project.start_date).toLocaleDateString()}` : (project.end_date ? `Terminé le ${new Date(project.end_date).toLocaleDateString()}` : 'N/A'))}`,
+      "type": "temporal" as 'temporal' | 'subject',
+      "color": "bg-back-green" 
     }, {
       "label": project.state,
-      "type": "subject" as 'temporal' | 'subject'
+      "type": "subject" as 'temporal' | 'subject',
+      "color": getTagColor(project.state) 
     },
     ...((project.category as string[])?.map(cat => ({
       "label": cat,
-      "type": "subject" as 'temporal' | 'subject'
+      "type": "subject" as 'temporal' | 'subject',
+      "color": "bg-back-green" 
     })) || [])];
 }
 
@@ -75,7 +89,7 @@ function getNews(project: ProjectPageData) {
     title: pressRelease.title,
     tag: pressRelease.tags ?? [],
     image: pressRelease.thumbnail?.url,
-    link: pressRelease.article_link,
+    link: getPressReleaseLink(pressRelease as { press_release_type: string; article_link: string; article_file: {url: string;}}),
     date: new Date(pressRelease.published_date || '').toLocaleString(undefined, { month: 'short', day: 'numeric', year: 'numeric'}),
   })) || [];
 }
diff --git a/frontend/src/components/organisms/ProjectPresentation/ProjectPresentation.tsx b/frontend/src/components/organisms/ProjectPresentation/ProjectPresentation.tsx
@@ -8,6 +8,7 @@ export type ProjectPresentationProps = {
   tags?: {
     label?: string;
     type: 'temporal' | 'subject';
+    color: string;
   }[];
   description: string[];
   associations: {
@@ -44,7 +45,7 @@ const ProjectPresentation: React.FC<ProjectPresentationProps> = ({
           <Title level="p" variant="x-small" className="mb-xs">{t('tags')}</Title>
           <ul className="flex flex-row flex-wrap gap-x-1 gap-y-2.5 max-w-96">
             {tags.map((tag, index) => (
-              <li key={index}><Tag color="text-black" bgColor="bg-back-green">{tag.label ?? ''}</Tag></li>
+              <li key={index}><Tag color="text-black" bgColor={tag.color}>{tag.label ?? ''}</Tag></li>
             ))}
             {thematics?.map((thematic, index) => (
               <li key={index}><Tag color="text-black" bgColor={`bg-${thematic.color}`}>{thematic.name ?? ''}</Tag></li>
diff --git a/frontend/src/lib/strapi-types.d.ts b/frontend/src/lib/strapi-types.d.ts
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
diff --git a/frontend/src/types/strapi/generated/contentTypes.d.ts b/frontend/src/types/strapi/generated/contentTypes.d.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,9 @@`
`56`	`56`	`},`
`57`	`57`	`"social": {`
`58`	`58`	`"bluesky": "Bluesky",`
`59`		`- "linkedin": "LinkedIn"`
	`59`	`+ "linkedin": "LinkedIn",`
	`60`	`+ "instagram": "Instagram",`
	`61`	`+ "mastodon": "Mastodon"`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`	`},`