Merge branch 'ep2025' into component-accordion

Author: egeakman

src/components/button-link/button-link.astro

@@ -0,0 +1,32 @@
+---
+import type React from 'react';
+
+export interface Props {
+  url?: string;
+  children: React.ReactNode;
+  disabled?: boolean;
+  className?: string;
+  secondary?: boolean;
+  isExternal?: boolean;
+}
+
+const { url, className = "", secondary = false, disabled = false, isExternal} = Astro.props;
+const resolvedIsExternal = isExternal !== undefined ? isExternal : url?.startsWith("http");
+---
+
+<a
+  class={`font-bold text-lg px-4 py-4 bg-button rounded-[60px] inline-block leading-4 hover:bg-button-hover not-prose
+    ${secondary || disabled ? "bg-primary text-white hover:bg-primary-hover" : "text-text-inverted"}
+    ${secondary ? "text-text" : ""}
+    ${className || ""}
+    ${disabled ? "opacity-50 pointer-events-none" : ""}`}
+  href={url}
+>
+  <slot />
+
+  {resolvedIsExternal && (
+    <span class="inline-block ml-1 font-system text-lg leading-4">
+      ↗
+    </span>
+  )}
+</a>

src/components/button-link/button-link.tsx

@@ -1,7 +1,7 @@
 ---
 import type { ImageMetadata } from "astro";
 import { Image } from "astro:assets";
-import { ButtonLink } from "../button-link/button-link";
+import ButtonLink from "../button-link/button-link.astro";
 
 export interface Props {
   title: string;
@@ -28,7 +28,7 @@ const { title, subtitle, url, image } = Astro.props;
     <h3 class="text-3xl font-bold mt-2 mb-4 text-primary">{title}</h3>
   </a>
   <ButtonLink
-    href={url}
+    url={url}
     className="mb-4"
     isExternal={false}
   >

src/components/button-link/index.tsx

@@ -64,9 +64,9 @@ const gitVersion = import.meta.env.GIT_VERSION;
           <br />
           <a
             class="underline whitespace-nowrap"
-            href="https://twitter.com/europython"
+            href="https://fosstodon.org/@europython"
           >
-            twitter.com/europython <span> ↗</span>
+            fosstodon.org/@europython <span> ↗</span>
           </a>
           <br />
           <a
@@ -78,9 +78,9 @@ const gitVersion = import.meta.env.GIT_VERSION;
           <br />
           <a
             class="underline whitespace-nowrap"
-            href="https://fosstodon.org/@europython"
+            href="https://bsky.app/profile/europython.eu"
           >
-            fosstodon.org/@europython <span> ↗</span>
+            bsky.app/profile/europython.eu <span> ↗</span>
           </a>
           <br />
           <a
@@ -89,6 +89,13 @@ const gitVersion = import.meta.env.GIT_VERSION;
           >
             github.com/europython <span> ↗</span>
           </a>
+          <br />
+          <a
+            class="underline whitespace-nowrap"
+            href="https://twitter.com/europython"
+          >
+            twitter.com/europython <span> ↗</span>
+          </a>
         </p>
           <p class="mb-4" style="color: rgba(255, 255, 255, 0.4)">version: {gitVersion} @ {buildTimestamp}</p>
       </div>

src/components/button-with-title/button-with-title.tsx

@@ -1,5 +1,5 @@
 ---
-import { ButtonLink } from "../button-link";
+import ButtonLink from "../button-link/button-link.astro";
 import HeaderButton from "./header-button.astro";
 
 export interface Props {
@@ -15,19 +15,17 @@ const IS_LIVE = false;
   {
     !mobile ? (
       <>
-        <ButtonLink secondary href="https://www.europython-society.org/coc/">
+        <ButtonLink secondary url="https://www.europython-society.org/coc/">
           <abbr title="Code of Conduct" class="no-underline md:hidden">
             CoC
           </abbr>
           <span class="hidden md:inline">Code of Conduct</span>
         </ButtonLink>
-<!--
-        <ButtonLink href="/programme/cfp" className="hidden md:block">
-          <span>Send your proposal!</span>
+        <ButtonLink url="https://voting.europython.eu" className="hidden md:block">
+          <span>Community vote</span>
         </ButtonLink>
--->
         {IS_LIVE && (
-          <ButtonLink href="/live">
+          <ButtonLink url="/live">
             Live
             <span class="hidden md:inline"> 📺</span>
           </ButtonLink>