Update nav, update shortcuts, link to GH Discussions

davidmyersdev · Feb 25, 2021 · af5f40f · af5f40f
1 parent 48d5d25
commit af5f40f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![latest tag](https://img.shields.io/github/v/tag/voraciousdev/octo?color=blue&label=latest%20tag&sort=semver)](https://github.com/voraciousdev/octo/releases)
 [![license](https://img.shields.io/github/license/voraciousdev/octo)](https://github.com/voraciousdev/octo/blob/master/LICENSE)
 [![open issues](https://img.shields.io/github/issues-raw/voraciousdev/octo)](https://github.com/voraciousdev/octo/issues)
-[![chat on discord](https://img.shields.io/badge/chat-on%20discord-7289da)](https://discord.gg/NWH9kFq5mb)
+[![chat in discussions](https://img.shields.io/badge/chat-in%20discussions-7289da)](https://github.com/voraciousdev/octo/discussions)
 [![follow on twitter](https://img.shields.io/badge/follow-on%20twitter-1da1f2)](https://twitter.com/writewithocto)
 
 <p align="center">
@@ -104,7 +104,7 @@ Your support is appreciated. ♥️
 
 ### Provide Feedback
 
-Your feedback is immensely important for building octo into an app that we all love. Consider [opening an issue](https://github.com/voraciousdev/octo/issues) if you discover any bugs or just want to chat about ideas!
+Your feedback is immensely important for building octo into an app that we all love. Consider [starting a discussion](https://github.com/voraciousdev/octo/discussions) if you have a question or just want to chat about ideas!
 
 ### Open a Pull Request
 

diff --git a/src/components/TheLeftSidebar.vue b/src/components/TheLeftSidebar.vue
@@ -38,7 +38,7 @@
             </svg>
           </div>
           <span class="action d-flex flex-grow-1 align-items-stretch justify-content-between ml-3">
-            <span class="action">Add Document</span>
+            <span class="action">New Doc</span>
             <ModKKey>N</ModKKey>
           </span>
         </router-link>
@@ -50,7 +50,7 @@
             </svg>
           </div>
           <span class="action d-flex flex-grow-1 align-items-stretch justify-content-between ml-3">
-            <span class="action">Change Context</span>
+            <span class="action">Set Context</span>
             <ModKKey>C</ModKKey>
           </span>
         </router-link>
@@ -62,8 +62,8 @@
             </svg>
           </div>
           <span class="action d-flex flex-grow-1 align-items-stretch justify-content-between ml-3">
-            <span>Editor Settings</span>
-            <ModKKey>E</ModKKey>
+            <span>Settings</span>
+            <ModKKey>S</ModKKey>
           </span>
         </router-link>
         <router-link :to="{ name: 'graph' }" class="item rounded p-3 my-1 px-md-2 py-md-1">
@@ -73,46 +73,24 @@
             </svg>
           </div>
           <span class="action d-flex flex-grow-1 align-items-stretch justify-content-between ml-3">
-            <span>Network Graph</span>
+            <span>Explore Data</span>
+            <ModKKey>E</ModKKey>
           </span>
         </router-link>
-        <a class="item rounded p-3 my-1 px-md-2 py-md-1" href="https://github.com/voraciousdev/octo/issues" target="_blank" rel="noopener noreferrer">
-          <div class="icon-wrapper d-flex align-items-center justify-content-center rounded-circle">
-            <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-bug" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" d="M4.355.522a.5.5 0 0 1 .623.333l.291.956A4.979 4.979 0 0 1 8 1c1.007 0 1.946.298 2.731.811l.29-.956a.5.5 0 1 1 .957.29l-.41 1.352A4.985 4.985 0 0 1 13 6h.5a.5.5 0 0 0 .5-.5V5a.5.5 0 0 1 1 0v.5A1.5 1.5 0 0 1 13.5 7H13v1h1.5a.5.5 0 0 1 0 1H13v1h.5a1.5 1.5 0 0 1 1.5 1.5v.5a.5.5 0 1 1-1 0v-.5a.5.5 0 0 0-.5-.5H13a5 5 0 0 1-10 0h-.5a.5.5 0 0 0-.5.5v.5a.5.5 0 1 1-1 0v-.5A1.5 1.5 0 0 1 2.5 10H3V9H1.5a.5.5 0 0 1 0-1H3V7h-.5A1.5 1.5 0 0 1 1 5.5V5a.5.5 0 0 1 1 0v.5a.5.5 0 0 0 .5.5H3c0-1.364.547-2.601 1.432-3.503l-.41-1.352a.5.5 0 0 1 .333-.623zM4 7v4a4 4 0 0 0 3.5 3.97V7H4zm4.5 0v7.97A4 4 0 0 0 12 11V7H8.5zM12 6H4a3.99 3.99 0 0 1 1.333-2.982A3.983 3.983 0 0 1 8 2c1.025 0 1.959.385 2.666 1.018A3.989 3.989 0 0 1 12 6z"/>
-            </svg>
-          </div>
-          <span class="action d-flex flex-grow-1 align-items-stretch justify-content-between ml-3">
-            <span>Report Issue</span>
-            <ModKKey>I</ModKKey>
-          </span>
-        </a>
-        <a class="item rounded p-3 my-1 px-md-2 py-md-1" href="https://discord.gg/qb2sTk2UD6" target="_blank" rel="noopener noreferrer">
+        <a class="item rounded p-3 my-1 px-md-2 py-md-1" href="https://github.com/voraciousdev/octo/discussions" target="_blank" rel="noopener noreferrer">
           <div class="icon-wrapper d-flex align-items-center justify-content-center rounded-circle">
-            <svg width="1em" height="1em" viewBox="0 0 245 240" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-              <path class="st0" d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/><path class="st0" d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/>
+            <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="currentColor" class="bi bi-chat" viewBox="0 0 16 16">
+              <path d="M2.678 11.894a1 1 0 0 1 .287.801 10.97 10.97 0 0 1-.398 2c1.395-.323 2.247-.697 2.634-.893a1 1 0 0 1 .71-.074A8.06 8.06 0 0 0 8 14c3.996 0 7-2.807 7-6 0-3.192-3.004-6-7-6S1 4.808 1 8c0 1.468.617 2.83 1.678 3.894zm-.493 3.905a21.682 21.682 0 0 1-.713.129c-.2.032-.352-.176-.273-.362a9.68 9.68 0 0 0 .244-.637l.003-.01c.248-.72.45-1.548.524-2.319C.743 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7-3.582 7-8 7a9.06 9.06 0 0 1-2.347-.306c-.52.263-1.639.742-3.468 1.105z"/>
             </svg>
           </div>
-          <span class="ml-3">Join Discord</span>
+          <span class="ml-3">Discuss</span>
         </a>
         <h6 class="dropdown-header mx-0 mt-3 p-3 px-md-2 d-flex justify-content-between">
           <span>Quick Filters</span>
           <span class="d-flex">
             <ModK/>
           </span>
         </h6>
-        <router-link :to="{ name: 'actionable' }" class="item rounded p-3 my-1 px-md-2 py-md-1 d-flex">
-          <div class="icon-wrapper d-flex align-items-center justify-content-center rounded-circle">
-            <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check2-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" d="M15.354 2.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3-3a.5.5 0 1 1 .708-.708L8 9.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
-              <path fill-rule="evenodd" d="M1.5 13A1.5 1.5 0 0 0 3 14.5h10a1.5 1.5 0 0 0 1.5-1.5V8a.5.5 0 0 0-1 0v5a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V3a.5.5 0 0 1 .5-.5h8a.5.5 0 0 0 0-1H3A1.5 1.5 0 0 0 1.5 3v10z"/>
-            </svg>
-          </div>
-          <span class="action d-flex flex-grow-1 align-items-stretch justify-content-between ml-3">
-            <span>Actionable</span>
-            <ModKKey>A</ModKKey>
-          </span>
-        </router-link>
         <router-link :to="{ name: 'recent' }" class="item rounded p-3 my-1 px-md-2 py-md-1 d-flex">
           <div class="icon-wrapper d-flex align-items-center justify-content-center rounded-circle">
             <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -122,10 +100,22 @@
             </svg>
           </div>
           <span class="action d-flex flex-grow-1 align-items-stretch justify-content-between ml-3">
-            <span>Recent</span>
+            <span>Recent Docs</span>
             <ModKKey>R</ModKKey>
           </span>
         </router-link>
+        <router-link :to="{ name: 'actionable' }" class="item rounded p-3 my-1 px-md-2 py-md-1 d-flex">
+          <div class="icon-wrapper d-flex align-items-center justify-content-center rounded-circle">
+            <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-check2-square" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+              <path fill-rule="evenodd" d="M15.354 2.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3-3a.5.5 0 1 1 .708-.708L8 9.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
+              <path fill-rule="evenodd" d="M1.5 13A1.5 1.5 0 0 0 3 14.5h10a1.5 1.5 0 0 0 1.5-1.5V8a.5.5 0 0 0-1 0v5a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V3a.5.5 0 0 1 .5-.5h8a.5.5 0 0 0 0-1H3A1.5 1.5 0 0 0 1.5 3v10z"/>
+            </svg>
+          </div>
+          <span class="action d-flex flex-grow-1 align-items-stretch justify-content-between ml-3">
+            <span>Tasks</span>
+            <ModKKey>T</ModKKey>
+          </span>
+        </router-link>
         <router-link :to="{ name: 'untagged' }" class="item rounded p-3 my-1 px-md-2 py-md-1 d-flex">
           <div class="icon-wrapper d-flex align-items-center justify-content-center rounded-circle">
             <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-file-earmark" fill="currentColor" xmlns="http://www.w3.org/2000/svg">

diff --git a/src/store/modules/keybindings.js b/src/store/modules/keybindings.js
@@ -28,11 +28,11 @@ const makeListener = (keybinding, callback, context) => {
 
 const makeListeners = (context) => {
   return [
-    makeListener('a', () => goTo('actionable'), context),
+    makeListener('t', () => goTo('actionable'), context),
     makeListener('c', () => goTo('context'), context),
     makeListener('d', () => goTo('discarded'), context),
-    makeListener('e', () => goTo('settings'), context),
-    makeListener('i', () => window.open('https://github.com/voraciousdev/octo/issues', '_blank'), context),
+    makeListener('e', () => goTo('graph'), context),
+    makeListener('s', () => goTo('settings'), context),
     makeListener('n', () => goTo('dashboard'), context),
     makeListener('r', () => goTo('recent'), context),
     makeListener('u', () => goTo('untagged'), context),