Resolve merge conflicts in speaker mentorship page

Author: ashiorkornortey

src/components/SocialLinks.astro

@@ -8,25 +8,25 @@ const {
 } = Astro.props;
 const socialMap = {
   website: { icon: "globe", label: "Website", color: "#0077b5" },
-  blog: { icon: "rss", label: "Blog", color: "" },
+  blog: { icon: "rss", label: "Blog", color: "#f26522", style: "solid" },
   linkedin: { icon: "linkedin", label: "LinkedIn", color: "#0a66c2" },
   github: { icon: "github", label: "GitHub", color: "#333333" },
+  youtube: { icon: "youtube", label: "YouTube", color: "#ff0000" },
+  discord: { icon: "discord", label: "Discord", color: "#5865f2" },
   mastodon: { icon: "mastodon", label: "Mastodon", color: "#6364ff" },
   bluesky: { icon: "bluesky", label: "Bluesky", color: "#0085ff" },
-  twitter: { icon: "x-twitter", label: "Twitter", color: "#1da1f2" },
   instagram: { icon: "instagram", label: "Instagram", color: "#e4405f" },
-  discord: { icon: "discord", label: "Discord", color: "#5865f2" },
-  facebook: { icon: "facebook", label: "Facebook", color: "#1877f2" },
-  youtube: { icon: "youtube", label: "YouTube", color: "#ff0000" },
   tiktok: { icon: "tiktok", label: "TikTok", color: "#000000" },
+  facebook: { icon: "facebook", label: "Facebook", color: "#1877f2" },
+  twitter: { icon: "x-twitter", label: "Twitter", color: "#1da1f2" },
 };
 ---
 
 <div class=`social-links flex justify-center space-x-4 ${className} h-[36px]`>
   {
     Object.entries(socialMap)
       .filter(([key]) => socials?.[key])
-      .map(([key, { icon, label, color }]) => {
+      .map(([key, { icon, label, color, style: iconStyle = "brands" }]) => {
         const url = socials[key];
         const style = variant === "color" && color ? `color: ${color}` : {variant};
         return (
@@ -41,7 +41,7 @@ const socialMap = {
             {" "}
             <span class="social-icon-inner">
               {" "}
-              <Icon name={icon} style="brands" size="fa-xl" />{" "}
+              <Icon name={icon} style={iconStyle} size="fa-xl" />{" "}
             </span>{" "}
           </a>
         );

src/components/SponsorLogo.astro

@@ -22,15 +22,15 @@ const {
 
 const logo = sponsorLogos[sponsor.id];
 const slug = tier==="Partners"? `/community-partners#sponsor-${sponsorId}`
-/*: tier==="Platinum" ? `/sponsor/${sponsorId}` */
+: tier==="Platinum" ? `/sponsor/${sponsorId}`
 : tier==="Media Partners" ? `/media-partners#sponsor-${sponsorId}` : tier==="Startups" ? `/startups#sponsor-${sponsorId}` : `/sponsors#sponsor-${sponsorId}`
 
 ---
 
 <div
   class="lg:max-w-[400px] flex flex-col p-6 bg-white"
 >
-  <div class="w-full grid text-center justify-center items-center md:items-center">
+  <div class={`w-full grid text-center justify-center items-center md:items-center ${tier === "Platinum" ? "min-h-[140px]" : ""}`}>
     {
       website && slug ? (
 

src/components/sections/hero/hero.astro

@@ -47,7 +47,7 @@ const action2 = "https://www.youtube.com/watch?v=laSzm-raS5A";
     <!-- Second 2x1 Grid with Action Buttons -->
     <div class="text-center grid grid-cols-1 md:grid-cols-2 gap-4 m-6">
       <div class="btn-outline">
-        <Button outline disabled class="!text-white !border-white"> Tickets coming soon! </Button>
+        <Button outline url="/tickets" class="!text-white !border-white hover:!bg-white hover:!text-primary"> Register now! </Button>
       </div>
       <div class="btn-outline">
         <Button outline url={action2} class="!text-white !border-white hover:!bg-white hover:!text-primary"> Watch the video (no Rickrolls) </Button>

src/components/sections/subscribe.astro

@@ -2,11 +2,13 @@
 import Button from "@ui/Button.astro";
 import Section from "@ui/Section.astro"
 const socialLinks = [
-{ href: "https://www.linkedin.com/company/europython/", icon: "linkedin", label: "LinkedIn" },
-  { href: "https://www.instagram.com/europython/", icon: "instagram", label: "Instagram" },
+  { href: "https://www.linkedin.com/company/europython/", icon: "linkedin", label: "LinkedIn" },
+  { href: "https://github.com/europython", icon: "github", label: "GitHub" },
   { href: "https://www.youtube.com/channel/UC98CzaYuFNAA_gOINFB0e4Q", icon: "youtube", label: "YouTube" },
   { href: "https://fosstodon.org/@europython", icon: "mastodon", label: "Mastodon" },
   { href: "https://bsky.app/profile/europython.eu", icon: "bluesky", label: "Bluesky" },
+  { href: "https://www.instagram.com/europython/", icon: "instagram", label: "Instagram" },
+  { href: "https://www.tiktok.com/@europython/", icon: "tiktok", label: "TikTok" },
   { href: "https://x.com/europython", icon: "x", label: "X (formerly Twitter)" },
 ];
 ---

src/components/ticket-tiers/ticket-tiers.astro

@@ -29,10 +29,10 @@ const tiers: TicketTierProps[] = [
     businessPrice: 400,
     features: [
       {
-        text: "Access to two full days of workshops, summits, and tutorials across six parallel tracks (14-15 July)",
+        text: "Access to two full days of workshops, summits, and tutorials across six parallel tracks (13-14 July)",
       },
       {
-        text: "<strong>Does NOT include</strong> access to three days of talks across six parallel tracks with 130+ talks (16-18 July)",
+        text: "<strong>Does NOT include</strong> access to three days of talks across six parallel tracks with 130+ talks (15-17 July)",
         icon: "❌",
       },
       {
@@ -43,7 +43,7 @@ const tiers: TicketTierProps[] = [
         text: "<strong>Does NOT include</strong> access to sponsor booths with opportunities to connect with sponsoring sponsors",
         icon: "❌",
       },
-      { text: "Access to Sprint Weekend (19-20 July)" },
+      { text: "Access to Sprint Weekend (18-19 July)" },
       { text: "Light lunch provided each day" },
       { text: "Break refreshments (coffee, tea, water, and more)" },
       {
@@ -66,18 +66,18 @@ const tiers: TicketTierProps[] = [
     lateBusinessPrice: 750,
     features: [
       {
-        text: "Access to two full days of workshops, summits, and tutorials across six parallel tracks (14-15 July)",
+        text: "Access to two full days of workshops, summits, and tutorials across six parallel tracks (13-14 July)",
         icon: "❌",
       },
       {
-        text: "<strong>Access to three days of talks across six parallel tracks with 130+ talks (16-18 July)</strong>",
+        text: "<strong>Access to three days of talks across six parallel tracks with 130+ talks (15-17 July)</strong>",
       },
       { text: "Access to open spaces throughout the three conference days" },
-      { text: "Access to Sprint Weekend (19-20 July)" },
+      { text: "Access to Sprint Weekend (18-19 July)" },
       {
         text: "Access to sponsor booths with opportunities to connect with sponsoring sponsors",
       },
-      { text: "Access to Sprint Weekend (19-20 July)" },
+      { text: "Access to Sprint Weekend (18-19 July)" },
       { text: "Limited access to specific sponsored workshops" },
       { text: "Light lunch provided each day" },
       { text: "Break refreshments (coffee, tea, water, and more)" },
@@ -97,16 +97,16 @@ const tiers: TicketTierProps[] = [
     lateBusinessPrice: 1200,
     features: [
       {
-        text: "Access to two full days of workshops, summits, and tutorials across six parallel tracks (14-15 July)",
+        text: "Access to two full days of workshops, summits, and tutorials across six parallel tracks (13-14 July)",
       },
       {
-        text: "<strong>Access to three days of talks across six parallel tracks with 130+ talks (16-18 July)</strong>",
+        text: "<strong>Access to three days of talks across six parallel tracks with 130+ talks (15-17 July)</strong>",
       },
       { text: "Access to open spaces throughout the three conference days" },
       {
         text: "Access to sponsor booths with opportunities to connect with sponsoring sponsors",
       },
-      { text: "Access to Sprint Weekend (19-20 July)" },
+      { text: "Access to Sprint Weekend (18-19 July)" },
       { text: "Limited access to specific sponsored workshops" },
       { text: "Light lunch provided each day" },
       { text: "Break refreshments (coffee, tea, water, and more)" },
@@ -121,16 +121,13 @@ const tiers: TicketTierProps[] = [
       },
     ],
   },
-
+ /*
   {
   title: "Remote",
   personalPrice: 80,
   businessPrice: 150,
   subtitle: "Conference days only",
   features: [
-    {
-      text: "Remote participation for Conference Days (16-18 July)",
-    },
     {
       text: "Watch live talks, keynotes & panels in all 6 tracks",
     },
@@ -146,6 +143,7 @@ const tiers: TicketTierProps[] = [
     },
   ],
 },
+*/
 ];
 
 const formatPrice = (price: number | string) => {
@@ -235,13 +233,6 @@ const formatPrice = (price: number | string) => {
     /*transform: translateX(-50%);*/
     position: relative;
     /*padding: 0 40px;*/
-    background: linear-gradient( to top,
-rgba(245, 229, 214, 0) 0%,
-rgb(245, 229, 214) 5%,
-rgb(245, 229, 214) 95%,
-rgba(245, 229, 214, 0
-) 100% )
-;
   }
 
   @media (max-width: 1023px) {

src/content/config.ts

@@ -225,6 +225,7 @@ const sponsors = defineCollection({
     socials: z
       .object({
         linkedin: z.string().url().optional().nullable(),
+        blog: z.string().url().optional().nullable(),
         github: z.string().url().optional().nullable(),
         mastodon: z.string().url().optional().nullable(),
         bluesky: z.string().url().optional().nullable(),

src/content/deadlines/02_mentorship.md

@@ -6,5 +6,7 @@ image: mentorship1.jpg
 #disabled: false
 ---
 
-Join our Speaker Orientation to build confidence, improve stage presence, and learn how to engage your audience.
-It is happening on 3 June 2026 18:00 CEST Online and is open to first time and returning speakers.
+Join our Speaker Orientation to build confidence, improve stage presence, and
+learn how to engage your audience. It is happening on 3 June 2026 18:00 CEST
+online and is open to first-time and returning speakers.
+

src/content/deadlines/04_tickets.md

@@ -0,0 +1,9 @@
+---
+title: Ticket Sale
+subtitle: Register now!
+url: /tickets
+image: "./registration.jpg"
+---
+
+Grab your spot at EuroPython 2026. Share, learn, and connect with fellow
+Pythonistas!

src/content/pages/contacts.mdx

@@ -17,11 +17,13 @@ project/event to suggest for our newsletter.
 Follow us on these channels:
 
 - [EuroPython LinkedIn](https://www.linkedin.com/company/europython)
+- [EuroPython Website](https://github.com/EuroPython/website)
+- [EuroPython YouTube Channel](https://youtube.com/channel/UC98CzaYuFNAA_gOINFB0e4Q) (conference videos)
 - [EuroPython Mastodon](https://fosstodon.org/@europython)
 - [EuroPython Bluesky](https://bsky.app/profile/europython.eu)
-- [EuroPython Telegram](https://t.me/+dEi3nIHzGRw0YjQy)
 - [EuroPython Instagram](https://instagram.com/europython/)
-- [EuroPython YouTube Channel](https://youtube.com/channel/UC98CzaYuFNAA_gOINFB0e4Q) (conference videos)
+- [EuroPython TikTok](https://www.tiktok.com/@europython)
+- [EuroPython Telegram](https://t.me/+dEi3nIHzGRw0YjQy)
 - [EuroPython X Account](https://x.com/europython)
 
 ## EuroPython Helpdesk

src/content/pages/programme/mentorship.mdx

@@ -46,7 +46,8 @@ If you require help contributing to EuroPython, especially if you are from an
 underrepresented or a marginalised group in the tech industry, you are welcome
 to submit your application in the form above to become a mentee.
 
-<Button disabled>Sign Up closed</Button>
+<Button disabled>Sign up closed</Button>
+
 
 ## 2. Workshops