moved becca to top level source dir

src/routes/api/attributes.js

@@ -3,8 +3,8 @@
 const sql = require('../../services/sql');
 const log = require('../../services/log');
 const attributeService = require('../../services/attributes');
-const Attribute = require('../../services/becca/entities/attribute');
-const becca = require("../../services/becca/becca");
+const Attribute = require('../../becca/entities/attribute.js');
+const becca = require("../../becca/becca.js");
 
 function getEffectiveNoteAttributes(req) {
     const note = becca.getNote(req.params.noteId);

src/routes/api/autocomplete.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const beccaService = require('../../services/becca/becca_service.js');
+const beccaService = require('../../becca/becca_service.js');
 const searchService = require('../../services/search/services/search.js');
 const log = require('../../services/log');
 const utils = require('../../services/utils');
 const cls = require('../../services/cls');
-const becca = require("../../services/becca/becca");
+const becca = require("../../becca/becca.js");
 
 function getAutocomplete(req) {
     const query = req.query.query.trim();

src/routes/api/branches.js

@@ -5,7 +5,7 @@ const utils = require('../../services/utils');
 const entityChangesService = require('../../services/entity_changes.js');
 const treeService = require('../../services/tree');
 const noteService = require('../../services/notes');
-const becca = require('../../services/becca/becca.js');
+const becca = require('../../becca/becca.js');
 const TaskContext = require('../../services/task_context');
 
 /**

src/routes/api/clipper.js

@@ -10,7 +10,7 @@ const ws = require('../../services/ws.js');
 const log = require('../../services/log');
 const utils = require('../../services/utils');
 const path = require('path');
-const Attribute = require('../../services/becca/entities/attribute');
+const Attribute = require('../../becca/entities/attribute.js');
 const htmlSanitizer = require('../../services/html_sanitizer');
 
 function findClippingNote(todayNote, pageUrl) {

src/routes/api/files.js

@@ -9,7 +9,7 @@ const fs = require('fs');
 const { Readable } = require('stream');
 const chokidar = require('chokidar');
 const ws = require('../../services/ws');
-const becca = require("../../services/becca/becca");
+const becca = require("../../becca/becca.js");
 
 function updateFile(req) {
     const {noteId} = req.params;

src/routes/api/image.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const imageService = require('../../services/image');
-const becca = require('../../services/becca/becca');
+const becca = require('../../becca/becca.js');
 const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
 const fs = require('fs');
 

src/routes/api/import.js

@@ -6,7 +6,7 @@ const zipImportService = require('../../services/import/zip');
 const singleImportService = require('../../services/import/single');
 const cls = require('../../services/cls');
 const path = require('path');
-const beccaLoader = require('../../services/becca/becca_loader.js');
+const beccaLoader = require('../../becca/becca_loader.js');
 const log = require('../../services/log');
 const TaskContext = require('../../services/task_context.js');
 

src/routes/api/login.js

@@ -11,7 +11,7 @@ const eventService = require('../../services/events');
 const sqlInit = require('../../services/sql_init');
 const sql = require('../../services/sql');
 const optionService = require('../../services/options');
-const ApiToken = require('../../services/becca/entities/api_token.js');
+const ApiToken = require('../../becca/entities/api_token.js');
 const ws = require("../../services/ws.js");
 
 function loginSync(req) {

src/routes/api/note_revisions.js

@@ -1,12 +1,12 @@
 "use strict";
 
-const beccaService = require('../../services/becca/becca_service.js');
+const beccaService = require('../../becca/becca_service.js');
 const protectedSessionService = require('../../services/protected_session');
 const noteRevisionService = require('../../services/note_revisions');
 const utils = require('../../services/utils');
 const sql = require('../../services/sql');
 const path = require('path');
-const becca = require("../../services/becca/becca");
+const becca = require("../../becca/becca.js");
 
 function getNoteRevisions(req) {
     return becca.getNoteRevisionsFromQuery(`

src/routes/api/notes.js

@@ -8,7 +8,7 @@ const log = require('../../services/log');
 const TaskContext = require('../../services/task_context');
 const fs = require('fs');
 const noteRevisionService = require("../../services/note_revisions.js");
-const becca = require("../../services/becca/becca");
+const becca = require("../../becca/becca.js");
 
 function getNote(req) {
     const noteId = req.params.noteId;

src/routes/api/recent_changes.js

@@ -3,7 +3,7 @@
 const sql = require('../../services/sql');
 const protectedSessionService = require('../../services/protected_session');
 const noteService = require('../../services/notes');
-const beccaService = require('../../services/becca/becca_service.js');
+const beccaService = require('../../becca/becca_service.js');
 
 function getRecentChanges(req) {
     const {ancestorNoteId} = req.params;

src/routes/api/recent_notes.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const RecentNote = require('../../services/becca/entities/recent_note.js');
+const RecentNote = require('../../becca/entities/recent_note.js');
 const sql = require('../../services/sql');
 const dateUtils = require('../../services/date_utils');
 

src/routes/api/script.js

@@ -2,7 +2,7 @@
 
 const scriptService = require('../../services/script');
 const attributeService = require('../../services/attributes');
-const becca = require('../../services/becca/becca');
+const becca = require('../../becca/becca.js');
 const syncService = require('../../services/sync');
 
 function exec(req) {

src/routes/api/search.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require('../../services/becca/becca');
+const becca = require('../../becca/becca.js');
 const SearchContext = require('../../services/search/search_context');
 const log = require('../../services/log');
 const scriptService = require('../../services/script');

src/routes/api/similar_notes.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const similarityService = require('../../services/becca/similarity.js');
-const becca = require("../../services/becca/becca");
+const similarityService = require('../../becca/similarity.js');
+const becca = require("../../becca/becca.js");
 
 async function getSimilarNotes(req) {
     const noteId = req.params.noteId;

src/routes/api/stats.js

@@ -1,5 +1,5 @@
 const sql = require('../../services/sql');
-const becca = require('../../services/becca/becca.js');
+const becca = require('../../becca/becca.js');
 
 function getNoteSize(req) {
     const {noteId} = req.params;

src/routes/api/tree.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const becca = require('../../services/becca/becca.js');
+const becca = require('../../becca/becca.js');
 const log = require('../../services/log');
 
 function getNotesAndBranchesAndAttributes(noteIds) {

src/routes/custom.js

@@ -3,7 +3,7 @@ const fileUploadService = require('./api/files.js');
 const scriptService = require('../services/script');
 const cls = require('../services/cls');
 const sql = require("../services/sql");
-const becca = require("../services/becca/becca");
+const becca = require("../becca/becca.js");
 
 function handleRequest(req, res) {
     // express puts content after first slash into 0 index element