diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 1eeb900b2..cd49e608f 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,6 +3,7 @@ "lokalise.i18n-ally", "editorconfig.editorconfig", "vitest.explorer", - "ms-playwright.playwright" + "ms-playwright.playwright", + "tobermory.es6-string-html" ] } diff --git a/db/demo.zip b/db/demo.zip index d13245f77..74d4e8c32 100644 Binary files a/db/demo.zip and b/db/demo.zip differ diff --git a/db/migrations/0216__move_content_into_blobs.ts b/db/migrations/0216__move_content_into_blobs.ts index f37e570f2..c10fcc780 100644 --- a/db/migrations/0216__move_content_into_blobs.ts +++ b/db/migrations/0216__move_content_into_blobs.ts @@ -17,8 +17,8 @@ interface NoteRevisionContents { export default () => { const existingBlobIds = new Set(); - for (const noteId of sql.getColumn(`SELECT noteId FROM note_contents`)) { - const row = sql.getRow(`SELECT noteId, content, dateModified, utcDateModified FROM note_contents WHERE noteId = ?`, [noteId]); + for (const noteId of sql.getColumn(/*sql*/`SELECT noteId FROM note_contents`)) { + const row = sql.getRow(/*sql*/`SELECT noteId, content, dateModified, utcDateModified FROM note_contents WHERE noteId = ?`, [noteId]); const blobId = utils.hashedBlobId(row.content); if (!existingBlobIds.has(blobId)) { @@ -40,8 +40,8 @@ export default () => { sql.execute("UPDATE notes SET blobId = ? WHERE noteId = ?", [blobId, row.noteId]); } - for (const noteRevisionId of sql.getColumn(`SELECT noteRevisionId FROM note_revision_contents`)) { - const row = sql.getRow(`SELECT noteRevisionId, content, utcDateModified FROM note_revision_contents WHERE noteRevisionId = ?`, [noteRevisionId]); + for (const noteRevisionId of sql.getColumn(/*sql*/`SELECT noteRevisionId FROM note_revision_contents`)) { + const row = sql.getRow(/*sql*/`SELECT noteRevisionId, content, utcDateModified FROM note_revision_contents WHERE noteRevisionId = ?`, [noteRevisionId]); const blobId = utils.hashedBlobId(row.content); if (!existingBlobIds.has(blobId)) { diff --git a/db/migrations/0220__migrate_images_to_attachments.ts b/db/migrations/0220__migrate_images_to_attachments.ts index 53eac5958..f54f4a956 100644 --- a/db/migrations/0220__migrate_images_to_attachments.ts +++ b/db/migrations/0220__migrate_images_to_attachments.ts @@ -7,7 +7,7 @@ import sql from "../../src/services/sql"; export default () => { cls.init(() => { // emergency disabling of image compression since it appears to make problems in migration to 0.61 - sql.execute(`UPDATE options SET value = 'false' WHERE name = 'compressImages'`); + sql.execute(/*sql*/`UPDATE options SET value = 'false' WHERE name = 'compressImages'`); becca_loader.load(); diff --git a/demo/!!!meta.json b/demo/!!!meta.json index f28159e36..f3d4a363e 100644 --- a/demo/!!!meta.json +++ b/demo/!!!meta.json @@ -114,13 +114,6 @@ "isInheritable": false, "position": 50 }, - { - "type": "relation", - "name": "includeNoteLink", - "value": "CN3CCLggUqf4", - "isInheritable": false, - "position": 60 - }, { "type": "label", "name": "iconClass", @@ -154,7 +147,7 @@ "title": "Inbox", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -223,7 +216,7 @@ "title": "The Last Question", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [], @@ -275,7 +268,7 @@ "title": "Formatting examples", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "book", "mime": "", "attributes": [], @@ -442,7 +435,7 @@ "title": "Journal", "notePosition": 30, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -485,7 +478,7 @@ "title": "2021", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -528,7 +521,7 @@ "title": "11 - November", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -572,7 +565,7 @@ "title": "28 - Tuesday", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -611,7 +604,7 @@ "title": "Phone call about work project", "notePosition": 0, "prefix": null, - "isExpanded": false, + "isExpanded": true, "type": "text", "mime": "text/html", "attributes": [], @@ -682,7 +675,7 @@ "title": "12 - December", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -726,7 +719,7 @@ "title": "18 - Monday", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -1343,7 +1336,7 @@ "title": "19 - Tuesday", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -1493,7 +1486,7 @@ "title": "21 - Thursday", "notePosition": 40, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -1586,7 +1579,7 @@ "title": "22 - Friday", "notePosition": 50, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -1786,7 +1779,7 @@ "title": "24 - Sunday - Christmas Eve!", "notePosition": 70, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -2026,7 +2019,7 @@ "title": "Epics", "notePosition": 30, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [], @@ -2049,7 +2042,7 @@ "title": "Christmas", "notePosition": 0, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [], @@ -2119,7 +2112,7 @@ "title": "Shopping", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [], @@ -2231,10 +2224,18 @@ "title": "Tech", "notePosition": 40, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", - "attributes": [], + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bx-desktop", + "isInheritable": false, + "position": 10 + } + ], "format": "html", "dataFileName": "Tech.html", "attachments": [], @@ -2252,10 +2253,18 @@ "title": "Security", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", - "attributes": [], + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bx-lock-alt", + "isInheritable": false, + "position": 10 + } + ], "format": "html", "attachments": [], "dirFileName": "Security", @@ -2290,10 +2299,18 @@ "title": "Linux", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", - "attributes": [], + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-tux", + "isInheritable": false, + "position": 10 + } + ], "format": "html", "attachments": [], "dirFileName": "Linux", @@ -2400,7 +2417,7 @@ "title": "Ubuntu", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [], @@ -2447,10 +2464,18 @@ "title": "Programming", "notePosition": 30, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", - "attributes": [], + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bx-code-alt", + "isInheritable": false, + "position": 10 + } + ], "format": "html", "attachments": [], "dirFileName": "Programming", @@ -2471,7 +2496,15 @@ "isExpanded": false, "type": "text", "mime": "text/html", - "attributes": [], + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-java", + "isInheritable": false, + "position": 10 + } + ], "format": "html", "dataFileName": "Java.html", "attachments": [] @@ -2503,15 +2536,23 @@ "HGcABfDS6a51", "B16t4MPcxaAs" ], - "title": "node.js", + "title": "Node.js", "notePosition": 40, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "book", "mime": "text/html", - "attributes": [], + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bxl-nodejs", + "isInheritable": false, + "position": 10 + } + ], "attachments": [], - "dirFileName": "node.js", + "dirFileName": "Node.js", "children": [ { "isClone": false, @@ -2547,7 +2588,7 @@ "title": "Overview", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [], @@ -2651,501 +2692,779 @@ }, { "isClone": false, - "noteId": "P1OnNHRhFn9u", + "noteId": "k7rcoITZRsi6", "notePath": [ "root", "Fb7eMY46lT6k", - "P1OnNHRhFn9u" + "k7rcoITZRsi6" ], - "title": "Canvas note", + "title": "Note Types", "notePosition": 60, "prefix": null, "isExpanded": true, - "type": "canvas", - "mime": "application/json", - "attributes": [], - "dataFileName": "Canvas note.json", - "attachments": [ + "type": "text", + "mime": "text/html", + "attributes": [ { - "attachmentId": "LrYmWTdvBYpX", - "title": "canvas-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 0, - "dataFileName": "Canvas note_canvas-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "CN3CCLggUqf4", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "CN3CCLggUqf4" - ], - "title": "Mind map", - "notePosition": 70, - "prefix": null, - "isExpanded": false, - "type": "mindMap", - "mime": "application/json", - "attributes": [], - "dataFileName": "Mind map.json", - "attachments": [ - { - "attachmentId": "xKxyCN02w5d2", - "title": "mindmap-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 0, - "dataFileName": "Mind map_mindmap-export.svg" + "type": "label", + "name": "iconClass", + "value": "bx bx-file", + "isInheritable": false, + "position": 10 } ], - "dirFileName": "Mind map", + "format": "html", + "attachments": [], + "dirFileName": "Note Types", "children": [ { "isClone": false, - "noteId": "cLIqMYiMy7v9", + "noteId": "P1OnNHRhFn9u", "notePath": [ "root", "Fb7eMY46lT6k", - "CN3CCLggUqf4", - "cLIqMYiMy7v9" + "k7rcoITZRsi6", + "P1OnNHRhFn9u" ], - "title": "new note", + "title": "Canvas", "notePosition": 10, "prefix": null, - "isExpanded": false, - "type": "mindMap", + "isExpanded": true, + "type": "canvas", "mime": "application/json", "attributes": [], - "dataFileName": "new note.json", + "dataFileName": "Canvas.json", + "attachments": [ + { + "attachmentId": "LrYmWTdvBYpX", + "title": "canvas-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 0, + "dataFileName": "Canvas_canvas-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "lZlMer9EkwF8", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8" + ], + "title": "Mermaid Diagrams", + "notePosition": 20, + "prefix": null, + "isExpanded": false, + "type": "book", + "mime": "", + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bx-selection", + "isInheritable": false, + "position": 10 + } + ], "attachments": [], - "dirFileName": "new note", + "dirFileName": "Mermaid Diagrams", "children": [ { "isClone": false, - "noteId": "nyo567lPZRFc", + "noteId": "DALQSU4fng4F", "notePath": [ "root", "Fb7eMY46lT6k", - "CN3CCLggUqf4", - "cLIqMYiMy7v9", - "nyo567lPZRFc" + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "DALQSU4fng4F" ], - "title": "new note", + "title": "Flow", "notePosition": 10, "prefix": null, "isExpanded": false, - "type": "mindMap", - "mime": "application/json", + "type": "mermaid", + "mime": "text/mermaid", "attributes": [], - "dataFileName": "new note.json", - "attachments": [] + "dataFileName": "Flow.txt", + "attachments": [ + { + "attachmentId": "6u2TW8zweuBN", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Flow_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "g7rjYwoleBlR", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "g7rjYwoleBlR" + ], + "title": "Flow (ELK)", + "notePosition": 11, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/mermaid", + "attributes": [], + "dataFileName": "Flow (ELK).txt", + "attachments": [ + { + "attachmentId": "9TKNS3IHYYQq", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Flow (ELK)_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "t73XNJNTTwQp", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "t73XNJNTTwQp" + ], + "title": "Sequence", + "notePosition": 20, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/mermaid", + "attributes": [], + "dataFileName": "Sequence.txt", + "attachments": [ + { + "attachmentId": "XfWi1TqleVbL", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Sequence_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "6wdYxWSVuXof", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "6wdYxWSVuXof" + ], + "title": "Gantt", + "notePosition": 30, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/plain", + "attributes": [], + "dataFileName": "Gantt.txt", + "attachments": [ + { + "attachmentId": "zCjOBL5UP9ii", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Gantt_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "WKL3yssKyoth", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "WKL3yssKyoth" + ], + "title": "Class", + "notePosition": 40, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/plain", + "attributes": [], + "dataFileName": "Class.txt", + "attachments": [ + { + "attachmentId": "sRADq0QJpaYr", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Class_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "v9TM7cCXBILP", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "v9TM7cCXBILP" + ], + "title": "State", + "notePosition": 50, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/plain", + "attributes": [], + "dataFileName": "State.txt", + "attachments": [ + { + "attachmentId": "NhPv2lQln1g4", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "State_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "1EDhd9QJyulq", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "1EDhd9QJyulq" + ], + "title": "Mind Map", + "notePosition": 60, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/mermaid", + "attributes": [], + "dataFileName": "Mind Map.txt", + "attachments": [ + { + "attachmentId": "Q8EircLk65HH", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Mind Map_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "n32hpxSA2fP8", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "n32hpxSA2fP8" + ], + "title": "Pie", + "notePosition": 70, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/plain", + "attributes": [], + "dataFileName": "Pie.txt", + "attachments": [ + { + "attachmentId": "6xhRWdFidyIg", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Pie_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "T0QEYaEv7PmE", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "T0QEYaEv7PmE" + ], + "title": "Journey", + "notePosition": 80, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/plain", + "attributes": [], + "dataFileName": "Journey.txt", + "attachments": [ + { + "attachmentId": "sxLqDNmjlbK4", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Journey_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "P9QvwWzLZnXJ", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "P9QvwWzLZnXJ" + ], + "title": "Git", + "notePosition": 90, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/plain", + "attributes": [], + "dataFileName": "Git.txt", + "attachments": [ + { + "attachmentId": "tIoCBIaY50Jm", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Git_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "19O4nsY7dkPt", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "19O4nsY7dkPt" + ], + "title": "Entity Relationship", + "notePosition": 100, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/plain", + "attributes": [], + "dataFileName": "Entity Relationship.txt", + "attachments": [ + { + "attachmentId": "AyKZhKQIE5w9", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Entity Relationship_mermai.svg" + } + ] + }, + { + "isClone": false, + "noteId": "2izpY6SPbmhp", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "2izpY6SPbmhp" + ], + "title": "Bar chart", + "notePosition": 110, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/mermaid", + "attributes": [], + "dataFileName": "Bar chart.txt", + "attachments": [ + { + "attachmentId": "r1wMURlU52l8", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "Bar chart_mermaid-export.svg" + } + ] + }, + { + "isClone": false, + "noteId": "hwx0dffwqIGg", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "lZlMer9EkwF8", + "hwx0dffwqIGg" + ], + "title": "C4", + "notePosition": 120, + "prefix": null, + "isExpanded": false, + "type": "mermaid", + "mime": "text/plain", + "attributes": [], + "dataFileName": "C4.txt", + "attachments": [ + { + "attachmentId": "6v2qO6zsygVC", + "title": "mermaid-export.svg", + "role": "image", + "mime": "image/svg+xml", + "position": 10, + "dataFileName": "C4_mermaid-export.svg" + } + ] } ] }, { "isClone": false, - "noteId": "0k0PGp04a9AN", + "noteId": "CN3CCLggUqf4", "notePath": [ "root", "Fb7eMY46lT6k", - "CN3CCLggUqf4", - "0k0PGp04a9AN" + "k7rcoITZRsi6", + "CN3CCLggUqf4" ], - "title": "new note", - "notePosition": 20, + "title": "Mind Map", + "notePosition": 30, "prefix": null, - "isExpanded": false, + "isExpanded": true, "type": "mindMap", "mime": "application/json", "attributes": [], - "dataFileName": "1_new note.json", - "attachments": [] - } - ] - }, - { - "isClone": false, - "noteId": "lZlMer9EkwF8", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8" - ], - "title": "Mermaid Diagrams", - "notePosition": 90, - "prefix": null, - "isExpanded": false, - "type": "book", - "mime": "", - "attributes": [], - "attachments": [], - "dirFileName": "Mermaid Diagrams", - "children": [ - { - "isClone": false, - "noteId": "DALQSU4fng4F", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "DALQSU4fng4F" - ], - "title": "Flow", - "notePosition": 10, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/mermaid", - "attributes": [], - "dataFileName": "Flow.txt", + "dataFileName": "Mind Map.json", "attachments": [ { - "attachmentId": "6u2TW8zweuBN", - "title": "mermaid-export.svg", + "attachmentId": "xKxyCN02w5d2", + "title": "mindmap-export.svg", "role": "image", "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Flow_mermaid-export.svg" + "position": 0, + "dataFileName": "Mind Map_mindmap-export.svg" } ] }, { "isClone": false, - "noteId": "g7rjYwoleBlR", + "noteId": "OdCVNGzsvWuv", "notePath": [ "root", "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "g7rjYwoleBlR" + "k7rcoITZRsi6", + "OdCVNGzsvWuv" ], - "title": "Flow (ELK)", - "notePosition": 11, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/mermaid", - "attributes": [], - "dataFileName": "Flow (ELK).txt", - "attachments": [ - { - "attachmentId": "9TKNS3IHYYQq", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Flow (ELK)_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "t73XNJNTTwQp", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "t73XNJNTTwQp" - ], - "title": "Sequence", - "notePosition": 20, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/mermaid", - "attributes": [], - "dataFileName": "Sequence.txt", - "attachments": [ - { - "attachmentId": "XfWi1TqleVbL", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Sequence_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "6wdYxWSVuXof", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "6wdYxWSVuXof" - ], - "title": "Gantt", - "notePosition": 30, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/plain", - "attributes": [], - "dataFileName": "Gantt.txt", - "attachments": [ - { - "attachmentId": "zCjOBL5UP9ii", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Gantt_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "WKL3yssKyoth", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "WKL3yssKyoth" - ], - "title": "Class", + "title": "Geo Map (The Seven Wonders of the World)", "notePosition": 40, "prefix": null, "isExpanded": false, - "type": "mermaid", - "mime": "text/plain", - "attributes": [], - "dataFileName": "Class.txt", - "attachments": [ + "type": "geoMap", + "mime": "application/json", + "attributes": [ { - "attachmentId": "sRADq0QJpaYr", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Class_mermaid-export.svg" + "type": "label", + "name": "label:geolocation", + "value": "promoted,alias=Geolocation,single,text", + "isInheritable": true, + "position": 10 + }, + { + "type": "label", + "name": "hidePromotedAttributes", + "value": "", + "isInheritable": false, + "position": 20 } - ] - }, - { - "isClone": false, - "noteId": "v9TM7cCXBILP", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "v9TM7cCXBILP" ], - "title": "State", - "notePosition": 50, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/plain", - "attributes": [], - "dataFileName": "State.txt", - "attachments": [ + "dataFileName": "Geo Map (The Seven Wonders of .json", + "attachments": [], + "dirFileName": "Geo Map (The Seven Wonders of the World)", + "children": [ { - "attachmentId": "NhPv2lQln1g4", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "State_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "1EDhd9QJyulq", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "1EDhd9QJyulq" - ], - "title": "Mind Map", - "notePosition": 60, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/mermaid", - "attributes": [], - "dataFileName": "Mind Map.txt", - "attachments": [ + "isClone": false, + "noteId": "IdHyf4rlLmlO", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "OdCVNGzsvWuv", + "IdHyf4rlLmlO" + ], + "title": "The Colosseum, Rome, Italy", + "notePosition": 10, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "geolocation", + "value": "41.89024211851462, 12.492263083403595", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-circle", + "isInheritable": false, + "position": 30 + } + ], + "format": "html", + "dataFileName": "The Colosseum, Rome, Italy.html", + "attachments": [] + }, { - "attachmentId": "Q8EircLk65HH", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Mind Map_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "n32hpxSA2fP8", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "n32hpxSA2fP8" - ], - "title": "Pie", - "notePosition": 70, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/plain", - "attributes": [], - "dataFileName": "Pie.txt", - "attachments": [ + "isClone": false, + "noteId": "Wyp6vjVo0vuV", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "OdCVNGzsvWuv", + "Wyp6vjVo0vuV" + ], + "title": "The Great Wall of China", + "notePosition": 20, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "geolocation", + "value": "40.431907671437244, 116.57035343915216", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-selection", + "isInheritable": false, + "position": 30 + } + ], + "format": "html", + "dataFileName": "The Great Wall of China.html", + "attachments": [] + }, { - "attachmentId": "6xhRWdFidyIg", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Pie_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "T0QEYaEv7PmE", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "T0QEYaEv7PmE" - ], - "title": "Journey", - "notePosition": 80, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/plain", - "attributes": [], - "dataFileName": "Journey.txt", - "attachments": [ + "isClone": false, + "noteId": "VsO5E97Y2mPy", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "OdCVNGzsvWuv", + "VsO5E97Y2mPy" + ], + "title": "The Taj Mahal, India", + "notePosition": 30, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "geolocation", + "value": "27.175173410074475, 78.04213146744753", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-arch", + "isInheritable": false, + "position": 30 + } + ], + "format": "html", + "dataFileName": "The Taj Mahal, India.html", + "attachments": [] + }, { - "attachmentId": "sxLqDNmjlbK4", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Journey_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "P9QvwWzLZnXJ", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "P9QvwWzLZnXJ" - ], - "title": "Git", - "notePosition": 90, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/plain", - "attributes": [], - "dataFileName": "Git.txt", - "attachments": [ + "isClone": false, + "noteId": "8nRYOMoDdWs3", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "OdCVNGzsvWuv", + "8nRYOMoDdWs3" + ], + "title": "Christ the Redeemer, Brazil", + "notePosition": 40, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "geolocation", + "value": "-22.951993968508837, -43.21044464113274", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bx-church", + "isInheritable": false, + "position": 30 + } + ], + "format": "html", + "dataFileName": "Christ the Redeemer, Brazil.html", + "attachments": [] + }, { - "attachmentId": "tIoCBIaY50Jm", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Git_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "19O4nsY7dkPt", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "19O4nsY7dkPt" - ], - "title": "Entity Relationship", - "notePosition": 100, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/plain", - "attributes": [], - "dataFileName": "Entity Relationship.txt", - "attachments": [ + "isClone": false, + "noteId": "nZxMTxkP8AQ4", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "OdCVNGzsvWuv", + "nZxMTxkP8AQ4" + ], + "title": "Machu Picchu, Peru", + "notePosition": 50, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "geolocation", + "value": "-13.163198787170078, -72.54528356174288", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxs-castle", + "isInheritable": false, + "position": 30 + } + ], + "format": "html", + "dataFileName": "Machu Picchu, Peru.html", + "attachments": [] + }, { - "attachmentId": "AyKZhKQIE5w9", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Entity Relationship_mermai.svg" - } - ] - }, - { - "isClone": false, - "noteId": "2izpY6SPbmhp", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "2izpY6SPbmhp" - ], - "title": "Bar chart", - "notePosition": 110, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/mermaid", - "attributes": [], - "dataFileName": "Bar chart.txt", - "attachments": [ + "isClone": false, + "noteId": "DtMcvaYKen9C", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "OdCVNGzsvWuv", + "DtMcvaYKen9C" + ], + "title": "Chichén Itzá, Mexico", + "notePosition": 60, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "geolocation", + "value": "20.678882007143176, -88.56836961554815", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxs-component", + "isInheritable": false, + "position": 30 + } + ], + "format": "html", + "dataFileName": "Chichén Itzá, Mexico.html", + "attachments": [] + }, { - "attachmentId": "r1wMURlU52l8", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "Bar chart_mermaid-export.svg" - } - ] - }, - { - "isClone": false, - "noteId": "hwx0dffwqIGg", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "lZlMer9EkwF8", - "hwx0dffwqIGg" - ], - "title": "C4", - "notePosition": 120, - "prefix": null, - "isExpanded": false, - "type": "mermaid", - "mime": "text/plain", - "attributes": [], - "dataFileName": "C4.txt", - "attachments": [ - { - "attachmentId": "6v2qO6zsygVC", - "title": "mermaid-export.svg", - "role": "image", - "mime": "image/svg+xml", - "position": 10, - "dataFileName": "C4_mermaid-export.svg" + "isClone": false, + "noteId": "ZkR3GvsSQ0Xe", + "notePath": [ + "root", + "Fb7eMY46lT6k", + "k7rcoITZRsi6", + "OdCVNGzsvWuv", + "ZkR3GvsSQ0Xe" + ], + "title": "Petra, Jordan", + "notePosition": 70, + "prefix": null, + "isExpanded": false, + "type": "text", + "mime": "text/html", + "attributes": [ + { + "type": "label", + "name": "geolocation", + "value": "30.32084750671952, 35.481009100454926", + "isInheritable": false, + "position": 20 + }, + { + "type": "label", + "name": "iconClass", + "value": "bx bxs-castle", + "isInheritable": false, + "position": 30 + } + ], + "format": "html", + "dataFileName": "Petra, Jordan.html", + "attachments": [] } ] } @@ -3160,9 +3479,9 @@ "L2NrzQACw0in" ], "title": "Books", - "notePosition": 120, + "notePosition": 130, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -3224,7 +3543,7 @@ "title": "Book template", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -3311,7 +3630,7 @@ "title": "Reviews", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -3356,12 +3675,20 @@ "EBROzsTV1jh4" ], "title": "Work", - "notePosition": 140, + "notePosition": 150, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", - "attributes": [], + "attributes": [ + { + "type": "label", + "name": "iconClass", + "value": "bx bx-briefcase-alt", + "isInheritable": false, + "position": 10 + } + ], "format": "html", "attachments": [], "dirFileName": "Work", @@ -3398,7 +3725,7 @@ "title": "Processes", "notePosition": 10, "prefix": null, - "isExpanded": false, + "isExpanded": true, "type": "text", "mime": "text/html", "attributes": [], @@ -3437,9 +3764,9 @@ "6RKJSJ65qIn5" ], "title": "Steel Blue", - "notePosition": 150, + "notePosition": 160, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "code", "mime": "text/css", "attributes": [ @@ -3548,9 +3875,9 @@ "G8k9CPUVtDeE" ], "title": "Scripting examples", - "notePosition": 340, + "notePosition": 350, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -3578,7 +3905,7 @@ "title": "Task manager", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -4025,7 +4352,7 @@ "title": "Done", "notePosition": 20, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -4281,7 +4608,7 @@ "title": "TODO", "notePosition": 30, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -4398,7 +4725,7 @@ "title": "Implementation", "notePosition": 40, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -4604,7 +4931,7 @@ "title": "Tags", "notePosition": 50, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ diff --git a/demo/navigation.html b/demo/navigation.html index ae5e227f8..55bba6d58 100644 --- a/demo/navigation.html +++ b/demo/navigation.html @@ -248,70 +248,101 @@ -
  • node.js +
  • Node.js
    • -
  • Canvas note -
    • -
  • Mind map +
  • Note Types -
    • -
  • Mermaid Diagrams -
    • diff --git a/demo/root/Trilium Demo.html b/demo/root/Trilium Demo.html index 2b2617d96..cd12b4bd1 100644 --- a/demo/root/Trilium Demo.html +++ b/demo/root/Trilium Demo.html @@ -18,30 +18,22 @@ height="150">

    Welcome to TriliumNext Notes! -

    This is initial "demo" document provided by TriliumNext by default to showcase some of its features and also give you some ideas how you might structure your notes. You can play with it, modify note content and tree structure as you wish.

    If you need any help, visit TriliumNext website: https://github.com/TriliumNext -

    -

    Cleanup

    - +

    Cleanup

    Once you're finished with experimenting and want to cleanup these pages, you can simply delete them all.

    -
     
    -

    Formatting

    - +

    Formatting

    TriliumNext supports classic formatting like italic, bold, bold and italic. Of course you can add links like this one pointing to google.com -

    Lists

    Ordered: -

    1. First Item
      2. @@ -56,7 +48,6 @@

    Unordered: -