release 0.5.3-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 src/electron --out=dist --platform=linux --arch=ia32 --overwrite
+./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite
 
-./node_modules/.bin/electron-packager src/electron --out=dist --platform=win32 --arch=x64 --overwrite
+./node_modules/.bin/electron-packager . --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 src/electron --out=dist --platform=linux --arch=x64 --overwrite
+./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite
 
 echo "Copying required windows binaries"
 

db/schema.sql

@@ -1,119 +1,121 @@
 CREATE TABLE IF NOT EXISTS "options" (
-	`opt_name`	TEXT NOT NULL PRIMARY KEY,
+    `name`	TEXT NOT NULL PRIMARY KEY,
-	`opt_value`	TEXT,
+    `value`	TEXT,
-	`date_modified` INT
+    `dateModified` INT,
-, is_synced INTEGER NOT NULL DEFAULT 0);
+    isSynced INTEGER NOT NULL DEFAULT 0);
 CREATE TABLE IF NOT EXISTS "sync" (
-    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    `entity_name`	TEXT NOT NULL,
+  `entityName`	TEXT NOT NULL,
-    `entity_id`	TEXT NOT NULL,
+  `entityId`	TEXT NOT NULL,
-    `source_id` TEXT NOT NULL,
+  `sourceId` TEXT NOT NULL,
-    `sync_date`	TEXT NOT NULL);
+  `syncDate`	TEXT NOT NULL);
-CREATE UNIQUE INDEX `IDX_sync_entity_name_id` ON `sync` (
+CREATE TABLE IF NOT EXISTS "source_ids" (
-  `entity_name`,
+  `sourceId`	TEXT NOT NULL,
-  `entity_id`
+  `dateCreated`	TEXT NOT NULL,
-);
+  PRIMARY KEY(`sourceId`)
-CREATE INDEX `IDX_sync_sync_date` ON `sync` (
-  `sync_date`
-);
-CREATE TABLE `source_ids` (
-  `source_id`	TEXT NOT NULL,
-  `date_created`	TEXT NOT NULL,
-  PRIMARY KEY(`source_id`)
 );
 CREATE TABLE IF NOT EXISTS "notes" (
-    `note_id`	TEXT NOT NULL,
+  `noteId`	TEXT NOT NULL,
-    `note_title`	TEXT,
+  `title`	TEXT,
-    `note_text`	TEXT,
+  `content`	TEXT,
-    `is_protected`	INT NOT NULL DEFAULT 0,
+  `isProtected`	INT NOT NULL DEFAULT 0,
-    `is_deleted`	INT NOT NULL DEFAULT 0,
+  `isDeleted`	INT NOT NULL DEFAULT 0,
-    `date_created`	TEXT NOT NULL,
+  `dateCreated`	TEXT NOT NULL,
-    `date_modified`	TEXT NOT NULL, type TEXT NOT NULL DEFAULT 'text', mime TEXT NOT NULL DEFAULT 'text/html',
+  `dateModified`	TEXT NOT NULL,
-    PRIMARY KEY(`note_id`)
+  type TEXT NOT NULL DEFAULT 'text',
+  mime TEXT NOT NULL DEFAULT 'text/html',
+  PRIMARY KEY(`noteId`)
 );
-CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
+CREATE TABLE IF NOT EXISTS "event_log" (
-    `is_deleted`
+  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `noteId`	TEXT,
+  `comment`	TEXT,
+  `dateAdded`	TEXT NOT NULL,
+  FOREIGN KEY(noteId) REFERENCES notes(noteId)
 );
-CREATE TABLE `event_log` (
+CREATE TABLE IF NOT EXISTS "note_tree" (
-    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `noteTreeId`	TEXT NOT NULL,
-    `note_id`	TEXT,
+  `noteId`	TEXT NOT NULL,
-    `comment`	TEXT,
+  `parentNoteId`	TEXT NOT NULL,
-    `date_added`	TEXT NOT NULL,
+  `notePosition`	INTEGER NOT NULL,
-    FOREIGN KEY(note_id) REFERENCES notes(note_id)
-);
-CREATE TABLE IF NOT EXISTS "notes_tree" (
-  `note_tree_id`	TEXT NOT NULL,
-  `note_id`	TEXT NOT NULL,
-  `parent_note_id`	TEXT NOT NULL,
-  `note_position`	INTEGER NOT NULL,
   `prefix`	TEXT,
-  `is_expanded`	BOOLEAN,
+  `isExpanded`	BOOLEAN,
-  `is_deleted`	INTEGER NOT NULL DEFAULT 0,
+  `isDeleted`	INTEGER NOT NULL DEFAULT 0,
-  `date_modified`	TEXT NOT NULL,
+  `dateModified`	TEXT NOT NULL,
-  PRIMARY KEY(`note_tree_id`)
+  PRIMARY KEY(`noteTreeId`)
 );
-CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
+CREATE TABLE IF NOT EXISTS "note_revisions" (
-  `note_id`
+  `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
 );
-CREATE TABLE IF NOT EXISTS "notes_history" (
+CREATE TABLE IF NOT EXISTS "recent_notes" (
-  `note_history_id`	TEXT NOT NULL PRIMARY KEY,
+  `noteTreeId` TEXT NOT NULL PRIMARY KEY,
-  `note_id`	TEXT NOT NULL,
+  `notePath` TEXT NOT NULL,
-  `note_title`	TEXT,
+  `dateAccessed` TEXT NOT NULL,
-  `note_text`	TEXT,
+  isDeleted INT
-  `is_protected`	INT NOT NULL DEFAULT 0,
-  `date_modified_from` TEXT NOT NULL,
-  `date_modified_to` TEXT NOT NULL
 );
-CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
+CREATE TABLE IF NOT EXISTS "images"
-  `note_id`
-);
-CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
-  `date_modified_from`
-);
-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,
+  imageId TEXT PRIMARY KEY NOT NULL,
   format TEXT NOT NULL,
   checksum TEXT NOT NULL,
   name TEXT NOT NULL,
   data BLOB,
-  is_deleted INT NOT NULL DEFAULT 0,
+  isDeleted INT NOT NULL DEFAULT 0,
-  date_modified TEXT NOT NULL,
+  dateModified TEXT NOT NULL,
-  date_created TEXT NOT NULL
+  dateCreated TEXT NOT NULL
 );
-CREATE TABLE notes_image
+CREATE TABLE note_images
 (
-  note_image_id TEXT PRIMARY KEY NOT NULL,
+  noteImageId TEXT PRIMARY KEY NOT NULL,
-  note_id TEXT NOT NULL,
+  noteId TEXT NOT NULL,
-  image_id TEXT NOT NULL,
+  imageId TEXT NOT NULL,
-  is_deleted INT NOT NULL DEFAULT 0,
+  isDeleted INT NOT NULL DEFAULT 0,
-  date_modified TEXT NOT NULL,
+  dateModified TEXT NOT NULL,
-  date_created TEXT NOT NULL
+  dateCreated TEXT NOT NULL
 );
-CREATE INDEX notes_image_note_id_index ON notes_image (note_id);
+CREATE TABLE IF NOT EXISTS "attributes"
-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,
+  attributeId TEXT PRIMARY KEY NOT NULL,
-  note_id TEXT NOT NULL,
+  noteId TEXT NOT NULL,
   name TEXT NOT NULL,
   value TEXT,
-  date_created TEXT NOT NULL,
+  dateCreated TEXT NOT NULL,
-  date_modified TEXT NOT NULL
+  dateModified TEXT NOT NULL
 );
-CREATE INDEX attributes_note_id_index ON attributes (note_id);
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
-CREATE UNIQUE INDEX attributes_note_id_name_index ON attributes (note_id, name);
+  `entityName`,
+  `entityId`
+);
+CREATE INDEX `IDX_sync_syncDate` ON `sync` (
+  `syncDate`
+);
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (
+  `isDeleted`
+);
+CREATE INDEX `IDX_note_tree_noteId` ON `note_tree` (
+  `noteId`
+);
+CREATE INDEX `IDX_note_tree_noteId_parentNoteId` ON `note_tree` (
+  `noteId`,
+  `parentNoteId`
+);
+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 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 INDEX IDX_attributes_noteId ON attributes (noteId);
+CREATE UNIQUE INDEX IDX_attributes_noteId_name ON attributes (noteId, name);

electron.js

@@ -2,7 +2,7 @@
 
 const electron = require('electron');
 const path = require('path');
-const config = require('./services/config');
+const config = require('./src/services/config');
 const url = require("url");
 
 const app = electron.app;
@@ -24,7 +24,7 @@ function createMainWindow() {
         width: 1200,
         height: 900,
         title: 'Trilium Notes',
-        icon: path.join(__dirname, 'public/images/app-icons/png/256x256.png')
+        icon: path.join(__dirname, 'src/public/images/app-icons/png/256x256.png')
     });
 
     const port = config['Network']['port'] || '3000';
@@ -69,4 +69,4 @@ app.on('ready', () => {
     mainWindow = createMainWindow();
 });
 
-require('./www');
+require('./src/www');

package.json

@@ -1,8 +1,9 @@
 {
   "name": "trilium",
   "description": "Trilium Notes",
-  "version": "0.5.1-beta",
+  "version": "0.5.3-beta",
   "license": "AGPL-3.0-only",
+  "main": "electron.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/zadam/trilium.git"
@@ -11,8 +12,8 @@
     "start": "node ./bin/www",
     "test-electron": "xo",
     "rebuild-electron": "electron-rebuild",
-    "start-electron": "electron src/electron",
+    "start-electron": "electron .",
-    "build-electron": "electron-packager src/electron --out=dist --asar --overwrite --all",
+    "build-electron": "electron-packager . --out=dist --asar --overwrite --all",
     "start-forge": "electron-forge start",
     "package-forge": "electron-forge package",
     "make-forge": "electron-forge make",