Complete staff page

opengento · Feb 1, 2025 · abf7526 · abf7526
1 parent 58b9abf
commit abf7526
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 36 deletions.
diff --git a/public/images/media/faq.png b/public/images/media/faq.png
diff --git a/public/locales/fr/staff.json b/public/locales/fr/staff.json
@@ -62,6 +62,16 @@
       "photoBg": 5,
       "biography": ""
     },
+    {
+      "name": "Thomas Klein",
+      "company": "Opengento",
+      "companyLogo": "/images/logo/opengento.svg",
+      "companyUrl": "https://opengento.fr/",
+      "linkedin": "https://www.linkedin.com/in/thomas-klein/",
+      "role": "Chargée de communication",
+      "photo": "/images/staff/thomas_klein.jpeg",
+      "biography": ""
+    },
     {
       "name": "Cannelle Lemnos",
       "company": "Ati4 Group",
@@ -73,27 +83,6 @@
       "photoBg": 6,
       "biography": ""
     },
-    {
-      "name": "Patricia Poncy",
-      "company": "Platform.sh",
-      "companyLogo": "/images/logo/platformsh.svg",
-      "companyUrl": "https://platform.sh/",
-      "linkedin": "https://www.linkedin.com/in/patriciaponcy",
-      "role": "Agency Partner Manager Western EU",
-      "photo": "/images/staff/patricia_poncy.png",
-      "photoBg": 3,
-      "biography": ""
-    },
-    {
-      "name": "Thomas Klein",
-      "company": "Opengento",
-      "companyLogo": "/images/logo/opengento.svg",
-      "companyUrl": "https://opengento.fr/",
-      "linkedin": "https://www.linkedin.com/in/thomas-klein/",
-      "role": "Chargée de communication",
-      "photo": "/images/staff/thomas_klein.jpeg",
-      "biography": ""
-    },
     {
       "name": "Ceyhun Kaplan",
       "company": "Blackbird",
@@ -106,14 +95,14 @@
       "biography": ""
     },
     {
-      "name": "Elodie Guiroux",
+      "name": "Patricia Poncy",
       "company": "Platform.sh",
       "companyLogo": "/images/logo/platformsh.svg",
       "companyUrl": "https://platform.sh/",
-      "linkedin": "https://www.linkedin.com/in/elodie-guiroux/",
-      "role": "Events Marketing Manager",
-      "photo": "/images/staff/elodie_guiroux.png",
-      "photoBg": 2,
+      "linkedin": "https://www.linkedin.com/in/patriciaponcy",
+      "role": "Agency Partner Manager Western EU",
+      "photo": "/images/staff/patricia_poncy.png",
+      "photoBg": 3,
       "biography": ""
     },
     {
@@ -126,6 +115,17 @@
       "photo": "/images/staff/olivier_haesen.png",
       "photoBg": 4,
       "biography": ""
+    },
+    {
+      "name": "Elodie Guiroux",
+      "company": "Platform.sh",
+      "companyLogo": "/images/logo/platformsh.svg",
+      "companyUrl": "https://platform.sh/",
+      "linkedin": "https://www.linkedin.com/in/elodie-guiroux/",
+      "role": "Events Marketing Manager",
+      "photo": "/images/staff/elodie_guiroux.png",
+      "photoBg": 2,
+      "biography": ""
     }
   ]
 }
diff --git a/src/app/code-de-conduite/page.tsx b/src/app/code-de-conduite/page.tsx
@@ -5,7 +5,7 @@ import ContentMedia from "@/components/ContentMedia/ContentMedia";
 
 export default function Page() {
   return (
-    <Container size="large" className="flex flex-col gap-8 my-8">
+    <Container className="flex flex-col gap-8 my-8">
       <ContentMedia>
         <Typography
           variant="h1"

diff --git a/src/app/mentions-legales/page.tsx b/src/app/mentions-legales/page.tsx
@@ -6,7 +6,7 @@ import Image from "next/image";
 
 export default function Page() {
   return (
-    <Container size="large" className="flex flex-col gap-8 my-8">
+    <Container className="flex flex-col gap-8 my-8">
       <ContentMedia>
         <Typography
           variant="h1"

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -31,7 +31,7 @@ export default function Home() {
         <div className="content-media-sections flex flex-col gap-12 py-12">
           <div id="faq">
             <ContentMedia
-              imageUrl="/images/faq.png"
+              imageUrl="/images/media/faq.png"
               imagePosition="right"
               imageWidth="40%"
               title="Besoin d'aide ?"

diff --git a/src/app/staff/page.tsx b/src/app/staff/page.tsx
@@ -10,9 +10,11 @@ import {PersonProps} from "@/components/Person/PersonProps";
 import Person from "@/components/Person/Person";
 import useDataProvider from "@/hooks/useDataProvider";
 import PersonPopIn from "@/components/Person/PersonPopIn";
+import ButtonLink from "@/components/ButtonLink/ButtonLink";
+import {IoIosArrowForward} from "react-icons/io";
 
 export default function Page() {
-  const { t } = useTranslation(['staff']);
+  const { t } = useTranslation(['staff', 'common']);
   const dataProvider = useDataProvider();
   const staffMembers = dataProvider.useStaffs();
   const [selectedStaff, setSelectedStaff] = React.useState<PersonProps | null>(null);
@@ -45,7 +47,7 @@ export default function Page() {
   }
 
   return (
-    <Container size="large" className="flex flex-col gap-8 my-8">
+    <Container className="flex flex-col gap-8 my-8">
       <ContentMedia>
         <Typography
           variant="h1"
@@ -61,14 +63,11 @@ export default function Page() {
         >
           {t('staff:subtitle')}
         </Typography>
-
         {renderImages()}
-
         <Typography color="dark" className="whitespace-pre-wrap">
           {t('staff:description')}
         </Typography>
       </ContentMedia>
-
       <div className="grid grid-cols-3 gap-8 gap-y-12">
         {staffMembers
           .map((staff) => (
@@ -81,14 +80,51 @@ export default function Page() {
             </div>
           ))}
       </div>
+      <ContentMedia
+        imageUrl="/images/media/faq.png"
+        imagePosition="left"
+        imageWidth="40%"
+      >
+        <div className="flex flex-col gap-6 h-full justify-center">
+          <Typography
+            variant="subtitle1"
+            weight="semibold"
+            color="primary"
+          >
+            Rejoignez-nous à Meet Magento France 2025 !
+          </Typography>
+          <Typography color="dark">
+            Réservez votre place dès maintenant et rejoignez-nous pour un événement riche en échanges, en apprentissages et en opportunités !
+          </Typography>
+          <div className="flex flex-row flex-wrap gap-8">
+            <ButtonLink
+              variant="secondary-invert"
+              href="/#programs"
+              iconPosition="right"
+              icon={<IoIosArrowForward />}
+            >
+              Je découvre la programmation
+            </ButtonLink>
+            <ButtonLink
+              variant="secondary-invert"
+              href={t('common:ticketingUrl')}
+              target="_blank"
+              rel="noopener"
+              iconPosition="right"
+              icon={<IoIosArrowForward />}
+            >
+              Je prend mon billet
+            </ButtonLink>
+          </div>
+        </div>
+      </ContentMedia>
       {selectedStaff && (
         <PersonPopIn
           isOpen={!!selectedStaff}
           onClose={handleCloseModal}
           selectedPerson={selectedStaff}
         />
       )}
-
     </Container>
   );
 }
diff --git a/src/layouts/Footer/Footer.tsx b/src/layouts/Footer/Footer.tsx
@@ -77,7 +77,7 @@ const Footer = () => {
     {
       content: {
         type: 'link',
-        href: '/mentions-legales#staff',
+        href: '/staff',
         text: 'Les organisateurs'
       },
       className: "w-full font-semibold hover:text-orange mb-2"