Merge branch 'main' into feature/brochure-sponsors

pythonitalia · Oct 1, 2024 · 6582c9e · 6582c9e
2 parents 06779df + 06c5dac
commit 6582c9e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/frontend/src/components/blocks/homepage-hero/index.tsx b/frontend/src/components/blocks/homepage-hero/index.tsx
@@ -1,5 +1,6 @@
 import {
   HeroIllustration,
+  HeroIllustrationBologna,
   LayoutContent,
   ScrollDownArrowBar,
 } from "@python-italia/pycon-styleguide";
@@ -11,14 +12,19 @@ type Props = {
   city: HomepageHeroCity;
 };
 
-const Illustration = React.memo(HeroIllustration);
+const HeroIllustrationFlorenceMemo = React.memo(HeroIllustration);
+const HeroIllustrationBolognaMemo = React.memo(HeroIllustrationBologna);
 
 export const HomepageHero = ({ cycle, city }: Props) => {
   return (
     <div className="h-screen relative -mt-[161px] -mb-[3px]">
       <div className="h-screen lg:h-[calc(100vh-60px)]">
-        {city === HomepageHeroCity.Florence && <Illustration cycle={cycle} />}
-        {city === HomepageHeroCity.Bologna && <div>Bologna illustration</div>}
+        {city === HomepageHeroCity.Florence && (
+          <HeroIllustrationFlorenceMemo cycle={cycle} />
+        )}
+        {city === HomepageHeroCity.Bologna && (
+          <HeroIllustrationBolognaMemo cycle={cycle} />
+        )}
       </div>
 
       <LayoutContent

diff --git a/frontend/src/components/brochure/backcover-page.tsx b/frontend/src/components/brochure/backcover-page.tsx
@@ -1,4 +1,3 @@
-import { Snake1 } from "@python-italia/pycon-styleguide/illustrations";
 import { CoverLogo } from "./cover-logo";
 
 export function BackCoverPage() {

diff --git a/frontend/src/components/brochure/community-page.tsx b/frontend/src/components/brochure/community-page.tsx
@@ -1,4 +1,3 @@
-import { Snake4 } from "@python-italia/pycon-styleguide/illustrations";
 import { compile } from "~/helpers/markdown";
 
 const Snakes = (props: React.SVGProps<SVGSVGElement>) => (

diff --git a/frontend/src/components/header/index.tsx b/frontend/src/components/header/index.tsx
@@ -42,19 +42,19 @@ export const Header = () => {
   );
 
   const actions: Action[] = [
-    isRunning && hasSomethingLive
-      ? {
-          text: getTranslatedMessage("header.streaming", language),
-          icon: "live-circle",
-          link: "/streaming",
-          background: "red",
-          hoverBackground: "red",
-        }
-      : {
-          text: getTranslatedMessage("header.tickets", language),
-          icon: "tickets",
-          link: "/tickets",
-        },
+    // isRunning && hasSomethingLive
+    //   ? {
+    //       text: getTranslatedMessage("header.streaming", language),
+    //       icon: "live-circle",
+    //       link: "/streaming",
+    //       background: "red",
+    //       hoverBackground: "red",
+    //     }
+    //   : {
+    //       text: getTranslatedMessage("header.tickets", language),
+    //       icon: "tickets",
+    //       link: "/tickets",
+    //     },
     {
       text:
         isReady && loggedIn

diff --git a/frontend/src/components/logo/index.tsx b/frontend/src/components/logo/index.tsx
@@ -53,7 +53,7 @@ export const Logo = (props: any) => (
         fill="black"
       />
       <path
-        d="M467.088 115.8V108.229C469.5 106.532 471.621 105.035 473.453 103.74C475.329 102.445 477.004 101.261 478.478 100.189C479.996 99.117 481.426 98.0897 482.766 97.107C486.071 94.695 488.55 92.7297 490.203 91.211C491.855 89.6477 492.994 88.2854 493.62 87.124C494.29 85.918 494.625 84.6227 494.625 83.238C494.625 81.0047 493.888 79.3074 492.414 78.146C490.984 76.9847 488.863 76.404 486.049 76.404C483.324 76.404 481.202 76.9624 479.684 78.079C478.165 79.1957 477.048 81.027 476.334 83.573L466.619 82.501C467.512 77.811 469.634 74.26 472.984 71.848C476.378 69.436 480.89 68.23 486.518 68.23C492.369 68.23 496.925 69.4807 500.186 71.982C503.446 74.4834 505.077 77.945 505.077 82.367C505.077 84.645 504.652 86.6997 503.804 88.531C503 90.3177 501.682 92.1267 499.851 93.958C498.019 95.7447 495.518 97.7547 492.347 99.988C489.086 102.311 485.423 104.812 481.359 107.492H506.015L504.742 115.8H467.088ZM538.255 115.8V105.951H511.455V98.313L537.719 69.503H547.635V98.313H555.005L553.933 105.951H547.635V115.8H538.255ZM538.255 79.888L521.371 98.313H538.255V79.888Z"
+        d="M504.29 105.22V116H469.08V109.14L483.15 95.56C484.923 93.8333 486.37 92.34 487.49 91.08C488.61 89.82 489.45 88.63 490.01 87.51C490.57 86.39 490.85 85.1767 490.85 83.87C490.85 82.7967 490.64 81.8867 490.22 81.14C489.8 80.3467 489.193 79.7633 488.4 79.39C487.607 78.97 486.627 78.76 485.46 78.76C484.153 78.76 483.033 79.0167 482.1 79.53C481.167 79.9967 480.443 80.6967 479.93 81.63C479.463 82.5633 479.23 83.7067 479.23 85.06H467.54C467.54 81.7 468.333 78.7367 469.92 76.17C471.507 73.6033 473.677 71.5967 476.43 70.15C479.23 68.7033 482.45 67.98 486.09 67.98C489.403 67.98 492.367 68.61 494.98 69.87C497.593 71.13 499.647 72.8333 501.14 74.98C502.68 77.1267 503.45 79.5767 503.45 82.33C503.45 84.29 503.147 86.11 502.54 87.79C501.933 89.4233 500.837 91.22 499.25 93.18C497.71 95.0933 495.47 97.4733 492.53 100.32L487.49 105.22H504.29ZM534.394 116.7C530.847 116.7 527.627 116.023 524.734 114.67C521.887 113.317 519.624 111.473 517.944 109.14C516.264 106.76 515.354 104.053 515.214 101.02H527.324C527.65 102.653 528.42 103.89 529.634 104.73C530.894 105.523 532.457 105.92 534.324 105.92C536.004 105.92 537.287 105.617 538.174 105.01C539.107 104.403 539.737 103.657 540.064 102.77C540.437 101.883 540.624 101.02 540.624 100.18C540.624 99.2933 540.414 98.4067 539.994 97.52C539.62 96.6333 538.944 95.8867 537.964 95.28C536.984 94.6267 535.607 94.3 533.834 94.3C532.154 94.3 530.707 94.65 529.494 95.35C528.28 96.05 527.417 97.1467 526.904 98.64L516.894 95.28L521.094 68.68H550.214V79.46H529.844L528.864 85.55C529.937 85.0367 531.08 84.6633 532.294 84.43C533.507 84.15 534.72 84.01 535.934 84.01C539.947 84.01 543.214 84.8033 545.734 86.39C548.254 87.9767 550.097 90.03 551.264 92.55C552.477 95.0233 553.084 97.59 553.084 100.25C553.084 102.163 552.71 104.1 551.964 106.06C551.217 107.973 550.074 109.747 548.534 111.38C546.994 112.967 545.057 114.25 542.724 115.23C540.39 116.21 537.614 116.7 534.394 116.7Z"
         fill="#1D1D1B"
       />
     </g>
@@ -83,7 +83,7 @@ export const MobileLogo = (props: any) => (
         <path d="M120 0H0V60H120V0Z" fill="#FCE8DE" />
         <path d="M120 60V0H60V60H120Z" fill="#F17A5D" />
         <path
-          d="M76.408 38V35.514C77.2 34.9567 77.8967 34.4653 78.498 34.04C79.114 33.6147 79.664 33.226 80.148 32.874C80.6467 32.522 81.116 32.1847 81.556 31.862C82.6413 31.07 83.4553 30.4247 83.998 29.926C84.5407 29.4127 84.9147 28.9653 85.12 28.584C85.34 28.188 85.45 27.7627 85.45 27.308C85.45 26.5747 85.208 26.0173 84.724 25.636C84.2547 25.2547 83.558 25.064 82.634 25.064C81.7393 25.064 81.0427 25.2473 80.544 25.614C80.0453 25.9807 79.6787 26.582 79.444 27.418L76.254 27.066C76.5473 25.526 77.244 24.36 78.344 23.568C79.4587 22.776 80.94 22.38 82.788 22.38C84.7093 22.38 86.2053 22.7907 87.276 23.612C88.3467 24.4333 88.882 25.57 88.882 27.022C88.882 27.77 88.7427 28.4447 88.464 29.046C88.2 29.6327 87.7673 30.2267 87.166 30.828C86.5647 31.4147 85.7433 32.0747 84.702 32.808C83.6313 33.5707 82.4287 34.392 81.094 35.272H89.19L88.772 38H76.408ZM100.436 38V34.766H91.6363V32.258L100.26 22.798H103.516V32.258H105.936L105.584 34.766H103.516V38H100.436ZM100.436 26.208L94.8923 32.258H100.436V26.208Z"
+          d="M90.034 35.612V39H78.968V36.844L83.39 32.576C85.04 30.97 85.81 30.134 85.81 28.902C85.81 27.89 85.194 27.296 84.116 27.296C82.862 27.296 82.158 28.022 82.158 29.276H78.484C78.484 26.13 80.882 23.908 84.314 23.908C87.438 23.908 89.77 25.844 89.77 28.418C89.77 30.288 89.088 31.41 86.338 34.072L84.754 35.612H90.034ZM97.9552 39.22C94.5892 39.22 92.0372 37.152 91.9272 34.292H95.7332C95.9312 35.326 96.7672 35.832 97.9332 35.832C99.5172 35.832 99.9132 34.82 99.9132 34.028C99.9132 33.214 99.4292 32.18 97.7792 32.18C96.7232 32.18 95.9312 32.598 95.6012 33.544L92.4552 32.488L93.7752 24.128H102.927V27.516H96.5252L96.2172 29.43C96.8992 29.1 97.6692 28.946 98.4392 28.946C102.223 28.946 103.829 31.542 103.829 34.05C103.829 36.47 101.981 39.22 97.9552 39.22Z"
           fill="#0E1116"
         />
         <path

diff --git a/frontend/src/locale/index.ts b/frontend/src/locale/index.ts
@@ -3,7 +3,7 @@ export const messages = {
   en: {
     titleTemplate: "%s | PyCon Italia",
     description:
-      "Join PyCon Italia from the 22th to the 25th of May 2024 in Florence, Italy!",
+      "Join PyCon Italia May 28th to May 31st 2025 in Bologna, Italy!",
     "input.placeholder": "Type here...",
     "global.accordion.close": "Close",
     "global.accordion.readMore": "Read more",
@@ -1048,7 +1048,7 @@ We have a limited number of discounted rooms, so make sure you grab yours quickl
   it: {
     titleTemplate: "%s | PyCon Italia",
     description:
-      "Partecipa a PyCon Italia! Dal 22 al 25 Maggio 2024 a Firenze!",
+      "Partecipa a PyCon Italia! Dal 28 al 31 Maggio 2025 a Bologna!",
     "global.accordion.close": "Chiudi",
     "global.accordion.readMore": "Apri",
     "global.here": "qui",

diff --git a/frontend/src/pages/api/[lang]/social-card.tsx b/frontend/src/pages/api/[lang]/social-card.tsx
@@ -107,7 +107,7 @@ const handler = async (req: NextRequest) => {
               textTransform: "uppercase",
             }}
           >
-            Florence
+            Bologna
           </div>
           <div
             style={{
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,7 +107,7 @@ const handler = async (req: NextRequest) => { @@
                   textTransform: "uppercase",
                 }}
               >
-                Florence
+                Bologna
               </div>
               <div
                 style={{
@@ Expand Down @@