From fb5ac4bb4804262f94a9dc4e01006a91a2bc575a Mon Sep 17 00:00:00 2001
From: Krishna Kumar <krishnakumarsharma8077@gmail.com>
Date: Thu, 4 Jun 2026 18:58:47 +0530
Subject: [PATCH 1/4] Fix unreachable launching soon modal

---
 web/src/app/page.tsx                   | 29 ++++++++++++++++++++------
 web/src/components/HeroAndDownload.tsx | 22 +++++++++----------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
index 38616cb0..ebf16c58 100644
--- a/web/src/app/page.tsx
+++ b/web/src/app/page.tsx
@@ -3,11 +3,10 @@
 import Image from "next/image";
 import "./globals.css";
 
-import { type RefObject, useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
 import { type RefObject, useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
 import HeroAndDownload from "../components/HeroAndDownload";
 import ScrollToTop from "../components/ScrollToTop";
-import ScrollToTop from "../components/ScrollToTop";
+import { PageWrapper, Section } from "../components/layout";
 import { Skeleton } from "../components/ui";
 
 const userScreenshots = [
@@ -119,6 +118,14 @@ export default function Home() {
   const userSliderRef = useRef<HTMLDivElement>(null);
   const adminSliderRef = useRef<HTMLDivElement>(null);
 
+  const openComingSoonModal = useCallback(() => {
+    setComingSoonModal(true);
+  }, []);
+
+  const closeComingSoonModal = useCallback(() => {
+    setComingSoonModal(false);
+  }, []);
+
   useEffect(() => {
     dnaEnabledRef.current = cursorGlowEnabled;
     if (dnaCanvasRef.current) {
@@ -492,7 +499,10 @@ export default function Home() {
       </header>
 
       {/* ── Hero ── */}
-<HeroAndDownload onJoinTestFlight={() => setAppleModal(true)} />
+      <HeroAndDownload
+        onJoinTestFlight={() => setAppleModal(true)}
+        onShowComingSoon={openComingSoonModal}
+      />
       {/* ── Screenshots ── */}
       <Section id="screenshots">
         <PageWrapper>
@@ -889,15 +899,22 @@ export default function Home() {
       </footer>
 
       {/* ── Coming Soon Modal ── */}
-      <div className={`modal-overlay${comingSoonModal ? " active" : ""}`} onClick={() => setComingSoonModal(false)}>
+      <div
+        className={`modal-overlay${comingSoonModal ? " active" : ""}`}
+        onClick={closeComingSoonModal}
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="coming-soon-modal-title"
+        aria-hidden={!comingSoonModal}
+      >
         <div className="modal-content" onClick={(e) => e.stopPropagation()}>
           <div style={{ fontSize: "4rem", marginBottom: 16 }}>🚀</div>
-          <h2>Launching Soon!</h2>
+          <h2 id="coming-soon-modal-title">Launching Soon!</h2>
           <p style={{ color: "var(--text-muted)", fontSize: "1rem", marginBottom: 8 }}>
             We&apos;re currently in final testing. We&apos;re <strong>85%</strong> of the way there!
           </p>
           <div className="progress-container"><div className="progress-bar"></div></div>
-          <button className="close-modal-btn" onClick={() => setComingSoonModal(false)}>Close</button>
+          <button className="close-modal-btn" onClick={closeComingSoonModal}>Close</button>
         </div>
       </div>
 
diff --git a/web/src/components/HeroAndDownload.tsx b/web/src/components/HeroAndDownload.tsx
index 9cf3056f..460b46d2 100644
--- a/web/src/components/HeroAndDownload.tsx
+++ b/web/src/components/HeroAndDownload.tsx
@@ -4,6 +4,7 @@ import Image from "next/image";
 
 type HeroAndDownloadProps = {
   onJoinTestFlight: () => void;
+  onShowComingSoon: () => void;
 };
 
 const activityItems = [
@@ -56,7 +57,7 @@ const platforms = [
   },
 ];
 
-export default function HeroAndDownload({ onJoinTestFlight }: HeroAndDownloadProps) {
+export default function HeroAndDownload({ onJoinTestFlight, onShowComingSoon }: HeroAndDownloadProps) {
   return (
     <>
       <section className="uh-hero">
@@ -244,7 +245,7 @@ export default function HeroAndDownload({ onJoinTestFlight }: HeroAndDownloadPro
                   </ul>
 
                   {platform.theme === "android" ? (
-                    <AndroidStoreButtons />
+                    <AndroidStoreButtons onShowComingSoon={onShowComingSoon} />
                   ) : (
                     <IosStoreButtons onJoinTestFlight={onJoinTestFlight} />
                   )}
@@ -322,7 +323,7 @@ function MiniPhone({ theme }: { theme: string }) {
   );
 }
 
-function AndroidStoreButtons() {
+function AndroidStoreButtons({ onShowComingSoon }: Pick<HeroAndDownloadProps, "onShowComingSoon">) {
   return (
     <div className="uh-store-buttons-group">
       <div className="uh-store-buttons">
@@ -339,25 +340,24 @@ function AndroidStoreButtons() {
             <strong>Google Play</strong>
           </div>
         </a>
-        <a
-          href="https://play.google.com/store/apps/details?id=com.ultimatehealth.admin"
-          target="_blank"
-          rel="noreferrer"
+        <button
+          type="button"
+          onClick={onShowComingSoon}
           className="uh-store-btn uh-store-admin"
-          aria-label="Download UHealth Admin on Google Play"
+          aria-label="View UHealth Admin closed testing launch status"
         >
           <i className="fas fa-user-shield" aria-hidden="true" />
           <div>
             <small>Admin Panel</small>
-            <strong>UHealth Admin</strong>
+            <strong>Closed Testing</strong>
           </div>
-        </a>
+        </button>
       </div>
     </div>
   );
 }
 
-function IosStoreButtons({ onJoinTestFlight }: HeroAndDownloadProps) {
+function IosStoreButtons({ onJoinTestFlight }: Pick<HeroAndDownloadProps, "onJoinTestFlight">) {
   return (
     <div className="uh-store-buttons-group">
       <div className="uh-store-buttons">

From b7b2a13afd4672b7b4f357fc8b6f9e21edf80e6e Mon Sep 17 00:00:00 2001
From: Krishna Kumar <krishnakumarsharma8077@gmail.com>
Date: Fri, 5 Jun 2026 10:54:24 +0530
Subject: [PATCH 2/4] fix

---
 ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp |  1 +
 web/src/app/login-admin/page.tsx             |  5 ++---
 web/src/app/login/page.tsx                   |  5 ++---
 web/src/components/HeroAndDownload.tsx       | 17 +++++++++++++++--
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 160000 ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp

diff --git a/ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp b/ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp
new file mode 160000
index 00000000..6736d06b
--- /dev/null
+++ b/ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp
@@ -0,0 +1 @@
+Subproject commit 6736d06be05b1aa1baf3bb7d8ce46d83739247a7
diff --git a/web/src/app/login-admin/page.tsx b/web/src/app/login-admin/page.tsx
index 6d1af6f3..0c9ae674 100644
--- a/web/src/app/login-admin/page.tsx
+++ b/web/src/app/login-admin/page.tsx
@@ -2,7 +2,6 @@
 
 import { useState } from "react";
 import { useRouter } from "next/navigation";
-import { PageWrapper, Section } from "@/components/layout";
 import Image from "next/image";
 
 export default function AdminLoginPage() {
@@ -111,8 +110,8 @@ export default function AdminLoginPage() {
             {msg}
           </div>
         )}
-      </PageWrapper>
-    </Section>
+      </div>
+    </div>
   );
 }
 
diff --git a/web/src/app/login/page.tsx b/web/src/app/login/page.tsx
index 64fd1a54..5a710ffc 100644
--- a/web/src/app/login/page.tsx
+++ b/web/src/app/login/page.tsx
@@ -2,7 +2,6 @@
 
 import { useState } from "react";
 import { useRouter } from "next/navigation";
-import { PageWrapper, Section } from "@/components/layout";
 import Image from "next/image";
 
 export default function UserLoginPage() {
@@ -111,8 +110,8 @@ export default function UserLoginPage() {
             {msg}
           </div>
         )}
-      </PageWrapper>
-    </Section>
+      </div>
+    </div>
   );
 }
 
diff --git a/web/src/components/HeroAndDownload.tsx b/web/src/components/HeroAndDownload.tsx
index 460b46d2..66446edc 100644
--- a/web/src/components/HeroAndDownload.tsx
+++ b/web/src/components/HeroAndDownload.tsx
@@ -340,15 +340,28 @@ function AndroidStoreButtons({ onShowComingSoon }: Pick<HeroAndDownloadProps, "o
             <strong>Google Play</strong>
           </div>
         </a>
+        <a
+          href="https://play.google.com/store/apps/details?id=com.ultimatehealth.admin"
+          target="_blank"
+          rel="noreferrer"
+          className="uh-store-btn uh-store-admin"
+          aria-label="Download UHealth Admin on Google Play"
+        >
+          <i className="fas fa-user-shield" aria-hidden="true" />
+          <div>
+            <small>Admin Panel</small>
+            <strong>UHealth Admin</strong>
+          </div>
+        </a>
         <button
           type="button"
           onClick={onShowComingSoon}
           className="uh-store-btn uh-store-admin"
           aria-label="View UHealth Admin closed testing launch status"
         >
-          <i className="fas fa-user-shield" aria-hidden="true" />
+          <i className="fas fa-hourglass-half" aria-hidden="true" />
           <div>
-            <small>Admin Panel</small>
+            <small>Launch Status</small>
             <strong>Closed Testing</strong>
           </div>
         </button>

From 0a9bb5efa9be6762882b23a3de3c0b8089215075 Mon Sep 17 00:00:00 2001
From: Krishna Kumar <krishnakumarsharma8077@gmail.com>
Date: Fri, 5 Jun 2026 14:47:07 +0530
Subject: [PATCH 3/4] fixed

---
 ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp |  1 -
 web/src/app/login-admin/page.tsx             |  9 +-
 web/src/app/login/page.tsx                   |  9 +-
 web/src/app/page.tsx                         | 95 +-------------------
 4 files changed, 11 insertions(+), 103 deletions(-)
 delete mode 160000 ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp

diff --git a/ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp b/ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp
deleted file mode 160000
index 6736d06b..00000000
--- a/ieee-submodules/IEEE-s-Mindful-Devs-Bootcamp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6736d06be05b1aa1baf3bb7d8ce46d83739247a7
diff --git a/web/src/app/login-admin/page.tsx b/web/src/app/login-admin/page.tsx
index 0c9ae674..18a3d317 100644
--- a/web/src/app/login-admin/page.tsx
+++ b/web/src/app/login-admin/page.tsx
@@ -2,6 +2,7 @@
 
 import { useState } from "react";
 import { useRouter } from "next/navigation";
+import { PageWrapper, Section } from "@/components/layout";
 import Image from "next/image";
 
 export default function AdminLoginPage() {
@@ -47,8 +48,8 @@ export default function AdminLoginPage() {
   };
 
   return (
-    <div style={styles.body}>
-      <div style={styles.container}>
+    <Section style={styles.body}>
+      <PageWrapper style={styles.container}>
         <Image
           src="https://raw.githubusercontent.com/SB2318/UltimateHealth/refs/heads/main/frontend/src/assets/images/adaptive-icon.png"
           style={styles.icon}
@@ -110,8 +111,8 @@ export default function AdminLoginPage() {
             {msg}
           </div>
         )}
-      </div>
-    </div>
+      </PageWrapper>
+    </Section>
   );
 }
 
diff --git a/web/src/app/login/page.tsx b/web/src/app/login/page.tsx
index 5a710ffc..07d033ae 100644
--- a/web/src/app/login/page.tsx
+++ b/web/src/app/login/page.tsx
@@ -2,6 +2,7 @@
 
 import { useState } from "react";
 import { useRouter } from "next/navigation";
+import { PageWrapper, Section } from "@/components/layout";
 import Image from "next/image";
 
 export default function UserLoginPage() {
@@ -47,8 +48,8 @@ export default function UserLoginPage() {
   };
 
   return (
-    <div style={styles.body}>
-      <div style={styles.container}>
+    <Section style={styles.body}>
+      <PageWrapper style={styles.container}>
         <Image
           src="https://raw.githubusercontent.com/SB2318/UltimateHealth/refs/heads/main/frontend/src/assets/images/adaptive-icon.png"
           style={styles.icon}
@@ -110,8 +111,8 @@ export default function UserLoginPage() {
             {msg}
           </div>
         )}
-      </div>
-    </div>
+      </PageWrapper>
+    </Section>
   );
 }
 
diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
index 991ede62..ef18c763 100644
--- a/web/src/app/page.tsx
+++ b/web/src/app/page.tsx
@@ -6,12 +6,8 @@ import "./globals.css";
 import { type RefObject, useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
 import HeroAndDownload from "../components/HeroAndDownload";
 import ScrollToTop from "../components/ScrollToTop";
- fix-unreachable-launching-soon-modal
 import { PageWrapper, Section } from "../components/layout";
-
-import ScrollToTop from "../components/ScrollToTop";
 import { withBasePath } from "@/lib/basePath";
- web
 import { Skeleton } from "../components/ui";
 
 const userScreenshots = [
@@ -504,96 +500,7 @@ export default function Home() {
       </header>
 
       {/* ── Hero ── */}
-      <section className="hero">
-        <div className="container hero-content scroll-reveal">
-          <h1>Empowering Wellness Through Global Community</h1>
-          <p>UltimateHealth is a platform that lets you publish health knowledge in your own language, review content, and share podcasts with the world.</p>
-        </PageWrapper>
-      </Section>
-
-      {/* Downloads Section */}
-      <Section id="downloads" className="download-section">
-        <PageWrapper>
-          <h2>Get UltimateHealth</h2>
-          <p className="center">
-            Access our platform on your preferred device. UltimateHealth is available now for Android and coming soon to iOS via TestFlight.
-          </p>
-          <div className="download-grid">
-            {/* Android Card */}
-            <div className="download-card fade-in">
-              <div className="download-platform-header">
-                <div className="download-platform-icon android">
-                  <i className="fab fa-android"></i>
-                </div>
-                <div>
-                  <h3>Android App</h3>
-                  <span className="platform-status active">Available Now</span>
-                </div>
-              </div>
-              <p className="platform-desc">
-                Install UltimateHealth on your Android device to publish articles, listen to podcasts, and manage content.
-              </p>
-              <div className="store-buttons">
-                <a
-                  href="https://play.google.com/store/apps/details?id=com.anonymous.UltimateHealth"
-                  target="_blank"
-                  rel="noreferrer"
-                  className="store-btn"
-                  id="playstore-btn"
-                  aria-label="Download UltimateHealth for Android on Google Play Store"
-                >
-                  <i className="fab fa-google-play"></i> UltimateHealth
-                </a>
-                <button
-                  type="button"
-                  className="store-btn"
-                  id="admin-closed-testing-btn"
-                  onClick={openComingSoonModal}
-                  aria-label="View UHealth Admin closed testing launch status"
-                >
-                  <i className="fas fa-user-shield"></i> UHealth Admin (Closed Testing)
-                </button>
-              </div>
-            </div>
-
-            {/* iOS Card */}
-            <div className="download-card fade-in">
-              <div className="download-platform-header">
-                <div className="download-platform-icon ios">
-                  <i className="fab fa-apple"></i>
-                </div>
-                <div>
-                  <h3>iOS App</h3>
-                  <span className="platform-status coming-soon">Coming Soon</span>
-                </div>
-              </div>
-              <p className="platform-desc">
-                We are actively testing our iOS application. Request to join the TestFlight waitlist for early beta access.
-              </p>
-              <div className="store-buttons">
-                <button
-                  className="store-btn store-btn-secondary"
-                  id="ios-uh-btn"
-                  onClick={() => setAppleModal(true)}
-                  aria-label="Join iOS TestFlight beta for UltimateHealth"
-                >
-                  <i className="fab fa-apple"></i> UltimateHealth (Beta)
-                </button>
-                <button
-                  className="store-btn store-btn-secondary"
-                  id="ios-admin-btn"
-                  onClick={() => setAppleModal(true)}
-                  aria-label="Join iOS TestFlight beta for UHealth Admin"
-                >
-                  <i className="fab fa-apple"></i> UHealth Admin (Beta)
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-    <HeroAndDownload
+      <HeroAndDownload
         onJoinTestFlight={() => setAppleModal(true)}
         onShowComingSoon={openComingSoonModal}
       />

From 1a09c02c3e765bf2ba0e62bfc294fb869e886b52 Mon Sep 17 00:00:00 2001
From: Krishna Kumar <krishnakumarsharma8077@gmail.com>
Date: Fri, 5 Jun 2026 14:51:36 +0530
Subject: [PATCH 4/4] chore: clean base path whitespace

---
 web/src/lib/basePath.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/lib/basePath.ts b/web/src/lib/basePath.ts
index f4c21caa..b5be8418 100644
--- a/web/src/lib/basePath.ts
+++ b/web/src/lib/basePath.ts
@@ -7,7 +7,7 @@ export const BASE_PATH = process.env.NEXT_PUBLIC_BASE_PATH || "";
 /**
  * Create a URL with the basePath prepended
  * Useful for internal navigation links
- * 
+ *
  * @param path - The path relative to the app root (e.g., "/contribute")
  * @returns The path with basePath prepended (e.g., "/frontend/v2/contribute")
  */
@@ -16,16 +16,16 @@ export function withBasePath(path: string): string {
   if (path.startsWith("http://") || path.startsWith("https://") || path.startsWith("mailto:") || path.startsWith("tel:")) {
     return path;
   }
-  
+
   // Don't modify hash-only links
   if (path.startsWith("#")) {
     return path;
   }
-  
+
   // Prepend basePath to internal paths
   if (BASE_PATH && !path.startsWith(BASE_PATH)) {
     return `${BASE_PATH}${path}`;
   }
-  
+
   return path;
 }