From 950c3bb64354adb9bb2e88a786a00d3f6729c44b Mon Sep 17 00:00:00 2001
From: Geetha <25wh5a0505@bvrithyderabad.edu.in>
Date: Sat, 4 Jul 2026 17:28:11 +0530
Subject: [PATCH 1/7] feat: add keyboard shortcuts for search focus and section
 navigation

Signed-off-by: Geetha <25wh5a0505@bvrithyderabad.edu.in>
---
 index.html    | 51 ++++++++++++++++++++++++++++++++++++++++-----------
 src/js/app.js | 14 ++++++++++++--
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index 9abf72f512..cb9bff309f 100644
--- a/index.html
+++ b/index.html
@@ -1356,6 +1356,7 @@ <h1 class="text-4xl sm:text-5xl md:text-7xl font-extrabold font-headline trackin
           <div class="relative z-10 bg-white dark:bg-[#18181b] rounded-[calc(1rem-1.5px)] w-full search-border-inner flex items-center gap-2 transition-all duration-300">
             <span class="material-symbols-outlined absolute left-4 top-1/2 -translate-y-1/2 text-zinc-400">search</span>
             <input id="hero-search" type="text" placeholder="Search organization names..." aria-label="Search GSoC 2026 organizations" class="flex-1 bg-transparent border-0 rounded-2xl py-3 sm:py-4 pl-12 pr-4 text-sm font-medium focus:ring-0 focus:outline-none transition-all text-zinc-900 dark:text-zinc-100" />
+            <span class="hidden sm:inline-flex items-center gap-0.5 mr-2 px-1.5 py-0.5 rounded-md border border-zinc-300 dark:border-zinc-600 text-[10px] font-mono font-semibold text-zinc-400 dark:text-zinc-500 select-none" aria-hidden="true">⌘K</span>
             <button id="hero-search-submit" type="button" class="mr-2 inline-flex items-center justify-center rounded-xl bg-primary px-4 py-2 text-xs sm:text-sm font-bold text-white transition-colors hover:bg-orange-600 focus:outline-none focus:ring-2 focus:ring-primary/30">
               Search
             </button>
@@ -5199,7 +5200,7 @@ <h4 class="font-bold text-sm group-hover:text-primary transition-colors line-cla
   }
 </script>
 
-<div class="modal-bg" id="helpModal">
+<div class="modal-bg" id="helpModal" role="dialog" aria-modal="true" aria-labelledby="helpModalTitle">
   <div class="modal">
     
     <button class="close-btn" onclick="closeHelpModal()"  aria-label="Close keyboard shortcuts modal">
@@ -5209,7 +5210,7 @@ <h4 class="font-bold text-sm group-hover:text-primary transition-colors line-cla
     
 
     <div class="modal-header">
-      <h2>Keyboard Shortcuts</h2>
+      <h2 id="helpModalTitle">Keyboard Shortcuts</h2>
       <p>Quick shortcuts for navigation</p>
     </div>
 
@@ -5245,10 +5246,20 @@ <h2>Keyboard Shortcuts</h2>
 </tr>
 
 <tr class="shortcut-row">
-  <td class="py-2"><kbd>/</kbd></td>
+  <td class="py-2"><kbd>/</kbd> or <kbd>⌘</kbd><kbd>K</kbd></td>
   <td class="py-2">Focus search bar</td>
 </tr>
 
+<tr class="shortcut-row">
+  <td class="py-2"><kbd>⌘</kbd><kbd>1</kbd></td>
+  <td class="py-2">Jump to Timeline section</td>
+</tr>
+
+<tr class="shortcut-row">
+  <td class="py-2"><kbd>⌘</kbd><kbd>2</kbd></td>
+  <td class="py-2">Jump to Organizations section</td>
+</tr>
+
 
 <tr class="category-row">
   <td colspan="2">Actions</td>
@@ -5327,17 +5338,35 @@ <h2>Keyboard Shortcuts</h2>
   }
 
 document.addEventListener('keydown', (e) => {
+  const active = document.activeElement;
+  const isTyping = active && (
+    ['INPUT', 'TEXTAREA', 'SELECT'].includes(active.tagName) ||
+    active.id === 'searchInput'
+  );
+
+  // Focus search bar — works alongside Ctrl/Cmd but not while already typing
+  if (!isTyping && (e.key === '/' || ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k'))) {
+    e.preventDefault();
+    document.getElementById('hero-search')?.focus();
+    return;
+  }
+  // Jump to Timeline section
+  if (!isTyping && (e.metaKey || e.ctrlKey) && e.key === '1') {
+    e.preventDefault();
+    document.getElementById('timeline')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
+    return;
+  }
+  // Jump to Organizations section
+  if (!isTyping && (e.metaKey || e.ctrlKey) && e.key === '2') {
+    e.preventDefault();
+    document.getElementById('orgs')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
+    return;
+  }
+
     if (e.ctrlKey || e.metaKey || e.altKey) {
     return;
 }
-  const active = document.activeElement;
-if (
-    active &&
-    (
-        ['INPUT', 'TEXTAREA', 'SELECT'].includes(active.tagName) ||
-        active.id === 'searchInput'
-    )
-) {
+    if (isTyping) {
         return;
     }
 const helpModalOpen =
diff --git a/src/js/app.js b/src/js/app.js
index d1c9415db2..30fbc29db6 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -724,9 +724,19 @@ function handleGlobalKeydown(e) {
     openModalElement('helpModal');
     return;
   }
-  if (e.key === '/') {
+  if (e.key === '/' || ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k')) {
     e.preventDefault();
-    document.getElementById('searchInput')?.focus();
+    document.getElementById('hero-search')?.focus();
+    return;
+  }
+  if ((e.metaKey || e.ctrlKey) && e.key === '1') {
+    e.preventDefault();
+    document.getElementById('timeline')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
+    return;
+  }
+  if ((e.metaKey || e.ctrlKey) && e.key === '2') {
+    e.preventDefault();
+    document.getElementById('orgs')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;
   }
 

From bc713fad101206c82bbce747ad4de8392ae868f2 Mon Sep 17 00:00:00 2001
From: Geetha <25wh5a0505@bvrithyderabad.edu.in>
Date: Sat, 4 Jul 2026 17:43:33 +0530
Subject: [PATCH 2/7] fix: prevent shortcut leak behind open modals and add
 help modal focus trap

Signed-off-by: Geetha <25wh5a0505@bvrithyderabad.edu.in>
---
 index.html    | 51 ++++++++++++++++++++++++++++++++++++---------------
 src/js/app.js |  8 +++++---
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/index.html b/index.html
index cb9bff309f..52fadfc26c 100644
--- a/index.html
+++ b/index.html
@@ -1356,7 +1356,7 @@ <h1 class="text-4xl sm:text-5xl md:text-7xl font-extrabold font-headline trackin
           <div class="relative z-10 bg-white dark:bg-[#18181b] rounded-[calc(1rem-1.5px)] w-full search-border-inner flex items-center gap-2 transition-all duration-300">
             <span class="material-symbols-outlined absolute left-4 top-1/2 -translate-y-1/2 text-zinc-400">search</span>
             <input id="hero-search" type="text" placeholder="Search organization names..." aria-label="Search GSoC 2026 organizations" class="flex-1 bg-transparent border-0 rounded-2xl py-3 sm:py-4 pl-12 pr-4 text-sm font-medium focus:ring-0 focus:outline-none transition-all text-zinc-900 dark:text-zinc-100" />
-            <span class="hidden sm:inline-flex items-center gap-0.5 mr-2 px-1.5 py-0.5 rounded-md border border-zinc-300 dark:border-zinc-600 text-[10px] font-mono font-semibold text-zinc-400 dark:text-zinc-500 select-none" aria-hidden="true">⌘K</span>
+            <span class="hidden sm:inline-flex items-center gap-0.5 mr-2 px-1.5 py-0.5 rounded-md border border-zinc-300 dark:border-zinc-600 text-[10px] font-mono font-semibold text-zinc-400 dark:text-zinc-500 select-none" aria-hidden="true">⌘/Ctrl K</span>
             <button id="hero-search-submit" type="button" class="mr-2 inline-flex items-center justify-center rounded-xl bg-primary px-4 py-2 text-xs sm:text-sm font-bold text-white transition-colors hover:bg-orange-600 focus:outline-none focus:ring-2 focus:ring-primary/30">
               Search
             </button>
@@ -5320,16 +5320,38 @@ <h2 id="helpModalTitle">Keyboard Shortcuts</h2>
 
   const helpModal = document.getElementById('helpModal');
   const helpBtn = document.getElementById('helpBtn');
+  let helpModalTriggerEl = null;
+
+  function trapHelpModalFocus(e) {
+    if (e.key !== 'Tab' || !helpModal) return;
+    const focusables = helpModal.querySelectorAll('button, [href], input, select, textarea, [tabindex="0"]');
+    if (!focusables.length) return;
+    const first = focusables[0];
+    const last = focusables[focusables.length - 1];
+    if (e.shiftKey && document.activeElement === first) {
+      last.focus();
+      e.preventDefault();
+    } else if (!e.shiftKey && document.activeElement === last) {
+      first.focus();
+      e.preventDefault();
+    }
+  }
 
   function openHelpModal() {
     if (helpModal) {
+      helpModalTriggerEl = document.activeElement;
       helpModal.classList.add('open');
+      helpModal.querySelector('.close-btn')?.focus();
+      document.addEventListener('keydown', trapHelpModalFocus);
     }
   }
 
   function closeHelpModal() {
     if (helpModal) {
       helpModal.classList.remove('open');
+      document.removeEventListener('keydown', trapHelpModalFocus);
+      helpModalTriggerEl?.focus();
+      helpModalTriggerEl = null;
     }
   }
 
@@ -5344,20 +5366,28 @@ <h2 id="helpModalTitle">Keyboard Shortcuts</h2>
     active.id === 'searchInput'
   );
 
-  // Focus search bar — works alongside Ctrl/Cmd but not while already typing
-  if (!isTyping && (e.key === '/' || ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k'))) {
+  const helpModalOpen =
+    document.getElementById('helpModal')?.classList.contains('open');
+  const orgModalOpen =
+    document.getElementById('orgModal')?.classList.contains('open');
+  const proposalModalOpen =
+    document.getElementById('proposalModal')?.classList.contains('open');
+  const anyModalOpen = helpModalOpen || orgModalOpen || proposalModalOpen;
+
+  // Focus search bar — works alongside Ctrl/Cmd but not while already typing or a modal is open
+  if (!anyModalOpen && !isTyping && (e.key === '/' || ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k'))) {
     e.preventDefault();
     document.getElementById('hero-search')?.focus();
     return;
   }
   // Jump to Timeline section
-  if (!isTyping && (e.metaKey || e.ctrlKey) && e.key === '1') {
+  if (!anyModalOpen && !isTyping && (e.metaKey || e.ctrlKey) && e.key === '1') {
     e.preventDefault();
     document.getElementById('timeline')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;
   }
   // Jump to Organizations section
-  if (!isTyping && (e.metaKey || e.ctrlKey) && e.key === '2') {
+  if (!anyModalOpen && !isTyping && (e.metaKey || e.ctrlKey) && e.key === '2') {
     e.preventDefault();
     document.getElementById('orgs')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;
@@ -5369,16 +5399,7 @@ <h2 id="helpModalTitle">Keyboard Shortcuts</h2>
     if (isTyping) {
         return;
     }
-const helpModalOpen =
-  document.getElementById('helpModal')?.classList.contains('open');
-
-const orgModalOpen =
-  document.getElementById('orgModal')?.classList.contains('open');
-
-const proposalModalOpen =
-  document.getElementById('proposalModal')?.classList.contains('open');
-
-if (helpModalOpen || orgModalOpen || proposalModalOpen) {
+if (anyModalOpen) {
   return;
 }
 
diff --git a/src/js/app.js b/src/js/app.js
index 30fbc29db6..46ece3ef9b 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -718,23 +718,25 @@ function handleGlobalKeydown(e) {
 
   if (['INPUT', 'SELECT', 'TEXTAREA'].includes(document.activeElement?.tagName)) return;
 
+  const anyModalOpen = !!document.querySelector('.modal-bg.open, .modal-bg.compare-bg.open');
+
   const n = filteredOrgs.length;
   if (e.key === '?') {
     e.preventDefault();
     openModalElement('helpModal');
     return;
   }
-  if (e.key === '/' || ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k')) {
+  if (!anyModalOpen && (e.key === '/' || ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k'))) {
     e.preventDefault();
     document.getElementById('hero-search')?.focus();
     return;
   }
-  if ((e.metaKey || e.ctrlKey) && e.key === '1') {
+  if (!anyModalOpen && (e.metaKey || e.ctrlKey) && e.key === '1') {
     e.preventDefault();
     document.getElementById('timeline')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;
   }
-  if ((e.metaKey || e.ctrlKey) && e.key === '2') {
+  if (!anyModalOpen && (e.metaKey || e.ctrlKey) && e.key === '2') {
     e.preventDefault();
     document.getElementById('orgs')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;

From 9f8ca59f992d29283b3967d13a8e92ddb7ec020f Mon Sep 17 00:00:00 2001
From: Geetha <25wh5a0505@bvrithyderabad.edu.in>
Date: Sat, 4 Jul 2026 19:11:05 +0530
Subject: [PATCH 3/7] fix: restore shortcut handlers in index.html and use
 Alt+1/2 to avoid browser conflicts

Signed-off-by: Geetha <25wh5a0505@bvrithyderabad.edu.in>
---
 index.html    | 7 +++----
 src/js/app.js | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 52fadfc26c..9a1f0b9775 100644
--- a/index.html
+++ b/index.html
@@ -5373,7 +5373,6 @@ <h2 id="helpModalTitle">Keyboard Shortcuts</h2>
   const proposalModalOpen =
     document.getElementById('proposalModal')?.classList.contains('open');
   const anyModalOpen = helpModalOpen || orgModalOpen || proposalModalOpen;
-
   // Focus search bar — works alongside Ctrl/Cmd but not while already typing or a modal is open
   if (!anyModalOpen && !isTyping && (e.key === '/' || ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k'))) {
     e.preventDefault();
@@ -5381,13 +5380,13 @@ <h2 id="helpModalTitle">Keyboard Shortcuts</h2>
     return;
   }
   // Jump to Timeline section
-  if (!anyModalOpen && !isTyping && (e.metaKey || e.ctrlKey) && e.key === '1') {
+  if (!anyModalOpen && !isTyping && e.altKey && e.key === '1') {
     e.preventDefault();
     document.getElementById('timeline')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;
   }
   // Jump to Organizations section
-  if (!anyModalOpen && !isTyping && (e.metaKey || e.ctrlKey) && e.key === '2') {
+  if (!anyModalOpen && !isTyping && e.altKey && e.key === '2') {
     e.preventDefault();
     document.getElementById('orgs')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;
@@ -5399,7 +5398,7 @@ <h2 id="helpModalTitle">Keyboard Shortcuts</h2>
     if (isTyping) {
         return;
     }
-if (anyModalOpen) {
+if (anyModalOpen && e.key !== 'Escape') {
   return;
 }
 
diff --git a/src/js/app.js b/src/js/app.js
index 46ece3ef9b..270e24149b 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -731,12 +731,12 @@ function handleGlobalKeydown(e) {
     document.getElementById('hero-search')?.focus();
     return;
   }
-  if (!anyModalOpen && (e.metaKey || e.ctrlKey) && e.key === '1') {
+  if (!anyModalOpen && e.altKey && e.key === '1') {
     e.preventDefault();
     document.getElementById('timeline')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;
   }
-  if (!anyModalOpen && (e.metaKey || e.ctrlKey) && e.key === '2') {
+  if (!anyModalOpen && e.altKey && e.key === '2') {
     e.preventDefault();
     document.getElementById('orgs')?.scrollIntoView({ behavior: 'smooth', block: 'start' });
     return;

From 3580b61ddc96a5acef41ba2ad3ee1419d5e31203 Mon Sep 17 00:00:00 2001
From: Geetha <25wh5a0505@bvrithyderabad.edu.in>
Date: Sat, 4 Jul 2026 19:19:40 +0530
Subject: [PATCH 4/7] docs: update help modal to show Alt+1/Alt+2 shortcuts
 instead of Ctrl/Cmd

Signed-off-by: Geetha <25wh5a0505@bvrithyderabad.edu.in>
---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 9a1f0b9775..0d8c709ac6 100644
--- a/index.html
+++ b/index.html
@@ -5251,12 +5251,12 @@ <h2 id="helpModalTitle">Keyboard Shortcuts</h2>
 </tr>
 
 <tr class="shortcut-row">
-  <td class="py-2"><kbd>⌘</kbd><kbd>1</kbd></td>
+  <td class="py-2"><kbd>Alt</kbd><kbd>1</kbd></td>
   <td class="py-2">Jump to Timeline section</td>
 </tr>
 
 <tr class="shortcut-row">
-  <td class="py-2"><kbd>⌘</kbd><kbd>2</kbd></td>
+  <td class="py-2"><kbd>Alt</kbd><kbd>2</kbd></td>
   <td class="py-2">Jump to Organizations section</td>
 </tr>
 

From 53c56e2d398cacfd9925892f761a86c0f7a3439f Mon Sep 17 00:00:00 2001
From: Geetha <25wh5a0505@bvrithyderabad.edu.in>
Date: Sat, 4 Jul 2026 19:26:36 +0530
Subject: [PATCH 5/7] fix: prevent help modal from stacking over other open
 modals

Signed-off-by: Geetha <25wh5a0505@bvrithyderabad.edu.in>
---
 src/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/app.js b/src/js/app.js
index 270e24149b..a4eaed53af 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -721,7 +721,7 @@ function handleGlobalKeydown(e) {
   const anyModalOpen = !!document.querySelector('.modal-bg.open, .modal-bg.compare-bg.open');
 
   const n = filteredOrgs.length;
-  if (e.key === '?') {
+  if (!anyModalOpen && e.key === '?') {
     e.preventDefault();
     openModalElement('helpModal');
     return;

From 3d52d6a077f802cb9a0c0d0e33f294cbaf1682ec Mon Sep 17 00:00:00 2001
From: Geetha <25wh5a0505@bvrithyderabad.edu.in>
Date: Sat, 4 Jul 2026 19:30:33 +0530
Subject: [PATCH 6/7] fix: include proposal modal in modal-open guard for
 global shortcuts

Signed-off-by: Geetha <25wh5a0505@bvrithyderabad.edu.in>
---
 src/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/app.js b/src/js/app.js
index a4eaed53af..c201a303da 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -718,7 +718,7 @@ function handleGlobalKeydown(e) {
 
   if (['INPUT', 'SELECT', 'TEXTAREA'].includes(document.activeElement?.tagName)) return;
 
-  const anyModalOpen = !!document.querySelector('.modal-bg.open, .modal-bg.compare-bg.open');
+  const anyModalOpen = !!document.querySelector('.modal-bg.open, .modal-bg.compare-bg.open, #proposalModal.open, #proposalModal[open]');
 
   const n = filteredOrgs.length;
   if (!anyModalOpen && e.key === '?') {

From 127901ea60c144d13a4c8b178649d209cbca1e43 Mon Sep 17 00:00:00 2001
From: Geetha <25wh5a0505@bvrithyderabad.edu.in>
Date: Sun, 5 Jul 2026 19:23:36 +0530
Subject: [PATCH 7/7] fix: block page shortcuts behind any open modal and align
 Escape handler selector

Signed-off-by: Geetha <25wh5a0505@bvrithyderabad.edu.in>
---
 src/js/app.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/js/app.js b/src/js/app.js
index c201a303da..2e316bb8e4 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -664,7 +664,7 @@ function updateCardFocus() {
 
 // Global keydown helper functions to manage Cognitive Complexity
 function handleEscapeKey(e) {
-  const activeModal = document.querySelector('.modal-bg.open, #mobileMenu:not(.hidden), .modal-bg.compare-bg.open');
+  const activeModal = document.querySelector('.modal-bg.open, #mobileMenu:not(.hidden), .modal-bg.compare-bg.open, #proposalModal.open, #proposalModal[open]');
   if (activeModal) {
     e.preventDefault();
     closeModalElement(activeModal.id);
@@ -719,7 +719,10 @@ function handleGlobalKeydown(e) {
   if (['INPUT', 'SELECT', 'TEXTAREA'].includes(document.activeElement?.tagName)) return;
 
   const anyModalOpen = !!document.querySelector('.modal-bg.open, .modal-bg.compare-bg.open, #proposalModal.open, #proposalModal[open]');
+  const anyModalOpen = !!document.querySelector('.modal-bg.open, .modal-bg.compare-bg.open, #proposalModal.open, #proposalModal[open]');
+if (anyModalOpen) return;
 
+const n = filteredOrgs.length;
   const n = filteredOrgs.length;
   if (!anyModalOpen && e.key === '?') {
     e.preventDefault();