release 0.5.1-beta

bin/build.sh

@@ -7,15 +7,15 @@ rm -r dist/*
 echo "Rebuilding binaries for linux-ia32"
 ./node_modules/.bin/electron-rebuild --arch=ia32
 
-./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite
+./node_modules/.bin/electron-packager src/electron --out=dist --platform=linux --arch=ia32 --overwrite
 
-./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite
+./node_modules/.bin/electron-packager src/electron --out=dist --platform=win32 --arch=x64 --overwrite
 
 # we build x64 as second so that we keep X64 binaries in node_modules for local development
 echo "Rebuilding binaries for linux-x64"
 ./node_modules/.bin/electron-rebuild --arch=x64
 
-./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite
+./node_modules/.bin/electron-packager src/electron --out=dist --platform=linux --arch=x64 --overwrite
 
 echo "Copying required windows binaries"
 

db/main_notes.sql

@@ -1,15 +1,15 @@
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('root', 'root', 'root', 0, 0, '2017-12-22T11:41:07.000Z', '2017-12-22T11:41:07.000Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('1Heh2acXfPNt', 'Trilium Demo', '<figure class="image image-style-side"><img src="/api/images/ed64aET6i379/trilium-small.png"></figure><p><strong>Welcome to Trilium Notes!</strong></p><p>&nbsp;</p><p>This is initial document provided by default Trilium 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.</p><p>&nbsp;</p><p>If you need any help, visit Trilium website: <a href="https://github.com/zadam/trilium">https://github.com/zadam/trilium</a></p><h3>Cleanup</h3><p>Once you''re finished with experimenting and want to cleanup these pages, you can simply delete them all.</p><h3>Formatting</h3><p>Trilium supports classic formatting like <i>italic</i>, <strong>bold</strong>, <i><strong>bold and italic</strong></i>. Of course you can add links like this one pointing to <a href="http://www.google.com">google.com</a></p><h4>Lists</h4><p><strong>Ordered:</strong></p><ol><li>First Item</li><li>Second item<ol><li>First sub-item</li><li>Second sub-item</li></ol></li></ol><p>&nbsp;</p><p><strong>Unordered:</strong></p><ul><li>Item</li><li>Another item<ul><li>Sub-item<ul><li>Sub-sub-item</li></ul></li></ul></li></ul><h4>Block quotes</h4><blockquote><p>Whereof one cannot speak, thereof one must be silent”</p><p>– Ludwig Wittgenstein</p></blockquote><p>&nbsp;</p>', 0, 0, '2017-12-23T00:46:39.304Z', '2017-12-23T04:08:45.445Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('3RkyK9LI18dO', 'Journal', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:20:04.181Z', '2017-12-23T18:07:55.377Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('L1Ox40M1aEyy', '2016', '<p>No content.</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>', 0, 0, '2017-12-23T01:20:45.365Z', '2017-12-23T16:40:43.129Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('HJusZTbBU494', '2017', '<p>No content.</p>', 0, 0, '2017-12-23T01:20:50.709Z', '2017-12-23T16:41:03.119Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('3oldoiMUPOlr', 'December', '', 0, 0, '2017-12-23T01:20:55.775Z', '2017-12-23T01:21:05.806Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('MG0wntwILQW6', '22 - friday', 'Daily summary', 0, 0, '2017-12-23T01:21:10.517Z', '2017-12-23T01:22:45.814Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('ZC78NlmdXeC6', 'Linux', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:22:55.255Z', '2017-12-23T18:08:10.381Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('NncfGH8dyNjJ', 'Programming', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:23:02.584Z', '2017-12-23T18:08:20.179Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('eouCLkjbruai', 'Java', '', 0, 0, '2017-12-23T01:23:28.291Z', '2017-12-23T01:23:31.944Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('C44aq4mkaX67', 'Bash scripting', '<p><strong>Bash</strong> is a <a href="https://en.wikipedia.org/wiki/Unix_shell">Unix shell</a> and <a href="https://en.wikipedia.org/wiki/Command_language">command language</a> written by <a href="https://en.wikipedia.org/wiki/Brian_Fox_(computer_programmer)">Brian Fox</a> for the <a href="https://en.wikipedia.org/wiki/GNU_Project">GNU Project</a> as a <a href="https://en.wikipedia.org/wiki/Free_software">free software</a> replacement for the <a href="https://en.wikipedia.org/wiki/Bourne_shell">Bourne shell</a>. First released in 1989, it has been distributed widely as the default <a href="https://en.wikipedia.org/wiki/Login">login</a> shell for most <a href="https://en.wikipedia.org/wiki/Linux">Linux</a> distributions and <a href="https://en.wikipedia.org/wiki/Apple_Inc.">Apple''s</a> <a href="https://en.wikipedia.org/wiki/MacOS">macOS</a> (formerly OS X). A version <a href="https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux">is also available for Windows 10</a>.</p><p>&nbsp;</p><p><a href="https://en.wikipedia.org/wiki/Bash_(Unix_shell)">Bash on Wikipedia</a></p>', 0, 0, '2017-12-23T01:23:31.879Z', '2017-12-23T04:00:49.098Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('I6Cw88AirBBl', 'While loop', '<p>Documentation: <a href="http://tldp.org/LDP/Bash-Beginners-Guide/html/sect_09_02.html">http://tldp.org/LDP/Bash-Beginners-Guide/html/sect_09_02.html</a></p><p>&nbsp;</p><p>#!/bin/bash
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('root', 'root', 'root', 0, 0, '2017-12-22T11:41:07.000Z', '2017-12-22T11:41:07.000Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('1Heh2acXfPNt', 'Trilium Demo', '<figure class="image image-style-side"><img src="/api/images/ed64aET6i379/trilium-small.png"></figure><p><strong>Welcome to Trilium Notes!</strong></p><p>&nbsp;</p><p>This is initial document provided by default Trilium 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.</p><p>&nbsp;</p><p>If you need any help, visit Trilium website: <a href="https://github.com/zadam/trilium">https://github.com/zadam/trilium</a></p><h3>Cleanup</h3><p>Once you''re finished with experimenting and want to cleanup these pages, you can simply delete them all.</p><h3>Formatting</h3><p>Trilium supports classic formatting like <i>italic</i>, <strong>bold</strong>, <i><strong>bold and italic</strong></i>. Of course you can add links like this one pointing to <a href="http://www.google.com">google.com</a></p><h4>Lists</h4><p><strong>Ordered:</strong></p><ol><li>First Item</li><li>Second item<ol><li>First sub-item</li><li>Second sub-item</li></ol></li></ol><p>&nbsp;</p><p><strong>Unordered:</strong></p><ul><li>Item</li><li>Another item<ul><li>Sub-item<ul><li>Sub-sub-item</li></ul></li></ul></li></ul><h4>Block quotes</h4><blockquote><p>Whereof one cannot speak, thereof one must be silent”</p><p>– Ludwig Wittgenstein</p></blockquote><p>&nbsp;</p>', 0, 0, '2017-12-23T00:46:39.304Z', '2017-12-23T04:08:45.445Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('3RkyK9LI18dO', 'Journal', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:20:04.181Z', '2017-12-23T18:07:55.377Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('L1Ox40M1aEyy', '2016', '<p>No content.</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>', 0, 0, '2017-12-23T01:20:45.365Z', '2017-12-23T16:40:43.129Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('HJusZTbBU494', '2017', '<p>No content.</p>', 0, 0, '2017-12-23T01:20:50.709Z', '2017-12-23T16:41:03.119Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('3oldoiMUPOlr', 'December', '', 0, 0, '2017-12-23T01:20:55.775Z', '2017-12-23T01:21:05.806Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('MG0wntwILQW6', '22 - friday', 'Daily summary', 0, 0, '2017-12-23T01:21:10.517Z', '2017-12-23T01:22:45.814Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('ZC78NlmdXeC6', 'Linux', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:22:55.255Z', '2017-12-23T18:08:10.381Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('NncfGH8dyNjJ', 'Programming', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:23:02.584Z', '2017-12-23T18:08:20.179Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('eouCLkjbruai', 'Java', '', 0, 0, '2017-12-23T01:23:28.291Z', '2017-12-23T01:23:31.944Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('C44aq4mkaX67', 'Bash scripting', '<p><strong>Bash</strong> is a <a href="https://en.wikipedia.org/wiki/Unix_shell">Unix shell</a> and <a href="https://en.wikipedia.org/wiki/Command_language">command language</a> written by <a href="https://en.wikipedia.org/wiki/Brian_Fox_(computer_programmer)">Brian Fox</a> for the <a href="https://en.wikipedia.org/wiki/GNU_Project">GNU Project</a> as a <a href="https://en.wikipedia.org/wiki/Free_software">free software</a> replacement for the <a href="https://en.wikipedia.org/wiki/Bourne_shell">Bourne shell</a>. First released in 1989, it has been distributed widely as the default <a href="https://en.wikipedia.org/wiki/Login">login</a> shell for most <a href="https://en.wikipedia.org/wiki/Linux">Linux</a> distributions and <a href="https://en.wikipedia.org/wiki/Apple_Inc.">Apple''s</a> <a href="https://en.wikipedia.org/wiki/MacOS">macOS</a> (formerly OS X). A version <a href="https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux">is also available for Windows 10</a>.</p><p>&nbsp;</p><p><a href="https://en.wikipedia.org/wiki/Bash_(Unix_shell)">Bash on Wikipedia</a></p>', 0, 0, '2017-12-23T01:23:31.879Z', '2017-12-23T04:00:49.098Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('I6Cw88AirBBl', 'While loop', '<p>Documentation: <a href="http://tldp.org/LDP/Bash-Beginners-Guide/html/sect_09_02.html">http://tldp.org/LDP/Bash-Beginners-Guide/html/sect_09_02.html</a></p><p>&nbsp;</p><p>#!/bin/bash
 
 </p><p># This script opens 4 terminal windows.
 
@@ -20,38 +20,38 @@ INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, dat
 </p><p>&nbsp; &nbsp; xterm &amp;
 </p><p>&nbsp; &nbsp; i=$[$i+1]
 </p><p>done</p>', 0, 0, '2017-12-23T01:24:04.681Z', '2017-12-23T01:26:07.786Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('mcEwFMSjhlvL', 'Bash startup modes', '<h3>Login shell</h3><p>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!).</p><p>When a login shell exits, Bash reads and executes commands from the file ~/.bash_logout, if it exists.</p><p>Why an extra login shell mode? There are many actions and variable sets that only make sense for the initial user login. That''s why all UNIX® shells have (should have) a "login" mode.</p><p><i><strong>Methods to start Bash as a login shell:</strong></i></p><ul><li>the first character of argv[0] is - (a hyphen): traditional UNIX® shells start from the login binary</li><li>Bash is started with the -l option</li><li>Bash is started with the --login option</li></ul><p><i><strong>Methods to test for login shell mode:</strong></i></p><ul><li>the shell option <a href="http://wiki.bash-hackers.org/internals/shell_options#login_shell">login_shell</a> is set</li></ul><p><i><strong>Related switches:</strong></i></p><ul><li>--noprofile disables reading of all profile files</li></ul><h3>Interactive shell</h3><p>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 the parent shell.</p><p>The feature to have a system-wide /etc/bash.bashrc or a similar system-wide rc-file is specific to vendors and distributors that ship <i>their own, patched variant of Bash</i>. The classic way to have a system-wide rc file is to source /etc/bashrc from every user''s ~/.bashrc.</p><p><i><strong>Methods to test for interactive-shell mode:</strong></i></p><ul><li>the special parameter $- contains the letter i (lowercase I)</li></ul><p><i><strong>Related switches:</strong></i></p><ul><li>-i forces the interactive mode</li><li>--norc disables reading of the startup files (e.g. /etc/bash.bashrc if supported) and ~/.bashrc</li><li>--rcfile defines another startup file (instead of /etc/bash.bashrc and ~/.bashrc)</li></ul><h3>SH mode</h3><p>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 and ~/.profile, if it''s a login shell.</p><p>If it''s not a login shell, the environment variable <a href="http://wiki.bash-hackers.org/syntax/shellvars#env">ENV</a> is evaluated and the resulting filename is used as the name of the startup file.</p><p>After the startup files are read, Bash enters the <a href="http://wiki.bash-hackers.org/scripting/bashbehaviour#posix_run_mode">POSIX(r) compatiblity mode (for running, not for starting!)</a>.</p><p><i><strong>Bash starts in sh compatiblity mode when:</strong></i></p><ul><li>the base filename in argv[0] is sh (<figure class="image"><img></figure>&nbsp;NB: /bin/sh may be linked to /bin/bash, but that doesn''t mean it acts like /bin/bash&nbsp;<figure class="image"><img></figure>)</li></ul>', 0, 0, '2017-12-23T01:29:35.974Z', '2017-12-23T01:34:10.493Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('CF2lUIJAr6Ey', 'Python', '', 0, 0, '2017-12-23T01:34:37.658Z', '2017-12-23T01:34:40.465Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('xkXwueRoDNeN', 'Christmas shopping', '<p>&nbsp;</p>', 0, 0, '2017-12-23T01:35:40.306Z', '2017-12-23T16:43:08.157Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('eXHZAKsMYgur', 'Books', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T03:32:42.868Z', '2017-12-23T18:08:03.857Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('2WU27ekfy07E', 'To read', '<p>Checkout Kindle daily deals: <a href="https://www.amazon.com/gp/feature.html?docId=1000677541">https://www.amazon.com/gp/feature.html?docId=1000677541</a></p><p>&nbsp;</p><ul><li>Cixin Liu - <a href="https://www.amazon.com/Dark-Forest-Remembrance-Earths-Past/dp/0765386690/ref=pd_bxgy_14_img_2?_encoding=UTF8&amp;pd_rd_i=0765386690&amp;pd_rd_r=AB0J179TM9NTEAMHE240&amp;pd_rd_w=FAhxX&amp;pd_rd_wg=pLGK7&amp;psc=1&amp;refRID=AB0J179TM9NTEAMHE240">The Dark Forest</a></li><li>Ann Leckie - <a href="https://www.amazon.com/Ancillary-Sword-Imperial-Radch-Leckie/dp/0316246654/ref=pd_sim_14_1?_encoding=UTF8&amp;pd_rd_i=0316246654&amp;pd_rd_r=D7KDTGZFP7YM1YSYVY4G&amp;pd_rd_w=jkn28&amp;pd_rd_wg=JVhtw&amp;psc=1&amp;refRID=D7KDTGZFP7YM1YSYVY4G">Ancillary Sword</a></li></ul>', 0, 0, '2017-12-23T03:32:49.379Z', '2017-12-23T03:59:01.970Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('TjWEndYCCg7g', 'Reviews', '', 0, 0, '2017-12-23T03:33:23.584Z', '2017-12-23T03:33:35.089Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('8nRNDJGyGs2Z', 'The Mechanical', '<p><strong>Amazon:</strong> <a href="https://www.amazon.com/Mechanical-Alchemy-Wars-Ian-Tregillis/dp/0316248002">https://www.amazon.com/Mechanical-Alchemy-Wars-Ian-Tregillis/dp/0316248002</a></p><p><strong>Author:</strong> Ian Tregillis</p><p><strong>Dates of reading:</strong> 24. 11. 2017 -13. 12. 2017</p><p>&nbsp;</p><p>I enjoyed this book a lot. It''s slow moving at times with the author taking his time with conversations and descriptions of them. The premise is very interesting, but I''m sad that it wasn''t elaborated more deeply - e.g. the history and development of the clakker technology with Huygens and how Spinoza comes into the picture. Maybe the author saves it for the next two parts of the book.</p><p>&nbsp;</p><p>Language can be intimidating at first for non-native english speakers - author uses wide range of vocabulary. Fortunately it gets better after a while as reader adjusts.</p>', 0, 0, '2017-12-23T03:33:37.327Z', '2017-12-23T03:36:51.534Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('9zSwD89vgzNO', 'Highlights', '<blockquote><p>Like a raindrop rolling down dry valleys to the sea, his body sensed the contours of agony and helplessly followed their gradient. Impelled by alchemical compulsion rather than gravity, Jax became an unstoppable boulder careering along gullies of human whim.</p></blockquote><p>&nbsp;</p><blockquote><p>Free Will was a vacuum, a negative space. It was the absence of coercion, the absence of compulsion, the absence of agony.</p></blockquote><p>&nbsp;</p><blockquote><p>Overwhelming: he could do anything he wanted. But the grand sum of anything-at-all was nothing-at-all. The topology of freedom offered no gradients to nudge him, no landmarks to guide him. How did humans guide themselves? How did they know what to do and what not to do? How did they know when to do anything without the benefit of geasa and metageasa to prioritize every single action of their waking lives? How did they order their daily existence without somebody to tell them what to do?</p></blockquote><blockquote><p>Life as a slave was unspeakable; life as a slave who had briefly tasted freedom was unthinkable. Clakkers carried complex geasa by dint of alchemy; humans carried heavy obligations, too, but called them culture. Society.</p></blockquote>', 0, 0, '2017-12-23T03:37:04.912Z', '2017-12-23T03:38:16.533Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('u5t1EvWa3CMO', 'Man''s search for meaning', '<p><strong>Autor</strong>: Viktor Frankl - <a href="https://en.wikipedia.org/wiki/Viktor_Frankl">https://en.wikipedia.org/wiki/Viktor_Frankl</a></p><p><strong>Wiki</strong> - <a href="https://en.wikipedia.org/wiki/Man%27s_Search_for_Meaning">https://en.wikipedia.org/wiki/Man%27s_Search_for_Meaning</a></p><p>&nbsp;</p><p>But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?</p><p>&nbsp;</p>', 0, 0, '2017-12-23T03:39:21.918Z', '2017-12-23T03:40:26.692Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('Iha4YwchR413', '21 - thursday', '', 0, 0, '2017-12-23T03:44:21.176Z', '2017-12-23T03:44:28.816Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('6ZuXjCSWgjB4', 'November', '', 0, 0, '2017-12-23T03:44:45.351Z', '2017-12-23T03:44:53.787Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('GpGnjmcAPeWG', '28', '', 0, 0, '2017-12-23T03:44:57.036Z', '2017-12-23T03:45:08.790Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('21K84UqGhqlt', 'Christmas gift ideas', '<ul><li>XBox</li><li>Candles</li><li><a href="https://www.amazon.ca/Anker-SoundCore-Portable-Bluetooth-Resistance/dp/B01MTB55WH?pd_rd_wg=honW8&amp;pd_rd_r=c9bb7c0f-0051-4da7-991f-4ca711a1b3e3&amp;pd_rd_w=ciUpR&amp;ref_=pd_gw_simh&amp;pf_rd_r=K10XKX0NGPDNTYYP4BS4&amp;pf_rd_p=5f1b460b-78c1-580e-929e-2878fe4859e8">Portable speakers</a></li><li>...?</li></ul>', 0, 0, '2017-12-23T03:45:10.933Z', '2017-12-23T16:43:28.160Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('rz5t0r9Qr2WC', 'Epics', '<p>Epic is kind of medium-term events or projects spread over days or months.</p><p>&nbsp;</p><p>Remember that Trilium is all free form so you can organise your stuff in whatever way you''d like</p><p>&nbsp;</p><p>&nbsp;</p>', 0, 0, '2017-12-23T03:45:20.914Z', '2017-12-23T03:52:37.779Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('R6pheWjdwmNU', 'Christmas', '<p>This christmas is going to be awesome!</p>', 0, 0, '2017-12-23T03:45:28.002Z', '2017-12-23T16:42:53.142Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('5v5Dx6LMHXIO', 'Christmas shopping', '<p>Bought a book!</p>', 0, 0, '2017-12-23T03:45:44.184Z', '2017-12-23T04:09:15.442Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('MLQjmREtcnJ3', 'Shopping', '', 0, 0, '2017-12-23T03:47:48.208Z', '2017-12-23T03:47:51.917Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('pTTjrxgnvURB', 'Vacation days', '<p>25. 12., 26. 12., 1. 1. - statutory holidays</p><p>27. 12. - 29. 12., 2. 1. - vacation days</p>', 0, 0, '2017-12-23T03:47:55.932Z', '2017-12-23T03:49:46.419Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('cFK9sGYZaMWs', 'Vacation in Cuba', 'Planning stuff etc.', 0, 0, '2017-12-23T03:49:32.210Z', '2017-12-23T03:55:17.763Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('pOFVzbXLmzhX', 'Christmas dinner', 'Carp of course!', 0, 0, '2017-12-23T03:54:46.138Z', '2017-12-23T03:54:57.762Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('0xtvjqrcGiRB', 'History', '<p>The <strong>history of Linux</strong> began in 1991 with the commencement of a personal project by <a href="https://en.wikipedia.org/wiki/Finland">Finnish</a> student <a href="https://en.wikipedia.org/wiki/Linus_Torvalds">Linus Torvalds</a> to create a new free operating system kernel. Since then, the resulting <a href="https://en.wikipedia.org/wiki/Linux_kernel">Linux kernel</a> has been marked by constant growth throughout its history. Since the initial release of its <a href="https://en.wikipedia.org/wiki/Source_code">source code</a> in 1991, it has grown from a small number of <a href="https://en.wikipedia.org/wiki/C_Programming_Language">C</a> files under a license prohibiting commercial distribution to the 4.2.3 version in 2015 with more than 18 million lines of source code under the <a href="https://en.wikipedia.org/wiki/GNU_General_Public_License">GNU General Public License</a> v2.</p>', 0, 0, '2017-12-23T04:01:51.565Z', '2017-12-23T04:02:05.496Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('Zl69uXBSen0w', 'Ubuntu', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:02:16.685Z', '2017-12-23T18:08:15.381Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('62BKAQMVP2KW', 'Unity shortcuts', '<ul><li>Hold Super - Invoke the Launcher and display the shortcuts</li><li>Hold Super, then press 1 or 2 or 3 and so on until 0 to open or focus an application. The number corresponds to the location of the icon on the launcher from top to bottom.<ul><li>Adding Shift will open a new instance of the application if it''s already open.</li><li>Holding the key is also useful when you want to get to the Launcher but do not want to invoke the Dash.</li></ul></li><li>Super + T - Open the rubbish bin/trash can.</li><li>Alt + F1 - Put keyboard focus on the Launcher, use arrow keys to navigate, Enter launches an application, Right arrow exposes the quicklists if an application has them.</li><li>Ctrl + Alt + T - Launch a terminal window.</li></ul>', 0, 0, '2017-12-23T04:02:39.164Z', '2017-12-23T04:03:09.867Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('h4OfLEAYspud', 'Security', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:04:00.715Z', '2017-12-23T18:08:25.474Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('1hASbLRDL7oo', 'Trusted timestamping', '<p>Wiki: <a href="https://en.wikipedia.org/wiki/Trusted_timestamping">https://en.wikipedia.org/wiki/Trusted_timestamping</a></p><p>Bozho: <a href="https://techblog.bozho.net/using-trusted-timestamping-java/">https://techblog.bozho.net/using-trusted-timestamping-java/</a></p><p>&nbsp;</p><p><strong>Trusted timestamping</strong> is the process of <a href="https://en.wikipedia.org/wiki/Computer_security">securely</a> keeping track of the creation and modification time of a document. Security here means that no one—not even the owner of the document—should be able to change it once it has been recorded provided that the timestamper''s integrity is never compromised.</p><p>The administrative aspect involves setting up a publicly available, trusted timestamp management infrastructure to collect, process and renew timestamps.</p>', 0, 0, '2017-12-23T04:04:08.155Z', '2017-12-23T04:04:30.386Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('jyqG9GucsMdn', 'Office party', 'That was fun!', 0, 0, '2017-12-23T04:05:16.439Z', '2017-12-23T04:05:30.373Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('WdWZFuWNVDZk', 'Tech', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:06:16.179Z', '2017-12-23T18:08:05.376Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('yK4SBJfwD3tY', 'Work', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:06:32.833Z', '2017-12-23T18:08:30.573Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('r4BnsmSQeVr1', 'HR', '<p>HR stuff&nbsp;</p>', 0, 0, '2017-12-23T04:06:37.427Z', '2017-12-23T16:42:23.145Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('QbL3pTvhgzM8', 'Processes', '<p>No content.</p><p>&nbsp;</p>', 0, 0, '2017-12-23T04:06:43.841Z', '2017-12-23T16:42:15.893Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('moMbTKwN15Ps', 'Projects', '<p>Here I''d keep various notes related to my work''s projects etc.</p>', 0, 0, '2017-12-23T04:06:49.331Z', '2017-12-23T04:07:25.429Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('PEGQGg0In3Ar', 'Phone call about work project', '<p>Bla bla bla ....</p>', 0, 0, '2017-12-23T16:44:35.900Z', '2017-12-23T16:44:53.174Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('IlULcDiOTI4K', 'Inbox', '<p>This is a place I use to put notes waiting for better categorization</p><p>&nbsp;</p>', 0, 0, '2017-12-23T16:45:11.047Z', '2017-12-23T18:04:49.545Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('vBv6ovBupfTj', 'Grocery list for today', '<ul><li>cucumber</li><li>cheese</li><li>beer</li></ul><p>&nbsp;</p>', 0, 0, '2017-12-23T18:04:50.904Z', '2017-12-23T18:05:19.574Z');
-INSERT INTO notes (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified) VALUES ('mw4f2xB4J5fV', 'Book to read', '<p>How to be a stoic from Massimo Pigliuci:</p><p>&nbsp;</p><p><a href="https://www.amazon.com/gp/product/B01K3WN1BY?pf_rd_m=A2R2RITDJNW1Q6&amp;storeType=ebooks&amp;pageType=STOREFRONT&amp;pf_rd_p=8e2a96d9-c848-435b-92bd-0856850ad544&amp;pf_rd_r=4J6CT15BS4X8062XNGDF&amp;pf_rd_s=merchandised-search-5&amp;pf_rd_t=40901&amp;ref_=dbs_f_ebk_rwt_scns_mwl_ms5_kmw_8e2a96d9-c848-435b-92bd-0856850ad544_2&amp;pf_rd_i=154606011">https://www.amazon.com/gp/product/B01K3WN1BY?pf_rd_m=A2R2RITDJNW1Q6&amp;storeType=ebooks&amp;pageType=STOREFRONT&amp;pf_rd_p=8e2a96d9-c848-435b-92bd-0856850ad544&amp;pf_rd_r=4J6CT15BS4X8062XNGDF&amp;pf_rd_s=merchandised-search-5&amp;pf_rd_t=40901&amp;ref_=dbs_f_ebk_rwt_scns_mwl_ms5_kmw_8e2a96d9-c848-435b-92bd-0856850ad544_2&amp;pf_rd_i=154606011</a></p>', 0, 0, '2017-12-23T18:05:24.868Z', '2017-12-23T18:06:55.320Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('mcEwFMSjhlvL', 'Bash startup modes', '<h3>Login shell</h3><p>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!).</p><p>When a login shell exits, Bash reads and executes commands from the file ~/.bash_logout, if it exists.</p><p>Why an extra login shell mode? There are many actions and variable sets that only make sense for the initial user login. That''s why all UNIX® shells have (should have) a "login" mode.</p><p><i><strong>Methods to start Bash as a login shell:</strong></i></p><ul><li>the first character of argv[0] is - (a hyphen): traditional UNIX® shells start from the login binary</li><li>Bash is started with the -l option</li><li>Bash is started with the --login option</li></ul><p><i><strong>Methods to test for login shell mode:</strong></i></p><ul><li>the shell option <a href="http://wiki.bash-hackers.org/internals/shell_options#login_shell">login_shell</a> is set</li></ul><p><i><strong>Related switches:</strong></i></p><ul><li>--noprofile disables reading of all profile files</li></ul><h3>Interactive shell</h3><p>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 the parent shell.</p><p>The feature to have a system-wide /etc/bash.bashrc or a similar system-wide rc-file is specific to vendors and distributors that ship <i>their own, patched variant of Bash</i>. The classic way to have a system-wide rc file is to source /etc/bashrc from every user''s ~/.bashrc.</p><p><i><strong>Methods to test for interactive-shell mode:</strong></i></p><ul><li>the special parameter $- contains the letter i (lowercase I)</li></ul><p><i><strong>Related switches:</strong></i></p><ul><li>-i forces the interactive mode</li><li>--norc disables reading of the startup files (e.g. /etc/bash.bashrc if supported) and ~/.bashrc</li><li>--rcfile defines another startup file (instead of /etc/bash.bashrc and ~/.bashrc)</li></ul><h3>SH mode</h3><p>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 and ~/.profile, if it''s a login shell.</p><p>If it''s not a login shell, the environment variable <a href="http://wiki.bash-hackers.org/syntax/shellvars#env">ENV</a> is evaluated and the resulting filename is used as the name of the startup file.</p><p>After the startup files are read, Bash enters the <a href="http://wiki.bash-hackers.org/scripting/bashbehaviour#posix_run_mode">POSIX(r) compatiblity mode (for running, not for starting!)</a>.</p><p><i><strong>Bash starts in sh compatiblity mode when:</strong></i></p><ul><li>the base filename in argv[0] is sh (<figure class="image"><img></figure>&nbsp;NB: /bin/sh may be linked to /bin/bash, but that doesn''t mean it acts like /bin/bash&nbsp;<figure class="image"><img></figure>)</li></ul>', 0, 0, '2017-12-23T01:29:35.974Z', '2017-12-23T01:34:10.493Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('CF2lUIJAr6Ey', 'Python', '', 0, 0, '2017-12-23T01:34:37.658Z', '2017-12-23T01:34:40.465Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('xkXwueRoDNeN', 'Christmas shopping', '<p>&nbsp;</p>', 0, 0, '2017-12-23T01:35:40.306Z', '2017-12-23T16:43:08.157Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('eXHZAKsMYgur', 'Books', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T03:32:42.868Z', '2017-12-23T18:08:03.857Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('2WU27ekfy07E', 'To read', '<p>Checkout Kindle daily deals: <a href="https://www.amazon.com/gp/feature.html?docId=1000677541">https://www.amazon.com/gp/feature.html?docId=1000677541</a></p><p>&nbsp;</p><ul><li>Cixin Liu - <a href="https://www.amazon.com/Dark-Forest-Remembrance-Earths-Past/dp/0765386690/ref=pd_bxgy_14_img_2?_encoding=UTF8&amp;pd_rd_i=0765386690&amp;pd_rd_r=AB0J179TM9NTEAMHE240&amp;pd_rd_w=FAhxX&amp;pd_rd_wg=pLGK7&amp;psc=1&amp;refRID=AB0J179TM9NTEAMHE240">The Dark Forest</a></li><li>Ann Leckie - <a href="https://www.amazon.com/Ancillary-Sword-Imperial-Radch-Leckie/dp/0316246654/ref=pd_sim_14_1?_encoding=UTF8&amp;pd_rd_i=0316246654&amp;pd_rd_r=D7KDTGZFP7YM1YSYVY4G&amp;pd_rd_w=jkn28&amp;pd_rd_wg=JVhtw&amp;psc=1&amp;refRID=D7KDTGZFP7YM1YSYVY4G">Ancillary Sword</a></li></ul>', 0, 0, '2017-12-23T03:32:49.379Z', '2017-12-23T03:59:01.970Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('TjWEndYCCg7g', 'Reviews', '', 0, 0, '2017-12-23T03:33:23.584Z', '2017-12-23T03:33:35.089Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('8nRNDJGyGs2Z', 'The Mechanical', '<p><strong>Amazon:</strong> <a href="https://www.amazon.com/Mechanical-Alchemy-Wars-Ian-Tregillis/dp/0316248002">https://www.amazon.com/Mechanical-Alchemy-Wars-Ian-Tregillis/dp/0316248002</a></p><p><strong>Author:</strong> Ian Tregillis</p><p><strong>Dates of reading:</strong> 24. 11. 2017 -13. 12. 2017</p><p>&nbsp;</p><p>I enjoyed this book a lot. It''s slow moving at times with the author taking his time with conversations and descriptions of them. The premise is very interesting, but I''m sad that it wasn''t elaborated more deeply - e.g. the history and development of the clakker technology with Huygens and how Spinoza comes into the picture. Maybe the author saves it for the next two parts of the book.</p><p>&nbsp;</p><p>Language can be intimidating at first for non-native english speakers - author uses wide range of vocabulary. Fortunately it gets better after a while as reader adjusts.</p>', 0, 0, '2017-12-23T03:33:37.327Z', '2017-12-23T03:36:51.534Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('9zSwD89vgzNO', 'Highlights', '<blockquote><p>Like a raindrop rolling down dry valleys to the sea, his body sensed the contours of agony and helplessly followed their gradient. Impelled by alchemical compulsion rather than gravity, Jax became an unstoppable boulder careering along gullies of human whim.</p></blockquote><p>&nbsp;</p><blockquote><p>Free Will was a vacuum, a negative space. It was the absence of coercion, the absence of compulsion, the absence of agony.</p></blockquote><p>&nbsp;</p><blockquote><p>Overwhelming: he could do anything he wanted. But the grand sum of anything-at-all was nothing-at-all. The topology of freedom offered no gradients to nudge him, no landmarks to guide him. How did humans guide themselves? How did they know what to do and what not to do? How did they know when to do anything without the benefit of geasa and metageasa to prioritize every single action of their waking lives? How did they order their daily existence without somebody to tell them what to do?</p></blockquote><blockquote><p>Life as a slave was unspeakable; life as a slave who had briefly tasted freedom was unthinkable. Clakkers carried complex geasa by dint of alchemy; humans carried heavy obligations, too, but called them culture. Society.</p></blockquote>', 0, 0, '2017-12-23T03:37:04.912Z', '2017-12-23T03:38:16.533Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('u5t1EvWa3CMO', 'Man''s search for meaning', '<p><strong>Autor</strong>: Viktor Frankl - <a href="https://en.wikipedia.org/wiki/Viktor_Frankl">https://en.wikipedia.org/wiki/Viktor_Frankl</a></p><p><strong>Wiki</strong> - <a href="https://en.wikipedia.org/wiki/Man%27s_Search_for_Meaning">https://en.wikipedia.org/wiki/Man%27s_Search_for_Meaning</a></p><p>&nbsp;</p><p>But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?</p><p>&nbsp;</p>', 0, 0, '2017-12-23T03:39:21.918Z', '2017-12-23T03:40:26.692Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('Iha4YwchR413', '21 - thursday', '', 0, 0, '2017-12-23T03:44:21.176Z', '2017-12-23T03:44:28.816Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('6ZuXjCSWgjB4', 'November', '', 0, 0, '2017-12-23T03:44:45.351Z', '2017-12-23T03:44:53.787Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('GpGnjmcAPeWG', '28', '', 0, 0, '2017-12-23T03:44:57.036Z', '2017-12-23T03:45:08.790Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('21K84UqGhqlt', 'Christmas gift ideas', '<ul><li>XBox</li><li>Candles</li><li><a href="https://www.amazon.ca/Anker-SoundCore-Portable-Bluetooth-Resistance/dp/B01MTB55WH?pd_rd_wg=honW8&amp;pd_rd_r=c9bb7c0f-0051-4da7-991f-4ca711a1b3e3&amp;pd_rd_w=ciUpR&amp;ref_=pd_gw_simh&amp;pf_rd_r=K10XKX0NGPDNTYYP4BS4&amp;pf_rd_p=5f1b460b-78c1-580e-929e-2878fe4859e8">Portable speakers</a></li><li>...?</li></ul>', 0, 0, '2017-12-23T03:45:10.933Z', '2017-12-23T16:43:28.160Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('rz5t0r9Qr2WC', 'Epics', '<p>Epic is kind of medium-term events or projects spread over days or months.</p><p>&nbsp;</p><p>Remember that Trilium is all free form so you can organise your stuff in whatever way you''d like</p><p>&nbsp;</p><p>&nbsp;</p>', 0, 0, '2017-12-23T03:45:20.914Z', '2017-12-23T03:52:37.779Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('R6pheWjdwmNU', 'Christmas', '<p>This christmas is going to be awesome!</p>', 0, 0, '2017-12-23T03:45:28.002Z', '2017-12-23T16:42:53.142Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('5v5Dx6LMHXIO', 'Christmas shopping', '<p>Bought a book!</p>', 0, 0, '2017-12-23T03:45:44.184Z', '2017-12-23T04:09:15.442Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('MLQjmREtcnJ3', 'Shopping', '', 0, 0, '2017-12-23T03:47:48.208Z', '2017-12-23T03:47:51.917Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('pTTjrxgnvURB', 'Vacation days', '<p>25. 12., 26. 12., 1. 1. - statutory holidays</p><p>27. 12. - 29. 12., 2. 1. - vacation days</p>', 0, 0, '2017-12-23T03:47:55.932Z', '2017-12-23T03:49:46.419Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('cFK9sGYZaMWs', 'Vacation in Cuba', 'Planning stuff etc.', 0, 0, '2017-12-23T03:49:32.210Z', '2017-12-23T03:55:17.763Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('pOFVzbXLmzhX', 'Christmas dinner', 'Carp of course!', 0, 0, '2017-12-23T03:54:46.138Z', '2017-12-23T03:54:57.762Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('0xtvjqrcGiRB', 'History', '<p>The <strong>history of Linux</strong> began in 1991 with the commencement of a personal project by <a href="https://en.wikipedia.org/wiki/Finland">Finnish</a> student <a href="https://en.wikipedia.org/wiki/Linus_Torvalds">Linus Torvalds</a> to create a new free operating system kernel. Since then, the resulting <a href="https://en.wikipedia.org/wiki/Linux_kernel">Linux kernel</a> has been marked by constant growth throughout its history. Since the initial release of its <a href="https://en.wikipedia.org/wiki/Source_code">source code</a> in 1991, it has grown from a small number of <a href="https://en.wikipedia.org/wiki/C_Programming_Language">C</a> files under a license prohibiting commercial distribution to the 4.2.3 version in 2015 with more than 18 million lines of source code under the <a href="https://en.wikipedia.org/wiki/GNU_General_Public_License">GNU General Public License</a> v2.</p>', 0, 0, '2017-12-23T04:01:51.565Z', '2017-12-23T04:02:05.496Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('Zl69uXBSen0w', 'Ubuntu', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:02:16.685Z', '2017-12-23T18:08:15.381Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('62BKAQMVP2KW', 'Unity shortcuts', '<ul><li>Hold Super - Invoke the Launcher and display the shortcuts</li><li>Hold Super, then press 1 or 2 or 3 and so on until 0 to open or focus an application. The number corresponds to the location of the icon on the launcher from top to bottom.<ul><li>Adding Shift will open a new instance of the application if it''s already open.</li><li>Holding the key is also useful when you want to get to the Launcher but do not want to invoke the Dash.</li></ul></li><li>Super + T - Open the rubbish bin/trash can.</li><li>Alt + F1 - Put keyboard focus on the Launcher, use arrow keys to navigate, Enter launches an application, Right arrow exposes the quicklists if an application has them.</li><li>Ctrl + Alt + T - Launch a terminal window.</li></ul>', 0, 0, '2017-12-23T04:02:39.164Z', '2017-12-23T04:03:09.867Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('h4OfLEAYspud', 'Security', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:04:00.715Z', '2017-12-23T18:08:25.474Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('1hASbLRDL7oo', 'Trusted timestamping', '<p>Wiki: <a href="https://en.wikipedia.org/wiki/Trusted_timestamping">https://en.wikipedia.org/wiki/Trusted_timestamping</a></p><p>Bozho: <a href="https://techblog.bozho.net/using-trusted-timestamping-java/">https://techblog.bozho.net/using-trusted-timestamping-java/</a></p><p>&nbsp;</p><p><strong>Trusted timestamping</strong> is the process of <a href="https://en.wikipedia.org/wiki/Computer_security">securely</a> keeping track of the creation and modification time of a document. Security here means that no one—not even the owner of the document—should be able to change it once it has been recorded provided that the timestamper''s integrity is never compromised.</p><p>The administrative aspect involves setting up a publicly available, trusted timestamp management infrastructure to collect, process and renew timestamps.</p>', 0, 0, '2017-12-23T04:04:08.155Z', '2017-12-23T04:04:30.386Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('jyqG9GucsMdn', 'Office party', 'That was fun!', 0, 0, '2017-12-23T04:05:16.439Z', '2017-12-23T04:05:30.373Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('WdWZFuWNVDZk', 'Tech', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:06:16.179Z', '2017-12-23T18:08:05.376Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('yK4SBJfwD3tY', 'Work', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:06:32.833Z', '2017-12-23T18:08:30.573Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('r4BnsmSQeVr1', 'HR', '<p>HR stuff&nbsp;</p>', 0, 0, '2017-12-23T04:06:37.427Z', '2017-12-23T16:42:23.145Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('QbL3pTvhgzM8', 'Processes', '<p>No content.</p><p>&nbsp;</p>', 0, 0, '2017-12-23T04:06:43.841Z', '2017-12-23T16:42:15.893Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('moMbTKwN15Ps', 'Projects', '<p>Here I''d keep various notes related to my work''s projects etc.</p>', 0, 0, '2017-12-23T04:06:49.331Z', '2017-12-23T04:07:25.429Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('PEGQGg0In3Ar', 'Phone call about work project', '<p>Bla bla bla ....</p>', 0, 0, '2017-12-23T16:44:35.900Z', '2017-12-23T16:44:53.174Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('IlULcDiOTI4K', 'Inbox', '<p>This is a place I use to put notes waiting for better categorization</p><p>&nbsp;</p>', 0, 0, '2017-12-23T16:45:11.047Z', '2017-12-23T18:04:49.545Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('vBv6ovBupfTj', 'Grocery list for today', '<ul><li>cucumber</li><li>cheese</li><li>beer</li></ul><p>&nbsp;</p>', 0, 0, '2017-12-23T18:04:50.904Z', '2017-12-23T18:05:19.574Z');
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('mw4f2xB4J5fV', 'Book to read', '<p>How to be a stoic from Massimo Pigliuci:</p><p>&nbsp;</p><p><a href="https://www.amazon.com/gp/product/B01K3WN1BY?pf_rd_m=A2R2RITDJNW1Q6&amp;storeType=ebooks&amp;pageType=STOREFRONT&amp;pf_rd_p=8e2a96d9-c848-435b-92bd-0856850ad544&amp;pf_rd_r=4J6CT15BS4X8062XNGDF&amp;pf_rd_s=merchandised-search-5&amp;pf_rd_t=40901&amp;ref_=dbs_f_ebk_rwt_scns_mwl_ms5_kmw_8e2a96d9-c848-435b-92bd-0856850ad544_2&amp;pf_rd_i=154606011">https://www.amazon.com/gp/product/B01K3WN1BY?pf_rd_m=A2R2RITDJNW1Q6&amp;storeType=ebooks&amp;pageType=STOREFRONT&amp;pf_rd_p=8e2a96d9-c848-435b-92bd-0856850ad544&amp;pf_rd_r=4J6CT15BS4X8062XNGDF&amp;pf_rd_s=merchandised-search-5&amp;pf_rd_t=40901&amp;ref_=dbs_f_ebk_rwt_scns_mwl_ms5_kmw_8e2a96d9-c848-435b-92bd-0856850ad544_2&amp;pf_rd_i=154606011</a></p>', 0, 0, '2017-12-23T18:05:24.868Z', '2017-12-23T18:06:55.320Z');

db/main_notes_image.sql

@@ -1 +1 @@
-INSERT INTO notes_image (note_image_id, note_id, image_id, is_deleted, date_modified, date_created) VALUES ('2EtgRRPfk4Fi', '1Heh2acXfPNt', 'ed64aET6i379', 0, '2018-01-08T04:41:30.663Z', '2018-01-08T04:41:30.663Z');
+INSERT INTO note_images (noteImageId, noteId, imageId, isDeleted, dateModified, dateCreated) VALUES ('2EtgRRPfk4Fi', '1Heh2acXfPNt', 'ed64aET6i379', 0, '2018-01-08T04:41:30.663Z', '2018-01-08T04:41:30.663Z');

db/main_notes_tree.sql

@@ -1,52 +1,52 @@
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('dLgtLUFn3GoN', '1Heh2acXfPNt', 'root', 21, null, 1, 0, '2017-12-23T00:46:39.304Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('QLfS835GSfIh', '3RkyK9LI18dO', '1Heh2acXfPNt', 1, null, 1, 0, '2017-12-23T01:20:04.181Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('QJAcYJ1gGUh9', 'L1Ox40M1aEyy', '3RkyK9LI18dO', 0, null, 0, 0, '2017-12-23T01:20:45.365Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('wLTa2l3lYi83', 'HJusZTbBU494', '3RkyK9LI18dO', 2, null, 1, 0, '2017-12-23T01:20:50.709Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('yMhwsE7uvEij', '3oldoiMUPOlr', 'HJusZTbBU494', 1, null, 1, 0, '2017-12-23T01:20:55.775Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('EjQTcVVHFmmZ', 'MG0wntwILQW6', '3oldoiMUPOlr', 1, null, 1, 0, '2017-12-23T01:21:10.517Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('jvhKcwz4pYTr', 'ZC78NlmdXeC6', 'WdWZFuWNVDZk', 0, null, 1, 0, '2017-12-23T04:06:21.579Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('CarTrwkGVcPz', 'NncfGH8dyNjJ', 'WdWZFuWNVDZk', 1, null, 0, 0, '2017-12-23T04:06:24.012Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('6M7qPlr7at6N', 'eouCLkjbruai', 'NncfGH8dyNjJ', 0, null, 0, 0, '2017-12-23T01:23:28.291Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('tQgognnAH9WI', 'C44aq4mkaX67', 'NncfGH8dyNjJ', 1, null, 0, 0, '2017-12-23T01:23:31.879Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('xyAi7MmgvAgR', 'C44aq4mkaX67', 'ZC78NlmdXeC6', 1, null, 0, 0, '2017-12-23T01:23:47.756Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('xQ3fjRp9yaPq', 'I6Cw88AirBBl', 'C44aq4mkaX67', 0, null, 0, 0, '2017-12-23T01:24:04.681Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('2GOsNT5LsvTP', 'mcEwFMSjhlvL', 'C44aq4mkaX67', 1, null, 0, 0, '2017-12-23T01:29:35.974Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('RxUiraiR655R', 'CF2lUIJAr6Ey', 'NncfGH8dyNjJ', 2, null, 0, 0, '2017-12-23T01:34:37.658Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('mZuSrZ18Zmv0', 'xkXwueRoDNeN', 'MG0wntwILQW6', 0, null, 0, 0, '2017-12-23T01:35:40.306Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('hbcWTnEnXPwF', 'eXHZAKsMYgur', '1Heh2acXfPNt', 3, null, 1, 0, '2017-12-23T03:32:42.868Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('8a3aNxjG0nu7', '2WU27ekfy07E', 'eXHZAKsMYgur', 0, null, 0, 0, '2017-12-23T03:32:49.379Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('4Tu6vaPdCxCM', 'TjWEndYCCg7g', 'eXHZAKsMYgur', 1, null, 0, 0, '2017-12-23T03:33:23.584Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('lBPOmhP12egP', '8nRNDJGyGs2Z', 'TjWEndYCCg7g', 0, null, 0, 0, '2017-12-23T03:33:37.327Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('C5ipVqeDWySp', '9zSwD89vgzNO', '8nRNDJGyGs2Z', 0, null, 0, 0, '2017-12-23T03:37:04.912Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('uSitzbGcSATJ', 'u5t1EvWa3CMO', 'TjWEndYCCg7g', 1, null, 0, 0, '2017-12-23T03:39:21.918Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('GZ6aRI8rdSJt', '8nRNDJGyGs2Z', 'MG0wntwILQW6', 1, '', 0, 0, '2017-12-23T03:42:28.310Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('HsN4600rQoL9', 'Iha4YwchR413', '3oldoiMUPOlr', 0, null, 1, 0, '2017-12-23T03:44:30.945Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('uipfvAfwWRgx', '6ZuXjCSWgjB4', 'HJusZTbBU494', 0, null, 0, 0, '2017-12-23T03:44:54.096Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('nMRpPWWH8WRk', 'GpGnjmcAPeWG', '6ZuXjCSWgjB4', 0, null, 1, 0, '2017-12-23T03:44:57.036Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('c4wt27WNjepw', '21K84UqGhqlt', 'GpGnjmcAPeWG', 0, null, 0, 0, '2017-12-23T03:45:10.933Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('0fpnraUGs9Kl', 'rz5t0r9Qr2WC', 'HJusZTbBU494', 2, null, 1, 0, '2017-12-23T03:45:20.914Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('d8L8zYlLTbym', 'R6pheWjdwmNU', 'rz5t0r9Qr2WC', 0, null, 1, 0, '2017-12-23T03:45:28.002Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('T4USGzfllu5t', '5v5Dx6LMHXIO', 'Iha4YwchR413', 0, null, 0, 0, '2017-12-23T03:45:44.184Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('c4JgFNIobvQW', 'MLQjmREtcnJ3', 'R6pheWjdwmNU', 0, null, 0, 0, '2017-12-23T03:47:48.208Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('nfWjptAU2ZDg', 'pTTjrxgnvURB', 'R6pheWjdwmNU', 1, null, 0, 0, '2017-12-23T03:47:55.932Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('T2ToYBfyPy0g', 'cFK9sGYZaMWs', 'rz5t0r9Qr2WC', 1, null, 0, 0, '2017-12-23T03:49:32.210Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('NG4gbKOnsM3v', '21K84UqGhqlt', 'MLQjmREtcnJ3', 0, '28. 11. 2017', 0, 0, '2017-12-23T03:53:38.110Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('Fstg4tkccO4N', '5v5Dx6LMHXIO', 'MLQjmREtcnJ3', 1, '21. 12. 2017', 0, 0, '2017-12-23T03:53:49.737Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('MN8B7qXDUViO', 'xkXwueRoDNeN', 'MLQjmREtcnJ3', 2, '22. 12. 2017', 0, 0, '2017-12-23T03:53:57.486Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('gSRkHpB7Bu3D', 'pOFVzbXLmzhX', 'R6pheWjdwmNU', 2, null, 0, 0, '2017-12-23T03:54:46.138Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('6brdjeWDOB6w', '0xtvjqrcGiRB', 'ZC78NlmdXeC6', 0, null, 0, 0, '2017-12-23T04:02:06.650Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('AqKUM2zUVFUF', 'Zl69uXBSen0w', 'ZC78NlmdXeC6', 2, null, 1, 0, '2017-12-23T04:02:16.685Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('Ez7NN2WVzRc4', '62BKAQMVP2KW', 'Zl69uXBSen0w', 1, null, 0, 0, '2017-12-23T04:02:39.164Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('t3vVElqMIQVa', 'h4OfLEAYspud', 'WdWZFuWNVDZk', 2, null, 1, 0, '2017-12-23T04:06:25.769Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('O983DHtLpgmr', '1hASbLRDL7oo', 'h4OfLEAYspud', 0, null, 0, 0, '2017-12-23T16:42:26.347Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('RsvL795Mk1bp', '1hASbLRDL7oo', 'GpGnjmcAPeWG', 1, '', 0, 0, '2017-12-23T04:04:56.830Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('79e4hrHLFmx6', 'jyqG9GucsMdn', 'Iha4YwchR413', 1, null, 0, 0, '2017-12-23T04:05:16.439Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('oWO8rctUjf7d', 'WdWZFuWNVDZk', '1Heh2acXfPNt', 5, null, 1, 0, '2017-12-23T04:06:16.179Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('GOxcrZrxalFN', 'yK4SBJfwD3tY', '1Heh2acXfPNt', 8, null, 1, 0, '2017-12-23T04:06:32.833Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('bSPmEvjLzQKU', 'r4BnsmSQeVr1', 'yK4SBJfwD3tY', 0, null, 0, 0, '2017-12-23T04:06:37.427Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('bMtxCD6cwNR9', 'QbL3pTvhgzM8', 'yK4SBJfwD3tY', 2, null, 0, 0, '2017-12-23T04:06:43.841Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('o4ycR7xIi4oI', 'moMbTKwN15Ps', 'yK4SBJfwD3tY', 3, null, 1, 0, '2017-12-23T04:06:49.331Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('abTEhnOsAsSg', 'PEGQGg0In3Ar', 'GpGnjmcAPeWG', 2, null, 0, 0, '2017-12-23T16:44:35.900Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('bryQseMhyzaI', 'IlULcDiOTI4K', '1Heh2acXfPNt', 0, null, 0, 0, '2017-12-23T18:04:26.439Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('ccslPJf3wQV3', 'vBv6ovBupfTj', 'IlULcDiOTI4K', 0, null, 0, 0, '2017-12-23T18:04:50.904Z');
-INSERT INTO notes_tree (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified) VALUES ('5Dt9YCMn59sY', 'mw4f2xB4J5fV', 'IlULcDiOTI4K', 1, null, 0, 0, '2017-12-23T18:05:24.868Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('dLgtLUFn3GoN', '1Heh2acXfPNt', 'root', 21, null, 1, 0, '2017-12-23T00:46:39.304Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('QLfS835GSfIh', '3RkyK9LI18dO', '1Heh2acXfPNt', 1, null, 1, 0, '2017-12-23T01:20:04.181Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('QJAcYJ1gGUh9', 'L1Ox40M1aEyy', '3RkyK9LI18dO', 0, null, 0, 0, '2017-12-23T01:20:45.365Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('wLTa2l3lYi83', 'HJusZTbBU494', '3RkyK9LI18dO', 2, null, 1, 0, '2017-12-23T01:20:50.709Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('yMhwsE7uvEij', '3oldoiMUPOlr', 'HJusZTbBU494', 1, null, 1, 0, '2017-12-23T01:20:55.775Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('EjQTcVVHFmmZ', 'MG0wntwILQW6', '3oldoiMUPOlr', 1, null, 1, 0, '2017-12-23T01:21:10.517Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('jvhKcwz4pYTr', 'ZC78NlmdXeC6', 'WdWZFuWNVDZk', 0, null, 1, 0, '2017-12-23T04:06:21.579Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('CarTrwkGVcPz', 'NncfGH8dyNjJ', 'WdWZFuWNVDZk', 1, null, 0, 0, '2017-12-23T04:06:24.012Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('6M7qPlr7at6N', 'eouCLkjbruai', 'NncfGH8dyNjJ', 0, null, 0, 0, '2017-12-23T01:23:28.291Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('tQgognnAH9WI', 'C44aq4mkaX67', 'NncfGH8dyNjJ', 1, null, 0, 0, '2017-12-23T01:23:31.879Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('xyAi7MmgvAgR', 'C44aq4mkaX67', 'ZC78NlmdXeC6', 1, null, 0, 0, '2017-12-23T01:23:47.756Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('xQ3fjRp9yaPq', 'I6Cw88AirBBl', 'C44aq4mkaX67', 0, null, 0, 0, '2017-12-23T01:24:04.681Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('2GOsNT5LsvTP', 'mcEwFMSjhlvL', 'C44aq4mkaX67', 1, null, 0, 0, '2017-12-23T01:29:35.974Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('RxUiraiR655R', 'CF2lUIJAr6Ey', 'NncfGH8dyNjJ', 2, null, 0, 0, '2017-12-23T01:34:37.658Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('mZuSrZ18Zmv0', 'xkXwueRoDNeN', 'MG0wntwILQW6', 0, null, 0, 0, '2017-12-23T01:35:40.306Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('hbcWTnEnXPwF', 'eXHZAKsMYgur', '1Heh2acXfPNt', 3, null, 1, 0, '2017-12-23T03:32:42.868Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('8a3aNxjG0nu7', '2WU27ekfy07E', 'eXHZAKsMYgur', 0, null, 0, 0, '2017-12-23T03:32:49.379Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('4Tu6vaPdCxCM', 'TjWEndYCCg7g', 'eXHZAKsMYgur', 1, null, 0, 0, '2017-12-23T03:33:23.584Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('lBPOmhP12egP', '8nRNDJGyGs2Z', 'TjWEndYCCg7g', 0, null, 0, 0, '2017-12-23T03:33:37.327Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('C5ipVqeDWySp', '9zSwD89vgzNO', '8nRNDJGyGs2Z', 0, null, 0, 0, '2017-12-23T03:37:04.912Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('uSitzbGcSATJ', 'u5t1EvWa3CMO', 'TjWEndYCCg7g', 1, null, 0, 0, '2017-12-23T03:39:21.918Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('GZ6aRI8rdSJt', '8nRNDJGyGs2Z', 'MG0wntwILQW6', 1, '', 0, 0, '2017-12-23T03:42:28.310Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('HsN4600rQoL9', 'Iha4YwchR413', '3oldoiMUPOlr', 0, null, 1, 0, '2017-12-23T03:44:30.945Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('uipfvAfwWRgx', '6ZuXjCSWgjB4', 'HJusZTbBU494', 0, null, 0, 0, '2017-12-23T03:44:54.096Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('nMRpPWWH8WRk', 'GpGnjmcAPeWG', '6ZuXjCSWgjB4', 0, null, 1, 0, '2017-12-23T03:44:57.036Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('c4wt27WNjepw', '21K84UqGhqlt', 'GpGnjmcAPeWG', 0, null, 0, 0, '2017-12-23T03:45:10.933Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('0fpnraUGs9Kl', 'rz5t0r9Qr2WC', 'HJusZTbBU494', 2, null, 1, 0, '2017-12-23T03:45:20.914Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('d8L8zYlLTbym', 'R6pheWjdwmNU', 'rz5t0r9Qr2WC', 0, null, 1, 0, '2017-12-23T03:45:28.002Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('T4USGzfllu5t', '5v5Dx6LMHXIO', 'Iha4YwchR413', 0, null, 0, 0, '2017-12-23T03:45:44.184Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('c4JgFNIobvQW', 'MLQjmREtcnJ3', 'R6pheWjdwmNU', 0, null, 0, 0, '2017-12-23T03:47:48.208Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('nfWjptAU2ZDg', 'pTTjrxgnvURB', 'R6pheWjdwmNU', 1, null, 0, 0, '2017-12-23T03:47:55.932Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('T2ToYBfyPy0g', 'cFK9sGYZaMWs', 'rz5t0r9Qr2WC', 1, null, 0, 0, '2017-12-23T03:49:32.210Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('NG4gbKOnsM3v', '21K84UqGhqlt', 'MLQjmREtcnJ3', 0, '28. 11. 2017', 0, 0, '2017-12-23T03:53:38.110Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('Fstg4tkccO4N', '5v5Dx6LMHXIO', 'MLQjmREtcnJ3', 1, '21. 12. 2017', 0, 0, '2017-12-23T03:53:49.737Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('MN8B7qXDUViO', 'xkXwueRoDNeN', 'MLQjmREtcnJ3', 2, '22. 12. 2017', 0, 0, '2017-12-23T03:53:57.486Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('gSRkHpB7Bu3D', 'pOFVzbXLmzhX', 'R6pheWjdwmNU', 2, null, 0, 0, '2017-12-23T03:54:46.138Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('6brdjeWDOB6w', '0xtvjqrcGiRB', 'ZC78NlmdXeC6', 0, null, 0, 0, '2017-12-23T04:02:06.650Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('AqKUM2zUVFUF', 'Zl69uXBSen0w', 'ZC78NlmdXeC6', 2, null, 1, 0, '2017-12-23T04:02:16.685Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('Ez7NN2WVzRc4', '62BKAQMVP2KW', 'Zl69uXBSen0w', 1, null, 0, 0, '2017-12-23T04:02:39.164Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('t3vVElqMIQVa', 'h4OfLEAYspud', 'WdWZFuWNVDZk', 2, null, 1, 0, '2017-12-23T04:06:25.769Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('O983DHtLpgmr', '1hASbLRDL7oo', 'h4OfLEAYspud', 0, null, 0, 0, '2017-12-23T16:42:26.347Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('RsvL795Mk1bp', '1hASbLRDL7oo', 'GpGnjmcAPeWG', 1, '', 0, 0, '2017-12-23T04:04:56.830Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('79e4hrHLFmx6', 'jyqG9GucsMdn', 'Iha4YwchR413', 1, null, 0, 0, '2017-12-23T04:05:16.439Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('oWO8rctUjf7d', 'WdWZFuWNVDZk', '1Heh2acXfPNt', 5, null, 1, 0, '2017-12-23T04:06:16.179Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('GOxcrZrxalFN', 'yK4SBJfwD3tY', '1Heh2acXfPNt', 8, null, 1, 0, '2017-12-23T04:06:32.833Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('bSPmEvjLzQKU', 'r4BnsmSQeVr1', 'yK4SBJfwD3tY', 0, null, 0, 0, '2017-12-23T04:06:37.427Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('bMtxCD6cwNR9', 'QbL3pTvhgzM8', 'yK4SBJfwD3tY', 2, null, 0, 0, '2017-12-23T04:06:43.841Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('o4ycR7xIi4oI', 'moMbTKwN15Ps', 'yK4SBJfwD3tY', 3, null, 1, 0, '2017-12-23T04:06:49.331Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('abTEhnOsAsSg', 'PEGQGg0In3Ar', 'GpGnjmcAPeWG', 2, null, 0, 0, '2017-12-23T16:44:35.900Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('bryQseMhyzaI', 'IlULcDiOTI4K', '1Heh2acXfPNt', 0, null, 0, 0, '2017-12-23T18:04:26.439Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('ccslPJf3wQV3', 'vBv6ovBupfTj', 'IlULcDiOTI4K', 0, null, 0, 0, '2017-12-23T18:04:50.904Z');
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('5Dt9YCMn59sY', 'mw4f2xB4J5fV', 'IlULcDiOTI4K', 1, null, 0, 0, '2017-12-23T18:05:24.868Z');

db/migrations/0031__change_encryption_to_CBC.js

@@ -17,7 +17,7 @@ module.exports = async () => {
     const password = await question("Enter password: ");
     const dataKey = await password_encryption.getDecryptedDataKey(password);
 
-    const protectedNotes = await sql.getAll("SELECT * FROM notes WHERE is_protected = 1");
+    const protectedNotes = await sql.getRows("SELECT * FROM notes WHERE is_protected = 1");
 
     for (const note of protectedNotes) {
         const decryptedTitle = data_encryption.decrypt(dataKey, note.note_title);
@@ -30,7 +30,7 @@ module.exports = async () => {
         await sql.execute("UPDATE notes SET note_title = ?, note_text = ? WHERE note_id = ?", [note.note_title, note.note_text, note.note_id]);
     }
 
-    const protectedNotesHistory = await sql.getAll("SELECT * FROM notes_history WHERE is_protected = 1");
+    const protectedNotesHistory = await sql.getRows("SELECT * FROM notes_history WHERE is_protected = 1");
 
     for (const noteHistory of protectedNotesHistory) {
         const decryptedTitle = data_encryption.decrypt(dataKey, noteHistory.note_title);

db/migrations/0068__add_note_type.sql

@@ -0,0 +1 @@
+ALTER TABLE notes ADD COLUMN type TEXT NOT NULL DEFAULT 'text';

db/migrations/0069__add_mime_to_note.sql

@@ -0,0 +1 @@
+ALTER TABLE notes ADD COLUMN mime TEXT NOT NULL DEFAULT 'text/html';

db/migrations/0070__rename_columns_to_camel_case.sql

@@ -0,0 +1,207 @@
+CREATE TABLE "options_mig" (
+    `name`	TEXT NOT NULL PRIMARY KEY,
+    `value`	TEXT,
+    `dateModified` INT,
+    isSynced INTEGER NOT NULL DEFAULT 0);
+
+INSERT INTO options_mig (name, value, dateModified, isSynced)
+    SELECT opt_name, opt_value, date_modified, is_synced FROM options;
+
+DROP TABLE options;
+ALTER TABLE options_mig RENAME TO options;
+
+CREATE TABLE "sync_mig" (
+  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `entityName`	TEXT NOT NULL,
+  `entityId`	TEXT NOT NULL,
+  `sourceId` TEXT NOT NULL,
+  `syncDate`	TEXT NOT NULL);
+
+INSERT INTO sync_mig (id, entityName, entityId, sourceId, syncDate)
+    SELECT id, entity_name, entity_id, source_id, sync_date FROM sync;
+
+DROP TABLE sync;
+ALTER TABLE sync_mig RENAME TO sync;
+
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
+  `entityName`,
+  `entityId`
+);
+
+CREATE INDEX `IDX_sync_syncDate` ON `sync` (
+  `syncDate`
+);
+
+CREATE TABLE `source_ids_mig` (
+  `sourceId`	TEXT NOT NULL,
+  `dateCreated`	TEXT NOT NULL,
+  PRIMARY KEY(`sourceId`)
+);
+
+INSERT INTO source_ids_mig (sourceId, dateCreated)
+    SELECT source_id, date_created FROM source_ids;
+
+DROP TABLE source_ids;
+ALTER TABLE source_ids_mig RENAME TO source_ids;
+
+CREATE TABLE "notes_mig" (
+  `noteId`	TEXT NOT NULL,
+  `title`	TEXT,
+  `content`	TEXT,
+  `isProtected`	INT NOT NULL DEFAULT 0,
+  `isDeleted`	INT NOT NULL DEFAULT 0,
+  `dateCreated`	TEXT NOT NULL,
+  `dateModified`	TEXT NOT NULL,
+  type TEXT NOT NULL DEFAULT 'text',
+  mime TEXT NOT NULL DEFAULT 'text/html',
+  PRIMARY KEY(`noteId`)
+);
+
+INSERT INTO notes_mig (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified, type, mime)
+    SELECT note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified, type, mime FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (
+  `isDeleted`
+);
+
+CREATE TABLE `event_log_mig` (
+  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `noteId`	TEXT,
+  `comment`	TEXT,
+  `dateAdded`	TEXT NOT NULL,
+  FOREIGN KEY(noteId) REFERENCES notes(noteId)
+);
+
+INSERT INTO event_log_mig (id, noteId, comment, dateAdded)
+    SELECT id, note_id, comment, date_added FROM event_log;
+
+DROP TABLE event_log;
+ALTER TABLE event_log_mig RENAME TO event_log;
+
+CREATE TABLE "note_tree" (
+  `noteTreeId`	TEXT NOT NULL,
+  `noteId`	TEXT NOT NULL,
+  `parentNoteId`	TEXT NOT NULL,
+  `notePosition`	INTEGER NOT NULL,
+  `prefix`	TEXT,
+  `isExpanded`	BOOLEAN,
+  `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+  `dateModified`	TEXT NOT NULL,
+  PRIMARY KEY(`noteTreeId`)
+);
+
+INSERT INTO note_tree (noteTreeId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified)
+    SELECT note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified FROM notes_tree;
+
+DROP TABLE notes_tree;
+
+CREATE INDEX `IDX_note_tree_noteId` ON `note_tree` (
+  `noteId`
+);
+
+CREATE INDEX `IDX_note_tree_noteId_parentNoteId` ON `note_tree` (
+  `noteId`,
+  `parentNoteId`
+);
+
+CREATE TABLE "note_revisions" (
+  `noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+  `noteId`	TEXT NOT NULL,
+  `title`	TEXT,
+  `content`	TEXT,
+  `isProtected`	INT NOT NULL DEFAULT 0,
+  `dateModifiedFrom` TEXT NOT NULL,
+  `dateModifiedTo` TEXT NOT NULL
+);
+
+INSERT INTO note_revisions (noteRevisionId, noteId, title, content, isProtected, dateModifiedFrom, dateModifiedTo)
+    SELECT note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to FROM notes_history;
+
+DROP TABLE notes_history;
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (
+  `noteId`
+);
+
+CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` (
+  `dateModifiedFrom`
+);
+
+CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` (
+  `dateModifiedTo`
+);
+
+CREATE TABLE `recent_notes_mig` (
+  `noteTreeId` TEXT NOT NULL PRIMARY KEY,
+  `notePath` TEXT NOT NULL,
+  `dateAccessed` TEXT NOT NULL,
+  isDeleted INT
+);
+
+INSERT INTO recent_notes_mig (noteTreeId, notePath, dateAccessed, isDeleted)
+    SELECT note_tree_id, note_path, date_accessed, is_deleted FROM recent_notes;
+
+DROP TABLE recent_notes;
+ALTER TABLE recent_notes_mig RENAME TO recent_notes;
+
+CREATE TABLE images_mig
+(
+  imageId TEXT PRIMARY KEY NOT NULL,
+  format TEXT NOT NULL,
+  checksum TEXT NOT NULL,
+  name TEXT NOT NULL,
+  data BLOB,
+  isDeleted INT NOT NULL DEFAULT 0,
+  dateModified TEXT NOT NULL,
+  dateCreated TEXT NOT NULL
+);
+
+INSERT INTO images_mig (imageId, format, checksum, name, data, isDeleted, dateModified, dateCreated)
+    SELECT image_id, format, checksum, name, data, is_deleted, date_modified, date_created FROM images;
+
+DROP TABLE images;
+ALTER TABLE images_mig RENAME TO images;
+
+CREATE TABLE note_images
+(
+  noteImageId TEXT PRIMARY KEY NOT NULL,
+  noteId TEXT NOT NULL,
+  imageId TEXT NOT NULL,
+  isDeleted INT NOT NULL DEFAULT 0,
+  dateModified TEXT NOT NULL,
+  dateCreated TEXT NOT NULL
+);
+
+INSERT INTO note_images (noteImageId, noteId, imageId, isDeleted, dateModified, dateCreated)
+    SELECT note_image_id, note_id, image_id, is_deleted, date_modified, date_created FROM notes_image;
+
+DROP TABLE notes_image;
+
+CREATE INDEX IDX_note_images_noteId ON note_images (noteId);
+
+CREATE INDEX IDX_note_images_imageId ON note_images (imageId);
+
+CREATE INDEX IDX_note_images_noteId_imageId ON note_images (noteId, imageId);
+
+CREATE TABLE attributes_mig
+(
+  attributeId TEXT PRIMARY KEY NOT NULL,
+  noteId TEXT NOT NULL,
+  name TEXT NOT NULL,
+  value TEXT,
+  dateCreated TEXT NOT NULL,
+  dateModified TEXT NOT NULL
+);
+
+INSERT INTO attributes_mig (attributeId, noteId, name, value, dateCreated, dateModified)
+    SELECT attribute_id, note_id, name, value, date_created, date_modified FROM attributes;
+
+DROP TABLE attributes;
+ALTER TABLE attributes_mig RENAME TO attributes;
+
+CREATE INDEX IDX_attributes_noteId ON attributes (noteId);
+
+CREATE UNIQUE INDEX IDX_attributes_noteId_name ON attributes (noteId, name);

db/migrations/0071__fix_sync_entity_names.sql

@@ -0,0 +1,4 @@
+UPDATE sync SET entityName = 'note_images' WHERE entityName = 'notes_image';
+UPDATE sync SET entityName = 'note_tree' WHERE entityName = 'notes_tree';
+UPDATE sync SET entityName = 'note_revisions' WHERE entityName = 'notes_history';
+UPDATE sync SET entityName = 'note_reordering' WHERE entityName = 'notes_reordering';

db/schema.sql

@@ -1,15 +1,21 @@
 CREATE TABLE IF NOT EXISTS "options" (
 	`opt_name`	TEXT NOT NULL PRIMARY KEY,
 	`opt_value`	TEXT,
-  `is_synced` INTEGER NOT NULL DEFAULT 0,
 	`date_modified` INT
-);
+, is_synced INTEGER NOT NULL DEFAULT 0);
 CREATE TABLE IF NOT EXISTS "sync" (
     `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     `entity_name`	TEXT NOT NULL,
     `entity_id`	TEXT NOT NULL,
     `source_id` TEXT NOT NULL,
     `sync_date`	TEXT NOT NULL);
+CREATE UNIQUE INDEX `IDX_sync_entity_name_id` ON `sync` (
+  `entity_name`,
+  `entity_id`
+);
+CREATE INDEX `IDX_sync_sync_date` ON `sync` (
+  `sync_date`
+);
 CREATE TABLE `source_ids` (
   `source_id`	TEXT NOT NULL,
   `date_created`	TEXT NOT NULL,
@@ -22,9 +28,12 @@ CREATE TABLE IF NOT EXISTS "notes" (
     `is_protected`	INT NOT NULL DEFAULT 0,
     `is_deleted`	INT NOT NULL DEFAULT 0,
     `date_created`	TEXT NOT NULL,
-    `date_modified`	TEXT NOT NULL,
+    `date_modified`	TEXT NOT NULL, type TEXT NOT NULL DEFAULT 'text', mime TEXT NOT NULL DEFAULT 'text/html',
     PRIMARY KEY(`note_id`)
 );
+CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
+    `is_deleted`
+);
 CREATE TABLE `event_log` (
     `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     `note_id`	TEXT,
@@ -43,6 +52,9 @@ CREATE TABLE IF NOT EXISTS "notes_tree" (
   `date_modified`	TEXT NOT NULL,
   PRIMARY KEY(`note_tree_id`)
 );
+CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
+  `note_id`
+);
 CREATE TABLE IF NOT EXISTS "notes_history" (
   `note_history_id`	TEXT NOT NULL PRIMARY KEY,
   `note_id`	TEXT NOT NULL,
@@ -52,29 +64,6 @@ CREATE TABLE IF NOT EXISTS "notes_history" (
   `date_modified_from` TEXT NOT NULL,
   `date_modified_to` TEXT NOT NULL
 );
-CREATE TABLE `recent_notes` (
-  `note_tree_id` TEXT NOT NULL PRIMARY KEY,
-  `note_path` TEXT NOT NULL,
-  `date_accessed` TEXT NOT NULL,
-  is_deleted INT
-);
-CREATE UNIQUE INDEX `IDX_sync_entity_name_id` ON `sync` (
-  `entity_name`,
-  `entity_id`
-);
-CREATE INDEX `IDX_sync_sync_date` ON `sync` (
-  `sync_date`
-);
-CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
-    `is_deleted`
-);
-CREATE INDEX `IDX_notes_tree_note_id_parent_note_id` ON `notes_tree` (
-  `note_id`,
-  `parent_note_id`
-);
-CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
-  `note_id`
-);
 CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
   `note_id`
 );
@@ -84,6 +73,16 @@ CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
 CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
   `date_modified_to`
 );
+CREATE TABLE `recent_notes` (
+  `note_tree_id` TEXT NOT NULL PRIMARY KEY,
+  `note_path` TEXT NOT NULL,
+  `date_accessed` TEXT NOT NULL,
+  is_deleted INT
+);
+CREATE INDEX `IDX_notes_tree_note_id_parent_note_id` ON `notes_tree` (
+  `note_id`,
+  `parent_note_id`
+);
 CREATE TABLE images
 (
   image_id TEXT PRIMARY KEY NOT NULL,
@@ -95,7 +94,6 @@ CREATE TABLE images
   date_modified TEXT NOT NULL,
   date_created TEXT NOT NULL
 );
-
 CREATE TABLE notes_image
 (
   note_image_id TEXT PRIMARY KEY NOT NULL,
@@ -105,11 +103,9 @@ CREATE TABLE notes_image
   date_modified TEXT NOT NULL,
   date_created TEXT NOT NULL
 );
-
 CREATE INDEX notes_image_note_id_index ON notes_image (note_id);
 CREATE INDEX notes_image_image_id_index ON notes_image (image_id);
 CREATE INDEX notes_image_note_id_image_id_index ON notes_image (note_id, image_id);
-
 CREATE TABLE attributes
 (
   attribute_id TEXT PRIMARY KEY NOT NULL,
@@ -119,6 +115,5 @@ CREATE TABLE attributes
   date_created TEXT NOT NULL,
   date_modified TEXT NOT NULL
 );
-
 CREATE INDEX attributes_note_id_index ON attributes (note_id);
-CREATE UNIQUE INDEX attributes_note_id_name_index ON attributes (note_id, name);
+CREATE UNIQUE INDEX attributes_note_id_name_index ON attributes (note_id, name);

doc/0001-Welcome to Trilium!.html

@@ -1,21 +0,0 @@
-<p>Trilium is a personal knowledge base tool. This allows you to write and
-  manage your knowledge in a structured manner.</p>
-<h3>Main features</h3>
-<ul>
-  <li>hierarchical (tree) structure of notes - notes can be easily nested as
-    necessary without imposing any depth limitations
-    <ul>
-      <li>extension of tree structure in the form of note clones - note can belong
-        to multiple parent notes - thus appearing in multiple places in the hierarchy</li>
-    </ul>
-  </li>
-  <li>strong encryption - selected notes can be protected with strong encryption
-    with key derived from password</li>
-  <li>web application to be deployed on your server, desktop application (build
-    on Electron) and data synchronization between instances</li>
-  <li>fast keyboard-based navigation between different notes using "Jump-to"
-    and "Recent notes" dialogs</li>
-</ul>
-<h3>Homepage</h3>
-<p>Trilium project is maintained in <a href="https://github.com/zadam/trilium">GitHub repository</a> where
-  you can find up to date documentation, source code and you can file issues.</p>

doc/0001-Welcome to Trilium!/0000-Protected notes.html

@@ -1,19 +0,0 @@
-<p>Protected notes are encrypted using AES encryption algorithm where encryption
-  key is generated using Scrypt key derivation function from user entered
-  password.</p>
-<p>&nbsp;</p>
-<p>You can either protect individual notes or whole subtree by right clicking
-  on an item in the tree pane. In such a case it's still a case of all of
-  the notes being encrypted individually. One consequence is that you can
-  still create unprotected notes under protected notes.</p>
-<p>&nbsp;</p>
-<p>In protected notes, only note title and note text are encrypted. All metadata
-  like date of last modification, note structure etc. are not encrypted and
-  can be visible even without entering protected mode.</p>
-<p>&nbsp;</p>
-<p>When you try to perform action which requires protected session (e.g.
-  reading protected notes or making note protected), you'll be asked to enter
-  password. After successful authentication, protected session is established
-  for limited period of time (by default 10 minutes). If protected session
-  is not refreshed during this time, protected session expires and user needs
-  to authenticate again to start new protected session.</p>

doc/0001-Welcome to Trilium!/0001-Note cloning.html

@@ -1,12 +0,0 @@
-Note cloning allows you to "register" single note (and it's subtree) under
-multiple different notes. 
-<p>&nbsp;</p>
-<p>This allows the same note to appear in multiple places in the tree. This
-  is useful when note logically belongs to multiple categories - e.g. in
-  time based structure you can categorize the note for the given date and
-  then separately you might want to put it somewhere else by it's taxonomy.
-  In this sense it works similarly to tags, only more generally and in a
-  tree structure (while tags are typically flat structured).</p>
-<p>&nbsp;</p>
-<p>When note has multiple parents, then technically there isn't any one "original"
-  and "clones", all of the parents are equal.</p>

doc/0001-Welcome to Trilium!/0002-Synchronization.html

@@ -1,3 +0,0 @@
-<p>Trilium supports synchronization between different instances. Typical
-  scenario is when you have web version of Trilium deployed on your server
-  and desktop builds on your personal and work computer (star shaped topology).</p>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -33,8 +33,8 @@
         "object-assign": "4.1.1",
         "source-map": "0.5.7",
         "through": "2.3.8",
-        "vue-hot-reload-api": "2.2.0",
-        "vue-template-compiler": "2.5.3",
+        "vue-hot-reload-api": "2.2.4",
+        "vue-template-compiler": "2.5.13",
         "vue-template-es2015-compiler": "1.6.0"
       }
     },
@@ -222,6 +222,12 @@
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
       "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768="
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
+    },
     "append-field": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz",
@@ -326,13 +332,13 @@
       "dev": true
     },
     "asar": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/asar/-/asar-0.13.0.tgz",
-      "integrity": "sha1-3zPdnQG/+EJGTQ2fCVdA1KYq+xQ=",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.0.tgz",
+      "integrity": "sha512-l21mf5pG65qbtD5WhymthfbE7ash0goQ+5ayo3lIncxtFNYH1PVArqsGXoAUXOd877mJplWSD9nGumByzQqVSA==",
       "dev": true,
       "requires": {
         "chromium-pickle-js": "0.2.0",
-        "commander": "2.11.0",
+        "commander": "2.13.0",
         "cuint": "0.2.2",
         "glob": "6.0.4",
         "minimatch": "3.0.4",
@@ -353,15 +359,6 @@
             "once": "1.4.0",
             "path-is-absolute": "1.0.1"
           }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
         }
       }
     },
@@ -375,6 +372,12 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
+    "async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
     "async-each-series": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-1.1.0.tgz",
@@ -395,6 +398,12 @@
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
+    "author-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz",
+      "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=",
+      "dev": true
+    },
     "autoprefixer": {
       "version": "6.7.7",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
@@ -402,7 +411,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000758",
+        "caniuse-db": "1.0.30000794",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
         "postcss": "5.2.18",
@@ -1076,19 +1085,19 @@
         "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
         "babel-plugin-transform-exponentiation-operator": "6.24.1",
         "babel-plugin-transform-regenerator": "6.26.0",
-        "browserslist": "2.7.0",
+        "browserslist": "2.11.3",
         "invariant": "2.2.2",
         "semver": "5.4.1"
       },
       "dependencies": {
         "browserslist": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.7.0.tgz",
-          "integrity": "sha512-s34mrlczJsfbJu//mz/m9zlOy/S6tiP6El1u8iC1gTfEnzKXvxo8RAoCxS/MmojB7rd7bnfYzvKQNHykWaUWWw==",
+          "version": "2.11.3",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+          "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "1.0.30000758",
-            "electron-to-chromium": "1.3.27"
+            "caniuse-lite": "1.0.30000792",
+            "electron-to-chromium": "1.3.31"
           }
         }
       }
@@ -1155,7 +1164,7 @@
       "dev": true,
       "requires": {
         "core-js": "2.5.1",
-        "regenerator-runtime": "0.11.0"
+        "regenerator-runtime": "0.11.1"
       }
     },
     "babel-template": {
@@ -1504,8 +1513,8 @@
       "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
       "dev": true,
       "requires": {
-        "caniuse-db": "1.0.30000758",
-        "electron-to-chromium": "1.3.27"
+        "caniuse-db": "1.0.30000794",
+        "electron-to-chromium": "1.3.31"
       }
     },
     "btoa": {
@@ -1656,21 +1665,21 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000758",
+        "caniuse-db": "1.0.30000794",
         "lodash.memoize": "4.1.2",
         "lodash.uniq": "4.5.0"
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000758",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000758.tgz",
-      "integrity": "sha1-ojViexki6Hi2MWSULJkbhN6SyBA=",
+      "version": "1.0.30000794",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000794.tgz",
+      "integrity": "sha1-u+cRBPonfOSzYjh9VJBei4jlLzU=",
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30000758",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000758.tgz",
-      "integrity": "sha1-4mEUAHZlEEnPaJHtS8ZJtcjCbGk=",
+      "version": "1.0.30000792",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz",
+      "integrity": "sha1-0M6pgfgRjzlhRxr7tDyaHlu/AzI=",
       "dev": true
     },
     "capture-stack-trace": {
@@ -1947,9 +1956,9 @@
       }
     },
     "commander": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+      "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
       "dev": true
     },
     "compare-version": {
@@ -2755,32 +2764,21 @@
       "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=",
       "dev": true
     },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "dev": true
+    },
     "detective-less": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.0.tgz",
-      "integrity": "sha1-Qmx4yatuMnW/ZsyRq6wAU7tFLX0=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.1.tgz",
+      "integrity": "sha512-xeFzlSFHChKSvDGBg/gL5K7RHB4x/xXk5PmVuOek3tIYi4tZaVpUKIkCDTY1ndOt4FVcgGd51DSn7Y/DYvCqDw==",
       "dev": true,
       "requires": {
-        "debug": "2.2.0",
+        "debug": "3.1.0",
         "gonzales-pe": "3.4.7",
         "node-source-walk": "3.3.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true,
-          "requires": {
-            "ms": "0.7.1"
-          }
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
-          "dev": true
-        }
       }
     },
     "detective-sass": {
@@ -3063,19 +3061,19 @@
       "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo="
     },
     "electron": {
-      "version": "1.8.2-beta.3",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.3.tgz",
-      "integrity": "sha1-Ljkcy9YnaKOzsmC48uPxZHNWeuw=",
+      "version": "1.8.2-beta.4",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.4.tgz",
+      "integrity": "sha1-GDayBO6s6dx3Bi7Ugg/bxsvZoZU=",
       "requires": {
-        "@types/node": "8.0.56",
+        "@types/node": "8.5.9",
         "electron-download": "3.3.0",
         "extract-zip": "1.6.5"
       },
       "dependencies": {
         "@types/node": {
-          "version": "8.0.56",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.56.tgz",
-          "integrity": "sha512-JAlQv3hUWbrnruuTiLDf1scd4F/TBT0LgGEe+BBeF3p/Rc3yL6RV57WJN2nK5i+BshEz1sDllwH0Fzbuo7G4QA=="
+          "version": "8.5.9",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz",
+          "integrity": "sha512-s+c3AjymyAccTI4hcgNFK4mToH8l+hyPDhu4LIkn71lRy56FLijGu00fyLgldjM/846Pmk9N4KFUs2P8GDs0pA=="
         }
       }
     },
@@ -3165,12 +3163,12 @@
         "coffee-script": "1.12.7",
         "cson": "3.0.2",
         "debug": "2.6.9",
-        "detective-less": "1.0.0",
+        "detective-less": "1.0.1",
         "detective-sass": "2.0.1",
         "detective-scss": "1.0.1",
         "detective-stylus": "1.0.0",
         "graphql": "0.9.6",
-        "graphql-tag": "2.5.0",
+        "graphql-tag": "2.6.1",
         "istanbul": "0.4.5",
         "jade": "1.11.0",
         "js-string-escape": "1.0.1",
@@ -3180,12 +3178,12 @@
         "resolve": "1.4.0",
         "rimraf": "2.6.2",
         "sass-lookup": "1.1.0",
-        "sass.js": "0.10.6",
+        "sass.js": "0.10.8",
         "sorcery": "0.10.0",
         "stylus": "0.54.5",
         "stylus-lookup": "1.0.2",
         "toutsuite": "0.6.0",
-        "typescript": "2.6.1"
+        "typescript": "2.6.2"
       },
       "dependencies": {
         "debug": {
@@ -3200,12 +3198,12 @@
       }
     },
     "electron-debug": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/electron-debug/-/electron-debug-1.4.0.tgz",
-      "integrity": "sha1-vscAVSIiCp0GIhUzUuG7/w83ry4=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/electron-debug/-/electron-debug-1.5.0.tgz",
+      "integrity": "sha512-23CLHQXW+gMgdlJbeW1EinPX7DpwuLtfdzSuFL0OnsqEhKGJVJufAZTyq2hc3sr+R53rr3P+mJiYoR5VzAHKJQ==",
       "requires": {
         "electron-is-dev": "0.3.0",
-        "electron-localshortcut": "3.0.2"
+        "electron-localshortcut": "3.1.0"
       }
     },
     "electron-download": {
@@ -3275,13 +3273,13 @@
       "integrity": "sha1-FOb9pcaOnk7L7/nM8DfL18BcWv4="
     },
     "electron-localshortcut": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.0.2.tgz",
-      "integrity": "sha512-s/T06qIlsHeRR3sgJiomKzHlJnJkoRJb5Kj3+HzTKiWXREpWcBObi8LilLRW7GeJCT8cp3h8z4O1WzCRY+TZcQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.1.0.tgz",
+      "integrity": "sha512-MgL/j5jdjW7iA0R6cI7S045B0GlKXWM1FjjujVPjlrmyXRa6yH0bGSaIAfxXAF9tpJm3pLEiQzerYHkRh9JG/A==",
       "requires": {
         "debug": "2.6.9",
         "electron-is-accelerator": "0.1.2",
-        "keyboardevent-from-electron-accelerator": "0.7.1",
+        "keyboardevent-from-electron-accelerator": "1.1.0",
         "keyboardevents-areequal": "0.2.2"
       },
       "dependencies": {
@@ -3296,9 +3294,9 @@
       }
     },
     "electron-osx-sign": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.7.tgz",
-      "integrity": "sha1-HXVkeoJ0jqzUi+pwYW7IP/rePuU=",
+      "version": "0.4.8",
+      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz",
+      "integrity": "sha1-8Ln63e2eHlTsNfqJh3tcbDTHvEA=",
       "dev": true,
       "requires": {
         "bluebird": "3.5.1",
@@ -3327,36 +3325,31 @@
       }
     },
     "electron-packager": {
-      "version": "8.7.2",
-      "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-8.7.2.tgz",
-      "integrity": "sha1-RX078kvJYHwGrUsettqkrMrcIQg=",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-10.1.1.tgz",
+      "integrity": "sha1-MWp/ossf/CYz9YBcn8IJE8vAnZQ=",
       "dev": true,
       "requires": {
-        "asar": "0.13.0",
-        "debug": "2.6.9",
+        "asar": "0.14.0",
+        "debug": "3.1.0",
         "electron-download": "4.1.0",
-        "electron-osx-sign": "0.4.7",
+        "electron-osx-sign": "0.4.8",
         "extract-zip": "1.6.5",
-        "fs-extra": "3.0.1",
+        "fs-extra": "5.0.0",
         "get-package-info": "1.0.0",
-        "minimist": "1.2.0",
+        "mz": "2.7.0",
+        "nodeify": "1.0.1",
+        "parse-author": "2.0.0",
+        "pify": "3.0.0",
         "plist": "2.1.0",
+        "pruner": "0.0.7",
         "rcedit": "0.9.0",
         "resolve": "1.4.0",
-        "run-series": "1.1.4",
         "sanitize-filename": "1.6.1",
-        "semver": "5.4.1"
+        "semver": "5.4.1",
+        "yargs-parser": "8.1.0"
       },
       "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
         "electron-download": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz",
@@ -3374,6 +3367,15 @@
             "sumchecker": "2.0.2"
           },
           "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
             "fs-extra": {
               "version": "2.1.2",
               "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
@@ -3387,20 +3389,20 @@
           }
         },
         "fs-extra": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-          "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
           "dev": true,
           "requires": {
             "graceful-fs": "4.1.11",
-            "jsonfile": "3.0.1",
+            "jsonfile": "4.0.0",
             "universalify": "0.1.1"
           },
           "dependencies": {
             "jsonfile": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-              "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+              "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
               "dev": true,
               "requires": {
                 "graceful-fs": "4.1.11"
@@ -3429,6 +3431,12 @@
           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
           "dev": true
         },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
         "sumchecker": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
@@ -3436,43 +3444,37 @@
           "dev": true,
           "requires": {
             "debug": "2.6.9"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            }
           }
         }
       }
     },
     "electron-prebuilt-compile": {
-      "version": "1.8.2-beta.2",
-      "resolved": "https://registry.npmjs.org/electron-prebuilt-compile/-/electron-prebuilt-compile-1.8.2-beta.2.tgz",
-      "integrity": "sha512-hXOHt+WOLnFPeU3MhRJgP+6QRQbht6MxltTPTurc5539REsvoau455rSXU16SfA/e8BVBUZ9h8NN6dkFwxuowQ==",
+      "version": "1.8.2-beta.4",
+      "resolved": "https://registry.npmjs.org/electron-prebuilt-compile/-/electron-prebuilt-compile-1.8.2-beta.4.tgz",
+      "integrity": "sha512-whVdRgFEDovWSFrAsbMXIiush6RQ8IV3XhYdL59zShck4U1eXGmdkaBCy+2tlkGmUGr0fRu+S4FpUx2ebBkRhQ==",
       "dev": true,
       "requires": {
         "babel-plugin-array-includes": "2.0.3",
         "babel-plugin-transform-async-to-generator": "6.24.1",
         "babel-preset-es2016-node5": "1.1.2",
         "babel-preset-react": "6.24.1",
-        "electron": "1.8.2-beta.2",
+        "electron": "1.8.2-beta.4",
         "electron-compile": "6.4.2",
         "electron-compilers": "5.9.0",
         "yargs": "6.6.0"
       },
       "dependencies": {
-        "@types/node": {
-          "version": "8.0.56",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.56.tgz",
-          "integrity": "sha512-JAlQv3hUWbrnruuTiLDf1scd4F/TBT0LgGEe+BBeF3p/Rc3yL6RV57WJN2nK5i+BshEz1sDllwH0Fzbuo7G4QA==",
-          "dev": true
-        },
-        "electron": {
-          "version": "1.8.2-beta.2",
-          "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.2.tgz",
-          "integrity": "sha1-tTLHEFDd0tSwDi4NNV3k51vB5f0=",
-          "dev": true,
-          "requires": {
-            "@types/node": "8.0.56",
-            "electron-download": "3.3.0",
-            "extract-zip": "1.6.5"
-          }
-        },
         "yargs": {
           "version": "6.6.0",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
@@ -3506,13 +3508,14 @@
       }
     },
     "electron-rebuild": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.6.0.tgz",
-      "integrity": "sha1-6NJvTY6f5TiN81hks2WOXP1Ny34=",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.7.3.tgz",
+      "integrity": "sha1-JK4GrZ3WHLfk1oiWH0kRjEChEOs=",
       "dev": true,
       "requires": {
         "colors": "1.1.2",
         "debug": "2.6.9",
+        "detect-libc": "1.0.3",
         "fs-extra": "3.0.1",
         "node-abi": "2.1.2",
         "node-gyp": "3.6.2",
@@ -3554,9 +3557,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.27",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
-      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
+      "version": "1.3.31",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz",
+      "integrity": "sha512-XE4CLbswkZgZFn34cKFy1xaX+F5LHxeDLjY1+rsK9asDzknhbrd9g/n/01/acbU25KTsUSiLKwvlLyA+6XLUOA==",
       "dev": true
     },
     "encodeurl": {
@@ -3594,13 +3597,13 @@
       "dev": true
     },
     "errno": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
-      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz",
+      "integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==",
       "dev": true,
       "optional": true,
       "requires": {
-        "prr": "0.0.0"
+        "prr": "1.0.1"
       }
     },
     "error-ex": {
@@ -4675,17 +4678,6 @@
         "inherits": "2.0.3",
         "mkdirp": "0.5.1",
         "rimraf": "2.6.2"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        }
       }
     },
     "function-bind": {
@@ -5071,9 +5063,9 @@
       }
     },
     "graphql-tag": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.5.0.tgz",
-      "integrity": "sha1-tDv9i1urzSwgWtaAwD6YsjiTTg8=",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.6.1.tgz",
+      "integrity": "sha1-R4jVCfbilgfZR/xHpAxOGPc200o=",
       "dev": true
     },
     "gulp-decompress": {
@@ -5206,12 +5198,6 @@
         "uglify-js": "2.8.29"
       },
       "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
         "source-map": {
           "version": "0.4.4",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
@@ -6101,12 +6087,6 @@
           "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
           "dev": true
         },
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
         "escodegen": {
           "version": "1.8.1",
           "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
@@ -6246,9 +6226,9 @@
       "integrity": "sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII="
     },
     "js-base64": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
-      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.2.tgz",
+      "integrity": "sha512-lLkz3IRPTNeATsKQGeltbzRK/5+bWsXBHfpZrxJAi4N30RtCtNA+rJznp4uR2+4OgkBsoeeFwONVLr4gzIVErQ==",
       "dev": true
     },
     "js-string-escape": {
@@ -6394,9 +6374,9 @@
       }
     },
     "keyboardevent-from-electron-accelerator": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-0.7.1.tgz",
-      "integrity": "sha512-5pdJoALj0U1GnEqO3NBbSpq5+JuPMOcMC92WTiy8CqaLzIDHfOexRKmJfW+Cho76K+sNMZHz/4T+GLTXDCsGrw=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-1.1.0.tgz",
+      "integrity": "sha512-VDC4vKWGrR3VgIKCE4CsXnvObGgP8C2idnTKEMUkuEuvDGE1GEBX9FtNdJzrD00iQlhI3xFxRaeItsUmlERVng=="
     },
     "keyboardevents-areequal": {
       "version": "0.2.2",
@@ -6462,7 +6442,7 @@
       "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
       "dev": true,
       "requires": {
-        "errno": "0.1.4",
+        "errno": "0.1.6",
         "graceful-fs": "4.1.11",
         "image-size": "0.5.5",
         "mime": "1.4.1",
@@ -7255,6 +7235,17 @@
       "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
       "dev": true
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "requires": {
+        "any-promise": "1.3.0",
+        "object-assign": "4.1.1",
+        "thenify-all": "1.6.0"
+      }
+    },
     "nan": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
@@ -7315,15 +7306,6 @@
         "which": "1.3.0"
       },
       "dependencies": {
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
         "semver": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
@@ -7346,6 +7328,33 @@
       "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
       "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8="
     },
+    "nodeify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz",
+      "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=",
+      "dev": true,
+      "requires": {
+        "is-promise": "1.0.1",
+        "promise": "1.3.0"
+      },
+      "dependencies": {
+        "is-promise": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz",
+          "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=",
+          "dev": true
+        },
+        "promise": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz",
+          "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=",
+          "dev": true,
+          "requires": {
+            "is-promise": "1.0.1"
+          }
+        }
+      }
+    },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -7659,6 +7668,15 @@
         "semver": "5.4.1"
       }
     },
+    "parse-author": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz",
+      "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=",
+      "dev": true,
+      "requires": {
+        "author-regex": "1.0.0"
+      }
+    },
     "parse-bmfont-ascii": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz",
@@ -7940,7 +7958,7 @@
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
-        "js-base64": "2.3.2",
+        "js-base64": "2.4.2",
         "source-map": "0.5.7",
         "supports-color": "3.2.3"
       },
@@ -8327,12 +8345,21 @@
       }
     },
     "prr": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
       "dev": true,
       "optional": true
     },
+    "pruner": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/pruner/-/pruner-0.0.7.tgz",
+      "integrity": "sha1-NF+8s+gHARY6HXrfVrrCKaWh5ME=",
+      "dev": true,
+      "requires": {
+        "fs-extra": "4.0.2"
+      }
+    },
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -8575,9 +8602,9 @@
       "dev": true
     },
     "regenerator-runtime": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
       "dev": true
     },
     "regenerator-transform": {
@@ -8833,12 +8860,6 @@
         "once": "1.4.0"
       }
     },
-    "run-series": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz",
-      "integrity": "sha1-iac93F51ye+KtjIMChYA1qQRebk=",
-      "dev": true
-    },
     "rx-lite": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
@@ -8911,9 +8932,9 @@
       }
     },
     "sass.js": {
-      "version": "0.10.6",
-      "resolved": "https://registry.npmjs.org/sass.js/-/sass.js-0.10.6.tgz",
-      "integrity": "sha512-Yfw6VBfWYg3A9PT7OKnEoNm+E4iBUgQWjiYTwzNvXRkVkVnQEIkUAuzrttZpjgwwCE52wreZwb8rsGioy7t2xw==",
+      "version": "0.10.8",
+      "resolved": "https://registry.npmjs.org/sass.js/-/sass.js-0.10.8.tgz",
+      "integrity": "sha512-HK8+oaOfb5fDpILmKeSG6Cl1Uk7zujsessffLGjSEuzXfM2WCpOxUjfnVu9MuYhPlzYg10Xxv2XXaJyp/y+yug==",
       "dev": true
     },
     "sax": {
@@ -10225,7 +10246,7 @@
       "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=",
       "requires": {
         "debug": "2.6.9",
-        "es6-promise": "4.1.1"
+        "es6-promise": "4.2.4"
       },
       "dependencies": {
         "debug": {
@@ -10237,9 +10258,9 @@
           }
         },
         "es6-promise": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz",
-          "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng=="
+          "version": "4.2.4",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
+          "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="
         }
       }
     },
@@ -10457,6 +10478,24 @@
       "integrity": "sha1-AIRwUAVzDdhNt1UlPJMa45jblSI=",
       "dev": true
     },
+    "thenify": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
+      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
+      "dev": true,
+      "requires": {
+        "any-promise": "1.3.0"
+      }
+    },
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
+      "requires": {
+        "thenify": "3.3.0"
+      }
+    },
     "throttleit": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
@@ -10773,9 +10812,9 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "typescript": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz",
-      "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
+      "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
       "dev": true
     },
     "uglify-js": {
@@ -11122,15 +11161,15 @@
       "dev": true
     },
     "vue-hot-reload-api": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz",
-      "integrity": "sha512-Hn0jdFiNfNx4+Nxz1vokYUsP3mwpn9r/XomLrXA+KafYaiR7LNQG1fxtpVklD4KxD5GluXRiSoWNDf0H9BdsJw==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz",
+      "integrity": "sha512-e+ThJMYmZg4D9UnrLcr6LQxGu6YlcxkrmZGPCyIN4malcNhdeGGKxmFuM5y6ICMJJxQywLfT8MM1rYZr4LpeLw==",
       "dev": true
     },
     "vue-template-compiler": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.3.tgz",
-      "integrity": "sha512-C7yWPyT8ZPyXv9AL1eZEZSp72qDHGSgfD80Rf2A9s2vKmMbUuRInfsDsOfYtoiN2hK4hMGMQ71xaZs2e8RnucQ==",
+      "version": "2.5.13",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz",
+      "integrity": "sha512-15HWSgIxrGUcV0v7QRen2Y3fQsbgxXwMvjT/5XKMO0ANmaCcNh7y2OeIDTAuSGeosjb9+E1Pn2PHZ61VQWEgBQ==",
       "dev": true,
       "requires": {
         "de-indent": "1.0.2",
@@ -11642,15 +11681,34 @@
         "which-module": "1.0.0",
         "y18n": "3.2.1",
         "yargs-parser": "5.0.0"
+      },
+      "dependencies": {
+        "yargs-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0"
+          }
+        }
       }
     },
     "yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
+      "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
       "dev": true,
       "requires": {
-        "camelcase": "3.0.0"
+        "camelcase": "4.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        }
       }
     },
     "yauzl": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "trilium",
   "description": "Trilium Notes",
-  "version": "0.4.1",
+  "version": "0.5.1-beta",
   "license": "AGPL-3.0-only",
   "repository": {
     "type": "git",
@@ -11,8 +11,8 @@
     "start": "node ./bin/www",
     "test-electron": "xo",
     "rebuild-electron": "electron-rebuild",
-    "start-electron": "electron .",
-    "build-electron": "electron-packager . --out=dist --asar --overwrite --all",
+    "start-electron": "electron src/electron",
+    "build-electron": "electron-packager src/electron --out=dist --asar --overwrite --all",
     "start-forge": "electron-forge start",
     "package-forge": "electron-forge package",
     "make-forge": "electron-forge make",
@@ -26,8 +26,8 @@
     "debug": "~3.1.0",
     "devtron": "^1.4.0",
     "ejs": "~2.5.7",
-    "electron": "^1.8.2-beta.3",
-    "electron-debug": "^1.0.0",
+    "electron": "^1.8.2-beta.4",
+    "electron-debug": "^1.5.0",
     "electron-in-page-search": "^1.2.4",
     "express": "~4.16.2",
     "express-promise-wrap": "^0.2.2",
@@ -59,9 +59,9 @@
   },
   "devDependencies": {
     "electron-compile": "^6.4.2",
-    "electron-packager": "^8.0.0",
-    "electron-prebuilt-compile": "1.8.2-beta.2",
-    "electron-rebuild": "^1.6.0",
+    "electron-packager": "^10.1.1",
+    "electron-prebuilt-compile": "1.8.2-beta.4",
+    "electron-rebuild": "^1.7.3",
     "tape": "^4.8.0",
     "xo": "^0.18.0"
   },

public/javascripts/note_editor.js

@@ -1,184 +0,0 @@
-"use strict";
-
-const noteEditor = (function() {
-    const noteTitleEl = $("#note-title");
-    const noteDetailEl = $('#note-detail');
-    const protectButton = $("#protect-button");
-    const unprotectButton = $("#unprotect-button");
-    const noteDetailWrapperEl = $("#note-detail-wrapper");
-    const noteIdDisplayEl = $("#note-id-display");
-
-    let editor = null;
-
-    let currentNote = null;
-
-    let noteChangeDisabled = false;
-
-    let isNoteChanged = false;
-
-    function getCurrentNote() {
-        return currentNote;
-    }
-
-    function getCurrentNoteId() {
-        return currentNote ? currentNote.detail.note_id : null;
-    }
-
-    function noteChanged() {
-        if (noteChangeDisabled) {
-            return;
-        }
-
-        isNoteChanged = true;
-    }
-
-    async function reload() {
-        // no saving here
-
-        await loadNoteToEditor(getCurrentNoteId());
-    }
-
-    async function switchToNote(noteId) {
-        if (getCurrentNoteId() !== noteId) {
-            await saveNoteIfChanged();
-
-            await loadNoteToEditor(noteId);
-        }
-    }
-
-    async function saveNoteIfChanged() {
-        if (!isNoteChanged) {
-            return;
-        }
-
-        const note = noteEditor.getCurrentNote();
-
-        updateNoteFromInputs(note);
-
-        await saveNoteToServer(note);
-
-        if (note.detail.is_protected) {
-            protected_session.touchProtectedSession();
-        }
-    }
-
-    function updateNoteFromInputs(note) {
-        note.detail.note_text = editor.getData();
-
-        const title = noteTitleEl.val();
-
-        note.detail.note_title = title;
-
-        noteTree.setNoteTitle(note.detail.note_id, title);
-    }
-
-    async function saveNoteToServer(note) {
-        await server.put('notes/' + note.detail.note_id, note);
-
-        isNoteChanged = false;
-
-        showMessage("Saved!");
-    }
-
-    function setNoteBackgroundIfProtected(note) {
-        const isProtected = !!note.detail.is_protected;
-
-        noteDetailWrapperEl.toggleClass("protected", isProtected);
-        protectButton.toggle(!isProtected);
-        unprotectButton.toggle(isProtected);
-    }
-
-    let isNewNoteCreated = false;
-
-    function newNoteCreated() {
-        isNewNoteCreated = true;
-    }
-
-    async function loadNoteToEditor(noteId) {
-        currentNote = await loadNote(noteId);
-
-        if (isNewNoteCreated) {
-            isNewNoteCreated = false;
-
-            noteTitleEl.focus().select();
-        }
-
-        noteIdDisplayEl.html(noteId);
-
-        await protected_session.ensureProtectedSession(currentNote.detail.is_protected, false);
-
-        if (currentNote.detail.is_protected) {
-            protected_session.touchProtectedSession();
-        }
-
-        // this might be important if we focused on protected note when not in protected note and we got a dialog
-        // to login, but we chose instead to come to another node - at that point the dialog is still visible and this will close it.
-        protected_session.ensureDialogIsClosed();
-
-        noteDetailWrapperEl.show();
-
-        noteChangeDisabled = true;
-
-        noteTitleEl.val(currentNote.detail.note_title);
-
-        // temporary workaround for https://github.com/ckeditor/ckeditor5-enter/issues/49
-        editor.setData(currentNote.detail.note_text ? currentNote.detail.note_text : "<p></p>");
-
-        noteChangeDisabled = false;
-
-        setNoteBackgroundIfProtected(currentNote);
-        noteTree.setNoteTreeBackgroundBasedOnProtectedStatus(noteId);
-
-        // after loading new note make sure editor is scrolled to the top
-        noteDetailWrapperEl.scrollTop(0);
-    }
-
-    async function loadNote(noteId) {
-        return await server.get('notes/' + noteId);
-    }
-
-    function getEditor() {
-        return editor;
-    }
-
-    $(document).ready(() => {
-        noteTitleEl.on('input', () => {
-            noteChanged();
-
-            const title = noteTitleEl.val();
-
-            noteTree.setNoteTitle(getCurrentNoteId(), title);
-        });
-
-        BalloonEditor
-            .create(document.querySelector('#note-detail'), {
-            })
-            .then(edit => {
-                editor = edit;
-
-                editor.document.on('change', noteChanged);
-            })
-            .catch(error => {
-                console.error(error);
-            });
-
-        // so that tab jumps from note title (which has tabindex 1)
-        noteDetailEl.attr("tabindex", 2);
-    });
-
-    setInterval(saveNoteIfChanged, 5000);
-
-    return {
-        reload,
-        switchToNote,
-        saveNoteIfChanged,
-        updateNoteFromInputs,
-        saveNoteToServer,
-        setNoteBackgroundIfProtected,
-        loadNote,
-        getCurrentNote,
-        getCurrentNoteId,
-        newNoteCreated,
-        getEditor
-    };
-})();

routes/api/note_history.js

@@ -1,40 +0,0 @@
-"use strict";
-
-const express = require('express');
-const router = express.Router();
-const sql = require('../../services/sql');
-const auth = require('../../services/auth');
-const data_encryption = require('../../services/data_encryption');
-const protected_session = require('../../services/protected_session');
-const sync_table = require('../../services/sync_table');
-const wrap = require('express-promise-wrap').wrap;
-
-router.get('/:noteId', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const noteId = req.params.noteId;
-    const history = await sql.getAll("SELECT * FROM notes_history WHERE note_id = ? order by date_modified_to desc", [noteId]);
-
-    const dataKey = protected_session.getDataKey(req);
-
-    for (const hist of history) {
-        if (hist.is_protected) {
-            hist.note_title = data_encryption.decryptString(dataKey, data_encryption.noteTitleIv(hist.note_history_id), hist.note_title);
-            hist.note_text = data_encryption.decryptString(dataKey, data_encryption.noteTextIv(hist.note_history_id), hist.note_text);
-        }
-    }
-
-    res.send(history);
-}));
-
-router.put('', auth.checkApiAuth, wrap(async (req, res, next) => {
-    const sourceId = req.headers.source_id;
-
-    await sql.doInTransaction(async () => {
-        await sql.replace("notes_history", req.body);
-
-        await sync_table.addNoteHistorySync(req.body.note_history_id, sourceId);
-    });
-
-    res.send();
-}));
-
-module.exports = router;

services/attributes.js

@@ -1,31 +0,0 @@
-"use strict";
-
-const sql = require('./sql');
-const utils = require('./utils');
-const sync_table = require('./sync_table');
-
-async function getNoteIdWithAttribute(name, value) {
-    return await sql.getFirstValue(`SELECT notes.note_id FROM notes JOIN attributes USING(note_id) 
-          WHERE notes.is_deleted = 0 AND attributes.name = ? AND attributes.value = ?`, [name, value]);
-}
-
-async function createAttribute(noteId, name, value = null, sourceId = null) {
-    const now = utils.nowDate();
-    const attributeId = utils.newAttributeId();
-
-    await sql.insert("attributes", {
-        attribute_id: attributeId,
-        note_id: noteId,
-        name: name,
-        value: value,
-        date_modified: now,
-        date_created: now
-    });
-
-    await sync_table.addAttributeSync(attributeId, sourceId);
-}
-
-module.exports = {
-    getNoteIdWithAttribute,
-    createAttribute
-};

services/content_hash.js

@@ -1,106 +0,0 @@
-const sql = require('./sql');
-const utils = require('./utils');
-const options = require('./options');
-const log = require('./log');
-
-function getHash(rows) {
-    let hash = '';
-
-    for (const row of rows) {
-        hash = utils.hash(hash + JSON.stringify(row));
-    }
-
-    return hash;
-}
-
-async function getHashes() {
-    const startTime = new Date();
-
-    const hashes = {
-        notes: getHash(await sql.getAll(`
-            SELECT
-              note_id,
-              note_title,
-              note_text,
-              date_modified,
-              is_protected,
-              is_deleted
-            FROM notes
-            ORDER BY note_id`)),
-
-        notes_tree: getHash(await sql.getAll(`
-            SELECT
-               note_tree_id,
-               note_id,
-               parent_note_id,
-               note_position,
-               date_modified,
-               is_deleted,
-               prefix
-             FROM notes_tree
-             ORDER BY note_tree_id`)),
-
-        notes_history: getHash(await sql.getAll(`
-            SELECT
-              note_history_id,
-              note_id,
-              note_title,
-              note_text,
-              date_modified_from,
-              date_modified_to
-            FROM notes_history
-            ORDER BY note_history_id`)),
-
-        recent_notes: getHash(await sql.getAll(`
-           SELECT
-             note_tree_id,
-             note_path,
-             date_accessed,
-             is_deleted
-           FROM recent_notes
-           ORDER BY note_path`)),
-
-        options: getHash(await sql.getAll(`
-           SELECT 
-             opt_name,
-             opt_value 
-           FROM options 
-           WHERE is_synced = 1
-           ORDER BY opt_name`)),
-
-        // we don't include image data on purpose because they are quite large, checksum is good enough
-        // to represent the data anyway
-        images: getHash(await sql.getAll(`
-          SELECT 
-            image_id,
-            format,
-            checksum,
-            name,
-            is_deleted,
-            date_modified,
-            date_created
-          FROM images  
-          ORDER BY image_id`)),
-
-        attributes: getHash(await sql.getAll(`
-          SELECT 
-            attribute_id,
-            note_id
-            name,
-            value
-            date_modified,
-            date_created
-          FROM attributes  
-          ORDER BY attribute_id`))
-    };
-
-    const elapseTimeMs = new Date().getTime() - startTime.getTime();
-
-    log.info(`Content hash computation took ${elapseTimeMs}ms`);
-
-    return hashes;
-}
-
-module.exports = {
-    getHashes
-};

services/notes.js

@@ -1,278 +0,0 @@
-const sql = require('./sql');
-const options = require('./options');
-const utils = require('./utils');
-const notes = require('./notes');
-const data_encryption = require('./data_encryption');
-const sync_table = require('./sync_table');
-
-async function createNewNote(parentNoteId, note, sourceId) {
-    const noteId = utils.newNoteId();
-    const noteTreeId = utils.newNoteTreeId();
-
-    let newNotePos = 0;
-
-    await sql.doInTransaction(async () => {
-        if (note.target === 'into') {
-            const maxNotePos = await sql.getFirstValue('SELECT MAX(note_position) FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0', [parentNoteId]);
-
-            newNotePos = maxNotePos === null ? 0 : maxNotePos + 1;
-        }
-        else if (note.target === 'after') {
-            const afterNote = await sql.getFirst('SELECT note_position FROM notes_tree WHERE note_tree_id = ?', [note.target_note_tree_id]);
-
-            newNotePos = afterNote.note_position + 1;
-
-            // not updating date_modified to avoig having to sync whole rows
-            await sql.execute('UPDATE notes_tree SET note_position = note_position + 1 WHERE parent_note_id = ? AND note_position > ? AND is_deleted = 0',
-                [parentNoteId, afterNote.note_position]);
-
-            await sync_table.addNoteReorderingSync(parentNoteId, sourceId);
-        }
-        else {
-            throw new Error('Unknown target: ' + note.target);
-        }
-
-        const now = utils.nowDate();
-
-        await sql.insert("notes", {
-            note_id: noteId,
-            note_title: note.note_title,
-            note_text: note.note_text ? note.note_text : '',
-            date_created: now,
-            date_modified: now,
-            is_protected: note.is_protected
-        });
-
-        await sync_table.addNoteSync(noteId, sourceId);
-
-        await sql.insert("notes_tree", {
-            note_tree_id: noteTreeId,
-            note_id: noteId,
-            parent_note_id: parentNoteId,
-            note_position: newNotePos,
-            is_expanded: 0,
-            date_modified: now,
-            is_deleted: 0
-        });
-
-        await sync_table.addNoteTreeSync(noteTreeId, sourceId);
-    });
-
-    return {
-        noteId,
-        noteTreeId
-    };
-}
-
-async function encryptNote(note, dataKey) {
-    note.detail.note_title = data_encryption.encrypt(dataKey, data_encryption.noteTitleIv(note.detail.note_id), note.detail.note_title);
-    note.detail.note_text = data_encryption.encrypt(dataKey, data_encryption.noteTextIv(note.detail.note_id), note.detail.note_text);
-}
-
-async function protectNoteRecursively(noteId, dataKey, protect, sourceId) {
-    const note = await sql.getFirst("SELECT * FROM notes WHERE note_id = ?", [noteId]);
-
-    await protectNote(note, dataKey, protect, sourceId);
-
-    const children = await sql.getFirstColumn("SELECT note_id FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0", [noteId]);
-
-    for (const childNoteId of children) {
-        await protectNoteRecursively(childNoteId, dataKey, protect, sourceId);
-    }
-}
-
-function decryptNote(note, dataKey) {
-    note.note_title = data_encryption.decryptString(dataKey, data_encryption.noteTitleIv(note.note_id), note.note_title);
-    note.note_text = data_encryption.decryptString(dataKey, data_encryption.noteTextIv(note.note_id), note.note_text);
-    note.is_protected = false;
-}
-
-async function protectNote(note, dataKey, protect, sourceId) {
-    let changed = false;
-
-    if (protect && !note.is_protected) {
-        note.note_title = data_encryption.encrypt(dataKey, data_encryption.noteTitleIv(note.note_id), note.note_title);
-        note.note_text = data_encryption.encrypt(dataKey, data_encryption.noteTextIv(note.note_id), note.note_text);
-        note.is_protected = true;
-
-        changed = true;
-    }
-    else if (!protect && note.is_protected) {
-        decryptNote(note, dataKey);
-
-        changed = true;
-    }
-
-    if (changed) {
-        await sql.execute("UPDATE notes SET note_title = ?, note_text = ?, is_protected = ? WHERE note_id = ?",
-            [note.note_title, note.note_text, note.is_protected, note.note_id]);
-
-        await sync_table.addNoteSync(note.note_id, sourceId);
-    }
-
-    await protectNoteHistory(note.note_id, dataKey, protect, sourceId);
-}
-
-async function protectNoteHistory(noteId, dataKey, protect, sourceId) {
-    const historyToChange = await sql.getAll("SELECT * FROM notes_history WHERE note_id = ? AND is_protected != ?", [noteId, protect]);
-
-    for (const history of historyToChange) {
-        if (protect) {
-            history.note_title = data_encryption.encrypt(dataKey, data_encryption.noteTitleIv(history.note_history_id), history.note_title);
-            history.note_text = data_encryption.encrypt(dataKey, data_encryption.noteTextIv(history.note_history_id), history.note_text);
-            history.is_protected = true;
-        }
-        else {
-            history.note_title = data_encryption.decryptString(dataKey, data_encryption.noteTitleIv(history.note_history_id), history.note_title);
-            history.note_text = data_encryption.decryptString(dataKey, data_encryption.noteTextIv(history.note_history_id), history.note_text);
-            history.is_protected = false;
-        }
-
-        await sql.execute("UPDATE notes_history SET note_title = ?, note_text = ?, is_protected = ? WHERE note_history_id = ?",
-            [history.note_title, history.note_text, history.is_protected, history.note_history_id]);
-
-        await sync_table.addNoteHistorySync(history.note_history_id, sourceId);
-    }
-}
-
-async function saveNoteHistory(noteId, dataKey, sourceId, nowStr) {
-    const oldNote = await sql.getFirst("SELECT * FROM notes WHERE note_id = ?", [noteId]);
-
-    if (oldNote.is_protected) {
-        decryptNote(oldNote, dataKey);
-    }
-
-    const newNoteHistoryId = utils.newNoteHistoryId();
-
-    await sql.insert('notes_history', {
-        note_history_id: newNoteHistoryId,
-        note_id: noteId,
-        // title and text should be decrypted now
-        note_title: oldNote.note_title,
-        note_text: oldNote.note_text,
-        is_protected: 0, // will be fixed in the protectNoteHistory() call
-        date_modified_from: oldNote.date_modified,
-        date_modified_to: nowStr
-    });
-
-    await sync_table.addNoteHistorySync(newNoteHistoryId, sourceId);
-}
-
-async function saveNoteImages(noteId, noteText, sourceId) {
-    const existingNoteImages = await sql.getAll("SELECT * FROM notes_image WHERE note_id = ?", [noteId]);
-    const foundImageIds = [];
-    const now = utils.nowDate();
-    const re = /src="\/api\/images\/([a-zA-Z0-9]+)\//g;
-    let match;
-
-    while (match = re.exec(noteText)) {
-        const imageId = match[1];
-        const existingNoteImage = existingNoteImages.find(ni => ni.image_id === imageId);
-
-        if (!existingNoteImage) {
-            const noteImageId = utils.newNoteImageId();
-
-            await sql.insert("notes_image", {
-                note_image_id: noteImageId,
-                note_id: noteId,
-                image_id: imageId,
-                is_deleted: 0,
-                date_modified: now,
-                date_created: now
-            });
-
-            await sync_table.addNoteImageSync(noteImageId, sourceId);
-        }
-        else if (existingNoteImage.is_deleted) {
-            await sql.execute("UPDATE notes_image SET is_deleted = 0, date_modified = ? WHERE note_image_id = ?",
-                [now, existingNoteImage.note_image_id]);
-
-            await sync_table.addNoteImageSync(existingNoteImage.note_image_id, sourceId);
-        }
-        // else we don't need to do anything
-
-        foundImageIds.push(imageId);
-    }
-
-    // marking note images as deleted if they are not present on the page anymore
-    const unusedNoteImages = existingNoteImages.filter(ni => !foundImageIds.includes(ni.image_id));
-
-    for (const unusedNoteImage of unusedNoteImages) {
-        await sql.execute("UPDATE notes_image SET is_deleted = 1, date_modified = ? WHERE note_image_id = ?",
-            [now, unusedNoteImage.note_image_id]);
-
-        await sync_table.addNoteImageSync(unusedNoteImage.note_image_id, sourceId);
-    }
-}
-
-async function updateNote(noteId, newNote, dataKey, sourceId) {
-    if (newNote.detail.is_protected) {
-        await encryptNote(newNote, dataKey);
-    }
-
-    const now = new Date();
-    const nowStr = utils.nowDate();
-
-    const historySnapshotTimeInterval = parseInt(await options.getOption('history_snapshot_time_interval'));
-
-    const historyCutoff = utils.dateStr(new Date(now.getTime() - historySnapshotTimeInterval * 1000));
-
-    const existingNoteHistoryId = await sql.getFirstValue(
-        "SELECT note_history_id FROM notes_history WHERE note_id = ? AND date_modified_to >= ?", [noteId, historyCutoff]);
-
-    await sql.doInTransaction(async () => {
-        const msSinceDateCreated = now.getTime() - utils.parseDate(newNote.detail.date_created).getTime();
-
-        if (!existingNoteHistoryId && msSinceDateCreated >= historySnapshotTimeInterval * 1000) {
-            await saveNoteHistory(noteId, dataKey, sourceId, nowStr);
-        }
-
-        await saveNoteImages(noteId, newNote.detail.note_text, sourceId);
-
-        await protectNoteHistory(noteId, dataKey, newNote.detail.is_protected);
-
-        await sql.execute("UPDATE notes SET note_title = ?, note_text = ?, is_protected = ?, date_modified = ? WHERE note_id = ?", [
-            newNote.detail.note_title,
-            newNote.detail.note_text,
-            newNote.detail.is_protected,
-            nowStr,
-            noteId]);
-
-        await sync_table.addNoteSync(noteId, sourceId);
-    });
-}
-
-async function deleteNote(noteTreeId, sourceId) {
-    const noteTree = await sql.getFirstOrNull("SELECT * FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
-
-    if (!noteTree || noteTree.is_deleted === 1) {
-        return;
-    }
-
-    const now = utils.nowDate();
-
-    await sql.execute("UPDATE notes_tree SET is_deleted = 1, date_modified = ? WHERE note_tree_id = ?", [now, noteTreeId]);
-    await sync_table.addNoteTreeSync(noteTreeId, sourceId);
-
-    const noteId = await sql.getFirstValue("SELECT note_id FROM notes_tree WHERE note_tree_id = ?", [noteTreeId]);
-
-    const notDeletedNoteTreesCount = await sql.getFirstValue("SELECT COUNT(*) FROM notes_tree WHERE note_id = ? AND is_deleted = 0", [noteId]);
-
-    if (!notDeletedNoteTreesCount) {
-        await sql.execute("UPDATE notes SET is_deleted = 1, date_modified = ? WHERE note_id = ?", [now, noteId]);
-        await sync_table.addNoteSync(noteId, sourceId);
-
-        const children = await sql.getAll("SELECT note_tree_id FROM notes_tree WHERE parent_note_id = ? AND is_deleted = 0", [noteId]);
-
-        for (const child of children) {
-            await deleteNote(child.note_tree_id, sourceId);
-        }
-    }
-}
-
-module.exports = {
-    createNewNote,
-    updateNote,
-    deleteNote,
-    protectNoteRecursively
-};

services/options.js

@@ -1,75 +0,0 @@
-const sql = require('./sql');
-const utils = require('./utils');
-const sync_table = require('./sync_table');
-const app_info = require('./app_info');
-
-async function getOptionOrNull(optName) {
-    return await sql.getFirstOrNull("SELECT opt_value FROM options WHERE opt_name = ?", [optName]);
-}
-
-async function getOption(optName) {
-    const row = await getOptionOrNull(optName);
-
-    if (!row) {
-        throw new Error("Option " + optName + " doesn't exist");
-    }
-
-    return row['opt_value'];
-}
-
-async function setOption(optName, optValue, sourceId = null) {
-    const opt = await sql.getFirst("SELECT * FROM options WHERE opt_name = ?", [optName]);
-
-    if (!opt) {
-        throw new Error(`Option ${optName} doesn't exist`);
-    }
-
-    if (opt.is_synced) {
-        await sync_table.addOptionsSync(optName, sourceId);
-    }
-
-    await sql.execute("UPDATE options SET opt_value = ?, date_modified = ? WHERE opt_name = ?",
-        [optValue, utils.nowDate(), optName]);
-}
-
-async function createOption(optName, optValue, isSynced, sourceId = null) {
-    await sql.insert("options", {
-        opt_name: optName,
-        opt_value: optValue,
-        is_synced: isSynced,
-        date_modified: utils.nowDate()
-    });
-
-    if (isSynced) {
-        await sync_table.addOptionsSync(optName, sourceId);
-    }
-}
-
-async function initOptions(startNotePath) {
-    await createOption('document_id', utils.randomSecureToken(16), false);
-    await createOption('document_secret', utils.randomSecureToken(16), false);
-
-    await createOption('username', '', true);
-    await createOption('password_verification_hash', '', true);
-    await createOption('password_verification_salt', '', true);
-    await createOption('password_derived_key_salt', '', true);
-    await createOption('encrypted_data_key', '', true);
-    await createOption('encrypted_data_key_iv', '', true);
-
-    await createOption('start_note_path', startNotePath, false);
-    await createOption('protected_session_timeout', 600, true);
-    await createOption('history_snapshot_time_interval', 600, true);
-    await createOption('last_backup_date', utils.nowDate(), false);
-    await createOption('db_version', app_info.db_version, false);
-
-    await createOption('last_synced_pull', app_info.db_version, false);
-    await createOption('last_synced_push', 0, false);
-}
-
-module.exports = {
-    getOption,
-    getOptionOrNull,
-    setOption,
-    initOptions,
-    createOption
-};

services/protected_session.js

@@ -1,38 +0,0 @@
-"use strict";
-
-const utils = require('./utils');
-const session = {};
-
-function setDataKey(req, decryptedDataKey) {
-    session.decryptedDataKey = Array.from(decryptedDataKey); // can't store buffer in session
-    session.protectedSessionId = utils.randomSecureToken(32);
-
-    return session.protectedSessionId;
-}
-
-function getProtectedSessionId(req) {
-    return req.headers.protected_session_id;
-}
-
-function getDataKey(req) {
-    const protectedSessionId = getProtectedSessionId(req);
-
-    if (protectedSessionId && session.protectedSessionId === protectedSessionId) {
-        return session.decryptedDataKey;
-    }
-    else {
-        return null;
-    }
-}
-
-function isProtectedSessionAvailable(req) {
-    const protectedSessionId = getProtectedSessionId(req);
-
-    return protectedSessionId && session.protectedSessionId === protectedSessionId;
-}
-
-module.exports = {
-    setDataKey,
-    getDataKey,
-    isProtectedSessionAvailable
-};

services/sync_update.js

@@ -1,150 +0,0 @@
-const sql = require('./sql');
-const log = require('./log');
-const eventLog = require('./event_log');
-const notes = require('./notes');
-const sync_table = require('./sync_table');
-
-async function updateNote(entity, sourceId) {
-    const origNote = await sql.getFirst("SELECT * FROM notes WHERE note_id = ?", [entity.note_id]);
-
-    if (!origNote || origNote.date_modified <= entity.date_modified) {
-        await sql.doInTransaction(async () => {
-            await sql.replace("notes", entity);
-
-            await sync_table.addNoteSync(entity.note_id, sourceId);
-            await eventLog.addNoteEvent(entity.note_id, "Synced note <note>");
-        });
-
-        log.info("Update/sync note " + entity.note_id);
-    }
-}
-
-async function updateNoteTree(entity, sourceId) {
-    const orig = await sql.getFirstOrNull("SELECT * FROM notes_tree WHERE note_tree_id = ?", [entity.note_tree_id]);
-
-    await sql.doInTransaction(async () => {
-        if (orig === null || orig.date_modified < entity.date_modified) {
-            delete entity.is_expanded;
-
-            await sql.replace('notes_tree', entity);
-
-            await sync_table.addNoteTreeSync(entity.note_tree_id, sourceId);
-
-            log.info("Update/sync note tree " + entity.note_tree_id);
-        }
-    });
-}
-
-async function updateNoteHistory(entity, sourceId) {
-    const orig = await sql.getFirstOrNull("SELECT * FROM notes_history WHERE note_history_id = ?", [entity.note_history_id]);
-
-    await sql.doInTransaction(async () => {
-        // we update note history even if date modified to is the same because the only thing which might have changed
-        // is the protected status (and correnspondingly note_title and note_text) which doesn't affect the date_modified_to
-        if (orig === null || orig.date_modified_to <= entity.date_modified_to) {
-            await sql.replace('notes_history', entity);
-
-            await sync_table.addNoteHistorySync(entity.note_history_id, sourceId);
-
-            log.info("Update/sync note history " + entity.note_history_id);
-        }
-    });
-}
-
-async function updateNoteReordering(entity, sourceId) {
-    await sql.doInTransaction(async () => {
-        Object.keys(entity.ordering).forEach(async key => {
-            await sql.execute("UPDATE notes_tree SET note_position = ? WHERE note_tree_id = ?", [entity.ordering[key], key]);
-        });
-
-        await sync_table.addNoteReorderingSync(entity.parent_note_id, sourceId);
-    });
-}
-
-async function updateOptions(entity, sourceId) {
-    const orig = await sql.getFirstOrNull("SELECT * FROM options WHERE opt_name = ?", [entity.opt_name]);
-
-    if (!orig.is_synced) {
-        return;
-    }
-
-    await sql.doInTransaction(async () => {
-        if (orig === null || orig.date_modified < entity.date_modified) {
-            await sql.replace('options', entity);
-
-            await sync_table.addOptionsSync(entity.opt_name, sourceId);
-
-            await eventLog.addEvent("Synced option " + entity.opt_name);
-        }
-    });
-}
-
-async function updateRecentNotes(entity, sourceId) {
-    const orig = await sql.getFirstOrNull("SELECT * FROM recent_notes WHERE note_tree_id = ?", [entity.note_tree_id]);
-
-    if (orig === null || orig.date_accessed < entity.date_accessed) {
-        await sql.doInTransaction(async () => {
-            await sql.replace('recent_notes', entity);
-
-            await sync_table.addRecentNoteSync(entity.note_tree_id, sourceId);
-        });
-    }
-}
-
-async function updateImage(entity, sourceId) {
-    if (entity.data !== null) {
-        entity.data = Buffer.from(entity.data, 'base64');
-    }
-
-    const origImage = await sql.getFirst("SELECT * FROM images WHERE image_id = ?", [entity.image_id]);
-
-    if (!origImage || origImage.date_modified <= entity.date_modified) {
-        await sql.doInTransaction(async () => {
-            await sql.replace("images", entity);
-
-            await sync_table.addImageSync(entity.image_id, sourceId);
-        });
-
-        log.info("Update/sync image " + entity.image_id);
-    }
-}
-
-async function updateNoteImage(entity, sourceId) {
-    const origNoteImage = await sql.getFirst("SELECT * FROM notes_image WHERE note_image_id = ?", [entity.note_image_id]);
-
-    if (!origNoteImage || origNoteImage.date_modified <= entity.date_modified) {
-        await sql.doInTransaction(async () => {
-            await sql.replace("notes_image", entity);
-
-            await sync_table.addNoteImageSync(entity.note_image_id, sourceId);
-        });
-
-        log.info("Update/sync note image " + entity.note_image_id);
-    }
-}
-
-async function updateAttribute(entity, sourceId) {
-    const origAttribute = await sql.getFirst("SELECT * FROM attributes WHERE attribute_id = ?", [entity.attribute_id]);
-
-    if (!origAttribute || origAttribute.date_modified <= entity.date_modified) {
-        await sql.doInTransaction(async () => {
-            await sql.replace("attributes", entity);
-
-            await sync_table.addAttributeSync(entity.attribute_id, sourceId);
-        });
-
-        log.info("Update/sync attribute " + entity.attribute_id);
-    }
-}
-
-module.exports = {
-    updateNote,
-    updateNoteTree,
-    updateNoteHistory,
-    updateNoteReordering,
-    updateOptions,
-    updateRecentNotes,
-    updateImage,
-    updateNoteImage,
-    updateAttribute
-};

src/app.js

@@ -56,7 +56,7 @@ app.use((req, res, next) => {
 
 // error handler
 app.use((err, req, res, next) => {
-    log.error(err.message);
+    log.info(err);
 
     res.status(err.status || 500);
     res.send({

src/electron.js

@@ -1,4 +1,5 @@
 'use strict';
+
 const electron = require('electron');
 const path = require('path');
 const config = require('./services/config');
@@ -68,4 +69,4 @@ app.on('ready', () => {
     mainWindow = createMainWindow();
 });
 
-require('./bin/www');
+require('./www');

src/entities/attribute.js

@@ -0,0 +1,14 @@
+"use strict";
+
+const Entity = require('./entity');
+
+class Attribute extends Entity {
+    static get tableName() { return "attributes"; }
+    static get primaryKeyName() { return "attributeId"; }
+
+    async getNote() {
+        return this.repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+    }
+}
+
+module.exports = Attribute;

src/entities/entity.js

@@ -0,0 +1,17 @@
+"use strict";
+
+const utils = require('../services/utils');
+
+class Entity {
+    constructor(repository, row) {
+        utils.assertArguments(repository, row);
+
+        this.repository = repository;
+
+        for (const key in row) {
+            this[key] = row[key];
+        }
+    }
+}
+
+module.exports = Entity;

src/entities/note.js

@@ -0,0 +1,51 @@
+"use strict";
+
+const Entity = require('./entity');
+const protected_session = require('../services/protected_session');
+
+class Note extends Entity {
+    static get tableName() { return "notes"; }
+    static get primaryKeyName() { return "noteId"; }
+
+    constructor(repository, row) {
+        super(repository, row);
+
+        if (this.isProtected) {
+            protected_session.decryptNote(this.dataKey, this);
+        }
+
+        if (this.isJson()) {
+            this.jsonContent = JSON.parse(this.content);
+        }
+    }
+
+    isJson() {
+        return this.type === "code" && this.mime === "application/json";
+    }
+
+    async getAttributes() {
+        return this.repository.getEntities("SELECT * FROM attributes WHERE noteId = ?", [this.noteId]);
+    }
+
+    async getAttribute(name) {
+        return this.repository.getEntity("SELECT * FROM attributes WHERE noteId = ? AND name = ?", [this.noteId, name]);
+    }
+
+    async getRevisions() {
+        return this.repository.getEntities("SELECT * FROM note_revisions WHERE noteId = ?", [this.noteId]);
+    }
+
+    async getTrees() {
+        return this.repository.getEntities("SELECT * FROM note_tree WHERE isDeleted = 0 AND noteId = ?", [this.noteId]);
+    }
+
+    beforeSaving() {
+        this.content = JSON.stringify(this.jsonContent, null, '\t');
+
+        if (this.isProtected) {
+            protected_session.encryptNote(this.dataKey, this);
+        }
+    }
+}
+
+module.exports = Note;

src/entities/note_revision.js

@@ -0,0 +1,14 @@
+"use strict";
+
+const Entity = require('./entity');
+
+class NoteRevision extends Entity {
+    static get tableName() { return "note_revisions"; }
+    static get primaryKeyName() { return "noteRevisionId"; }
+
+    async getNote() {
+        return this.repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+    }
+}
+
+module.exports = NoteRevision;

src/entities/note_tree.js

@@ -0,0 +1,18 @@
+"use strict";
+
+const Entity = require('./entity');
+
+class NoteTree extends Entity {
+    static get tableName() { return "note_tree"; }
+    static get primaryKeyName() { return "noteTreeId"; }
+
+    async getNote() {
+        return this.repository.getEntity("SELECT * FROM note_tree WHERE isDeleted = 0 AND noteId = ?", [this.noteId]);
+    }
+
+    async getParentNote() {
+        return this.repository.getEntity("SELECT * FROM note_tree WHERE isDeleted = 0 AND parentNoteId = ?", [this.parentNoteId]);
+    }
+}
+
+module.exports = NoteTree;