From a16aaf7a817941b0b1ffc42adcd6ca10764832d5 Mon Sep 17 00:00:00 2001 From: zadam Date: Fri, 22 Nov 2019 20:24:49 +0100 Subject: [PATCH] fix setup on non-root paths #404 --- package-lock.json | 2 +- src/public/javascripts/setup.js | 8 ++++---- src/views/setup.ejs | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00e79a4a2..eca7487ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.37.2", + "version": "0.37.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/public/javascripts/setup.js b/src/public/javascripts/setup.js index 45a633dc4..e7cf7c7e1 100644 --- a/src/public/javascripts/setup.js +++ b/src/public/javascripts/setup.js @@ -76,12 +76,12 @@ function SetupModel() { } // not using server.js because it loads too many dependencies - $.post('/api/setup/new-document', { + $.post('api/setup/new-document', { username: username, password: password1, theme: theme }).then(() => { - window.location.replace("/"); + window.location.replace("./"); }); } else if (this.setupType() === 'sync-from-server') { @@ -128,10 +128,10 @@ function SetupModel() { } async function checkOutstandingSyncs() { - const { stats, initialized } = await $.get('/api/sync/stats'); + const { stats, initialized } = await $.get('api/sync/stats'); if (initialized) { - window.location.replace("/"); + window.location.replace("./"); } const totalOutstandingSyncs = stats.outstandingPushes + stats.outstandingPulls; diff --git a/src/views/setup.ejs b/src/views/setup.ejs index 709bf618d..0a2454290 100644 --- a/src/views/setup.ejs +++ b/src/views/setup.ejs @@ -138,7 +138,6 @@