From a103886ea5ce0ce11c6fc6d839e4a62a4e11b04f Mon Sep 17 00:00:00 2001 From: azivner Date: Sat, 5 Jan 2019 21:49:40 +0100 Subject: [PATCH] responsive setup page --- package-lock.json | 2 +- src/services/notes.js | 9 ++- src/views/login.ejs | 4 +- src/views/setup.ejs | 175 +++++++++++++++++++++--------------------- 4 files changed, 99 insertions(+), 91 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8f571885b..83d3bbf92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.27.1-beta", + "version": "0.27.2-beta", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/services/notes.js b/src/services/notes.js index ba2479e21..aefa7d96e 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -1,4 +1,5 @@ const sql = require('./sql'); +const sqlInit = require('./sql_init'); const optionService = require('./options'); const dateUtils = require('./date_utils'); const syncTableService = require('./sync_table'); @@ -408,10 +409,12 @@ async function cleanupDeletedNotes() { await sql.execute("UPDATE note_revisions SET content = NULL WHERE note_revisions.content IS NOT NULL AND noteId IN (SELECT noteId FROM notes WHERE isDeleted = 1 AND notes.dateModified <= ?)", [dateUtils.dateStr(cutoffDate)]); } -// first cleanup kickoff 5 minutes after startup -setTimeout(cls.wrap(cleanupDeletedNotes), 5 * 60 * 1000); +sqlInit.dbReady.then(() => { + // first cleanup kickoff 5 minutes after startup + setTimeout(cls.wrap(cleanupDeletedNotes), 5 * 60 * 1000); -setInterval(cls.wrap(cleanupDeletedNotes), 4 * 3600 * 1000); + setInterval(cls.wrap(cleanupDeletedNotes), 4 * 3600 * 1000); +}); module.exports = { createNewNote, diff --git a/src/views/login.ejs b/src/views/login.ejs index cb25c76f3..8627882ac 100644 --- a/src/views/login.ejs +++ b/src/views/login.ejs @@ -7,7 +7,7 @@
-
+

Trilium login

<% if (failedAuth) { %> @@ -60,6 +60,8 @@ device = /Mobi/.test(navigator.userAgent) ? "mobile" : "desktop"; } + console.log("Setting device cookie to:", device); + setCookie("trilium-device", device); function setCookie(name, value) { diff --git a/src/views/setup.ejs b/src/views/setup.ejs index b64c869fb..1079b27db 100644 --- a/src/views/setup.ejs +++ b/src/views/setup.ejs @@ -2,113 +2,116 @@ + Setup -