From 10c21d34039c7e7feacf7f923bc5ff61e50ab84a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 7 Apr 2024 14:36:47 +0300 Subject: [PATCH] server-ts: Convert routes/index --- package-lock.json | 19 +++++++++++++++++++ package.json | 1 + src/routes/{index.js => index.ts} | 29 +++++++++++++++-------------- src/routes/routes.js | 2 +- 4 files changed, 36 insertions(+), 15 deletions(-) rename src/routes/{index.js => index.ts} (72%) diff --git a/package-lock.json b/package-lock.json index 3c5e38812..5976c203c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -91,6 +91,7 @@ "@types/archiver": "^6.0.2", "@types/better-sqlite3": "^7.6.9", "@types/cls-hooked": "^4.3.8", + "@types/csurf": "^1.11.5", "@types/escape-html": "^1.0.4", "@types/express": "^4.17.21", "@types/express-session": "^1.18.0", @@ -1234,6 +1235,15 @@ "@types/node": "*" } }, + "node_modules/@types/csurf": { + "version": "1.11.5", + "resolved": "https://registry.npmjs.org/@types/csurf/-/csurf-1.11.5.tgz", + "integrity": "sha512-5rw87+5YGixyL2W8wblSUl5DSZi5YOlXE6Awwn2ofLvqKr/1LruKffrQipeJKUX44VaxKj8m5es3vfhltJTOoA==", + "dev": true, + "dependencies": { + "@types/express-serve-static-core": "*" + } + }, "node_modules/@types/d3-scale": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", @@ -14221,6 +14231,15 @@ "@types/node": "*" } }, + "@types/csurf": { + "version": "1.11.5", + "resolved": "https://registry.npmjs.org/@types/csurf/-/csurf-1.11.5.tgz", + "integrity": "sha512-5rw87+5YGixyL2W8wblSUl5DSZi5YOlXE6Awwn2ofLvqKr/1LruKffrQipeJKUX44VaxKj8m5es3vfhltJTOoA==", + "dev": true, + "requires": { + "@types/express-serve-static-core": "*" + } + }, "@types/d3-scale": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", diff --git a/package.json b/package.json index 106b21964..efb6aae02 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,7 @@ "@types/archiver": "^6.0.2", "@types/better-sqlite3": "^7.6.9", "@types/cls-hooked": "^4.3.8", + "@types/csurf": "^1.11.5", "@types/escape-html": "^1.0.4", "@types/express": "^4.17.21", "@types/express-session": "^1.18.0", diff --git a/src/routes/index.js b/src/routes/index.ts similarity index 72% rename from src/routes/index.js rename to src/routes/index.ts index 44c609834..2ede70f42 100644 --- a/src/routes/index.js +++ b/src/routes/index.ts @@ -1,18 +1,19 @@ "use strict"; -const sql = require('../services/sql'); -const attributeService = require('../services/attributes'); -const config = require('../services/config'); -const optionService = require('../services/options'); -const log = require('../services/log'); -const env = require('../services/env'); -const utils = require('../services/utils'); -const protectedSessionService = require('../services/protected_session'); -const packageJson = require('../../package.json'); -const assetPath = require('../services/asset_path'); -const appPath = require('../services/app_path'); +import sql = require('../services/sql'); +import attributeService = require('../services/attributes'); +import config = require('../services/config'); +import optionService = require('../services/options'); +import log = require('../services/log'); +import env = require('../services/env'); +import utils = require('../services/utils'); +import protectedSessionService = require('../services/protected_session'); +import packageJson = require('../../package.json'); +import assetPath = require('../services/asset_path'); +import appPath = require('../services/app_path'); +import { Request, Response } from 'express'; -function index(req, res) { +function index(req: Request, res: Response) { const options = optionService.getOptionMap(); const view = (!utils.isElectron() && req.cookies['trilium-device'] === 'mobile') @@ -43,7 +44,7 @@ function index(req, res) { }); } -function getThemeCssUrl(theme) { +function getThemeCssUrl(theme: string) { if (theme === 'light') { return false; // light theme is always loaded as baseline } else if (theme === 'dark') { @@ -63,6 +64,6 @@ function getAppCssNoteIds() { return attributeService.getNotesWithLabel('appCss').map(note => note.noteId); } -module.exports = { +export = { index }; diff --git a/src/routes/routes.js b/src/routes/routes.js index 7c0df5fcf..182639b84 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -19,7 +19,7 @@ const ValidationError = require('../errors/validation_error'); // page routes const setupRoute = require('./setup'); const loginRoute = require('./login'); -const indexRoute = require('./index.js'); +const indexRoute = require('./index'); // API routes const treeApiRoute = require('./api/tree');