diff --git a/src/routes/api/setup.js b/src/routes/api/setup.ts similarity index 78% rename from src/routes/api/setup.js rename to src/routes/api/setup.ts index 84f310725..9e63a2331 100644 --- a/src/routes/api/setup.js +++ b/src/routes/api/setup.ts @@ -1,9 +1,10 @@ "use strict"; -const sqlInit = require('../../services/sql_init'); -const setupService = require('../../services/setup'); -const log = require('../../services/log'); -const appInfo = require('../../services/app_info'); +import sqlInit = require('../../services/sql_init'); +import setupService = require('../../services/setup'); +import log = require('../../services/log'); +import appInfo = require('../../services/app_info'); +import { Request } from 'express'; function getStatus() { return { @@ -17,13 +18,13 @@ async function setupNewDocument() { await sqlInit.createInitialDatabase(); } -function setupSyncFromServer(req) { +function setupSyncFromServer(req: Request) { const { syncServerHost, syncProxy, password } = req.body; return setupService.setupSyncFromSyncServer(syncServerHost, syncProxy, password); } -function saveSyncSeed(req) { +function saveSyncSeed(req: Request) { const { options, syncVersion } = req.body; if (appInfo.syncVersion !== syncVersion) { @@ -50,7 +51,7 @@ function getSyncSeed() { }; } -module.exports = { +export = { getStatus, setupNewDocument, setupSyncFromServer, diff --git a/src/routes/routes.js b/src/routes/routes.js index a88dccd80..9e4f0c152 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -17,7 +17,7 @@ const NotFoundError = require('../errors/not_found_error'); const ValidationError = require('../errors/validation_error'); // page routes -const setupRoute = require('./setup.js'); +const setupRoute = require('./setup'); const loginRoute = require('./login.js'); const indexRoute = require('./index.js'); @@ -38,7 +38,7 @@ const recentNotesRoute = require('./api/recent_notes'); const appInfoRoute = require('./api/app_info'); const exportRoute = require('./api/export'); const importRoute = require('./api/import'); -const setupApiRoute = require('./api/setup.js'); +const setupApiRoute = require('./api/setup'); const sqlRoute = require('./api/sql'); const databaseRoute = require('./api/database'); const imageRoute = require('./api/image'); diff --git a/src/services/setup.ts b/src/services/setup.ts index 3d7706dba..08b1ee806 100644 --- a/src/services/setup.ts +++ b/src/services/setup.ts @@ -110,7 +110,7 @@ function getSyncSeedOptions() { ]; } -module.exports = { +export = { hasSyncServerSchemaAndSeed, triggerSync, sendSeedToSyncServer,