fix affichages divers

GDG-Nantes · Sep 1, 2024 · 9737392 · 9737392
1 parent 6ec5c39
commit 9737392
Show file tree

Hide file tree

Showing 12 changed files with 6,717 additions and 10,246 deletions.
diff --git a/data/speakers/stephanie_vachon.yml b/data/speakers/stephanie_vachon.yml
@@ -1,7 +1,6 @@
 ---
 key: stephanie_vachon
 name: Stéphanie Vachon
-feature: false
 company: 'Nantes Numérique Responsable'
 companyLogo: /images/partners/nantes_numerique_responsable_.png
 city: Nantes, France

diff --git a/data/speakers/valentin_deleplace.yml b/data/speakers/valentin_deleplace.yml
@@ -1,7 +1,6 @@
 ---
 key: valentin_deleplace
 name: Valentin Deleplace
-feature: false
 photoUrl: https://avatars.githubusercontent.com/u/13508141?v=4
 city: Paris, France
 company: Google

diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -9,9 +9,10 @@
       "what-is": "What is DevFest Nantes?",
       "jumbo": {
         "come-back": "Devfest Nantes will be back",
-        "date": "on October 17,18 2024",
+        "date": "October 17,18 2024",
         "cfp": "Become speaker",
         "previous": "2022 Edition",
+        "schedule": "Schedule",
         "generate-ticket": "Edit my ticket",
         "bring-ecocup": "Don't forget your own eco-cup and bag !",
         "resend-tickets": "Resend my tickets",

diff --git a/locales/fr/translation.json b/locales/fr/translation.json
@@ -9,9 +9,10 @@
       "what-is": "Le DevFest Nantes",
       "jumbo": {
         "come-back": "Le Devfest Nantes reviendra",
-        "date": "les 17 & 18 Octobre 2024",
+        "date": "17 & 18 Octobre 2024",
         "cfp": "Devenir speaker",
         "previous": "Édition 2022",
+        "schedule": "Programme",
         "generate-ticket": "Générer mon billet",
         "bring-ecocup": "N'oubliez pas vos propres eco-cups et sac !",
         "resend-tickets": "Renvoyer mes billets",

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/commun/jumbo/jumbo.tsx b/src/components/commun/jumbo/jumbo.tsx
@@ -5,7 +5,7 @@ export const Jumbo: React.FC<
   React.PropsWithChildren<{ background?: string }>
 > = ({ children, background }) => {
   return (
-    <div className="jumbo bande-film-bottom">
+    <div className="jumbo">
       <div className="jumbo-content">{children}</div>
     </div>
   );

diff --git a/src/components/commun/section/section.scss b/src/components/commun/section/section.scss
@@ -17,7 +17,7 @@
   }
 
   &.slim {
-    padding: 2rem 10vw;
+    padding: 1.2rem 10vw; 
   }
 
   &.padding-none {

diff --git a/src/components/home/home.scss b/src/components/home/home.scss
@@ -20,12 +20,19 @@
     width: 100%;
     margin-top: 10%;
     max-height: 45%;
+    flex-grow: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     img {
       height: auto;
       width: 50%;
       max-height: 100%;
       margin: auto;
       display: block;
+      @media (max-width: 960px) {
+        width: 75%;
+      }
     }
   }
 

diff --git a/src/components/home/jumbo.tsx b/src/components/home/jumbo.tsx
@@ -19,19 +19,19 @@ export const HomeJumbo = () => {
       </div>
 
       <div>
-        <Typography variant="h1" textAlign="center">
+        {/* <Typography variant="h1" textAlign="center">
           {t("come-back")}
-        </Typography>
+        </Typography> */}
         <Typography variant="h1" textAlign="center">
           {t("date")}
         </Typography>
-        {/*<Typography*/}
-        {/*  variant="h2"*/}
-        {/*  textAlign="center"*/}
-        {/*  style={{marginTop: "10px", marginBottom: "25px"}}*/}
-        {/*>*/}
-        {/*  Code, Dev, et... Action !*/}
-        {/*</Typography>*/}
+        <Typography
+          variant="h2"
+          textAlign="center"
+          style={{marginTop: "10px", marginBottom: "25px"}}
+        >
+          At night, they come to code !
+        </Typography>
         <Stack direction="column" spacing={3}>
           {/*<Stack direction="row" spacing={3} justifyContent={"center"}>*/}
           {/*  <Button*/}
@@ -52,14 +52,14 @@ export const HomeJumbo = () => {
             >
               {t("cfp")}
             </Button> */}
-            <Button
+            {/* <Button
               color="secondary"
               variant="contained"
               href="https://www.billetweb.fr/partenaire-devfest-nantes-2024"
               aria-label="Devenir Sponsor"
             >
               Devenir Sponsor 2024
-            </Button>
+            </Button> */}
             <Button
               color="secondary"
               variant="contained"
@@ -68,6 +68,14 @@ export const HomeJumbo = () => {
             >
               Billetterie
             </Button>
+            <Button
+              color="secondary"
+              variant="contained"
+              aria-label="Billetterie"
+              href="/schedule"
+            >
+              {t('schedule')}
+            </Button>
           </Stack>
           <Stack direction="row" spacing={3} justifyContent={"center"}>
 

diff --git a/src/components/session/sessionPageTemplate.tsx b/src/components/session/sessionPageTemplate.tsx
@@ -45,7 +45,7 @@ const SessionPageTemplate: React.FC<{ pageContext: { session: Session } }> = ({
           >
             {session.title}
           </Typography>
-          <Stack spacing={5}>
+          <Stack spacing={3}>
             <Stack direction="row" spacing={2} alignItems="center">
               <Typography
                 variant="h3"
@@ -156,6 +156,8 @@ const SpeakerCard: React.FC<{ speakerKey }> = ({ speakerKey }) => {
           minHeight: "75px",
           color: "var(--tertiary)",
           backgroundColor: "var(--primary)",
+          border: "1px solid white",
+          borderLeft: "5px solid var(--secondary)"
         }}
       >
         <Stack

diff --git a/src/components/speakers/speakerPageTemplate.tsx b/src/components/speakers/speakerPageTemplate.tsx
@@ -43,20 +43,20 @@ const SpeakerPageTemplate: React.FC<{ pageContext: { speaker: Speaker } }> = ({
     <Layout>
       <DefaultPage title={speaker.name} noHero={true}>
         <TertiarySection slim>
-          <Stack spacing={5}>
-            <Stack spacing={5} direction="column" alignItems="center">
+          <Stack spacing={1}>
+            <Stack spacing={2} direction="column" alignItems="center">
               <AvatarSpeaker speaker={speaker} size="large" />
               <Typography
                 variant="h1"
                 color="primary"
-                sx={{ marginBottom: "5px" }}
+                sx={{ marginBottom: "2px" }}
               >
                 {speaker.name}
               </Typography>
               {speaker.company && (
                 <Typography
                   variant="h4"
-                  style={{ color: "white", marginTop: "20px" }}
+                  style={{ color: "white", marginTop: "10px" }}
                 >
                   {speaker.company}
                 </Typography>
@@ -101,7 +101,8 @@ const SessionCard: React.FC<{ session: PartialSession }> = ({ session }) => {
           color: "var(--tertiary)",
           backgroundColor: "var(--primary)",
           padding: "10px",
-          border: "1px solid white"
+          border: "1px solid white",
+          borderLeft: "5px solid var(--secondary)"
         }}
       >
         <Stack

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -15,44 +15,46 @@ import {
   HomeMap,
   Tickets,
 } from "../components/home";
+import { PlanCite } from "../components/home/plan";
+import { Partners } from "../components/partners";
 import Layout from "../layout";
 
 const HomeContent = () => {
   const { t } = useTranslation("translation");
   return (
     <>
-      <PrimarySection>
+      <PrimarySection> 
         <Typography variant="h1">{t("pages.home.what-is")}</Typography>
         <Typography variant="body1">{t("site.description")}</Typography>
         <Typography variant="body1">{t("site.theme")}</Typography>
         <DevfestNumbers />
         <Youtube id="IE0pnWdSwuw" title="After Movie 2023" />
       </PrimarySection>
-      {/*<PlanCite />*/}
-      <HomeMap />
-      {/*<DefaultSection variant="primary-dark" className="home-speakers">*/}
-      {/*  <Typography variant="h2">{t("pages.home.speakers.title")}</Typography>*/}
-      {/*  <Speakers featuredOnly={true} />*/}
-      {/*  <Stack justifyContent="center" alignItems="center" marginTop={8}>*/}
-      {/*    <MyLink to="/speakers">*/}
-      {/*      <Button variant="contained">*/}
-      {/*        {t("pages.home.speakers.seeAll")}*/}
-      {/*      </Button>*/}
-      {/*    </MyLink>*/}
-      {/*  </Stack>*/}
-      {/*</DefaultSection>*/}
-      <PrimarySection>
+      {/* <PrimarySection slim className="home-speakers">
+        <Typography variant="h2">{t("pages.home.speakers.title")}</Typography>
+        <Speakers featuredOnly={true} />
+        <Stack justifyContent="center" alignItems="center">
+          <MyLink to="/speakers">
+            <Button variant="contained">
+              {t("pages.home.speakers.seeAll")}
+            </Button>
+          </MyLink>
+        </Stack>
+      </PrimarySection> */}
+      <PrimarySection slim>
         <Typography variant="h2">{t("pages.home.tickets.name")}</Typography>
         <Typography variant="h3">
           {t("pages.home.tickets.description")}
         </Typography>
         <Tickets />
       </PrimarySection>
+      <PlanCite />
       <TertiarySection slim>
         <Typography variant="h2">{t("pages.home.newsletter")}</Typography>
         <SubscribeNewsletter />
       </TertiarySection>
-      {/*<Partners onlyPlatinium={true} />*/}
+      <HomeMap />
+      <Partners onlyPlatinium={true} />
 
       <DevfestPhotos />
     </>