From 29a2892dd0ecfad0bde998cf510c8f434d6070f8 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sun, 13 Jan 2019 11:35:04 -0800
Subject: [PATCH] feat: add hotkey help to settings (#886)

---
 src/routes/_components/ShortcutHelpInfo.html  | 49 +++++++++++++++++++
 .../dialog/components/ShortcutHelpDialog.html | 43 ++--------------
 src/routes/_pages/settings/hotkeys.html       | 14 ++++++
 src/routes/_pages/settings/index.html         |  3 +-
 src/routes/settings/hotkeys.html              | 20 ++++++++
 5 files changed, 89 insertions(+), 40 deletions(-)
 create mode 100644 src/routes/_components/ShortcutHelpInfo.html
 create mode 100644 src/routes/_pages/settings/hotkeys.html
 create mode 100644 src/routes/settings/hotkeys.html

diff --git a/src/routes/_components/ShortcutHelpInfo.html b/src/routes/_components/ShortcutHelpInfo.html
new file mode 100644
index 0000000..062bae5
--- /dev/null
+++ b/src/routes/_components/ShortcutHelpInfo.html
@@ -0,0 +1,49 @@
+<div class="{inDialog ? 'in-dialog' : ''}">
+  <h1>Hotkeys</h1>
+
+  <ul>
+    <li><kbd>s</kbd> to search</li>
+    <li><kbd>g</kbd> + <kbd>h</kbd> to go home</li>
+    <li><kbd>g</kbd> + <kbd>n</kbd> to go to the notifications page</li>
+    <li><kbd>g</kbd> + <kbd>l</kbd> to go to the local stream page</li>
+    <li><kbd>g</kbd> + <kbd>t</kbd> to go to the federated stream page</li>
+    <li><kbd>g</kbd> + <kbd>c</kbd> to go to the community page</li>
+    <li><kbd>j</kbd> or <kbd>↓</kbd> to activate the next status</li>
+    <li><kbd>k</kbd> or <kbd>↑</kbd> to activate the previous status</li>
+    <li><kbd>o</kbd> to open the active status</li>
+    <li><kbd>f</kbd> to favorite the active status</li>
+    <li><kbd>b</kbd> to boost the active status</li>
+    <li><kbd>r</kbd> to reply to the active status</li>
+    <li><kbd>x</kbd> to show or hide text behind content warning in the active status</li>
+    <li><kbd>y</kbd> to show or hide sensitive media in the active status</li>
+    <li><kbd>h</kbd> or <kbd>?</kbd> to toggle the help dialog</li>
+    <li><kbd>Backspace</kbd> to go back, close dialogs</li>
+  </ul>
+</div>
+<style>
+  .in-dialog h1 {
+    color: var(--muted-modal-text);
+  }
+  li {
+    list-style-type: none;
+  }
+  .in-dialog li {
+    color: var(--muted-modal-text);
+  }
+  kbd {
+    color: #333;
+    display: inline-block;
+    border: 1px solid #333;
+    border-radius: 2px;
+    padding: 0.1em;
+    margin: 0.2em;
+    background-color: #dadada;
+  }
+</style>
+<script>
+  export default {
+    data: () => ({
+      inDialog: false
+    })
+  }
+</script>
diff --git a/src/routes/_components/dialog/components/ShortcutHelpDialog.html b/src/routes/_components/dialog/components/ShortcutHelpDialog.html
index 59dbc08..09c430e 100644
--- a/src/routes/_components/dialog/components/ShortcutHelpDialog.html
+++ b/src/routes/_components/dialog/components/ShortcutHelpDialog.html
@@ -5,49 +5,13 @@
   muted="true"
   className="shortcut-help-modal-dialog">
   
-  <h1>Keyboard Shortcuts</h1>
-
-  <ul>
-    <li><kbd>s</kbd> to search</li>
-    <li><kbd>g</kbd> + <kbd>h</kbd> to go home</li>
-    <li><kbd>g</kbd> + <kbd>n</kbd> to go to the notifications page</li>
-    <li><kbd>g</kbd> + <kbd>l</kbd> to go to the local stream page</li>
-    <li><kbd>g</kbd> + <kbd>t</kbd> to go to the federated stream page</li>
-    <li><kbd>g</kbd> + <kbd>c</kbd> to go to the community page</li>
-    <li><kbd>j</kbd> or <kbd>↓</kbd> to activate the next status</li>
-    <li><kbd>k</kbd> or <kbd>↑</kbd> to activate the previous status</li>
-    <li><kbd>o</kbd> to open the active status</li>
-    <li><kbd>f</kbd> to favorite the active status</li>
-    <li><kbd>b</kbd> to boost the active status</li>
-    <li><kbd>r</kbd> to reply to the active status</li>
-    <li><kbd>x</kbd> to show or hide text behind content warning in the active status</li>
-    <li><kbd>y</kbd> to show or hide sensitive media in the active status</li>
-    <li><kbd>h</kbd> or <kbd>?</kbd> to toggle this dialog</li>
-    <li><kbd>Backspace</kbd> to go back, close dialogs</li>
-  </ul>
+  <ShortcutHelpInfo inDialog={true} />
 
   <Shortcut scope='modal' key='h|?' on:pressed='close()'/>
 </ModalDialog>
-<style>
-  h1 {
-    color: var(--muted-modal-text);
-  }
-  li {
-    list-style-type:none;
-    color: var(--muted-modal-text);
-  }
-  kbd {
-    color: #333;
-    display: inline-block;
-    border: 1px solid #333;
-    border-radius: 2px;
-    padding: 0.1em;
-    margin: 0.2em;
-    background-color: #dadada;
-  }
-</style>
 <script>
   import ModalDialog from './ModalDialog.html'
+  import ShortcutHelpInfo from '../../ShortcutHelpInfo.html'
   import Shortcut from '../../shortcut/Shortcut.html'
   import { show } from '../helpers/showDialog'
   import { close } from '../helpers/closeDialog'
@@ -57,7 +21,8 @@
     oncreate,
     components: {
       ModalDialog,
-      Shortcut
+      Shortcut,
+      ShortcutHelpInfo
     },
     methods: {
       show,
diff --git a/src/routes/_pages/settings/hotkeys.html b/src/routes/_pages/settings/hotkeys.html
new file mode 100644
index 0000000..b1fd793
--- /dev/null
+++ b/src/routes/_pages/settings/hotkeys.html
@@ -0,0 +1,14 @@
+<SettingsLayout page='settings/hotkeys' label="Hotkeys">
+  <ShortcutHelpInfo />
+</SettingsLayout>
+<script>
+  import SettingsLayout from '../../_components/settings/SettingsLayout.html'
+  import ShortcutHelpInfo from '../../_components/ShortcutHelpInfo.html'
+
+  export default {
+    components: {
+      SettingsLayout,
+      ShortcutHelpInfo
+    }
+  }
+</script>
diff --git a/src/routes/_pages/settings/index.html b/src/routes/_pages/settings/index.html
index 015373b..e1f97c2 100644
--- a/src/routes/_pages/settings/index.html
+++ b/src/routes/_pages/settings/index.html
@@ -4,6 +4,7 @@
   <SettingsList>
     <SettingsListItem href="/settings/general" label="General"/>
     <SettingsListItem href="/settings/instances" label="Instances"/>
+    <SettingsListItem href="/settings/hotkeys" label="Hotkeys"/>
     <SettingsListItem href="/settings/about" label="About Pinafore"/>
   </SettingsList>
 
@@ -20,4 +21,4 @@
       SettingsListItem
     }
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/routes/settings/hotkeys.html b/src/routes/settings/hotkeys.html
new file mode 100644
index 0000000..e50cf73
--- /dev/null
+++ b/src/routes/settings/hotkeys.html
@@ -0,0 +1,20 @@
+<Title name="Hotkeys" settingsPage={true} />
+
+<LazyPage {pageComponent} {params} />
+
+<script>
+  import Title from '../_components/Title.html'
+  import LazyPage from '../_components/LazyPage.html'
+  import pageComponent from '../_pages/settings/hotkeys.html'
+
+  export default {
+    components: {
+
+      Title,
+      LazyPage
+    },
+    data: () => ({
+      pageComponent
+    })
+  }
+</script>