Merge branch 'main' of https://github.com/opengento/meet-magento-fr i…

…nto program

public/locales/fr/contributors.json

@@ -32,7 +32,7 @@
       "companyUrl": "https://opengento.fr/",
       "linkedin": "https://www.linkedin.com/in/thomas-klein/",
       "role": "Développeur",
-      "photo": "/images/staff/thomas_klein.jpeg",
+      "photo": "/images/staff/thomas_klein.png",
       "photoBg": 3,
       "biography": ""
     }

public/locales/fr/speakers.json

@@ -51,11 +51,11 @@
       {
         "id": 4,
         "name": "Hervé Guétin",
-        "company": "Agence Dn'D",
-        "companyLogo": "/images/logo/dnd.svg",
-        "companyUrl": "https://www.dnd.fr/",
+        "company": "Maddlen",
+        "companyLogo": "/images/logo/maddlen.jpeg",
+        "companyUrl": "https://www.maddlen.fr/",
         "linkedin": "https://www.linkedin.com/in/herveguetin/",
-        "role": "Tech Expert",
+        "role": "Consultant & développeur full-stack",
         "photo": "/images/speakers/herve_guetin.jpg",
         "photoBg": 1,
         "biography": ""
@@ -77,7 +77,8 @@
         "start": "9h00",
         "end": "10h30",
         "tags": ["Ouverture", "Business", "Expertise"],
-        "speakers": [1]
+        "speakers": [1],
+        "eventUrl": null
       },
       {
         "id": 2,
@@ -89,7 +90,8 @@
         "start": "9h00",
         "end": "10h30",
         "tags": ["Technical", "Expertise"],
-        "speakers": [2]
+        "speakers": [2],
+        "eventUrl": null
       },
       {
         "id": 3,
@@ -101,7 +103,8 @@
         "start": "9h00",
         "end": "10h30",
         "tags": ["Technical", "Expertise"],
-        "speakers": [3]
+        "speakers": [3],
+        "eventUrl": null
       },
       {
         "id": 4,
@@ -113,7 +116,8 @@
         "start": "9h00",
         "end": "10h30",
         "tags": ["Technical", "Expertise"],
-        "speakers": [4]
+        "speakers": [4],
+        "eventUrl": null
       }
     ]
   }

public/locales/fr/staff.json

@@ -76,7 +76,7 @@
       "companyUrl": "https://opengento.fr/",
       "linkedin": "https://www.linkedin.com/in/thomas-klein/",
       "role": "Secrétaire",
-      "photo": "/images/staff/thomas_klein.jpeg",
+      "photo": "/images/staff/thomas_klein.png",
       "photoBg": 3,
       "biography": ""
     },

src/app/page.tsx

@@ -26,7 +26,7 @@ export default function Home() {
   return (
     <div className="relative -top-[104px] left-0">
       <Hero />
-      <div id="program">
+      <div id="programs">
         <Program />
       </div>
       <div id="speakers">
@@ -39,7 +39,7 @@ export default function Home() {
         <div className="content-media-sections flex flex-col gap-12 py-12">
           <div id="faq">
             <ContentMedia
-              imageUrl="/images/media/faq.png"
+              imageUrl="/images/media/faq.jpg"
               imagePosition="right"
               imageWidth="40%"
               title="Besoin d'aide ?"

src/components/Person/Person.tsx

@@ -20,7 +20,6 @@ const PersonCard = ({
           alt={person.company}
           width={20}
           height={20}
-          className="h-6"
         />
         <span className="text-sm">{person.company}</span>
       </div>

src/components/Program/Program.tsx

@@ -6,7 +6,7 @@ import ProgramList from "./ProgramList";
 const Program = () => {
   return (
     <BackgroundImage
-      imagePath="/images/background/sponsors.png"
+      imagePath="/images/background/programs.jpg"
       className="py-12"
     >
       <Container size="large">

src/components/Program/ProgramTile.tsx

@@ -1,9 +1,10 @@
 import React from "react";
-import { SessionProps } from "../Speakers/Session/SessionProps";
-import Session from "../Speakers/Session/Session";
 import { PiCalendarPlus } from "react-icons/pi";
-import Person from "../Person/Person";
 import useDataProvider from "@/hooks/useDataProvider";
+import { SessionProps } from "@/components/Speakers/Session/SessionProps";
+import Session from "@/components/Speakers/Session/Session";
+import Person from "@/components/Person/Person";
+import ButtonLink from "@/components/ButtonLink/ButtonLink";
 
 const ProgramTile = ({
   session,
@@ -18,7 +19,7 @@ const ProgramTile = ({
     .filter((speaker) => session.speakers.includes(speaker.id));
 
   return (
-    <div className="program-tile bg-white rounded-xl flex flex-col justify-between gap-6 p-4 md:p-6 h-full group">
+    <div className="program-tile bg-white rounded-xl flex flex-col justify-between gap-6 p-4 md:p-6 h-full">
       <div className="flex flex-col gap-6">
         <Session session={session} onPopInClick={onPopInClick} />
         <div className="program-tile-speakers flex flex-col gap-2">
@@ -27,14 +28,18 @@ const ProgramTile = ({
           ))}
         </div>
       </div>
-      <div className="flex justify-center">
-        <div className="flex flex-row items-center gap-1 bg-primary px-4 py-2 rounded-full lg:opacity-0 lg:group-hover:opacity-100 lg:transition-opacity lg:duration-300 lg:hover:cursor-pointer">
-          <PiCalendarPlus size={20} className="text-white" />
-          <span className="text-sm text-white font-semibold">
+      {!!session.eventUrl && (
+        <div className="mx-auto">
+          <ButtonLink
+            variant="secondary-invert"
+            href={session.eventUrl}
+            iconPosition="left"
+            icon={<PiCalendarPlus />}
+          >
             Ajouter à mon agenda
-          </span>
+          </ButtonLink>
         </div>
-      </div>
+      )}
     </div>
   );
 };

src/components/Speakers/Session/Session.tsx

@@ -9,13 +9,12 @@ import ButtonLink from "@/components/ButtonLink/ButtonLink";
 import { useTranslation } from "react-i18next";
 import { BsFillInfoCircleFill } from "react-icons/bs";
 
-const Session = ({
-  session,
-  onPopInClick,
-}: {
+interface Session {
   session: SessionProps;
   onPopInClick?: () => void;
-}) => {
+}
+
+const Session = ({ session, onPopInClick }: Session) => {
   const { t } = useTranslation(["speakers"]);
   return (
     <div className="flex flex-col md:flex-row justify-between">
@@ -65,11 +64,9 @@ const Session = ({
             variant="secondary-invert"
             href={session.eventUrl}
             iconPosition="left"
-            icon={<PiCalendarPlus size={24} className="text-white" />}
+            icon={<PiCalendarPlus />}
           >
-            <Typography variant="body1" weight="semibold" color="light">
-              Ajouter à mon agenda
-            </Typography>
+            Ajouter à mon agenda
           </ButtonLink>
         </div>
       )}

src/components/SponsorList/SponsorList.tsx

@@ -41,18 +41,18 @@ const SponsorList = ({ items }: { items: SponsorProps[] }) => {
   ];
 
   return (
-    <BackgroundImage imagePath="/images/background/sponsors.png" className="py-12">
+    <BackgroundImage imagePath="/images/background/sponsors.jpg" className="py-12">
       <Container size="large">
         <TopBanner
           title="Merci à nos sponsors"
           backgroundImage="/images/pattern_top-banner_sponsors.svg"
         >
-          {'submitUrl' in actions && typeof actions.submitUrl === 'string' && actions.submitUrl !== '' && (
+          {'submitUrl' in actions && typeof actions.submitUrl === 'string' && !!actions.submitUrl && (
             <ButtonLink variant="secondary" href={actions.submitUrl}>
               Devenir sponsor
             </ButtonLink>
           )}
-          {'seeAllUrl' in actions && typeof actions.seeAllUrl === 'string' && actions.seeAllUrl !== '' && (
+          {'seeAllUrl' in actions && typeof actions.seeAllUrl === 'string' && !!actions.seeAllUrl && (
             <>
               <div className="hidden md:block">
                 <ButtonLink variant="soft-pink" href={actions.seeAllUrl}>

src/layouts/Push/Push.tsx

@@ -12,7 +12,7 @@ const Push = () => {
   return (
     <div className="my-4">
       <ContentMedia
-        imageUrl="/images/media/faq.png"
+        imageUrl="/images/media/faq.jpg"
         imagePosition="left"
         imageWidth="40%"
       >