move components

src/public/javascripts/services/app_context.js

@@ -7,7 +7,7 @@ import noteDetailService from "./note_detail.js";
 import TabContext from "./tab_context.js";
 import server from "./server.js";
 import keyboardActionService from "./keyboard_actions.js";
-import TabRowWidget from "./tab_row.js";
+import TabRowWidget from "../widgets/tab_row.js";
 import NoteTitleWidget from "../widgets/note_title.js";
 import PromotedAttributesWidget from "../widgets/promoted_attributes.js";
 import NoteDetailWidget from "../widgets/note_detail.js";

src/public/javascripts/services/note_detail.js

@@ -5,7 +5,7 @@ import ws from "./ws.js";
 import treeCache from "./tree_cache.js";
 import NoteFull from "../entities/note_full.js";
 import treeUtils from "./tree_utils.js";
-import tabRow from "./tab_row.js";
+import tabRow from "../widgets/tab_row.js";
 import appContext from "./app_context.js";
 
 const $tabContentsContainer = $("#note-tab-container");

src/public/javascripts/widgets/detail/note_detail_book.js

@@ -1,6 +1,6 @@
-import linkService from "./link.js";
+import linkService from "../../services/link.js";
-import treeCache from "./tree_cache.js";
+import treeCache from "../../services/tree_cache.js";
-import noteContentRenderer from "./note_content_renderer.js";
+import noteContentRenderer from "../../services/note_content_renderer.js";
 
 const MIN_ZOOM_LEVEL = 1;
 const MAX_ZOOM_LEVEL = 6;

src/public/javascripts/widgets/detail/note_detail_code.js

@@ -1,9 +1,9 @@
-import libraryLoader from "./library_loader.js";
+import libraryLoader from "../../services/library_loader.js";
-import bundleService from "./bundle.js";
+import bundleService from "../../services/bundle.js";
-import toastService from "./toast.js";
+import toastService from "../../services/toast.js";
-import server from "./server.js";
+import server from "../../services/server.js";
-import noteDetailService from "./note_detail.js";
+import noteDetailService from "../../services/note_detail.js";
-import keyboardActionService from "./keyboard_actions.js";
+import keyboardActionService from "../../services/keyboard_actions.js";
 
 const TPL = `
 <div class="note-detail-code note-detail-component">

src/public/javascripts/widgets/detail/note_detail_empty.js

@@ -1,5 +1,5 @@
-import noteAutocompleteService from '../services/note_autocomplete.js';
+import noteAutocompleteService from '../../services/note_autocomplete.js';
-import treeService from "./tree.js";
+import treeService from "../../services/tree.js";
 
 class NoteDetailEmpty {
     /**

src/public/javascripts/widgets/detail/note_detail_file.js

@@ -1,7 +1,7 @@
-import utils from "./utils.js";
+import utils from "../../services/utils.js";
-import server from "./server.js";
+import server from "../../services/server.js";
-import toastService from "./toast.js";
+import toastService from "../../services/toast.js";
-import noteDetailService from "./note_detail.js";
+import noteDetailService from "../../services/note_detail.js";
 
 class NoteDetailFile {
     /**

src/public/javascripts/widgets/detail/note_detail_image.js

@@ -1,7 +1,7 @@
-import utils from "./utils.js";
+import utils from "../../services/utils.js";
-import toastService from "./toast.js";
+import toastService from "../../services/toast.js";
-import server from "./server.js";
+import server from "../../services/server.js";
-import noteDetailService from "./note_detail.js";
+import noteDetailService from "../../services/note_detail.js";
 
 class NoteDetailImage {
     /**

src/public/javascripts/widgets/detail/note_detail_protected_session.js

@@ -1,4 +1,4 @@
-import protectedSessionService from './protected_session.js';
+import protectedSessionService from '../../services/protected_session.js';
 
 class NoteDetailProtectedSession {
     /**

src/public/javascripts/widgets/detail/note_detail_relation_map.js

@@ -1,11 +1,11 @@
-import server from "./server.js";
+import server from "../../services/server.js";
-import noteDetailService from "./note_detail.js";
+import noteDetailService from "../../services/note_detail.js";
-import linkService from "./link.js";
+import linkService from "../../services/link.js";
-import libraryLoader from "./library_loader.js";
+import libraryLoader from "../../services/library_loader.js";
-import treeService from "./tree.js";
+import treeService from "../../services/tree.js";
-import contextMenuWidget from "./context_menu.js";
+import contextMenuWidget from "../../services/context_menu.js";
-import toastService from "./toast.js";
+import toastService from "../../services/toast.js";
-import attributeAutocompleteService from "./attribute_autocomplete.js";
+import attributeAutocompleteService from "../../services/attribute_autocomplete.js";
 
 const uniDirectionalOverlays = [
     [ "Arrow", {
@@ -122,7 +122,7 @@ class NoteDetailRelationMap {
         this.clipboard = null;
 
         this.$createChildNote.on('click', async () => {
-            const promptDialog = await import('../dialogs/prompt.js');
+            const promptDialog = await import('../../dialogs/prompt.js');
             const title = await promptDialog.ask({ message: "Enter title of new note",  defaultValue: "new note" });
 
             if (!title.trim()) {
@@ -163,7 +163,7 @@ class NoteDetailRelationMap {
             noteDetailService.openInTab(noteId, false);
         }
         else if (cmd === "remove") {
-            const confirmDialog = await import('../dialogs/confirm.js');
+            const confirmDialog = await import('../../dialogs/confirm.js');
 
             if (!await confirmDialog.confirmDeleteNoteBoxWithNote($title.text())) {
                 return;
@@ -185,7 +185,7 @@ class NoteDetailRelationMap {
             this.saveData();
         }
         else if (cmd === "edit-title") {
-            const promptDialog = await import("../dialogs/prompt.js");
+            const promptDialog = await import("../../dialogs/prompt.js");
             const title = await promptDialog.ask({
                 message: "Enter new note title:",
                 defaultValue: $title.text()
@@ -426,7 +426,7 @@ class NoteDetailRelationMap {
                     },
                     selectContextMenuItem: async (event, cmd) => {
                         if (cmd === 'remove') {
-                            const confirmDialog = await import('../dialogs/confirm.js');
+                            const confirmDialog = await import('../../dialogs/confirm.js');
 
                             if (!await confirmDialog.confirm("Are you sure you want to remove the relation?")) {
                                 return;
@@ -450,7 +450,7 @@ class NoteDetailRelationMap {
             return;
         }
 
-        const promptDialog = await import("../dialogs/prompt.js");
+        const promptDialog = await import("../../dialogs/prompt.js");
         const name = await promptDialog.ask({
             message: "Specify new relation name:",
             shown: ({ $answer }) =>
@@ -476,7 +476,7 @@ class NoteDetailRelationMap {
             && rel.name === name);
 
         if (relationExists) {
-            const infoDialog = await import('../dialogs/info.js');
+            const infoDialog = await import('../../dialogs/info.js');
             await infoDialog.info("Connection '" + name + "' between these notes already exists.");
 
             this.jsPlumbInstance.deleteConnection(connection);

src/public/javascripts/widgets/detail/note_detail_render.js

@@ -1,4 +1,4 @@
-import renderService from "./render.js";
+import renderService from "../../services/render.js";
 
 class NoteDetailRender {
     /**

src/public/javascripts/widgets/detail/note_detail_search.js

@@ -1,5 +1,5 @@
-import noteDetailService from "./note_detail.js";
+import noteDetailService from "../../services/note_detail.js";
-import searchNotesService from "./search_notes.js";
+import searchNotesService from "../../services/search_notes.js";
 
 class NoteDetailSearch {
     /**

src/public/javascripts/widgets/detail/note_detail_text.js

@@ -1,7 +1,7 @@
-import libraryLoader from "./library_loader.js";
+import libraryLoader from "../../services/library_loader.js";
-import treeService from './tree.js';
+import treeService from '../../services/tree.js';
-import noteAutocompleteService from './note_autocomplete.js';
+import noteAutocompleteService from '../../services/note_autocomplete.js';
-import mimeTypesService from './mime_types.js';
+import mimeTypesService from '../../services/mime_types.js';
 
 const ENABLE_INSPECTOR = false;
 

src/public/javascripts/widgets/note_detail.js

@@ -17,16 +17,16 @@ const TPL = `
 `;
 
 const componentClasses = {
-    'empty': "../services/note_detail_empty.js",
+    'empty': "./detail/note_detail_empty.js",
-    'text': "../services/note_detail_text.js",
+    'text': "./detail/note_detail_text.js",
-    'code': "../services/note_detail_code.js",
+    'code': "./detail/note_detail_code.js",
-    'file': "../services/note_detail_file.js",
+    'file': "./detail/note_detail_file.js",
-    'image': "../services/note_detail_image.js",
+    'image': "./detail/note_detail_image.js",
-    'search': "../services/note_detail_search.js",
+    'search': "./detail/note_detail_search.js",
-    'render': "../services/note_detail_render.js",
+    'render': "./detail/note_detail_render.js",
-    'relation-map': "../services/note_detail_relation_map.js",
+    'relation-map': "./detail/note_detail_relation_map.js",
-    'protected-session': "../services/note_detail_protected_session.js",
+    'protected-session': "./detail/note_detail_protected_session.js",
-    'book': "../services/note_detail_book.js"
+    'book': "./detail/note_detail_book.js"
 };
 
 export default class NoteDetailWidget extends TabAwareWidget {