), using highlight.js. */ @@ -43,20 +48,13 @@ export async function applySingleBlockSyntaxHighlight($codeBlock: JQuery `${count} ${name}${count > 1 ? "s" : ""}`; - const segments = []; + const segments: string[] = []; if (days > 0) { segments.push(plural(days, "day")); @@ -149,7 +149,7 @@ function isMac() { export const hasTouchBar = (isMac() && isElectron()); -function isCtrlKey(evt: KeyboardEvent | MouseEvent | JQuery.ClickEvent | JQuery.ContextMenuEvent | JQuery.TriggeredEvent | React.PointerEvent) { +function isCtrlKey(evt: KeyboardEvent | MouseEvent | JQuery.ClickEvent | JQuery.ContextMenuEvent | JQuery.TriggeredEvent | React.PointerEvent | JQueryEventObject) { return (!isMac() && evt.ctrlKey) || (isMac() && evt.metaKey); } diff --git a/apps/client/src/setup.ts b/apps/client/src/setup.ts index 2e0dae151..033bb4f42 100644 --- a/apps/client/src/setup.ts +++ b/apps/client/src/setup.ts @@ -1,3 +1,5 @@ +import "jquery"; +import "jquery-hotkeys"; import utils from "./services/utils.js"; import ko from "knockout"; import "./stylesheets/bootstrap.scss"; diff --git a/apps/client/src/share.ts b/apps/client/src/share.ts index 0281e6ed4..6e221b1f1 100644 --- a/apps/client/src/share.ts +++ b/apps/client/src/share.ts @@ -1,4 +1,5 @@ -import "./stylesheets/bootstrap.scss"; +import "normalize.css"; +import "@triliumnext/ckeditor5/content.css"; /** * Fetch note with given ID from backend diff --git a/apps/client/src/stylesheets/llm_chat.css b/apps/client/src/stylesheets/llm_chat.css index aacdf543f..9199d44c7 100644 --- a/apps/client/src/stylesheets/llm_chat.css +++ b/apps/client/src/stylesheets/llm_chat.css @@ -272,4 +272,179 @@ justify-content: center; padding: 1rem; color: var(--muted-text-color); +} + +/* Thinking display styles */ +.llm-thinking-container { + margin: 1rem 0; + animation: fadeInUp 0.3s ease-out; +} + +.thinking-bubble { + background-color: var(--accented-background-color, var(--main-background-color)); + border: 1px solid var(--subtle-border-color, var(--main-border-color)); + border-radius: 0.75rem; + padding: 0.75rem; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05); + position: relative; + overflow: hidden; + transition: all 0.2s ease; +} + +.thinking-bubble:hover { + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08); +} + +.thinking-bubble::before { + content: ''; + position: absolute; + top: 0; + left: -100%; + width: 100%; + height: 100%; + background: linear-gradient(90deg, transparent, var(--hover-item-background-color, rgba(0, 0, 0, 0.03)), transparent); + animation: shimmer 2s infinite; + opacity: 0.5; +} + +.thinking-header { + cursor: pointer; + transition: all 0.2s ease; + border-radius: 0.375rem; +} + +.thinking-header:hover { + background-color: var(--hover-item-background-color, rgba(0, 0, 0, 0.03)); + padding: 0.25rem; + margin: -0.25rem; +} + +.thinking-dots { + display: flex; + gap: 3px; + align-items: center; +} + +.thinking-dots span { + width: 6px; + height: 6px; + background-color: var(--link-color, var(--hover-item-text-color)); + border-radius: 50%; + animation: thinkingPulse 1.4s infinite ease-in-out; +} + +.thinking-dots span:nth-child(1) { + animation-delay: -0.32s; +} + +.thinking-dots span:nth-child(2) { + animation-delay: -0.16s; +} + +.thinking-dots span:nth-child(3) { + animation-delay: 0s; +} + +.thinking-label { + font-weight: 500; + color: var(--link-color, var(--hover-item-text-color)) !important; +} + +.thinking-toggle { + color: var(--muted-text-color) !important; + transition: transform 0.2s ease; + background: transparent !important; + border: none !important; +} + +.thinking-toggle:hover { + color: var(--main-text-color) !important; +} + +.thinking-toggle.expanded { + transform: rotate(180deg); +} + +.thinking-content { + margin-top: 0.75rem; + padding-top: 0.75rem; + border-top: 1px solid var(--subtle-border-color, var(--main-border-color)); + animation: expandDown 0.3s ease-out; +} + +.thinking-text { + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, sans-serif; + font-size: 0.875rem; + line-height: 1.5; + color: var(--main-text-color); + white-space: pre-wrap; + word-wrap: break-word; + background-color: var(--input-background-color); + padding: 0.75rem; + border-radius: 0.5rem; + border: 1px solid var(--subtle-border-color, var(--main-border-color)); + max-height: 300px; + overflow-y: auto; + transition: border-color 0.2s ease; +} + +.thinking-text:hover { + border-color: var(--main-border-color); +} + +/* Animations */ +@keyframes thinkingPulse { + 0%, 80%, 100% { + transform: scale(0.8); + opacity: 0.6; + } + 40% { + transform: scale(1); + opacity: 1; + } +} + +@keyframes shimmer { + 0% { + left: -100%; + } + 100% { + left: 100%; + } +} + +@keyframes fadeInUp { + from { + opacity: 0; + transform: translateY(10px); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes expandDown { + from { + opacity: 0; + max-height: 0; + } + to { + opacity: 1; + max-height: 300px; + } +} + +/* Responsive adjustments */ +@media (max-width: 768px) { + .thinking-bubble { + margin: 0.5rem 0; + padding: 0.5rem; + } + + .thinking-text { + font-size: 0.8rem; + padding: 0.5rem; + max-height: 200px; + } } \ No newline at end of file diff --git a/apps/client/src/stylesheets/style.css b/apps/client/src/stylesheets/style.css index 544b6581b..b1b9ee921 100644 --- a/apps/client/src/stylesheets/style.css +++ b/apps/client/src/stylesheets/style.css @@ -15,6 +15,18 @@ src: url(../fonts/JetBrainsMono-Light.woff2) format("woff"); } +:root { + --admonition-note-accent-color: #69c7ff; + --admonition-tip-accent-color: #40c025; + --admonition-important-accent-color: #9839f7; + --admonition-caution-accent-color: #ff2e2e; + --admonition-warning-accent-color: #e2aa03; + --bs-body-font-family: var(--main-font-family) !important; + --bs-body-font-weight: var(--main-font-weight) !important; + --bs-body-color: var(--main-text-color) !important; + --bs-body-bg: var(--main-background-color) !important; +} + .table { --bs-table-bg: transparent !important; } @@ -420,33 +432,24 @@ body.desktop #context-menu-container .dropdown-item > span { width: 100%; } -.CodeMirror { +.cm-editor { height: 100%; - background: inherit; + outline: none !important; + border-radius: 6px; + overflow: hidden; + margin: 4px; } -body .CodeMirror { +body .cm-editor { font-size: var(--monospace-font-size); } -.CodeMirror-gutters { +body .cm-editor .cm-gutters { background-color: inherit !important; border-right: none; } -.cm-matchhighlight { - background-color: #eeeeee; -} - -.cm-matchhighlight.ck-find-result{ - background: var(--ck-color-highlight-background); -} - -.cm-matchhighlight.ck-find-result_selected { - background-color: #ff9633; -} - -.CodeMirror pre.CodeMirror-placeholder { +body .cm-editor .cm-placeholder { color: #999 !important; } @@ -457,11 +460,11 @@ body .CodeMirror { margin-bottom: 10px; } -#sql-console-query .CodeMirror { +#sql-console-query .cm-editor { height: 150px; } -#sql-console-query .CodeMirror-scroll { +#sql-console-query .cm-editor .cm-scroller { min-height: inherit !important; } @@ -524,12 +527,40 @@ button.btn-sm { padding: 0; } -pre:not(.CodeMirror-line):not(.hljs) { +pre:not(.hljs) { color: var(--main-text-color) !important; white-space: pre-wrap; font-size: 100%; } +:root pre { + --padding-size: 1em; + --copy-button-margin-size: .35em; + --copy-button-width: 37px; + + position: relative; + padding: var(--padding-size); +} + +pre > button.copy-button { + position: absolute; + top: var(--copy-button-margin-size); + right: var(--copy-button-margin-size); +} + +:root pre:has(> button.copy-button) { + padding-right: calc(var(--copy-button-width) + (var(--copy-button-margin-size) * 2)); +} + +pre > button.copy-button:hover { + color: inherit !important; + opacity: 1; +} + +pre > button.copy-button:active { + background-color: unset !important; +} + .pointer { cursor: pointer; } @@ -599,11 +630,6 @@ table.promoted-attributes-in-tooltip th { } .tooltip-trigger { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; background: transparent; pointer-events: none; } @@ -1016,9 +1042,10 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href font-size: var(--detail-font-size) !important; } -.ck-mentions .ck-button.ck-on { - background-color: var(--active-item-background-color) !important; - color: var(--active-item-text-color) !important; +.ck-mentions { + --ck-color-list-button-on-background: var(--active-item-background-color); + --ck-color-list-button-on-background-focus: var(--ck-color-list-button-on-background); + --ck-color-list-button-on-text: var(--active-item-text-color); } .ck-mentions .ck-button b { @@ -1222,6 +1249,10 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu { background-color: inherit; } +::selection { + background-color: var(--selection-background-color); +} + [data-bs-toggle="tooltip"]:not(.button-widget) span { padding-bottom: 0; border-bottom: 1px dotted; @@ -1778,7 +1809,7 @@ body.zen .title-row { height: unset !important; -webkit-app-region: drag; padding-left: env(titlebar-area-x); - padding-right: 2.5em; + padding-right: calc(100vw - env(titlebar-area-width, 100vw) + 2.5em); } body.zen .floating-buttons { @@ -2018,11 +2049,11 @@ footer.file-footer button { left: 1em; } -.admonition.note { --accent-color: #69c7ff; } -.admonition.tip { --accent-color: #40c025; } -.admonition.important { --accent-color: #9839f7; } -.admonition.caution { --accent-color: #ff2e2e; } -.admonition.warning { --accent-color: #e2aa03; } +.admonition.note { --accent-color: var(--admonition-note-accent-color); } +.admonition.tip { --accent-color: var(--admonition-tip-accent-color); } +.admonition.important { --accent-color: var(--admonition-important-accent-color); } +.admonition.caution { --accent-color: var(--admonition-caution-accent-color); } +.admonition.warning { --accent-color: var(--admonition-warning-accent-color); } .admonition.note::before { content: "\eb21"; } .admonition.tip::before { content: "\ea0d"; } diff --git a/apps/client/src/stylesheets/theme-dark.css b/apps/client/src/stylesheets/theme-dark.css index cfabe2f15..3b7a8fcc2 100644 --- a/apps/client/src/stylesheets/theme-dark.css +++ b/apps/client/src/stylesheets/theme-dark.css @@ -81,10 +81,6 @@ body ::-webkit-calendar-picker-indicator { filter: invert(1); } -body .CodeMirror { - filter: invert(90%) hue-rotate(180deg); -} - .excalidraw.theme--dark { --theme-filter: invert(80%) hue-rotate(180deg) !important; } diff --git a/apps/client/src/stylesheets/theme-next-dark.css b/apps/client/src/stylesheets/theme-next-dark.css index 98f379c6e..031bdf465 100644 --- a/apps/client/src/stylesheets/theme-next-dark.css +++ b/apps/client/src/stylesheets/theme-next-dark.css @@ -5,6 +5,12 @@ * Color scheme */ :root { + + /* + * ⚠️ NOTICE: This theme is currently in the beta stage of development. + * The names and purposes of these CSS variables are subject to frequent changes. + */ + --theme-style: dark; --native-titlebar-background: #00000000; @@ -89,6 +95,7 @@ --menu-item-arrow-color: #ffffffa3; --menu-item-delimiter-color: #ffffff1c; --menu-item-group-header-color: #ffffff91; + --menu-section-background-color: #fefefe08; --modal-backdrop-color: #000; --modal-shadow-color: rgba(0, 0, 0, .5); @@ -195,6 +202,8 @@ --scrollbar-background-color: transparent; --scrollbar-border-color: unset; /* Deprecated */ + --selection-background-color: #3399FF70; + --link-color: lightskyblue; --mermaid-theme: dark; @@ -234,6 +243,11 @@ --help-code-background: #565656; --ck-editor-popup-border-color: var(--modal-border-color); + + --ck-editor-toolbar-button-on-background: #ffffff3b; + --ck-editor-toolbar-button-on-color: white; + --ck-editor-toolbar-button-on-shadow: 1px 1px 2px rgba(0, 0, 0, .75); + --ck-editor-toolbar-dropdown-button-open-background: #ffffff14; } /* @@ -244,10 +258,6 @@ body ::-webkit-calendar-picker-indicator { filter: invert(1); } -body .CodeMirror { - filter: invert(90%) hue-rotate(180deg); -} - .excalidraw.theme--dark { --theme-filter: invert(80%) hue-rotate(180deg) !important; } diff --git a/apps/client/src/stylesheets/theme-next-light.css b/apps/client/src/stylesheets/theme-next-light.css index 7793d8ece..ba994587f 100644 --- a/apps/client/src/stylesheets/theme-next-light.css +++ b/apps/client/src/stylesheets/theme-next-light.css @@ -5,6 +5,12 @@ * Color scheme */ :root { + + /* + * ⚠️ NOTICE: This theme is currently in the beta stage of development. + * The names and purposes of these CSS variables are subject to frequent changes. + */ + --theme-style: light; --native-titlebar-background: #ffffff00; @@ -83,6 +89,7 @@ --menu-item-arrow-color: #00000080; --menu-item-delimiter-color: #00000030; --menu-item-group-header-color: #00000061; + --menu-section-background-color: #00000006; --modal-backdrop-color: #7c7c7c; --modal-shadow-color: #00000033; @@ -194,6 +201,8 @@ --scrollbar-background-color: transparent; --scrollbar-border-color: unset; /* Deprecated */ + --selection-background-color: #3399FF70; + --link-color: blue; --mermaid-theme: default; @@ -234,4 +243,9 @@ --help-code-background: #d7d5d5; --ck-editor-popup-border-color: var(--dropdown-border-color); + --ck-editor-toolbar-button-on-background: #00000030; + --ck-editor-toolbar-button-on-color: black; + --ck-editor-toolbar-button-on-shadow: none; + --ck-editor-toolbar-dropdown-button-open-background: #0000000f; + } diff --git a/apps/client/src/stylesheets/theme-next/base.css b/apps/client/src/stylesheets/theme-next/base.css index e9917b142..9058328c3 100644 --- a/apps/client/src/stylesheets/theme-next/base.css +++ b/apps/client/src/stylesheets/theme-next/base.css @@ -110,7 +110,8 @@ body.mobile .dropdown-menu .dropdown-menu { border-radius: unset !important; } -body.desktop .dropdown-menu::before { +body.desktop .dropdown-menu::before, +:root .ck.ck-dropdown__panel::before { content: ""; backdrop-filter: var(--dropdown-backdrop-filter); border-radius: var(--dropdown-border-radius); diff --git a/apps/client/src/stylesheets/theme-next/forms.css b/apps/client/src/stylesheets/theme-next/forms.css index f7aa04831..446c9b89c 100644 --- a/apps/client/src/stylesheets/theme-next/forms.css +++ b/apps/client/src/stylesheets/theme-next/forms.css @@ -79,7 +79,7 @@ button.btn.btn-success kbd { */ :root .icon-action:not(.global-menu-button), -:root .tn-tool-button, +:root .btn.tn-tool-button, :root .btn-group .tn-tool-button:not(:last-child), :root .btn-group .tn-tool-button:last-child { width: var(--icon-button-size); @@ -110,7 +110,7 @@ button.btn.btn-success kbd { :root .icon-action:not(.global-menu-button)::before, :root .tn-tool-button::before { display: block; - line-height: var(--icon-button-size); + line-height: 1; font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio)); } diff --git a/apps/client/src/stylesheets/theme-next/notes/text.css b/apps/client/src/stylesheets/theme-next/notes/text.css index 22770d27a..f7b9e3f51 100644 --- a/apps/client/src/stylesheets/theme-next/notes/text.css +++ b/apps/client/src/stylesheets/theme-next/notes/text.css @@ -10,7 +10,8 @@ * Toolbar */ -.ck.ck-toolbar { +.ck.ck-toolbar, +.ck.ck-block-toolbar-button { --ck-color-toolbar-background: transparent; --ck-color-button-default-background: transparent; @@ -19,19 +20,62 @@ --ck-color-button-on-background: transparent; --ck-color-button-on-hover-background: var(--hover-item-background-color); + --ck-color-button-default-active-background: var(--hover-item-background-color); - --ck-focus-ring: 1px solid var(--input-focus-outline-color); + --ck-color-split-button-hover-background: var(--ck-editor-toolbar-dropdown-button-open-background); + + --ck-focus-ring: 1px solid transparent; --ck-color-focus-border: var(--input-focus-outline-color); --ck-focus-outer-shadow: none; + --ck-focus-disabled-outer-shadow: none; --ck-border-radius: 6px; } +/* Toolbar button in on state */ +.ck.ck-toolbar .ck-button.ck-on:not(.ck-dropdown__button):not(.ck-list-item-button):not(.ck-button_with-text) { + --ck-color-button-on-background: var(--ck-editor-toolbar-button-on-background); + --ck-color-button-on-color: var(--ck-editor-toolbar-button-on-color); + box-shadow: var(--ck-editor-toolbar-button-on-shadow); +} + +/* Toolbar button with its dropdown open */ +.ck.ck-toolbar .ck-button.ck-dropdown__button { + --ck-color-button-on-background: var(--ck-editor-toolbar-dropdown-button-open-background); + --ck-color-button-on-color: currentColor; +} + +/* The toolbar show / hide button for the current text block */ +.ck.ck-block-toolbar-button { + --ck-color-button-on-background: transparent; + --ck-color-button-on-color: currentColor; +} + +:root .ck.ck-toolbar .ck-button:not(.ck-disabled):active, +.ck.ck-block-toolbar-button:active { + background-color: var(--hover-item-background-color); +} + +.ck.ck-toolbar .ck-button:active:not(.ck-list-item-button):not(.ck-button_with-text):not(.ck-disabled) svg:not(.ck-dropdown__arrow), +.ck.ck-block-toolbar-button:active svg { + transform: scale(.8); +} + /* Disabled button */ :root .classic-toolbar-widget .ck.ck-button.ck-disabled { opacity: .75; } +/* Focus visible */ +.ck.ck-toolbar .ck-button:focus-visible { + --ck-focus-ring: 1px solid var(--input-focus-outline-color); +} + +/* Remove the border from hovered split arrow button */ +.ck.ck-splitbutton:hover > .ck-splitbutton__arrow:not(.ck-disabled)::after { + visibility: collapse; +} + /* * Dropdowns */ @@ -49,16 +93,61 @@ border: 1px solid var(--ck-editor-popup-border-color) !important; border-radius: var(--dropdown-border-radius) !important; background: var(--menu-background-color) !important; - backdrop-filter: var(--dropdown-backdrop-filter); padding: var(--ck-editor-popup-padding); } +/* + * Backdrop blur pseudo-element + * + * Since .ck-balloon-panel already uses the :after and :before pseudo-elements, there is no other + * option than using a :before on the children element to apply the backdrop blur. + * This pseudoelement will overflow and cover the entire surface of .ck-balloon-panel. +*/ + +:root .ck-balloon-panel > .ck-toolbar, +:root .ck-balloon-panel > .ck-balloon-rotator { + position: relative; +} + +:root .ck-balloon-panel > .ck-toolbar::before, +:root .ck-balloon-panel > .ck-balloon-rotator::before { + --negative-padding: calc(0px - var(--ck-editor-popup-padding)); /* Compensate the parent's padding */ + + content: ""; + position: absolute; + top: var(--negative-padding); + right: var(--negative-padding); + bottom: var(--negative-padding); + left: var(--negative-padding); + border-radius: var(--dropdown-border-radius); + backdrop-filter: var(--dropdown-backdrop-filter); + z-index: -1; +} + +:root .ck.ck-dropdown__panel { + --ck-editor-popup-padding: var(--menu-padding-size); +} + +/* Dropdown panel containing a toolbar */ +:root .ck.ck-dropdown__panel:has(>.ck-toolbar) { + --ck-editor-popup-padding: calc(var(--menu-padding-size) - var(--ck-spacing-small)); +} + +/* Bulleted / number list toolbar */ +.ck-list-styles-list { + --ck-spacing-large: var(--ck-spacing-small); +} + :root ul.ck.ck-list, :root div.ck.ck-balloon-panel:not(.ck-tooltip) { border: none; background: transparent; } +:root .ck.ck-list { + padding: 0; +} + /* Tooltip */ :root div.ck.ck-balloon-panel.ck-tooltip { --ck-color-panel-background: var(--toast-background); /* Arrow */ @@ -73,24 +162,45 @@ } /* Dropdown list item */ -:root ul.ck.ck-list button.ck-button { +:root ul.ck.ck-list button.ck-button, +:root .ck.ck-collapsible > button.ck-button { padding: 2px 16px; background: transparent; border-radius: 6px !important; box-shadow: unset; } -/* Checked list item */ -:root ul.ck.ck-list button.ck-button.ck-on:not(:hover) { - background: transparent !important; +:root .ck.ck-list__item { + min-width: 10em; } +/* Item with icon */ +:root .ck.ck-button_with-text svg:first-child { + color: var(--menu-item-icon-color); +} + +/* Checked list item */ + :root ul.ck.ck-list button.ck-button:hover, -:root ul.ck.ck-list button.ck-button.ck-on:hover { +:root ul.ck.ck-list button.ck-button.ck-on:hover, +:root .ck.ck-collapsible > button.ck-button:not(.ck-disabled):hover, +:root .ck.ck-collapsible > button.ck-button:not(.ck-disabled):not(:focus):hover { background: var(--hover-item-background-color); color: var(--hover-item-color); } +/* List item checkmark container */ + +:root .ck.ck-list-item-button .ck-list-item-button__check-holder { + margin-inline-start: var(--ck-spacing-small); + margin-inline-end: var(--menu-padding-size); +} + +:root .ck.ck-list-item-button .ck-list-item-button__check-holder svg { + transform: scale(1.2); + color: var(--menu-item-icon-color); +} + /* Separator */ :root .ck .ck-list__separator { margin: .5em 0; @@ -99,8 +209,82 @@ background: var(--menu-item-delimiter-color); } +/* Collapsible section */ + +.ck.ck-collapsible { + position: relative; + border: unset !important; + padding-top: var(--ck-editor-popup-padding); +} + +.ck.ck-collapsible::before { + /* Adds a background shade which overlaps the dropdown's padding */ + + --negative-padding: calc(0px - var(--ck-editor-popup-padding)); + + display: block; + content: ""; + position: absolute; + top: 0; + bottom: var(--negative-padding); + left: var(--negative-padding); + right: var(--negative-padding); + border-top: 1px solid var(--ck-editor-popup-border-color); + background: var(--menu-section-background-color); +} + +.ck.ck-collapsible:last-child::before { + border-radius: 0 0 var(--dropdown-border-radius) var(--dropdown-border-radius); +} + +.ck.ck-collapsible.ck-collapsible_collapsed > button.ck-button { + font-weight: normal !important; +} + +.ck.ck-collapsible .ck-collapsible__children { + padding-top: 1em; +} + +/* Toolbar separators */ + +:root .ck.ck-toolbar .ck.ck-toolbar__separator { + background: transparent; + border-left: 1px solid var(--ck-color-toolbar-border); +} + +/* The last separator of the toolbar */ +:root .classic-toolbar-widget .ck.ck-toolbar__separator:last-of-type { + flex-grow: 1; +} + +/* Heading dropdown */ + +:root .ck.ck-dropdown.ck-heading-dropdown .ck-dropdown__panel .ck-list__item { + min-width: 170px; +} + +/* Font size dropdown */ + +.ck-fontsize-option { + min-height: 2rem !important; +} + +.ck-fontsize-option.text-tiny {--size: .75em;} +.ck-fontsize-option.text-small {--size: .85em;} +.ck-fontsize-option.text-big {--size: 1.4em;} +.ck-fontsize-option.text-huge {--size: 1.8em;} + +:root .ck-fontsize-option .ck-button__label { + font-size: var(--size); +} + /* Color picker dropdown */ +/* Color palette */ +:root .ck.ck-color-selector .ck-color-grid { + --ck-editor-toolbar-button-on-shadow: none; /* Remove the shadow of the selected color button */ +} + /* Color picker button */ :root .ck.ck-color-selector .ck-color-grids-fragment .ck-button.ck-color-selector__color-picker { --ck-color-base-border: transparent; /* Remove the top border */ @@ -109,13 +293,69 @@ border-bottom-right-radius: var(--ck-border-radius); } +/* Current color checkmark */ +:root .ck.ck-color-selector .ck-color-grid .ck-icon { + color: white; +} + +:root .ck.ck-color-selector .ck-color-grid .ck-icon__fill { + fill: black !important; +} + +/* Numbered list */ + +:root .ck.ck-list-properties_with-numbered-properties .ck.ck-list-styles-list { + min-width: 200px; + grid-template-columns: repeat(3, auto); + justify-content: space-between; + padding-bottom: calc(var(--ck-spacing-medium) + var(--menu-padding-size)); +} + /* Table dropdown */ +/* Table rows / columns button grid container */ .ck-insert-table-dropdown__grid { + --ck-insert-table-dropdown-box-width: 16px; + --ck-insert-table-dropdown-box-height: 16px; + --ck-insert-table-dropdown-box-margin: 2px; --ck-color-base-border: var(--ck-color-panel-border); /* Cell box color */ --ck-color-focus-border: var(--hover-item-text-color); /* Selected cell box border color */ --ck-color-focus-outer-shadow: var(--hover-item-background-color); /* Selected cell box background color */ --ck-border-radius: 0; + --ck-editor-toolbar-button-on-shadow: 1px 1px 1px rgba(0, 0, 0, .35); +} + +/* Selected rows / column counter */ +.ck.ck-insert-table-dropdown__label { + margin-top: var(--ck-spacing-medium); +} + +/* Admonitions dropdown */ + +.ck-tn-admonition-note { --icon: "\eb21"; --accent: var(--admonition-note-accent-color);} +.ck-tn-admonition-tip { --icon: "\ea0d"; --accent: var(--admonition-tip-accent-color);} +.ck-tn-admonition-important { --icon: "\ea7c"; --accent: var(--admonition-important-accent-color);} +.ck-tn-admonition-caution { --icon: "\eac7"; --accent: var(--admonition-caution-accent-color);} +.ck-tn-admonition-warning { --icon: "\eac5"; --accent: var(--admonition-warning-accent-color);} + +:root .ck.ck-tn-admonition-option .ck-button__label { + display: inline-flex; + align-items: center; + width: 100%; + margin: 4px; + padding-right: 2em; + border: 1px solid var(--accent); + border-radius: 6px; +} + +:root .ck.ck-tn-admonition-option .ck-button__label::before { + display: inline-block; + content: var(--icon); + width: 2em; + text-align: center; + font-size: 1.4em; + font-family: boxicons; + color: var(--accent); } /* Action buttons */ @@ -133,6 +373,20 @@ background: var(--hover-item-background-color); } +/* Mention list (the autocompletion list for emojis, labels and relations) */ + +:root .ck-mentions { + --ck-color-list-button-on-background: var(--hover-item-background-color); + --ck-color-list-button-on-text: var(--hover-item-text-color); + --ck-color-list-button-hover-background: var(--ck-editor-toolbar-dropdown-button-open-background); + --ck-focus-ring: 1px solid transparent; +} + +/* "Keep on typing to see the emoji" placeholder */ +#mention-list-item-id\:__EMOJI_HINT { + background: transparent; +} + /* * EDITOR'S CONTENT */ @@ -142,19 +396,39 @@ */ .attachment-content-wrapper pre, -.ck-content pre, +:root .ck-content pre, .ck-mermaid__editing-view { border: 0; border-radius: 6px; box-shadow: var(--code-block-box-shadow); - padding: 0 !important; + padding: 0; margin-top: 2px !important; } -.ck-content pre { +:root .ck-content pre { + --icon-button-size: 1.8em; + --copy-button-width: var(--icon-button-size); + + /* The margin of the copy button is computed so the button will appear vertically centered + * for single-line code blocks */ + + --copy-button-margin-size: calc((1em * 1.5 + var(--padding-size) * 2 - var(--icon-button-size)) / 2); + + /* Where: │ └ Line height + * └───────── Font size + */ + overflow: unset; } +pre button.copy-button.icon-action { + font-size: 1em; /* Workaround: --icon-button-size does not work properly with em units */ +} + +:root pre:has(> button.copy-button) { + padding-right: calc(var(--icon-button-size) + (var(--copy-button-margin-size) * 2)); +} + html .note-detail-editable-text :not(figure, .include-note, hr):first-child { /* Create some space for the top-side shadow */ margin-top: 1px !important; @@ -170,10 +444,10 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child { } .attachment-content-wrapper pre code, -.ck-content pre code, +:root .ck-content pre code, .ck-mermaid__editing-view { display: block; - padding: 1em !important; + padding: var(--padding-size, 1em); overflow: auto; } @@ -245,7 +519,6 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child { .note-detail-printable:not(.word-wrap) pre code { white-space: pre; - margin-right: 1em; } .code-sample-wrapper .hljs { diff --git a/apps/client/src/stylesheets/theme-next/ribbon.css b/apps/client/src/stylesheets/theme-next/ribbon.css index c7765865d..e21984a76 100644 --- a/apps/client/src/stylesheets/theme-next/ribbon.css +++ b/apps/client/src/stylesheets/theme-next/ribbon.css @@ -108,6 +108,25 @@ div.editability-dropdown a.dropdown-item { font-size: 0.85em; } +/* + * Edited notes (for calendar notes) + */ + +/* The path of the note */ +.edited-notes-list small { + margin-inline-start: 4px; + font-size: inherit; + color: var(--muted-text-color); +} + +.edited-notes-list small::before { + content: "("; +} + +.edited-notes-list small::after { + content: ")"; +} + /* * Owned attributes */ diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css index 483d6910d..5b11839e5 100644 --- a/apps/client/src/stylesheets/theme-next/shell.css +++ b/apps/client/src/stylesheets/theme-next/shell.css @@ -127,10 +127,12 @@ body.layout-horizontal > .horizontal { --launcher-pane-button-gap: var(--launcher-pane-vert-button-gap); width: var(--launcher-pane-size) !important; + min-width: var(--launcher-pane-size) !important; padding-bottom: var(--launcher-pane-button-gap); } #launcher-pane.vertical #launcher-container { + width: var(--launcher-pane-size); height: 100%; overflow-x: hidden; overflow-y: auto; @@ -1400,6 +1402,7 @@ div.floating-buttons .show-floating-buttons-button:active { div.floating-buttons-children .close-floating-buttons-button::before, div.floating-buttons .show-floating-buttons-button::before { display: block; + line-height: 1; } /* "Show buttons" button */ @@ -1636,7 +1639,9 @@ div.find-replace-widget div.find-widget-found-wrapper > span { #right-pane .toc li, #right-pane .highlights-list li { - padding: 2px 8px; + padding-top: 2px; + padding-right: 8px; + padding-bottom: 2px; border-radius: 4px; text-align: unset; transition: diff --git a/apps/client/src/test/easy-froca.ts b/apps/client/src/test/easy-froca.ts index 0ccb768fd..045819ab5 100644 --- a/apps/client/src/test/easy-froca.ts +++ b/apps/client/src/test/easy-froca.ts @@ -28,7 +28,7 @@ interface NoteDefinition extends AttributeDefinitions, RelationDefinitions { * ]); */ export function buildNotes(notes: NoteDefinition[]) { - const ids = []; + const ids: string[] = []; for (const noteDef of notes) { ids.push(buildNote(noteDef).noteId); diff --git a/apps/client/src/translations/cn/translation.json b/apps/client/src/translations/cn/translation.json index da17ebc9e..fa2460f26 100644 --- a/apps/client/src/translations/cn/translation.json +++ b/apps/client/src/translations/cn/translation.json @@ -274,15 +274,15 @@ "revision_last_edited": "此修订版本上次编辑于 {{date}}", "confirm_delete_all": "您是否要删除此笔记的所有修订版本？", "no_revisions": "此笔记暂无修订版本...", - "restore_button": "", + "restore_button": "恢复", "confirm_restore": "您是否要恢复此修订版本？这将使用此修订版本覆盖笔记的当前标题和内容。", - "delete_button": "", + "delete_button": "删除", "confirm_delete": "您是否要删除此修订版本？", "revisions_deleted": "笔记修订版本已删除。", "revision_restored": "笔记修订版本已恢复。", "revision_deleted": "笔记修订版本已删除。", "snapshot_interval": "笔记快照保存间隔: {{seconds}}秒。", - "maximum_revisions": "当前笔记的最历史数量: {{number}}。", + "maximum_revisions": "当前笔记的最大历史数量: {{number}}。", "settings": "笔记修订设置", "download_button": "下载", "mime": "MIME 类型：", @@ -806,7 +806,7 @@ "open_full": "展开显示", "collapse": "折叠到正常大小", "title": "笔记地图", - "fix-nodes": "修复节点", + "fix-nodes": "固定节点", "link-distance": "链接距离" }, "note_paths": { @@ -1213,7 +1213,7 @@ "color": "字体颜色", "bg_color": "背景颜色", "visibility_title": "高亮列表可见性", - "visibility_description": "您可以通过添加 #hideHighlightWidget 标签来隐藏每个笔记的高亮小部件。", + "visibility_description": "您可以通过添加 #hideHighlightWidget 标签来隐藏单个笔记的高亮小部件。", "shortcut_info": "您可以在选项 -> 快捷键中为快速切换右侧面板（包括高亮列表）配置键盘快捷键（名称为 'toggleRightPane'）。" }, "table_of_contents": { @@ -1547,7 +1547,7 @@ "close_other_tabs": "关闭其他标签页", "close_right_tabs": "关闭右侧标签页", "close_all_tabs": "关闭所有标签页", - "reopen_last_tab": "重新打开最后一个关闭的标签页", + "reopen_last_tab": "重新打开关闭的标签页", "move_tab_to_new_window": "将此标签页移动到新窗口", "copy_tab_to_new_window": "将此标签页复制到新窗口", "new_tab": "新标签页" @@ -1616,29 +1616,32 @@ "auto-detect-language": "自动检测" }, "highlighting": { - "title": "文本笔记的代码语法高亮", + "title": "代码块", "description": "控制文本笔记中代码块的语法高亮，代码笔记不会受到影响。", "color-scheme": "颜色方案" }, "code_block": { - "word_wrapping": "自动换行" + "word_wrapping": "自动换行", + "theme_none": "无语法高亮", + "theme_group_light": "浅色主题", + "theme_group_dark": "深色主题" }, "classic_editor_toolbar": { - "title": "格式化" + "title": "格式" }, "editor": { "title": "编辑器" }, "editing": { "editor_type": { - "label": "格式化工具栏", + "label": "格式工具栏", "floating": { "title": "浮动", "description": "编辑工具出现在光标附近;" }, "fixed": { "title": "固定", - "description": "编辑工具出现在 \"格式化\" 功能区标签中。" + "description": "编辑工具出现在 \"格式\" 功能区标签中。" }, "multiline-toolbar": "如果工具栏无法完全显示，则分多行显示。" } diff --git a/apps/client/src/translations/de/translation.json b/apps/client/src/translations/de/translation.json index 108586d05..ea17f0575 100644 --- a/apps/client/src/translations/de/translation.json +++ b/apps/client/src/translations/de/translation.json @@ -1568,12 +1568,15 @@ "auto-detect-language": "Automatisch erkannt" }, "highlighting": { - "title": "Code-Syntax-Hervorhebung für Textnotizen", + "title": "", "description": "Steuert die Syntaxhervorhebung für Codeblöcke in Textnotizen, Code-Notizen sind nicht betroffen.", "color-scheme": "Farbschema" }, "code_block": { - "word_wrapping": "Wortumbruch" + "word_wrapping": "Wortumbruch", + "theme_none": "Keine Syntax-Hervorhebung", + "theme_group_light": "Helle Themen", + "theme_group_dark": "Dunkle Themen" }, "classic_editor_toolbar": { "title": "Format" diff --git a/apps/client/src/translations/en/translation.json b/apps/client/src/translations/en/translation.json index a5526659b..4d39265d1 100644 --- a/apps/client/src/translations/en/translation.json +++ b/apps/client/src/translations/en/translation.json @@ -1247,13 +1247,11 @@ "reprocessing_embeddings": "Reprocessing...", "reprocess_started": "Embedding reprocessing started in the background", "reprocess_error": "Error starting embedding reprocessing", - "reprocess_index": "Rebuild Search Index", "reprocess_index_description": "Optimize the search index for better performance. This uses existing embeddings without regenerating them (much faster than reprocessing all embeddings).", "reprocessing_index": "Rebuilding...", "reprocess_index_started": "Search index optimization started in the background", "reprocess_index_error": "Error rebuilding search index", - "index_rebuild_progress": "Index Rebuild Progress", "index_rebuilding": "Optimizing index ({{percentage}}%)", "index_rebuild_complete": "Index optimization complete", @@ -1781,7 +1779,9 @@ }, "clipboard": { "cut": "Note(s) have been cut into clipboard.", - "copied": "Note(s) have been copied into clipboard." + "copied": "Note(s) have been copied into clipboard.", + "copy_failed": "Cannot copy to clipboard due to permission issues.", + "copy_success": "Copied to clipboard." }, "entrypoints": { "note-revision-created": "Note revision has been created.", @@ -1824,12 +1824,16 @@ "auto-detect-language": "Auto-detected" }, "highlighting": { - "title": "Code Syntax Highlighting for Text Notes", + "title": "Code Blocks", "description": "Controls the syntax highlighting for code blocks inside text notes, code notes will not be affected.", "color-scheme": "Color Scheme" }, "code_block": { - "word_wrapping": "Word wrapping" + "word_wrapping": "Word wrapping", + "theme_none": "No syntax highlighting", + "theme_group_light": "Light themes", + "theme_group_dark": "Dark themes", + "copy_title": "Copy to clipboard" }, "classic_editor_toolbar": { "title": "Formatting" @@ -1953,5 +1957,10 @@ }, "svg": { "export_to_png": "The diagram could not be exported to PNG." + }, + "code_theme": { + "title": "Appearance", + "word_wrapping": "Word wrapping", + "color-scheme": "Color scheme" } } diff --git a/apps/client/src/translations/es/translation.json b/apps/client/src/translations/es/translation.json index 172ca8ea0..64951c3a6 100644 --- a/apps/client/src/translations/es/translation.json +++ b/apps/client/src/translations/es/translation.json @@ -1584,12 +1584,15 @@ "auto-detect-language": "Detectado automáticamente" }, "highlighting": { - "title": "Resaltado de sintaxis de de código para Notas de Texto", + "title": "", "description": "Controla el resaltado de sintaxis para bloques de código dentro de las notas de texto, las notas de código no serán afectadas.", "color-scheme": "Esquema de color" }, "code_block": { - "word_wrapping": "Ajuste de palabras" + "word_wrapping": "Ajuste de palabras", + "theme_none": "Sin resaltado de sintaxis", + "theme_group_light": "Temas claros", + "theme_group_dark": "Temas oscuros" }, "classic_editor_toolbar": { "title": "Formato" diff --git a/apps/client/src/translations/fr/translation.json b/apps/client/src/translations/fr/translation.json index 91758b8d6..74335e936 100644 --- a/apps/client/src/translations/fr/translation.json +++ b/apps/client/src/translations/fr/translation.json @@ -1574,12 +1574,15 @@ "auto-detect-language": "Détecté automatiquement" }, "highlighting": { - "title": "Coloration syntaxique du code pour les notes texte", + "title": "", "description": "Contrôle la coloration syntaxique des blocs de code à l'intérieur des notes texte, les notes de code ne seront pas affectées.", "color-scheme": "Jeu de couleurs" }, "code_block": { - "word_wrapping": "Saut à la ligne automatique suivant la largeur" + "word_wrapping": "Saut à la ligne automatique suivant la largeur", + "theme_none": "Pas de coloration syntaxique", + "theme_group_light": "Thèmes clairs", + "theme_group_dark": "Thèmes sombres" }, "classic_editor_toolbar": { "title": "Mise en forme" diff --git a/apps/client/src/translations/pt_br/translation.json b/apps/client/src/translations/pt_br/translation.json index a79d14844..8410e64db 100644 --- a/apps/client/src/translations/pt_br/translation.json +++ b/apps/client/src/translations/pt_br/translation.json @@ -1,5 +1,10 @@ { "revisions": { "delete_button": "" + }, + "code_block": { + "theme_none": "Sem destaque de sintaxe", + "theme_group_light": "Temas claros", + "theme_group_dark": "Temas escuros" } } diff --git a/apps/client/src/translations/ro/translation.json b/apps/client/src/translations/ro/translation.json index 6e371c28a..25b073e9e 100644 --- a/apps/client/src/translations/ro/translation.json +++ b/apps/client/src/translations/ro/translation.json @@ -1581,11 +1581,14 @@ }, "highlighting": { "color-scheme": "Temă de culori", - "title": "Evidențiere de sintaxă pentru notițele de tip text", + "title": "", "description": "Controlează evidențierea de sintaxă pentru blocurile de cod în interiorul notițelor text, notițele de tip cod nu vor fi afectate de aceste setări." }, "code_block": { - "word_wrapping": "Încadrare text" + "word_wrapping": "Încadrare text", + "theme_none": "Fără evidențiere de sintaxă", + "theme_group_dark": "Teme întunecate", + "theme_group_light": "Teme luminoase" }, "classic_editor_toolbar": { "title": "Formatare" diff --git a/apps/client/src/translations/tw/translation.json b/apps/client/src/translations/tw/translation.json index 2d2e256ad..c25504510 100644 --- a/apps/client/src/translations/tw/translation.json +++ b/apps/client/src/translations/tw/translation.json @@ -1514,12 +1514,15 @@ "auto-detect-language": "自動檢測" }, "highlighting": { - "title": "文字筆記的程式碼語法高亮", + "title": "", "description": "控制文字筆記中程式碼塊的語法高亮，程式碼筆記不會受到影響。", "color-scheme": "顏色方案" }, "code_block": { - "word_wrapping": "自動換行" + "word_wrapping": "自動換行", + "theme_none": "無格式高亮", + "theme_group_light": "淺色主題", + "theme_group_dark": "深色主題" }, "classic_editor_toolbar": { "title": "格式化" diff --git a/apps/client/src/types-assets.d.ts b/apps/client/src/types-assets.d.ts index 61242b04e..ffe5456fd 100644 --- a/apps/client/src/types-assets.d.ts +++ b/apps/client/src/types-assets.d.ts @@ -3,9 +3,7 @@ declare module "*.png" { export default path; } -declare module "*.json?external" { +declare module "@triliumnext/ckeditor5/emoji_definitions/en.json?url" { var path: string; export default path; } - -declare module "script-loader!mark.js/dist/jquery.mark.min.js"; diff --git a/apps/client/src/types-lib.d.ts b/apps/client/src/types-lib.d.ts index 57b810f76..0c4474e94 100644 --- a/apps/client/src/types-lib.d.ts +++ b/apps/client/src/types-lib.d.ts @@ -24,3 +24,30 @@ declare module "draggabilly" { declare module "@mind-elixir/node-menu" { export default mindmap; } + +declare module "katex/contrib/auto-render" { + var renderMathInElement: (element: HTMLElement, options: { + trust: boolean; + }) => void; + export default renderMathInElement; +} + +import * as L from "leaflet"; + +declare module "leaflet" { + interface GPXMarker { + startIcon?: DivIcon | Icon | string | undefined; + endIcon?: DivIcon | Icon | string | undefined; + wptIcons?: { + [key: string]: DivIcon | Icon | string; + }; + wptTypeIcons?: { + [key: string]: DivIcon | Icon | string; + }; + pointMatchers?: Array<{ regex: RegExp; icon: DivIcon | Icon | string}>; + } + + interface GPXOptions { + markers?: GPXMarker | undefined; + } +} diff --git a/apps/client/src/types.d.ts b/apps/client/src/types.d.ts index 0a466825a..113b94d76 100644 --- a/apps/client/src/types.d.ts +++ b/apps/client/src/types.d.ts @@ -22,7 +22,6 @@ interface CustomGlobals { getReferenceLinkTitle: (href: string) => Promise; getReferenceLinkTitleSync: (href: string) => string; getActiveContextNote: () => FNote | null; - requireLibrary: typeof library_loader.requireLibrary; ESLINT: Library; appContext: AppContext; froca: Froca; @@ -94,16 +93,6 @@ declare global { getSelectedExternalLink(): string | undefined; setSelectedExternalLink(externalLink: string | null | undefined); setNote(noteId: string); - markRegExp(regex: RegExp, opts: { - element: string; - className: string; - separateWordSearch: boolean; - caseSensitive: boolean; - done?: () => void; - }); - unmark(opts?: { - done: () => void; - }); } interface JQueryStatic { @@ -123,92 +112,6 @@ declare global { var require: RequireMethod; var __non_webpack_require__: RequireMethod | undefined; - // Libraries - // TODO: Replace once library loader is replaced with webpack. - var hljs: { - highlightAuto(text: string); - highlight(text: string, { - language: string - }); - }; - var renderMathInElement: (element: HTMLElement, options: { - trust: boolean; - }) => void; - - interface CodeMirrorOpts { - value: string; - viewportMargin: number; - indentUnit: number; - matchBrackets: boolean; - matchTags: { bothTags: boolean }; - highlightSelectionMatches: { - showToken: boolean; - annotateScrollbar: boolean; - }; - lineNumbers: boolean; - lineWrapping: boolean; - keyMap?: "vim" | "default"; - lint?: boolean; - gutters?: string[]; - tabindex?: number; - dragDrop?: boolean; - placeholder?: string; - readOnly?: boolean; - } - - var CodeMirror: { - (el: HTMLElement, opts: CodeMirrorOpts): CodeMirrorInstance; - keyMap: { - default: Record; - }; - modeURL: string; - modeInfo: ModeInfo[]; - findModeByMIME(mime: string): ModeInfo; - autoLoadMode(instance: CodeMirrorInstance, mode: string) - registerHelper(type: string, filter: string | null, callback: (text: string, options: object) => unknown); - Pos(line: number, col: number); - } - - interface ModeInfo { - name: string; - mode: string; - mime: string; - mimes: string[]; - } - - interface CodeMirrorInstance { - getValue(): string; - setValue(val: string); - clearHistory(); - setOption(name: string, value: string); - refresh(); - focus(); - getCursor(): { line: number, col: number, ch: number }; - setCursor(line: number, col: number); - getSelection(): string; - lineCount(): number; - on(event: string, callback: () => void); - operation(callback: () => void); - scrollIntoView(pos: number); - doc: { - getValue(): string; - markText( - from: { line: number, ch: number } | number, - to: { line: number, ch: number } | number, - opts: { - className: string - }); - setSelection(from: number, to: number); - replaceRange(text: string, from: number, to: number); - } - } - - var katex: { - renderToString(text: string, opts: { - throwOnError: boolean - }); - } - /* * Panzoom */ diff --git a/apps/client/src/widgets/attribute_widgets/attribute_detail.ts b/apps/client/src/widgets/attribute_widgets/attribute_detail.ts index 94d2bfa29..08bb764fc 100644 --- a/apps/client/src/widgets/attribute_widgets/attribute_detail.ts +++ b/apps/client/src/widgets/attribute_widgets/attribute_detail.ts @@ -718,7 +718,7 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget { } buildDefinitionValue() { - const props = []; + const props: string[] = []; if (this.$inputPromoted.is(":checked")) { props.push("promoted"); @@ -728,10 +728,10 @@ export default class AttributeDetailWidget extends NoteContextAwareWidget { } } - props.push(this.$inputMultiplicity.val()); + props.push(this.$inputMultiplicity.val() as string); if (this.attrType === "label-definition") { - props.push(this.$inputLabelType.val()); + props.push(this.$inputLabelType.val() as string); if (this.$inputLabelType.val() === "number" && this.$inputNumberPrecision.val() !== "") { props.push(`precision=${this.$inputNumberPrecision.val()}`); diff --git a/apps/client/src/widgets/attribute_widgets/attribute_editor.ts b/apps/client/src/widgets/attribute_widgets/attribute_editor.ts index 1f3da0096..132632ceb 100644 --- a/apps/client/src/widgets/attribute_widgets/attribute_editor.ts +++ b/apps/client/src/widgets/attribute_widgets/attribute_editor.ts @@ -198,6 +198,8 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget implem ], selectMenuItemHandler: ({ command }) => this.handleAddNewAttributeCommand(command) }); + // Prevent automatic hiding of the context menu due to the button being clicked. + e.stopPropagation(); } // triggered from keyboard shortcut diff --git a/apps/client/src/widgets/buttons/create_ai_chat_button.ts b/apps/client/src/widgets/buttons/create_ai_chat_button.ts deleted file mode 100644 index 1ccd52cda..000000000 --- a/apps/client/src/widgets/buttons/create_ai_chat_button.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { t } from "../../services/i18n.js"; -import options from "../../services/options.js"; -import CommandButtonWidget from "./command_button.js"; - -export default class CreateAiChatButton extends CommandButtonWidget { - constructor() { - super(); - - this.icon("bx bx-bot") - .title(t("ai.create_new_ai_chat")) - .titlePlacement("bottom") - .command("createAiChat") - .class("icon-action"); - } - - isEnabled() { - return options.get("aiEnabled") === "true"; - } - - async refreshWithNote() { - if (this.isEnabled()) { - this.$widget.show(); - } else { - this.$widget.hide(); - } - } -} diff --git a/apps/client/src/widgets/buttons/create_pane_button.ts b/apps/client/src/widgets/buttons/create_pane_button.ts index 04231d8d4..8a636df05 100644 --- a/apps/client/src/widgets/buttons/create_pane_button.ts +++ b/apps/client/src/widgets/buttons/create_pane_button.ts @@ -8,7 +8,10 @@ export default class CreatePaneButton extends OnClickButtonWidget { this.icon("bx-dock-right") .title(t("create_pane_button.create_new_split")) .titlePlacement("bottom") - .onClick((widget) => widget.triggerCommand("openNewNoteSplit", { ntxId: widget.getClosestNtxId() })) + .onClick((widget, e) => { + widget.triggerCommand("openNewNoteSplit", { ntxId: widget.getClosestNtxId() }); + e.stopPropagation(); + }) .class("icon-action"); } } diff --git a/apps/client/src/widgets/buttons/global_menu.ts b/apps/client/src/widgets/buttons/global_menu.ts index d21e43b0d..47323e271 100644 --- a/apps/client/src/widgets/buttons/global_menu.ts +++ b/apps/client/src/widgets/buttons/global_menu.ts @@ -53,10 +53,6 @@ const TPL = /*html*/` pointer-events: none; } - .update-to-latest-version-button { - display: none; - } - .global-menu .zoom-container { display: flex; flex-direction: row; @@ -235,7 +231,7 @@ const TPL = /*html*/` ${t("global_menu.about")} - + diff --git a/apps/client/src/widgets/buttons/left_pane_toggle.ts b/apps/client/src/widgets/buttons/left_pane_toggle.ts index 88528add5..22a902622 100644 --- a/apps/client/src/widgets/buttons/left_pane_toggle.ts +++ b/apps/client/src/widgets/buttons/left_pane_toggle.ts @@ -19,10 +19,10 @@ export default class LeftPaneToggleWidget extends CommandButtonWidget { return "bx-sidebar"; } - return options.is("leftPaneVisible") ? "bx-chevrons-left" : "bx-chevrons-right"; + return this.currentLeftPaneVisible ? "bx-chevrons-left" : "bx-chevrons-right"; }; - this.settings.title = () => (options.is("leftPaneVisible") ? t("left_pane_toggle.hide_panel") : t("left_pane_toggle.show_panel")); + this.settings.title = () => (this.currentLeftPaneVisible ? t("left_pane_toggle.hide_panel") : t("left_pane_toggle.show_panel")); this.settings.command = () => (this.currentLeftPaneVisible ? "hideLeftPane" : "showLeftPane"); @@ -32,16 +32,12 @@ export default class LeftPaneToggleWidget extends CommandButtonWidget { } refreshIcon() { - if (document.hasFocus() || this.currentLeftPaneVisible === true) { - super.refreshIcon(); - splitService.setupLeftPaneResizer(this.currentLeftPaneVisible); - } + super.refreshIcon(); + splitService.setupLeftPaneResizer(this.currentLeftPaneVisible); } - - entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) { - if (loadResults.isOptionReloaded("leftPaneVisible") && document.hasFocus()) { - this.currentLeftPaneVisible = options.is("leftPaneVisible"); - this.refreshIcon(); - } + + setLeftPaneVisibilityEvent({ leftPaneVisible }: EventData<"setLeftPaneVisibility">) { + this.currentLeftPaneVisible = leftPaneVisible ?? !this.currentLeftPaneVisible; + this.refreshIcon(); } } diff --git a/apps/client/src/widgets/buttons/note_actions.ts b/apps/client/src/widgets/buttons/note_actions.ts index 020da9318..6989d8152 100644 --- a/apps/client/src/widgets/buttons/note_actions.ts +++ b/apps/client/src/widgets/buttons/note_actions.ts @@ -186,7 +186,7 @@ export default class NoteActionsWidget extends NoteContextAwareWidget { this.$convertNoteIntoAttachmentButton.toggle(note.isEligibleForConversionToAttachment()); - this.toggleDisabled(this.$findInTextButton, ["text", "code", "book"].includes(note.type)); + this.toggleDisabled(this.$findInTextButton, ["text", "code", "book", "mindMap"].includes(note.type)); this.toggleDisabled(this.$showAttachmentsButton, !isInOptions); this.toggleDisabled(this.$showSourceButton, ["text", "code", "relationMap", "mermaid", "canvas", "mindMap", "geoMap"].includes(note.type)); diff --git a/apps/client/src/widgets/containers/launcher_container.ts b/apps/client/src/widgets/containers/launcher_container.ts index 5a814d1fa..f684d4e6b 100644 --- a/apps/client/src/widgets/containers/launcher_container.ts +++ b/apps/client/src/widgets/containers/launcher_container.ts @@ -29,7 +29,7 @@ export default class LauncherContainer extends FlexContainer { return; } - const newChildren = []; + const newChildren: LauncherWidget[] = []; for (const launcherNote of await visibleLaunchersRoot.getChildNotes()) { try { diff --git a/apps/client/src/widgets/containers/left_pane_container.ts b/apps/client/src/widgets/containers/left_pane_container.ts index 2b8221553..d95f5091a 100644 --- a/apps/client/src/widgets/containers/left_pane_container.ts +++ b/apps/client/src/widgets/containers/left_pane_container.ts @@ -4,28 +4,33 @@ import appContext, { type EventData } from "../../components/app_context.js"; import type Component from "../../components/component.js"; export default class LeftPaneContainer extends FlexContainer { + private currentLeftPaneVisible: boolean; + constructor() { super("column"); + this.currentLeftPaneVisible = options.is("leftPaneVisible"); + this.id("left-pane"); this.css("height", "100%"); this.collapsible(); } isEnabled() { - return super.isEnabled() && options.is("leftPaneVisible"); + return super.isEnabled() && this.currentLeftPaneVisible; } - entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) { - if (loadResults.isOptionReloaded("leftPaneVisible") && document.hasFocus()) { - const visible = this.isEnabled(); - this.toggleInt(visible); + setLeftPaneVisibilityEvent({ leftPaneVisible }: EventData<"setLeftPaneVisibility">) { + this.currentLeftPaneVisible = leftPaneVisible ?? !this.currentLeftPaneVisible; + const visible = this.isEnabled(); + this.toggleInt(visible); - if (visible) { - this.triggerEvent("focusTree", {}); - } else { - this.triggerEvent("focusOnDetail", { ntxId: appContext.tabManager.getActiveContext()?.ntxId }); - } + if (visible) { + this.triggerEvent("focusTree", {}); + } else { + this.triggerEvent("focusOnDetail", { ntxId: appContext.tabManager.getActiveContext()?.ntxId }); } + + options.save("leftPaneVisible", this.currentLeftPaneVisible.toString()); } } diff --git a/apps/client/src/widgets/containers/split_note_container.ts b/apps/client/src/widgets/containers/split_note_container.ts index 9bd5c04b5..99165437c 100644 --- a/apps/client/src/widgets/containers/split_note_container.ts +++ b/apps/client/src/widgets/containers/split_note_container.ts @@ -217,7 +217,7 @@ export default class SplitNoteContainer extends FlexContainer { } refreshNotShown(data: NoteSwitchedContext | EventData<"activeContextChanged">) { - const promises = []; + const promises: (Promise | null | undefined)[] = []; for (const subContext of data.noteContext.getMainContext().getSubContexts()) { if (!subContext.ntxId) { diff --git a/apps/client/src/widgets/dialogs/note_type_chooser.ts b/apps/client/src/widgets/dialogs/note_type_chooser.ts index 5e9b7bdf1..927e2f174 100644 --- a/apps/client/src/widgets/dialogs/note_type_chooser.ts +++ b/apps/client/src/widgets/dialogs/note_type_chooser.ts @@ -110,6 +110,8 @@ export default class NoteTypeChooserDialog extends BasicWidget { //@ts-ignore if (e.clickEvent) { e.preventDefault(); + } else { + this.modal.hide(); } }); } diff --git a/apps/client/src/widgets/dialogs/revisions.ts b/apps/client/src/widgets/dialogs/revisions.ts index c97864e22..8083dd935 100644 --- a/apps/client/src/widgets/dialogs/revisions.ts +++ b/apps/client/src/widgets/dialogs/revisions.ts @@ -3,7 +3,6 @@ import utils from "../../services/utils.js"; import server from "../../services/server.js"; import toastService from "../../services/toast.js"; import appContext from "../../components/app_context.js"; -import libraryLoader from "../../services/library_loader.js"; import openService from "../../services/open.js"; import protectedSessionHolder from "../../services/protected_session_holder.js"; import BasicWidget from "../basic_widget.js"; @@ -12,6 +11,7 @@ import options from "../../services/options.js"; import type FNote from "../../entities/fnote.js"; import type { NoteType } from "../../entities/fnote.js"; import { Dropdown, Modal } from "bootstrap"; +import { renderMathInElement } from "../../services/math.js"; const TPL = /*html*/` @@ -315,8 +315,6 @@ export default class RevisionsDialog extends BasicWidget { this.$content.html(`${fullRevision.content}`); if (this.$content.find("span.math-tex").length > 0) { - await libraryLoader.requireLibrary(libraryLoader.KATEX); - renderMathInElement(this.$content[0], { trust: true }); } } else if (revisionItem.type === "code") { diff --git a/apps/client/src/widgets/find.ts b/apps/client/src/widgets/find.ts index 8db84e448..c5b3470b2 100644 --- a/apps/client/src/widgets/find.ts +++ b/apps/client/src/widgets/find.ts @@ -188,7 +188,7 @@ export default class FindWidget extends NoteContextAwareWidget { return; } - if (!["text", "code", "render"].includes(this.note?.type ?? "")) { + if (!["text", "code", "render", "mindMap"].includes(this.note?.type ?? "")) { return; } @@ -198,13 +198,8 @@ export default class FindWidget extends NoteContextAwareWidget { let selectedText = ""; if (this.note?.type === "code" && this.noteContext) { - if (isReadOnly){ - const $content = await this.noteContext.getContentElement(); - selectedText = $content.find('.cm-matchhighlight').first().text(); - } else { - const codeEditor = await this.noteContext.getCodeEditor(); - selectedText = codeEditor.getSelection(); - } + const codeEditor = await this.noteContext.getCodeEditor(); + selectedText = codeEditor.getSelectedText(); } else { selectedText = window.getSelection()?.toString() || ""; } @@ -247,16 +242,18 @@ export default class FindWidget extends NoteContextAwareWidget { } async getHandler() { - if (this.note?.type === "render") { - return this.htmlHandler; - } - - const readOnly = await this.noteContext?.isReadOnly(); - - if (readOnly) { - return this.htmlHandler; - } else { - return this.note?.type === "code" ? this.codeHandler : this.textHandler; + switch (this.note?.type) { + case "render": + return this.htmlHandler; + case "code": + return this.codeHandler; + case "text": + const readOnly = await this.noteContext?.isReadOnly(); + return readOnly ? this.htmlHandler : this.textHandler; + case "mindMap": + return this.htmlHandler; + default: + console.warn("FindWidget: Unsupported note type for find widget", this.note?.type); } } @@ -357,7 +354,7 @@ export default class FindWidget extends NoteContextAwareWidget { } isEnabled() { - return super.isEnabled() && ["text", "code", "render"].includes(this.note?.type ?? ""); + return super.isEnabled() && ["text", "code", "render", "mindMap"].includes(this.note?.type ?? ""); } async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) { diff --git a/apps/client/src/widgets/find_in_code.ts b/apps/client/src/widgets/find_in_code.ts index 63081bb0b..5dc8536ba 100644 --- a/apps/client/src/widgets/find_in_code.ts +++ b/apps/client/src/widgets/find_in_code.ts @@ -17,10 +17,16 @@ interface Match { }; } +interface SearchParameters { + searchTerm: string; + matchCase: boolean; + wholeWord: boolean; +} + export default class FindInCode { private parent: FindWidget; - private findResult?: Match[] | null; + private searchParameters: SearchParameters | null = null; constructor(parent: FindWidget) { this.parent = parent; @@ -31,217 +37,54 @@ export default class FindInCode { } async performFind(searchTerm: string, matchCase: boolean, wholeWord: boolean) { - let findResult: Match[] | null = null; - let totalFound = 0; - let currentFound = -1; - - // See https://codemirror.net/addon/search/searchcursor.js for tips const codeEditor = await this.getCodeEditor(); if (!codeEditor) { return { totalFound: 0, currentFound: 0 }; } - const doc = codeEditor.doc; - const text = doc.getValue(); - - // Clear all markers - if (this.findResult) { - codeEditor.operation(() => { - const findResult = this.findResult as Match[]; - for (let i = 0; i < findResult.length; ++i) { - const marker = findResult[i]; - marker.clear(); - } - }); - } - - if (searchTerm !== "") { - searchTerm = utils.escapeRegExp(searchTerm); - - // Find and highlight matches - // Find and highlight matches - // XXX Using \\b and not using the unicode flag probably doesn't - // work with non-ASCII alphabets, findAndReplace uses a more - // complicated regexp, see - // https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/utils.js#L145 - const wholeWordChar = wholeWord ? "\\b" : ""; - const re = new RegExp(wholeWordChar + searchTerm + wholeWordChar, "g" + (matchCase ? "" : "i")); - let curLine = 0; - let curChar = 0; - let curMatch: RegExpExecArray | null = null; - findResult = []; - // All those markText take several seconds on e.g., this ~500-line - // script, batch them inside an operation, so they become - // unnoticeable. Alternatively, an overlay could be used, see - // https://codemirror.net/addon/search/match-highlighter.js ? - codeEditor.operation(() => { - for (let i = 0; i < text.length; ++i) { - // Fetch the next match if it's the first time or if past the current match start - if (curMatch == null || curMatch.index < i) { - curMatch = re.exec(text); - if (curMatch == null) { - // No more matches - break; - } - } - // Create a non-selected highlight marker for the match, the - // selected marker highlight will be done later - if (i === curMatch.index) { - let fromPos = { line: curLine, ch: curChar }; - // If multiline is supported, this needs to recalculate curLine since the match may span lines - let toPos = { line: curLine, ch: curChar + curMatch[0].length }; - // or css = "color: #f3" - let marker = doc.markText(fromPos, toPos, { className: FIND_RESULT_CSS_CLASSNAME }); - findResult?.push(marker); - - // Set the first match beyond the cursor as the current match - if (currentFound === -1) { - const cursorPos = codeEditor.getCursor(); - if (fromPos.line > cursorPos.line || (fromPos.line === cursorPos.line && fromPos.ch >= cursorPos.ch)) { - currentFound = totalFound; - } - } - - totalFound++; - } - // Do line and char position tracking - if (text[i] === "\n") { - curLine++; - curChar = 0; - } else { - curChar++; - } - } - }); - } - - this.findResult = findResult; - - // Calculate curfound if not already, highlight it as selected - if (findResult && totalFound > 0) { - currentFound = Math.max(0, currentFound); - let marker = findResult[currentFound]; - let pos = marker.find(); - codeEditor.scrollIntoView(pos.to); - marker.clear(); - findResult[currentFound] = doc.markText(pos.from, pos.to, { className: FIND_RESULT_SELECTED_CSS_CLASSNAME }); - } - - return { - totalFound, - currentFound: Math.min(currentFound + 1, totalFound) + this.searchParameters = { + searchTerm, + matchCase, + wholeWord, }; + const { totalFound, currentFound } = await codeEditor.performFind(searchTerm, matchCase, wholeWord); + return { totalFound, currentFound }; } async findNext(direction: number, currentFound: number, nextFound: number) { const codeEditor = await this.getCodeEditor(); - if (!codeEditor || !this.findResult) { + if (!codeEditor) { return; } - const doc = codeEditor.doc; - - // - // Dehighlight current, highlight & scrollIntoView next - // - - let marker = this.findResult[currentFound]; - let pos = marker.find(); - marker.clear(); - marker = doc.markText(pos.from, pos.to, { className: FIND_RESULT_CSS_CLASSNAME }); - this.findResult[currentFound] = marker; - - marker = this.findResult[nextFound]; - pos = marker.find(); - marker.clear(); - marker = doc.markText(pos.from, pos.to, { className: FIND_RESULT_SELECTED_CSS_CLASSNAME }); - this.findResult[nextFound] = marker; - - codeEditor.scrollIntoView(pos.from); + codeEditor.findNext(direction, currentFound, nextFound); } async findBoxClosed(totalFound: number, currentFound: number) { const codeEditor = await this.getCodeEditor(); - - if (codeEditor && totalFound > 0) { - const doc = codeEditor.doc; - const pos = this.findResult?.[currentFound].find(); - // Note setting the selection sets the cursor to - // the end of the selection and scrolls it into - // view - if (pos) { - doc.setSelection(pos.from, pos.to); - } - // Clear all markers - codeEditor.operation(() => { - if (!this.findResult) { - return; - } - for (let i = 0; i < this.findResult.length; ++i) { - let marker = this.findResult[i]; - marker.clear(); - } - }); - } - this.findResult = null; - + codeEditor?.cleanSearch(); codeEditor?.focus(); } + async replace(replaceText: string) { - // this.findResult may be undefined and null - if (!this.findResult || this.findResult.length === 0) { - return; - } - let currentFound = -1; - this.findResult.forEach((marker, index) => { - const pos = marker.find(); - if (pos) { - if (marker.className === FIND_RESULT_SELECTED_CSS_CLASSNAME) { - currentFound = index; - return; - } - } - }); - if (currentFound >= 0) { - let marker = this.findResult[currentFound]; - let pos = marker.find(); - const codeEditor = await this.getCodeEditor(); - const doc = codeEditor?.doc; - if (doc) { - doc.replaceRange(replaceText, pos.from, pos.to); - } - marker.clear(); - - let nextFound; - if (currentFound === this.findResult.length - 1) { - nextFound = 0; - } else { - nextFound = currentFound; - } - this.findResult.splice(currentFound, 1); - if (this.findResult.length > 0) { - this.findNext(0, nextFound, nextFound); - } - } - } - async replaceAll(replaceText: string) { - if (!this.findResult || this.findResult.length === 0) { - return; - } const codeEditor = await this.getCodeEditor(); - const doc = codeEditor?.doc; - codeEditor?.operation(() => { - if (!this.findResult) { - return; - } - - for (let currentFound = 0; currentFound < this.findResult.length; currentFound++) { - let marker = this.findResult[currentFound]; - let pos = marker.find(); - doc?.replaceRange(replaceText, pos.from, pos.to); - marker.clear(); - } - }); - this.findResult = []; + await codeEditor?.replace(replaceText); + this.rerunSearch(); } + + async replaceAll(replaceText: string) { + const codeEditor = await this.getCodeEditor(); + await codeEditor?.replaceAll(replaceText); + this.rerunSearch(); + } + + private rerunSearch() { + if (this.searchParameters) { + this.performFind( + this.searchParameters.searchTerm, + this.searchParameters.matchCase, + this.searchParameters.wholeWord); + } + } + } diff --git a/apps/client/src/widgets/find_in_html.ts b/apps/client/src/widgets/find_in_html.ts index e4d47e623..0bf2bd376 100644 --- a/apps/client/src/widgets/find_in_html.ts +++ b/apps/client/src/widgets/find_in_html.ts @@ -1,6 +1,7 @@ // ck-find-result and ck-find-result_selected are the styles ck-editor // uses for highlighting matches, use the same one on CodeMirror // for consistency +import type Mark from "mark.js"; import utils from "../services/utils.js"; import type FindWidget from "./find.js"; import type { FindResult } from "./find.js"; @@ -13,6 +14,7 @@ export default class FindInHtml { private parent: FindWidget; private currentIndex: number; private $results: JQuery | null; + private mark?: Mark; constructor(parent: FindWidget) { this.parent = parent; @@ -21,28 +23,31 @@ export default class FindInHtml { } async performFind(searchTerm: string, matchCase: boolean, wholeWord: boolean) { - await import("script-loader!mark.js/dist/jquery.mark.min.js"); - const $content = await this.parent?.noteContext?.getContentElement(); + if (!$content || !$content.length) { + return Promise.resolve({ totalFound: 0, currentFound: 0 }); + } + + if (!this.mark) { + this.mark = new (await import("mark.js")).default($content[0]); + } const wholeWordChar = wholeWord ? "\\b" : ""; const regExp = new RegExp(wholeWordChar + utils.escapeRegExp(searchTerm) + wholeWordChar, matchCase ? "g" : "gi"); return new Promise((res) => { - $content?.unmark({ + this.mark!.unmark({ done: () => { - $content.markRegExp(regExp, { + this.mark!.markRegExp(regExp, { element: "span", className: FIND_RESULT_CSS_CLASSNAME, - separateWordSearch: false, - caseSensitive: matchCase, done: async () => { this.$results = $content.find(`.${FIND_RESULT_CSS_CLASSNAME}`); const scrollingContainer = $content[0].closest('.scrolling-container'); const containerTop = scrollingContainer?.getBoundingClientRect().top ?? 0; const closestIndex = this.$results.toArray().findIndex(el => el.getBoundingClientRect().top >= containerTop); this.currentIndex = closestIndex >= 0 ? closestIndex : 0; - + await this.jumpTo(); res({ @@ -73,17 +78,14 @@ export default class FindInHtml { } async findBoxClosed(totalFound: number, currentFound: number) { - const $content = await this.parent?.noteContext?.getContentElement(); - if (typeof $content?.unmark === 'function') { - $content.unmark(); - } + this.mark?.unmark(); } async jumpTo() { if (this.$results?.length) { const $current = this.$results.eq(this.currentIndex); this.$results.removeClass(FIND_RESULT_SELECTED_CSS_CLASSNAME); - $current[0].scrollIntoView(); + $current[0].scrollIntoView({ block: 'center', inline: 'center'}); $current.addClass(FIND_RESULT_SELECTED_CSS_CLASSNAME); } } diff --git a/apps/client/src/widgets/find_in_text.ts b/apps/client/src/widgets/find_in_text.ts index 959fcdf34..e97a7a8df 100644 --- a/apps/client/src/widgets/find_in_text.ts +++ b/apps/client/src/widgets/find_in_text.ts @@ -2,16 +2,6 @@ import type { FindAndReplaceState, FindCommandResult } from "@triliumnext/ckedit import type { FindResult } from "./find.js"; import type FindWidget from "./find.js"; -// TODO: Deduplicate. -interface Match { - className: string; - clear(): void; - find(): { - from: number; - to: number; - }; -} - export default class FindInText { private parent: FindWidget; @@ -35,7 +25,7 @@ export default class FindInText { } const model = textEditor.model; - let findResult = null; + let findResult: FindCommandResult | null = null; let totalFound = 0; let currentFound = -1; diff --git a/apps/client/src/widgets/floating_buttons/edit_button.ts b/apps/client/src/widgets/floating_buttons/edit_button.ts index 2a11f0d01..344447f31 100644 --- a/apps/client/src/widgets/floating_buttons/edit_button.ts +++ b/apps/client/src/widgets/floating_buttons/edit_button.ts @@ -6,6 +6,7 @@ import { t } from "../../services/i18n.js"; import LoadResults from "../../services/load_results.js"; import type { AttributeRow } from "../../services/load_results.js"; import FNote from "../../entities/fnote.js"; +import options from "../../services/options.js"; export default class EditButton extends OnClickButtonWidget { isEnabled(): boolean { @@ -27,6 +28,10 @@ export default class EditButton extends OnClickButtonWidget { } async refreshWithNote(note: FNote): Promise { + if (options.is("databaseReadonly")) { + this.toggleInt(false); + return; + } if (note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable()) { this.toggleInt(false); } else { diff --git a/apps/client/src/widgets/highlights_list.ts b/apps/client/src/widgets/highlights_list.ts index 8fc1ceb54..38a736f7e 100644 --- a/apps/client/src/widgets/highlights_list.ts +++ b/apps/client/src/widgets/highlights_list.ts @@ -11,8 +11,8 @@ import RightPanelWidget from "./right_panel_widget.js"; import options from "../services/options.js"; import OnClickButtonWidget from "./buttons/onclick_button.js"; import appContext, { type EventData } from "../components/app_context.js"; -import libraryLoader from "../services/library_loader.js"; import type FNote from "../entities/fnote.js"; +import katex from "../services/math.js"; const TPL = /*html*/` @@ -378,22 +378,44 @@ export default class TabRowWidget extends BasicWidget { } scrollTabContainer(direction: number, behavior: ScrollBehavior = "smooth") { - const currentScrollLeft = this.$tabScrollingContainer[0]?.scrollLeft; - this.$tabScrollingContainer[0].scrollTo({ - left: currentScrollLeft + direction, + this.$tabScrollingContainer[0].scrollBy({ + left: direction, behavior }); }; setupScrollEvents() { + let deltaX = 0; let isScrolling = false; - this.$tabScrollingContainer[0].addEventListener('wheel', (event) => { - if (!isScrolling) { - isScrolling = true; - requestAnimationFrame(() => { - this.scrollTabContainer(event.deltaY * 1.5, 'instant'); - isScrolling = false; - }); + const stepScroll = () => { + if (Math.abs(deltaX) > 5) { + const step = Math.round(deltaX * 0.2); + deltaX -= step; + this.scrollTabContainer(step, "instant"); + requestAnimationFrame(stepScroll); + } else { + this.scrollTabContainer(deltaX, "instant"); + deltaX = 0; + isScrolling = false; + } + }; + this.$tabScrollingContainer[0].addEventListener('wheel', async (event) => { + if (!event.shiftKey && event.deltaX === 0) { + event.preventDefault(); + // Clamp deltaX between TAB_CONTAINER_MIN_WIDTH and TAB_CONTAINER_MIN_WIDTH * 3 + deltaX += Math.sign(event.deltaY) * Math.max(Math.min(Math.abs(event.deltaY), TAB_CONTAINER_MIN_WIDTH * 3), TAB_CONTAINER_MIN_WIDTH); + if (!isScrolling) { + isScrolling = true; + stepScroll(); + } + } else if (event.shiftKey) { + event.preventDefault(); + if (event.deltaY > 0) { + await appContext.tabManager.activateNextTabCommand(); + } else { + await appContext.tabManager.activatePreviousTabCommand(); + } + this.activeTabEl.scrollIntoView(); } }); @@ -480,7 +502,7 @@ export default class TabRowWidget extends BasicWidget { const totalTabsWidthUsingTarget = flooredClampedTargetWidth * numberOfTabs + marginWidth; const totalExtraWidthDueToFlooring = tabsContainerWidth - totalTabsWidthUsingTarget; - const widths = []; + const widths: number[] = []; let extraWidthRemaining = totalExtraWidthDueToFlooring; for (let i = 0; i < numberOfTabs; i += 1) { diff --git a/apps/client/src/widgets/toc.ts b/apps/client/src/widgets/toc.ts index 5c9a4b3e8..a5db7ff1b 100644 --- a/apps/client/src/widgets/toc.ts +++ b/apps/client/src/widgets/toc.ts @@ -19,7 +19,7 @@ import RightPanelWidget from "./right_panel_widget.js"; import options from "../services/options.js"; import OnClickButtonWidget from "./buttons/onclick_button.js"; import appContext, { type EventData } from "../components/app_context.js"; -import libraryLoader from "../services/library_loader.js"; +import katex from "../services/math.js"; import type FNote from "../entities/fnote.js"; const TPL = /*html*/` @@ -29,23 +29,88 @@ const TPL = /*html*/` contain: none; overflow: auto; position: relative; + padding-left:0px !important; } .toc ol { - padding-left: 25px; + position: relative; + overflow: hidden; + padding-left: 0px; + transition: max-height 0.3s ease; } - .toc > ol { - padding-left: 20px; + .toc li.collapsed + ol { + display:none; + } + + .toc li + ol:before { + content: ""; + position: absolute; + height: 100%; + border-left: 1px solid var(--main-border-color); + z-index: 10; } .toc li { + display: flex; + position: relative; + list-style: none; + align-items: center; + padding-left: 7px; cursor: pointer; text-align: justify; word-wrap: break-word; hyphens: auto; } + .toc > ol { + --toc-depth-level: 1; + } + .toc > ol > ol { + --toc-depth-level: 2; + } + .toc > ol > ol > ol { + --toc-depth-level: 3; + } + .toc > ol > ol > ol > ol { + --toc-depth-level: 4; + } + .toc > ol > ol > ol > ol > ol { + --toc-depth-level: 5; + } + + .toc > ol ol::before { + left: calc((var(--toc-depth-level) - 2) * 20px + 14px); + } + + .toc li { + padding-left: calc((var(--toc-depth-level) - 1) * 20px + 4px); + } + + .toc li .collapse-button { + display: flex; + position: relative; + width: 21px; + height: 21px; + flex-shrink: 0; + align-items: center; + justify-content: center; + transition: transform 0.3s ease; + } + + .toc li.collapsed .collapse-button { + transform: rotate(-90deg); + } + + .toc li .item-content { + margin-left: 25px; + flex: 1; + } + + .toc li .collapse-button + .item-content { + margin-left: 4px; + } + .toc li:hover { font-weight: bold; } @@ -189,7 +254,6 @@ export default class TocWidget extends RightPanelWidget { } catch (e) { if (e instanceof ReferenceError && e.message.includes("katex is not defined")) { // Load KaTeX if it is not already loaded - await libraryLoader.requireLibrary(libraryLoader.KATEX); try { rendered = katex.renderToString(latexCode, { throwOnError: false @@ -231,8 +295,16 @@ export default class TocWidget extends RightPanelWidget { // Note heading 2 is the first level Trilium makes available to the note let curLevel = 2; const $ols = [$toc]; + let $previousLi: JQuery | undefined; + + if (!(this.noteContext?.viewScope?.tocCollapsedHeadings instanceof Set)) { + this.noteContext!.viewScope!.tocCollapsedHeadings = new Set(); + } + const tocCollapsedHeadings = this.noteContext!.viewScope!.tocCollapsedHeadings as Set; + const validHeadingKeys = new Set(); // Used to clean up obsolete entries in tocCollapsedHeadings + let headingCount = 0; - for (let m = null, headingIndex = 0; (m = headingTagsRegex.exec(html)) !== null; headingIndex++) { + for (let m: RegExpMatchArray | null = null, headingIndex = 0; (m = headingTagsRegex.exec(html)) !== null; headingIndex++) { // // Nest/unnest whatever necessary number of ordered lists // @@ -244,6 +316,11 @@ export default class TocWidget extends RightPanelWidget { const $ol = $(""); $ols[$ols.length - 1].append($ol); $ols.push($ol); + + if ($previousLi) { + const headingKey = `h${newLevel}_${headingIndex}_${$previousLi?.text().trim()}`; + this.setupCollapsibleHeading($ol, $previousLi, headingKey, tocCollapsedHeadings, validHeadingKeys); + } } } else if (levelDelta < 0) { // Close as many lists as curLevel - newLevel @@ -259,10 +336,19 @@ export default class TocWidget extends RightPanelWidget { // const headingText = await this.replaceMathTextWithKatax(m[2]); - const $li = $("").html(headingText); - $li.on("click", () => this.jumpToHeading(headingIndex)); + const $itemContent = $('').html(headingText); + const $li = $("").append($itemContent) + .on("click", () => this.jumpToHeading(headingIndex)); $ols[$ols.length - 1].append($li); headingCount = headingIndex; + $previousLi = $li; + } + + // Clean up unused entries in tocCollapsedHeadings + for (const key of tocCollapsedHeadings) { + if (!validHeadingKeys.has(key)) { + tocCollapsedHeadings.delete(key); + } } $toc = this.pullLeft($toc); @@ -286,7 +372,7 @@ export default class TocWidget extends RightPanelWidget { const $first = $toc.children(":first"); - if ($first[0].tagName !== "OL") { + if ($first[0].tagName.toLowerCase() !== "ol") { break; } @@ -308,18 +394,74 @@ export default class TocWidget extends RightPanelWidget { const isDocNote = this.note.type === "doc"; const isReadOnly = await this.noteContext.isReadOnly(); - let $container; + let $container: JQuery | null = null; if (isReadOnly || isDocNote) { $container = await this.noteContext.getContentElement(); } else { const textEditor = await this.noteContext.getTextEditor(); - $container = $(textEditor.sourceElement); + if (textEditor?.sourceElement) { + $container = $(textEditor.sourceElement); + } } const headingElement = $container?.find(":header:not(section.include-note :header)")?.[headingIndex]; headingElement?.scrollIntoView({ behavior: "smooth" }); } + async setupCollapsibleHeading($ol: JQuery, $previousLi: JQuery, headingKey: string, tocCollapsedHeadings: Set, validHeadingKeys: Set) { + if ($previousLi && $previousLi.find(".collapse-button").length === 0) { + const $collapseButton = $(''); + $previousLi.prepend($collapseButton); + + // Restore the previous collapsed state + if (tocCollapsedHeadings?.has(headingKey)) { + $previousLi.addClass("collapsed"); + validHeadingKeys.add(headingKey); + } else { + $previousLi.removeClass("collapsed"); + } + + $collapseButton.on("click", (event) => { + event.stopPropagation(); + if ($previousLi.hasClass("animating")) return; + const willCollapse = !$previousLi.hasClass("collapsed"); + $previousLi.addClass("animating"); + + if (willCollapse) { // Collapse + $ol.css("maxHeight", `${$ol.prop("scrollHeight")}px`); + requestAnimationFrame(() => { + requestAnimationFrame(() => { + $ol.css("maxHeight", "0px"); + $collapseButton.css("transform", "rotate(-90deg)"); + }); + }); + setTimeout(() => { + $ol.css("maxHeight", ""); + $previousLi.addClass("collapsed"); + $previousLi.removeClass("animating"); + }, 300); + } else { // Expand + $previousLi.removeClass("collapsed"); + $ol.css("maxHeight", "0px"); + requestAnimationFrame(() => { + $ol.css("maxHeight", `${$ol.prop("scrollHeight")}px`); + $collapseButton.css("transform", ""); + }); + setTimeout(() => { + $ol.css("maxHeight", ""); + $previousLi.removeClass("animating"); + }, 300); + } + + if (willCollapse) { // Store collapsed headings + tocCollapsedHeadings!.add(headingKey); + } else { + tocCollapsedHeadings!.delete(headingKey); + } + }); + } + } + async closeTocCommand() { if (this.noteContext?.viewScope) { this.noteContext.viewScope.tocTemporarilyHidden = true; diff --git a/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts b/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts index 69bc38bd7..9da76b559 100644 --- a/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts +++ b/apps/client/src/widgets/type_widgets/abstract_code_type_widget.ts @@ -1,7 +1,11 @@ -import TypeWidget from "./type_widget.js"; -import libraryLoader from "../../services/library_loader.js"; -import options from "../../services/options.js"; +import { getThemeById } from "@triliumnext/codemirror"; import type FNote from "../../entities/fnote.js"; +import options from "../../services/options.js"; +import TypeWidget from "./type_widget.js"; +import CodeMirror, { type EditorConfig } from "@triliumnext/codemirror"; +import type { EventData } from "../../components/app_context.js"; + +export const DEFAULT_PREFIX = "default:"; /** * An abstract {@link TypeWidget} which implements the CodeMirror editor, meant to be used as a parent for @@ -19,43 +23,27 @@ import type FNote from "../../entities/fnote.js"; export default class AbstractCodeTypeWidget extends TypeWidget { protected $editor!: JQuery; - protected codeEditor!: CodeMirrorInstance; + protected codeEditor!: CodeMirror; doRender() { this.initialized = this.#initEditor(); } async #initEditor() { - await libraryLoader.requireLibrary(libraryLoader.CODE_MIRROR); - - // these conflict with backward/forward navigation shortcuts - delete CodeMirror.keyMap.default["Alt-Left"]; - delete CodeMirror.keyMap.default["Alt-Right"]; - - CodeMirror.modeURL = `${window.glob.assetPath}/node_modules/codemirror/mode/%N/%N.js`; - const jsMode = CodeMirror.modeInfo.find((mode) => mode.name === "JavaScript"); - if (jsMode) { - jsMode.mimes.push(...["application/javascript;env=frontend", "application/javascript;env=backend"]); - } - const sqlMode = CodeMirror.modeInfo.find((mode) => mode.name === "SQLite"); - if (sqlMode) { - sqlMode.mimes = ["text/x-sqlite", "text/x-sqlite;schema=trilium"]; - } - - this.codeEditor = CodeMirror(this.$editor[0], { - value: "", - viewportMargin: Infinity, - indentUnit: 4, - matchBrackets: true, - matchTags: { bothTags: true }, - highlightSelectionMatches: { showToken: false, annotateScrollbar: false }, - lineNumbers: true, - // we line wrap partly also because without it horizontal scrollbar displays only when you scroll - // all the way to the bottom of the note. With line wrap, there's no horizontal scrollbar so no problem + this.codeEditor = new CodeMirror({ + parent: this.$editor[0], lineWrapping: options.is("codeLineWrapEnabled"), ...this.getExtraOpts() }); - this.onEditorInitialized(); + + // Load the theme. + const themeId = options.get("codeNoteTheme"); + if (themeId?.startsWith(DEFAULT_PREFIX)) { + const theme = getThemeById(themeId.substring(DEFAULT_PREFIX.length)); + if (theme) { + await this.codeEditor.setTheme(theme); + } + } } /** @@ -64,7 +52,7 @@ export default class AbstractCodeTypeWidget extends TypeWidget { * * @returns the extra options to be passed to the CodeMirror constructor. */ - getExtraOpts(): Partial { + getExtraOpts(): Partial { return {}; } @@ -81,50 +69,73 @@ export default class AbstractCodeTypeWidget extends TypeWidget { /** * Must be called by the derived classes in `#doRefresh(note)` in order to react to changes. * - * @param {*} note the note that was changed. - * @param {*} content the new content of the note. + * @param the note that was changed. + * @param new content of the note. */ _update(note: { mime: string }, content: string) { - // CodeMirror breaks pretty badly on null, so even though it shouldn't happen (guarded by a consistency check) - // we provide fallback - this.codeEditor.setValue(content || ""); + this.codeEditor.setText(content); + this.codeEditor.setMimeType(note.mime); this.codeEditor.clearHistory(); - - let info = CodeMirror.findModeByMIME(note.mime); - if (!info) { - // Switch back to plain text if CodeMirror does not have a mode for whatever MIME type we're editing. - // To avoid inheriting a mode from a previously open code note. - info = CodeMirror.findModeByMIME("text/plain"); - } - - this.codeEditor.setOption("mode", info.mime); - CodeMirror.autoLoadMode(this.codeEditor, info.mode); } show() { this.$widget.show(); - - if (this.codeEditor) { - // show can be called before render - this.codeEditor.refresh(); - } + this.updateBackgroundColor(); } focus() { - this.$editor.focus(); this.codeEditor.focus(); } scrollToEnd() { - this.codeEditor.setCursor(this.codeEditor.lineCount(), 0); + this.codeEditor.scrollToEnd(); this.codeEditor.focus(); } cleanup() { if (this.codeEditor) { this.spacedUpdate.allowUpdateWithoutChange(() => { - this.codeEditor.setValue(""); + this.codeEditor.setText(""); }); } + this.updateBackgroundColor("unset"); } + + async executeWithCodeEditorEvent({ resolve, ntxId }: EventData<"executeWithCodeEditor">) { + if (!this.isNoteContext(ntxId)) { + return; + } + + await this.initialized; + + resolve(this.codeEditor); + } + + async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) { + if (loadResults.isOptionReloaded("codeNoteTheme")) { + const themeId = options.get("codeNoteTheme"); + if (themeId?.startsWith(DEFAULT_PREFIX)) { + const theme = getThemeById(themeId.substring(DEFAULT_PREFIX.length)); + if (theme) { + await this.codeEditor.setTheme(theme); + } + this.updateBackgroundColor(); + } + } + + if (loadResults.isOptionReloaded("codeLineWrapEnabled")) { + this.codeEditor.setLineWrapping(options.is("codeLineWrapEnabled")); + } + } + + updateBackgroundColor(color?: string) { + if (this.note?.mime === "text/x-sqlite;schema=trilium") { + // Don't apply a background color for SQL console notes. + return; + } + + const $editorEl = $(this.codeEditor.dom); + this.$widget.closest(".scrolling-container").css("background-color", color ?? $editorEl.css("background-color")); + } + } diff --git a/apps/client/src/widgets/type_widgets/abstract_split_type_widget.ts b/apps/client/src/widgets/type_widgets/abstract_split_type_widget.ts index 3b1cb222b..23a4da942 100644 --- a/apps/client/src/widgets/type_widgets/abstract_split_type_widget.ts +++ b/apps/client/src/widgets/type_widgets/abstract_split_type_widget.ts @@ -8,6 +8,7 @@ import options from "../../services/options.js"; import type SwitchSplitOrientationButton from "../floating_buttons/switch_layout_button.js"; import type { EventData } from "../../components/app_context.js"; import type OnClickButtonWidget from "../buttons/onclick_button.js"; +import type { EditorConfig } from "@triliumnext/codemirror"; const TPL = /*html*/`\ @@ -130,8 +131,16 @@ export default abstract class AbstractSplitTypeWidget extends TypeWidget { constructor() { super(); this.editorTypeWidget = new EditableCodeTypeWidget(); + this.editorTypeWidget.updateBackgroundColor = () => {}; this.editorTypeWidget.isEnabled = () => true; - this.editorTypeWidget.getExtraOpts = this.buildEditorExtraOptions; + + const defaultOptions = this.editorTypeWidget.getExtraOpts(); + this.editorTypeWidget.getExtraOpts = () => { + return { + ...defaultOptions, + ...this.buildEditorExtraOptions() + }; + }; } doRender(): void { @@ -166,6 +175,7 @@ export default abstract class AbstractSplitTypeWidget extends TypeWidget { cleanup(): void { this.#destroyResizer(); + this.editorTypeWidget.cleanup(); } async doRefresh(note: FNote) { @@ -242,7 +252,7 @@ export default abstract class AbstractSplitTypeWidget extends TypeWidget { /** * Called upon when the code editor is being initialized. Can be used to add additional options to the editor. */ - buildEditorExtraOptions(): Partial { + buildEditorExtraOptions(): Partial { return { lineWrapping: false }; diff --git a/apps/client/src/widgets/type_widgets/abstract_svg_split_type_widget.ts b/apps/client/src/widgets/type_widgets/abstract_svg_split_type_widget.ts index 24c2c1ae4..45eba8890 100644 --- a/apps/client/src/widgets/type_widgets/abstract_svg_split_type_widget.ts +++ b/apps/client/src/widgets/type_widgets/abstract_svg_split_type_widget.ts @@ -138,8 +138,8 @@ export default abstract class AbstractSvgSplitTypeWidget extends AbstractSplitTy */ async #setupPanZoom(preservePanZoom: boolean) { // Clean up - let pan = null; - let zoom = null; + let pan: SvgPanZoom.Point | null = null; + let zoom: number | null = null; if (preservePanZoom && this.zoomInstance) { // Store pan and zoom for same note, when the user is editing the note. pan = this.zoomInstance.getPan(); diff --git a/apps/client/src/widgets/type_widgets/canvas.ts b/apps/client/src/widgets/type_widgets/canvas.ts index 369585936..490350686 100644 --- a/apps/client/src/widgets/type_widgets/canvas.ts +++ b/apps/client/src/widgets/type_widgets/canvas.ts @@ -3,6 +3,7 @@ import utils from "../../services/utils.js"; import linkService from "../../services/link.js"; import server from "../../services/server.js"; import type FNote from "../../entities/fnote.js"; +import options from "../../services/options.js"; import type { ExcalidrawElement, Theme } from "@excalidraw/excalidraw/element/types"; import type { AppState, BinaryFileData, ExcalidrawImperativeAPI, ExcalidrawProps, LibraryItem, SceneData } from "@excalidraw/excalidraw/types"; import type { JSX } from "react"; @@ -132,7 +133,7 @@ export default class ExcalidrawTypeWidget extends TypeWidget { // currently required by excalidraw, in order to allows self-hosting fonts locally. // this avoids making excalidraw load the fonts from an external CDN. - (window as any).EXCALIDRAW_ASSET_PATH = `${window.location.origin}/${asset_path}/app-dist/excalidraw/`; + (window as any).EXCALIDRAW_ASSET_PATH = `${new URL(import.meta.url).origin}/node_modules/@excalidraw/excalidraw/dist/prod`; // temporary vars this.currentNoteId = ""; @@ -447,6 +448,9 @@ export default class ExcalidrawTypeWidget extends TypeWidget { } onChangeHandler() { + if (options.is("databaseReadonly")) { + return; + } // changeHandler is called upon any tiny change in excalidraw. button clicked, hover, etc. // make sure only when a new element is added, we actually save something. const isNewSceneVersion = this.isNewSceneVersion(); @@ -540,7 +544,7 @@ export default class ExcalidrawTypeWidget extends TypeWidget { this.saveData(); }, onChange: () => this.onChangeHandler(), - viewModeEnabled: false, + viewModeEnabled: options.is("databaseReadonly"), zenModeEnabled: false, gridModeEnabled: false, isCollaborating: false, @@ -567,6 +571,10 @@ export default class ExcalidrawTypeWidget extends TypeWidget { * info: sceneVersions are not incrementing. it seems to be a pseudo-random number */ isNewSceneVersion() { + if (options.is("databaseReadonly")) { + return false; + } + const sceneVersion = this.getSceneVersion(); return ( diff --git a/apps/client/src/widgets/type_widgets/ckeditor/config.spec.ts b/apps/client/src/widgets/type_widgets/ckeditor/config.spec.ts index 8c96629b9..3bce30d9b 100644 --- a/apps/client/src/widgets/type_widgets/ckeditor/config.spec.ts +++ b/apps/client/src/widgets/type_widgets/ckeditor/config.spec.ts @@ -6,7 +6,7 @@ type ToolbarConfig = string | "|" | { items: ToolbarConfig[] }; describe("CKEditor config", () => { it("has same toolbar items for fixed and floating", () => { function traverseItems(config: ToolbarConfig): string[] { - const result = []; + const result: (string | string[])[] = []; if (typeof config === "object") { for (const item of config.items) { result.push(traverseItems(item)); diff --git a/apps/client/src/widgets/type_widgets/ckeditor/config.ts b/apps/client/src/widgets/type_widgets/ckeditor/config.ts index b4ba9633a..5a3262a1c 100644 --- a/apps/client/src/widgets/type_widgets/ckeditor/config.ts +++ b/apps/client/src/widgets/type_widgets/ckeditor/config.ts @@ -1,18 +1,19 @@ -import library_loader from "../../../services/library_loader.js"; import { ALLOWED_PROTOCOLS } from "../../../services/link.js"; -import { MIME_TYPE_AUTO } from "../../../services/mime_type_definitions.js"; +import { MIME_TYPE_AUTO } from "@triliumnext/commons"; +import type { EditorConfig } from "@triliumnext/ckeditor5"; import { getHighlightJsNameForMime } from "../../../services/mime_types.js"; import options from "../../../services/options.js"; -import { isSyntaxHighlightEnabled } from "../../../services/syntax_highlight.js"; +import { ensureMimeTypesForHighlighting, isSyntaxHighlightEnabled } from "../../../services/syntax_highlight.js"; import utils from "../../../services/utils.js"; -import emojiDefinitionsUrl from "@triliumnext/ckeditor5/emoji_definitions/en.json?external"; +import emojiDefinitionsUrl from "@triliumnext/ckeditor5/emoji_definitions/en.json?url"; +import { copyText } from "../../../services/clipboard.js"; const TEXT_FORMATTING_GROUP = { label: "Text formatting", icon: "text" }; -export function buildConfig() { +export function buildConfig(): EditorConfig { return { image: { styles: { @@ -101,16 +102,19 @@ export function buildConfig() { allowedProtocols: ALLOWED_PROTOCOLS }, emoji: { - definitionsUrl: emojiDefinitionsUrl + definitionsUrl: new URL(import.meta.url).origin + emojiDefinitionsUrl }, syntaxHighlighting: { - async loadHighlightJs() { - await library_loader.requireLibrary(library_loader.HIGHLIGHT_JS); - return hljs; + loadHighlightJs: async () => { + await ensureMimeTypesForHighlighting(); + return await import("@triliumnext/highlightjs"); }, mapLanguageName: getHighlightJsNameForMime, defaultMimeType: MIME_TYPE_AUTO, - enabled: isSyntaxHighlightEnabled + enabled: isSyntaxHighlightEnabled() + }, + clipboard: { + copy: copyText }, // This value must be kept in sync with the language defined in webpack.config.js. language: "en" @@ -130,7 +134,7 @@ export function buildToolbarConfig(isClassicToolbar: boolean) { export function buildMobileToolbar() { const classicConfig = buildClassicToolbar(false); - const items = []; + const items: string[] = []; for (const item of classicConfig.toolbar.items) { if (typeof item === "object" && "items" in item) { diff --git a/apps/client/src/widgets/type_widgets/content/backend_log.ts b/apps/client/src/widgets/type_widgets/content/backend_log.ts index efd8ff6ff..b6f78f9fa 100644 --- a/apps/client/src/widgets/type_widgets/content/backend_log.ts +++ b/apps/client/src/widgets/type_widgets/content/backend_log.ts @@ -1,6 +1,7 @@ import server from "../../../services/server.js"; import AbstractCodeTypeWidget from "../abstract_code_type_widget.js"; import type { EventData } from "../../../components/app_context.js"; +import type { EditorConfig } from "@triliumnext/codemirror"; const TPL = /*html*/` + +`; + +export default class CodeTheme extends OptionsWidget { + + private $themeSelect!: JQuery; + private $sampleEl!: JQuery; + private $lineWrapEnabled!: JQuery; + private editor?: CodeMirror; + + doRender() { + this.$widget = $(TPL); + this.$themeSelect = this.$widget.find(".theme-select"); + this.$themeSelect.on("change", async () => { + const newTheme = String(this.$themeSelect.val()); + await server.put(`options/codeNoteTheme/${newTheme}`); + }); + + // Populate the list of themes. + for (const theme of ColorThemes) { + const option = $("") + .attr("value", `default:${theme.id}`) + .text(theme.name); + this.$themeSelect.append(option); + } + + this.$sampleEl = this.$widget.find(".note-detail-readonly-code-content"); + this.$lineWrapEnabled = this.$widget.find(".word-wrap"); + this.$lineWrapEnabled.on("change", () => this.updateCheckboxOption("codeLineWrapEnabled", this.$lineWrapEnabled)); + } + + async #setupPreview(options: OptionMap) { + if (!this.editor) { + this.editor = new CodeMirror({ + parent: this.$sampleEl[0], + }); + } + this.editor.setText(SAMPLE_CODE); + this.editor.setMimeType(SAMPLE_MIME); + this.editor.setLineWrapping(options.codeLineWrapEnabled === "true"); + + // Load the theme. + const themeId = options.codeNoteTheme; + if (themeId?.startsWith(DEFAULT_PREFIX)) { + const theme = getThemeById(themeId.substring(DEFAULT_PREFIX.length)); + if (theme) { + await this.editor.setTheme(theme); + } + } + } + + async optionsLoaded(options: OptionMap) { + this.$themeSelect.val(options.codeNoteTheme); + this.#setupPreview(options); + this.setCheckboxState(this.$lineWrapEnabled, options.codeLineWrapEnabled); + } + +} diff --git a/apps/client/src/widgets/type_widgets/options/i18n/language.ts b/apps/client/src/widgets/type_widgets/options/i18n/language.ts index 7a10e0a15..7b38067a9 100644 --- a/apps/client/src/widgets/type_widgets/options/i18n/language.ts +++ b/apps/client/src/widgets/type_widgets/options/i18n/language.ts @@ -1,7 +1,7 @@ import OptionsWidget from "../options_widget.js"; import type { OptionMap } from "@triliumnext/commons"; import { getAvailableLocales } from "../../../../services/i18n.js"; -import { t } from "i18next"; +import { t } from "../../../../services/i18n.js"; const TPL = /*html*/` diff --git a/apps/client/src/widgets/type_widgets/options/related_settings.ts b/apps/client/src/widgets/type_widgets/options/related_settings.ts new file mode 100644 index 000000000..d0f959d43 --- /dev/null +++ b/apps/client/src/widgets/type_widgets/options/related_settings.ts @@ -0,0 +1,72 @@ +import type FNote from "../../../entities/fnote"; +import type { OptionPages } from "../content_widget"; +import OptionsWidget from "./options_widget"; + +const TPL = `\ + + Related settings + + + Color scheme for code blocks in text notes + Color scheme for code notes + + + + +`; + +interface RelatedSettingsConfig { + items: { + title: string; + targetPage: OptionPages; + }[]; +} + +const RELATED_SETTINGS: Record = { + "_optionsAppearance": { + items: [ + { + title: "Color scheme for code blocks in text notes", + targetPage: "_optionsTextNotes" + }, + { + title: "Color scheme for code notes", + targetPage: "_optionsCodeNotes" + } + ] + } +}; + +export default class RelatedSettings extends OptionsWidget { + + doRender() { + this.$widget = $(TPL); + + const config = this.noteId && RELATED_SETTINGS[this.noteId]; + if (!config) { + return; + } + + const $relatedSettings = this.$widget.find(".related-settings"); + $relatedSettings.empty(); + for (const item of config.items) { + const $item = $(""); + const $link = $("").text(item.title); + + $item.append($link); + $link.attr("href", `#root/_hidden/_options/${item.targetPage}`); + $relatedSettings.append($item); + } + } + + isEnabled() { + return (!!this.noteId && this.noteId in RELATED_SETTINGS); + } + +} diff --git a/apps/client/src/widgets/type_widgets/options/appearance/code_block.ts b/apps/client/src/widgets/type_widgets/options/text_notes/code_block.ts similarity index 64% rename from apps/client/src/widgets/type_widgets/options/appearance/code_block.ts rename to apps/client/src/widgets/type_widgets/options/text_notes/code_block.ts index 44182fdae..0a97d37d3 100644 --- a/apps/client/src/widgets/type_widgets/options/appearance/code_block.ts +++ b/apps/client/src/widgets/type_widgets/options/text_notes/code_block.ts @@ -1,10 +1,11 @@ -import type { OptionMap } from "@triliumnext/commons"; +import { normalizeMimeTypeForCKEditor, type OptionMap } from "@triliumnext/commons"; import { t } from "../../../../services/i18n.js"; -import library_loader from "../../../../services/library_loader.js"; import server from "../../../../services/server.js"; import OptionsWidget from "../options_widget.js"; +import { ensureMimeTypesForHighlighting, loadHighlightingTheme } from "../../../../services/syntax_highlight.js"; +import { Themes, type Theme } from "@triliumnext/highlightjs"; -const SAMPLE_LANGUAGE = "javascript"; +const SAMPLE_LANGUAGE = normalizeMimeTypeForCKEditor("application/javascript;env=frontend"); const SAMPLE_CODE = `\ const n = 10; greet(n); // Print "Hello World" for n times @@ -25,8 +26,6 @@ const TPL = /*html*/` ${t("highlighting.title")} - ${t("highlighting.description")} - ${t("highlighting.color-scheme")} @@ -41,27 +40,22 @@ const TPL = /*html*/` - - - ${SAMPLE_CODE} - + + ${SAMPLE_CODE} `; -interface Theme { - title: string; - val: string; -} - -type Response = Record; - /** * Contains appearance settings for code blocks within text notes, such as the theme for the syntax highlighter. */ @@ -74,9 +68,31 @@ export default class CodeBlockOptions extends OptionsWidget { doRender() { this.$widget = $(TPL); this.$themeSelect = this.$widget.find(".theme-select"); + + // Populate the list of themes. + const themeGroups = groupThemesByLightOrDark(); + for (const [key, themes] of Object.entries(themeGroups)) { + const $group = key ? $("").attr("label", key) : null; + + for (const theme of themes) { + const option = $("") + .attr("value", theme.val) + .text(theme.title); + + if ($group) { + $group.append(option); + } else { + this.$themeSelect.append(option); + } + } + if ($group) { + this.$themeSelect.append($group); + } + } + this.$themeSelect.on("change", async () => { const newTheme = String(this.$themeSelect.val()); - library_loader.loadHighlightingTheme(newTheme); + loadHighlightingTheme(newTheme); await server.put(`options/codeBlockTheme/${newTheme}`); }); @@ -90,11 +106,14 @@ export default class CodeBlockOptions extends OptionsWidget { #setupPreview(shouldEnableSyntaxHighlight: boolean) { const text = SAMPLE_CODE; if (shouldEnableSyntaxHighlight) { - library_loader.requireLibrary(library_loader.HIGHLIGHT_JS).then(() => { + import("@triliumnext/highlightjs").then(async (hljs) => { + await ensureMimeTypesForHighlighting(); const highlightedText = hljs.highlight(text, { language: SAMPLE_LANGUAGE }); - this.$sampleEl.html(highlightedText.value); + if (highlightedText) { + this.$sampleEl.html(highlightedText.value); + } }); } else { this.$sampleEl.text(text); @@ -102,25 +121,6 @@ export default class CodeBlockOptions extends OptionsWidget { } async optionsLoaded(options: OptionMap) { - const themeGroups = await server.get("options/codeblock-themes"); - this.$themeSelect.empty(); - - for (const [key, themes] of Object.entries(themeGroups)) { - const $group = key ? $("").attr("label", key) : null; - - for (const theme of themes) { - const option = $("").attr("value", theme.val).text(theme.title); - - if ($group) { - $group.append(option); - } else { - this.$themeSelect.append(option); - } - } - if ($group) { - this.$themeSelect.append($group); - } - } this.$themeSelect.val(options.codeBlockTheme); this.setCheckboxState(this.$wordWrap, options.codeBlockWordWrap); this.$widget.closest(".note-detail-printable").toggleClass("word-wrap", options.codeBlockWordWrap === "true"); @@ -128,3 +128,38 @@ export default class CodeBlockOptions extends OptionsWidget { this.#setupPreview(options.codeBlockTheme !== "none"); } } + +interface ThemeData { + val: string; + title: string; +} + +function groupThemesByLightOrDark() { + const darkThemes: ThemeData[] = []; + const lightThemes: ThemeData[] = []; + + for (const [ id, theme ] of Object.entries(Themes)) { + const data: ThemeData = { + val: "default:" + id, + title: theme.name + }; + + if (theme.name.includes("Dark")) { + darkThemes.push(data); + } else { + lightThemes.push(data); + } + } + + const output: Record = { + "": [ + { + val: "none", + title: t("code_block.theme_none") + } + ] + }; + output[t("code_block.theme_group_light")] = lightThemes; + output[t("code_block.theme_group_dark")] = darkThemes; + return output; +} diff --git a/apps/client/src/widgets/type_widgets/read_only_code.ts b/apps/client/src/widgets/type_widgets/read_only_code.ts index 9bdeee150..fd74aaa5a 100644 --- a/apps/client/src/widgets/type_widgets/read_only_code.ts +++ b/apps/client/src/widgets/type_widgets/read_only_code.ts @@ -9,10 +9,6 @@ const TPL = /*html*/` min-height: 50px; position: relative; } - - .note-detail-readonly-code-content { - padding: 10px; - } @@ -43,7 +39,7 @@ export default class ReadOnlyCodeTypeWidget extends AbstractCodeTypeWidget { this.show(); } - getExtraOpts(): Partial { + getExtraOpts() { return { readOnly: true }; diff --git a/apps/client/src/widgets/type_widgets/read_only_text.ts b/apps/client/src/widgets/type_widgets/read_only_text.ts index 9e3daa084..59f99af33 100644 --- a/apps/client/src/widgets/type_widgets/read_only_text.ts +++ b/apps/client/src/widgets/type_widgets/read_only_text.ts @@ -1,11 +1,11 @@ import AbstractTextTypeWidget from "./abstract_text_type_widget.js"; -import libraryLoader from "../../services/library_loader.js"; -import { applySyntaxHighlight } from "../../services/syntax_highlight.js"; +import { formatCodeBlocks } from "../../services/syntax_highlight.js"; import type FNote from "../../entities/fnote.js"; import type { CommandListenerData, EventData } from "../../components/app_context.js"; import { getLocaleById } from "../../services/i18n.js"; import appContext from "../../components/app_context.js"; import { getMermaidConfig } from "../../services/mermaid.js"; +import { renderMathInElement } from "../../services/math.js"; const TPL = /*html*/` @@ -121,13 +121,11 @@ export default class ReadOnlyTextTypeWidget extends AbstractTextTypeWidget { }); if (this.$content.find("span.math-tex").length > 0) { - await libraryLoader.requireLibrary(libraryLoader.KATEX); - renderMathInElement(this.$content[0], { trust: true }); } await this.#applyInlineMermaid(); - await applySyntaxHighlight(this.$content); + await formatCodeBlocks(this.$content); } async #applyInlineMermaid() { diff --git a/apps/client/src/widgets/view_widgets/calendar_view.ts b/apps/client/src/widgets/view_widgets/calendar_view.ts index fdc693dc1..51758fca3 100644 --- a/apps/client/src/widgets/view_widgets/calendar_view.ts +++ b/apps/client/src/widgets/view_widgets/calendar_view.ts @@ -31,6 +31,14 @@ const TPL = /*html*/` color: unset; } + .search-result-widget-content .calendar-view { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + } + .calendar-container { height: 100%; --fc-page-bg-color: var(--main-background-color); @@ -51,6 +59,10 @@ const TPL = /*html*/` padding-right: 5em; } + .search-result-widget-content .calendar-view .fc-toolbar.fc-header-toolbar { + padding-right: unset !important; + } + .calendar-container .fc-toolbar-title { font-size: 1.3rem; font-weight: normal; @@ -83,6 +95,13 @@ interface CreateChildResponse { }; } +interface Event { + startDate: string, + endDate?: string | null, + startTime?: string | null, + endTime?: string | null +} + const CALENDAR_VIEWS = [ "timeGridWeek", "dayGridMonth", @@ -158,6 +177,7 @@ export default class CalendarView extends ViewMode { locale: await CalendarView.#getLocale(), height: "100%", nowIndicator: true, + handleWindowResize: false, eventDidMount: (e) => { const { iconClass, promotedAttributes } = e.event.extendedProps; @@ -226,6 +246,9 @@ export default class CalendarView extends ViewMode { calendar.render(); this.calendar = calendar; + new ResizeObserver(() => calendar.updateSize()) + .observe(this.$calendarContainer[0]); + return this.$root; } @@ -325,8 +348,8 @@ export default class CalendarView extends ViewMode { } #parseStartEndTimeFromEvent(e: DateSelectArg | EventImpl) { - let startTime = null; - let endTime = null; + let startTime: string | undefined | null = null; + let endTime: string | undefined | null = null; if (!e.allDay) { startTime = CalendarView.#formatTimeToLocalISO(e.start); endTime = CalendarView.#formatTimeToLocalISO(e.end); @@ -391,7 +414,7 @@ export default class CalendarView extends ViewMode { } async #buildEventsForCalendar(e: EventSourceFuncArg) { - const events = []; + const events: EventInput[] = []; // Gather all the required date note IDs. const dateRange = utils.getMonthsInDateRange(e.startStr, e.endStr); @@ -483,12 +506,7 @@ export default class CalendarView extends ViewMode { return note.getLabelValue(defaultLabelName); } - static async buildEvent(note: FNote, { startDate, endDate, startTime, endTime }: { - startDate: string, - endDate?: string | null, - startTime?: string | null, - endTime?: string | null - }) { + static async buildEvent(note: FNote, { startDate, endDate, startTime, endTime }: Event) { const customTitleAttributeName = note.getLabelValue("calendar:title"); const titles = await CalendarView.#parseCustomTitle(customTitleAttributeName, note); const color = note.getLabelValue("calendar:color") ?? note.getLabelValue("color"); @@ -553,7 +571,7 @@ export default class CalendarView extends ViewMode { if (relations.length > 0) { const noteIds = relations.map((r) => r.targetNoteId); const notesFromRelation = await froca.getNotes(noteIds); - const titles = []; + const titles: string[][] = []; for (const targetNote of notesFromRelation) { const targetCustomTitleValue = targetNote.getAttributeValue("label", "calendar:title"); @@ -631,7 +649,7 @@ export default class CalendarView extends ViewMode { // Icon button. const iconEl = subItem.querySelector("span.fc-icon"); - let icon = null; + let icon: string | null = null; if (iconEl?.classList.contains("fc-icon-chevron-left")) { icon = "NSImageNameTouchBarGoBackTemplate"; mode = "buttons"; diff --git a/apps/client/src/widgets/view_widgets/list_or_grid_view.ts b/apps/client/src/widgets/view_widgets/list_or_grid_view.ts index 7733a0d05..54b83b971 100644 --- a/apps/client/src/widgets/view_widgets/list_or_grid_view.ts +++ b/apps/client/src/widgets/view_widgets/list_or_grid_view.ts @@ -215,8 +215,6 @@ class ListOrGridView extends ViewMode { const highlightedTokens = this.parentNote.highlightedTokens || []; if (highlightedTokens.length > 0) { - await import("script-loader!mark.js/dist/jquery.mark.min.js"); - const regex = highlightedTokens.map((token) => utils.escapeRegExp(token)).join("|"); this.highlightRegex = new RegExp(regex, "gi"); @@ -320,11 +318,10 @@ class ListOrGridView extends ViewMode { $expander.on("click", () => this.toggleContent($card, note, !$card.hasClass("expanded"))); if (this.highlightRegex) { - $card.find(".note-book-title").markRegExp(this.highlightRegex, { + const Mark = new (await import("mark.js")).default($card.find(".note-book-title")[0]); + Mark.markRegExp(this.highlightRegex, { element: "span", - className: "ck-find-result", - separateWordSearch: false, - caseSensitive: false + className: "ck-find-result" }); } @@ -362,11 +359,10 @@ class ListOrGridView extends ViewMode { }); if (this.highlightRegex) { - $renderedContent.markRegExp(this.highlightRegex, { + const Mark = new (await import("mark.js")).default($renderedContent[0]); + Mark.markRegExp(this.highlightRegex, { element: "span", - className: "ck-find-result", - separateWordSearch: false, - caseSensitive: false + className: "ck-find-result" }); } diff --git a/apps/client/tsconfig.app.json b/apps/client/tsconfig.app.json index 588ce728f..e51437ed1 100644 --- a/apps/client/tsconfig.app.json +++ b/apps/client/tsconfig.app.json @@ -35,10 +35,16 @@ ], "references": [ { - "path": "../../packages/ckeditor5/tsconfig.lib.json" + "path": "../../packages/highlightjs/tsconfig.lib.json" + }, + { + "path": "../../packages/codemirror/tsconfig.lib.json" }, { "path": "../../packages/commons/tsconfig.lib.json" + }, + { + "path": "../../packages/ckeditor5/tsconfig.lib.json" } ] } diff --git a/apps/client/tsconfig.json b/apps/client/tsconfig.json index 433040798..c51d8fdcd 100644 --- a/apps/client/tsconfig.json +++ b/apps/client/tsconfig.json @@ -4,11 +4,17 @@ "include": [], "references": [ { - "path": "../../packages/ckeditor5" + "path": "../../packages/highlightjs" + }, + { + "path": "../../packages/codemirror" }, { "path": "../../packages/commons" }, + { + "path": "../../packages/ckeditor5" + }, { "path": "./tsconfig.app.json" }, diff --git a/apps/client/vite.config.mts b/apps/client/vite.config.mts new file mode 100644 index 000000000..ab86bc5c8 --- /dev/null +++ b/apps/client/vite.config.mts @@ -0,0 +1,94 @@ +/// +import { join, resolve } from 'path'; +import { defineConfig } from 'vite'; +import { viteStaticCopy } from 'vite-plugin-static-copy' +import asset_path from './src/asset_path'; + +const assets = [ "assets", "stylesheets", "libraries", "fonts", "translations" ]; + +export default defineConfig(() => ({ + root: __dirname, + cacheDir: '../../node_modules/.vite/apps/client', + base: "/" + asset_path, + server: { + port: 4200, + host: 'localhost', + }, + preview: { + port: 4300, + host: 'localhost', + }, + plugins: [ + viteStaticCopy({ + targets: assets.map((asset) => ({ + src: `src/${asset}/*`, + dest: asset + })) + }), + viteStaticCopy({ + structured: true, + targets: [ + { + src: "node_modules/@excalidraw/excalidraw/dist/prod/fonts/*", + dest: "", + } + ] + }) + ], + resolve: { + alias: [ + // Force the use of dist in development mode because upstream ESM is broken (some hybrid between CJS and ESM, will be improved in upcoming versions). + { + find: "@triliumnext/highlightjs", + replacement: resolve(__dirname, "node_modules/@triliumnext/highlightjs/dist") + } + ] + }, + // Uncomment this if you are using workers. + // worker: { + // plugins: [ nxViteTsPaths() ], + // }, + build: { + target: "esnext", + outDir: './dist', + emptyOutDir: true, + reportCompressedSize: true, + rollupOptions: { + input: { + desktop: join(__dirname, "src", "desktop.ts"), + mobile: join(__dirname, "src", "mobile.ts"), + login: join(__dirname, "src", "login.ts"), + setup: join(__dirname, "src", "setup.ts"), + share: join(__dirname, "src", "share.ts"), + set_password: join(__dirname, "src", "set_password.ts"), + runtime: join(__dirname, "src", "runtime.ts") + }, + output: { + entryFileNames: "src/[name].js", + chunkFileNames: "src/[name].js", + assetFileNames: "src/[name].[ext]" + }, + onwarn(warning, rollupWarn) { + if (warning.code === "MODULE_LEVEL_DIRECTIVE") { + return; + } + rollupWarn(warning); + } + } + }, + optimizeDeps: { + exclude: [ + "@triliumnext/highlightjs" + ] + }, + css: { + preprocessorOptions: { + scss: { + quietDeps: true + } + } + }, + commonjsOptions: { + transformMixedEsModules: true, + } +})); diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts deleted file mode 100644 index 7dedf276b..000000000 --- a/apps/client/vite.config.ts +++ /dev/null @@ -1,21 +0,0 @@ - -import { defineConfig } from 'vite'; - -export default defineConfig(() => ({ - root: __dirname, - cacheDir: '../../node_modules/.vite/apps/client', - plugins: [], - test: { - watch: false, - globals: true, - setupFiles: ["./src/test/setup.ts"], - environment: "happy-dom", - include: ["src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], - reporters: ["default"], - coverage: { - reportsDirectory: './test-output/vitest/coverage', - provider: 'v8' as const, - reporter: [ "text", "html" ] - } - }, -})); diff --git a/apps/client/webpack.config.cjs b/apps/client/webpack.config.cjs deleted file mode 100644 index 15a7307ba..000000000 --- a/apps/client/webpack.config.cjs +++ /dev/null @@ -1,116 +0,0 @@ - -const { composePlugins, withNx, withWeb } = require('@nx/webpack'); -const { join } = require('path'); -const CopyPlugin = require('copy-webpack-plugin'); - -module.exports = composePlugins( - withNx({ - tsConfig: join(__dirname, './tsconfig.app.json'), - compiler: "tsc", - main: join(__dirname, "./src/index.ts"), - additionalEntryPoints: [ - { - entryName: "desktop", - entryPath: join(__dirname, "./src/desktop.ts") - }, - { - entryName: "mobile", - entryPath: join(__dirname, "./src/mobile.ts") - }, - { - entryName: "login", - entryPath: join(__dirname, "./src/login.ts") - }, - { - entryName: "setup", - entryPath: join(__dirname, "./src/setup.ts") - }, - { - entryName: "share", - entryPath: join(__dirname, "./src/share.ts") - }, - { - // TriliumNextTODO: integrate set_password into setup entry point/view - entryName: "set_password", - entryPath: join(__dirname, "./src/set_password.ts") - } - ], - externalDependencies: [ - "electron" - ], - baseHref: '/', - outputHashing: false, - optimization: process.env['NODE_ENV'] === 'production' - }), - withWeb({ - styles: [], - stylePreprocessorOptions: { - sassOptions: { - quietDeps: true - } - }, - }), - (config) => { - config.output = { - path: join(__dirname, 'dist') - }; - - config.devServer = { - port: 4200, - client: { - overlay: { - errors: true, - warnings: false, - runtimeErrors: true - } - } - } - - config.resolve.fallback = { - path: false, - fs: false, - util: false - }; - - const assets = [ "assets", "stylesheets", "libraries", "fonts", "translations" ] - config.plugins.push(new CopyPlugin({ - patterns: assets.map((asset) => ({ - from: join(__dirname, "src", asset), - to: asset - })) - })); - - inlineSvg(config); - externalJson(config); - - return config; - } -); - -function inlineSvg(config) { - if (!config.module?.rules) { - return; - } - - // Alter Nx's asset rule to avoid inlining SVG if they have ?raw prepended. - const existingRule = config.module.rules.find((r) => r.test.toString() === /\.svg$/.toString()); - existingRule.resourceQuery = { not: [/raw/] }; - - // Add a rule for prepending ?raw SVGs. - config.module.rules.push({ - resourceQuery: /raw/, - type: 'asset/source', - }); -} - -function externalJson(config) { - if (!config.module?.rules) { - return; - } - - // Add a rule for prepending ?external. - config.module.rules.push({ - resourceQuery: /external/, - type: 'asset/resource', - }); -} \ No newline at end of file diff --git a/apps/db-compare/package.json b/apps/db-compare/package.json index 301251273..370ae38a6 100644 --- a/apps/db-compare/package.json +++ b/apps/db-compare/package.json @@ -5,7 +5,7 @@ "description": "Tool to compare content of Trilium databases. Useful for debugging sync problems.", "dependencies": { "colors": "1.4.0", - "diff": "7.0.0", + "diff": "8.0.2", "sqlite": "5.1.1", "sqlite3": "5.1.7" }, @@ -67,8 +67,5 @@ } } } - }, - "devDependencies": { - "@types/diff": "^7.0.2" } } diff --git a/apps/db-compare/src/sql.ts b/apps/db-compare/src/sql.ts index 9e165ceab..adb03e4eb 100644 --- a/apps/db-compare/src/sql.ts +++ b/apps/db-compare/src/sql.ts @@ -51,8 +51,8 @@ async function getMap(db: Database, query: string, params: any[] = []) { return map; } -async function getFlattenedResults(db: Database, key: string, query: string, params: any[] = []) { - const list = []; +async function getFlattenedResults(db: Database, key: string, query: string, params: any[] = []) { + const list: T[] = []; const result = await getResults(db, query, params); for (const row of result) { diff --git a/apps/db-compare/tsconfig.app.json b/apps/db-compare/tsconfig.app.json index c5944cc79..bdf9ba861 100644 --- a/apps/db-compare/tsconfig.app.json +++ b/apps/db-compare/tsconfig.app.json @@ -6,8 +6,7 @@ "node" ], "rootDir": "src", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "verbatimModuleSyntax": false + "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo" }, "include": [ "src/**/*.ts" diff --git a/apps/desktop/.swcrc b/apps/desktop/.swcrc deleted file mode 100644 index a2d5b04f4..000000000 --- a/apps/desktop/.swcrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "jsc": { - "parser": { - "syntax": "typescript" - }, - "target": "es2016" - } -} diff --git a/apps/desktop/electron-forge/sign-windows.cjs b/apps/desktop/electron-forge/sign-windows.cjs index 12246842d..ddcf354c4 100644 --- a/apps/desktop/electron-forge/sign-windows.cjs +++ b/apps/desktop/electron-forge/sign-windows.cjs @@ -1,13 +1,10 @@ const child_process = require("child_process"); const fs = require("fs"); -const { default: path } = require("path"); +const path = require("path"); module.exports = function (filePath) { const { WINDOWS_SIGN_EXECUTABLE } = process.env; - const stats = fs.lstatSync(filePath); - console.log(filePath, stats); - if (!WINDOWS_SIGN_EXECUTABLE) { console.warn("[Sign] Skip signing due to missing environment variable."); return; @@ -19,11 +16,15 @@ module.exports = function (filePath) { fs.mkdirSync(outputDir); } - fs.copyFileSync(sourcePath, destPath); - const command = `${WINDOWS_SIGN_EXECUTABLE} --executable "${filePath}"`; - console.log(`[Sign] ${command}`); + console.log(`[Sign] Running ${command}`); - const output = child_process.execSync(command); - console.log(`[Sign] ${output}`); + try { + child_process.execSync(command); + } catch (e) { + console.warn(`[Sign] Unable to sign ${filePath} due to:\n${e.stdout.toString("utf-8")})}`) + return; + } + + console.log(`[Sign] Signed ${filePath} successfully.`); } \ No newline at end of file diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 578c0f816..024d7d3a9 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,9 +1,9 @@ { "name": "@triliumnext/desktop", - "version": "0.0.1", + "version": "0.94.0", "description": "Build your personal knowledge base with TriliumNext Notes", "private": true, - "main": "main.js", + "main": "main.cjs", "dependencies": { "@electron/remote": "2.1.2", "better-sqlite3": "^11.9.1", @@ -11,14 +11,13 @@ "electron-dl": "4.0.0", "electron-squirrel-startup": "1.0.1", "jquery.fancytree": "2.38.5", - "jquery-hotkeys": "0.2.2", - "@highlightjs/cdn-assets": "11.11.1" + "jquery-hotkeys": "0.2.2" }, "devDependencies": { "@types/electron-squirrel-startup": "1.0.2", "@triliumnext/server": "workspace:*", "copy-webpack-plugin": "13.0.0", - "electron": "36.2.0", + "electron": "36.3.2", "@electron-forge/cli": "7.8.1", "@electron-forge/maker-deb": "7.8.1", "@electron-forge/maker-dmg": "7.8.1", @@ -30,9 +29,9 @@ "prebuild-install": "^7.1.1" }, "config": { - "forge": "../electron-forge/forge.config.cjs" + "forge": "./electron-forge/forge.config.cjs" }, - "packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39", + "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977", "scripts": { "start-prod": "nx build desktop && cross-env TRILIUM_DATA_DIR=data TRILIUM_RESOURCE_DIR=dist TRILIUM_PORT=37841 electron dist/main.js" }, @@ -45,6 +44,70 @@ "nx": { "name": "desktop", "targets": { + "build": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], + "options": { + "main": "apps/desktop/src/electron-main.ts", + "outputPath": "apps/desktop/dist", + "outputFileName": "main.js", + "tsConfig": "apps/desktop/tsconfig.app.json", + "platform": "node", + "external": [ + "electron", + "@electron/remote", + "better-sqlite3", + "./xhr-sync-worker.js" + ], + "format": [ + "cjs" + ], + "minify": true, + "thirdParty": true, + "declaration": false, + "esbuildOptions": { + "splitting": false, + "loader": { + ".css": "text" + } + }, + "assets": [ + { + "glob": "**/*", + "input": "apps/server/dist/node_modules", + "output": "node_modules" + }, + { + "glob": "**/*", + "input": "apps/desktop/node_modules/@electron/remote", + "output": "node_modules/@electron/remote" + }, + { + "glob": "**/*", + "input": "apps/server/dist/assets", + "output": "assets" + }, + { + "glob": "**/*", + "input": "apps/desktop/src/assets", + "output": "assets" + }, + { + "glob": "**/*", + "input": "apps/server/dist/public", + "output": "public" + }, + { + "glob": "xhr-sync-worker.js", + "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", + "output": "" + } + ], + "declarationRootDir": "apps/desktop/src" + } + }, "rebuild-deps": { "executor": "nx:run-commands", "dependsOn": [ @@ -57,7 +120,7 @@ "command": "cross-env DEBUG=* tsx scripts/electron-rebuild.mts {projectRoot}/dist" }, "nixos": { - "command": "cross-env DEBUG=* tsx scripts/electron-rebuild.mts {projectRoot}/dist $(nix-shell -p electron_33 --run \"electron --version\")" + "command": "cross-env DEBUG=* tsx scripts/electron-rebuild.mts {projectRoot}/dist $(nix-shell -p electron_35 --run \"electron --version\")" } } }, @@ -69,11 +132,11 @@ "defaultConfiguration": "default", "configurations": { "default": { - "command": "electron .", + "command": "electron main.cjs", "cwd": "{projectRoot}/dist" }, "nixos": { - "command": "nix-shell -p electron_33 --run \"electron {projectRoot}/dist/main.js\"", + "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.cjs\"", "cwd": ".", "forwardAllArgs": false } @@ -87,11 +150,11 @@ "defaultConfiguration": "default", "configurations": { "default": { - "command": "electron .", + "command": "electron main.cjs", "cwd": "{projectRoot}/dist" }, "nixos": { - "command": "nix-shell -p electron_33 --run \"electron {projectRoot}/dist/main.js\"", + "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/main.cjs\"", "cwd": ".", "forwardAllArgs": false } @@ -99,16 +162,25 @@ }, "electron-forge:make": { "dependsOn": [ - "build" + "build", + "rebuild-deps" ], "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge make dist" }, "electron-forge:package": { "dependsOn": [ - "build" + "build", + "rebuild-deps" ], "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge package dist" + }, + "electron-forge:start": { + "dependsOn": [ + "build", + "rebuild-deps" + ], + "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm TRILIUM_DATA_DIR=./data electron-forge start dist" } } } -} +} \ No newline at end of file diff --git a/apps/desktop/src/electron-main.ts b/apps/desktop/src/electron-main.ts index ac1c712dc..c8c28ac77 100644 --- a/apps/desktop/src/electron-main.ts +++ b/apps/desktop/src/electron-main.ts @@ -22,6 +22,12 @@ async function main() { electron.app.commandLine.appendSwitch("enable-experimental-web-platform-features"); electron.app.commandLine.appendSwitch("lang", options.getOptionOrNull("formattingLocale") ?? "en"); + // Electron 36 crashes with "Using GTK 2/3 and GTK 4 in the same process is not supported" on some distributions. + // See https://github.com/electron/electron/issues/46538 for more info. + if (process.platform === "linux") { + electron.app.commandLine.appendSwitch("gtk-version", "3"); + } + // Quit when all windows are closed, except on macOS. There, it's common // for applications and their menu bar to stay active until the user quits // explicitly with Cmd + Q. @@ -44,7 +50,7 @@ async function main() { await import("@triliumnext/server/src/main.js"); } -export async function onReady() { +async function onReady() { // electron.app.setAppUserModelId('com.github.zadam.trilium'); // if db is not initialized -> setup process diff --git a/apps/desktop/tsconfig.app.json b/apps/desktop/tsconfig.app.json index 8a23da03c..24b95c5ed 100644 --- a/apps/desktop/tsconfig.app.json +++ b/apps/desktop/tsconfig.app.json @@ -1,17 +1,20 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "module": "ESNext", + "moduleResolution": "bundler", + "target": "ES2020", "outDir": "dist", "types": [ "node", "express" ], "rootDir": "src", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "verbatimModuleSyntax": false + "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo" }, "include": [ - "src/**/*.ts" + "src/**/*.ts", + "../server/src/*.d.ts" ], "exclude": [ "eslint.config.js", diff --git a/apps/desktop/webpack.config.cjs b/apps/desktop/webpack.config.cjs deleted file mode 100644 index edd32780a..000000000 --- a/apps/desktop/webpack.config.cjs +++ /dev/null @@ -1,67 +0,0 @@ -const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin'); -const CopyPlugin = require('copy-webpack-plugin'); -const { join } = require('path'); - -const outputDir = join(__dirname, 'dist'); - -module.exports = { - output: { - path: outputDir, - }, - module: { - rules: [ - { - test: /\.css$/i, - type: "asset/source" - } - ] - }, - target: [ "node" ], - plugins: [ - new NxAppWebpackPlugin({ - target: 'node', - compiler: 'tsc', - main: './src/electron-main.ts', - tsConfig: './tsconfig.app.json', - assets: ["./src/assets"], - optimization: false, - outputHashing: 'none', - generatePackageJson: false, - externalDependencies: [ - "electron/main", - "@electron/remote/main", - "electron", - "@electron/remote", - "better-sqlite3" - ] - }), - new CopyPlugin({ - patterns: [ - { - from: "../client/dist", - to: join(outputDir, "public") - }, - { - from: "../server/dist/node_modules", - to: join(outputDir, "node_modules") - }, - { - from: "../server/dist/assets", - to: join(outputDir, "assets") - }, - { - from: "node_modules/@electron/remote", - to: join(outputDir, "node_modules/@electron/remote") - }, - { - from: "node_modules/prebuild-install", - to: join(outputDir, "node_modules/better-sqlite3/node_modules/prebuild-install") - }, - { - from: "package.json", - to: join(outputDir, "package.json") - } - ] - }) - ] -}; diff --git a/apps/dump-db/package.json b/apps/dump-db/package.json index cb139b010..a63105b9c 100644 --- a/apps/dump-db/package.json +++ b/apps/dump-db/package.json @@ -8,7 +8,7 @@ "mime-types": "^3.0.0", "sanitize-filename": "^1.6.3", "tsx": "^4.19.3", - "yargs": "^17.3.1" + "yargs": "^18.0.0" }, "devDependencies": { "@types/better-sqlite3": "^7.6.11", diff --git a/apps/dump-db/src/main.ts b/apps/dump-db/src/main.ts index e00f1c615..28f9065d4 100644 --- a/apps/dump-db/src/main.ts +++ b/apps/dump-db/src/main.ts @@ -1,5 +1,3 @@ -#!/usr/bin/env node - import yargs from "yargs"; import { hideBin } from "yargs/helpers"; import dumpService from "./inc/dump.js"; diff --git a/_regroup/demo/!!!meta.json b/apps/edit-docs/demo/!!!meta.json similarity index 78% rename from _regroup/demo/!!!meta.json rename to apps/edit-docs/demo/!!!meta.json index 4899c4606..178f5bd51 100644 --- a/_regroup/demo/!!!meta.json +++ b/apps/edit-docs/demo/!!!meta.json @@ -1,6 +1,6 @@ { "formatVersion": 2, - "appVersion": "0.92.5-beta", + "appVersion": "0.94.0", "files": [ { "isClone": false, @@ -21,10 +21,10 @@ "children": [ { "isClone": false, - "noteId": "sxsosDSEMa8u", + "noteId": "uXI8DRRYXWKs", "notePath": [ "root", - "sxsosDSEMa8u" + "uXI8DRRYXWKs" ], "title": "Journal", "notePosition": 10, @@ -67,10 +67,10 @@ }, { "isClone": false, - "noteId": "Fb7eMY46lT6k", + "noteId": "rvaX6hEaQlmk", "notePath": [ "root", - "Fb7eMY46lT6k" + "rvaX6hEaQlmk" ], "title": "Trilium Demo", "notePosition": 20, @@ -82,35 +82,35 @@ { "type": "relation", "name": "internalLink", - "value": "qP9UEZ4kQ0NK", + "value": "Th0SHTjziC8R", "isInheritable": false, "position": 10 }, { "type": "relation", "name": "internalLink", - "value": "8DORylN1bL6J", + "value": "1afuYh5pfoEP", "isInheritable": false, "position": 20 }, { "type": "relation", "name": "internalLink", - "value": "rIP0ngPPeia6", + "value": "FtCt1LKirRGs", "isInheritable": false, "position": 30 }, { "type": "relation", "name": "internalLink", - "value": "TIKj1aLdHCzw", + "value": "uppxiNYbjvGw", "isInheritable": false, "position": 40 }, { "type": "relation", "name": "internalLink", - "value": "xd22mlgxfdWw", + "value": "Q3ve69mXIaMY", "isInheritable": false, "position": 50 }, @@ -126,7 +126,7 @@ "dataFileName": "Trilium Demo.html", "attachments": [ { - "attachmentId": "96nFd7uePoSp", + "attachmentId": "49LZY5VsPxHQ", "title": "icon-color.svg", "role": "image", "mime": "image/svg+xml", @@ -138,16 +138,16 @@ "children": [ { "isClone": false, - "noteId": "B08ZaJdYTK5v", + "noteId": "Ys8DWdyfaZcf", "notePath": [ "root", - "Fb7eMY46lT6k", - "B08ZaJdYTK5v" + "rvaX6hEaQlmk", + "Ys8DWdyfaZcf" ], "title": "Inbox", "notePosition": 10, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -166,12 +166,12 @@ "children": [ { "isClone": false, - "noteId": "nMiFslI2hks0", + "noteId": "pazSSdaZVwtg", "notePath": [ "root", - "Fb7eMY46lT6k", - "B08ZaJdYTK5v", - "nMiFslI2hks0" + "rvaX6hEaQlmk", + "Ys8DWdyfaZcf", + "pazSSdaZVwtg" ], "title": "Grocery list for today", "notePosition": 0, @@ -186,12 +186,12 @@ }, { "isClone": false, - "noteId": "RsIQGAjjnfgv", + "noteId": "dqqETl7LjFV7", "notePath": [ "root", - "Fb7eMY46lT6k", - "B08ZaJdYTK5v", - "RsIQGAjjnfgv" + "rvaX6hEaQlmk", + "Ys8DWdyfaZcf", + "dqqETl7LjFV7" ], "title": "Book to read", "notePosition": 10, @@ -206,12 +206,12 @@ }, { "isClone": false, - "noteId": "47q1VMmTjJtx", + "noteId": "A6cJSHsdETV2", "notePath": [ "root", - "Fb7eMY46lT6k", - "B08ZaJdYTK5v", - "47q1VMmTjJtx" + "rvaX6hEaQlmk", + "Ys8DWdyfaZcf", + "A6cJSHsdETV2" ], "title": "The Last Question", "notePosition": 20, @@ -220,19 +220,12 @@ "type": "text", "mime": "text/html", "attributes": [ - { - "type": "relation", - "name": "includeNoteLink", - "value": "ZWCYra81yOFO", - "isInheritable": false, - "position": 10 - }, { "type": "relation", "name": "internalLink", "value": "_help_nBAXQFj20hS1", "isInheritable": false, - "position": 20 + "position": 10 } ], "format": "html", @@ -242,13 +235,13 @@ "children": [ { "isClone": false, - "noteId": "ZWCYra81yOFO", + "noteId": "VsFbpoySMCE3", "notePath": [ "root", - "Fb7eMY46lT6k", - "B08ZaJdYTK5v", - "47q1VMmTjJtx", - "ZWCYra81yOFO" + "rvaX6hEaQlmk", + "Ys8DWdyfaZcf", + "A6cJSHsdETV2", + "VsFbpoySMCE3" ], "title": "The Last Question by Issac Asimov.pdf", "notePosition": 0, @@ -274,11 +267,11 @@ }, { "isClone": false, - "noteId": "vHpMd49rAUWn", + "noteId": "xY1FldcqIlaS", "notePath": [ "root", - "Fb7eMY46lT6k", - "vHpMd49rAUWn" + "rvaX6hEaQlmk", + "xY1FldcqIlaS" ], "title": "Formatting examples", "notePosition": 20, @@ -292,12 +285,12 @@ "children": [ { "isClone": false, - "noteId": "qP9UEZ4kQ0NK", + "noteId": "Th0SHTjziC8R", "notePath": [ "root", - "Fb7eMY46lT6k", - "vHpMd49rAUWn", - "qP9UEZ4kQ0NK" + "rvaX6hEaQlmk", + "xY1FldcqIlaS", + "Th0SHTjziC8R" ], "title": "School schedule", "notePosition": 0, @@ -320,12 +313,12 @@ }, { "isClone": false, - "noteId": "8DORylN1bL6J", + "noteId": "1afuYh5pfoEP", "notePath": [ "root", - "Fb7eMY46lT6k", - "vHpMd49rAUWn", - "8DORylN1bL6J" + "rvaX6hEaQlmk", + "xY1FldcqIlaS", + "1afuYh5pfoEP" ], "title": "Checkbox lists", "notePosition": 10, @@ -348,12 +341,12 @@ }, { "isClone": false, - "noteId": "rIP0ngPPeia6", + "noteId": "FtCt1LKirRGs", "notePath": [ "root", - "Fb7eMY46lT6k", - "vHpMd49rAUWn", - "rIP0ngPPeia6" + "rvaX6hEaQlmk", + "xY1FldcqIlaS", + "FtCt1LKirRGs" ], "title": "Highlighting", "notePosition": 20, @@ -376,12 +369,12 @@ }, { "isClone": false, - "noteId": "TIKj1aLdHCzw", + "noteId": "uppxiNYbjvGw", "notePath": [ "root", - "Fb7eMY46lT6k", - "vHpMd49rAUWn", - "TIKj1aLdHCzw" + "rvaX6hEaQlmk", + "xY1FldcqIlaS", + "uppxiNYbjvGw" ], "title": "Code blocks", "notePosition": 30, @@ -393,7 +386,7 @@ { "type": "relation", "name": "internalLink", - "value": "IPifAXM3cyRS", + "value": "sh460UeSCkDG", "isInheritable": false, "position": 10 }, @@ -411,12 +404,12 @@ }, { "isClone": false, - "noteId": "xd22mlgxfdWw", + "noteId": "Q3ve69mXIaMY", "notePath": [ "root", - "Fb7eMY46lT6k", - "vHpMd49rAUWn", - "xd22mlgxfdWw" + "rvaX6hEaQlmk", + "xY1FldcqIlaS", + "Q3ve69mXIaMY" ], "title": "Math", "notePosition": 40, @@ -441,11 +434,11 @@ }, { "isClone": false, - "noteId": "eYIqnBvdAmaE", + "noteId": "zoH8XiuiEJSV", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV" ], "title": "Journal", "notePosition": 30, @@ -464,7 +457,7 @@ { "type": "relation", "name": "child:child:child:template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 20 }, @@ -483,12 +476,12 @@ "children": [ { "isClone": false, - "noteId": "3H4RMc45XIpI", + "noteId": "b3kSYO90QeET", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET" ], "title": "2021", "notePosition": 10, @@ -514,7 +507,7 @@ { "type": "relation", "name": "child:child:template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 30 } @@ -525,13 +518,13 @@ "children": [ { "isClone": false, - "noteId": "oNJGQb0t2SGb", + "noteId": "iYU0SglOv14g", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "oNJGQb0t2SGb" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "iYU0SglOv14g" ], "title": "11 - November", "notePosition": 10, @@ -557,7 +550,7 @@ { "type": "relation", "name": "child:template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 30 } @@ -568,14 +561,14 @@ "children": [ { "isClone": false, - "noteId": "JvGlcvRf2Lu8", + "noteId": "snHll0LeHI7G", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "oNJGQb0t2SGb", - "JvGlcvRf2Lu8" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "iYU0SglOv14g", + "snHll0LeHI7G" ], "title": "28 - Tuesday", "notePosition": 10, @@ -594,7 +587,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 20 } @@ -606,15 +599,15 @@ "children": [ { "isClone": false, - "noteId": "k11dU4eL5Teq", + "noteId": "pu9pBUH4VFPN", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "oNJGQb0t2SGb", - "JvGlcvRf2Lu8", - "k11dU4eL5Teq" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "iYU0SglOv14g", + "snHll0LeHI7G", + "pu9pBUH4VFPN" ], "title": "Phone call about work project", "notePosition": 0, @@ -629,15 +622,15 @@ }, { "isClone": false, - "noteId": "RNf8bX9CdR1k", + "noteId": "JfG63T2BUsrG", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "oNJGQb0t2SGb", - "JvGlcvRf2Lu8", - "RNf8bX9CdR1k" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "iYU0SglOv14g", + "snHll0LeHI7G", + "JfG63T2BUsrG" ], "title": "Christmas gift ideas", "notePosition": 10, @@ -652,15 +645,15 @@ }, { "isClone": false, - "noteId": "AaxrGGwyIPxO", + "noteId": "o8F1rlidMSlU", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "oNJGQb0t2SGb", - "JvGlcvRf2Lu8", - "AaxrGGwyIPxO" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "iYU0SglOv14g", + "snHll0LeHI7G", + "o8F1rlidMSlU" ], "title": "Trusted timestamping", "notePosition": 20, @@ -679,13 +672,13 @@ }, { "isClone": false, - "noteId": "BkmGEUBkAvZC", + "noteId": "SbaYih0D3uUk", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk" ], "title": "12 - December", "notePosition": 20, @@ -711,7 +704,7 @@ { "type": "relation", "name": "child:template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 30 } @@ -722,14 +715,14 @@ "children": [ { "isClone": false, - "noteId": "S9e1O6walQlq", + "noteId": "BL4b1a0UF8Lx", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx" ], "title": "18 - Monday", "notePosition": 10, @@ -741,7 +734,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 10 }, @@ -767,15 +760,15 @@ "children": [ { "isClone": false, - "noteId": "aqelIyWn57Aa", + "noteId": "aaULGL3KvSSH", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "aqelIyWn57Aa" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "aaULGL3KvSSH" ], "title": "Meeting minutes", "notePosition": 0, @@ -790,15 +783,15 @@ }, { "isClone": false, - "noteId": "xqGIjsmQPRPq", + "noteId": "XzkV6K6a7xO4", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4" ], "title": "Photos from the trip", "notePosition": 10, @@ -820,16 +813,16 @@ "children": [ { "isClone": false, - "noteId": "1EdiWGOQB4RK", + "noteId": "P0BVQpp3s4PQ", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "1EdiWGOQB4RK" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "P0BVQpp3s4PQ" ], "title": "01.jpeg", "notePosition": 0, @@ -858,16 +851,16 @@ }, { "isClone": false, - "noteId": "NUeVuPpK1N7f", + "noteId": "EahTkXB5OWCD", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "NUeVuPpK1N7f" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "EahTkXB5OWCD" ], "title": "02.jpeg", "notePosition": 10, @@ -896,16 +889,16 @@ }, { "isClone": false, - "noteId": "u3Cb1NkuHVFu", + "noteId": "Ttda71dsPGSn", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "u3Cb1NkuHVFu" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "Ttda71dsPGSn" ], "title": "03.jpeg", "notePosition": 20, @@ -934,16 +927,16 @@ }, { "isClone": false, - "noteId": "RMk5ZL0mw2vh", + "noteId": "droyGgN0bsMD", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "RMk5ZL0mw2vh" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "droyGgN0bsMD" ], "title": "04.jpeg", "notePosition": 30, @@ -972,16 +965,16 @@ }, { "isClone": false, - "noteId": "lA77h6Gld6Af", + "noteId": "cVtKAYgEWRG2", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "lA77h6Gld6Af" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "cVtKAYgEWRG2" ], "title": "05.jpeg", "notePosition": 40, @@ -1010,16 +1003,16 @@ }, { "isClone": false, - "noteId": "5bKca24TwvXi", + "noteId": "tV1Kjv6LEKPK", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "5bKca24TwvXi" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "tV1Kjv6LEKPK" ], "title": "06.jpeg", "notePosition": 50, @@ -1048,16 +1041,16 @@ }, { "isClone": false, - "noteId": "Dw80f8XRUEkb", + "noteId": "5wcyB4t5al4h", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "Dw80f8XRUEkb" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "5wcyB4t5al4h" ], "title": "07.jpeg", "notePosition": 60, @@ -1086,16 +1079,16 @@ }, { "isClone": false, - "noteId": "3B4wY3ysFzUL", + "noteId": "ppwyRRjdOAWX", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "3B4wY3ysFzUL" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "ppwyRRjdOAWX" ], "title": "08.jpeg", "notePosition": 70, @@ -1124,16 +1117,16 @@ }, { "isClone": false, - "noteId": "8rJBABNUlLlJ", + "noteId": "qYLcsGWPaUBw", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "8rJBABNUlLlJ" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "qYLcsGWPaUBw" ], "title": "09.jpeg", "notePosition": 80, @@ -1162,16 +1155,16 @@ }, { "isClone": false, - "noteId": "2mkSjqnJhj9i", + "noteId": "jYFCqQVLD15p", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "2mkSjqnJhj9i" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "jYFCqQVLD15p" ], "title": "10.jpeg", "notePosition": 90, @@ -1200,16 +1193,16 @@ }, { "isClone": false, - "noteId": "oPcnET6xqcz1", + "noteId": "xQxHCWRvFGOZ", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "oPcnET6xqcz1" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "xQxHCWRvFGOZ" ], "title": "11.jpeg", "notePosition": 100, @@ -1238,16 +1231,16 @@ }, { "isClone": false, - "noteId": "V1OwJwsPuBzj", + "noteId": "9HheXquf5atI", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "xqGIjsmQPRPq", - "V1OwJwsPuBzj" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "XzkV6K6a7xO4", + "9HheXquf5atI" ], "title": "12.jpeg", "notePosition": 110, @@ -1278,15 +1271,15 @@ }, { "isClone": false, - "noteId": "vH389HhCX3to", + "noteId": "N3H75XH3nGRe", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "S9e1O6walQlq", - "vH389HhCX3to" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "BL4b1a0UF8Lx", + "N3H75XH3nGRe" ], "title": "Send invites for christmas party", "notePosition": 20, @@ -1339,14 +1332,14 @@ }, { "isClone": false, - "noteId": "Xa15h4cRL6O8", + "noteId": "E5ZFA3tndbcj", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "Xa15h4cRL6O8" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "E5ZFA3tndbcj" ], "title": "19 - Tuesday", "notePosition": 20, @@ -1358,7 +1351,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 10 }, @@ -1384,15 +1377,15 @@ "children": [ { "isClone": false, - "noteId": "KaNVFkFBdkvZ", + "noteId": "UB4Rt240VgV9", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "Xa15h4cRL6O8", - "KaNVFkFBdkvZ" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "E5ZFA3tndbcj", + "UB4Rt240VgV9" ], "title": "Dentist appointment", "notePosition": 0, @@ -1445,14 +1438,14 @@ }, { "isClone": false, - "noteId": "mMQKGLEGtRHn", + "noteId": "YQxQ5rcWiFvQ", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "mMQKGLEGtRHn" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "YQxQ5rcWiFvQ" ], "title": "20 - Wednesday", "notePosition": 30, @@ -1464,7 +1457,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 10 }, @@ -1489,14 +1482,14 @@ }, { "isClone": false, - "noteId": "ZZz9RKYGLcK7", + "noteId": "Vf0GuwMAsitj", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "ZZz9RKYGLcK7" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "Vf0GuwMAsitj" ], "title": "21 - Thursday", "notePosition": 40, @@ -1515,7 +1508,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 20 }, @@ -1534,15 +1527,15 @@ "children": [ { "isClone": false, - "noteId": "hXwLRiT7g4dE", + "noteId": "UO2EPOezeQoa", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "ZZz9RKYGLcK7", - "hXwLRiT7g4dE" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "Vf0GuwMAsitj", + "UO2EPOezeQoa" ], "title": "Christmas shopping", "notePosition": 0, @@ -1557,15 +1550,15 @@ }, { "isClone": false, - "noteId": "jpcqxgiEtJkn", + "noteId": "7Nc2Ovjyc66i", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "ZZz9RKYGLcK7", - "jpcqxgiEtJkn" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "Vf0GuwMAsitj", + "7Nc2Ovjyc66i" ], "title": "Office party", "notePosition": 10, @@ -1582,14 +1575,14 @@ }, { "isClone": false, - "noteId": "KgE3kYIT24Sb", + "noteId": "ilB1T75UG19p", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "KgE3kYIT24Sb" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "ilB1T75UG19p" ], "title": "22 - Friday", "notePosition": 50, @@ -1608,7 +1601,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 20 }, @@ -1627,15 +1620,15 @@ "children": [ { "isClone": false, - "noteId": "AEa2Sy5UwdT4", + "noteId": "n7WlrMv9Kt9O", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "KgE3kYIT24Sb", - "AEa2Sy5UwdT4" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "ilB1T75UG19p", + "n7WlrMv9Kt9O" ], "title": "Christmas shopping", "notePosition": 0, @@ -1650,15 +1643,15 @@ }, { "isClone": false, - "noteId": "NhSSbIObzEsM", + "noteId": "kv6L6RAdwL4h", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "KgE3kYIT24Sb", - "NhSSbIObzEsM" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "ilB1T75UG19p", + "kv6L6RAdwL4h" ], "title": "The Mechanical", "notePosition": 10, @@ -1666,43 +1659,7 @@ "isExpanded": false, "type": "text", "mime": "text/html", - "attributes": [ - { - "type": "relation", - "name": "template", - "value": "ODEzxhfMalvQ", - "isInheritable": false, - "position": 10 - }, - { - "type": "label", - "name": "link", - "value": "https://www.amazon.com/Mechanical-Alchemy-Wars-Ian-Tregillis/dp/0316248002", - "isInheritable": false, - "position": 20 - }, - { - "type": "label", - "name": "author", - "value": "Ian Tregillis", - "isInheritable": false, - "position": 30 - }, - { - "type": "label", - "name": "readingStart", - "value": "2018-05-05", - "isInheritable": false, - "position": 40 - }, - { - "type": "label", - "name": "readingEnd", - "value": "2018-05-23", - "isInheritable": false, - "position": 50 - } - ], + "attributes": [], "format": "html", "dataFileName": "The Mechanical.html", "attachments": [], @@ -1710,16 +1667,16 @@ "children": [ { "isClone": false, - "noteId": "QGIhTr2UNF8V", + "noteId": "MV2KF7Ma6nCD", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "KgE3kYIT24Sb", - "NhSSbIObzEsM", - "QGIhTr2UNF8V" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "ilB1T75UG19p", + "kv6L6RAdwL4h", + "MV2KF7Ma6nCD" ], "title": "Highlights", "notePosition": 0, @@ -1738,14 +1695,14 @@ }, { "isClone": false, - "noteId": "uDulJuuQUQV9", + "noteId": "Zjezi8WBQ1Mu", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "uDulJuuQUQV9" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "Zjezi8WBQ1Mu" ], "title": "23 - Saturday", "notePosition": 60, @@ -1757,7 +1714,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 10 }, @@ -1782,14 +1739,14 @@ }, { "isClone": false, - "noteId": "cG0jN1I9tYPs", + "noteId": "gW1WbDNQRMUC", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "cG0jN1I9tYPs" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "gW1WbDNQRMUC" ], "title": "24 - Sunday - Christmas Eve!", "notePosition": 70, @@ -1801,7 +1758,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 10 }, @@ -1827,15 +1784,15 @@ "children": [ { "isClone": false, - "noteId": "xybXfFXh4kbk", + "noteId": "7MvrqjQXdy65", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "cG0jN1I9tYPs", - "xybXfFXh4kbk" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "gW1WbDNQRMUC", + "7MvrqjQXdy65" ], "title": "Buy a board game for Alice", "notePosition": 0, @@ -1898,7 +1855,7 @@ "dataFileName": "DONE - Buy a board game for Al.html", "attachments": [ { - "attachmentId": "pZ0Azmg2ivRC", + "attachmentId": "SmnN1IA6sqy7", "title": "codenames.jpg", "role": "image", "mime": "image/jpg", @@ -1909,15 +1866,15 @@ }, { "isClone": false, - "noteId": "HnU0m7ECI7G5", + "noteId": "CRjUrigNXYnP", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "cG0jN1I9tYPs", - "HnU0m7ECI7G5" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "gW1WbDNQRMUC", + "CRjUrigNXYnP" ], "title": "Buy milk", "notePosition": 10, @@ -1984,14 +1941,14 @@ }, { "isClone": false, - "noteId": "l0Hn9dXX4wJ7", + "noteId": "c5sYRApFBW5v", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "BkmGEUBkAvZC", - "l0Hn9dXX4wJ7" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "SbaYih0D3uUk", + "c5sYRApFBW5v" ], "title": "30 - Thursday", "notePosition": 80, @@ -2003,7 +1960,7 @@ { "type": "relation", "name": "template", - "value": "sINmXkCzncB4", + "value": "kr6HIBBuXRwm", "isInheritable": false, "position": 30 }, @@ -2023,13 +1980,13 @@ }, { "isClone": false, - "noteId": "2kH7aQSosO9C", + "noteId": "AD8gDaZaJekk", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "2kH7aQSosO9C" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "AD8gDaZaJekk" ], "title": "Epics", "notePosition": 30, @@ -2045,14 +2002,14 @@ "children": [ { "isClone": false, - "noteId": "BH0WNWPyihkF", + "noteId": "c3NaitsUCQck", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "2kH7aQSosO9C", - "BH0WNWPyihkF" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "AD8gDaZaJekk", + "c3NaitsUCQck" ], "title": "Christmas", "notePosition": 0, @@ -2068,15 +2025,15 @@ "children": [ { "isClone": false, - "noteId": "PDRNLWTHfOi0", + "noteId": "Lu42Q5okeVuB", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "2kH7aQSosO9C", - "BH0WNWPyihkF", - "PDRNLWTHfOi0" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "AD8gDaZaJekk", + "c3NaitsUCQck", + "Lu42Q5okeVuB" ], "title": "Vacation days", "notePosition": 0, @@ -2091,15 +2048,15 @@ }, { "isClone": false, - "noteId": "r45qXBox4mts", + "noteId": "sHSzraHtxH8l", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "2kH7aQSosO9C", - "BH0WNWPyihkF", - "r45qXBox4mts" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "AD8gDaZaJekk", + "c3NaitsUCQck", + "sHSzraHtxH8l" ], "title": "Christmas dinner", "notePosition": 10, @@ -2114,15 +2071,15 @@ }, { "isClone": false, - "noteId": "5t7iAUBdEndw", + "noteId": "Jk1NHUjA5nIT", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "2kH7aQSosO9C", - "BH0WNWPyihkF", - "5t7iAUBdEndw" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "AD8gDaZaJekk", + "c3NaitsUCQck", + "Jk1NHUjA5nIT" ], "title": "Shopping", "notePosition": 20, @@ -2137,16 +2094,16 @@ "children": [ { "isClone": true, - "noteId": "RNf8bX9CdR1k", + "noteId": "JfG63T2BUsrG", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "2kH7aQSosO9C", - "BH0WNWPyihkF", - "5t7iAUBdEndw", - "RNf8bX9CdR1k" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "AD8gDaZaJekk", + "c3NaitsUCQck", + "Jk1NHUjA5nIT", + "JfG63T2BUsrG" ], "title": "Christmas gift ideas", "prefix": "28. 11. 2017", @@ -2160,14 +2117,14 @@ }, { "isClone": false, - "noteId": "2p3IczsCyfFH", + "noteId": "cO1ZpqA44IcF", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "3H4RMc45XIpI", - "2kH7aQSosO9C", - "2p3IczsCyfFH" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "b3kSYO90QeET", + "AD8gDaZaJekk", + "cO1ZpqA44IcF" ], "title": "Vacation", "notePosition": 10, @@ -2186,12 +2143,12 @@ }, { "isClone": false, - "noteId": "sINmXkCzncB4", + "noteId": "kr6HIBBuXRwm", "notePath": [ "root", - "Fb7eMY46lT6k", - "eYIqnBvdAmaE", - "sINmXkCzncB4" + "rvaX6hEaQlmk", + "zoH8XiuiEJSV", + "kr6HIBBuXRwm" ], "title": "Day template", "notePosition": 20, @@ -2230,11 +2187,11 @@ }, { "isClone": false, - "noteId": "HGcABfDS6a51", + "noteId": "bZBkjm466gSM", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51" + "rvaX6hEaQlmk", + "bZBkjm466gSM" ], "title": "Tech", "notePosition": 40, @@ -2258,12 +2215,12 @@ "children": [ { "isClone": false, - "noteId": "1wgEZXIXYS9H", + "noteId": "RomrYHfAtLTR", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "1wgEZXIXYS9H" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "RomrYHfAtLTR" ], "title": "Security", "notePosition": 10, @@ -2286,13 +2243,13 @@ "children": [ { "isClone": true, - "noteId": "AaxrGGwyIPxO", + "noteId": "o8F1rlidMSlU", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "1wgEZXIXYS9H", - "AaxrGGwyIPxO" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "RomrYHfAtLTR", + "o8F1rlidMSlU" ], "title": "Trusted timestamping", "prefix": null, @@ -2304,12 +2261,12 @@ }, { "isClone": false, - "noteId": "7Sbzd7Qd7nSn", + "noteId": "GPaZYkEBBX0o", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "7Sbzd7Qd7nSn" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "GPaZYkEBBX0o" ], "title": "Linux", "notePosition": 20, @@ -2332,13 +2289,13 @@ "children": [ { "isClone": false, - "noteId": "zLD6PepcrYhv", + "noteId": "ogwx0UzfkpFd", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "7Sbzd7Qd7nSn", - "zLD6PepcrYhv" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "GPaZYkEBBX0o", + "ogwx0UzfkpFd" ], "title": "History", "notePosition": 0, @@ -2353,13 +2310,13 @@ }, { "isClone": false, - "noteId": "rwXwXJUFWswH", + "noteId": "MQvl2MArKI33", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "7Sbzd7Qd7nSn", - "rwXwXJUFWswH" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "GPaZYkEBBX0o", + "MQvl2MArKI33" ], "title": "Bash scripting", "notePosition": 10, @@ -2375,14 +2332,14 @@ "children": [ { "isClone": false, - "noteId": "F7QT7w1jFQ4S", + "noteId": "J3x4Au74CLjn", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "7Sbzd7Qd7nSn", - "rwXwXJUFWswH", - "F7QT7w1jFQ4S" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "GPaZYkEBBX0o", + "MQvl2MArKI33", + "J3x4Au74CLjn" ], "title": "While loop", "notePosition": 0, @@ -2397,14 +2354,14 @@ }, { "isClone": false, - "noteId": "Xllm9YiBRXqN", + "noteId": "XjmLbxm47KRJ", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "7Sbzd7Qd7nSn", - "rwXwXJUFWswH", - "Xllm9YiBRXqN" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "GPaZYkEBBX0o", + "MQvl2MArKI33", + "XjmLbxm47KRJ" ], "title": "Bash startup modes", "notePosition": 10, @@ -2421,13 +2378,13 @@ }, { "isClone": false, - "noteId": "E8inmLohu8XE", + "noteId": "yWP7kwU5IQyo", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "7Sbzd7Qd7nSn", - "E8inmLohu8XE" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "GPaZYkEBBX0o", + "yWP7kwU5IQyo" ], "title": "Ubuntu", "notePosition": 20, @@ -2443,14 +2400,14 @@ "children": [ { "isClone": false, - "noteId": "elwY4igN6EGl", + "noteId": "6IjjOQJn7k50", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "7Sbzd7Qd7nSn", - "E8inmLohu8XE", - "elwY4igN6EGl" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "GPaZYkEBBX0o", + "yWP7kwU5IQyo", + "6IjjOQJn7k50" ], "title": "Unity shortcuts", "notePosition": 0, @@ -2469,12 +2426,12 @@ }, { "isClone": false, - "noteId": "VpNAHIDDlcLh", + "noteId": "6mWClR7od2pV", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "VpNAHIDDlcLh" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "6mWClR7od2pV" ], "title": "Programming", "notePosition": 30, @@ -2497,13 +2454,13 @@ "children": [ { "isClone": false, - "noteId": "penrSU9H9j0z", + "noteId": "x6YTurY3BTiG", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "VpNAHIDDlcLh", - "penrSU9H9j0z" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "6mWClR7od2pV", + "x6YTurY3BTiG" ], "title": "Java", "notePosition": 0, @@ -2526,13 +2483,13 @@ }, { "isClone": true, - "noteId": "rwXwXJUFWswH", + "noteId": "MQvl2MArKI33", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "VpNAHIDDlcLh", - "rwXwXJUFWswH" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "6mWClR7od2pV", + "MQvl2MArKI33" ], "title": "Bash scripting", "prefix": null, @@ -2544,12 +2501,12 @@ }, { "isClone": false, - "noteId": "B16t4MPcxaAs", + "noteId": "SHbxthISQkxg", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "B16t4MPcxaAs" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "SHbxthISQkxg" ], "title": "Node.js", "notePosition": 40, @@ -2571,13 +2528,13 @@ "children": [ { "isClone": false, - "noteId": "UDLLOhsgyVLk", + "noteId": "bXXkjeUR2M5Y", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "B16t4MPcxaAs", - "UDLLOhsgyVLk" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "SHbxthISQkxg", + "bXXkjeUR2M5Y" ], "title": "Intro", "notePosition": 0, @@ -2592,13 +2549,13 @@ }, { "isClone": false, - "noteId": "LWpxsRzR1WbA", + "noteId": "wys20ie8Saky", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "B16t4MPcxaAs", - "LWpxsRzR1WbA" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "SHbxthISQkxg", + "wys20ie8Saky" ], "title": "Overview", "notePosition": 10, @@ -2614,14 +2571,14 @@ "children": [ { "isClone": false, - "noteId": "PHD3wfCknzIJ", + "noteId": "d3ghNjFh60OT", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "B16t4MPcxaAs", - "LWpxsRzR1WbA", - "PHD3wfCknzIJ" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "SHbxthISQkxg", + "wys20ie8Saky", + "d3ghNjFh60OT" ], "title": "History", "notePosition": 0, @@ -2636,14 +2593,14 @@ }, { "isClone": false, - "noteId": "ZBPDxGMrNx7O", + "noteId": "SN03WufBiQyo", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "B16t4MPcxaAs", - "LWpxsRzR1WbA", - "ZBPDxGMrNx7O" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "SHbxthISQkxg", + "wys20ie8Saky", + "SN03WufBiQyo" ], "title": "Platform architecture", "notePosition": 10, @@ -2658,14 +2615,14 @@ }, { "isClone": false, - "noteId": "dXjFj3SB4m1I", + "noteId": "ZnHMVQBreHkY", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "B16t4MPcxaAs", - "LWpxsRzR1WbA", - "dXjFj3SB4m1I" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "SHbxthISQkxg", + "wys20ie8Saky", + "ZnHMVQBreHkY" ], "title": "Industry support", "notePosition": 20, @@ -2682,13 +2639,13 @@ }, { "isClone": false, - "noteId": "TRT99FK2qOzt", + "noteId": "Gwt1NcVHVN4J", "notePath": [ "root", - "Fb7eMY46lT6k", - "HGcABfDS6a51", - "B16t4MPcxaAs", - "TRT99FK2qOzt" + "rvaX6hEaQlmk", + "bZBkjm466gSM", + "SHbxthISQkxg", + "Gwt1NcVHVN4J" ], "title": "Releases", "notePosition": 20, @@ -2707,16 +2664,16 @@ }, { "isClone": false, - "noteId": "k7rcoITZRsi6", + "noteId": "dvgVuMNvit5M", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6" + "rvaX6hEaQlmk", + "dvgVuMNvit5M" ], "title": "Note Types", "notePosition": 60, "prefix": null, - "isExpanded": true, + "isExpanded": false, "type": "text", "mime": "text/html", "attributes": [ @@ -2734,12 +2691,12 @@ "children": [ { "isClone": false, - "noteId": "P1OnNHRhFn9u", + "noteId": "vnyKLHvbHZa5", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "P1OnNHRhFn9u" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "vnyKLHvbHZa5" ], "title": "Canvas", "notePosition": 10, @@ -2751,7 +2708,7 @@ "dataFileName": "Canvas.json", "attachments": [ { - "attachmentId": "LrYmWTdvBYpX", + "attachmentId": "C6BFKNdZQHRC", "title": "canvas-export.svg", "role": "image", "mime": "image/svg+xml", @@ -2762,12 +2719,12 @@ }, { "isClone": false, - "noteId": "lZlMer9EkwF8", + "noteId": "6156RTTenVtt", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt" ], "title": "Mermaid Diagrams", "notePosition": 20, @@ -2789,13 +2746,13 @@ "children": [ { "isClone": false, - "noteId": "DALQSU4fng4F", + "noteId": "SHvERoLB6fj8", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "DALQSU4fng4F" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "SHvERoLB6fj8" ], "title": "Flow", "notePosition": 10, @@ -2807,7 +2764,7 @@ "dataFileName": "Flow.txt", "attachments": [ { - "attachmentId": "6u2TW8zweuBN", + "attachmentId": "DRQRqkeasUcb", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -2818,13 +2775,13 @@ }, { "isClone": false, - "noteId": "g7rjYwoleBlR", + "noteId": "EQPqvF08hPVy", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "g7rjYwoleBlR" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "EQPqvF08hPVy" ], "title": "Flow (ELK)", "notePosition": 11, @@ -2836,7 +2793,7 @@ "dataFileName": "Flow (ELK).txt", "attachments": [ { - "attachmentId": "9TKNS3IHYYQq", + "attachmentId": "dVGC3G8tekQW", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -2847,13 +2804,13 @@ }, { "isClone": false, - "noteId": "t73XNJNTTwQp", + "noteId": "hPXTC0epiXkk", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "t73XNJNTTwQp" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "hPXTC0epiXkk" ], "title": "Sequence", "notePosition": 20, @@ -2865,7 +2822,7 @@ "dataFileName": "Sequence.txt", "attachments": [ { - "attachmentId": "XfWi1TqleVbL", + "attachmentId": "xSLnrl7h3fiT", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -2876,13 +2833,13 @@ }, { "isClone": false, - "noteId": "6wdYxWSVuXof", + "noteId": "a8AMHbDdTyNz", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "6wdYxWSVuXof" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "a8AMHbDdTyNz" ], "title": "Gantt", "notePosition": 30, @@ -2894,7 +2851,7 @@ "dataFileName": "Gantt.txt", "attachments": [ { - "attachmentId": "zCjOBL5UP9ii", + "attachmentId": "Zk2G65QXLBkz", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -2905,13 +2862,13 @@ }, { "isClone": false, - "noteId": "WKL3yssKyoth", + "noteId": "rmAseO7ISgEK", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "WKL3yssKyoth" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "rmAseO7ISgEK" ], "title": "Class", "notePosition": 40, @@ -2923,7 +2880,7 @@ "dataFileName": "Class.txt", "attachments": [ { - "attachmentId": "sRADq0QJpaYr", + "attachmentId": "kO7BRtEJU47L", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -2934,13 +2891,13 @@ }, { "isClone": false, - "noteId": "v9TM7cCXBILP", + "noteId": "gZKhj4WEYrRY", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "v9TM7cCXBILP" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "gZKhj4WEYrRY" ], "title": "State", "notePosition": 50, @@ -2952,7 +2909,7 @@ "dataFileName": "State.txt", "attachments": [ { - "attachmentId": "NhPv2lQln1g4", + "attachmentId": "QEYXvcbekWg8", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -2963,13 +2920,13 @@ }, { "isClone": false, - "noteId": "1EDhd9QJyulq", + "noteId": "3LrbigleD5U6", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "1EDhd9QJyulq" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "3LrbigleD5U6" ], "title": "Mind Map", "notePosition": 60, @@ -2981,7 +2938,7 @@ "dataFileName": "Mind Map.txt", "attachments": [ { - "attachmentId": "Q8EircLk65HH", + "attachmentId": "QWELEP3BIox8", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -2992,13 +2949,13 @@ }, { "isClone": false, - "noteId": "n32hpxSA2fP8", + "noteId": "eWRu1caODwQ7", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "n32hpxSA2fP8" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "eWRu1caODwQ7" ], "title": "Pie", "notePosition": 70, @@ -3010,7 +2967,7 @@ "dataFileName": "Pie.txt", "attachments": [ { - "attachmentId": "6xhRWdFidyIg", + "attachmentId": "8QESGpZlxlaP", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -3021,13 +2978,13 @@ }, { "isClone": false, - "noteId": "T0QEYaEv7PmE", + "noteId": "zCZPqmBtCkk9", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "T0QEYaEv7PmE" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "zCZPqmBtCkk9" ], "title": "Journey", "notePosition": 80, @@ -3039,7 +2996,7 @@ "dataFileName": "Journey.txt", "attachments": [ { - "attachmentId": "sxLqDNmjlbK4", + "attachmentId": "jXvpt0lsL1Wj", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -3050,13 +3007,13 @@ }, { "isClone": false, - "noteId": "P9QvwWzLZnXJ", + "noteId": "Pnv2FquBIfl5", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "P9QvwWzLZnXJ" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "Pnv2FquBIfl5" ], "title": "Git", "notePosition": 90, @@ -3068,7 +3025,7 @@ "dataFileName": "Git.txt", "attachments": [ { - "attachmentId": "tIoCBIaY50Jm", + "attachmentId": "FFBAw2a1dx84", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -3079,13 +3036,13 @@ }, { "isClone": false, - "noteId": "19O4nsY7dkPt", + "noteId": "dZ3AQfk4DMUh", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "19O4nsY7dkPt" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "dZ3AQfk4DMUh" ], "title": "Entity Relationship", "notePosition": 100, @@ -3097,7 +3054,7 @@ "dataFileName": "Entity Relationship.txt", "attachments": [ { - "attachmentId": "AyKZhKQIE5w9", + "attachmentId": "DJgvhIa4o6vm", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -3108,13 +3065,13 @@ }, { "isClone": false, - "noteId": "2izpY6SPbmhp", + "noteId": "6F50lXa4nQdo", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "2izpY6SPbmhp" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "6F50lXa4nQdo" ], "title": "Bar chart", "notePosition": 110, @@ -3126,7 +3083,7 @@ "dataFileName": "Bar chart.txt", "attachments": [ { - "attachmentId": "r1wMURlU52l8", + "attachmentId": "c1QUhX4T1LxY", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -3137,13 +3094,13 @@ }, { "isClone": false, - "noteId": "hwx0dffwqIGg", + "noteId": "KTsZskCGRbA4", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "lZlMer9EkwF8", - "hwx0dffwqIGg" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "6156RTTenVtt", + "KTsZskCGRbA4" ], "title": "C4", "notePosition": 120, @@ -3155,7 +3112,7 @@ "dataFileName": "C4.txt", "attachments": [ { - "attachmentId": "6v2qO6zsygVC", + "attachmentId": "Sr89usqNJfOw", "title": "mermaid-export.svg", "role": "image", "mime": "image/svg+xml", @@ -3168,12 +3125,12 @@ }, { "isClone": false, - "noteId": "CN3CCLggUqf4", + "noteId": "5eoXhBVBJmVS", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "CN3CCLggUqf4" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "5eoXhBVBJmVS" ], "title": "Mind Map", "notePosition": 30, @@ -3185,7 +3142,7 @@ "dataFileName": "Mind Map.json", "attachments": [ { - "attachmentId": "xKxyCN02w5d2", + "attachmentId": "mf1aX48Kwveu", "title": "mindmap-export.svg", "role": "image", "mime": "image/svg+xml", @@ -3196,12 +3153,12 @@ }, { "isClone": false, - "noteId": "OdCVNGzsvWuv", + "noteId": "65Kj96Nbdc7Q", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "OdCVNGzsvWuv" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "65Kj96Nbdc7Q" ], "title": "Geo Map (The Seven Wonders of the World)", "notePosition": 40, @@ -3231,13 +3188,13 @@ "children": [ { "isClone": false, - "noteId": "IdHyf4rlLmlO", + "noteId": "CM2Anb6Tre6X", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "OdCVNGzsvWuv", - "IdHyf4rlLmlO" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "65Kj96Nbdc7Q", + "CM2Anb6Tre6X" ], "title": "The Colosseum, Rome, Italy", "notePosition": 10, @@ -3267,13 +3224,13 @@ }, { "isClone": false, - "noteId": "Wyp6vjVo0vuV", + "noteId": "cQzdY4sLOH09", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "OdCVNGzsvWuv", - "Wyp6vjVo0vuV" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "65Kj96Nbdc7Q", + "cQzdY4sLOH09" ], "title": "The Great Wall of China", "notePosition": 20, @@ -3303,13 +3260,13 @@ }, { "isClone": false, - "noteId": "VsO5E97Y2mPy", + "noteId": "5SW71KrDoAP3", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "OdCVNGzsvWuv", - "VsO5E97Y2mPy" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "65Kj96Nbdc7Q", + "5SW71KrDoAP3" ], "title": "The Taj Mahal, India", "notePosition": 30, @@ -3339,13 +3296,13 @@ }, { "isClone": false, - "noteId": "8nRYOMoDdWs3", + "noteId": "1EDzMGtWVNOv", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "OdCVNGzsvWuv", - "8nRYOMoDdWs3" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "65Kj96Nbdc7Q", + "1EDzMGtWVNOv" ], "title": "Christ the Redeemer, Brazil", "notePosition": 40, @@ -3375,13 +3332,13 @@ }, { "isClone": false, - "noteId": "nZxMTxkP8AQ4", + "noteId": "efZsyQHpu0k7", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "OdCVNGzsvWuv", - "nZxMTxkP8AQ4" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "65Kj96Nbdc7Q", + "efZsyQHpu0k7" ], "title": "Machu Picchu, Peru", "notePosition": 50, @@ -3411,13 +3368,13 @@ }, { "isClone": false, - "noteId": "DtMcvaYKen9C", + "noteId": "DYP8VQ7iEipa", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "OdCVNGzsvWuv", - "DtMcvaYKen9C" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "65Kj96Nbdc7Q", + "DYP8VQ7iEipa" ], "title": "Chichén Itzá, Mexico", "notePosition": 60, @@ -3447,13 +3404,13 @@ }, { "isClone": false, - "noteId": "ZkR3GvsSQ0Xe", + "noteId": "eDTxcs4A7xYB", "notePath": [ "root", - "Fb7eMY46lT6k", - "k7rcoITZRsi6", - "OdCVNGzsvWuv", - "ZkR3GvsSQ0Xe" + "rvaX6hEaQlmk", + "dvgVuMNvit5M", + "65Kj96Nbdc7Q", + "eDTxcs4A7xYB" ], "title": "Petra, Jordan", "notePosition": 70, @@ -3487,11 +3444,11 @@ }, { "isClone": false, - "noteId": "L2NrzQACw0in", + "noteId": "XpCKD6IODUj2", "notePath": [ "root", - "Fb7eMY46lT6k", - "L2NrzQACw0in" + "rvaX6hEaQlmk", + "XpCKD6IODUj2" ], "title": "Books", "notePosition": 130, @@ -3503,7 +3460,7 @@ { "type": "relation", "name": "child:template", - "value": "ODEzxhfMalvQ", + "value": "O9xYjAzeyT9O", "isInheritable": false, "position": 10 }, @@ -3528,12 +3485,12 @@ "children": [ { "isClone": false, - "noteId": "Mzby9GxzBFl1", + "noteId": "rdGlenjQSD4y", "notePath": [ "root", - "Fb7eMY46lT6k", - "L2NrzQACw0in", - "Mzby9GxzBFl1" + "rvaX6hEaQlmk", + "XpCKD6IODUj2", + "rdGlenjQSD4y" ], "title": "To read", "notePosition": 0, @@ -3548,12 +3505,12 @@ }, { "isClone": false, - "noteId": "ODEzxhfMalvQ", + "noteId": "O9xYjAzeyT9O", "notePath": [ "root", - "Fb7eMY46lT6k", - "L2NrzQACw0in", - "ODEzxhfMalvQ" + "rvaX6hEaQlmk", + "XpCKD6IODUj2", + "O9xYjAzeyT9O" ], "title": "Book template", "notePosition": 10, @@ -3612,13 +3569,13 @@ "children": [ { "isClone": false, - "noteId": "MFVR8MlrXQDQ", + "noteId": "J6gog8wRwN8g", "notePath": [ "root", - "Fb7eMY46lT6k", - "L2NrzQACw0in", - "ODEzxhfMalvQ", - "MFVR8MlrXQDQ" + "rvaX6hEaQlmk", + "XpCKD6IODUj2", + "O9xYjAzeyT9O", + "J6gog8wRwN8g" ], "title": "Highlights", "notePosition": 10, @@ -3635,12 +3592,12 @@ }, { "isClone": false, - "noteId": "IWFmoH3KgkH2", + "noteId": "rZ3BP6Qfyker", "notePath": [ "root", - "Fb7eMY46lT6k", - "L2NrzQACw0in", - "IWFmoH3KgkH2" + "rvaX6hEaQlmk", + "XpCKD6IODUj2", + "rZ3BP6Qfyker" ], "title": "Reviews", "notePosition": 20, @@ -3652,7 +3609,7 @@ { "type": "relation", "name": "child:template", - "value": "ODEzxhfMalvQ", + "value": "O9xYjAzeyT9O", "isInheritable": false, "position": 10 } @@ -3663,13 +3620,13 @@ "children": [ { "isClone": true, - "noteId": "NhSSbIObzEsM", + "noteId": "kv6L6RAdwL4h", "notePath": [ "root", - "Fb7eMY46lT6k", - "L2NrzQACw0in", - "IWFmoH3KgkH2", - "NhSSbIObzEsM" + "rvaX6hEaQlmk", + "XpCKD6IODUj2", + "rZ3BP6Qfyker", + "kv6L6RAdwL4h" ], "title": "The Mechanical", "prefix": null, @@ -3683,11 +3640,11 @@ }, { "isClone": false, - "noteId": "EBROzsTV1jh4", + "noteId": "B2ao3EopB5yW", "notePath": [ "root", - "Fb7eMY46lT6k", - "EBROzsTV1jh4" + "rvaX6hEaQlmk", + "B2ao3EopB5yW" ], "title": "Work", "notePosition": 150, @@ -3710,12 +3667,12 @@ "children": [ { "isClone": false, - "noteId": "WgVZEuZC0Hv8", + "noteId": "wqzzSbAEUFLQ", "notePath": [ "root", - "Fb7eMY46lT6k", - "EBROzsTV1jh4", - "WgVZEuZC0Hv8" + "rvaX6hEaQlmk", + "B2ao3EopB5yW", + "wqzzSbAEUFLQ" ], "title": "HR", "notePosition": 0, @@ -3730,12 +3687,12 @@ }, { "isClone": false, - "noteId": "oHu27s9uc20i", + "noteId": "9CA1t6Z3JTOT", "notePath": [ "root", - "Fb7eMY46lT6k", - "EBROzsTV1jh4", - "oHu27s9uc20i" + "rvaX6hEaQlmk", + "B2ao3EopB5yW", + "9CA1t6Z3JTOT" ], "title": "Processes", "notePosition": 10, @@ -3750,12 +3707,12 @@ }, { "isClone": false, - "noteId": "mrSqOUvKrvVS", + "noteId": "RpJ3H6CeslUU", "notePath": [ "root", - "Fb7eMY46lT6k", - "EBROzsTV1jh4", - "mrSqOUvKrvVS" + "rvaX6hEaQlmk", + "B2ao3EopB5yW", + "RpJ3H6CeslUU" ], "title": "Projects", "notePosition": 20, @@ -3772,11 +3729,11 @@ }, { "isClone": false, - "noteId": "6RKJSJ65qIn5", + "noteId": "Zl2So0VN2bPq", "notePath": [ "root", - "Fb7eMY46lT6k", - "6RKJSJ65qIn5" + "rvaX6hEaQlmk", + "Zl2So0VN2bPq" ], "title": "Steel Blue", "notePosition": 160, @@ -3799,12 +3756,12 @@ "children": [ { "isClone": false, - "noteId": "83Ywz5JXl9pw", + "noteId": "WJKLFxyflwt3", "notePath": [ "root", - "Fb7eMY46lT6k", - "6RKJSJ65qIn5", - "83Ywz5JXl9pw" + "rvaX6hEaQlmk", + "Zl2So0VN2bPq", + "WJKLFxyflwt3" ], "title": "eb-garamond-v9-latin-regular.woff2", "notePosition": 0, @@ -3840,12 +3797,12 @@ }, { "isClone": false, - "noteId": "K2IK5OccY70o", + "noteId": "RHRrVvtDRfhT", "notePath": [ "root", - "Fb7eMY46lT6k", - "6RKJSJ65qIn5", - "K2IK5OccY70o" + "rvaX6hEaQlmk", + "Zl2So0VN2bPq", + "RHRrVvtDRfhT" ], "title": "raleway-v12-latin-regular.woff2", "notePosition": 10, @@ -3883,11 +3840,11 @@ }, { "isClone": false, - "noteId": "G8k9CPUVtDeE", + "noteId": "KZVWidxicAfn", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE" + "rvaX6hEaQlmk", + "KZVWidxicAfn" ], "title": "Scripting examples", "notePosition": 350, @@ -3910,12 +3867,12 @@ "children": [ { "isClone": false, - "noteId": "zQpMt8tYmYPL", + "noteId": "JwXAb88VP2wn", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn" ], "title": "Task manager", "notePosition": 10, @@ -3939,13 +3896,13 @@ "children": [ { "isClone": false, - "noteId": "749vDoR12ulD", + "noteId": "JgjjgA2mpWHd", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd" ], "title": "Locations", "notePosition": 10, @@ -3975,14 +3932,14 @@ "children": [ { "isClone": false, - "noteId": "ps7IPoCpurK3", + "noteId": "guVfSfQsVNnB", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD", - "ps7IPoCpurK3" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd", + "guVfSfQsVNnB" ], "title": "gym", "notePosition": 0, @@ -4005,14 +3962,14 @@ }, { "isClone": false, - "noteId": "gvgFDSKxYYRr", + "noteId": "X1PGaxXd2GjI", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD", - "gvgFDSKxYYRr" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd", + "X1PGaxXd2GjI" ], "title": "work", "notePosition": 10, @@ -4035,15 +3992,15 @@ "children": [ { "isClone": false, - "noteId": "Evz7c4Npu4PO", + "noteId": "1yhbjW4nlr4l", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD", - "gvgFDSKxYYRr", - "Evz7c4Npu4PO" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd", + "X1PGaxXd2GjI", + "1yhbjW4nlr4l" ], "title": "Send invites for christmas party", "notePosition": 10, @@ -4062,7 +4019,7 @@ { "type": "relation", "name": "template", - "value": "7qiHS46jApK2", + "value": "s0jjoiuap4Ic", "isInheritable": false, "position": 20 }, @@ -4103,14 +4060,14 @@ }, { "isClone": false, - "noteId": "druYfHaAacBo", + "noteId": "8vUXW1ycnGte", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD", - "druYfHaAacBo" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd", + "8vUXW1ycnGte" ], "title": "tesco", "notePosition": 20, @@ -4133,15 +4090,15 @@ "children": [ { "isClone": false, - "noteId": "hu6fwfUGqnZR", + "noteId": "jjeJHzHpi6ur", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD", - "druYfHaAacBo", - "hu6fwfUGqnZR" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd", + "8vUXW1ycnGte", + "jjeJHzHpi6ur" ], "title": "Buy milk", "notePosition": 10, @@ -4160,7 +4117,7 @@ { "type": "relation", "name": "template", - "value": "7qiHS46jApK2", + "value": "s0jjoiuap4Ic", "isInheritable": false, "position": 2 }, @@ -4215,14 +4172,14 @@ }, { "isClone": false, - "noteId": "GrPlXB0Xk9k0", + "noteId": "5vuniBMFTH72", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD", - "GrPlXB0Xk9k0" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd", + "5vuniBMFTH72" ], "title": "mall", "notePosition": 30, @@ -4245,15 +4202,15 @@ "children": [ { "isClone": false, - "noteId": "4uh4j70LaKiG", + "noteId": "Se4NJBgDXgDP", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD", - "GrPlXB0Xk9k0", - "4uh4j70LaKiG" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd", + "5vuniBMFTH72", + "Se4NJBgDXgDP" ], "title": "Buy some book for Bob", "notePosition": 0, @@ -4272,7 +4229,7 @@ { "type": "relation", "name": "template", - "value": "7qiHS46jApK2", + "value": "s0jjoiuap4Ic", "isInheritable": false, "position": 20 }, @@ -4326,16 +4283,16 @@ "children": [ { "isClone": false, - "noteId": "DWjd4cV0s4YG", + "noteId": "FFfZ8j7dbla2", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "749vDoR12ulD", - "GrPlXB0Xk9k0", - "4uh4j70LaKiG", - "DWjd4cV0s4YG" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "JgjjgA2mpWHd", + "5vuniBMFTH72", + "Se4NJBgDXgDP", + "FFfZ8j7dbla2" ], "title": "Maybe Black Swan?", "notePosition": 0, @@ -4356,13 +4313,13 @@ }, { "isClone": false, - "noteId": "74H7PQ7nSsUf", + "noteId": "XgOo7la4Zhaa", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "74H7PQ7nSsUf" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "XgOo7la4Zhaa" ], "title": "Done", "notePosition": 20, @@ -4392,14 +4349,14 @@ "children": [ { "isClone": false, - "noteId": "PbOr6Ka8Q1pu", + "noteId": "9KSQ8DZQlXM9", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "74H7PQ7nSsUf", - "PbOr6Ka8Q1pu" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "XgOo7la4Zhaa", + "9KSQ8DZQlXM9" ], "title": "Buy a board game for Alice", "notePosition": 10, @@ -4418,7 +4375,7 @@ { "type": "relation", "name": "template", - "value": "7qiHS46jApK2", + "value": "s0jjoiuap4Ic", "isInheritable": false, "position": 20 }, @@ -4469,7 +4426,7 @@ "dataFileName": "Buy a board game for Alice.html", "attachments": [ { - "attachmentId": "gQqtPMhL3mA0", + "attachmentId": "hTaZjHj3H3Pc", "title": "codenames.jpg", "role": "image", "mime": "image/jpg", @@ -4480,14 +4437,14 @@ }, { "isClone": false, - "noteId": "oLis5ntGu1GE", + "noteId": "32RmtcG0KwdZ", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "74H7PQ7nSsUf", - "oLis5ntGu1GE" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "XgOo7la4Zhaa", + "32RmtcG0KwdZ" ], "title": "Dentist appointment", "notePosition": 20, @@ -4506,7 +4463,7 @@ { "type": "relation", "name": "template", - "value": "7qiHS46jApK2", + "value": "s0jjoiuap4Ic", "isInheritable": false, "position": 20 }, @@ -4545,14 +4502,14 @@ }, { "isClone": false, - "noteId": "MkD3XMHCTSOr", + "noteId": "GhLqwhaJ0EC2", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "74H7PQ7nSsUf", - "MkD3XMHCTSOr" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "XgOo7la4Zhaa", + "GhLqwhaJ0EC2" ], "title": "Get a gym membership", "notePosition": 20, @@ -4571,7 +4528,7 @@ { "type": "relation", "name": "template", - "value": "7qiHS46jApK2", + "value": "s0jjoiuap4Ic", "isInheritable": false, "position": 20 }, @@ -4612,13 +4569,13 @@ }, { "isClone": false, - "noteId": "o1sKXDXzZRwS", + "noteId": "pQFBLIQkRk7e", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "o1sKXDXzZRwS" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "pQFBLIQkRk7e" ], "title": "TODO", "notePosition": 30, @@ -4644,7 +4601,7 @@ { "type": "relation", "name": "child:template", - "value": "7qiHS46jApK2", + "value": "s0jjoiuap4Ic", "isInheritable": false, "position": 30 }, @@ -4676,31 +4633,14 @@ "children": [ { "isClone": true, - "noteId": "Evz7c4Npu4PO", + "noteId": "jjeJHzHpi6ur", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "o1sKXDXzZRwS", - "Evz7c4Npu4PO" - ], - "title": "Send invites for christmas party", - "prefix": null, - "dataFileName": "Send invites for christmas party.clone.html", - "type": "text", - "format": "html" - }, - { - "isClone": true, - "noteId": "hu6fwfUGqnZR", - "notePath": [ - "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "o1sKXDXzZRwS", - "hu6fwfUGqnZR" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "pQFBLIQkRk7e", + "jjeJHzHpi6ur" ], "title": "Buy milk", "prefix": null, @@ -4710,32 +4650,49 @@ }, { "isClone": true, - "noteId": "4uh4j70LaKiG", + "noteId": "Se4NJBgDXgDP", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "o1sKXDXzZRwS", - "4uh4j70LaKiG" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "pQFBLIQkRk7e", + "Se4NJBgDXgDP" ], "title": "Buy some book for Bob", "prefix": null, "dataFileName": "Buy some book for Bob.clone.html", "type": "text", "format": "html" + }, + { + "isClone": true, + "noteId": "1yhbjW4nlr4l", + "notePath": [ + "root", + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "pQFBLIQkRk7e", + "1yhbjW4nlr4l" + ], + "title": "Send invites for christmas party", + "prefix": null, + "dataFileName": "Send invites for christmas party.clone.html", + "type": "text", + "format": "html" } ] }, { "isClone": false, - "noteId": "8fyQ8ULFg2w5", + "noteId": "zzbGZzlK1UnU", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "8fyQ8ULFg2w5" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "zzbGZzlK1UnU" ], "title": "Implementation", "notePosition": 40, @@ -4758,14 +4715,14 @@ "children": [ { "isClone": false, - "noteId": "FvShZ1dQD0WH", + "noteId": "o6dIpDqmk9Mk", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "8fyQ8ULFg2w5", - "FvShZ1dQD0WH" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "zzbGZzlK1UnU", + "o6dIpDqmk9Mk" ], "title": "attribute changed", "notePosition": 0, @@ -4780,15 +4737,15 @@ "children": [ { "isClone": false, - "noteId": "g3wKmIEgGR9n", + "noteId": "AkYrzb1oFJLM", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "8fyQ8ULFg2w5", - "FvShZ1dQD0WH", - "g3wKmIEgGR9n" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "zzbGZzlK1UnU", + "o6dIpDqmk9Mk", + "AkYrzb1oFJLM" ], "title": "reconcileAssignments", "notePosition": 0, @@ -4804,14 +4761,14 @@ }, { "isClone": false, - "noteId": "g4vuWDH3pfQB", + "noteId": "dRHJjUpBEMHl", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "8fyQ8ULFg2w5", - "g4vuWDH3pfQB" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "zzbGZzlK1UnU", + "dRHJjUpBEMHl" ], "title": "CSS", "notePosition": 20, @@ -4833,14 +4790,14 @@ }, { "isClone": false, - "noteId": "7qiHS46jApK2", + "noteId": "s0jjoiuap4Ic", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "8fyQ8ULFg2w5", - "7qiHS46jApK2" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "zzbGZzlK1UnU", + "s0jjoiuap4Ic" ], "title": "task template", "notePosition": 30, @@ -4901,7 +4858,7 @@ { "type": "relation", "name": "runOnAttributeChange", - "value": "FvShZ1dQD0WH", + "value": "o6dIpDqmk9Mk", "isInheritable": false, "position": 10 } @@ -4912,14 +4869,14 @@ }, { "isClone": false, - "noteId": "SI8AwI2KJqip", + "noteId": "B8r8cR1CgOXC", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "8fyQ8ULFg2w5", - "SI8AwI2KJqip" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "zzbGZzlK1UnU", + "B8r8cR1CgOXC" ], "title": "createNewTask", "notePosition": 40, @@ -4935,13 +4892,13 @@ }, { "isClone": false, - "noteId": "ZLW5vUDmnj7c", + "noteId": "6wvo0XkUPMIC", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC" ], "title": "Tags", "notePosition": 50, @@ -4971,14 +4928,14 @@ "children": [ { "isClone": false, - "noteId": "L1NgccjlH70Q", + "noteId": "vqXaew913RYE", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c", - "L1NgccjlH70Q" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC", + "vqXaew913RYE" ], "title": "health", "notePosition": 0, @@ -5001,14 +4958,14 @@ }, { "isClone": false, - "noteId": "bRwEJbMouAJh", + "noteId": "Zz5qaexattwb", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c", - "bRwEJbMouAJh" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC", + "Zz5qaexattwb" ], "title": "shopping", "notePosition": 10, @@ -5031,37 +4988,37 @@ "children": [ { "isClone": true, - "noteId": "4uh4j70LaKiG", + "noteId": "jjeJHzHpi6ur", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c", - "bRwEJbMouAJh", - "4uh4j70LaKiG" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC", + "Zz5qaexattwb", + "jjeJHzHpi6ur" ], - "title": "Buy some book for Bob", + "title": "Buy milk", "prefix": null, - "dataFileName": "Buy some book for Bob.clone.html", + "dataFileName": "Buy milk.clone.html", "type": "text", "format": "html" }, { "isClone": true, - "noteId": "hu6fwfUGqnZR", + "noteId": "Se4NJBgDXgDP", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c", - "bRwEJbMouAJh", - "hu6fwfUGqnZR" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC", + "Zz5qaexattwb", + "Se4NJBgDXgDP" ], - "title": "Buy milk", + "title": "Buy some book for Bob", "prefix": null, - "dataFileName": "Buy milk.clone.html", + "dataFileName": "Buy some book for Bob.clone.html", "type": "text", "format": "html" } @@ -5069,14 +5026,14 @@ }, { "isClone": false, - "noteId": "wxvh8gxBAFTr", + "noteId": "Rn1zVLQyfH3M", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c", - "wxvh8gxBAFTr" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC", + "Rn1zVLQyfH3M" ], "title": "groceries", "notePosition": 20, @@ -5099,15 +5056,15 @@ "children": [ { "isClone": true, - "noteId": "hu6fwfUGqnZR", + "noteId": "jjeJHzHpi6ur", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c", - "wxvh8gxBAFTr", - "hu6fwfUGqnZR" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC", + "Rn1zVLQyfH3M", + "jjeJHzHpi6ur" ], "title": "Buy milk", "prefix": null, @@ -5119,14 +5076,14 @@ }, { "isClone": false, - "noteId": "H8AbesQ2DsJV", + "noteId": "YFgSaj76EAlV", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c", - "H8AbesQ2DsJV" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC", + "YFgSaj76EAlV" ], "title": "christmas", "notePosition": 30, @@ -5149,15 +5106,15 @@ "children": [ { "isClone": true, - "noteId": "4uh4j70LaKiG", + "noteId": "Se4NJBgDXgDP", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "ZLW5vUDmnj7c", - "H8AbesQ2DsJV", - "4uh4j70LaKiG" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "6wvo0XkUPMIC", + "YFgSaj76EAlV", + "Se4NJBgDXgDP" ], "title": "Buy some book for Bob", "prefix": null, @@ -5171,13 +5128,13 @@ }, { "isClone": false, - "noteId": "qv7UJuErc16Q", + "noteId": "REYFb3PQQ7Uu", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "zQpMt8tYmYPL", - "qv7UJuErc16Q" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "JwXAb88VP2wn", + "REYFb3PQQ7Uu" ], "title": "Create Launcher", "notePosition": 60, @@ -5196,7 +5153,7 @@ { "type": "relation", "name": "createNewTask", - "value": "SI8AwI2KJqip", + "value": "B8r8cR1CgOXC", "isInheritable": false, "position": 20 }, @@ -5222,12 +5179,12 @@ }, { "isClone": false, - "noteId": "uEhizdFWgTIC", + "noteId": "mJJ4HfInuU8m", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uEhizdFWgTIC" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "mJJ4HfInuU8m" ], "title": "Word count widget", "notePosition": 20, @@ -5249,12 +5206,12 @@ }, { "isClone": false, - "noteId": "IYO5iEWuPCbj", + "noteId": "AoV6PijRs3ZU", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "IYO5iEWuPCbj" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "AoV6PijRs3ZU" ], "title": "Weight Tracker", "notePosition": 40, @@ -5287,7 +5244,7 @@ { "type": "relation", "name": "renderNote", - "value": "iFlQcEYLIVWB", + "value": "A32WDOAEaJ6M", "isInheritable": false, "position": 20 } @@ -5297,13 +5254,13 @@ "children": [ { "isClone": false, - "noteId": "iFlQcEYLIVWB", + "noteId": "A32WDOAEaJ6M", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "IYO5iEWuPCbj", - "iFlQcEYLIVWB" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "AoV6PijRs3ZU", + "A32WDOAEaJ6M" ], "title": "Implementation", "notePosition": 0, @@ -5318,14 +5275,14 @@ "children": [ { "isClone": false, - "noteId": "fdpRmy4olJ9D", + "noteId": "tq1IEPNTcEwE", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "IYO5iEWuPCbj", - "iFlQcEYLIVWB", - "fdpRmy4olJ9D" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "AoV6PijRs3ZU", + "A32WDOAEaJ6M", + "tq1IEPNTcEwE" ], "title": "JS code", "notePosition": 0, @@ -5340,15 +5297,15 @@ "children": [ { "isClone": false, - "noteId": "iS5BBNx0i74J", + "noteId": "piyimQhwfcy5", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "IYO5iEWuPCbj", - "iFlQcEYLIVWB", - "fdpRmy4olJ9D", - "iS5BBNx0i74J" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "AoV6PijRs3ZU", + "A32WDOAEaJ6M", + "tq1IEPNTcEwE", + "piyimQhwfcy5" ], "title": "chart.js", "notePosition": 0, @@ -5356,15 +5313,7 @@ "isExpanded": false, "type": "file", "mime": "text/javascript", - "attributes": [ - { - "type": "label", - "name": "originalFileName", - "value": "chart.min.js", - "isInheritable": false, - "position": 1 - } - ], + "attributes": [], "dataFileName": "chart.js", "attachments": [] } @@ -5376,12 +5325,12 @@ }, { "isClone": false, - "noteId": "uK5ckLvFPUUX", + "noteId": "xRQuuwkaobBM", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM" ], "title": "Statistics", "notePosition": 60, @@ -5403,13 +5352,13 @@ "children": [ { "isClone": false, - "noteId": "BsUewm6yHngC", + "noteId": "GXUcReLM6dSe", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "BsUewm6yHngC" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "GXUcReLM6dSe" ], "title": "Attribute count", "notePosition": 10, @@ -5421,7 +5370,7 @@ { "type": "relation", "name": "renderNote", - "value": "AiKGUNbMJeOi", + "value": "oLPbgCo7djD7", "isInheritable": false, "position": 10 } @@ -5431,14 +5380,14 @@ "children": [ { "isClone": false, - "noteId": "AiKGUNbMJeOi", + "noteId": "oLPbgCo7djD7", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "BsUewm6yHngC", - "AiKGUNbMJeOi" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "GXUcReLM6dSe", + "oLPbgCo7djD7" ], "title": "template", "notePosition": 0, @@ -5453,15 +5402,15 @@ "children": [ { "isClone": false, - "noteId": "fYAbi7MctpJ1", + "noteId": "AlL9eFopYuHg", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "BsUewm6yHngC", - "AiKGUNbMJeOi", - "fYAbi7MctpJ1" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "GXUcReLM6dSe", + "oLPbgCo7djD7", + "AlL9eFopYuHg" ], "title": "js", "notePosition": 0, @@ -5476,16 +5425,16 @@ "children": [ { "isClone": false, - "noteId": "TsdykeHU5RJ9", + "noteId": "9GZB2MeW51xv", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "BsUewm6yHngC", - "AiKGUNbMJeOi", - "fYAbi7MctpJ1", - "TsdykeHU5RJ9" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "GXUcReLM6dSe", + "oLPbgCo7djD7", + "AlL9eFopYuHg", + "9GZB2MeW51xv" ], "title": "renderPieChart", "notePosition": 0, @@ -5500,17 +5449,17 @@ "children": [ { "isClone": false, - "noteId": "AQV0tCouCZpT", + "noteId": "3jaioienOLTR", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "BsUewm6yHngC", - "AiKGUNbMJeOi", - "fYAbi7MctpJ1", - "TsdykeHU5RJ9", - "AQV0tCouCZpT" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "GXUcReLM6dSe", + "oLPbgCo7djD7", + "AlL9eFopYuHg", + "9GZB2MeW51xv", + "3jaioienOLTR" ], "title": "chartjs-plugin-datalabels.min.js", "notePosition": 0, @@ -5533,18 +5482,18 @@ "children": [ { "isClone": true, - "noteId": "iS5BBNx0i74J", + "noteId": "piyimQhwfcy5", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "BsUewm6yHngC", - "AiKGUNbMJeOi", - "fYAbi7MctpJ1", - "TsdykeHU5RJ9", - "AQV0tCouCZpT", - "iS5BBNx0i74J" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "GXUcReLM6dSe", + "oLPbgCo7djD7", + "AlL9eFopYuHg", + "9GZB2MeW51xv", + "3jaioienOLTR", + "piyimQhwfcy5" ], "title": "chart.js", "prefix": null, @@ -5556,17 +5505,17 @@ }, { "isClone": true, - "noteId": "iS5BBNx0i74J", + "noteId": "piyimQhwfcy5", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "BsUewm6yHngC", - "AiKGUNbMJeOi", - "fYAbi7MctpJ1", - "TsdykeHU5RJ9", - "iS5BBNx0i74J" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "GXUcReLM6dSe", + "oLPbgCo7djD7", + "AlL9eFopYuHg", + "9GZB2MeW51xv", + "piyimQhwfcy5" ], "title": "chart.js", "prefix": null, @@ -5578,16 +5527,16 @@ }, { "isClone": false, - "noteId": "hfRME6bdRU2R", + "noteId": "gp03dlXCFkJf", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "BsUewm6yHngC", - "AiKGUNbMJeOi", - "fYAbi7MctpJ1", - "hfRME6bdRU2R" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "GXUcReLM6dSe", + "oLPbgCo7djD7", + "AlL9eFopYuHg", + "gp03dlXCFkJf" ], "title": "renderTable", "notePosition": 10, @@ -5607,13 +5556,13 @@ }, { "isClone": false, - "noteId": "H0nm1lyI4jCY", + "noteId": "SsesNR9Q4LMV", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "H0nm1lyI4jCY" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "SsesNR9Q4LMV" ], "title": "Largest notes", "notePosition": 20, @@ -5625,7 +5574,7 @@ { "type": "relation", "name": "renderNote", - "value": "1ZUtxvW1qeyZ", + "value": "GYJZOEJXBEJ1", "isInheritable": false, "position": 10 } @@ -5635,14 +5584,14 @@ "children": [ { "isClone": false, - "noteId": "1ZUtxvW1qeyZ", + "noteId": "GYJZOEJXBEJ1", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "H0nm1lyI4jCY", - "1ZUtxvW1qeyZ" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "SsesNR9Q4LMV", + "GYJZOEJXBEJ1" ], "title": "template", "notePosition": 10, @@ -5657,15 +5606,15 @@ "children": [ { "isClone": false, - "noteId": "jsM6edxHyM0C", + "noteId": "BcqIQhG3eQbo", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "H0nm1lyI4jCY", - "1ZUtxvW1qeyZ", - "jsM6edxHyM0C" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "SsesNR9Q4LMV", + "GYJZOEJXBEJ1", + "BcqIQhG3eQbo" ], "title": "js", "notePosition": 0, @@ -5683,13 +5632,13 @@ }, { "isClone": false, - "noteId": "AJ2eejoELNhk", + "noteId": "LpuRqz4YOvPH", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "AJ2eejoELNhk" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "LpuRqz4YOvPH" ], "title": "Most edited notes", "notePosition": 30, @@ -5701,7 +5650,7 @@ { "type": "relation", "name": "renderNote", - "value": "VNUKOvrPKC76", + "value": "RpSdzJ8YtGCh", "isInheritable": false, "position": 10 } @@ -5711,14 +5660,14 @@ "children": [ { "isClone": false, - "noteId": "VNUKOvrPKC76", + "noteId": "RpSdzJ8YtGCh", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "AJ2eejoELNhk", - "VNUKOvrPKC76" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "LpuRqz4YOvPH", + "RpSdzJ8YtGCh" ], "title": "template", "notePosition": 0, @@ -5733,15 +5682,15 @@ "children": [ { "isClone": false, - "noteId": "JJyoW0AUEa3E", + "noteId": "xANbepYCI3MM", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "AJ2eejoELNhk", - "VNUKOvrPKC76", - "JJyoW0AUEa3E" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "LpuRqz4YOvPH", + "RpSdzJ8YtGCh", + "xANbepYCI3MM" ], "title": "js", "notePosition": 0, @@ -5759,13 +5708,13 @@ }, { "isClone": false, - "noteId": "7W53TQFpBujr", + "noteId": "3Pqm2PAdIDoR", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "7W53TQFpBujr" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "3Pqm2PAdIDoR" ], "title": "Most linked notes", "notePosition": 40, @@ -5777,7 +5726,7 @@ { "type": "relation", "name": "renderNote", - "value": "1zt0MOCyJEVI", + "value": "A9AEOknGTXH7", "isInheritable": false, "position": 10 } @@ -5787,14 +5736,14 @@ "children": [ { "isClone": false, - "noteId": "1zt0MOCyJEVI", + "noteId": "A9AEOknGTXH7", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "7W53TQFpBujr", - "1zt0MOCyJEVI" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "3Pqm2PAdIDoR", + "A9AEOknGTXH7" ], "title": "template", "notePosition": 0, @@ -5809,15 +5758,15 @@ "children": [ { "isClone": false, - "noteId": "76s2u6NeK7IE", + "noteId": "qPHo4bcTNQRc", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "7W53TQFpBujr", - "1zt0MOCyJEVI", - "76s2u6NeK7IE" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "3Pqm2PAdIDoR", + "A9AEOknGTXH7", + "qPHo4bcTNQRc" ], "title": "js", "notePosition": 0, @@ -5835,13 +5784,13 @@ }, { "isClone": false, - "noteId": "5xtL10PYc4bf", + "noteId": "zaJv5dTikOST", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "5xtL10PYc4bf" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "zaJv5dTikOST" ], "title": "Note type count", "notePosition": 50, @@ -5853,7 +5802,7 @@ { "type": "relation", "name": "renderNote", - "value": "fmbJsCyc7oOc", + "value": "pT0x9fitYGkt", "isInheritable": false, "position": 10 } @@ -5863,14 +5812,14 @@ "children": [ { "isClone": false, - "noteId": "fmbJsCyc7oOc", + "noteId": "pT0x9fitYGkt", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "5xtL10PYc4bf", - "fmbJsCyc7oOc" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "zaJv5dTikOST", + "pT0x9fitYGkt" ], "title": "template", "notePosition": 0, @@ -5885,15 +5834,15 @@ "children": [ { "isClone": false, - "noteId": "fqsDkKujJc3w", + "noteId": "svjnZ2JM3B3M", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "5xtL10PYc4bf", - "fmbJsCyc7oOc", - "fqsDkKujJc3w" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "zaJv5dTikOST", + "pT0x9fitYGkt", + "svjnZ2JM3B3M" ], "title": "js", "notePosition": 0, @@ -5908,16 +5857,16 @@ "children": [ { "isClone": false, - "noteId": "iStjuccma54t", + "noteId": "xwOPidcKMYFp", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "5xtL10PYc4bf", - "fmbJsCyc7oOc", - "fqsDkKujJc3w", - "iStjuccma54t" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "zaJv5dTikOST", + "pT0x9fitYGkt", + "svjnZ2JM3B3M", + "xwOPidcKMYFp" ], "title": "renderTable", "notePosition": 0, @@ -5931,16 +5880,16 @@ }, { "isClone": true, - "noteId": "TsdykeHU5RJ9", + "noteId": "9GZB2MeW51xv", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "5xtL10PYc4bf", - "fmbJsCyc7oOc", - "fqsDkKujJc3w", - "TsdykeHU5RJ9" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "zaJv5dTikOST", + "pT0x9fitYGkt", + "svjnZ2JM3B3M", + "9GZB2MeW51xv" ], "title": "renderPieChart", "prefix": null, @@ -5956,13 +5905,13 @@ }, { "isClone": false, - "noteId": "JkMXQ0r5bRnI", + "noteId": "60hC06fQDFbz", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "JkMXQ0r5bRnI" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "60hC06fQDFbz" ], "title": "Most cloned notes", "notePosition": 60, @@ -5974,7 +5923,7 @@ { "type": "relation", "name": "renderNote", - "value": "VeQJSgKIkaUQ", + "value": "PpBDHBshEH8H", "isInheritable": false, "position": 10 } @@ -5984,14 +5933,14 @@ "children": [ { "isClone": false, - "noteId": "VeQJSgKIkaUQ", + "noteId": "PpBDHBshEH8H", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "JkMXQ0r5bRnI", - "VeQJSgKIkaUQ" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "60hC06fQDFbz", + "PpBDHBshEH8H" ], "title": "template", "notePosition": 0, @@ -6006,15 +5955,15 @@ "children": [ { "isClone": false, - "noteId": "NI8zZ7IznTZT", + "noteId": "kPuAKFW2XFXq", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "uK5ckLvFPUUX", - "JkMXQ0r5bRnI", - "VeQJSgKIkaUQ", - "NI8zZ7IznTZT" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "xRQuuwkaobBM", + "60hC06fQDFbz", + "PpBDHBshEH8H", + "kPuAKFW2XFXq" ], "title": "js", "notePosition": 0, @@ -6034,12 +5983,12 @@ }, { "isClone": false, - "noteId": "IPifAXM3cyRS", + "noteId": "sh460UeSCkDG", "notePath": [ "root", - "Fb7eMY46lT6k", - "G8k9CPUVtDeE", - "IPifAXM3cyRS" + "rvaX6hEaQlmk", + "KZVWidxicAfn", + "sh460UeSCkDG" ], "title": "Custom request handler", "notePosition": 90, @@ -6051,7 +6000,7 @@ { "type": "relation", "name": "targetNote", - "value": "B08ZaJdYTK5v", + "value": "Ys8DWdyfaZcf", "isInheritable": false, "position": 10 }, diff --git a/_regroup/demo/index.html b/apps/edit-docs/demo/index.html similarity index 100% rename from _regroup/demo/index.html rename to apps/edit-docs/demo/index.html diff --git a/_regroup/demo/navigation.html b/apps/edit-docs/demo/navigation.html similarity index 100% rename from _regroup/demo/navigation.html rename to apps/edit-docs/demo/navigation.html index 55bba6d58..ff2586927 100644 --- a/_regroup/demo/navigation.html +++ b/apps/edit-docs/demo/navigation.html @@ -438,15 +438,15 @@ TODO - Send invites for christmas party - Buy milk Buy some book for Bob + Send invites for christmas party + Implementation @@ -477,12 +477,12 @@ shopping - Buy some book for Bob - Buy milk + Buy some book for Bob + groceries diff --git a/_regroup/demo/root/Journal.dat b/apps/edit-docs/demo/root/Journal.dat similarity index 100% rename from _regroup/demo/root/Journal.dat rename to apps/edit-docs/demo/root/Journal.dat diff --git a/_regroup/demo/root/Trilium Demo.html b/apps/edit-docs/demo/root/Trilium Demo.html similarity index 99% rename from _regroup/demo/root/Trilium Demo.html rename to apps/edit-docs/demo/root/Trilium Demo.html index 59ef348b7..a99649f5e 100644 --- a/_regroup/demo/root/Trilium Demo.html +++ b/apps/edit-docs/demo/root/Trilium Demo.html @@ -18,28 +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 - Once you're finished with experimenting and want to cleanup these pages, you can simply delete them all. 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: - First Item @@ -54,7 +48,6 @@ Unordered: - Item diff --git a/_regroup/demo/root/Trilium Demo/Books/Book template.html b/apps/edit-docs/demo/root/Trilium Demo/Books/Book template.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Books/Book template.html rename to apps/edit-docs/demo/root/Trilium Demo/Books/Book template.html index b6ece231e..5f589ccde 100644 --- a/_regroup/demo/root/Trilium Demo/Books/Book template.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Books/Book template.html @@ -14,22 +14,17 @@ Main characters - … here put main characters … Plot - … describe main plot lines … Tone - Genre - scifi / drama / romance Similar books - … diff --git a/_regroup/demo/root/Trilium Demo/Books/Book template/Highlights.html b/apps/edit-docs/demo/root/Trilium Demo/Books/Book template/Highlights.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Books/Book template/Highlights.html rename to apps/edit-docs/demo/root/Trilium Demo/Books/Book template/Highlights.html diff --git a/_regroup/demo/root/Trilium Demo/Books/Reviews/The Mechanical.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Books/Reviews/The Mechanical.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Books/Reviews/The Mechanical.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Books/Reviews/The Mechanical.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Books/To read.html b/apps/edit-docs/demo/root/Trilium Demo/Books/To read.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Books/To read.html rename to apps/edit-docs/demo/root/Trilium Demo/Books/To read.html index 30cf1d0d1..17b164b6c 100644 --- a/_regroup/demo/root/Trilium Demo/Books/To read.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Books/To read.html @@ -14,14 +14,11 @@ Checkout Kindle daily deals: https://www.amazon.com/gp/feature.html?docId=1000677541 - Cixin Liu - The Dark Forest - Ann Leckie - Ancillary Sword - diff --git a/_regroup/demo/root/Trilium Demo/Formatting examples/Checkbox lists.html b/apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Checkbox lists.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Formatting examples/Checkbox lists.html rename to apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Checkbox lists.html index 1a581a9d0..62c728414 100644 --- a/_regroup/demo/root/Trilium Demo/Formatting examples/Checkbox lists.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Checkbox lists.html @@ -18,25 +18,21 @@ buy milk - do the laundry - watch TV - eat ice cream - diff --git a/_regroup/demo/root/Trilium Demo/Formatting examples/Code blocks.html b/apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Code blocks.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Formatting examples/Code blocks.html rename to apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Code blocks.html index 5bb2da12c..6827fa8af 100644 --- a/_regroup/demo/root/Trilium Demo/Formatting examples/Code blocks.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Code blocks.html @@ -20,9 +20,10 @@ is first created it will try to automatically determine the programming language, should that fail it is possible to manually adjust it. The color scheme for the syntax highlighting is adjustable in settings. function helloWorld() { - alert("Hello world"); -} + alert("Hello world"); + +} For larger pieces of code it is better to use a code note, which uses a fully-fledged code editor (CodeMirror). For an example of a code note, see Custom request handler. diff --git a/_regroup/demo/root/Trilium Demo/Formatting examples/Highlighting.html b/apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Highlighting.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Formatting examples/Highlighting.html rename to apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Highlighting.html diff --git a/_regroup/demo/root/Trilium Demo/Formatting examples/Math.html b/apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Math.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Formatting examples/Math.html rename to apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Math.html index e646e00b4..54a28f3ff 100644 --- a/_regroup/demo/root/Trilium Demo/Formatting examples/Math.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Formatting examples/Math.html @@ -15,9 +15,7 @@ \(% \f is defined as #1f(#2) using the macro \f\relax{x} = \int_{-\infty}^\infty \f\hat\xi\,e^{2 \pi i \xi x} \,d\xi\)Some math examples:\[\displaystyle \frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} {1+\frac{e^{-8\pi}} {1+\cdots} } } }\] - Another:\[\displaystyle \left( \sum_{k=1}^n a_k b_k \right)^2 \leq \left( \sum_{k=1}^n a_k^2 \right) \left( \sum_{k=1}^n b_k^2 \right)\] - Inline math is also possible: \(c^2 = a^2 + b^2\) diff --git a/_regroup/demo/root/Trilium Demo/Formatting examples/School schedule.html b/apps/edit-docs/demo/root/Trilium Demo/Formatting examples/School schedule.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Formatting examples/School schedule.html rename to apps/edit-docs/demo/root/Trilium Demo/Formatting examples/School schedule.html diff --git a/_regroup/demo/root/Trilium Demo/Inbox.html b/apps/edit-docs/demo/root/Trilium Demo/Inbox.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Inbox.html rename to apps/edit-docs/demo/root/Trilium Demo/Inbox.html diff --git a/_regroup/demo/root/Trilium Demo/Inbox/Book to read.html b/apps/edit-docs/demo/root/Trilium Demo/Inbox/Book to read.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Inbox/Book to read.html rename to apps/edit-docs/demo/root/Trilium Demo/Inbox/Book to read.html diff --git a/_regroup/demo/root/Trilium Demo/Inbox/Grocery list for today.html b/apps/edit-docs/demo/root/Trilium Demo/Inbox/Grocery list for today.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Inbox/Grocery list for today.html rename to apps/edit-docs/demo/root/Trilium Demo/Inbox/Grocery list for today.html diff --git a/_regroup/demo/root/Trilium Demo/Inbox/The Last Question.html b/apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question.html similarity index 95% rename from _regroup/demo/root/Trilium Demo/Inbox/The Last Question.html rename to apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question.html index 57cc8dff5..e0d736c1b 100644 --- a/_regroup/demo/root/Trilium Demo/Inbox/The Last Question.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question.html @@ -18,7 +18,7 @@ href="https://en.wikipedia.org/wiki/Short_story">short storyby American writer Isaac Asimov. It first appeared in the November 1956 issue of Science Fiction Quarterly. + class="include-note" data-note-id="VsFbpoySMCE3" data-box-size="medium"> This page demonstrates two things: possibility to include one note into another diff --git a/_regroup/demo/root/Trilium Demo/Inbox/The Last Question/The Last Question by Issac.pdf b/apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question/The Last Question by Issac.pdf similarity index 100% rename from _regroup/demo/root/Trilium Demo/Inbox/The Last Question/The Last Question by Issac.pdf rename to apps/edit-docs/demo/root/Trilium Demo/Inbox/The Last Question/The Last Question by Issac.pdf diff --git a/_regroup/demo/root/Trilium Demo/Journal.html b/apps/edit-docs/demo/root/Trilium Demo/Journal.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal.html index 629b4870f..faac301b5 100644 --- a/_regroup/demo/root/Trilium Demo/Journal.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal.html @@ -14,7 +14,6 @@ You can read some explanation on how this journal works here: https://github.com/zadam/trilium/wiki/Day-notes - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday.html index e4a99c109..5171b6ee2 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Christmas gift ideas.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Christmas gift ideas.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Christmas gift ideas.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Christmas gift ideas.html index 01ad36c16..2a2d08336 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Christmas gift ideas.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Christmas gift ideas.html @@ -17,7 +17,6 @@ XBox Candles Portable speakers - ...? diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Phone call about work project.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Phone call about work project.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Phone call about work project.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Phone call about work project.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Trusted timestamping.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Trusted timestamping.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Trusted timestamping.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Trusted timestamping.html index bae5a1ed0..0a85f8618 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Trusted timestamping.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/11 - November/28 - Tuesday/Trusted timestamping.html @@ -14,10 +14,8 @@ Wiki: https://en.wikipedia.org/wiki/Trusted_timestamping - Bozho: https://techblog.bozho.net/using-trusted-timestamping-java/ - Trusted timestamping is the process of securely keeping track of the creation and modification time of a document. Security here diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html index 3722a62c0..ae490681e 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html @@ -16,7 +16,6 @@ Miscellaneous notes done on monday ... Interesting video: https://www.youtube.com/watch?v=_eSAF_qT_FY&feature=youtu.be - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Meeting minutes.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Meeting minutes.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Meeting minutes.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Meeting minutes.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/01.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/01.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/01.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/01.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/02.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/02.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/02.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/02.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/03.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/03.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/03.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/03.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/04.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/04.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/04.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/04.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/05.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/05.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/05.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/05.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/06.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/06.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/06.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/06.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/07.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/07.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/07.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/07.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/08.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/08.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/08.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/08.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/09.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/09.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/09.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/09.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/10.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/10.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/10.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/10.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/11.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/11.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/11.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/11.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/12.jpeg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/12.jpeg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/12.jpeg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/Photos from the trip/12.jpeg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/TODO - Send invites for christ.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/TODO - Send invites for christ.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/TODO - Send invites for christ.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday/TODO - Send invites for christ.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday.html index 487b71530..f0309b26d 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday/DONE - Dentist appointment.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday/DONE - Dentist appointment.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday/DONE - Dentist appointment.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/19 - Tuesday/DONE - Dentist appointment.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/20 - Wednesday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/20 - Wednesday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/20 - Wednesday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/20 - Wednesday.html index ae559b3c1..28245eb1a 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/20 - Wednesday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/20 - Wednesday.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday.html index 28b77ec56..2ff2ac742 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday/Christmas shopping.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday/Christmas shopping.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday/Christmas shopping.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday/Christmas shopping.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday/Office party.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday/Office party.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday/Office party.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/21 - Thursday/Office party.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday.html index 3545fd3d7..f8ec2e8e5 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/Christmas shopping.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/Christmas shopping.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/Christmas shopping.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/Christmas shopping.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/The Mechanical.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/The Mechanical.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/The Mechanical.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/The Mechanical.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/The Mechanical/Highlights.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/The Mechanical/Highlights.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/The Mechanical/Highlights.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/22 - Friday/The Mechanical/Highlights.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/23 - Saturday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/23 - Saturday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/23 - Saturday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/23 - Saturday.html index 912b715c0..6973b8531 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/23 - Saturday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/23 - Saturday.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!.html index c243a035c..29a1e0cd2 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game fo.jpg b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game fo.jpg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game fo.jpg rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game fo.jpg diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game for Al.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game for Al.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game for Al.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game for Al.html index e7367a06c..55d9b2909 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game for Al.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/DONE - Buy a board game for Al.html @@ -18,7 +18,6 @@ width="209" height="300"> Maybe CodeNames? https://boardgamegeek.com/boardgame/178900/codenames - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/TODO - Buy milk.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/TODO - Buy milk.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/TODO - Buy milk.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/24 - Sunday - Christmas Eve!/TODO - Buy milk.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/30 - Thursday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/30 - Thursday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/30 - Thursday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/30 - Thursday.html index 133fae97b..36cbd2ed6 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/30 - Thursday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/30 - Thursday.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/Epics.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/Epics.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/Epics/Christmas.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Christmas.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/Epics/Christmas.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Christmas.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Christmas dinner.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Christmas dinner.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Christmas dinner.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Christmas dinner.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Shopping/28. 11. 2017 - Christmas gift ideas.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Shopping/28. 11. 2017 - Christmas gift ideas.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Shopping/28. 11. 2017 - Christmas gift ideas.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Shopping/28. 11. 2017 - Christmas gift ideas.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Vacation days.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Vacation days.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Vacation days.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Christmas/Vacation days.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/Epics/Vacation.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Vacation.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Journal/2021/Epics/Vacation.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/Epics/Vacation.html diff --git a/_regroup/demo/root/Trilium Demo/Journal/Day template.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/Day template.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/Day template.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/Day template.html index 44bd101ae..623273a9e 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/Day template.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/Day template.html @@ -18,7 +18,6 @@ - diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Canvas.json b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Canvas.json similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Canvas.json rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Canvas.json diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Canvas_canvas-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Canvas_canvas-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Canvas_canvas-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Canvas_canvas-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of .json b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of .json similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of .json rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of .json diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Chichén Itzá, Mexico.html b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Chichén Itzá, Mexico.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Chichén Itzá, Mexico.html rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Chichén Itzá, Mexico.html index 3992ceed9..ab44bd638 100644 --- a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Chichén Itzá, Mexico.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Chichén Itzá, Mexico.html @@ -24,17 +24,14 @@ [1] - ^ - What Are the 7 Wonders of the World? (with HD Images) | TheCollector - diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Christ the Redeemer, Brazil.html b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Christ the Redeemer, Brazil.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Christ the Redeemer, Brazil.html rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Christ the Redeemer, Brazil.html index cbaae70da..3e1f1e905 100644 --- a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Christ the Redeemer, Brazil.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Christ the Redeemer, Brazil.html @@ -26,16 +26,13 @@ been brought to its knees.[1] - ^ - What Are the 7 Wonders of the World? (with HD Images) | TheCollector - diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Machu Picchu, Peru.html b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Machu Picchu, Peru.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Machu Picchu, Peru.html rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Machu Picchu, Peru.html index 929103047..5e9817e5b 100644 --- a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Machu Picchu, Peru.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Machu Picchu, Peru.html @@ -22,16 +22,13 @@ around 1450 in polished drystone walls.[1] - ^ - What Are the 7 Wonders of the World? (with HD Images) | TheCollector - diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Petra, Jordan.html b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Petra, Jordan.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Petra, Jordan.html rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Petra, Jordan.html index 55e0adafa..1396c2691 100644 --- a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Petra, Jordan.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/Petra, Jordan.html @@ -23,16 +23,13 @@ by earthquakes.[1] - ^ - What Are the 7 Wonders of the World? (with HD Images) | TheCollector - diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Colosseum, Rome, Italy.html b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Colosseum, Rome, Italy.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Colosseum, Rome, Italy.html rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Colosseum, Rome, Italy.html index c9abd680d..650a6623c 100644 --- a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Colosseum, Rome, Italy.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Colosseum, Rome, Italy.html @@ -26,17 +26,14 @@ [1] - ^ - What Are the 7 Wonders of the World? (with HD Images) | TheCollector - diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Great Wall of China.html b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Great Wall of China.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Great Wall of China.html rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Great Wall of China.html index ccedb8388..1f5d5886f 100644 --- a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Great Wall of China.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Great Wall of China.html @@ -23,17 +23,14 @@ [1] - ^ - What Are the 7 Wonders of the World? (with HD Images) | TheCollector - diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Taj Mahal, India.html b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Taj Mahal, India.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Taj Mahal, India.html rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Taj Mahal, India.html index 755184be0..0d692392a 100644 --- a/_regroup/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Taj Mahal, India.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Geo Map (The Seven Wonders of the World)/The Taj Mahal, India.html @@ -23,16 +23,13 @@ the complex.[1] - ^ - What Are the 7 Wonders of the World? (with HD Images) | TheCollector - diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Bar chart.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Bar chart.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Bar chart.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Bar chart.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Bar chart_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Bar chart_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Bar chart_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Bar chart_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/C4.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/C4.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/C4.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/C4.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/C4_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/C4_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/C4_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/C4_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Class.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Class.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Class.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Class.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Class_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Class_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Class_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Class_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Entity Relationship.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Entity Relationship.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Entity Relationship.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Entity Relationship.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Entity Relationship_mermai.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Entity Relationship_mermai.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Entity Relationship_mermai.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Entity Relationship_mermai.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow (ELK).txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow (ELK).txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow (ELK).txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow (ELK).txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow (ELK)_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow (ELK)_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow (ELK)_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow (ELK)_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Flow_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Gantt.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Gantt.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Gantt.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Gantt.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Gantt_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Gantt_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Gantt_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Gantt_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Git.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Git.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Git.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Git.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Git_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Git_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Git_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Git_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Journey.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Journey.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Journey.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Journey.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Journey_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Journey_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Journey_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Journey_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Mind Map.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Mind Map.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Mind Map.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Mind Map.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Mind Map_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Mind Map_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Mind Map_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Mind Map_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Pie.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Pie.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Pie.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Pie.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Pie_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Pie_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Pie_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Pie_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Sequence.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Sequence.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Sequence.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Sequence.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Sequence_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Sequence_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Sequence_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/Sequence_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/State.txt b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/State.txt similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/State.txt rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/State.txt diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/State_mermaid-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/State_mermaid-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/State_mermaid-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mermaid Diagrams/State_mermaid-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mind Map.json b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mind Map.json similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mind Map.json rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mind Map.json diff --git a/_regroup/demo/root/Trilium Demo/Note Types/Mind Map_mindmap-export.svg b/apps/edit-docs/demo/root/Trilium Demo/Note Types/Mind Map_mindmap-export.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Note Types/Mind Map_mindmap-export.svg rename to apps/edit-docs/demo/root/Trilium Demo/Note Types/Mind Map_mindmap-export.svg diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Custom request handler.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Custom request handler.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Custom request handler.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Custom request handler.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chart.js.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chart.js.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chart.js.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chart.js.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chartjs-plugin-datalabe.min.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chartjs-plugin-datalabe.min.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chartjs-plugin-datalabe.min.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chartjs-plugin-datalabe.min.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chartjs-plugin-datalabels.min.js/chart.js.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chartjs-plugin-datalabels.min.js/chart.js.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chartjs-plugin-datalabels.min.js/chart.js.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderPieChart/chartjs-plugin-datalabels.min.js/chart.js.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderTable.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderTable.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderTable.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Attribute count/template/js/renderTable.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Largest notes/template.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Largest notes/template.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Largest notes/template.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Largest notes/template.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Largest notes/template/js.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Largest notes/template/js.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Largest notes/template/js.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Largest notes/template/js.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most cloned notes/template.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most cloned notes/template.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most cloned notes/template.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most cloned notes/template.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most cloned notes/template/js.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most cloned notes/template/js.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most cloned notes/template/js.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most cloned notes/template/js.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most edited notes/template.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most edited notes/template.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most edited notes/template.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most edited notes/template.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most edited notes/template/js.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most edited notes/template/js.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most edited notes/template/js.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most edited notes/template/js.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most linked notes/template.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most linked notes/template.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most linked notes/template.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most linked notes/template.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most linked notes/template/js.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most linked notes/template/js.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Most linked notes/template/js.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Most linked notes/template/js.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js/renderPieChart.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js/renderPieChart.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js/renderPieChart.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js/renderPieChart.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js/renderTable.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js/renderTable.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js/renderTable.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Statistics/Note type count/template/js/renderTable.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager.html index 0194f9364..1b4822074 100644 --- a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager.html @@ -15,7 +15,6 @@ This is a simple TODO/Task manager. You can see some description and explanation here: https://github.com/zadam/trilium/wiki/Task-manager - Please note that this is meant as scripting example only and feature/bug support is very limited. diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Create Launcher.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Create Launcher.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Create Launcher.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Create Launcher.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.html index 65b1819f2..9cda89645 100644 --- a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.html @@ -18,7 +18,6 @@ width="209" height="300"> Maybe CodeNames? https://boardgamegeek.com/boardgame/178900/codenames - diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.jpg b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.jpg similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.jpg rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Buy a board game for Alice.jpg diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Dentist appointment.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Dentist appointment.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Dentist appointment.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Dentist appointment.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Get a gym membership.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Get a gym membership.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Get a gym membership.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Done/Get a gym membership.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/CSS.css b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/CSS.css similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/CSS.css rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/CSS.css diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/attribute changed.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/attribute changed.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/attribute changed.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/attribute changed.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/attribute changed/reconcileAssignments.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/attribute changed/reconcileAssignments.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/attribute changed/reconcileAssignments.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/attribute changed/reconcileAssignments.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/createNewTask.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/createNewTask.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/createNewTask.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/createNewTask.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/task template.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/task template.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/task template.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Implementation/task template.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/gym.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/gym.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/gym.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/gym.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob/Maybe Black Swan.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob/Maybe Black Swan.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob/Maybe Black Swan.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob/Maybe Black Swan.html index 51831b17f..ba291c1ae 100644 --- a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob/Maybe Black Swan.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/mall/Buy some book for Bob/Maybe Black Swan.html @@ -14,7 +14,6 @@ https://en.wikipedia.org/wiki/The_Black_Swan:_The_Impact_of_the_Highly_Improbable - The Black Swan: The Impact of the Highly Improbable is a 2007 book by author and former options trader diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/tesco/Buy milk.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/tesco/Buy milk.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/tesco/Buy milk.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/tesco/Buy milk.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/work/Send invites for christmas par.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/work/Send invites for christmas par.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/work/Send invites for christmas par.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/work/Send invites for christmas par.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy milk.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy milk.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy milk.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy milk.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy some book for Bob.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy some book for Bob.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy some book for Bob.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy some book for Bob.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Send invites for christmas party.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Send invites for christmas party.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Send invites for christmas party.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Send invites for christmas party.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/christmas/Buy some book for Bob.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/christmas/Buy some book for Bob.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/christmas/Buy some book for Bob.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/christmas/Buy some book for Bob.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/groceries/Buy milk.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/groceries/Buy milk.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/groceries/Buy milk.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/groceries/Buy milk.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/health.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/health.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/health.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/health.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy milk.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy milk.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy milk.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy milk.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy some book for Bob.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy some book for Bob.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy some book for Bob.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy some book for Bob.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code/chart.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code/chart.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code/chart.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code/chart.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Word count widget.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Word count widget.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Word count widget.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Word count widget.js diff --git a/_regroup/demo/root/Trilium Demo/Steel Blue.css b/apps/edit-docs/demo/root/Trilium Demo/Steel Blue.css similarity index 97% rename from _regroup/demo/root/Trilium Demo/Steel Blue.css rename to apps/edit-docs/demo/root/Trilium Demo/Steel Blue.css index 56f3dec40..9da2189e7 100644 --- a/_regroup/demo/root/Trilium Demo/Steel Blue.css +++ b/apps/edit-docs/demo/root/Trilium Demo/Steel Blue.css @@ -1,6 +1,6 @@ /* * This is a demo of how you can create custom theme for Trilium. You can activate it by going - * into options (top-right corner) in first tab "Appearance". + * into options in first tab "Appearance". * * You can read some details on theming here: http://github.com/zadam/trilium/wiki/Themes */ @@ -98,4 +98,4 @@ body .note-detail-editable-text, body .note-detail-readonly-text { body .CodeMirror { filter: invert(100%) hue-rotate(180deg); -} \ No newline at end of file +} diff --git a/_regroup/demo/root/Trilium Demo/Steel Blue/eb-garamond-v9-latin-reg.woff2 b/apps/edit-docs/demo/root/Trilium Demo/Steel Blue/eb-garamond-v9-latin-reg.woff2 similarity index 100% rename from _regroup/demo/root/Trilium Demo/Steel Blue/eb-garamond-v9-latin-reg.woff2 rename to apps/edit-docs/demo/root/Trilium Demo/Steel Blue/eb-garamond-v9-latin-reg.woff2 diff --git a/_regroup/demo/root/Trilium Demo/Steel Blue/raleway-v12-latin-regula.woff2 b/apps/edit-docs/demo/root/Trilium Demo/Steel Blue/raleway-v12-latin-regula.woff2 similarity index 100% rename from _regroup/demo/root/Trilium Demo/Steel Blue/raleway-v12-latin-regula.woff2 rename to apps/edit-docs/demo/root/Trilium Demo/Steel Blue/raleway-v12-latin-regula.woff2 diff --git a/_regroup/demo/root/Trilium Demo/Tech.html b/apps/edit-docs/demo/root/Trilium Demo/Tech.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html index 55c1364be..aaa6cd1ad 100644 --- a/_regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html @@ -25,7 +25,6 @@ and Apple's macOS (formerly OS X). A version is also available for Windows 10. Bash on Wikipedia - diff --git a/_regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting/Bash startup modes.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting/Bash startup modes.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting/Bash startup modes.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting/Bash startup modes.html index 2f686d2de..4dad269df 100644 --- a/_regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting/Bash startup modes.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting/Bash startup modes.html @@ -14,7 +14,6 @@ Login shell - As a "login shell", Bash reads and sets (executes) the user's profile from /etc/profile and one of ~/.bash_profile, ~/.bash_login, or ~/.profile (in that order, using the first one that's readable!). @@ -24,7 +23,6 @@ that only make sense for the initial user login. That's why all UNIX® shells have (should have) a "login" mode. Methods to start Bash as a login shell: - the first character of argv[0] is - (a hyphen): traditional UNIX® shells @@ -33,20 +31,17 @@ Bash is started with the --login option Methods to test for login shell mode: - the shell option login_shell is set Related switches: - --noprofile disables reading of all profile files Interactive shell - When Bash starts as an interactive non-login shell, it reads and executes commands from ~/.bashrc. This file should contain, for example, aliases, since they need to be defined in every shell as they're not inherited from @@ -56,13 +51,11 @@ The classic way to have a system-wide rc file is to source /etc/bashrc from every user's ~/.bashrc. Methods to test for interactive-shell mode: - the special parameter $- contains the letter i (lowercase I) Related switches: - -i forces the interactive mode @@ -72,7 +65,6 @@ ~/.bashrc) SH mode - When Bash starts in SH compatiblity mode, it tries to mimic the startup behaviour of historical versions of sh as closely as possible, while conforming to the POSIX® standard as well. The profile files read are /etc/profile @@ -82,7 +74,6 @@ file. After the startup files are read, Bash enters the POSIX(r) compatiblity mode (for running, not for starting!). Bash starts in sh compatiblity mode when: - diff --git a/_regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting/While loop.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting/While loop.html similarity index 98% rename from _regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting/While loop.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting/While loop.html index edf0b35c5..6ab7cf106 100644 --- a/_regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting/While loop.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting/While loop.html @@ -14,16 +14,24 @@ Documentation: http://tldp.org/LDP/Bash-Beginners-Guide/html/sect_09_02.html - #!/bin/bash + # This script opens 4 terminal windows. + + i="0" + while [ $i -lt 4 ] + do + xterm & + + i=$[$i+1] + done diff --git a/_regroup/demo/root/Trilium Demo/Tech/Linux/History.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/History.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Linux/History.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/History.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Linux/Ubuntu.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Ubuntu.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Linux/Ubuntu.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Ubuntu.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Linux/Ubuntu/Unity shortcuts.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Ubuntu/Unity shortcuts.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Linux/Ubuntu/Unity shortcuts.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Ubuntu/Unity shortcuts.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Node.js/Intro.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Intro.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Node.js/Intro.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Intro.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Node.js/Overview.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Node.js/Overview.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Node.js/Overview/History.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview/History.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Node.js/Overview/History.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview/History.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Node.js/Overview/Industry support.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview/Industry support.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Node.js/Overview/Industry support.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview/Industry support.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Node.js/Overview/Platform architecture.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview/Platform architecture.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Tech/Node.js/Overview/Platform architecture.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview/Platform architecture.html index 4b51ab5be..1a977bccc 100644 --- a/_regroup/demo/root/Trilium Demo/Tech/Node.js/Overview/Platform architecture.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Overview/Platform architecture.html @@ -20,7 +20,6 @@ href="https://en.wikipedia.org/wiki/Node.js#cite_note-b1-31">[31]Developers can create scalable servers without using threading, by using a simplified model of event-driven programming that uses callbacks to signal the completion of a task.[31] - diff --git a/_regroup/demo/root/Trilium Demo/Tech/Node.js/Releases.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Releases.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Node.js/Releases.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Node.js/Releases.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Programming/Bash scripting.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Programming/Bash scripting.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Programming/Bash scripting.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Programming/Bash scripting.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Programming/Java.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Programming/Java.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Programming/Java.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Programming/Java.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Security/Trusted timestamping.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Security/Trusted timestamping.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech/Security/Trusted timestamping.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Security/Trusted timestamping.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Work/HR.html b/apps/edit-docs/demo/root/Trilium Demo/Work/HR.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Work/HR.html rename to apps/edit-docs/demo/root/Trilium Demo/Work/HR.html diff --git a/_regroup/demo/root/Trilium Demo/Work/Processes.html b/apps/edit-docs/demo/root/Trilium Demo/Work/Processes.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Work/Processes.html rename to apps/edit-docs/demo/root/Trilium Demo/Work/Processes.html diff --git a/_regroup/demo/root/Trilium Demo/Work/Projects.html b/apps/edit-docs/demo/root/Trilium Demo/Work/Projects.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Work/Projects.html rename to apps/edit-docs/demo/root/Trilium Demo/Work/Projects.html diff --git a/_regroup/demo/root/Trilium Demo_icon-color.svg b/apps/edit-docs/demo/root/Trilium Demo_icon-color.svg similarity index 100% rename from _regroup/demo/root/Trilium Demo_icon-color.svg rename to apps/edit-docs/demo/root/Trilium Demo_icon-color.svg diff --git a/apps/edit-docs/demo/style.css b/apps/edit-docs/demo/style.css new file mode 100644 index 000000000..a848c475a --- /dev/null +++ b/apps/edit-docs/demo/style.css @@ -0,0 +1,4 @@ +/** + * @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options + */:root{--ck-color-mention-background:hsla(341, 100%, 30%, .1);--ck-color-mention-text:hsl(341, 100%, 30%)}.ck-content .mention{background:var(--ck-color-mention-background);color:var(--ck-color-mention-text)}.ck-content code{background-color:#c7c7c74d;padding:.15em;border-radius:2px}.ck-content blockquote{overflow:hidden;padding-right:1.5em;padding-left:1.5em;margin-left:0;margin-right:0;font-style:italic;border-left:solid 5px hsl(0,0%,80%)}.ck-content[dir=rtl] blockquote{border-left:0;border-right:solid 5px hsl(0,0%,80%)}.ck-content pre{padding:1em;color:#353535;background:#c7c7c74d;border:1px solid hsl(0,0%,77%);border-radius:2px;text-align:left;direction:ltr;-moz-tab-size:4;tab-size:4;white-space:pre-wrap;font-style:normal;min-width:200px}.ck-content pre code{background:unset;padding:0;border-radius:0}.ck-content .text-tiny{font-size:.7em}.ck-content .text-small{font-size:.85em}.ck-content .text-big{font-size:1.4em}.ck-content .text-huge{font-size:1.8em}:root{--ck-highlight-marker-yellow:hsl(60, 97%, 73%);--ck-highlight-marker-green:hsl(120, 93%, 68%);--ck-highlight-marker-pink:hsl(345, 96%, 73%);--ck-highlight-marker-blue:hsl(201, 97%, 72%);--ck-highlight-pen-red:hsl(0, 85%, 49%);--ck-highlight-pen-green:hsl(112, 100%, 27%)}.ck-content .marker-yellow{background-color:var(--ck-highlight-marker-yellow)}.ck-content .marker-green{background-color:var(--ck-highlight-marker-green)}.ck-content .marker-pink{background-color:var(--ck-highlight-marker-pink)}.ck-content .marker-blue{background-color:var(--ck-highlight-marker-blue)}.ck-content .pen-red{color:var(--ck-highlight-pen-red);background-color:transparent}.ck-content .pen-green{color:var(--ck-highlight-pen-green);background-color:transparent}.ck-content hr{margin:15px 0;height:4px;background:#dedede;border:0}:root{--ck-color-image-caption-background:hsl(0, 0%, 97%);--ck-color-image-caption-text:hsl(0, 0%, 20%)}.ck-content .image>figcaption{display:table-caption;caption-side:bottom;word-break:break-word;color:var(--ck-color-image-caption-text);background-color:var(--ck-color-image-caption-background);padding:.6em;font-size:.75em;outline-offset:-1px}@media (forced-colors: active){.ck-content .image>figcaption{background-color:unset;color:unset}}.ck-content img.image_resized{height:auto}.ck-content .image.image_resized{max-width:100%;display:block;box-sizing:border-box}.ck-content .image.image_resized img{width:100%}.ck-content .image.image_resized>figcaption{display:block}:root{--ck-image-style-spacing:1.5em;--ck-inline-image-style-spacing:calc(var(--ck-image-style-spacing) / 2)}.ck-content .image.image-style-block-align-left,.ck-content .image.image-style-block-align-right{max-width:calc(100% - var(--ck-image-style-spacing))}.ck-content .image.image-style-align-left,.ck-content .image.image-style-align-right{clear:none}.ck-content .image.image-style-side{float:right;margin-left:var(--ck-image-style-spacing);max-width:50%}.ck-content .image.image-style-align-left{float:left;margin-right:var(--ck-image-style-spacing)}.ck-content .image.image-style-align-right{float:right;margin-left:var(--ck-image-style-spacing)}.ck-content .image.image-style-block-align-right{margin-right:0;margin-left:auto}.ck-content .image.image-style-block-align-left{margin-left:0;margin-right:auto}.ck-content .image-style-align-center{margin-left:auto;margin-right:auto}.ck-content .image-style-align-left{float:left;margin-right:var(--ck-image-style-spacing)}.ck-content .image-style-align-right{float:right;margin-left:var(--ck-image-style-spacing)}.ck-content p+.image.image-style-align-left,.ck-content p+.image.image-style-align-right,.ck-content p+.image.image-style-side{margin-top:0}.ck-content .image-inline.image-style-align-left,.ck-content .image-inline.image-style-align-right{margin-top:var(--ck-inline-image-style-spacing);margin-bottom:var(--ck-inline-image-style-spacing)}.ck-content .image-inline.image-style-align-left{margin-right:var(--ck-inline-image-style-spacing)}.ck-content .image-inline.image-style-align-right{margin-left:var(--ck-inline-image-style-spacing)}.ck-content .image{display:table;clear:both;text-align:center;margin:.9em auto;min-width:50px}.ck-content .image img{display:block;margin:0 auto;max-width:100%;min-width:100%;height:auto}.ck-content .image-inline{display:inline-flex;max-width:100%;align-items:flex-start}.ck-content .image-inline picture{display:flex}.ck-content .image-inline picture,.ck-content .image-inline img{flex-grow:1;flex-shrink:1;max-width:100%}.ck-content ol{list-style-type:decimal}.ck-content ol ol{list-style-type:lower-latin}.ck-content ol ol ol{list-style-type:lower-roman}.ck-content ol ol ol ol{list-style-type:upper-latin}.ck-content ol ol ol ol ol{list-style-type:upper-roman}.ck-content ul{list-style-type:disc}.ck-content ul ul{list-style-type:circle}.ck-content ul ul ul,.ck-content ul ul ul ul{list-style-type:square}:root{--ck-todo-list-checkmark-size:16px}.ck-content .todo-list{list-style:none}.ck-content .todo-list li{position:relative;margin-bottom:5px}.ck-content .todo-list li .todo-list{margin-top:5px}.ck-content .todo-list .todo-list__label>input{-webkit-appearance:none;display:inline-block;position:relative;width:var(--ck-todo-list-checkmark-size);height:var(--ck-todo-list-checkmark-size);vertical-align:middle;border:0;left:-25px;margin-right:-15px;right:0;margin-left:0}.ck-content[dir=rtl] .todo-list .todo-list__label>input{left:0;margin-right:0;right:-25px;margin-left:-15px}.ck-content .todo-list .todo-list__label>input:before{display:block;position:absolute;box-sizing:border-box;content:"";width:100%;height:100%;border:1px solid hsl(0,0%,20%);border-radius:2px;transition:.25s ease-in-out box-shadow}@media (prefers-reduced-motion: reduce){.ck-content .todo-list .todo-list__label>input:before{transition:none}}.ck-content .todo-list .todo-list__label>input:after{display:block;position:absolute;box-sizing:content-box;pointer-events:none;content:"";left:calc(var(--ck-todo-list-checkmark-size) / 3);top:calc(var(--ck-todo-list-checkmark-size) / 5.3);width:calc(var(--ck-todo-list-checkmark-size) / 5.3);height:calc(var(--ck-todo-list-checkmark-size) / 2.6);border-style:solid;border-color:transparent;border-width:0 calc(var(--ck-todo-list-checkmark-size) / 8) calc(var(--ck-todo-list-checkmark-size) / 8) 0;transform:rotate(45deg)}.ck-content .todo-list .todo-list__label>input[checked]:before{background:#26ab33;border-color:#26ab33}.ck-content .todo-list .todo-list__label>input[checked]:after{border-color:#fff}.ck-content .todo-list .todo-list__label .todo-list__label__description{vertical-align:middle}.ck-content .todo-list .todo-list__label.todo-list__label_without-description input[type=checkbox]{position:absolute}.ck-content .media{clear:both;margin:.9em 0;display:block;min-width:15em}.ck-content .page-break{position:relative;clear:both;padding:5px 0;display:flex;align-items:center;justify-content:center}.ck-content .page-break:after{content:"";position:absolute;border-bottom:2px dashed hsl(0,0%,77%);width:100%}.ck-content .page-break__label{position:relative;z-index:1;padding:.3em .6em;display:block;text-transform:uppercase;border:1px solid hsl(0,0%,77%);border-radius:2px;font-family:Helvetica,Arial,Tahoma,Verdana,Sans-Serif;font-size:.75em;font-weight:700;color:#333;background:#fff;box-shadow:2px 2px 1px #00000026;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}@media print{.ck-content .page-break{padding:0}.ck-content .page-break:after{display:none}.ck-content *:has(+.page-break){margin-bottom:0}}.ck-content[dir=rtl] .table th{text-align:right}.ck-content[dir=ltr] .table th{text-align:left}.ck-content figure.table:not(.layout-table){display:table}.ck-content figure.table:not(.layout-table)>table{width:100%;height:100%}.ck-content .table:not(.layout-table){margin:.9em auto}.ck-content table.table:not(.layout-table),.ck-content figure.table:not(.layout-table)>table{border-collapse:collapse;border-spacing:0;border:1px double hsl(0,0%,70%)}.ck-content table.table:not(.layout-table)>thead>tr>th,.ck-content figure.table:not(.layout-table)>table>thead>tr>th,.ck-content table.table:not(.layout-table)>tbody>tr>th,.ck-content figure.table:not(.layout-table)>table>tbody>tr>th{font-weight:700;background:#0000000d}.ck-content table.table:not(.layout-table)>thead>tr>td,.ck-content figure.table:not(.layout-table)>table>thead>tr>td,.ck-content table.table:not(.layout-table)>tbody>tr>td,.ck-content figure.table:not(.layout-table)>table>tbody>tr>td,.ck-content table.table:not(.layout-table)>thead>tr>th,.ck-content figure.table:not(.layout-table)>table>thead>tr>th,.ck-content table.table:not(.layout-table)>tbody>tr>th,.ck-content figure.table:not(.layout-table)>table>tbody>tr>th{min-width:2em;padding:.4em;border:1px solid hsl(0,0%,75%)}@media print{.ck-content figure.table>table{height:initial}}.ck-content table.table.layout-table,.ck-content figure.table.layout-table{margin-top:0;margin-bottom:0}.ck-content table.table.layout-table,.ck-content figure.table.layout-table>table{border-spacing:0}:root{--ck-color-selector-caption-background:hsl(0, 0%, 97%);--ck-color-selector-caption-text:hsl(0, 0%, 20%)}.ck-content .table>figcaption{display:table-caption;caption-side:top;word-break:break-word;text-align:center;color:var(--ck-color-selector-caption-text);background-color:var(--ck-color-selector-caption-background);padding:.6em;font-size:.75em;outline-offset:-1px}@media (forced-colors: active){.ck-content .table>figcaption{background-color:unset;color:unset}}.ck-content .table .ck-table-resized{table-layout:fixed}.ck-content .table td,.ck-content .table th{overflow-wrap:break-word}.printed-content .ck-widget__selection-handle,.printed-content .ck-widget__type-around{display:none}.page-break{page-break-after:always}.printed-content .page-break:after,.printed-content .page-break>*{display:none!important}.ck-content li p{margin:0!important}.admonition{--accent-color: var(--card-border-color);border:1px solid var(--accent-color);box-shadow:var(--card-box-shadow);background:var(--card-background-color);border-radius:.5em;padding:1em;margin:1.25em 0;position:relative;overflow:hidden}.admonition p:last-child{margin-bottom:0}.admonition p,h2{margin-top:0}.admonition.note{--accent-color: #69c7ff}.admonition.tip{--accent-color: #40c025}.admonition.important{--accent-color: #9839f7}.admonition.caution{--accent-color: #ff2e2e}.admonition.warning{--accent-color: #e2aa03} diff --git a/apps/edit-docs/package.json b/apps/edit-docs/package.json index 8bc4a3d3a..82f97d457 100644 --- a/apps/edit-docs/package.json +++ b/apps/edit-docs/package.json @@ -3,12 +3,16 @@ "version": "0.0.1", "private": true, "description": "Desktop version of Trilium which imports the demo database (presented to new users at start-up) or the user guide and other documentation and saves the modifications for committing.", + "dependencies": { + "archiver": "7.0.1", + "better-sqlite3": "^11.9.1" + }, "devDependencies": { "@triliumnext/client": "workspace:*", "@triliumnext/desktop": "workspace:*", "@types/fs-extra": "11.0.4", "copy-webpack-plugin": "13.0.0", - "electron": "36.2.0", + "electron": "36.3.2", "fs-extra": "11.3.0" }, "nx": { @@ -17,6 +21,62 @@ "server" ], "targets": { + "build": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], + "options": { + "main": "apps/edit-docs/src/edit-docs.ts", + "outputPath": "apps/edit-docs/dist", + "tsConfig": "apps/edit-docs/tsconfig.app.json", + "platform": "node", + "additionalEntryPoints": [ + "apps/edit-docs/src/edit-demo.ts" + ], + "external": [ + "electron", + "@electron/remote", + "better-sqlite3", + "./xhr-sync-worker.js" + ], + "format": [ + "cjs" + ], + "minify": false, + "thirdParty": true, + "declaration": false, + "esbuildOptions": { + "splitting": false, + "loader": { + ".css": "text" + } + }, + "assets": [ + { + "glob": "**/*", + "input": "apps/server/dist/node_modules", + "output": "node_modules" + }, + { + "glob": "**/*", + "input": "apps/server/dist/assets", + "output": "assets" + }, + { + "glob": "**/*", + "input": "apps/server/dist/public", + "output": "public" + }, + { + "glob": "xhr-sync-worker.js", + "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", + "output": "" + } + ], + "declarationRootDir": "apps/edit-docs/src" + } + }, "rebuild-deps": { "executor": "nx:run-commands", "dependsOn": [ @@ -29,11 +89,11 @@ "command": "cross-env DEBUG=* tsx scripts/electron-rebuild.mts {projectRoot}/dist" }, "nixos": { - "command": "cross-env DEBUG=* tsx scripts/electron-rebuild.mts {projectRoot}/dist $(nix-shell -p electron_33 --run \"electron --version\")" + "command": "cross-env DEBUG=* tsx scripts/electron-rebuild.mts {projectRoot}/dist $(nix-shell -p electron_35 --run \"electron --version\")" } } }, - "serve": { + "edit-docs": { "executor": "nx:run-commands", "dependsOn": [ "rebuild-deps" @@ -41,19 +101,34 @@ "defaultConfiguration": "default", "configurations": { "default": { - "command": "electron .", - "cwd": "./apps/edit-docs/dist" + "command": "electron edit-docs.cjs", + "cwd": "{projectRoot}/dist" }, "nixos": { - "command": "nix-shell -p electron_35 --run \"electron .\"", - "forwardAllArgs": false, - "cwd": "./apps/edit-docs/dist" + "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/edit-docs.cjs\"", + "cwd": ".", + "forwardAllArgs": false + } + } + }, + "edit-demo": { + "executor": "nx:run-commands", + "dependsOn": [ + "rebuild-deps" + ], + "defaultConfiguration": "default", + "configurations": { + "default": { + "command": "electron edit-demo.cjs", + "cwd": "{projectRoot}/dist" + }, + "nixos": { + "command": "nix-shell -p electron_35 --run \"electron {projectRoot}/dist/edit-demo.cjs\"", + "cwd": ".", + "forwardAllArgs": false } } } } - }, - "dependencies": { - "archiver": "7.0.1" - } -} + } +} \ No newline at end of file diff --git a/apps/edit-docs/src/edit-demo.ts b/apps/edit-docs/src/edit-demo.ts new file mode 100644 index 000000000..62ea49014 --- /dev/null +++ b/apps/edit-docs/src/edit-demo.ts @@ -0,0 +1,62 @@ +import { extractZip, importData, initializeDatabase, startElectron } from "./utils.js"; +import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js"; +import debounce from "@triliumnext/client/src/services/debounce.js"; +import fs from "fs/promises"; +import { join } from "path"; +import cls from "@triliumnext/server/src/services/cls.js"; + +// Paths are relative to apps/edit-docs/dist. +const DEMO_ZIP_PATH = join(__dirname, "../../server/src/assets/db/demo.zip"); +const DEMO_ZIP_DIR_PATH = join(__dirname, "../demo"); + +async function main() { + const initializedPromise = startElectron(() => { + // Wait for the import to be finished and the application to be loaded before we listen to changes. + setTimeout(() => registerHandlers(), 10_000); + }); + + await initializeTranslations(); + await initializeDatabase(true); + cls.init(async () => { + await importData(DEMO_ZIP_DIR_PATH); + setOptions(); + initializedPromise.resolve(); + }); + + initializedPromise.resolve(); +} + +async function setOptions() { + const optionsService = (await import("@triliumnext/server/src/services/options.js")).default; + optionsService.setOption("eraseUnusedAttachmentsAfterSeconds", 10); + optionsService.setOption("eraseUnusedAttachmentsAfterTimeScale", 60); + optionsService.setOption("compressImages", "false"); +} + +async function registerHandlers() { + const events = (await import("@triliumnext/server/src/services/events.js")).default; + const eraseService = (await import("@triliumnext/server/src/services/erase.js")).default; + const debouncer = debounce(async () => { + console.log("Exporting data"); + eraseService.eraseUnusedAttachmentsNow(); + await exportData(); + + await fs.rmdir(DEMO_ZIP_DIR_PATH, { recursive: true }).catch(() => {}); + await extractZip(DEMO_ZIP_PATH, DEMO_ZIP_DIR_PATH); + }, 10_000); + events.subscribe(events.ENTITY_CHANGED, async (e) => { + if (e.entityName === "options") { + return; + } + + console.log("Got entity changed ", e); + debouncer(); + }); +} + +async function exportData() { + const { exportToZipFile } = (await import("@triliumnext/server/src/services/export/zip.js")).default; + await exportToZipFile("root", "html", DEMO_ZIP_PATH); +} + +main(); diff --git a/apps/edit-docs/src/electron-docs-main.ts b/apps/edit-docs/src/edit-docs.ts similarity index 75% rename from apps/edit-docs/src/electron-docs-main.ts rename to apps/edit-docs/src/edit-docs.ts index 52121df3a..940f89540 100644 --- a/apps/edit-docs/src/electron-docs-main.ts +++ b/apps/edit-docs/src/edit-docs.ts @@ -3,18 +3,12 @@ import fsExtra from "fs-extra"; import path from "path"; import type { NoteMetaFile } from "@triliumnext/server/src/services/meta/note_meta.js"; import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js"; -import archiver, { type Archiver } from "archiver"; -import type { WriteStream } from "fs"; import debounce from "@triliumnext/client/src/services/debounce.js"; -import { extractZip, initializeDatabase, startElectron } from "./electron-utils.js"; +import { extractZip, importData, initializeDatabase, startElectron } from "./utils.js"; import cls from "@triliumnext/server/src/services/cls.js"; import type { AdvancedExportOptions } from "@triliumnext/server/src/services/export/zip.js"; -import TaskContext from "@triliumnext/server/src/services/task_context.js"; -import { deferred } from "@triliumnext/server/src/services/utils.js"; import { parseNoteMetaFile } from "@triliumnext/server/src/services/in_app_help.js"; -import { resolve } from "path"; -import electron from "electron"; -import { onReady } from "@triliumnext/desktop/src/electron-main.js"; +import type NoteMeta from "@triliumnext/server/src/services/meta/note_meta.js"; interface NoteMapping { rootNoteId: string; @@ -32,35 +26,37 @@ if (!DOCS_ROOT || !USER_GUIDE_ROOT) { const NOTE_MAPPINGS: NoteMapping[] = [ { rootNoteId: "pOsGYCXsbNQG", - path: path.join(DOCS_ROOT, "User Guide"), + path: path.join(__dirname, DOCS_ROOT, "User Guide"), format: "markdown" }, { rootNoteId: "pOsGYCXsbNQG", - path: USER_GUIDE_ROOT, + path: path.join(__dirname, USER_GUIDE_ROOT), format: "html", ignoredFiles: ["index.html", "navigation.html", "style.css", "User Guide.html"], exportOnly: true }, { rootNoteId: "jdjRLhLV3TtI", - path: path.join(DOCS_ROOT, "Developer Guide"), + path: path.join(__dirname, DOCS_ROOT, "Developer Guide"), format: "markdown" }, { rootNoteId: "hD3V4hiu2VW4", - path: path.join(DOCS_ROOT, "Release Notes"), + path: path.join(__dirname, DOCS_ROOT, "Release Notes"), format: "markdown" } ]; async function main() { - electron.app.on("ready", onReady); + const initializedPromise = startElectron(() => { + // Wait for the import to be finished and the application to be loaded before we listen to changes. + setTimeout(() => registerHandlers(), 10_000); + }); await initializeTranslations(); await initializeDatabase(true); - const initializedPromise = deferred(); cls.init(async () => { for (const mapping of NOTE_MAPPINGS) { if (!mapping.exportOnly) { @@ -70,11 +66,6 @@ async function main() { setOptions(); initializedPromise.resolve(); }); - - await initializedPromise; - - // Wait for the import to be finished and the application to be loaded before we listen to changes. - setTimeout(() => registerHandlers(), 10_000); } async function setOptions() { @@ -84,49 +75,6 @@ async function setOptions() { optionsService.setOption("compressImages", "false"); } -async function importData(path: string) { - const buffer = await createImportZip(path); - const importService = (await import("@triliumnext/server/src/services/import/zip.js")).default; - const context = new TaskContext("no-progress-reporting", "import", false); - const becca = (await import("@triliumnext/server/src/becca/becca.js")).default; - - const rootNote = becca.getRoot(); - if (!rootNote) { - throw new Error("Missing root note for import."); - } - await importService.importZip(context, buffer, rootNote, { - preserveIds: true - }); -} - -async function createImportZip(path: string) { - const inputFile = "input.zip"; - const archive = archiver("zip", { - zlib: { level: 0 } - }); - - console.log("Archive path is ", resolve(path)) - archive.directory(path, "/"); - - const outputStream = fsExtra.createWriteStream(inputFile); - archive.pipe(outputStream); - await waitForEnd(archive, outputStream); - - try { - return await fsExtra.readFile(inputFile); - } finally { - await fsExtra.rm(inputFile); - } -} - -function waitForEnd(archive: Archiver, stream: WriteStream) { - return new Promise(async (res, rej) => { - stream.on("finish", () => res()); - await archive.finalize(); - }); - -} - async function exportData(noteId: string, format: "html" | "markdown", outputPath: string, ignoredFiles?: Set) { const zipFilePath = "output.zip"; diff --git a/apps/edit-docs/src/electron-edit-demo.ts b/apps/edit-docs/src/electron-edit-demo.ts deleted file mode 100644 index 17fb59e57..000000000 --- a/apps/edit-docs/src/electron-edit-demo.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { extractZip, initializeDatabase, startElectron } from "./electron-utils.js"; -import { initializeTranslations } from "@triliumnext/server/src/services/i18n.js"; -import debounce from "@triliumnext/client/src/services/debounce.js"; -import fs from "fs/promises"; - -const DEMO_ZIP_PATH = "db/demo.zip"; - -async function main() { - await initializeTranslations(); - await initializeDatabase(false); - - await startElectron(); - await registerHandlers(); -} - -async function registerHandlers() { - const events = (await import("@triliumnext/server/src/services/events.js")).default; - const eraseService = (await import("@triliumnext/server/src/services/erase.js")).default; - const debouncer = debounce(async () => { - console.log("Exporting data"); - eraseService.eraseUnusedAttachmentsNow(); - await exportData(); - - const outputDir = "demo"; - await fs.rmdir(outputDir, { recursive: true }).catch(() => {}); - await extractZip(DEMO_ZIP_PATH, outputDir); - }, 10_000); - events.subscribe(events.ENTITY_CHANGED, async (e) => { - if (e.entityName === "options") { - return; - } - - console.log("Got entity changed ", e); - debouncer(); - }); -} - -async function exportData() { - const { exportToZipFile } = (await import("@triliumnext/server/src/services/export/zip.js")).default; - await exportToZipFile("root", "html", DEMO_ZIP_PATH); -} - -await main(); diff --git a/apps/edit-docs/src/electron-utils.ts b/apps/edit-docs/src/electron-utils.ts deleted file mode 100644 index 8c7758f62..000000000 --- a/apps/edit-docs/src/electron-utils.ts +++ /dev/null @@ -1,44 +0,0 @@ -import cls from "@triliumnext/server/src/services/cls.js"; -import fs from "fs/promises"; -import fsExtra from "fs-extra"; -import path from "path"; - -export function initializeDatabase(skipDemoDb: boolean) { - return new Promise(async (resolve) => { - const sqlInit = (await import("@triliumnext/server/src/services/sql_init.js")).default; - cls.init(async () => { - if (!sqlInit.isDbInitialized()) { - await sqlInit.createInitialDatabase(skipDemoDb); - } - resolve(); - }); - }); -} - -export async function startElectron() { - await import("@triliumnext/desktop/src/electron-main.js"); -} - -export async function extractZip(zipFilePath: string, outputPath: string, ignoredFiles?: Set) { - const deferred = (await import("@triliumnext/server/src/services/utils.js")).deferred; - - const promise = deferred() - setTimeout(async () => { - // Then extract the zip. - const { readZipFile, readContent } = (await import("@triliumnext/server/src/services/import/zip.js")); - await readZipFile(await fs.readFile(zipFilePath), async (zip, entry) => { - // We ignore directories since they can appear out of order anyway. - if (!entry.fileName.endsWith("/") && !ignoredFiles?.has(entry.fileName)) { - const destPath = path.join(outputPath, entry.fileName); - const fileContent = await readContent(zip, entry); - - await fsExtra.mkdirs(path.dirname(destPath)); - await fs.writeFile(destPath, fileContent); - } - - zip.readEntry(); - }); - promise.resolve(); - }, 1000); - await promise; -} diff --git a/apps/edit-docs/src/utils.ts b/apps/edit-docs/src/utils.ts new file mode 100644 index 000000000..059e1e0cc --- /dev/null +++ b/apps/edit-docs/src/utils.ts @@ -0,0 +1,115 @@ +import cls from "@triliumnext/server/src/services/cls.js"; +import fs from "fs/promises"; +import fsExtra from "fs-extra"; +import path from "path"; +import electron from "electron"; +import { deferred, type DeferredPromise } from "@triliumnext/server/src/services/utils.js"; +import windowService from "@triliumnext/server/src/services/window.js"; +import archiver, { type Archiver } from "archiver"; +import type { WriteStream } from "fs"; +import TaskContext from "@triliumnext/server/src/services/task_context.js"; +import { resolve } from "path"; + +export function initializeDatabase(skipDemoDb: boolean) { + return new Promise(async (resolve) => { + const sqlInit = (await import("@triliumnext/server/src/services/sql_init.js")).default; + cls.init(async () => { + if (!sqlInit.isDbInitialized()) { + await sqlInit.createInitialDatabase(skipDemoDb); + } + resolve(); + }); + }); +} + +/** + * Electron has a behaviour in which the "ready" event must have a listener attached before it gets to initialize. + * If async tasks are awaited before the "ready" event is bound, then the window will never shown. + * This method works around by creating a deferred promise. It will immediately bind to the "ready" event and wait for that promise to be resolved externally. + * + * @param callback a method to be called after the server and Electron is initialized. + * @returns the deferred promise that must be resolved externally before the Electron app is started. + */ +export function startElectron(callback: () => void): DeferredPromise { + const initializedPromise = deferred(); + electron.app.on("ready", async () => { + await initializedPromise; + + console.log("Electron is ready!"); + + // Start the server. + await import("@triliumnext/server/src/main.js"); + + // Create the main window. + await windowService.createMainWindow(electron.app); + + callback(); + }); + return initializedPromise; +} + +export async function importData(path: string) { + const buffer = await createImportZip(path); + const importService = (await import("@triliumnext/server/src/services/import/zip.js")).default; + const context = new TaskContext("no-progress-reporting", "import", false); + const becca = (await import("@triliumnext/server/src/becca/becca.js")).default; + + const rootNote = becca.getRoot(); + if (!rootNote) { + throw new Error("Missing root note for import."); + } + await importService.importZip(context, buffer, rootNote, { + preserveIds: true + }); +} + +async function createImportZip(path: string) { + const inputFile = "input.zip"; + const archive = archiver("zip", { + zlib: { level: 0 } + }); + + console.log("Archive path is ", resolve(path)) + archive.directory(path, "/"); + + const outputStream = fsExtra.createWriteStream(inputFile); + archive.pipe(outputStream); + await waitForEnd(archive, outputStream); + + try { + return await fsExtra.readFile(inputFile); + } finally { + await fsExtra.rm(inputFile); + } +} + +function waitForEnd(archive: Archiver, stream: WriteStream) { + return new Promise(async (res, rej) => { + stream.on("finish", () => res()); + await archive.finalize(); + }); +} + +export async function extractZip(zipFilePath: string, outputPath: string, ignoredFiles?: Set) { + const deferred = (await import("@triliumnext/server/src/services/utils.js")).deferred; + + const promise = deferred() + setTimeout(async () => { + // Then extract the zip. + const { readZipFile, readContent } = (await import("@triliumnext/server/src/services/import/zip.js")); + await readZipFile(await fs.readFile(zipFilePath), async (zip, entry) => { + // We ignore directories since they can appear out of order anyway. + if (!entry.fileName.endsWith("/") && !ignoredFiles?.has(entry.fileName)) { + const destPath = path.join(outputPath, entry.fileName); + const fileContent = await readContent(zip, entry); + + await fsExtra.mkdirs(path.dirname(destPath)); + await fs.writeFile(destPath, fileContent); + } + + zip.readEntry(); + }); + promise.resolve(); + }, 1000); + await promise; +} diff --git a/apps/edit-docs/tsconfig.app.json b/apps/edit-docs/tsconfig.app.json index 2479661aa..b9e17115a 100644 --- a/apps/edit-docs/tsconfig.app.json +++ b/apps/edit-docs/tsconfig.app.json @@ -1,16 +1,21 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "module": "ESNext", + "moduleResolution": "bundler", + "target": "ES2020", "outDir": "dist", + "strict": false, "types": [ - "node" + "node", + "express" ], "rootDir": "src", - "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo", - "verbatimModuleSyntax": false + "tsBuildInfoFile": "dist/tsconfig.app.tsbuildinfo" }, "include": [ - "src/**/*.ts" + "src/**/*.ts", + "../server/src/*.d.ts" ], "exclude": [ "eslint.config.js", diff --git a/apps/edit-docs/webpack.config.cjs b/apps/edit-docs/webpack.config.cjs deleted file mode 100644 index 1ae774de7..000000000 --- a/apps/edit-docs/webpack.config.cjs +++ /dev/null @@ -1,53 +0,0 @@ -const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin'); -const CopyPlugin = require('copy-webpack-plugin'); -const { join } = require('path'); - -const outputDir = join(__dirname, 'dist'); - -module.exports = { - output: { - path: join(__dirname, 'dist'), - }, - module: { - rules: [ - { - test: /\.css$/i, - type: "asset/source" - } - ] - }, - plugins: [ - new NxAppWebpackPlugin({ - target: 'node', - compiler: 'tsc', - main: './src/electron-docs-main.ts', - tsConfig: './tsconfig.app.json', - optimization: false, - outputHashing: 'none', - generatePackageJson: true, - externalDependencies: [ - "electron/main", - "@electron/remote/main", - "electron", - "@electron/remote", - "better-sqlite3" - ] - }), - new CopyPlugin({ - patterns: [ - { - from: "../desktop/dist/node_modules", - to: join(outputDir, "node_modules") - }, - { - from: "../desktop/dist/assets", - to: join(outputDir, "assets") - }, - { - from: "../desktop/dist/public", - to: join(outputDir, "public") - }, - ] - }) - ], -}; diff --git a/apps/server-e2e/playwright.config.ts b/apps/server-e2e/playwright.config.ts index 47a21bf81..75de90147 100644 --- a/apps/server-e2e/playwright.config.ts +++ b/apps/server-e2e/playwright.config.ts @@ -22,12 +22,13 @@ export default defineConfig({ trace: 'on-first-retry', }, /* Run your local dev server before starting the tests */ - webServer: { + webServer: !process.env.TRILIUM_DOCKER ? { command: 'pnpm server:start-prod', url: baseURL, reuseExistingServer: !process.env.CI, - cwd: workspaceRoot - }, + cwd: workspaceRoot, + timeout: 5 * 60 * 1000 + } : undefined, projects: [ { name: "chromium", diff --git a/apps/server-e2e/src/layout/tab_bar.spec.ts b/apps/server-e2e/src/layout/tab_bar.spec.ts index c064dbf57..cb82f8f82 100644 --- a/apps/server-e2e/src/layout/tab_bar.spec.ts +++ b/apps/server-e2e/src/layout/tab_bar.spec.ts @@ -115,7 +115,7 @@ test("Search works when dismissing a tab", async ({ page, context }) => { await app.getTab(0).click(); await app.openAndClickNoteActionMenu("Search in note"); - await expect(app.findAndReplaceWidget).toBeVisible(); + await expect(app.findAndReplaceWidget.first()).toBeVisible(); }); test("New tab displays workspaces", async ({ page, context }) => { diff --git a/apps/server-e2e/src/note_types/code.spec.ts b/apps/server-e2e/src/note_types/code.spec.ts index 29084ff84..325c6100b 100644 --- a/apps/server-e2e/src/note_types/code.spec.ts +++ b/apps/server-e2e/src/note_types/code.spec.ts @@ -7,18 +7,14 @@ test("Displays lint warnings for backend script", async ({ page, context }) => { await app.closeAllTabs(); await app.goToNoteInNewTab("Backend script with lint warnings"); - const codeEditor = app.currentNoteSplit.locator(".CodeMirror"); + const codeEditor = app.currentNoteSplit.locator(".cm-editor"); // Expect two warning signs in the gutter. - await expect(codeEditor.locator(".CodeMirror-gutter-wrapper .CodeMirror-lint-marker-warning")).toHaveCount(2); + await expect(codeEditor.locator(".cm-gutter-lint .cm-lint-marker-warning")).toHaveCount(2); // Hover over hello await codeEditor.getByText("hello").first().hover(); await expectTooltip(page, "'hello' is defined but never used."); - - // Hover over world - await codeEditor.getByText("world").first().hover(); - await expectTooltip(page, "'world' is defined but never used."); }); test("Displays lint errors for backend script", async ({ page, context }) => { @@ -27,10 +23,10 @@ test("Displays lint errors for backend script", async ({ page, context }) => { await app.closeAllTabs(); await app.goToNoteInNewTab("Backend script with lint errors"); - const codeEditor = app.currentNoteSplit.locator(".CodeMirror"); + const codeEditor = app.currentNoteSplit.locator(".cm-editor"); // Expect two warning signs in the gutter. - const errorMarker = codeEditor.locator(".CodeMirror-gutter-wrapper .CodeMirror-lint-marker-error"); + const errorMarker = codeEditor.locator(".cm-gutter-lint .cm-lint-marker-error"); await expect(errorMarker).toHaveCount(1); // Hover over hello @@ -40,7 +36,7 @@ test("Displays lint errors for backend script", async ({ page, context }) => { async function expectTooltip(page: Page, tooltip: string) { await expect( - page.locator(".CodeMirror-lint-tooltip:visible", { + page.locator(".cm-tooltip:visible", { hasText: tooltip }) ).toBeVisible(); diff --git a/apps/server-e2e/tsconfig.json b/apps/server-e2e/tsconfig.json index 5e023db98..1df867f3a 100644 --- a/apps/server-e2e/tsconfig.json +++ b/apps/server-e2e/tsconfig.json @@ -3,8 +3,7 @@ "compilerOptions": { "allowJs": true, "outDir": "out-tsc/playwright", - "sourceMap": false, - "verbatimModuleSyntax": false + "sourceMap": false }, "include": [ "**/*.ts", diff --git a/apps/server/.serve.env b/apps/server/.serve.env index 5006a3765..43591d92c 100644 --- a/apps/server/.serve.env +++ b/apps/server/.serve.env @@ -1,3 +1,4 @@ TRILIUM_ENV=dev TRILIUM_DATA_DIR=./apps/server/data +TRILIUM_RESOURCE_DIR=./apps/server/dist TRILIUM_PUBLIC_SERVER=http://localhost:4200 \ No newline at end of file diff --git a/apps/server/.start-prod.env b/apps/server/.start-prod.env index b5c249243..9bd1c0d93 100644 --- a/apps/server/.start-prod.env +++ b/apps/server/.start-prod.env @@ -1,2 +1,3 @@ TRILIUM_ENV=production -TRILIUM_DATA_DIR=./apps/server/data \ No newline at end of file +TRILIUM_DATA_DIR=./apps/server/data +TRILIUM_PORT=8082 \ No newline at end of file diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile index f834ba726..dbb021f58 100644 --- a/apps/server/Dockerfile +++ b/apps/server/Dockerfile @@ -1,28 +1,28 @@ -FROM node:22.15.0-bullseye-slim AS builder - RUN corepack enable +FROM node:22.16.0-bullseye-slim AS builder +RUN corepack enable - # Install native dependencies since we might be building cross-platform. - WORKDIR /usr/src/app/build - COPY ./dist/package.json ./dist/pnpm-lock.yaml ./docker/pnpm-workspace.yaml /usr/src/app/ - # We have to use --no-frozen-lockfile due to CKEditor patches - RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild +# Install native dependencies since we might be building cross-platform. +WORKDIR /usr/src/app/build +COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ +# We have to use --no-frozen-lockfile due to CKEditor patches +RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild -FROM node:22.15.0-bullseye-slim - # Install only runtime dependencies - RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - gosu && \ - rm -rf \ - /var/lib/apt/lists/* \ - /var/cache/apt/* +FROM node:22.16.0-bullseye-slim +# Install only runtime dependencies +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gosu && \ + rm -rf \ + /var/lib/apt/lists/* \ + /var/cache/apt/* - WORKDIR /usr/src/app - COPY ./dist /usr/src/app - RUN rm -rf /usr/src/app/node_modules/better-sqlite3 - COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /usr/src/app/node_modules/better-sqlite3 - COPY ./start-docker.sh /usr/src/app +WORKDIR /usr/src/app +COPY ./dist /usr/src/app +RUN rm -rf /usr/src/app/node_modules/better-sqlite3 +COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /usr/src/app/node_modules/better-sqlite3 +COPY ./start-docker.sh /usr/src/app - # Configure container - EXPOSE 8080 - CMD [ "sh", "./start-docker.sh" ] - HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.js \ No newline at end of file +# Configure container +EXPOSE 8080 +CMD [ "sh", "./start-docker.sh" ] +HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.cjs \ No newline at end of file diff --git a/apps/server/Dockerfile.alpine b/apps/server/Dockerfile.alpine index dc038043f..18bc42bf5 100644 --- a/apps/server/Dockerfile.alpine +++ b/apps/server/Dockerfile.alpine @@ -1,26 +1,26 @@ -FROM node:22.15.0-alpine AS builder - RUN corepack enable +FROM node:22.16.0-alpine AS builder +RUN corepack enable - # Install native dependencies since we might be building cross-platform. - WORKDIR /usr/src/app - COPY ./dist/package.json ./dist/pnpm-lock.yaml ./docker/pnpm-workspace.yaml /usr/src/app/ - # We have to use --no-frozen-lockfile due to CKEditor patches - RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild +# Install native dependencies since we might be building cross-platform. +WORKDIR /usr/src/app +COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ +# We have to use --no-frozen-lockfile due to CKEditor patches +RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild -FROM node:22.15.0-alpine - # Install runtime dependencies - RUN apk add --no-cache su-exec shadow +FROM node:22.16.0-alpine +# Install runtime dependencies +RUN apk add --no-cache su-exec shadow - WORKDIR /usr/src/app - COPY ./dist /usr/src/app - RUN rm -rf /usr/src/app/node_modules/better-sqlite3 - COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /usr/src/app/node_modules/better-sqlite3 - COPY ./start-docker.sh /usr/src/app +WORKDIR /usr/src/app +COPY ./dist /usr/src/app +RUN rm -rf /usr/src/app/node_modules/better-sqlite3 +COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /usr/src/app/node_modules/better-sqlite3 +COPY ./start-docker.sh /usr/src/app - # Add application user - RUN adduser -s /bin/false node; exit 0 +# Add application user +RUN adduser -s /bin/false node; exit 0 - # Configure container - EXPOSE 8080 - CMD [ "sh", "./start-docker.sh" ] - HEALTHCHECK --start-period=10s CMD exec su-exec node node /usr/src/app/docker_healthcheck.js \ No newline at end of file +# Configure container +EXPOSE 8080 +CMD [ "sh", "./start-docker.sh" ] +HEALTHCHECK --start-period=10s CMD exec su-exec node node /usr/src/app/docker_healthcheck.cjs \ No newline at end of file diff --git a/apps/server/Dockerfile.alpine.rootless b/apps/server/Dockerfile.alpine.rootless new file mode 100644 index 000000000..8f2325c29 --- /dev/null +++ b/apps/server/Dockerfile.alpine.rootless @@ -0,0 +1,50 @@ +FROM node:22.16.0-alpine AS builder +RUN corepack enable + +# Install native dependencies since we might be building cross-platform. +WORKDIR /usr/src/app +COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ +# We have to use --no-frozen-lockfile due to CKEditor patches +RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild + +FROM node:22.16.0-alpine +# Create a non-root user with configurable UID/GID +ARG USER=trilium +ARG UID=1001 +ARG GID=1001 +ENV USER=${USER} +ENV UID=${UID} +ENV GID=${GID} + +# Install runtime dependencies and create user with specific UID/GID +RUN apk add --no-cache dumb-init && \ + apk add --no-cache bash && \ + # Alpine uses addgroup/adduser (from busybox) instead of groupadd/useradd + addgroup -g ${GID} ${USER} && \ + adduser -u ${UID} -G ${USER} -s /bin/sh -D -h /home/${USER} ${USER} + +WORKDIR /home/${USER}/app +COPY ./dist /home/${USER}/app +# Also copy the rootless entrypoint script +COPY rootless-entrypoint.sh /home/${USER}/app/ +RUN rm -rf /home/${USER}/app/node_modules/better-sqlite3 +COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /home/${USER}/app/node_modules/better-sqlite3 +RUN chown -R ${USER}:${USER} /home/${USER} + +# Configure container +USER ${USER} +EXPOSE 8080 + +# By default, use UID/GID that was set during build +# These can be overridden at runtime +ENV TRILIUM_UID=${UID} +ENV TRILIUM_GID=${GID} +ENV TRILIUM_DATA_DIR=/home/${USER}/trilium-data + +# Use dumb-init as entrypoint to handle signals properly +ENTRYPOINT ["/usr/bin/dumb-init", "--"] + +# Use the entrypoint script +CMD [ "bash", "./rootless-entrypoint.sh" ] + +HEALTHCHECK --start-period=10s CMD node /home/${USER}/app/docker_healthcheck.js diff --git a/apps/server/Dockerfile.rootless b/apps/server/Dockerfile.rootless new file mode 100644 index 000000000..1c4ae0321 --- /dev/null +++ b/apps/server/Dockerfile.rootless @@ -0,0 +1,48 @@ +FROM node:22.16.0-bullseye-slim AS builder +RUN corepack enable + +# Install native dependencies since we might be building cross-platform. +WORKDIR /usr/src/app/build +COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ +# We have to use --no-frozen-lockfile due to CKEditor patches +RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild + +FROM node:22.16.0-bullseye-slim +# Create a non-root user with configurable UID/GID +ARG USER=trilium +ARG UID=1001 +ARG GID=1001 +ENV USER=${USER} +ENV UID=${UID} +ENV GID=${GID} + +# Install only runtime dependencies +RUN rm -rf \ + /var/lib/apt/lists/* \ + /var/cache/apt/* && \ + # Create the user/group with the default UID/GID + groupadd -g ${GID} ${USER} && \ + useradd -u ${UID} -g ${USER} -s /bin/sh -m ${USER} + +WORKDIR /home/${USER}/app +COPY ./dist /home/${USER}/app +# Also copy the rootless entrypoint script +COPY rootless-entrypoint.sh /home/${USER}/app/ +RUN rm -rf /home/${USER}/app/node_modules/better-sqlite3 +COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /home/${USER}/app/node_modules/better-sqlite3 +RUN chown -R ${USER}:${USER} /home/${USER} + +# Configure container +USER ${USER} +EXPOSE 8080 + +# By default, use UID/GID that was set during build +# These can be overridden at runtime +ENV TRILIUM_UID=${UID} +ENV TRILIUM_GID=${GID} +ENV TRILIUM_DATA_DIR=/home/${USER}/trilium-data + +# Use the entrypoint script +CMD [ "bash", "./rootless-entrypoint.sh" ] + +HEALTHCHECK --start-period=10s CMD node /home/${USER}/app/docker_healthcheck.js diff --git a/apps/server/docker/package.json b/apps/server/docker/package.json new file mode 100644 index 000000000..bd414d937 --- /dev/null +++ b/apps/server/docker/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "better-sqlite3": "11.10.0" + } +} \ No newline at end of file diff --git a/apps/server/package.json b/apps/server/package.json index 44f73942f..2b8836251 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -4,18 +4,14 @@ "description": "The server-side component of TriliumNext, which exposes the client via the web, allows for sync and provides a REST API for both internal and external use.", "private": true, "dependencies": { - "better-sqlite3": "11.10.0", - "jquery.fancytree": "2.38.5", - "jquery-hotkeys": "0.2.2", - "@highlightjs/cdn-assets": "11.11.1" + "better-sqlite3": "11.10.0" }, "devDependencies": { "@electron/remote": "2.1.2", - "@excalidraw/excalidraw": "0.18.0", "@types/archiver": "6.0.3", "@types/better-sqlite3": "7.6.13", "@types/cls-hooked": "4.3.9", - "@types/compression": "1.7.5", + "@types/compression": "1.8.0", "@types/cookie-parser": "1.4.8", "@types/debounce": "1.2.4", "@types/ejs": "3.1.5", @@ -42,14 +38,8 @@ "@types/turndown": "5.0.5", "@types/ws": "8.18.1", "@types/xml2js": "0.4.14", - "autocomplete.js": "0.38.1", - "boxicons": "2.1.4", - "codemirror": "5.65.19", "express-http-proxy": "2.1.1", - "jquery": "3.7.1", - "katex": "0.16.22", - "normalize.css": "8.0.1", - "@anthropic-ai/sdk": "0.50.3", + "@anthropic-ai/sdk": "0.52.0", "@braintree/sanitize-url": "7.1.1", "@triliumnext/commons": "workspace:*", "@triliumnext/express-partial-content": "workspace:*", @@ -67,9 +57,9 @@ "csrf-csrf": "3.2.2", "dayjs": "1.11.13", "debounce": "2.2.0", - "debug": "4.4.0", + "debug": "4.4.1", "ejs": "3.1.10", - "electron": "36.2.0", + "electron": "36.3.2", "electron-debug": "4.1.0", "electron-window-state": "5.0.3", "escape-html": "1.0.3", @@ -84,70 +74,59 @@ "html2plaintext": "2.1.4", "http-proxy-agent": "7.0.2", "https-proxy-agent": "7.0.6", - "i18next": "25.1.2", + "i18next": "25.2.1", "i18next-fs-backend": "2.6.0", - "image-type": "5.2.0", + "image-type": "6.0.0", "ini": "5.0.0", "is-animated": "2.0.2", "is-svg": "6.0.0", "jimp": "1.6.0", "js-yaml": "4.1.0", "jsdom": "26.1.0", - "marked": "15.0.11", + "marked": "15.0.12", "mime-types": "3.0.1", - "multer": "1.4.5-lts.2", + "multer": "2.0.0", "normalize-strings": "1.1.1", - "ollama": "0.5.15", - "openai": "4.98.0", + "ollama": "0.5.16", + "openai": "4.104.0", "rand-token": "1.0.1", "safe-compare": "1.1.4", "sanitize-filename": "1.6.3", - "sanitize-html": "2.16.0", + "sanitize-html": "2.17.0", "sax": "1.4.1", "serve-favicon": "2.5.0", - "session-file-store": "1.5.0", "stream-throttle": "0.1.3", "strip-bom": "5.0.0", "striptags": "3.2.0", - "supertest": "7.1.0", + "supertest": "7.1.1", "swagger-jsdoc": "6.2.8", "swagger-ui-express": "5.0.1", "time2fa": "^1.3.0", "tmp": "0.2.3", "turndown": "7.2.0", "unescape": "1.0.1", - "webpack": "5.99.8", "ws": "8.18.2", "xml2js": "0.6.2", - "yauzl": "3.2.0", - "copy-webpack-plugin": "13.0.0" + "yauzl": "3.2.0" }, "nx": { "name": "server", "targets": { - "build": { - "dependsOn": [ - "^build", - "client:build" - ] - }, "serve": { "executor": "@nx/js:node", - "defaultConfiguration": "development", "dependsOn": [ - "build" - ], - "options": { - "buildTarget": "server:build", - "runBuildTargetDependencies": false - }, - "configurations": { - "development": { - "buildTarget": "server:build:development" + { + "projects": [ + "client" + ], + "target": "serve" }, - "production": { - "buildTarget": "server:build:production" - } + "build-without-client" + ], + "continuous": true, + "options": { + "buildTarget": "server:build-without-client:development", + "runBuildTargetDependencies": false } }, "package": { @@ -160,7 +139,7 @@ "dependsOn": [ "build" ], - "command": "node apps/server/dist/main.js" + "command": "node apps/server/dist/main.cjs" }, "docker-build": { "dependsOn": [ @@ -177,6 +156,12 @@ }, "alpine": { "command": "docker build . -t triliumnext-alpine -f Dockerfile.alpine" + }, + "rootless-debian": { + "command": "docker build . -t triliumnext-rootless-debian -f Dockerfile.rootless" + }, + "rootless-alpine": { + "command": "docker build . -t triliumnext-rootless-alpine -f Dockerfile.alpine.rootless" } } }, @@ -192,9 +177,132 @@ }, "alpine": { "command": "docker run -p 8081:8080 triliumnext-alpine" + }, + "rootless-debian": { + "command": "docker run -p 8081:8080 triliumnext-rootless-debian" + }, + "rootless-alpine": { + "command": "docker run -p 8081:8080 triliumnext-rootless-alpine" } } + }, + "build-without-client": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], + "options": { + "main": "apps/server/src/main.ts", + "outputPath": "apps/server/dist", + "outputFileName": "main.js", + "tsConfig": "apps/server/tsconfig.app.json", + "platform": "node", + "format": [ + "cjs" + ], + "esbuildOptions": { + "loader": { + ".css": "text" + } + }, + "declarationRootDir": "apps/server/src" + }, + "configurations": { + "development": { + "minify": false, + "assets": [ + { + "glob": "**/*", + "input": "apps/server/src/assets", + "output": "assets" + } + ] + } + } + }, + "build": { + "executor": "@nx/esbuild:esbuild", + "outputs": [ + "{options.outputPath}" + ], + "dependsOn": [ + "^build", + "client:build" + ], + "options": { + "main": "apps/server/src/main.ts", + "outputPath": "apps/server/dist", + "tsConfig": "apps/server/tsconfig.app.json", + "platform": "node", + "external": [ + "electron", + "@electron/remote", + "better-sqlite3", + "./xhr-sync-worker.js" + ], + "format": [ + "cjs" + ], + "declarationRootDir": "apps/server/src", + "minify": true, + "thirdParty": true, + "declaration": false, + "esbuildOptions": { + "splitting": false, + "loader": { + ".css": "text" + } + }, + "additionalEntryPoints": [ + "apps/server/src/docker_healthcheck.ts" + ], + "assets": [ + { + "glob": "**/*", + "input": "apps/server/src/assets", + "output": "assets" + }, + { + "glob": "**/*", + "input": "apps/client/dist", + "output": "public" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/better-sqlite3", + "output": "node_modules/better-sqlite3" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/bindings", + "output": "node_modules/bindings" + }, + { + "glob": "**/*", + "input": "apps/server/node_modules/file-uri-to-path", + "output": "node_modules/file-uri-to-path" + }, + { + "glob": "xhr-sync-worker.js", + "input": "apps/server/node_modules/jsdom/lib/jsdom/living/xhr", + "output": "" + } + ] + } } } - } + }, + "exports": { + "./package.json": "./package.json", + "./src/*": "./src/*", + ".": { + "development": "./src/main.ts", + "types": "./dist/main.d.ts", + "import": "./dist/main.js", + "default": "./dist/main.js" + } + }, + "types": "./dist/main.d.ts", + "module": "./dist/main.js", + "main": "./dist/main.js" } \ No newline at end of file diff --git a/apps/server/rootless-entrypoint.sh b/apps/server/rootless-entrypoint.sh new file mode 100755 index 000000000..4056df2a2 --- /dev/null +++ b/apps/server/rootless-entrypoint.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# Rootless entrypoint script for Trilium Notes +# Works with both Debian and Alpine-based images + +# Check if runtime UID/GID match the expected values +if [ "${TRILIUM_UID}" != "$(id -u)" ] || [ "${TRILIUM_GID}" != "$(id -g)" ]; then + echo "Detected UID:GID mismatch (current: $(id -u):$(id -g), expected: ${TRILIUM_UID}:${TRILIUM_GID})" + # Check GID mismatch + if [ "${TRILIUM_GID}" != "$(id -g)" ]; then + echo "ERROR: Cannot change GID at runtime in rootless mode." + echo " Current GID: $(id -g), Expected GID: ${TRILIUM_GID}" + echo " Please use docker run with --user $(id -u):$(id -g) instead." + exit 1 + fi + # Check UID mismatch + if [ "${TRILIUM_UID}" != "$(id -u)" ]; then + echo "ERROR: Cannot change UID at runtime in rootless mode." + echo " Current UID: $(id -u), Expected UID: ${TRILIUM_UID}" + echo " Please use docker run with --user $(id -u):$(id -g) instead." + exit 1 + fi +fi + +# Make sure data directory has correct permissions +mkdir -p "${TRILIUM_DATA_DIR}" + +# Start the app +exec node ./main.cjs diff --git a/apps/server/scripts/build-server.sh b/apps/server/scripts/build-server.sh index 313726c86..b81e2901a 100644 --- a/apps/server/scripts/build-server.sh +++ b/apps/server/scripts/build-server.sh @@ -21,7 +21,7 @@ fi echo "Selected Arch: $ARCH" # Set Node.js version and architecture-specific filename -NODE_VERSION=22.14.0 +NODE_VERSION=22.16.0 script_dir=$(realpath $(dirname $0)) BUILD_DIR="$script_dir/../dist" @@ -43,7 +43,7 @@ rm -rf $BUILD_DIR/node/lib/node_modules/{npm,corepack} \ $BUILD_DIR/node_modules/electron* \ $BUILD_DIR/electron*.{js,map} -printf "#!/bin/sh\n./node/bin/node src/main\n" > $BUILD_DIR/trilium.sh +printf "#!/bin/sh\n./node/bin/node main.cjs\n" > $BUILD_DIR/trilium.sh chmod 755 $BUILD_DIR/trilium.sh VERSION=`jq -r ".version" package.json` diff --git a/apps/server/spec/setup.ts b/apps/server/spec/setup.ts index c3b32e477..2fae6e73c 100644 --- a/apps/server/spec/setup.ts +++ b/apps/server/spec/setup.ts @@ -1,6 +1,7 @@ import { beforeAll } from "vitest"; import i18next from "i18next"; import { join } from "path"; +import dayjs from "dayjs"; beforeAll(async () => { // Initialize the translations manually to avoid any side effects. @@ -15,4 +16,8 @@ beforeAll(async () => { loadPath: join(__dirname, "../src/assets/translations/{{lng}}/{{ns}}.json") } }); + + // Initialize dayjs + await import("dayjs/locale/en.js"); + dayjs.locale("en"); }); diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index 43170e0bd..3ac3ee5c4 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -4,9 +4,8 @@ import favicon from "serve-favicon"; import cookieParser from "cookie-parser"; import helmet from "helmet"; import compression from "compression"; -import sessionParser from "./routes/session_parser.js"; import config from "./services/config.js"; -import utils, { getResourceDir } from "./services/utils.js"; +import utils, { getResourceDir, isDev } from "./services/utils.js"; import assets from "./routes/assets.js"; import routes from "./routes/routes.js"; import custom from "./routes/custom.js"; @@ -64,7 +63,7 @@ export default async function buildApp() { console.log("Database not initialized yet. LLM features will be initialized after setup."); } - const publicDir = path.join(getResourceDir(), "public"); + const publicDir = isDev ? path.join(getResourceDir(), "../dist/public") : path.join(getResourceDir(), "public"); const publicAssetsDir = path.join(publicDir, "assets"); const assetsDir = RESOURCE_DIR; @@ -111,6 +110,8 @@ export default async function buildApp() { app.use(`/manifest.webmanifest`, express.static(path.join(publicAssetsDir, "manifest.webmanifest"))); app.use(`/robots.txt`, express.static(path.join(publicAssetsDir, "robots.txt"))); app.use(`/icon.png`, express.static(path.join(publicAssetsDir, "icon.png"))); + + const sessionParser = (await import("./routes/session_parser.js")).default; app.use(sessionParser); app.use(favicon(path.join(assetsDir, "icon.ico"))); @@ -136,7 +137,7 @@ export default async function buildApp() { startScheduledCleanup(); if (utils.isElectron) { - (await import("@electron/remote/main")).initialize(); + (await import("@electron/remote/main/index.js")).initialize(); } return app; diff --git a/apps/server/src/assets/db/demo.zip b/apps/server/src/assets/db/demo.zip index b44f44fb4..8a0d61779 100644 Binary files a/apps/server/src/assets/db/demo.zip and b/apps/server/src/assets/db/demo.zip differ diff --git a/apps/server/src/assets/db/migrations/0215__content_structure.sql b/apps/server/src/assets/db/migrations/0215__content_structure.sql deleted file mode 100644 index da4afcf6b..000000000 --- a/apps/server/src/assets/db/migrations/0215__content_structure.sql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE TABLE IF NOT EXISTS "blobs" ( - `blobId` TEXT NOT NULL, - `content` TEXT NULL DEFAULT NULL, - `dateModified` TEXT NOT NULL, - `utcDateModified` TEXT NOT NULL, - PRIMARY KEY(`blobId`) -); - -ALTER TABLE notes ADD blobId TEXT DEFAULT NULL; -ALTER TABLE note_revisions ADD blobId TEXT DEFAULT NULL; - -CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId); -CREATE INDEX IF NOT EXISTS IDX_note_revisions_blobId on note_revisions (blobId); diff --git a/apps/server/src/assets/db/migrations/0217__drop_content_tables.sql b/apps/server/src/assets/db/migrations/0217__drop_content_tables.sql deleted file mode 100644 index 549fd6919..000000000 --- a/apps/server/src/assets/db/migrations/0217__drop_content_tables.sql +++ /dev/null @@ -1,4 +0,0 @@ -DROP TABLE note_contents; -DROP TABLE note_revision_contents; - -DELETE FROM entity_changes WHERE entityName IN ('note_contents', 'note_revision_contents'); diff --git a/apps/server/src/assets/db/migrations/0218__rename_note_revision_to_revision.sql b/apps/server/src/assets/db/migrations/0218__rename_note_revision_to_revision.sql deleted file mode 100644 index c67c52393..000000000 --- a/apps/server/src/assets/db/migrations/0218__rename_note_revision_to_revision.sql +++ /dev/null @@ -1,26 +0,0 @@ -CREATE TABLE IF NOT EXISTS "revisions" (`revisionId` TEXT NOT NULL PRIMARY KEY, - `noteId` TEXT NOT NULL, - type TEXT DEFAULT '' NOT NULL, - mime TEXT DEFAULT '' NOT NULL, - `title` TEXT NOT NULL, - `isProtected` INT NOT NULL DEFAULT 0, - blobId TEXT DEFAULT NULL, - `utcDateLastEdited` TEXT NOT NULL, - `utcDateCreated` TEXT NOT NULL, - `utcDateModified` TEXT NOT NULL, - `dateLastEdited` TEXT NOT NULL, - `dateCreated` TEXT NOT NULL); - -INSERT INTO revisions (revisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, blobId) -SELECT noteRevisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, blobId FROM note_revisions; - -DROP TABLE note_revisions; - -CREATE INDEX `IDX_revisions_noteId` ON `revisions` (`noteId`); -CREATE INDEX `IDX_revisions_utcDateCreated` ON `revisions` (`utcDateCreated`); -CREATE INDEX `IDX_revisions_utcDateLastEdited` ON `revisions` (`utcDateLastEdited`); -CREATE INDEX `IDX_revisions_dateCreated` ON `revisions` (`dateCreated`); -CREATE INDEX `IDX_revisions_dateLastEdited` ON `revisions` (`dateLastEdited`); -CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId); - -UPDATE entity_changes SET entityName = 'revisions' WHERE entityName = 'note_revisions'; diff --git a/apps/server/src/assets/db/migrations/0219__attachments.sql b/apps/server/src/assets/db/migrations/0219__attachments.sql deleted file mode 100644 index 246360bfe..000000000 --- a/apps/server/src/assets/db/migrations/0219__attachments.sql +++ /dev/null @@ -1,23 +0,0 @@ -CREATE TABLE IF NOT EXISTS "attachments" -( - attachmentId TEXT not null primary key, - ownerId TEXT not null, - role TEXT not null, - mime TEXT not null, - title TEXT not null, - isProtected INT not null DEFAULT 0, - position INT default 0 not null, - blobId TEXT DEFAULT null, - dateModified TEXT NOT NULL, - utcDateModified TEXT not null, - utcDateScheduledForErasureSince TEXT DEFAULT NULL, - isDeleted INT not null, - deleteId TEXT DEFAULT NULL); - -CREATE INDEX IDX_attachments_ownerId_role - on attachments (ownerId, role); - -CREATE INDEX IDX_attachments_utcDateScheduledForErasureSince - on attachments (utcDateScheduledForErasureSince); - -CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId); diff --git a/apps/server/src/assets/db/migrations/0221__remove_hideIncludedImages_main_option.sql b/apps/server/src/assets/db/migrations/0221__remove_hideIncludedImages_main_option.sql deleted file mode 100644 index 5e4ec083b..000000000 --- a/apps/server/src/assets/db/migrations/0221__remove_hideIncludedImages_main_option.sql +++ /dev/null @@ -1,2 +0,0 @@ -DELETE FROM options WHERE name = 'hideIncludedImages_main'; -DELETE FROM entity_changes WHERE entityName = 'options' AND entityId = 'hideIncludedImages_main'; \ No newline at end of file diff --git a/apps/server/src/assets/db/migrations/0222__rename_openTabs_to_openNoteContexts.sql b/apps/server/src/assets/db/migrations/0222__rename_openTabs_to_openNoteContexts.sql deleted file mode 100644 index c4d719bce..000000000 --- a/apps/server/src/assets/db/migrations/0222__rename_openTabs_to_openNoteContexts.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE options SET name = 'openNoteContexts' WHERE name = 'openTabs'; -UPDATE entity_changes SET entityId = 'openNoteContexts' WHERE entityName = 'options' AND entityId = 'openTabs'; diff --git a/apps/server/src/assets/db/migrations/0223__NOOP.sql b/apps/server/src/assets/db/migrations/0223__NOOP.sql deleted file mode 100644 index e0ac49d1e..000000000 --- a/apps/server/src/assets/db/migrations/0223__NOOP.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT 1; diff --git a/apps/server/src/assets/db/migrations/0224__fix_blobIds.sql b/apps/server/src/assets/db/migrations/0224__fix_blobIds.sql deleted file mode 100644 index 725e9d1f2..000000000 --- a/apps/server/src/assets/db/migrations/0224__fix_blobIds.sql +++ /dev/null @@ -1,14 +0,0 @@ -UPDATE blobs SET blobId = REPLACE(blobId, '+', 'X'); -UPDATE blobs SET blobId = REPLACE(blobId, '/', 'Y'); - -UPDATE notes SET blobId = REPLACE(blobId, '+', 'X'); -UPDATE notes SET blobId = REPLACE(blobId, '/', 'Y'); - -UPDATE attachments SET blobId = REPLACE(blobId, '+', 'X'); -UPDATE attachments SET blobId = REPLACE(blobId, '/', 'Y'); - -UPDATE revisions SET blobId = REPLACE(blobId, '+', 'X'); -UPDATE revisions SET blobId = REPLACE(blobId, '/', 'Y'); - -UPDATE entity_changes SET entityId = REPLACE(entityId, '+', 'X') WHERE entityName = 'blobs'; -UPDATE entity_changes SET entityId = REPLACE(entityId, '/', 'Y') WHERE entityName = 'blobs'; diff --git a/apps/server/src/assets/db/migrations/0225__create_blobId_indices.sql b/apps/server/src/assets/db/migrations/0225__create_blobId_indices.sql deleted file mode 100644 index bd3445447..000000000 --- a/apps/server/src/assets/db/migrations/0225__create_blobId_indices.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE INDEX IF NOT EXISTS IDX_notes_blobId on notes (blobId); -CREATE INDEX IF NOT EXISTS IDX_revisions_blobId on revisions (blobId); -CREATE INDEX IF NOT EXISTS IDX_attachments_blobId on attachments (blobId); diff --git a/apps/server/src/assets/db/migrations/0226__rename_noteSize_label.sql b/apps/server/src/assets/db/migrations/0226__rename_noteSize_label.sql deleted file mode 100644 index cd2239af4..000000000 --- a/apps/server/src/assets/db/migrations/0226__rename_noteSize_label.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE attributes SET value = 'contentAndAttachmentsAndRevisionsSize' WHERE name = 'orderBy' AND value = 'noteSize'; diff --git a/apps/server/src/assets/db/migrations/0227__disable_image_compression.sql b/apps/server/src/assets/db/migrations/0227__disable_image_compression.sql deleted file mode 100644 index a5350deff..000000000 --- a/apps/server/src/assets/db/migrations/0227__disable_image_compression.sql +++ /dev/null @@ -1,2 +0,0 @@ --- emergency disabling of image compression since it appears to make problems in migration to 0.61 -UPDATE options SET value = 'false' WHERE name = 'compressImages'; diff --git a/apps/server/src/assets/db/migrations/0228__fix_blobIds.sql b/apps/server/src/assets/db/migrations/0228__fix_blobIds.sql deleted file mode 100644 index 339a6100a..000000000 --- a/apps/server/src/assets/db/migrations/0228__fix_blobIds.sql +++ /dev/null @@ -1,17 +0,0 @@ --- + is normally replaced by X and / by Y, but this can temporarily cause UNIQUE key exception --- this might create blob duplicates, but cleanup will eventually take care of it - -UPDATE blobs SET blobId = REPLACE(blobId, '+', 'A'); -UPDATE blobs SET blobId = REPLACE(blobId, '/', 'B'); - -UPDATE notes SET blobId = REPLACE(blobId, '+', 'A'); -UPDATE notes SET blobId = REPLACE(blobId, '/', 'B'); - -UPDATE attachments SET blobId = REPLACE(blobId, '+', 'A'); -UPDATE attachments SET blobId = REPLACE(blobId, '/', 'B'); - -UPDATE revisions SET blobId = REPLACE(blobId, '+', 'A'); -UPDATE revisions SET blobId = REPLACE(blobId, '/', 'B'); - -UPDATE entity_changes SET entityId = REPLACE(entityId, '+', 'A') WHERE entityName = 'blobs'; -UPDATE entity_changes SET entityId = REPLACE(entityId, '/', 'B') WHERE entityName = 'blobs'; diff --git a/apps/server/src/assets/db/migrations/0229__add_oauth_user_data_table.sql b/apps/server/src/assets/db/migrations/0229__add_oauth_user_data_table.sql deleted file mode 100644 index ea2db4ef9..000000000 --- a/apps/server/src/assets/db/migrations/0229__add_oauth_user_data_table.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Add the oauth user data table -CREATE TABLE IF NOT EXISTS "user_data" -( - tmpID INT, - username TEXT, - email TEXT, - userIDEncryptedDataKey TEXT, - userIDVerificationHash TEXT, - salt TEXT, - derivedKey TEXT, - isSetup TEXT DEFAULT "false", - UNIQUE (tmpID), - PRIMARY KEY (tmpID) -); \ No newline at end of file diff --git a/apps/server/src/assets/db/migrations/0230__vector_embeddings.sql b/apps/server/src/assets/db/migrations/0230__vector_embeddings.sql deleted file mode 100644 index 45f14fddf..000000000 --- a/apps/server/src/assets/db/migrations/0230__vector_embeddings.sql +++ /dev/null @@ -1,46 +0,0 @@ --- Add tables for vector embeddings storage and management --- This migration adds embedding support to the main document.db database - --- Store embeddings for notes -CREATE TABLE IF NOT EXISTS "note_embeddings" ( - "embedId" TEXT NOT NULL PRIMARY KEY, - "noteId" TEXT NOT NULL, - "providerId" TEXT NOT NULL, - "modelId" TEXT NOT NULL, - "dimension" INTEGER NOT NULL, - "embedding" BLOB NOT NULL, - "version" INTEGER NOT NULL DEFAULT 1, - "dateCreated" TEXT NOT NULL, - "utcDateCreated" TEXT NOT NULL, - "dateModified" TEXT NOT NULL, - "utcDateModified" TEXT NOT NULL -); - -CREATE INDEX "IDX_note_embeddings_noteId" ON "note_embeddings" ("noteId"); -CREATE INDEX "IDX_note_embeddings_providerId_modelId" ON "note_embeddings" ("providerId", "modelId"); - --- Table to track which notes need embedding updates -CREATE TABLE IF NOT EXISTS "embedding_queue" ( - "noteId" TEXT NOT NULL PRIMARY KEY, - "operation" TEXT NOT NULL, -- CREATE, UPDATE, DELETE - "dateQueued" TEXT NOT NULL, - "utcDateQueued" TEXT NOT NULL, - "priority" INTEGER NOT NULL DEFAULT 0, - "attempts" INTEGER NOT NULL DEFAULT 0, - "lastAttempt" TEXT NULL, - "error" TEXT NULL, - "failed" INTEGER NOT NULL DEFAULT 0, - "isProcessing" INTEGER NOT NULL DEFAULT 0 -); - --- Table to store embedding provider configurations -CREATE TABLE IF NOT EXISTS "embedding_providers" ( - "providerId" TEXT NOT NULL PRIMARY KEY, - "name" TEXT NOT NULL, - "priority" INTEGER NOT NULL DEFAULT 0, - "config" TEXT NOT NULL, -- JSON config object - "dateCreated" TEXT NOT NULL, - "utcDateCreated" TEXT NOT NULL, - "dateModified" TEXT NOT NULL, - "utcDateModified" TEXT NOT NULL -); \ No newline at end of file diff --git a/apps/server/src/assets/db/schema.sql b/apps/server/src/assets/db/schema.sql index 29b749d89..be21bcc3d 100644 --- a/apps/server/src/assets/db/schema.sql +++ b/apps/server/src/assets/db/schema.sql @@ -187,3 +187,9 @@ CREATE TABLE IF NOT EXISTS "embedding_providers" ( "dateModified" TEXT NOT NULL, "utcDateModified" TEXT NOT NULL ); + +CREATE TABLE IF NOT EXISTS sessions ( + id TEXT PRIMARY KEY, + data TEXT, + expires INTEGER +); diff --git a/apps/server/src/assets/doc_notes/en/User Guide/!!!meta.json b/apps/server/src/assets/doc_notes/en/User Guide/!!!meta.json index f0a176595..f5f7da775 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/!!!meta.json +++ b/apps/server/src/assets/doc_notes/en/User Guide/!!!meta.json @@ -1 +1 @@ -[{"id":"_help_Otzi9La2YAUX","title":"Installation & Setup","type":"book","attributes":[{"name":"iconClass","value":"bx bx-cog","type":"label"}],"children":[{"id":"_help_poXkQfguuA0U","title":"Desktop Installation","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Desktop Installation"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_WOcw2SLH6tbX","title":"Server Installation","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_Dgg7bR3b6K9j","title":"1. Installing the server","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_3tW6mORuTHnB","title":"Packaged version for Linux","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux"},{"name":"iconClass","value":"bx bxl-tux","type":"label"}]},{"id":"_help_rWX5eY045zbE","title":"Using Docker","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker"},{"name":"iconClass","value":"bx bxl-docker","type":"label"}]},{"id":"_help_moVgBcoxE3EK","title":"On NixOS","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/On NixOS"},{"name":"iconClass","value":"bx bxl-tux","type":"label"}]},{"id":"_help_J1Bb6lVlwU5T","title":"Manually","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually"},{"name":"iconClass","value":"bx bx-code-alt","type":"label"}]},{"id":"_help_DCmT6e7clMoP","title":"Using Kubernetes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Kubernetes"},{"name":"iconClass","value":"bx bxl-kubernetes","type":"label"}]},{"id":"_help_klCWNks3ReaQ","title":"Multiple server instances","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Multiple server instances"},{"name":"iconClass","value":"bx bxs-user-account","type":"label"}]}]},{"id":"_help_vcjrb3VVYPZI","title":"2. Reverse proxy","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_ud6MShXL4WpO","title":"Nginx","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Nginx"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_fDLvzOx29Pfg","title":"Apache","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Apache"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_l2VkvOwUNfZj","title":"TLS Configuration","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/TLS Configuration"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_cbkrhQjrkKrh","title":"Synchronization","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Synchronization"},{"name":"iconClass","value":"bx bx-sync","type":"label"}]},{"id":"_help_RDslemsQ6gCp","title":"Mobile Frontend","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Mobile Frontend"},{"name":"iconClass","value":"bx bx-mobile-alt","type":"label"}]},{"id":"_help_MtPxeAWVAzMg","title":"Web Clipper","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Web Clipper"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_n1lujUxCwipy","title":"Upgrading TriliumNext","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Upgrading TriliumNext"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_ODY7qQn5m2FT","title":"Backup","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Backup"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_tAassRL4RSQL","title":"Data directory","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Data directory"},{"name":"iconClass","value":"bx bx-folder-open","type":"label"}]}]},{"id":"_help_gh7bpGYxajRS","title":"Basic Concepts and Features","type":"book","attributes":[{"name":"iconClass","value":"bx bx-help-circle","type":"label"}],"children":[{"id":"_help_Vc8PjrjAGuOp","title":"UI Elements","type":"book","attributes":[{"name":"iconClass","value":"bx bx-window-alt","type":"label"}],"children":[{"id":"_help_x0JgW8UqGXvq","title":"Vertical and horizontal layout","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Vertical and horizontal layout"},{"name":"iconClass","value":"bx bxs-layout","type":"label"}]},{"id":"_help_x3i7MxGccDuM","title":"Global menu","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Global menu"},{"name":"iconClass","value":"bx bx-menu","type":"label"}]},{"id":"_help_oPVyFC7WL2Lp","title":"Note Tree","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree"},{"name":"iconClass","value":"bx bxs-tree-alt","type":"label"}],"children":[{"id":"_help_YtSN43OrfzaA","title":"Note tree contextual menu","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu"},{"name":"iconClass","value":"bx bx-menu","type":"label"}]},{"id":"_help_yTjUdsOi4CIE","title":"Multiple selection","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Multiple selection"},{"name":"iconClass","value":"bx bx-list-plus","type":"label"}]}]},{"id":"_help_BlN9DFI679QC","title":"Ribbon","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Ribbon"},{"name":"iconClass","value":"bx bx-dots-horizontal","type":"label"}]},{"id":"_help_3seOhtN8uLIY","title":"Tabs","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs"},{"name":"iconClass","value":"bx bx-dock-top","type":"label"}]},{"id":"_help_xYmIYSP6wE3F","title":"Launch Bar","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar"},{"name":"iconClass","value":"bx bx-sidebar","type":"label"}]},{"id":"_help_8YBEPzcpUgxw","title":"Note buttons","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Note buttons"},{"name":"iconClass","value":"bx bx-dots-vertical-rounded","type":"label"}]},{"id":"_help_4TIF1oA4VQRO","title":"Options","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Options"},{"name":"iconClass","value":"bx bx-cog","type":"label"}]},{"id":"_help_luNhaphA37EO","title":"Split View","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View"},{"name":"iconClass","value":"bx bx-dock-right","type":"label"}]},{"id":"_help_XpOYSgsLkTJy","title":"Floating buttons","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Floating buttons"},{"name":"iconClass","value":"bx bx-rectangle","type":"label"}]},{"id":"_help_RnaPdbciOfeq","title":"Right Sidebar","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Right Sidebar"},{"name":"iconClass","value":"bx bxs-dock-right","type":"label"}]},{"id":"_help_r5JGHN99bVKn","title":"Recent Changes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes"},{"name":"iconClass","value":"bx bx-history","type":"label"}]},{"id":"_help_ny318J39E5Z0","title":"Zoom","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Zoom"},{"name":"iconClass","value":"bx bx-zoom-in","type":"label"}]}]},{"id":"_help_BFs8mudNFgCS","title":"Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes"},{"name":"iconClass","value":"bx bx-notepad","type":"label"}],"children":[{"id":"_help_p9kXRFAkwN4o","title":"Note Icons","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Note Icons"},{"name":"iconClass","value":"bx bxs-grid","type":"label"}]},{"id":"_help_0vhv7lsOLy82","title":"Attachments","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Attachments"},{"name":"iconClass","value":"bx bx-paperclip","type":"label"}]},{"id":"_help_IakOLONlIfGI","title":"Cloning Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Cloning Notes"},{"name":"iconClass","value":"bx bx-duplicate","type":"label"}],"children":[{"id":"_help_TBwsyfadTA18","title":"Branch prefix","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Cloning Notes/Branch prefix"},{"name":"iconClass","value":"bx bx-rename","type":"label"}]}]},{"id":"_help_bwg0e8ewQMak","title":"Protected Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Protected Notes"},{"name":"iconClass","value":"bx bx-lock-alt","type":"label"}]},{"id":"_help_MKmLg5x6xkor","title":"Archived Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Archived Notes"},{"name":"iconClass","value":"bx bx-box","type":"label"}]},{"id":"_help_vZWERwf8U3nx","title":"Note Revisions","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Note Revisions"},{"name":"iconClass","value":"bx bx-history","type":"label"}]},{"id":"_help_aGlEvb9hyDhS","title":"Sorting Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Sorting Notes"},{"name":"iconClass","value":"bx bx-sort-up","type":"label"}]},{"id":"_help_NRnIZmSMc5sj","title":"Export as PDF","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Export as PDF"},{"name":"iconClass","value":"bx bxs-file-pdf","type":"label"}]},{"id":"_help_CoFPLs3dRlXc","title":"Read-Only Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Read-Only Notes"},{"name":"iconClass","value":"bx bx-edit-alt","type":"label"}]},{"id":"_help_0ESUbbAxVnoK","title":"Note List","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Note List"},{"name":"iconClass","value":"bx bxs-grid","type":"label"}],"children":[{"id":"_help_xWbu3jpNWapp","title":"Calendar View","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View"},{"name":"iconClass","value":"bx bx-calendar","type":"label"}]}]}]},{"id":"_help_wArbEsdSae6g","title":"Navigation","type":"book","attributes":[{"name":"iconClass","value":"bx bx-navigation","type":"label"}],"children":[{"id":"_help_kBrnXNG3Hplm","title":"Tree Concepts","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Tree Concepts"},{"name":"iconClass","value":"bx bx-pyramid","type":"label"}]},{"id":"_help_MMiBEQljMQh2","title":"Note Navigation","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Note Navigation"},{"name":"iconClass","value":"bx bxs-navigation","type":"label"}]},{"id":"_help_Ms1nauBra7gq","title":"Quick search","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Quick search"},{"name":"iconClass","value":"bx bx-search-alt-2","type":"label"}]},{"id":"_help_F1r9QtzQLZqm","title":"Jump to Note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Jump to Note"},{"name":"iconClass","value":"bx bx-send","type":"label"}]},{"id":"_help_eIg8jdvaoNNd","title":"Search","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Search"},{"name":"iconClass","value":"bx bx-search-alt-2","type":"label"}]},{"id":"_help_u3YFHC9tQlpm","title":"Bookmarks","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks"},{"name":"iconClass","value":"bx bx-bookmarks","type":"label"}]},{"id":"_help_OR8WJ7Iz9K4U","title":"Note Hoisting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Note Hoisting"},{"name":"iconClass","value":"bx bxs-chevrons-up","type":"label"}]},{"id":"_help_9sRHySam5fXb","title":"Workspaces","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Workspaces"},{"name":"iconClass","value":"bx bx-door-open","type":"label"}]},{"id":"_help_xWtq5NUHOwql","title":"Similar Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Similar Notes"},{"name":"iconClass","value":"bx bx-bar-chart","type":"label"}]},{"id":"_help_McngOG2jbUWX","title":"Search in note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Search in note"},{"name":"iconClass","value":"bx bx-search-alt-2","type":"label"}]}]},{"id":"_help_A9Oc6YKKc65v","title":"Keyboard Shortcuts","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts"},{"name":"iconClass","value":"bx bxs-keyboard","type":"label"}]},{"id":"_help_Wy267RK4M69c","title":"Themes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Themes"},{"name":"iconClass","value":"bx bx-palette","type":"label"}],"children":[{"id":"_help_VbjZvtUek0Ln","title":"Theme Gallery","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Themes/Theme Gallery"},{"name":"iconClass","value":"bx bx-book-reader","type":"label"}]}]},{"id":"_help_mHbBMPDPkVV5","title":"Import & Export","type":"book","attributes":[{"name":"iconClass","value":"bx bx-import","type":"label"}],"children":[{"id":"_help_Oau6X9rCuegd","title":"Markdown","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown"},{"name":"iconClass","value":"bx bxl-markdown","type":"label"}]},{"id":"_help_syuSEKf2rUGr","title":"Evernote","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Import & Export/Evernote"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_GnhlmrATVqcH","title":"OneNote","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Import & Export/OneNote"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_rC3pL2aptaRE","title":"Zen mode","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Zen mode"},{"name":"iconClass","value":"bx bxs-yin-yang","type":"label"}]}]},{"id":"_help_s3YCWHBfmYuM","title":"Quick Start","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Quick Start"},{"name":"iconClass","value":"bx bx-run","type":"label"}]},{"id":"_help_i6dbnitykE5D","title":"FAQ","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/FAQ"},{"name":"iconClass","value":"bx bx-question-mark","type":"label"}]},{"id":"_help_KSZ04uQ2D1St","title":"Note Types","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types"},{"name":"iconClass","value":"bx bx-edit","type":"label"}],"children":[{"id":"_help_iPIMuisry3hd","title":"Text","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text"},{"name":"iconClass","value":"bx bx-note","type":"label"}],"children":[{"id":"_help_NwBbFdNZ9h7O","title":"Block quotes & admonitions","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Block quotes & admonitions"},{"name":"iconClass","value":"bx bx-info-circle","type":"label"}]},{"id":"_help_oSuaNgyyKnhu","title":"Bookmarks","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Bookmarks"},{"name":"iconClass","value":"bx bx-bookmark","type":"label"}]},{"id":"_help_veGu4faJErEM","title":"Content language & Right-to-left support","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Content language & Right-to-le"},{"name":"iconClass","value":"bx bx-align-right","type":"label"}]},{"id":"_help_2x0ZAX9ePtzV","title":"Cut to subnote","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Cut to subnote"},{"name":"iconClass","value":"bx bx-cut","type":"label"}]},{"id":"_help_UYuUB1ZekNQU","title":"Developer-specific formatting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Developer-specific formatting"},{"name":"iconClass","value":"bx bx-code-alt","type":"label"}],"children":[{"id":"_help_QxEyIjRBizuC","title":"Code blocks","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks"},{"name":"iconClass","value":"bx bx-code","type":"label"}]}]},{"id":"_help_AgjCISero73a","title":"Footnotes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Footnotes"},{"name":"iconClass","value":"bx bx-bracket","type":"label"}]},{"id":"_help_nRhnJkTT8cPs","title":"Formatting toolbar","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Formatting toolbar"},{"name":"iconClass","value":"bx bx-text","type":"label"}]},{"id":"_help_Gr6xFaF6ioJ5","title":"General formatting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/General formatting"},{"name":"iconClass","value":"bx bx-bold","type":"label"}]},{"id":"_help_AxshuNRegLAv","title":"Highlights list","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Highlights list"},{"name":"iconClass","value":"bx bx-highlight","type":"label"}]},{"id":"_help_mT0HEkOsz6i1","title":"Images","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Images"},{"name":"iconClass","value":"bx bx-image-alt","type":"label"}],"children":[{"id":"_help_0Ofbk1aSuVRu","title":"Image references","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Images/Image references"},{"name":"iconClass","value":"bx bxs-file-image","type":"label"}]}]},{"id":"_help_nBAXQFj20hS1","title":"Include Note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Include Note"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_CohkqWQC1iBv","title":"Insert buttons","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Insert buttons"},{"name":"iconClass","value":"bx bx-plus","type":"label"}]},{"id":"_help_oiVPnW8QfnvS","title":"Keyboard shortcuts","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Keyboard shortcuts"},{"name":"iconClass","value":"bx bxs-keyboard","type":"label"}]},{"id":"_help_QEAPj01N5f7w","title":"Links","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Links"},{"name":"iconClass","value":"bx bx-link-alt","type":"label"}]},{"id":"_help_S6Xx8QIWTV66","title":"Lists","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Lists"},{"name":"iconClass","value":"bx bx-list-ul","type":"label"}]},{"id":"_help_QrtTYPmdd1qq","title":"Markdown-like formatting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Markdown-like formatting"},{"name":"iconClass","value":"bx bxl-markdown","type":"label"}]},{"id":"_help_YfYAtQBcfo5V","title":"Math Equations","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Math Equations"},{"name":"iconClass","value":"bx bx-math","type":"label"}]},{"id":"_help_dEHYtoWWi8ct","title":"Other features","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Other features"},{"name":"iconClass","value":"bx bxs-grid","type":"label"}]},{"id":"_help_BFvAtE74rbP6","title":"Table of contents","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Table of contents"},{"name":"iconClass","value":"bx bx-heading","type":"label"}]},{"id":"_help_NdowYOC1GFKS","title":"Tables","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Tables"},{"name":"iconClass","value":"bx bx-table","type":"label"}]}]},{"id":"_help_6f9hih2hXXZk","title":"Code","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Code"},{"name":"iconClass","value":"bx bx-code","type":"label"}]},{"id":"_help_m523cpzocqaD","title":"Saved Search","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Saved Search"},{"name":"iconClass","value":"bx bx-file-find","type":"label"}]},{"id":"_help_iRwzGnHPzonm","title":"Relation Map","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Relation Map"},{"name":"iconClass","value":"bx bxs-network-chart","type":"label"}]},{"id":"_help_bdUJEHsAPYQR","title":"Note Map","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Note Map"},{"name":"iconClass","value":"bx bxs-network-chart","type":"label"}]},{"id":"_help_HcABDtFCkbFN","title":"Render Note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Render Note"},{"name":"iconClass","value":"bx bx-extension","type":"label"}]},{"id":"_help_GTwFsgaA0lCt","title":"Book","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Book"},{"name":"iconClass","value":"bx bx-book","type":"label"}]},{"id":"_help_s1aBHPd79XYj","title":"Mermaid Diagrams","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Mermaid Diagrams"},{"name":"iconClass","value":"bx bx-selection","type":"label"}],"children":[{"id":"_help_RH6yLjjWJHof","title":"ELK layout","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Mermaid Diagrams/ELK layout"},{"name":"iconClass","value":"bx bxs-network-chart","type":"label"}]}]},{"id":"_help_grjYqerjn243","title":"Canvas","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Canvas"},{"name":"iconClass","value":"bx bx-pen","type":"label"}]},{"id":"_help_1vHRoWCEjj0L","title":"Web View","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Web View"},{"name":"iconClass","value":"bx bx-globe-alt","type":"label"}]},{"id":"_help_gBbsAeiuUxI5","title":"Mind Map","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Mind Map"},{"name":"iconClass","value":"bx bx-sitemap","type":"label"}]},{"id":"_help_81SGnPGMk7Xc","title":"Geo Map","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Geo Map"},{"name":"iconClass","value":"bx bx-map-alt","type":"label"}]},{"id":"_help_W8vYD3Q1zjCR","title":"File","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/File"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_BgmBlOIl72jZ","title":"Troubleshooting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting"},{"name":"iconClass","value":"bx bx-bug","type":"label"}],"children":[{"id":"_help_wy8So3yZZlH9","title":"Reporting issues","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Reporting issues"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_x59R8J8KV5Bp","title":"Anonymized Database","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Anonymized Database"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_qzNzp9LYQyPT","title":"Error logs","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Error logs"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_vdlYGAcpXAgc","title":"Synchronization fails with 504 Gateway Timeout","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Synchronization fails with 504"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_s8alTXmpFR61","title":"Refreshing the application","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Refreshing the application"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_pKK96zzmvBGf","title":"Theme development","type":"book","attributes":[{"name":"iconClass","value":"bx bx-palette","type":"label"}],"children":[{"id":"_help_7NfNr5pZpVKV","title":"Creating a custom theme","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Theme development/Creating a custom theme"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_WFGzWeUK6arS","title":"Customize the Next theme","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Theme development/Customize the Next theme"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_WN5z4M8ASACJ","title":"Reference","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Theme development/Reference"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_AlhDUqhENtH7","title":"Custom app-wide CSS","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Theme development/Custom app-wide CSS"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_tC7s2alapj8V","title":"Advanced Usage","type":"book","attributes":[{"name":"iconClass","value":"bx bx-rocket","type":"label"}],"children":[{"id":"_help_zEY4DaJG4YT5","title":"Attributes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes"},{"name":"iconClass","value":"bx bx-list-check","type":"label"}],"children":[{"id":"_help_HI6GBBIduIgv","title":"Labels","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes/Labels"},{"name":"iconClass","value":"bx bx-hash","type":"label"}]},{"id":"_help_Cq5X6iKQop6R","title":"Relations","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes/Relations"},{"name":"iconClass","value":"bx bx-transfer","type":"label"}]},{"id":"_help_bwZpz2ajCEwO","title":"Attribute Inheritance","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes/Attribute Inheritance"},{"name":"iconClass","value":"bx bx-list-plus","type":"label"}]},{"id":"_help_OFXdgB2nNk1F","title":"Promoted Attributes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes/Promoted Attributes"},{"name":"iconClass","value":"bx bx-table","type":"label"}]}]},{"id":"_help_KC1HB96bqqHX","title":"Templates","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Templates"},{"name":"iconClass","value":"bx bx-copy","type":"label"}]},{"id":"_help_BCkXAVs63Ttv","title":"Note Map (Link map, Tree map)","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Note Map (Link map, Tree map)"},{"name":"iconClass","value":"bx bxs-network-chart","type":"label"}]},{"id":"_help_R9pX4DGra2Vt","title":"Sharing","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Sharing"},{"name":"iconClass","value":"bx bx-share-alt","type":"label"}],"children":[{"id":"_help_Qjt68inQ2bRj","title":"Serving directly the content of a note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Sharing/Serving directly the content o"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_5668rwcirq1t","title":"Advanced Showcases","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Advanced Showcases"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_l0tKav7yLHGF","title":"Day Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Advanced Showcases/Day Notes"},{"name":"iconClass","value":"bx bx-calendar","type":"label"}]},{"id":"_help_R7abl2fc6Mxi","title":"Weight Tracker","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Advanced Showcases/Weight Tracker"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_xYjQUYhpbUEW","title":"Task Manager","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Advanced Showcases/Task Manager"},{"name":"iconClass","value":"bx bx-calendar-check","type":"label"}]}]},{"id":"_help_J5Ex1ZrMbyJ6","title":"Custom Request Handler","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Custom Request Handler"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_d3fAXQ2diepH","title":"Custom Resource Providers","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Custom Resource Providers"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_pgxEVkzLl1OP","title":"ETAPI (REST API)","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/ETAPI (REST API)"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_9qPsTWBorUhQ","title":"API Reference","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"/etapi/docs"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_47ZrP6FNuoG8","title":"Default Note Title","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Default Note Title"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_wX4HbRucYSDD","title":"Database","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Database"},{"name":"iconClass","value":"bx bx-data","type":"label"}],"children":[{"id":"_help_oyIAJ9PvvwHX","title":"Manually altering the database","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Database/Manually altering the database"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_YKWqdJhzi2VY","title":"SQL Console","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console"},{"name":"iconClass","value":"bx bx-data","type":"label"}]}]},{"id":"_help_6tZeKvSHEUiB","title":"Demo Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Database/Demo Notes"},{"name":"iconClass","value":"bx bx-package","type":"label"}]}]},{"id":"_help_Gzjqa934BdH4","title":"Configuration (config.ini or environment variables)","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Configuration (config.ini or e"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_c5xB8m4g2IY6","title":"Trilium instance","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Configuration (config.ini or environment variables)/Trilium instance"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_LWtBjFej3wX3","title":"Cross-Origin Resource Sharing (CORS)","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Configuration (config.ini or environment variables)/Cross-Origin Resource Sharing "},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_ivYnonVFBxbQ","title":"Bulk Actions","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Bulk Actions"},{"name":"iconClass","value":"bx bx-list-plus","type":"label"}]},{"id":"_help_4FahAwuGTAwC","title":"Note source","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Note source"},{"name":"iconClass","value":"bx bx-code","type":"label"}]},{"id":"_help_1YeN2MzFUluU","title":"Technologies used","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used"},{"name":"iconClass","value":"bx bxs-component","type":"label"}],"children":[{"id":"_help_MI26XDLSAlCD","title":"CKEditor","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used/CKEditor"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_N4IDkixaDG9C","title":"MindElixir","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used/MindElixir"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_H0mM1lTxF9JI","title":"Excalidraw","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used/Excalidraw"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_MQHyy2dIFgxS","title":"Leaflet","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used/Leaflet"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_m1lbrzyKDaRB","title":"Note ID","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Note ID"},{"name":"iconClass","value":"bx bx-hash","type":"label"}]},{"id":"_help_0vTSyvhPTAOz","title":"Internal API","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_z8O2VG4ZZJD7","title":"API Reference","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"/api/docs"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_2mUhVmZK8RF3","title":"Hidden Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Hidden Notes"},{"name":"iconClass","value":"bx bx-hide","type":"label"}]}]},{"id":"_help_LMAv4Uy3Wk6J","title":"AI","type":"book","attributes":[{"name":"iconClass","value":"bx bx-bot","type":"label"}],"children":[{"id":"_help_GBBMSlVSOIGP","title":"Introduction","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/Introduction"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_WkM7gsEUyCXs","title":"AI Provider Information","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/AI Provider Information"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_7EdTxPADv95W","title":"Ollama","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_vvUCN7FDkq7G","title":"Installing Ollama","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/AI Provider Information/Ollama/Installing Ollama"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_ZavFigBX9AwP","title":"OpenAI","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/AI Provider Information/OpenAI"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_e0lkirXEiSNc","title":"Anthropic","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/AI Provider Information/Anthropic"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]}]},{"id":"_help_CdNpE2pqjmI6","title":"Scripting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting"},{"name":"iconClass","value":"bx bxs-file-js","type":"label"}],"children":[{"id":"_help_yIhgI5H7A2Sm","title":"Frontend Basics","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Frontend Basics"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_es8OU2GuguFU","title":"Examples","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_TjLYAo3JMO8X","title":"\"New Task\" launcher button","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Examples/New Task launcher button"},{"name":"iconClass","value":"bx bx-task","type":"label"}]},{"id":"_help_7kZPMD0uFwkH","title":"Downloading responses from Google Forms","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Examples/Downloading responses from Goo"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_DL92EjAaXT26","title":"Using promoted attributes to configure scripts","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Examples/Using promoted attributes to c"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_GPERMystNGTB","title":"Events","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Events"},{"name":"iconClass","value":"bx bx-rss","type":"label"}]},{"id":"_help_MgibgPcfeuGz","title":"Custom Widgets","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Custom Widgets"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_YNxAqkI5Kg1M","title":"Word count widget","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Custom Widgets/Word count widget"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_SynTBQiBsdYJ","title":"Widget Basics","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Custom Widgets/Widget Basics"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_GLks18SNjxmC","title":"Script API","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Script API"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_Q2z6av6JZVWm","title":"Frontend API","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"https://triliumnext.github.io/Notes/Script%20API/interfaces/Frontend_Script_API.Api.html"},{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_habiZ3HU8Kw8","title":"FNote","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"https://triliumnext.github.io/Notes/Script%20API/classes/Frontend_Script_API.FNote.html"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_MEtfsqa5VwNi","title":"Backend API","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"https://triliumnext.github.io/Notes/Script%20API/interfaces/Backend_Script_API.Api.html"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]}]}] \ No newline at end of file +[{"id":"_help_Otzi9La2YAUX","title":"Installation & Setup","type":"book","attributes":[{"name":"iconClass","value":"bx bx-cog","type":"label"}],"children":[{"id":"_help_poXkQfguuA0U","title":"Desktop Installation","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Desktop Installation"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_WOcw2SLH6tbX","title":"Server Installation","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_Dgg7bR3b6K9j","title":"1. Installing the server","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_3tW6mORuTHnB","title":"Packaged version for Linux","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux"},{"name":"iconClass","value":"bx bxl-tux","type":"label"}]},{"id":"_help_rWX5eY045zbE","title":"Using Docker","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker"},{"name":"iconClass","value":"bx bxl-docker","type":"label"}]},{"id":"_help_moVgBcoxE3EK","title":"On NixOS","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/On NixOS"},{"name":"iconClass","value":"bx bxl-tux","type":"label"}]},{"id":"_help_J1Bb6lVlwU5T","title":"Manually","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually"},{"name":"iconClass","value":"bx bx-code-alt","type":"label"}]},{"id":"_help_DCmT6e7clMoP","title":"Using Kubernetes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Kubernetes"},{"name":"iconClass","value":"bx bxl-kubernetes","type":"label"}]},{"id":"_help_klCWNks3ReaQ","title":"Multiple server instances","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Multiple server instances"},{"name":"iconClass","value":"bx bxs-user-account","type":"label"}]}]},{"id":"_help_vcjrb3VVYPZI","title":"2. Reverse proxy","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_ud6MShXL4WpO","title":"Nginx","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Nginx"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_fDLvzOx29Pfg","title":"Apache","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Apache"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_l2VkvOwUNfZj","title":"TLS Configuration","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Server Installation/TLS Configuration"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_cbkrhQjrkKrh","title":"Synchronization","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Synchronization"},{"name":"iconClass","value":"bx bx-sync","type":"label"}]},{"id":"_help_RDslemsQ6gCp","title":"Mobile Frontend","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Mobile Frontend"},{"name":"iconClass","value":"bx bx-mobile-alt","type":"label"}]},{"id":"_help_MtPxeAWVAzMg","title":"Web Clipper","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Web Clipper"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_n1lujUxCwipy","title":"Upgrading TriliumNext","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Upgrading TriliumNext"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_ODY7qQn5m2FT","title":"Backup","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Backup"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_tAassRL4RSQL","title":"Data directory","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Installation & Setup/Data directory"},{"name":"iconClass","value":"bx bx-folder-open","type":"label"}]}]},{"id":"_help_gh7bpGYxajRS","title":"Basic Concepts and Features","type":"book","attributes":[{"name":"iconClass","value":"bx bx-help-circle","type":"label"}],"children":[{"id":"_help_Vc8PjrjAGuOp","title":"UI Elements","type":"book","attributes":[{"name":"iconClass","value":"bx bx-window-alt","type":"label"}],"children":[{"id":"_help_x0JgW8UqGXvq","title":"Vertical and horizontal layout","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Vertical and horizontal layout"},{"name":"iconClass","value":"bx bxs-layout","type":"label"}]},{"id":"_help_x3i7MxGccDuM","title":"Global menu","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Global menu"},{"name":"iconClass","value":"bx bx-menu","type":"label"}]},{"id":"_help_oPVyFC7WL2Lp","title":"Note Tree","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree"},{"name":"iconClass","value":"bx bxs-tree-alt","type":"label"}],"children":[{"id":"_help_YtSN43OrfzaA","title":"Note tree contextual menu","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Note tree contextual menu"},{"name":"iconClass","value":"bx bx-menu","type":"label"}]},{"id":"_help_yTjUdsOi4CIE","title":"Multiple selection","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Note Tree/Multiple selection"},{"name":"iconClass","value":"bx bx-list-plus","type":"label"}]}]},{"id":"_help_BlN9DFI679QC","title":"Ribbon","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Ribbon"},{"name":"iconClass","value":"bx bx-dots-horizontal","type":"label"}]},{"id":"_help_3seOhtN8uLIY","title":"Tabs","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Tabs"},{"name":"iconClass","value":"bx bx-dock-top","type":"label"}]},{"id":"_help_xYmIYSP6wE3F","title":"Launch Bar","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Launch Bar"},{"name":"iconClass","value":"bx bx-sidebar","type":"label"}]},{"id":"_help_8YBEPzcpUgxw","title":"Note buttons","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Note buttons"},{"name":"iconClass","value":"bx bx-dots-vertical-rounded","type":"label"}]},{"id":"_help_4TIF1oA4VQRO","title":"Options","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Options"},{"name":"iconClass","value":"bx bx-cog","type":"label"}]},{"id":"_help_luNhaphA37EO","title":"Split View","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Split View"},{"name":"iconClass","value":"bx bx-dock-right","type":"label"}]},{"id":"_help_XpOYSgsLkTJy","title":"Floating buttons","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Floating buttons"},{"name":"iconClass","value":"bx bx-rectangle","type":"label"}]},{"id":"_help_RnaPdbciOfeq","title":"Right Sidebar","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Right Sidebar"},{"name":"iconClass","value":"bx bxs-dock-right","type":"label"}]},{"id":"_help_r5JGHN99bVKn","title":"Recent Changes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Recent Changes"},{"name":"iconClass","value":"bx bx-history","type":"label"}]},{"id":"_help_ny318J39E5Z0","title":"Zoom","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/UI Elements/Zoom"},{"name":"iconClass","value":"bx bx-zoom-in","type":"label"}]}]},{"id":"_help_BFs8mudNFgCS","title":"Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes"},{"name":"iconClass","value":"bx bx-notepad","type":"label"}],"children":[{"id":"_help_p9kXRFAkwN4o","title":"Note Icons","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Note Icons"},{"name":"iconClass","value":"bx bxs-grid","type":"label"}]},{"id":"_help_0vhv7lsOLy82","title":"Attachments","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Attachments"},{"name":"iconClass","value":"bx bx-paperclip","type":"label"}]},{"id":"_help_IakOLONlIfGI","title":"Cloning Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Cloning Notes"},{"name":"iconClass","value":"bx bx-duplicate","type":"label"}],"children":[{"id":"_help_TBwsyfadTA18","title":"Branch prefix","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Cloning Notes/Branch prefix"},{"name":"iconClass","value":"bx bx-rename","type":"label"}]}]},{"id":"_help_bwg0e8ewQMak","title":"Protected Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Protected Notes"},{"name":"iconClass","value":"bx bx-lock-alt","type":"label"}]},{"id":"_help_MKmLg5x6xkor","title":"Archived Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Archived Notes"},{"name":"iconClass","value":"bx bx-box","type":"label"}]},{"id":"_help_vZWERwf8U3nx","title":"Note Revisions","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Note Revisions"},{"name":"iconClass","value":"bx bx-history","type":"label"}]},{"id":"_help_aGlEvb9hyDhS","title":"Sorting Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Sorting Notes"},{"name":"iconClass","value":"bx bx-sort-up","type":"label"}]},{"id":"_help_NRnIZmSMc5sj","title":"Export as PDF","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Export as PDF"},{"name":"iconClass","value":"bx bxs-file-pdf","type":"label"}]},{"id":"_help_CoFPLs3dRlXc","title":"Read-Only Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Read-Only Notes"},{"name":"iconClass","value":"bx bx-edit-alt","type":"label"}]},{"id":"_help_0ESUbbAxVnoK","title":"Note List","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Note List"},{"name":"iconClass","value":"bx bxs-grid","type":"label"}],"children":[{"id":"_help_xWbu3jpNWapp","title":"Calendar View","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Notes/Note List/Calendar View"},{"name":"iconClass","value":"bx bx-calendar","type":"label"}]}]}]},{"id":"_help_wArbEsdSae6g","title":"Navigation","type":"book","attributes":[{"name":"iconClass","value":"bx bx-navigation","type":"label"}],"children":[{"id":"_help_kBrnXNG3Hplm","title":"Tree Concepts","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Tree Concepts"},{"name":"iconClass","value":"bx bx-pyramid","type":"label"}]},{"id":"_help_MMiBEQljMQh2","title":"Note Navigation","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Note Navigation"},{"name":"iconClass","value":"bx bxs-navigation","type":"label"}]},{"id":"_help_Ms1nauBra7gq","title":"Quick search","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Quick search"},{"name":"iconClass","value":"bx bx-search-alt-2","type":"label"}]},{"id":"_help_F1r9QtzQLZqm","title":"Jump to Note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Jump to Note"},{"name":"iconClass","value":"bx bx-send","type":"label"}]},{"id":"_help_eIg8jdvaoNNd","title":"Search","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Search"},{"name":"iconClass","value":"bx bx-search-alt-2","type":"label"}]},{"id":"_help_u3YFHC9tQlpm","title":"Bookmarks","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Bookmarks"},{"name":"iconClass","value":"bx bx-bookmarks","type":"label"}]},{"id":"_help_OR8WJ7Iz9K4U","title":"Note Hoisting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Note Hoisting"},{"name":"iconClass","value":"bx bxs-chevrons-up","type":"label"}]},{"id":"_help_9sRHySam5fXb","title":"Workspaces","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Workspaces"},{"name":"iconClass","value":"bx bx-door-open","type":"label"}]},{"id":"_help_xWtq5NUHOwql","title":"Similar Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Similar Notes"},{"name":"iconClass","value":"bx bx-bar-chart","type":"label"}]},{"id":"_help_McngOG2jbUWX","title":"Search in note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Navigation/Search in note"},{"name":"iconClass","value":"bx bx-search-alt-2","type":"label"}]}]},{"id":"_help_A9Oc6YKKc65v","title":"Keyboard Shortcuts","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts"},{"name":"iconClass","value":"bx bxs-keyboard","type":"label"}]},{"id":"_help_Wy267RK4M69c","title":"Themes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Themes"},{"name":"iconClass","value":"bx bx-palette","type":"label"}],"children":[{"id":"_help_VbjZvtUek0Ln","title":"Theme Gallery","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Themes/Theme Gallery"},{"name":"iconClass","value":"bx bx-book-reader","type":"label"}]}]},{"id":"_help_mHbBMPDPkVV5","title":"Import & Export","type":"book","attributes":[{"name":"iconClass","value":"bx bx-import","type":"label"}],"children":[{"id":"_help_Oau6X9rCuegd","title":"Markdown","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Import & Export/Markdown"},{"name":"iconClass","value":"bx bxl-markdown","type":"label"}]},{"id":"_help_syuSEKf2rUGr","title":"Evernote","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Import & Export/Evernote"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_GnhlmrATVqcH","title":"OneNote","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Import & Export/OneNote"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_rC3pL2aptaRE","title":"Zen mode","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Basic Concepts and Features/Zen mode"},{"name":"iconClass","value":"bx bxs-yin-yang","type":"label"}]}]},{"id":"_help_s3YCWHBfmYuM","title":"Quick Start","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Quick Start"},{"name":"iconClass","value":"bx bx-run","type":"label"}]},{"id":"_help_i6dbnitykE5D","title":"FAQ","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/FAQ"},{"name":"iconClass","value":"bx bx-question-mark","type":"label"}]},{"id":"_help_KSZ04uQ2D1St","title":"Note Types","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types"},{"name":"iconClass","value":"bx bx-edit","type":"label"}],"children":[{"id":"_help_iPIMuisry3hd","title":"Text","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text"},{"name":"iconClass","value":"bx bx-note","type":"label"}],"children":[{"id":"_help_NwBbFdNZ9h7O","title":"Block quotes & admonitions","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Block quotes & admonitions"},{"name":"iconClass","value":"bx bx-info-circle","type":"label"}]},{"id":"_help_oSuaNgyyKnhu","title":"Bookmarks","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Bookmarks"},{"name":"iconClass","value":"bx bx-bookmark","type":"label"}]},{"id":"_help_veGu4faJErEM","title":"Content language & Right-to-left support","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Content language & Right-to-le"},{"name":"iconClass","value":"bx bx-align-right","type":"label"}]},{"id":"_help_2x0ZAX9ePtzV","title":"Cut to subnote","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Cut to subnote"},{"name":"iconClass","value":"bx bx-cut","type":"label"}]},{"id":"_help_UYuUB1ZekNQU","title":"Developer-specific formatting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Developer-specific formatting"},{"name":"iconClass","value":"bx bx-code-alt","type":"label"}],"children":[{"id":"_help_QxEyIjRBizuC","title":"Code blocks","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks"},{"name":"iconClass","value":"bx bx-code","type":"label"}]}]},{"id":"_help_AgjCISero73a","title":"Footnotes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Footnotes"},{"name":"iconClass","value":"bx bx-bracket","type":"label"}]},{"id":"_help_nRhnJkTT8cPs","title":"Formatting toolbar","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Formatting toolbar"},{"name":"iconClass","value":"bx bx-text","type":"label"}]},{"id":"_help_Gr6xFaF6ioJ5","title":"General formatting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/General formatting"},{"name":"iconClass","value":"bx bx-bold","type":"label"}]},{"id":"_help_AxshuNRegLAv","title":"Highlights list","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Highlights list"},{"name":"iconClass","value":"bx bx-highlight","type":"label"}]},{"id":"_help_mT0HEkOsz6i1","title":"Images","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Images"},{"name":"iconClass","value":"bx bx-image-alt","type":"label"}],"children":[{"id":"_help_0Ofbk1aSuVRu","title":"Image references","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Images/Image references"},{"name":"iconClass","value":"bx bxs-file-image","type":"label"}]}]},{"id":"_help_nBAXQFj20hS1","title":"Include Note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Include Note"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_CohkqWQC1iBv","title":"Insert buttons","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Insert buttons"},{"name":"iconClass","value":"bx bx-plus","type":"label"}]},{"id":"_help_oiVPnW8QfnvS","title":"Keyboard shortcuts","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Keyboard shortcuts"},{"name":"iconClass","value":"bx bxs-keyboard","type":"label"}]},{"id":"_help_QEAPj01N5f7w","title":"Links","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Links"},{"name":"iconClass","value":"bx bx-link-alt","type":"label"}]},{"id":"_help_S6Xx8QIWTV66","title":"Lists","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Lists"},{"name":"iconClass","value":"bx bx-list-ul","type":"label"}]},{"id":"_help_QrtTYPmdd1qq","title":"Markdown-like formatting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Markdown-like formatting"},{"name":"iconClass","value":"bx bxl-markdown","type":"label"}]},{"id":"_help_YfYAtQBcfo5V","title":"Math Equations","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Math Equations"},{"name":"iconClass","value":"bx bx-math","type":"label"}]},{"id":"_help_dEHYtoWWi8ct","title":"Other features","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Other features"},{"name":"iconClass","value":"bx bxs-grid","type":"label"}]},{"id":"_help_BFvAtE74rbP6","title":"Table of contents","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Table of contents"},{"name":"iconClass","value":"bx bx-heading","type":"label"}]},{"id":"_help_NdowYOC1GFKS","title":"Tables","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Text/Tables"},{"name":"iconClass","value":"bx bx-table","type":"label"}]}]},{"id":"_help_6f9hih2hXXZk","title":"Code","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Code"},{"name":"iconClass","value":"bx bx-code","type":"label"}]},{"id":"_help_m523cpzocqaD","title":"Saved Search","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Saved Search"},{"name":"iconClass","value":"bx bx-file-find","type":"label"}]},{"id":"_help_iRwzGnHPzonm","title":"Relation Map","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Relation Map"},{"name":"iconClass","value":"bx bxs-network-chart","type":"label"}]},{"id":"_help_bdUJEHsAPYQR","title":"Note Map","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Note Map"},{"name":"iconClass","value":"bx bxs-network-chart","type":"label"}]},{"id":"_help_HcABDtFCkbFN","title":"Render Note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Render Note"},{"name":"iconClass","value":"bx bx-extension","type":"label"}]},{"id":"_help_GTwFsgaA0lCt","title":"Book","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Book"},{"name":"iconClass","value":"bx bx-book","type":"label"}]},{"id":"_help_s1aBHPd79XYj","title":"Mermaid Diagrams","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Mermaid Diagrams"},{"name":"iconClass","value":"bx bx-selection","type":"label"}],"children":[{"id":"_help_RH6yLjjWJHof","title":"ELK layout","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Mermaid Diagrams/ELK layout"},{"name":"iconClass","value":"bx bxs-network-chart","type":"label"}]}]},{"id":"_help_grjYqerjn243","title":"Canvas","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Canvas"},{"name":"iconClass","value":"bx bx-pen","type":"label"}]},{"id":"_help_1vHRoWCEjj0L","title":"Web View","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Web View"},{"name":"iconClass","value":"bx bx-globe-alt","type":"label"}]},{"id":"_help_gBbsAeiuUxI5","title":"Mind Map","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Mind Map"},{"name":"iconClass","value":"bx bx-sitemap","type":"label"}]},{"id":"_help_81SGnPGMk7Xc","title":"Geo Map","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/Geo Map"},{"name":"iconClass","value":"bx bx-map-alt","type":"label"}]},{"id":"_help_W8vYD3Q1zjCR","title":"File","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Note Types/File"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_BgmBlOIl72jZ","title":"Troubleshooting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting"},{"name":"iconClass","value":"bx bx-bug","type":"label"}],"children":[{"id":"_help_wy8So3yZZlH9","title":"Reporting issues","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Reporting issues"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_x59R8J8KV5Bp","title":"Anonymized Database","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Anonymized Database"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_qzNzp9LYQyPT","title":"Error logs","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Error logs"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_vdlYGAcpXAgc","title":"Synchronization fails with 504 Gateway Timeout","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Synchronization fails with 504"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_s8alTXmpFR61","title":"Refreshing the application","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Troubleshooting/Refreshing the application"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_pKK96zzmvBGf","title":"Theme development","type":"book","attributes":[{"name":"iconClass","value":"bx bx-palette","type":"label"}],"children":[{"id":"_help_7NfNr5pZpVKV","title":"Creating a custom theme","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Theme development/Creating a custom theme"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_WFGzWeUK6arS","title":"Customize the Next theme","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Theme development/Customize the Next theme"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_WN5z4M8ASACJ","title":"Reference","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Theme development/Reference"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_AlhDUqhENtH7","title":"Custom app-wide CSS","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Theme development/Custom app-wide CSS"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_tC7s2alapj8V","title":"Advanced Usage","type":"book","attributes":[{"name":"iconClass","value":"bx bx-rocket","type":"label"}],"children":[{"id":"_help_zEY4DaJG4YT5","title":"Attributes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes"},{"name":"iconClass","value":"bx bx-list-check","type":"label"}],"children":[{"id":"_help_HI6GBBIduIgv","title":"Labels","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes/Labels"},{"name":"iconClass","value":"bx bx-hash","type":"label"}]},{"id":"_help_Cq5X6iKQop6R","title":"Relations","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes/Relations"},{"name":"iconClass","value":"bx bx-transfer","type":"label"}]},{"id":"_help_bwZpz2ajCEwO","title":"Attribute Inheritance","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes/Attribute Inheritance"},{"name":"iconClass","value":"bx bx-list-plus","type":"label"}]},{"id":"_help_OFXdgB2nNk1F","title":"Promoted Attributes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Attributes/Promoted Attributes"},{"name":"iconClass","value":"bx bx-table","type":"label"}]}]},{"id":"_help_KC1HB96bqqHX","title":"Templates","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Templates"},{"name":"iconClass","value":"bx bx-copy","type":"label"}]},{"id":"_help_BCkXAVs63Ttv","title":"Note Map (Link map, Tree map)","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Note Map (Link map, Tree map)"},{"name":"iconClass","value":"bx bxs-network-chart","type":"label"}]},{"id":"_help_R9pX4DGra2Vt","title":"Sharing","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Sharing"},{"name":"iconClass","value":"bx bx-share-alt","type":"label"}],"children":[{"id":"_help_Qjt68inQ2bRj","title":"Serving directly the content of a note","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Sharing/Serving directly the content o"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_5668rwcirq1t","title":"Advanced Showcases","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Advanced Showcases"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_l0tKav7yLHGF","title":"Day Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Advanced Showcases/Day Notes"},{"name":"iconClass","value":"bx bx-calendar","type":"label"}]},{"id":"_help_R7abl2fc6Mxi","title":"Weight Tracker","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Advanced Showcases/Weight Tracker"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_xYjQUYhpbUEW","title":"Task Manager","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Advanced Showcases/Task Manager"},{"name":"iconClass","value":"bx bx-calendar-check","type":"label"}]}]},{"id":"_help_J5Ex1ZrMbyJ6","title":"Custom Request Handler","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Custom Request Handler"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_d3fAXQ2diepH","title":"Custom Resource Providers","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Custom Resource Providers"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_pgxEVkzLl1OP","title":"ETAPI (REST API)","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/ETAPI (REST API)"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_9qPsTWBorUhQ","title":"API Reference","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"/etapi/docs"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_47ZrP6FNuoG8","title":"Default Note Title","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Default Note Title"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_wX4HbRucYSDD","title":"Database","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Database"},{"name":"iconClass","value":"bx bx-data","type":"label"}],"children":[{"id":"_help_oyIAJ9PvvwHX","title":"Manually altering the database","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Database/Manually altering the database"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_YKWqdJhzi2VY","title":"SQL Console","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Database/Manually altering the database/SQL Console"},{"name":"iconClass","value":"bx bx-data","type":"label"}]}]},{"id":"_help_6tZeKvSHEUiB","title":"Demo Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Database/Demo Notes"},{"name":"iconClass","value":"bx bx-package","type":"label"}]}]},{"id":"_help_Gzjqa934BdH4","title":"Configuration (config.ini or environment variables)","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Configuration (config.ini or e"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_c5xB8m4g2IY6","title":"Trilium instance","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Configuration (config.ini or environment variables)/Trilium instance"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_LWtBjFej3wX3","title":"Cross-Origin Resource Sharing (CORS)","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Configuration (config.ini or environment variables)/Cross-Origin Resource Sharing "},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_ivYnonVFBxbQ","title":"Bulk Actions","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Bulk Actions"},{"name":"iconClass","value":"bx bx-list-plus","type":"label"}]},{"id":"_help_4FahAwuGTAwC","title":"Note source","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Note source"},{"name":"iconClass","value":"bx bx-code","type":"label"}]},{"id":"_help_1YeN2MzFUluU","title":"Technologies used","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used"},{"name":"iconClass","value":"bx bxs-component","type":"label"}],"children":[{"id":"_help_MI26XDLSAlCD","title":"CKEditor","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used/CKEditor"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_N4IDkixaDG9C","title":"MindElixir","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used/MindElixir"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_H0mM1lTxF9JI","title":"Excalidraw","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used/Excalidraw"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_MQHyy2dIFgxS","title":"Leaflet","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Technologies used/Leaflet"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_m1lbrzyKDaRB","title":"Note ID","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Note ID"},{"name":"iconClass","value":"bx bx-hash","type":"label"}]},{"id":"_help_0vTSyvhPTAOz","title":"Internal API","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_z8O2VG4ZZJD7","title":"API Reference","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"/api/docs"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_2mUhVmZK8RF3","title":"Hidden Notes","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Hidden Notes"},{"name":"iconClass","value":"bx bx-hide","type":"label"}]},{"id":"_help_uYF7pmepw27K","title":"Metrics","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Advanced Usage/Metrics"},{"name":"iconClass","value":"bx bxs-data","type":"label"}]}]},{"id":"_help_LMAv4Uy3Wk6J","title":"AI","type":"book","attributes":[{"name":"iconClass","value":"bx bx-bot","type":"label"}],"children":[{"id":"_help_GBBMSlVSOIGP","title":"Introduction","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/Introduction"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_WkM7gsEUyCXs","title":"AI Provider Information","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/AI Provider Information"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_7EdTxPADv95W","title":"Ollama","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_vvUCN7FDkq7G","title":"Installing Ollama","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/AI Provider Information/Ollama/Installing Ollama"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_ZavFigBX9AwP","title":"OpenAI","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/AI Provider Information/OpenAI"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_e0lkirXEiSNc","title":"Anthropic","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/AI/AI Provider Information/Anthropic"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]}]},{"id":"_help_CdNpE2pqjmI6","title":"Scripting","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting"},{"name":"iconClass","value":"bx bxs-file-js","type":"label"}],"children":[{"id":"_help_yIhgI5H7A2Sm","title":"Frontend Basics","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Frontend Basics"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_es8OU2GuguFU","title":"Examples","type":"book","attributes":[{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_TjLYAo3JMO8X","title":"\"New Task\" launcher button","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Examples/New Task launcher button"},{"name":"iconClass","value":"bx bx-task","type":"label"}]},{"id":"_help_7kZPMD0uFwkH","title":"Downloading responses from Google Forms","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Examples/Downloading responses from Goo"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_DL92EjAaXT26","title":"Using promoted attributes to configure scripts","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Examples/Using promoted attributes to c"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_GPERMystNGTB","title":"Events","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Events"},{"name":"iconClass","value":"bx bx-rss","type":"label"}]},{"id":"_help_MgibgPcfeuGz","title":"Custom Widgets","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Custom Widgets"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_YNxAqkI5Kg1M","title":"Word count widget","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Custom Widgets/Word count widget"},{"name":"iconClass","value":"bx bx-file","type":"label"}]},{"id":"_help_SynTBQiBsdYJ","title":"Widget Basics","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Custom Widgets/Widget Basics"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_GLks18SNjxmC","title":"Script API","type":"doc","attributes":[{"type":"label","name":"docName","value":"User Guide/User Guide/Scripting/Script API"},{"name":"iconClass","value":"bx bx-file","type":"label"}],"children":[{"id":"_help_Q2z6av6JZVWm","title":"Frontend API","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"https://triliumnext.github.io/Notes/Script%20API/interfaces/Frontend_Script_API.Api.html"},{"name":"iconClass","value":"bx bx-folder","type":"label"}],"children":[{"id":"_help_habiZ3HU8Kw8","title":"FNote","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"https://triliumnext.github.io/Notes/Script%20API/classes/Frontend_Script_API.FNote.html"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]},{"id":"_help_MEtfsqa5VwNi","title":"Backend API","type":"webView","attributes":[{"type":"label","name":"webViewSrc","value":"https://triliumnext.github.io/Notes/Script%20API/interfaces/Backend_Script_API.Api.html"},{"name":"iconClass","value":"bx bx-file","type":"label"}]}]}]}] \ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Labels.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Labels.html index 866127d3e..7dc0eb5a0 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Labels.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Attributes/Labels.html @@ -275,9 +275,9 @@ content via the injected now and parentNote variables. Examples: - ${parentNote.getLabel('authorName')}'s literary works + \({parentNote.getLabel('authorName')}'s literary works - Log for ${now.format('YYYY-MM-DD HH:mm:ss')} + Log for \){now.format('YYYY-MM-DD HH:mm:ss')} to mirror the parent's template. diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.html index a77f87038..923cbdf03 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Configuration (config.ini or e.html @@ -1,5 +1,5 @@ Trilium supports configuration via a file named config.ini and - environment variables. Please review the file named config-sample.ini in + environment variables. Please review the file named config-sample.ini in the Notes repository to see what values are supported. You can provide the same values via environment variables instead of the config.ini file, diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Metrics.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Metrics.html new file mode 100644 index 000000000..805db1df2 --- /dev/null +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Metrics.html @@ -0,0 +1,82 @@ +The Trilium Metrics API provides comprehensive monitoring data about your + Trilium instance, designed for external monitoring systems like Prometheus. +Endpoint + + URL: /etapi/metrics + + Method: GET + + Authentication: ETAPI token required + Default Format: Prometheus text format + +Authentication +You need an ETAPI token to access the metrics endpoint. Get one by:# Get an ETAPI token +curl -X POST http://localhost:8080/etapi/auth/login \ + -H "Content-Type: application/json" \ + -d '{"password": "your_password"}' + +Usage +Prometheus Format (Default)curl -H "Authorization: YOUR_ETAPI_TOKEN" \ + http://localhost:8080/etapi/metrics + +Returns metrics in Prometheus text format:# HELP trilium_info Trilium instance information +# TYPE trilium_info gauge +trilium_info{version="0.91.6",db_version="231",node_version="v18.17.0"} 1 1701432000 + +# HELP trilium_notes_total Total number of notes including deleted +# TYPE trilium_notes_total gauge +trilium_notes_total 1234 1701432000 + +JSON Formatcurl -H "Authorization: YOUR_ETAPI_TOKEN" \ + "http://localhost:8080/etapi/metrics?format=json" + +Returns detailed metrics in JSON format for debugging or custom integrations. +Available Metrics +Instance Information + + trilium_info - Version and build information with labels + +Database Metrics + + trilium_notes_total - Total notes (including deleted) + trilium_notes_deleted - Number of deleted notes + trilium_notes_active - Number of active notes + trilium_notes_protected - Number of protected notes + trilium_attachments_total - Total attachments + trilium_attachments_active - Active attachments + trilium_revisions_total - Total note revisions + trilium_branches_total - Active branches + trilium_attributes_total - Active attributes + trilium_blobs_total - Total blob records + trilium_etapi_tokens_total - Active ETAPI tokens + trilium_embeddings_total - Note embeddings (if available) + +Categorized Metrics + + trilium_notes_by_type{type="text|code|image|file"} - Notes + by type + trilium_attachments_by_type{mime_type="..."} - Attachments + by MIME type + +Statistics + + trilium_database_size_bytes - Database size in bytes + trilium_oldest_note_timestamp - Timestamp of oldest note + trilium_newest_note_timestamp - Timestamp of newest note + trilium_last_modified_timestamp - Last modification timestamp + +Prometheus Configuration +Add to your prometheus.yml:scrape_configs: + - job_name: 'trilium' + static_configs: + - targets: ['localhost:8080'] + metrics_path: '/etapi/metrics' + bearer_token: 'YOUR_ETAPI_TOKEN' + scrape_interval: 30s + +Error Responses + + 400 - Invalid format parameter + 401 - Missing or invalid ETAPI token + 500 - Internal server error + \ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.html index 97629b68b..ddd6b647d 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Basic Concepts and Features/Keyboard Shortcuts.html @@ -70,23 +70,16 @@ Del - delete note / sub-tree Editing notes - - For Text notes, + - Alt-F10 - bring up inline formatting toolbar (arrow - keys ←,→ to navigate, Enter to - apply) - Alt-F10 - again to bring up block formatting toolbar - Enter in tree pane switches from tree pane into note title. + class="reference-link" href="#root/_help_QrtTYPmdd1qq">Markdown-like formatting. + + + Enter in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. Ctrl+. switches back from editor to tree pane. - Ctrl+K - create / edit external link - - Ctrl+L - create internal (note) link - - Alt+T - inserts current date and time at caret position Ctrl+. - jump away from the editor to tree pane and scroll to current note diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html index b82d3b1c7..360d21a10 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html @@ -37,13 +37,22 @@ and other important Trilium data files are stored in the data directory. If you prefer a different location, you can change it by setting the TRILIUM_DATA_DIR environment variable:export TRILIUM_DATA_DIR=/home/myuser/data/my-trilium-data +Disabling / Modifying the Upload Limit +If you're running into the 250MB limit imposed on the server by default, + and you'd like to increase the upload limit, you can set the TRILIUM_NO_UPLOAD_LIMIT environment + variable to true disable it completely:export TRILIUM_NO_UPLOAD_LIMIT=true +Or, if you'd simply like to increase the upload limit size to something + beyond 250MB, you can set the MAX_ALLOWED_FILE_SIZE_MB environment + variable to something larger than the integer 250 (e.g. 450 in + the following example):export MAX_ALLOWED_FILE_SIZE_MB=450 Disabling Authentication If you are running Trilium on localhost only or if authentication is handled by another component, you can disable Trilium’s authentication by adding the following to config.ini:[General] noAuthentication=true Reverse Proxy Setup -To configure a reverse proxy for Trilium, you can use either nginx or Apache. +To configure a reverse proxy for Trilium, you can use either nginx or Apache. + You can also check out the documentation stored in the Reverse proxy folder. nginx Add the following configuration to your nginx setup to proxy requests to Trilium:location /trilium/ { diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html index fb75e87d3..6d92fef26 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html @@ -3,8 +3,9 @@ Steps SSH into your server - use wget (or curl) to download latest TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz (notice -Server suffix) - on your server. + use wget (or curl) to download latest TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz (copy + link from release page, + notice -Server suffix) on your server. unpack the archive, e.g. using tar -xf -d TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz cd trilium-linux-x64-server @@ -17,7 +18,9 @@ The problem with above steps is that once you close the SSH connection, the Trilium process is terminated. To avoid that, you have two options: - Kill it (with e.g. Ctrl + C) and run again like this: nohup ./trilium &. + Kill it (with e.g. Ctrl + C) and run again like this: nohup ./trilium.sh &. + (nohup keeps the process running in the background, & runs + it in the background) Configure systemd to automatically run Trilium in the background on every boot diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html index 26e837d8b..60e5d049e 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html @@ -76,4 +76,115 @@ docker inspect [container_name] Note on timezones If you are having timezone issues and you are not using docker-compose, you may need to add a TZ environment variable with the TZ identifier of - your local timezone. \ No newline at end of file + your local timezone. +Rootless Docker Image + +If you would prefer to run Trilium without having to run the Docker container + as root, you can use either of the provided Debian (default) + and Alpine-based images with the rootless tag. +If you're unsure, stick to the “rootful” Docker image referenced above. + +Below are some commands to pull the rootless images:# For Debian-based image +docker pull triliumnext/notes:rootless + +# For Alpine-based image +docker pull triliumnext/notes:rootless-alpine +Why Rootless? +Running containers as non-root is a security best practice that reduces + the potential impact of container breakouts. If an attacker manages to + escape the container, they'll only have the permissions of the non-root + user instead of full root access to the host. +How It Works +The rootless Trilium image: + + Creates a non-root user (trilium) during build time + Configures the application to run as this non-root user + Allows runtime customization of the user's UID/GID via Docker's --user flag + Does not require a separate Docker entrypoint script + +Usage +Using docker-compose (Recommended)# Run with default UID/GID (1000:1000) +docker-compose -f docker-compose.rootless.yml up -d + +# Run with custom UID/GID (e.g., match your host user) +TRILIUM_UID=$(id -u) TRILIUM_GID=$(id -g) docker-compose -f docker-compose.rootless.yml up -d + +# Specify a custom data directory +TRILIUM_DATA_DIR=/path/to/your/data TRILIUM_UID=$(id -u) TRILIUM_GID=$(id -g) docker-compose -f docker-compose.rootless.yml up -d + +Using Docker CLI# Build the image +docker build -t triliumnext/notes:rootless -f apps/server/Dockerfile.rootless . + +# Run with default UID/GID (1000:1000) +docker run -d --name trilium -p 8080:8080 -v ~/trilium-data:/home/trilium/trilium-data triliumnext/notes:rootless + +# Run with custom UID/GID +docker run -d --name trilium -p 8080:8080 --user $(id -u):$(id -g) -v ~/trilium-data:/home/trilium/trilium-data triliumnext/notes:rootless + +Environment Variables + + TRILIUM_UID: UID to use for the container process (passed + to Docker's --user flag) + TRILIUM_GID: GID to use for the container process (passed + to Docker's --user flag) + TRILIUM_DATA_DIR: Path to the data directory inside the container + (default: /home/node/trilium-data) + +Volume Permissions +If you encounter permission issues with the data volume, ensure that: + + The host directory has appropriate permissions for the UID/GID you're + using + You're setting both TRILIUM_UID and TRILIUM_GID to + match the owner of the host directory +# For example, if your data directory is owned by UID 1001 and GID 1001: +TRILIUM_UID=1001 TRILIUM_GID=1001 docker-compose -f docker-compose.rootless.yml up -d + +Considerations + + The container starts with a specific UID/GID which can be customized at + runtime + Unlike the traditional setup, this approach does not use a separate entrypoint + script with usermod/groupmod commands + The container cannot modify its own UID/GID at runtime, which is a security + feature of rootless containers + +Available Rootless Images +Two rootless variants are provided: + + Debian-based (default): Uses the Debian Bullseye Slim + base image + + Dockerfile: apps/server/Dockerfile.rootless + + Recommended for most users + + + Alpine-based: Uses the Alpine base image for smaller + size + + Dockerfile: apps/server/Dockerfile.alpine.rootless + + Smaller image size, but may have compatibility issues with some systems + + + +Building Custom Rootless Images +If you would prefer, you can also customize the UID/GID at build time:# For Debian-based image with custom UID/GID +docker build --build-arg USER=myuser --build-arg UID=1001 --build-arg GID=1001 \ + -t triliumnext/notes:rootless-custom -f apps/server/Dockerfile.rootless . + +# For Alpine-based image with custom UID/GID +docker build --build-arg USER=myuser --build-arg UID=1001 --build-arg GID=1001 \ + -t triliumnext/notes:alpine-rootless-custom -f apps/server/Dockerfile.alpine.rootless . + +Available build arguments: + + USER: Username for the non-root user (default: trilium) + UID: User ID for the non-root user (default: 1000) + GID: Group ID for the non-root user (default: 1000) + \ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html index f9a809a86..8145def6a 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html @@ -1,5 +1,3 @@ -Note: This feature has not been merged yet, so it is not available. - Multi-factor authentication (MFA) is a security process that requires users to provide two or more verification factors to gain access to a system, application, or account. This adds an extra layer of protection beyond @@ -7,80 +5,60 @@ By requiring more than one verification method, MFA helps reduce the risk of unauthorized access, even if someone has obtained your password. It’s highly recommended for securing sensitive information stored in your notes. -Warning! OpenID and TOTP cannot be both used at the same time! -Log in with your Google Account with OpenID! -OpenID is a standardized way to let you log into websites using an account - from another service, like Google, to verify your identity. -Why Time-based One Time Passwords? -TOTP (Time-Based One-Time Password) is a security feature that generates - a unique, temporary code on your device, like a smartphone, which changes - every 30 seconds. You use this code, along with your password, to log into - your account, making it much harder for anyone else to access them. -Setup -TOTP - - - Start Trilium Notes normally. - - - Go to "Menu" -> "Options" -> "MFA" - - - Click the "Generate TOTP Secret" button - - - Copy the generated secret to your authentication app/extension - - - Set an environment variable "TOTP_SECRET" as the generated secret. Environment - variables can be set with a .env file in the root directory, by defining - them in the command line, or with a docker container.# .env in the project root directory -TOTP_ENABLED="true" -TOTP_SECRET="secret"# Terminal/CLI -export TOTP_ENABLED="true" -export TOTP_SECRET="secret"# Docker -docker run -p 8080:8080 -v ~/trilium-data:/home/node/trilium-data -e TOTP_ENABLED="true" -e TOTP_SECRET="secret" triliumnext/notes:[VERSION] - - - Restart Trilium - - - Go to "Options" -> "MFA" - - - Click the "Generate Recovery Codes" button - - - Save the recovery codes. Recovery codes can be used once in place of the + + Log in with your Google Account with OpenID! + OpenID is a standardized way to let you log into websites using an account + from another service, like Google, to verify your identity. + Why Time-based One Time Passwords? + TOTP (Time-Based One-Time Password) is a security feature that generates + a unique, temporary code on your device, like a smartphone, which changes + every 30 seconds. You use this code, along with your password, to log into + your account, making it much harder for anyone else to access them. + Setup + MFA can only be set up on a server instance. + + TOTP + + Go to "Menu" -> "Options" -> "MFA" + Click the “Enable Multi-Factor Authentication” checkbox if not checked + Choose “Time-Based One-Time Password (TOTP)” under MFA Method + Click the "Generate TOTP Secret" button + Copy the generated secret to your authentication app/extension + Click the "Generate Recovery Codes" button + Save the recovery codes. Recovery codes can be used once in place of the TOTP if you loose access to your authenticator. After a rerecovery code is used, it will show the unix timestamp when it was used in the MFA options - tab. - - - Load the secret into an authentication app like google authenticator - - -OpenID -Currently only compatible with Google. Other services like Authentik and Auth0 are planned on being added. - -In order to setup OpenID, you will need to setup a authentication provider. - This requires a bit of extra setup. Follow these instructions to - setup an OpenID service through google. -Set an environment variable "SSO_ENABLED" to true and add the client ID - and secret you obtained from google. Environment variables can be set with - a .env file in the root directory, by defining them in the command line, - or with a docker container. -.env File# .env in the project root directory -SSO_ENABLED="true" -BASE_URL="http://localhost:8080" -CLIENT_ID= -SECRET= -Environment variable (linux)export SSO_ENABLED="true" -export BASE_URL="http://localhost:8080" -export CLIENT_ID= -export SECRET= -Dockerdocker run -d -p 8080:8080 -v ~/trilium-data:/home/node/trilium-data -e SSO_ENABLED="true" -e BASE_URL="http://localhost:8080" -e CLIENT_ID= -e SECRET= triliumnext/notes:[VERSION] -After you restart Trilium Notes, you will be redirected to Google's account - selection page. Login to an account and Trilium Next will bind to that - account, allowing you to login with it. -You can now login using your google account. \ No newline at end of file + tab. + Re-login will be required after TOTP setup is finished (After you refreshing + the page). + + OpenID + + In order to setup OpenID, you will need to setup a authentication provider. + This requires a bit of extra setup. Follow these instructions to + setup an OpenID service through google. + + Set the oauthBaseUrl, oauthClientId and oauthClientSecret in + the config.ini file (check Configuration (config.ini or environment variables) for + more information). + + You can also setup through environment variables (TRILIUM_OAUTH_BASE_URL, TRILIUM_OAUTH_CLIENT_ID and TRILIUM_OAUTH_CLIENT_SECRET). + + + Restart the server + Go to "Menu" -> "Options" -> "MFA" + Click the “Enable Multi-Factor Authentication” checkbox if not checked + Choose “OAuth/OpenID” under MFA Method + Refresh the page and login through OpenID provider + \ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Code.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Code.html index 6f645e8fb..95e10fd24 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Code.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Code.html @@ -36,4 +36,18 @@ Note that the list of languages is not immediately refreshed, you'd have to manually refresh the application. The list of languages is also shared with the Code blocks feature - of Text notes. \ No newline at end of file + of Text notes. +Color schemes +Since Trilium 0.94.0 the colors of code notes can be customized by going + Options → Code Notes and looking for the Appearance section. + \ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Geo Map.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Geo Map.html index 4a5860659..674422cad 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Geo Map.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Geo Map.html @@ -19,7 +19,7 @@ 1 - + @@ -29,7 +29,7 @@ 2 - + @@ -39,7 +39,6 @@ - Repositioning the map Click and drag the map in order to move across the map. @@ -103,11 +102,12 @@ - How the location of the markers is stored The location of a marker is stored in the #geolocation attribute of the child notes: - + + + This value can be added manually if needed. The value of the attribute is made up of the latitude and longitude separated by a comma. Repositioning markers @@ -170,7 +170,7 @@ 1 - + @@ -187,7 +187,7 @@ 2 - + @@ -197,7 +197,7 @@ 3 - + @@ -210,7 +210,6 @@ - Adding from OpenStreetMap Similarly to the Google Maps approach: @@ -260,7 +259,6 @@ - Adding GPS tracks (.gpx) Trilium has basic support for displaying GPS tracks on the geo map. - -Troubleshooting + + Troubleshooting - -Grid-like artifacts on the map + Grid-like artifacts on the map This occurs if the application is not at 100% zoom which causes the pixels of the map to not render correctly due to fractional scaling. The only possible solution is to set the UI zoom at 100% (default keyboard shortcut diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.html index ac999ac76..87ce90c0a 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.html @@ -25,7 +25,7 @@ -Syntax highlighting +Syntax highlighting & color schemes Since TriliumNext v0.90.12, Trilium will try to offer syntax highlighting to the code block. Note that the syntax highlighting mechanism is slightly different than the one in Code notes diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html index 3c18e673d..df312d7bf 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html @@ -1,3 +1,108 @@ +Trilium-specific shortcuts + + + + + Action + PC + Mac + + + + + Bring up inline formatting toolbar (arrow keys ←,→ to + navigate, Enter to apply) + Alt+F10 + + ⌥+F10 + + + + Bring up block formatting toolbar + Alt+F10 + + ⌥+F10 + + + + Create external link + + Ctrl+K + + ⌘+K + + + + Create internal (note) link + + Ctrl+L + + ⌘+L + + + + Inserts current date and time at caret position + Alt+T + ⌥+T + + + Increase paragraph indentation + Tab + + ⇥ + + + + Decrease paragraph indentation + Shift + Tab + + ⇧ + ⇥ + + + + Mark selected text as keyboard shortcut + + Ctrl + Alt + K + + ⌘+ ⌥+ K + + + + Insert Math Equations + + Ctrl + M + + ⌘+ M + + + + Move blocks (lists, paragraphs, etc.) up + Ctrl+↑ + ⌘+↑ + + + Alt+↑ + + ⌥+↑ + + + + Move blocks (lists, paragraphs, etc.) down + Ctrl+↑ + + ⌘+↑ + + + + Alt+↓ + + ⌥+↓ + + + + + +Common shortcuts
${t("highlighting.description")}
${SAMPLE_CODE}
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 -
Once you're finished with experimenting and want to cleanup these pages, you can simply delete them all.
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: -
Unordered: -
… here put main characters …
… describe main plot lines …
scifi / drama / romance
Checkout Kindle daily deals: https://www.amazon.com/gp/feature.html?docId=1000677541 -
function helloWorld() { - alert("Hello world"); -}
For larger pieces of code it is better to use a code note, which uses a fully-fledged code editor (CodeMirror). For an example of a code note, see Custom request handler.
\(% \f is defined as #1f(#2) using the macro \f\relax{x} = \int_{-\infty}^\infty \f\hat\xi\,e^{2 \pi i \xi x} \,d\xi\)Some math examples:
Another:
Inline math is also possible: \(c^2 = a^2 + b^2\)
This page demonstrates two things:
You can read some explanation on how this journal works here: https://github.com/zadam/trilium/wiki/Day-notes -
Wiki: https://en.wikipedia.org/wiki/Trusted_timestamping -
Bozho: https://techblog.bozho.net/using-trusted-timestamping-java/ -
Trusted timestamping is the process of securely keeping track of the creation and modification time of a document. Security here diff --git a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html rename to apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html index 3722a62c0..ae490681e 100644 --- a/_regroup/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Journal/2021/12 - December/18 - Monday.html @@ -16,7 +16,6 @@
Miscellaneous notes done on monday ...
Interesting video: https://www.youtube.com/watch?v=_eSAF_qT_FY&feature=youtu.be -
Maybe CodeNames? https://boardgamegeek.com/boardgame/178900/codenames -
What Are the 7 Wonders of the World? (with HD Images) | TheCollector -
This is a simple TODO/Task manager. You can see some description and explanation here: https://github.com/zadam/trilium/wiki/Task-manager -
Please note that this is meant as scripting example only and feature/bug support is very limited.
https://en.wikipedia.org/wiki/The_Black_Swan:_The_Impact_of_the_Highly_Improbable -
The Black Swan: The Impact of the Highly Improbable is a 2007 book by author and former options trader diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/tesco/Buy milk.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/tesco/Buy milk.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/tesco/Buy milk.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/tesco/Buy milk.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/work/Send invites for christmas par.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/work/Send invites for christmas par.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/work/Send invites for christmas par.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Locations/work/Send invites for christmas par.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy milk.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy milk.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy milk.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy milk.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy some book for Bob.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy some book for Bob.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy some book for Bob.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Buy some book for Bob.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Send invites for christmas party.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Send invites for christmas party.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Send invites for christmas party.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/TODO/Send invites for christmas party.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/christmas/Buy some book for Bob.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/christmas/Buy some book for Bob.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/christmas/Buy some book for Bob.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/christmas/Buy some book for Bob.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/groceries/Buy milk.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/groceries/Buy milk.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/groceries/Buy milk.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/groceries/Buy milk.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/health.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/health.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/health.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/health.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy milk.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy milk.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy milk.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy milk.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy some book for Bob.clone.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy some book for Bob.clone.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy some book for Bob.clone.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Task manager/Tags/shopping/Buy some book for Bob.clone.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation.html b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation.html rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation.html diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code/chart.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code/chart.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code/chart.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Weight Tracker/Implementation/JS code/chart.js diff --git a/_regroup/demo/root/Trilium Demo/Scripting examples/Word count widget.js b/apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Word count widget.js similarity index 100% rename from _regroup/demo/root/Trilium Demo/Scripting examples/Word count widget.js rename to apps/edit-docs/demo/root/Trilium Demo/Scripting examples/Word count widget.js diff --git a/_regroup/demo/root/Trilium Demo/Steel Blue.css b/apps/edit-docs/demo/root/Trilium Demo/Steel Blue.css similarity index 97% rename from _regroup/demo/root/Trilium Demo/Steel Blue.css rename to apps/edit-docs/demo/root/Trilium Demo/Steel Blue.css index 56f3dec40..9da2189e7 100644 --- a/_regroup/demo/root/Trilium Demo/Steel Blue.css +++ b/apps/edit-docs/demo/root/Trilium Demo/Steel Blue.css @@ -1,6 +1,6 @@ /* * This is a demo of how you can create custom theme for Trilium. You can activate it by going - * into options (top-right corner) in first tab "Appearance". + * into options in first tab "Appearance". * * You can read some details on theming here: http://github.com/zadam/trilium/wiki/Themes */ @@ -98,4 +98,4 @@ body .note-detail-editable-text, body .note-detail-readonly-text { body .CodeMirror { filter: invert(100%) hue-rotate(180deg); -} \ No newline at end of file +} diff --git a/_regroup/demo/root/Trilium Demo/Steel Blue/eb-garamond-v9-latin-reg.woff2 b/apps/edit-docs/demo/root/Trilium Demo/Steel Blue/eb-garamond-v9-latin-reg.woff2 similarity index 100% rename from _regroup/demo/root/Trilium Demo/Steel Blue/eb-garamond-v9-latin-reg.woff2 rename to apps/edit-docs/demo/root/Trilium Demo/Steel Blue/eb-garamond-v9-latin-reg.woff2 diff --git a/_regroup/demo/root/Trilium Demo/Steel Blue/raleway-v12-latin-regula.woff2 b/apps/edit-docs/demo/root/Trilium Demo/Steel Blue/raleway-v12-latin-regula.woff2 similarity index 100% rename from _regroup/demo/root/Trilium Demo/Steel Blue/raleway-v12-latin-regula.woff2 rename to apps/edit-docs/demo/root/Trilium Demo/Steel Blue/raleway-v12-latin-regula.woff2 diff --git a/_regroup/demo/root/Trilium Demo/Tech.html b/apps/edit-docs/demo/root/Trilium Demo/Tech.html similarity index 100% rename from _regroup/demo/root/Trilium Demo/Tech.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech.html diff --git a/_regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html similarity index 99% rename from _regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html rename to apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html index 55c1364be..aaa6cd1ad 100644 --- a/_regroup/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html +++ b/apps/edit-docs/demo/root/Trilium Demo/Tech/Linux/Bash scripting.html @@ -25,7 +25,6 @@ and Apple's macOS (formerly OS X). A version is also available for Windows 10.
Bash on Wikipedia -
As a "login shell", Bash reads and sets (executes) the user's profile from /etc/profile and one of ~/.bash_profile, ~/.bash_login, or ~/.profile (in that order, using the first one that's readable!).
Methods to start Bash as a login shell: -
Methods to test for login shell mode: -
Related switches: -
When Bash starts as an interactive non-login shell, it reads and executes commands from ~/.bashrc. This file should contain, for example, aliases, since they need to be defined in every shell as they're not inherited from @@ -56,13 +51,11 @@ The classic way to have a system-wide rc file is to source /etc/bashrc from every user's ~/.bashrc.
Methods to test for interactive-shell mode: -
When Bash starts in SH compatiblity mode, it tries to mimic the startup behaviour of historical versions of sh as closely as possible, while conforming to the POSIX® standard as well. The profile files read are /etc/profile @@ -82,7 +74,6 @@ file.
After the startup files are read, Bash enters the POSIX(r) compatiblity mode (for running, not for starting!).
Bash starts in sh compatiblity mode when: -
Documentation: http://tldp.org/LDP/Bash-Beginners-Guide/html/sect_09_02.html -
#!/bin/bash + # This script opens 4 terminal windows. + + i="0" + while [ $i -lt 4 ] + do + xterm & + + i=$[$i+1] + done
now
parentNote
Examples:
${parentNote.getLabel('authorName')}'s literary works
\({parentNote.getLabel('authorName')}'s literary works
Log for ${now.format('YYYY-MM-DD HH:mm:ss')}
Log for \){now.format('YYYY-MM-DD HH:mm:ss')}
Trilium supports configuration via a file named config.ini and - environment variables. Please review the file named config-sample.ini in + environment variables. Please review the file named config-sample.ini in the Notes repository to see what values are supported.
config.ini
You can provide the same values via environment variables instead of the config.ini file, diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Metrics.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Metrics.html new file mode 100644 index 000000000..805db1df2 --- /dev/null +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Advanced Usage/Metrics.html @@ -0,0 +1,82 @@ +
The Trilium Metrics API provides comprehensive monitoring data about your + Trilium instance, designed for external monitoring systems like Prometheus.
/etapi/metrics
GET
You need an ETAPI token to access the metrics endpoint. Get one by:
# Get an ETAPI token +curl -X POST http://localhost:8080/etapi/auth/login \ + -H "Content-Type: application/json" \ + -d '{"password": "your_password"}' +
curl -H "Authorization: YOUR_ETAPI_TOKEN" \ + http://localhost:8080/etapi/metrics +
Returns metrics in Prometheus text format:
# HELP trilium_info Trilium instance information +# TYPE trilium_info gauge +trilium_info{version="0.91.6",db_version="231",node_version="v18.17.0"} 1 1701432000 + +# HELP trilium_notes_total Total number of notes including deleted +# TYPE trilium_notes_total gauge +trilium_notes_total 1234 1701432000 +
curl -H "Authorization: YOUR_ETAPI_TOKEN" \ + "http://localhost:8080/etapi/metrics?format=json" +
Returns detailed metrics in JSON format for debugging or custom integrations.
trilium_info
trilium_notes_total
trilium_notes_deleted
trilium_notes_active
trilium_notes_protected
trilium_attachments_total
trilium_attachments_active
trilium_revisions_total
trilium_branches_total
trilium_attributes_total
trilium_blobs_total
trilium_etapi_tokens_total
trilium_embeddings_total
trilium_notes_by_type{type="text|code|image|file"}
trilium_attachments_by_type{mime_type="..."}
trilium_database_size_bytes
trilium_oldest_note_timestamp
trilium_newest_note_timestamp
trilium_last_modified_timestamp
Add to your prometheus.yml:
prometheus.yml
scrape_configs: + - job_name: 'trilium' + static_configs: + - targets: ['localhost:8080'] + metrics_path: '/etapi/metrics' + bearer_token: 'YOUR_ETAPI_TOKEN' + scrape_interval: 30s +
400
401
500
TRILIUM_DATA_DIR
export TRILIUM_DATA_DIR=/home/myuser/data/my-trilium-data
If you're running into the 250MB limit imposed on the server by default, + and you'd like to increase the upload limit, you can set the TRILIUM_NO_UPLOAD_LIMIT environment + variable to true disable it completely:
TRILIUM_NO_UPLOAD_LIMIT
true
export TRILIUM_NO_UPLOAD_LIMIT=true
Or, if you'd simply like to increase the upload limit size to something + beyond 250MB, you can set the MAX_ALLOWED_FILE_SIZE_MB environment + variable to something larger than the integer 250 (e.g. 450 in + the following example):
MAX_ALLOWED_FILE_SIZE_MB
250
450
export MAX_ALLOWED_FILE_SIZE_MB=450
If you are running Trilium on localhost only or if authentication is handled by another component, you can disable Trilium’s authentication by adding the following to config.ini:
[General] noAuthentication=true
To configure a reverse proxy for Trilium, you can use either nginx or Apache.
To configure a reverse proxy for Trilium, you can use either nginx or Apache. + You can also check out the documentation stored in the Reverse proxy folder.
Add the following configuration to your nginx setup to proxy requests to Trilium:
nginx
location /trilium/ { diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html index fb75e87d3..6d92fef26 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Packaged version for Linux.html @@ -3,8 +3,9 @@ Steps SSH into your server - use wget (or curl) to download latest TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz (notice -Server suffix) - on your server. + use wget (or curl) to download latest TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz (copy + link from release page, + notice -Server suffix) on your server. unpack the archive, e.g. using tar -xf -d TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz cd trilium-linux-x64-server @@ -17,7 +18,9 @@ The problem with above steps is that once you close the SSH connection, the Trilium process is terminated. To avoid that, you have two options: - Kill it (with e.g. Ctrl + C) and run again like this: nohup ./trilium &. + Kill it (with e.g. Ctrl + C) and run again like this: nohup ./trilium.sh &. + (nohup keeps the process running in the background, & runs + it in the background) Configure systemd to automatically run Trilium in the background on every boot diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html index 26e837d8b..60e5d049e 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Using Docker.html @@ -76,4 +76,115 @@ docker inspect [container_name]
wget
curl
TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz
-Server
tar -xf -d TriliumNextNotes-Server-[VERSION]-linux-x64.tar.xz
cd trilium-linux-x64-server
The problem with above steps is that once you close the SSH connection, the Trilium process is terminated. To avoid that, you have two options:
nohup ./trilium &
nohup ./trilium.sh &
&
If you are having timezone issues and you are not using docker-compose, you may need to add a TZ environment variable with the TZ identifier of - your local timezone.
TZ
If you would prefer to run Trilium without having to run the Docker container + as root, you can use either of the provided Debian (default) + and Alpine-based images with the rootless tag.
root
rootless
If you're unsure, stick to the “rootful” Docker image referenced above. +
Below are some commands to pull the rootless images:
# For Debian-based image +docker pull triliumnext/notes:rootless + +# For Alpine-based image +docker pull triliumnext/notes:rootless-alpine
Running containers as non-root is a security best practice that reduces + the potential impact of container breakouts. If an attacker manages to + escape the container, they'll only have the permissions of the non-root + user instead of full root access to the host.
The rootless Trilium image:
trilium
--user
entrypoint
# Run with default UID/GID (1000:1000) +docker-compose -f docker-compose.rootless.yml up -d + +# Run with custom UID/GID (e.g., match your host user) +TRILIUM_UID=$(id -u) TRILIUM_GID=$(id -g) docker-compose -f docker-compose.rootless.yml up -d + +# Specify a custom data directory +TRILIUM_DATA_DIR=/path/to/your/data TRILIUM_UID=$(id -u) TRILIUM_GID=$(id -g) docker-compose -f docker-compose.rootless.yml up -d +
# Build the image +docker build -t triliumnext/notes:rootless -f apps/server/Dockerfile.rootless . + +# Run with default UID/GID (1000:1000) +docker run -d --name trilium -p 8080:8080 -v ~/trilium-data:/home/trilium/trilium-data triliumnext/notes:rootless + +# Run with custom UID/GID +docker run -d --name trilium -p 8080:8080 --user $(id -u):$(id -g) -v ~/trilium-data:/home/trilium/trilium-data triliumnext/notes:rootless +
TRILIUM_UID
TRILIUM_GID
/home/node/trilium-data
If you encounter permission issues with the data volume, ensure that:
# For example, if your data directory is owned by UID 1001 and GID 1001: +TRILIUM_UID=1001 TRILIUM_GID=1001 docker-compose -f docker-compose.rootless.yml up -d +
usermod
groupmod
Two rootless variants are provided:
apps/server/Dockerfile.rootless
apps/server/Dockerfile.alpine.rootless
If you would prefer, you can also customize the UID/GID at build time:
# For Debian-based image with custom UID/GID +docker build --build-arg USER=myuser --build-arg UID=1001 --build-arg GID=1001 \ + -t triliumnext/notes:rootless-custom -f apps/server/Dockerfile.rootless . + +# For Alpine-based image with custom UID/GID +docker build --build-arg USER=myuser --build-arg UID=1001 --build-arg GID=1001 \ + -t triliumnext/notes:alpine-rootless-custom -f apps/server/Dockerfile.alpine.rootless . +
Available build arguments:
USER
UID
GID
Note: This feature has not been merged yet, so it is not available. -
Multi-factor authentication (MFA) is a security process that requires users to provide two or more verification factors to gain access to a system, application, or account. This adds an extra layer of protection beyond @@ -7,80 +5,60 @@
By requiring more than one verification method, MFA helps reduce the risk of unauthorized access, even if someone has obtained your password. It’s highly recommended for securing sensitive information stored in your notes.
Warning! OpenID and TOTP cannot be both used at the same time!
OpenID is a standardized way to let you log into websites using an account - from another service, like Google, to verify your identity.
TOTP (Time-Based One-Time Password) is a security feature that generates - a unique, temporary code on your device, like a smartphone, which changes - every 30 seconds. You use this code, along with your password, to log into - your account, making it much harder for anyone else to access them.
Start Trilium Notes normally.
Go to "Menu" -> "Options" -> "MFA"
Click the "Generate TOTP Secret" button
Copy the generated secret to your authentication app/extension
Set an environment variable "TOTP_SECRET" as the generated secret. Environment - variables can be set with a .env file in the root directory, by defining - them in the command line, or with a docker container.
# .env in the project root directory -TOTP_ENABLED="true" -TOTP_SECRET="secret"
# Terminal/CLI -export TOTP_ENABLED="true" -export TOTP_SECRET="secret"
# Docker -docker run -p 8080:8080 -v ~/trilium-data:/home/node/trilium-data -e TOTP_ENABLED="true" -e TOTP_SECRET="secret" triliumnext/notes:[VERSION]
Restart Trilium
Go to "Options" -> "MFA"
Click the "Generate Recovery Codes" button
Save the recovery codes. Recovery codes can be used once in place of the + +
OpenID is a standardized way to let you log into websites using an account + from another service, like Google, to verify your identity.
TOTP (Time-Based One-Time Password) is a security feature that generates + a unique, temporary code on your device, like a smartphone, which changes + every 30 seconds. You use this code, along with your password, to log into + your account, making it much harder for anyone else to access them.
MFA can only be set up on a server instance.
Load the secret into an authentication app like google authenticator
Currently only compatible with Google. Other services like Authentik and Auth0 are planned on being added. -
In order to setup OpenID, you will need to setup a authentication provider. - This requires a bit of extra setup. Follow these instructions to - setup an OpenID service through google.
Set an environment variable "SSO_ENABLED" to true and add the client ID - and secret you obtained from google. Environment variables can be set with - a .env file in the root directory, by defining them in the command line, - or with a docker container.
# .env in the project root directory -SSO_ENABLED="true" -BASE_URL="http://localhost:8080" -CLIENT_ID= -SECRET=
export SSO_ENABLED="true" -export BASE_URL="http://localhost:8080" -export CLIENT_ID= -export SECRET=
docker run -d -p 8080:8080 -v ~/trilium-data:/home/node/trilium-data -e SSO_ENABLED="true" -e BASE_URL="http://localhost:8080" -e CLIENT_ID= -e SECRET= triliumnext/notes:[VERSION]
After you restart Trilium Notes, you will be redirected to Google's account - selection page. Login to an account and Trilium Next will bind to that - account, allowing you to login with it.
You can now login using your google account.
In order to setup OpenID, you will need to setup a authentication provider. + This requires a bit of extra setup. Follow these instructions to + setup an OpenID service through google.
oauthBaseUrl
oauthClientId
oauthClientSecret
TRILIUM_OAUTH_BASE_URL
TRILIUM_OAUTH_CLIENT_ID
TRILIUM_OAUTH_CLIENT_SECRET
Note that the list of languages is not immediately refreshed, you'd have to manually refresh the application.
The list of languages is also shared with the Code blocks feature - of Text notes.
Since Trilium 0.94.0 the colors of code notes can be customized by going + Options → Code Notes and looking for the Appearance section.
The location of a marker is stored in the #geolocation attribute of the child notes:
#geolocation
+ +
This value can be added manually if needed. The value of the attribute is made up of the latitude and longitude separated by a comma.
Similarly to the Google Maps approach:
Trilium has basic support for displaying GPS tracks on the geo map.
This occurs if the application is not at 100% zoom which causes the pixels of the map to not render correctly due to fractional scaling. The only possible solution is to set the UI zoom at 100% (default keyboard shortcut diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.html index ac999ac76..87ce90c0a 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Developer-specific formatting/Code blocks.html @@ -25,7 +25,7 @@ -
Since TriliumNext v0.90.12, Trilium will try to offer syntax highlighting to the code block. Note that the syntax highlighting mechanism is slightly different than the one in Code notes diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html index 3c18e673d..df312d7bf 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Text/Keyboard shortcuts.html @@ -1,3 +1,108 @@ +
