From 400b14e021f8968a2242ee42f64e2f8fc3c9c834 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 17 Feb 2023 16:44:04 +0100
Subject: [PATCH] removed remnants of dev branch

---
 src/public/app/components/root_command_executor.js | 4 ----
 src/public/app/widgets/buttons/global_menu.js      | 8 ++++----
 src/public/app/widgets/dialogs/help.js             | 5 +++++
 src/public/app/widgets/note_detail.js              | 2 +-
 src/services/hidden_subtree.js                     | 6 ------
 src/services/keyboard_actions.js                   | 2 +-
 src/services/options_init.js                       | 1 -
 src/services/resource_dir.js                       | 5 +----
 8 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/public/app/components/root_command_executor.js b/src/public/app/components/root_command_executor.js
index a3d41e48a..bac07af70 100644
--- a/src/public/app/components/root_command_executor.js
+++ b/src/public/app/components/root_command_executor.js
@@ -106,10 +106,6 @@ export default class RootCommandExecutor extends Component {
         await this.showAndHoistSubtree('_search');
     }
 
-    async showUserGuideCommand() {
-        await this.showAndHoistSubtree('_userGuide');
-    }
-
     async showAndHoistSubtree(subtreeNoteId) {
         await appContext.tabManager.openContextWithNote(subtreeNoteId, {
             activate: true,
diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js
index 653cb684a..8108655b7 100644
--- a/src/public/app/widgets/buttons/global_menu.js
+++ b/src/public/app/widgets/buttons/global_menu.js
@@ -75,7 +75,7 @@ const TPL = `
         margin-right: 5px;
     }
     
-    body.mobile .show-user-guide-button, body.mobile .show-about-dialog-button {
+    body.mobile .show-help-button, body.mobile .show-about-dialog-button {
         /* hidden because these dialogs are not available for mobile */
         display: none;
     }
@@ -195,10 +195,10 @@ const TPL = `
             </ul>
         </li>
 
-        <li class="dropdown-item show-user-guide-button" data-trigger-command="showUserGuide">
+        <li class="dropdown-item show-help-button" data-trigger-command="showHelp">
             <span class="bx bx-info-circle"></span>
-            Show User Guide
-            <kbd data-command="showUserGuide"></kbd>
+            Show Help
+            <kbd data-command="showHelp"></kbd>
         </li>
 
         <li class="dropdown-item show-about-dialog-button">
diff --git a/src/public/app/widgets/dialogs/help.js b/src/public/app/widgets/dialogs/help.js
index b15ca841b..d3f8ecf4f 100644
--- a/src/public/app/widgets/dialogs/help.js
+++ b/src/public/app/widgets/dialogs/help.js
@@ -1,3 +1,4 @@
+import utils from "../../services/utils.js";
 import BasicWidget from "../basic_widget.js";
 
 const TPL = `
@@ -155,4 +156,8 @@ export default class HelpDialog extends BasicWidget {
     doRender() {
         this.$widget = $(TPL);
     }
+
+    showHelpEvent() {
+        utils.openDialog(this.$widget);
+    }
 }
diff --git a/src/public/app/widgets/note_detail.js b/src/public/app/widgets/note_detail.js
index 4dfa9a2d7..aaf2c568d 100644
--- a/src/public/app/widgets/note_detail.js
+++ b/src/public/app/widgets/note_detail.js
@@ -110,7 +110,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
 
             const files = [...e.originalEvent.dataTransfer.files]; // chrome has issue that dataTransfer.files empties after async operation
 
-            const importService = await import("../services/import");
+            const importService = await import("../services/import.js");
 
             importService.uploadFiles(activeNote.noteId, files, {
                 safeImport: true,
diff --git a/src/services/hidden_subtree.js b/src/services/hidden_subtree.js
index b1e86b3e3..a4f69cbe4 100644
--- a/src/services/hidden_subtree.js
+++ b/src/services/hidden_subtree.js
@@ -72,12 +72,6 @@ const HIDDEN_SUBTREE_DEFINITION = {
                 { type: 'label', name: 'keepCurrentHoisting' }
             ]
         },
-        {
-            id: '_userGuide',
-            title: 'User Guide',
-            type: 'text',
-            icon: 'bx-help-circle'
-        },
         {
             // place for user scripts hidden stuff (scripts should not create notes directly under hidden root)
             id: '_userHidden',
diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js
index ec30db208..d665692a9 100644
--- a/src/services/keyboard_actions.js
+++ b/src/services/keyboard_actions.js
@@ -273,7 +273,7 @@ const DEFAULT_KEYBOARD_ACTIONS = [
         scope: "window"
     },
     {
-        actionName: "showUserGuide",
+        actionName: "showHelp",
         defaultShortcuts: ["F1"],
         description: "Shows built-in Help / cheatsheet",
         scope: "window"
diff --git a/src/services/options_init.js b/src/services/options_init.js
index 40c2b79d5..fd66718f8 100644
--- a/src/services/options_init.js
+++ b/src/services/options_init.js
@@ -89,7 +89,6 @@ const defaultOptions = [
     { name: 'minTocHeadings', value: '5', isSynced: true },
     { name: 'checkForUpdates', value: 'true', isSynced: true },
     { name: 'disableTray', value: 'false', isSynced: false },
-    { name: 'userGuideSha256Hash', value: '', isSynced: true },
 ];
 
 function initStartupOptions() {
diff --git a/src/services/resource_dir.js b/src/services/resource_dir.js
index 0e968d42a..862887474 100644
--- a/src/services/resource_dir.js
+++ b/src/services/resource_dir.js
@@ -20,12 +20,9 @@ if (!fs.existsSync(MIGRATIONS_DIR)) {
     process.exit(1);
 }
 
-const USER_GUIDE_ZIP_DIR = path.resolve(RESOURCE_DIR, "tmp");
-
 module.exports = {
     RESOURCE_DIR,
     MIGRATIONS_DIR,
     DB_INIT_DIR,
-    ELECTRON_APP_ROOT_DIR,
-    USER_GUIDE_ZIP_DIR
+    ELECTRON_APP_ROOT_DIR
 };