Skip to content

Commit fd17a89

Browse files
committed
Merge branch 'main' of https://github.com/opengento/meet-magento-fr into program
2 parents 42acce2 + 432f57f commit fd17a89

25 files changed

+42
-37
lines changed

public/images/background/programs.jpg

580 KB
Loading
443 KB
Loading
-1.75 MB
Binary file not shown.
-175 KB
Loading
-172 KB
Loading
-173 KB
Loading

public/images/background/sponsors.jpg

139 KB
Loading

public/images/background/sponsors.png

-2.8 MB
Binary file not shown.

public/images/bg-gradiant-blue.jpg

-180 KB
Loading

public/images/logo/maddlen.jpeg

1.84 KB
Loading

public/images/media/faq.jpg

808 KB
Loading

public/images/media/faq.png

-7.38 MB
Binary file not shown.

public/images/staff/ceyhun_kaplan.png

160 KB
Loading

public/images/staff/thomas_klein.jpeg

-70.1 KB
Binary file not shown.

public/images/staff/thomas_klein.png

2.85 MB
Loading

public/locales/fr/contributors.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"companyUrl": "https://opengento.fr/",
3333
"linkedin": "https://www.linkedin.com/in/thomas-klein/",
3434
"role": "Développeur",
35-
"photo": "/images/staff/thomas_klein.jpeg",
35+
"photo": "/images/staff/thomas_klein.png",
3636
"photoBg": 3,
3737
"biography": ""
3838
}

public/locales/fr/speakers.json

+12-8
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
{
5252
"id": 4,
5353
"name": "Hervé Guétin",
54-
"company": "Agence Dn'D",
55-
"companyLogo": "/images/logo/dnd.svg",
56-
"companyUrl": "https://www.dnd.fr/",
54+
"company": "Maddlen",
55+
"companyLogo": "/images/logo/maddlen.jpeg",
56+
"companyUrl": "https://www.maddlen.fr/",
5757
"linkedin": "https://www.linkedin.com/in/herveguetin/",
58-
"role": "Tech Expert",
58+
"role": "Consultant & développeur full-stack",
5959
"photo": "/images/speakers/herve_guetin.jpg",
6060
"photoBg": 1,
6161
"biography": ""
@@ -77,7 +77,8 @@
7777
"start": "9h00",
7878
"end": "10h30",
7979
"tags": ["Ouverture", "Business", "Expertise"],
80-
"speakers": [1]
80+
"speakers": [1],
81+
"eventUrl": null
8182
},
8283
{
8384
"id": 2,
@@ -89,7 +90,8 @@
8990
"start": "9h00",
9091
"end": "10h30",
9192
"tags": ["Technical", "Expertise"],
92-
"speakers": [2]
93+
"speakers": [2],
94+
"eventUrl": null
9395
},
9496
{
9597
"id": 3,
@@ -101,7 +103,8 @@
101103
"start": "9h00",
102104
"end": "10h30",
103105
"tags": ["Technical", "Expertise"],
104-
"speakers": [3]
106+
"speakers": [3],
107+
"eventUrl": null
105108
},
106109
{
107110
"id": 4,
@@ -113,7 +116,8 @@
113116
"start": "9h00",
114117
"end": "10h30",
115118
"tags": ["Technical", "Expertise"],
116-
"speakers": [4]
119+
"speakers": [4],
120+
"eventUrl": null
117121
}
118122
]
119123
}

public/locales/fr/staff.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"companyUrl": "https://opengento.fr/",
7777
"linkedin": "https://www.linkedin.com/in/thomas-klein/",
7878
"role": "Secrétaire",
79-
"photo": "/images/staff/thomas_klein.jpeg",
79+
"photo": "/images/staff/thomas_klein.png",
8080
"photoBg": 3,
8181
"biography": ""
8282
},

src/app/page.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default function Home() {
2626
return (
2727
<div className="relative -top-[104px] left-0">
2828
<Hero />
29-
<div id="program">
29+
<div id="programs">
3030
<Program />
3131
</div>
3232
<div id="speakers">
@@ -39,7 +39,7 @@ export default function Home() {
3939
<div className="content-media-sections flex flex-col gap-12 py-12">
4040
<div id="faq">
4141
<ContentMedia
42-
imageUrl="/images/media/faq.png"
42+
imageUrl="/images/media/faq.jpg"
4343
imagePosition="right"
4444
imageWidth="40%"
4545
title="Besoin d'aide ?"

src/components/Person/Person.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const PersonCard = ({
2020
alt={person.company}
2121
width={20}
2222
height={20}
23-
className="h-6"
2423
/>
2524
<span className="text-sm">{person.company}</span>
2625
</div>

src/components/Program/Program.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ProgramList from "./ProgramList";
66
const Program = () => {
77
return (
88
<BackgroundImage
9-
imagePath="/images/background/sponsors.png"
9+
imagePath="/images/background/programs.jpg"
1010
className="py-12"
1111
>
1212
<Container size="large">

src/components/Program/ProgramTile.tsx

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import React from "react";
2-
import { SessionProps } from "../Speakers/Session/SessionProps";
3-
import Session from "../Speakers/Session/Session";
42
import { PiCalendarPlus } from "react-icons/pi";
5-
import Person from "../Person/Person";
63
import useDataProvider from "@/hooks/useDataProvider";
4+
import { SessionProps } from "@/components/Speakers/Session/SessionProps";
5+
import Session from "@/components/Speakers/Session/Session";
6+
import Person from "@/components/Person/Person";
7+
import ButtonLink from "@/components/ButtonLink/ButtonLink";
78

89
const ProgramTile = ({
910
session,
@@ -18,7 +19,7 @@ const ProgramTile = ({
1819
.filter((speaker) => session.speakers.includes(speaker.id));
1920

2021
return (
21-
<div className="program-tile bg-white rounded-xl flex flex-col justify-between gap-6 p-4 md:p-6 h-full group">
22+
<div className="program-tile bg-white rounded-xl flex flex-col justify-between gap-6 p-4 md:p-6 h-full">
2223
<div className="flex flex-col gap-6">
2324
<Session session={session} onPopInClick={onPopInClick} />
2425
<div className="program-tile-speakers flex flex-col gap-2">
@@ -27,14 +28,18 @@ const ProgramTile = ({
2728
))}
2829
</div>
2930
</div>
30-
<div className="flex justify-center">
31-
<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">
32-
<PiCalendarPlus size={20} className="text-white" />
33-
<span className="text-sm text-white font-semibold">
31+
{!!session.eventUrl && (
32+
<div className="mx-auto">
33+
<ButtonLink
34+
variant="secondary-invert"
35+
href={session.eventUrl}
36+
iconPosition="left"
37+
icon={<PiCalendarPlus />}
38+
>
3439
Ajouter à mon agenda
35-
</span>
40+
</ButtonLink>
3641
</div>
37-
</div>
42+
)}
3843
</div>
3944
);
4045
};

src/components/Speakers/Session/Session.tsx

+6-9
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ import ButtonLink from "@/components/ButtonLink/ButtonLink";
99
import { useTranslation } from "react-i18next";
1010
import { BsFillInfoCircleFill } from "react-icons/bs";
1111

12-
const Session = ({
13-
session,
14-
onPopInClick,
15-
}: {
12+
interface Session {
1613
session: SessionProps;
1714
onPopInClick?: () => void;
18-
}) => {
15+
}
16+
17+
const Session = ({ session, onPopInClick }: Session) => {
1918
const { t } = useTranslation(["speakers"]);
2019
return (
2120
<div className="flex flex-col md:flex-row justify-between">
@@ -65,11 +64,9 @@ const Session = ({
6564
variant="secondary-invert"
6665
href={session.eventUrl}
6766
iconPosition="left"
68-
icon={<PiCalendarPlus size={24} className="text-white" />}
67+
icon={<PiCalendarPlus />}
6968
>
70-
<Typography variant="body1" weight="semibold" color="light">
71-
Ajouter à mon agenda
72-
</Typography>
69+
Ajouter à mon agenda
7370
</ButtonLink>
7471
</div>
7572
)}

src/components/SponsorList/SponsorList.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ const SponsorList = ({ items }: { items: SponsorProps[] }) => {
4141
];
4242

4343
return (
44-
<BackgroundImage imagePath="/images/background/sponsors.png" className="py-12">
44+
<BackgroundImage imagePath="/images/background/sponsors.jpg" className="py-12">
4545
<Container size="large">
4646
<TopBanner
4747
title="Merci à nos sponsors"
4848
backgroundImage="/images/pattern_top-banner_sponsors.svg"
4949
>
50-
{'submitUrl' in actions && typeof actions.submitUrl === 'string' && actions.submitUrl !== '' && (
50+
{'submitUrl' in actions && typeof actions.submitUrl === 'string' && !!actions.submitUrl && (
5151
<ButtonLink variant="secondary" href={actions.submitUrl}>
5252
Devenir sponsor
5353
</ButtonLink>
5454
)}
55-
{'seeAllUrl' in actions && typeof actions.seeAllUrl === 'string' && actions.seeAllUrl !== '' && (
55+
{'seeAllUrl' in actions && typeof actions.seeAllUrl === 'string' && !!actions.seeAllUrl && (
5656
<>
5757
<div className="hidden md:block">
5858
<ButtonLink variant="soft-pink" href={actions.seeAllUrl}>

src/layouts/Push/Push.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Push = () => {
1212
return (
1313
<div className="my-4">
1414
<ContentMedia
15-
imageUrl="/images/media/faq.png"
15+
imageUrl="/images/media/faq.jpg"
1616
imagePosition="left"
1717
imageWidth="40%"
1818
>

0 commit comments

Comments
 (0)