From e8655a84e258e1a92943739690abe26461401407 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sun, 15 Oct 2017 17:09:41 -0400
Subject: [PATCH] move API routes into api subdir

---
 node/app.js                             | 16 ++++++++--------
 node/routes/{ => api}/audit.js          |  4 ++--
 node/routes/{ => api}/note_history.js   |  4 ++--
 node/routes/{ => api}/notes.js          |  8 ++++----
 node/routes/{ => api}/notes_move.js     |  8 ++++----
 node/routes/{ => api}/password.js       |  6 +++---
 node/routes/{ => api}/recent_changes.js |  4 ++--
 node/routes/{ => api}/settings.js       |  6 +++---
 node/routes/{ => api}/tree.js           |  8 ++++----
 9 files changed, 32 insertions(+), 32 deletions(-)
 rename node/routes/{ => api}/audit.js (88%)
 rename node/routes/{ => api}/note_history.js (83%)
 rename node/routes/{ => api}/notes.js (97%)
 rename node/routes/{ => api}/notes_move.js (94%)
 rename node/routes/{ => api}/password.js (70%)
 rename node/routes/{ => api}/recent_changes.js (81%)
 rename node/routes/{ => api}/settings.js (89%)
 rename node/routes/{ => api}/tree.js (92%)

diff --git a/node/app.js b/node/app.js
index 674ab2f09..04b65daad 100644
--- a/node/app.js
+++ b/node/app.js
@@ -14,14 +14,14 @@ const logoutRoute = require('./routes/logout');
 const migrationRoute = require('./routes/migration');
 
 // API routes
-const treeRoute = require('./routes/tree');
-const notesRoute = require('./routes/notes');
-const notesMoveRoute = require('./routes/notes_move');
-const auditRoute = require('./routes/audit');
-const noteHistoryRoute = require('./routes/note_history');
-const recentChangesRoute = require('./routes/recent_changes');
-const settingsRoute = require('./routes/settings');
-const passwordRoute = require('./routes/password');
+const treeRoute = require('./routes/api/tree');
+const notesRoute = require('./routes/api/notes');
+const notesMoveRoute = require('./routes/api/notes_move');
+const auditRoute = require('./routes/api/audit');
+const noteHistoryRoute = require('./routes/api/note_history');
+const recentChangesRoute = require('./routes/api/recent_changes');
+const settingsRoute = require('./routes/api/settings');
+const passwordRoute = require('./routes/api/password');
 
 const db = require('sqlite');
 
diff --git a/node/routes/audit.js b/node/routes/api/audit.js
similarity index 88%
rename from node/routes/audit.js
rename to node/routes/api/audit.js
index a0f029c30..1d83ba440 100644
--- a/node/routes/audit.js
+++ b/node/routes/api/audit.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const router = express.Router();
-const sql = require('../sql');
-const auth = require('../auth');
+const sql = require('../../sql');
+const auth = require('../../auth');
 
 router.get('/:full_load_time', auth.checkApiAuth, async (req, res, next) => {
     const fullLoadTime = req.params.full_load_time;
diff --git a/node/routes/note_history.js b/node/routes/api/note_history.js
similarity index 83%
rename from node/routes/note_history.js
rename to node/routes/api/note_history.js
index a7f7d18c4..f9d69af27 100644
--- a/node/routes/note_history.js
+++ b/node/routes/api/note_history.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const router = express.Router();
-const sql = require('../sql');
-const auth = require('../auth');
+const sql = require('../../sql');
+const auth = require('../../auth');
 
 router.get('/:noteId', auth.checkApiAuth, async (req, res, next) => {
     const noteId = req.params.noteId;
diff --git a/node/routes/notes.js b/node/routes/api/notes.js
similarity index 97%
rename from node/routes/notes.js
rename to node/routes/api/notes.js
index 6682e0e37..d461db3cd 100644
--- a/node/routes/notes.js
+++ b/node/routes/api/notes.js
@@ -1,9 +1,9 @@
 const express = require('express');
 const router = express.Router();
-const sql = require('../sql');
-const utils = require('../utils');
-const audit_category = require('../audit_category');
-const auth = require('../auth');
+const sql = require('../../sql');
+const utils = require('../../utils');
+const audit_category = require('../../audit_category');
+const auth = require('../../auth');
 
 router.get('/:noteId', auth.checkApiAuth, async (req, res, next) => {
     let noteId = req.params.noteId;
diff --git a/node/routes/notes_move.js b/node/routes/api/notes_move.js
similarity index 94%
rename from node/routes/notes_move.js
rename to node/routes/api/notes_move.js
index b794ca264..2a967d276 100644
--- a/node/routes/notes_move.js
+++ b/node/routes/api/notes_move.js
@@ -1,9 +1,9 @@
 const express = require('express');
 const router = express.Router();
-const sql = require('../sql');
-const utils = require('../utils');
-const audit_category = require('../audit_category');
-const auth = require('../auth');
+const sql = require('../../sql');
+const utils = require('../../utils');
+const audit_category = require('../../audit_category');
+const auth = require('../../auth');
 
 router.put('/:noteId/moveTo/:parentId', auth.checkApiAuth, async (req, res, next) => {
     let noteId = req.params.noteId;
diff --git a/node/routes/password.js b/node/routes/api/password.js
similarity index 70%
rename from node/routes/password.js
rename to node/routes/api/password.js
index 2336caa29..1a3403b8f 100644
--- a/node/routes/password.js
+++ b/node/routes/api/password.js
@@ -1,8 +1,8 @@
 const express = require('express');
 const router = express.Router();
-const sql = require('../sql');
-const changePassword = require('../change_password');
-const auth = require('../auth');
+const sql = require('../../sql');
+const changePassword = require('../../change_password');
+const auth = require('../../auth');
 
 router.post('/change', auth.checkApiAuth, async (req, res, next) => {
     const result = await changePassword.changePassword(req.body['current_password'], req.body['new_password']);
diff --git a/node/routes/recent_changes.js b/node/routes/api/recent_changes.js
similarity index 81%
rename from node/routes/recent_changes.js
rename to node/routes/api/recent_changes.js
index 497aefa24..352ae6546 100644
--- a/node/routes/recent_changes.js
+++ b/node/routes/api/recent_changes.js
@@ -1,7 +1,7 @@
 const express = require('express');
 const router = express.Router();
-const sql = require('../sql');
-const auth = require('../auth');
+const sql = require('../../sql');
+const auth = require('../../auth');
 
 router.get('/', auth.checkApiAuth, async (req, res, next) => {
     const recentChanges = await sql.getResults("select * from notes_history order by date_modified desc limit 1000");
diff --git a/node/routes/settings.js b/node/routes/api/settings.js
similarity index 89%
rename from node/routes/settings.js
rename to node/routes/api/settings.js
index 3cb70674e..879c17e99 100644
--- a/node/routes/settings.js
+++ b/node/routes/api/settings.js
@@ -1,8 +1,8 @@
 const express = require('express');
 const router = express.Router();
-const sql = require('../sql');
-const audit_category = require('../audit_category');
-const auth = require('../auth');
+const sql = require('../../sql');
+const audit_category = require('../../audit_category');
+const auth = require('../../auth');
 
 const ALLOWED_OPTIONS = ['encryption_session_timeout', 'history_snapshot_time_interval'];
 
diff --git a/node/routes/tree.js b/node/routes/api/tree.js
similarity index 92%
rename from node/routes/tree.js
rename to node/routes/api/tree.js
index dda03878d..7a9fd3a6b 100644
--- a/node/routes/tree.js
+++ b/node/routes/api/tree.js
@@ -1,9 +1,9 @@
 const express = require('express');
 const router = express.Router();
-const sql = require('../sql');
-const utils = require('../utils');
-const backup = require('../backup');
-const auth = require('../auth');
+const sql = require('../../sql');
+const utils = require('../../utils');
+const backup = require('../../backup');
+const auth = require('../../auth');
 
 router.get('/', auth.checkApiAuth, async (req, res, next) => {
     await backup.regularBackup();