From 4108ea6ae227701513ebb109bcfc42abac524d08 Mon Sep 17 00:00:00 2001
From: mmrakt <mimuraakkun3@gmail.com>
Date: Thu, 18 Sep 2025 11:50:26 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20URL=E8=BF=BD=E5=8A=A0=E3=80=81?=
 =?UTF-8?q?=E3=82=B0=E3=83=AD=E3=83=8A=E3=83=93=E3=81=AE=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=AF=E5=85=88=E3=82=92=E5=8B=95=E7=9A=84=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=95=E3=81=9B=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Apply.astro        |  3 ++-
 src/components/Footer.astro       |  5 ++---
 src/components/Header.astro       | 14 +++++++++++---
 src/components/Introduction.astro |  3 ++-
 src/components/Timetable.astro    | 10 ++++++++--
 src/data/constants.ts             |  1 +
 6 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 src/data/constants.ts

diff --git a/src/components/Apply.astro b/src/components/Apply.astro
index 379bef1..a1eafd7 100644
--- a/src/components/Apply.astro
+++ b/src/components/Apply.astro
@@ -1,9 +1,10 @@
 ---
 import { Image } from "astro:assets";
 import ApplyImage from "@/assets/apply-button.png";
+import { CONNPASS_URL } from "@/data/constants";
 ---
 
-<a href="#apply" class="apply">
+<a href={CONNPASS_URL} class="apply">
   <Image src={ApplyImage} width={200} height={200} alt="応募する" />
 </a>
 <style>
diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 5b749b5..de55388 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -6,6 +6,7 @@ import EventNameImage from "@/assets/event-name-en.svg";
 import FooterPersonImage from "@/assets/footer-person.png";
 import TrafficImage from "@/assets/footer-traffic.png";
 import SnsLinks from "./SnsLinks.astro";
+import { CONNPASS_URL } from "@/data/constants";
 
 const BOTTOM_LINKS = [
   {
@@ -54,9 +55,7 @@ const BOTTOM_LINKS = [
           />
         </div>
         <div class="topButtons">
-          <Button href="https://fec-tokyo.connpass.com/event/352581/">
-            Connpassで参加申込する
-          </Button>
+          <Button href={CONNPASS_URL}> Connpassで参加申込する </Button>
           <Button
             href="https://x.com/intent/tweet?text=Frontend%20Conference%20Tokyo%202025に参加申し込みをしました%20%EF%BC%81%0A%23fec_tokyo%0Ahttps%3A%2F%2Ffec-tokyo.github.io%2F"
             isGradated={false}
diff --git a/src/components/Header.astro b/src/components/Header.astro
index f598c32..75d48db 100644
--- a/src/components/Header.astro
+++ b/src/components/Header.astro
@@ -1,6 +1,14 @@
 ---
 import { Image } from "astro:assets";
 import LogoImage from "@/assets/header-logo.svg";
+
+const currentPath = Astro.url.pathname;
+const getNavHref = (section: string) => {
+  if (currentPath === "/" || currentPath === "/contents") {
+    return `#${section}`;
+  }
+  return `/#${section}`;
+};
 ---
 
 <header class="container">
@@ -14,9 +22,9 @@ import LogoImage from "@/assets/header-logo.svg";
     />
   </a>
   <nav class="nav" aria-label="メインナビゲーション">
-    <a href="#timetable" class="navLink">Timetable</a>
-    <a href="#sponsors" class="navLink">Sponsors</a>
-    <a href="#faq" class="navLink">Faq</a>
+    <a href={getNavHref("timetable")} class="navLink">Timetable</a>
+    <a href={getNavHref("sponsors")} class="navLink">Sponsors</a>
+    <a href={getNavHref("faq")} class="navLink">Faq</a>
   </nav>
 </header>
 
diff --git a/src/components/Introduction.astro b/src/components/Introduction.astro
index 3cb647e..ee6a555 100644
--- a/src/components/Introduction.astro
+++ b/src/components/Introduction.astro
@@ -1,5 +1,6 @@
 ---
 import Button from "@/components/Button.astro";
+import { CONNPASS_URL } from "@/data/constants";
 ---
 
 <section id="introduction" class="container">
@@ -42,7 +43,7 @@ import Button from "@/components/Button.astro";
         </p>
       </div>
       <div class="apply">
-        <Button href="/">
+        <Button href={CONNPASS_URL}>
           いますぐ参加申込する
           <span class="arrow"></span>
         </Button>
diff --git a/src/components/Timetable.astro b/src/components/Timetable.astro
index a77d814..44bcbc7 100644
--- a/src/components/Timetable.astro
+++ b/src/components/Timetable.astro
@@ -217,7 +217,8 @@ import ExternalLinkIcon from "@/assets/external-link.svg";
 
   .container {
     position: relative;
-    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: visible;
   }
 
   .container::before {
@@ -246,7 +247,10 @@ import ExternalLinkIcon from "@/assets/external-link.svg";
   }
 
   .tabWrapper {
-    position: relative;
+    position: sticky;
+    /* Offset matches fixed header height (padding + logo) plus additional spacing */
+    top: calc(122px + env(safe-area-inset-top));
+    z-index: 10;
     width: 100%;
     padding: 8px 10px;
     margin-top: 24px;
@@ -547,6 +551,8 @@ import ExternalLinkIcon from "@/assets/external-link.svg";
     .tabWrapper {
       width: 100%;
       margin-top: 48px;
+      /* Smaller header footprint on mobile */
+      top: calc(87px + env(safe-area-inset-top));
     }
     .tabLabel {
       padding: 12px 18px;
diff --git a/src/data/constants.ts b/src/data/constants.ts
new file mode 100644
index 0000000..ce6ea9e
--- /dev/null
+++ b/src/data/constants.ts
@@ -0,0 +1 @@
+export const CONNPASS_URL = "https://fec-tokyo.connpass.com/event/352581/";

From d9625e0712328f966adaee0b92f02ed17f0f4a8d Mon Sep 17 00:00:00 2001
From: mmrakt <mimuraakkun3@gmail.com>
Date: Thu, 18 Sep 2025 11:52:55 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20Timetable=E3=81=AE=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AEsticky=E5=AF=BE=E5=BF=9C?=
 =?UTF-8?q?=E3=82=92=E6=88=BB=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Timetable.astro | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/Timetable.astro b/src/components/Timetable.astro
index 44bcbc7..295e7ca 100644
--- a/src/components/Timetable.astro
+++ b/src/components/Timetable.astro
@@ -217,8 +217,7 @@ import ExternalLinkIcon from "@/assets/external-link.svg";
 
   .container {
     position: relative;
-    overflow-x: hidden;
-    overflow-y: visible;
+    overflow: clip;
   }
 
   .container::before {
@@ -247,10 +246,7 @@ import ExternalLinkIcon from "@/assets/external-link.svg";
   }
 
   .tabWrapper {
-    position: sticky;
-    /* Offset matches fixed header height (padding + logo) plus additional spacing */
-    top: calc(122px + env(safe-area-inset-top));
-    z-index: 10;
+    position: relative;
     width: 100%;
     padding: 8px 10px;
     margin-top: 24px;
@@ -551,8 +547,6 @@ import ExternalLinkIcon from "@/assets/external-link.svg";
     .tabWrapper {
       width: 100%;
       margin-top: 48px;
-      /* Smaller header footprint on mobile */
-      top: calc(87px + env(safe-area-inset-top));
     }
     .tabLabel {
       padding: 12px 18px;