From 10856b53fdbe7bbfdc1bfcdad4a89986f2c1d9bd Mon Sep 17 00:00:00 2001
From: Ian Sanders <iansan5653@github.com>
Date: Tue, 10 Oct 2023 18:49:24 +0000
Subject: [PATCH 1/3] Fix website structure

---
 .github/workflows/publish-pages.yml | 10 ++--------
 .gitignore                          |  2 +-
 package.json                        |  3 ++-
 pages/demo.html                     |  2 +-
 pages/hotkey_mapper.html            |  4 ++--
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/publish-pages.yml b/.github/workflows/publish-pages.yml
index d06e856..deda604 100644
--- a/.github/workflows/publish-pages.yml
+++ b/.github/workflows/publish-pages.yml
@@ -17,17 +17,11 @@ jobs:
 
       - run: npm install
 
-      - run: npm run build
-
-      - name: Copy files
-        run: |
-          mkdir _site
-          cp -r pages _site
-          cp -r dist _site
+      - run: npm run buildSite
 
       - name: Fix permissions
         run: |
-          chmod -c -R +rX "_site/" | while read line; do
+          chmod -c -R +rX "pages/" | while read line; do
             echo "::warning title=Invalid file permissions automatically fixed::$line"
           done
 
diff --git a/.gitignore b/.gitignore
index dd50801..9711c77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 node_modules/
 dist/
-_site/
+pages/hotkey
diff --git a/package.json b/package.json
index 1b4365f..0d38797 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,8 @@
     "clean": "rm -rf dist",
     "prebuild": "npm run clean && npm run lint && mkdir dist",
     "pretest": "npm run build",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "buildSite": "npm run build && mkdir -p pages/hotkey && cp -r dist/* pages/hotkey"
   },
   "files": [
     "dist",
diff --git a/pages/demo.html b/pages/demo.html
index cc5377f..3aaa3eb 100644
--- a/pages/demo.html
+++ b/pages/demo.html
@@ -17,7 +17,7 @@
   <a href="#ok" data-hotkey="o k">Press <kbd>o k</kbd> click this link</a>
 
   <script type="module">
-    import {install} from '../dist/index.js'
+    import {install} from './hotkey/index.js'
 
     for (const el of document.querySelectorAll('[data-hotkey]')) {
       install(el)
diff --git a/pages/hotkey_mapper.html b/pages/hotkey_mapper.html
index 5315559..95c1cc2 100644
--- a/pages/hotkey_mapper.html
+++ b/pages/hotkey_mapper.html
@@ -46,8 +46,8 @@ <h1 id="app-name">Hotkey Code</h1>
   </div>
 
   <script type="module">
-    import {eventToHotkeyString} from '../dist/index.js'
-    import sequenceTracker from '../dist/sequence.js'
+    import {eventToHotkeyString} from './hotkey/index.js'
+    import sequenceTracker from './hotkey/sequence.js'
 
     const hotkeyCodeElement = document.getElementById('hotkey-code')
     const sequenceStatusElement = document.getElementById('sequence-status')

From 2884cd2d594daed14b11325c339257ff77ab241c Mon Sep 17 00:00:00 2001
From: Ian Sanders <iansan5653@github.com>
Date: Tue, 10 Oct 2023 18:52:21 +0000
Subject: [PATCH 2/3] Fix syntax error

---
 pages/hotkey_mapper.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/hotkey_mapper.html b/pages/hotkey_mapper.html
index 95c1cc2..3a819c9 100644
--- a/pages/hotkey_mapper.html
+++ b/pages/hotkey_mapper.html
@@ -47,13 +47,13 @@ <h1 id="app-name">Hotkey Code</h1>
 
   <script type="module">
     import {eventToHotkeyString} from './hotkey/index.js'
-    import sequenceTracker from './hotkey/sequence.js'
+    import SequenceTracker from './hotkey/sequence.js'
 
     const hotkeyCodeElement = document.getElementById('hotkey-code')
     const sequenceStatusElement = document.getElementById('sequence-status')
     const resetButtonElement = document.getElementById('reset-button')
 
-    const sequenceTracker = new sequenceTracker({
+    const sequenceTracker = new SequenceTracker({
       onReset() {
         sequenceStatusElement.hidden = true
       }

From e0246cf1a738eee6e6f06e1c691f488997e161ba Mon Sep 17 00:00:00 2001
From: Ian Sanders <iansan5653@github.com>
Date: Tue, 10 Oct 2023 18:57:44 +0000
Subject: [PATCH 3/3] Undo format

---
 pages/hotkey_mapper.html | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pages/hotkey_mapper.html b/pages/hotkey_mapper.html
index f929eee..d6b65b5 100644
--- a/pages/hotkey_mapper.html
+++ b/pages/hotkey_mapper.html
@@ -12,12 +12,21 @@
 <body>
   <div class="mx-auto my-3 col-12 col-md-8 col-lg-6">
     <h1 id="app-name">Hotkey Code</h1>
-    <p id="hint">Press a key combination to see the corresponding hotkey string. Quickly press another combination to
-      build a sequence.</p>
+    <p id="hint">Press a key combination to see the corresponding hotkey string. Quickly press another combination to build a sequence.</p>
     <div class="position-relative">
-      <input readonly role="application" aria-roledescription="Input Capture" autofocus aria-labelledby="app-name"
-        aria-describedby="hint sequence-hint" aria-live="assertive" aria-atomic="true" id="hotkey-code"
-        class="border rounded-2 mt-2 p-6 f1 text-mono" style="width: 100%" />
+      <input
+        readonly
+        role="application"
+        aria-roledescription="Input Capture"
+        autofocus
+        aria-labelledby="app-name"
+        aria-describedby="hint sequence-hint"
+        aria-live="assertive"
+        aria-atomic="true"
+        id="hotkey-code"
+        class="border rounded-2 mt-2 p-6 f1 text-mono"
+        style="width: 100%"
+      />
 
       <div class="position-absolute bottom-2 left-3 right-3 d-flex" style="align-items: center; gap: 8px">
         <!-- This indicates that the input is listening for a sequence press. Ideally we'd have a way to tell screen
@@ -53,7 +62,7 @@ <h1 id="app-name">Hotkey Code</h1>
     let currentsequence = null
 
     hotkeyCodeElement.addEventListener('keydown', event => {
-      if (event.key === "Tab")
+      if (event.key === "Tab") 
         return;
 
       event.preventDefault();
@@ -80,4 +89,4 @@ <h1 id="app-name">Hotkey Code</h1>
   </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>