diff --git a/_regroup/package.json b/_regroup/package.json index eb5ea9cde..e861ae79c 100644 --- a/_regroup/package.json +++ b/_regroup/package.json @@ -38,10 +38,10 @@ "@playwright/test": "1.52.0", "@stylistic/eslint-plugin": "4.2.0", "@types/express": "5.0.1", - "@types/node": "22.15.18", + "@types/node": "22.15.19", "@types/yargs": "17.0.33", "@vitest/coverage-v8": "3.1.3", - "eslint": "9.26.0", + "eslint": "9.27.0", "eslint-plugin-simple-import-sort": "12.1.1", "esm": "3.2.25", "jsdoc": "4.0.4", diff --git a/apps/client/package.json b/apps/client/package.json index e10a4b77a..1986bf93d 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -10,7 +10,7 @@ "url": "https://github.com/TriliumNext/Notes" }, "dependencies": { - "@eslint/js": "9.26.0", + "@eslint/js": "9.27.0", "@excalidraw/excalidraw": "0.18.0", "@fullcalendar/core": "6.1.17", "@fullcalendar/daygrid": "6.1.17", diff --git a/apps/client/src/stylesheets/theme-next/shell.css b/apps/client/src/stylesheets/theme-next/shell.css index fc751f8dd..2bcdf942f 100644 --- a/apps/client/src/stylesheets/theme-next/shell.css +++ b/apps/client/src/stylesheets/theme-next/shell.css @@ -1637,7 +1637,9 @@ div.find-replace-widget div.find-widget-found-wrapper > span { #right-pane .toc li, #right-pane .highlights-list li { - padding: 2px 8px; + padding-top: 2px; + padding-right: 8px; + padding-bottom: 2px; border-radius: 4px; text-align: unset; transition: diff --git a/apps/client/src/widgets/toc.ts b/apps/client/src/widgets/toc.ts index b33cb2a9e..c5fda409c 100644 --- a/apps/client/src/widgets/toc.ts +++ b/apps/client/src/widgets/toc.ts @@ -35,12 +35,8 @@ const TPL = /*html*/`
.toc ol { position: relative; overflow: hidden; - padding-left: 20px; - transition: max-height 0.3s ease; - } - - .toc > ol { padding-left: 0px; + transition: max-height 0.3s ease; } .toc li.collapsed + ol { @@ -51,8 +47,8 @@ const TPL = /*html*/`
content: ""; position: absolute; height: 100%; - left: 17px; border-left: 1px solid var(--main-border-color); + z-index: 10; } .toc li { @@ -67,11 +63,35 @@ const TPL = /*html*/`
hyphens: auto; } + .toc > ol { + --toc-depth-level: 1; + } + .toc > ol > ol { + --toc-depth-level: 2; + } + .toc > ol > ol > ol { + --toc-depth-level: 3; + } + .toc > ol > ol > ol > ol { + --toc-depth-level: 4; + } + .toc > ol > ol > ol > ol > ol { + --toc-depth-level: 5; + } + + .toc > ol ol::before { + left: calc((var(--toc-depth-level) - 2) * 20px + 14px); + } + + .toc li { + padding-left: calc((var(--toc-depth-level) - 1) * 20px + 4px); + } + .toc li .collapse-button { display: flex; position: relative; - width: 20px; - height: 20px; + width: 21px; + height: 21px; flex-shrink: 0; align-items: center; justify-content: center; @@ -83,12 +103,12 @@ const TPL = /*html*/`
} .toc li .item-content { - margin-left: 28px; + margin-left: 25px; flex: 1; } .toc li .collapse-button + .item-content { - margin-left: 8px; + margin-left: 4px; } .toc li:hover { @@ -316,10 +336,9 @@ export default class TocWidget extends RightPanelWidget { // const headingText = await this.replaceMathTextWithKatax(m[2]); - const $itemContent = $('
').html(headingText).on("click", () => { - this.jumpToHeading(headingIndex); - }); - const $li = $("
  • ").append($itemContent); + const $itemContent = $('
    ').html(headingText); + const $li = $("
  • ").append($itemContent) + .on("click", () => this.jumpToHeading(headingIndex)); $ols[$ols.length - 1].append($li); headingCount = headingIndex; $previousLi = $li; @@ -400,7 +419,8 @@ export default class TocWidget extends RightPanelWidget { $previousLi.removeClass("collapsed"); } - $collapseButton.on("click", () => { + $collapseButton.on("click", (event) => { + event.stopPropagation(); if ($previousLi.hasClass("animating")) return; const willCollapse = !$previousLi.hasClass("collapsed"); $previousLi.addClass("animating"); diff --git a/apps/server/package.json b/apps/server/package.json index 2c8e50151..4b16cc738 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -88,7 +88,7 @@ "multer": "1.4.5-lts.2", "normalize-strings": "1.1.1", "ollama": "0.5.15", - "openai": "4.98.0", + "openai": "4.100.0", "rand-token": "1.0.1", "safe-compare": "1.1.4", "sanitize-filename": "1.6.3", diff --git a/apps/server/spec/setup.ts b/apps/server/spec/setup.ts index c3b32e477..2fae6e73c 100644 --- a/apps/server/spec/setup.ts +++ b/apps/server/spec/setup.ts @@ -1,6 +1,7 @@ import { beforeAll } from "vitest"; import i18next from "i18next"; import { join } from "path"; +import dayjs from "dayjs"; beforeAll(async () => { // Initialize the translations manually to avoid any side effects. @@ -15,4 +16,8 @@ beforeAll(async () => { loadPath: join(__dirname, "../src/assets/translations/{{lng}}/{{ns}}.json") } }); + + // Initialize dayjs + await import("dayjs/locale/en.js"); + dayjs.locale("en"); }); diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index 43170e0bd..9c35c6aed 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -4,7 +4,6 @@ import favicon from "serve-favicon"; import cookieParser from "cookie-parser"; import helmet from "helmet"; import compression from "compression"; -import sessionParser from "./routes/session_parser.js"; import config from "./services/config.js"; import utils, { getResourceDir } from "./services/utils.js"; import assets from "./routes/assets.js"; @@ -111,6 +110,8 @@ export default async function buildApp() { app.use(`/manifest.webmanifest`, express.static(path.join(publicAssetsDir, "manifest.webmanifest"))); app.use(`/robots.txt`, express.static(path.join(publicAssetsDir, "robots.txt"))); app.use(`/icon.png`, express.static(path.join(publicAssetsDir, "icon.png"))); + + const sessionParser = (await import("./routes/session_parser.js")).default; app.use(sessionParser); app.use(favicon(path.join(assetsDir, "icon.ico"))); diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html index f9a809a86..8145def6a 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html @@ -1,5 +1,3 @@ -

    Note: This feature has not been merged yet, so it is not available. -

    Multi-factor authentication (MFA) is a security process that requires users to provide two or more verification factors to gain access to a system, application, or account. This adds an extra layer of protection beyond @@ -7,80 +5,60 @@

    By requiring more than one verification method, MFA helps reduce the risk of unauthorized access, even if someone has obtained your password. It’s highly recommended for securing sensitive information stored in your notes.

    -

    Warning! OpenID and TOTP cannot be both used at the same time!

    -

    Log in with your Google Account with OpenID!

    -

    OpenID is a standardized way to let you log into websites using an account - from another service, like Google, to verify your identity.

    -

    Why Time-based One Time Passwords?

    -

    TOTP (Time-Based One-Time Password) is a security feature that generates - a unique, temporary code on your device, like a smartphone, which changes - every 30 seconds. You use this code, along with your password, to log into - your account, making it much harder for anyone else to access them.

    -

    Setup

    -

    TOTP

    -
      -
    1. -

      Start Trilium Notes normally.

      -
      2. -
    2. -

      Go to "Menu" -> "Options" -> "MFA"

      -
      3. -
    3. -

      Click the "Generate TOTP Secret" button

      -
      4. -
    4. -

      Copy the generated secret to your authentication app/extension

      -
      5. -
    5. -

      Set an environment variable "TOTP_SECRET" as the generated secret. Environment - variables can be set with a .env file in the root directory, by defining - them in the command line, or with a docker container.

      # .env in the project root directory
-TOTP_ENABLED="true"
-TOTP_SECRET="secret"
      # Terminal/CLI
-export TOTP_ENABLED="true"
-export TOTP_SECRET="secret"
      # Docker
-docker run -p 8080:8080 -v ~/trilium-data:/home/node/trilium-data -e TOTP_ENABLED="true" -e TOTP_SECRET="secret" triliumnext/notes:[VERSION]
      -
      6. -
    6. -

      Restart Trilium

      -
      7. -
    7. -

      Go to "Options" -> "MFA"

      -
      8. -
    8. -

      Click the "Generate Recovery Codes" button

      -
      9. -
    9. -

      Save the recovery codes. Recovery codes can be used once in place of the +

      +

      Log in with your Google Account with OpenID!

      +

      OpenID is a standardized way to let you log into websites using an account + from another service, like Google, to verify your identity.

      +

      Why Time-based One Time Passwords?

      +

      TOTP (Time-Based One-Time Password) is a security feature that generates + a unique, temporary code on your device, like a smartphone, which changes + every 30 seconds. You use this code, along with your password, to log into + your account, making it much harder for anyone else to access them.

      +

      Setup

      +

      MFA can only be set up on a server instance.

      + +

      TOTP

      +
        +
      1. Go to "Menu" -> "Options" -> "MFA"
        2. +
      2. Click the “Enable Multi-Factor Authentication” checkbox if not checked
        3. +
      3. Choose “Time-Based One-Time Password (TOTP)” under MFA Method
        4. +
      4. Click the "Generate TOTP Secret" button
        5. +
      5. Copy the generated secret to your authentication app/extension
        6. +
      6. Click the "Generate Recovery Codes" button
        7. +
      7. Save the recovery codes. Recovery codes can be used once in place of the TOTP if you loose access to your authenticator. After a rerecovery code is used, it will show the unix timestamp when it was used in the MFA options - tab.

        -
        8. -
      8. -

        Load the secret into an authentication app like google authenticator

        -
        9. -
      -

      OpenID

      -

      Currently only compatible with Google. Other services like Authentik and Auth0 are planned on being added. -

      -

      In order to setup OpenID, you will need to setup a authentication provider. - This requires a bit of extra setup. Follow these instructions to - setup an OpenID service through google.

      -

      Set an environment variable "SSO_ENABLED" to true and add the client ID - and secret you obtained from google. Environment variables can be set with - a .env file in the root directory, by defining them in the command line, - or with a docker container.

      -

      .env File

      # .env in the project root directory
-SSO_ENABLED="true"
-BASE_URL="http://localhost:8080"
-CLIENT_ID=
-SECRET=
      -

      Environment variable (linux)

      export SSO_ENABLED="true"
-export BASE_URL="http://localhost:8080"
-export CLIENT_ID=
-export SECRET=
      -

      Docker

      docker run -d -p 8080:8080 -v ~/trilium-data:/home/node/trilium-data -e SSO_ENABLED="true" -e BASE_URL="http://localhost:8080" -e CLIENT_ID= -e SECRET= triliumnext/notes:[VERSION]
      -

      After you restart Trilium Notes, you will be redirected to Google's account - selection page. Login to an account and Trilium Next will bind to that - account, allowing you to login with it.

      -

      You can now login using your google account.

      \ No newline at end of file + tab.
      10. +
    10. Re-login will be required after TOTP setup is finished (After you refreshing + the page).
      11. +
    +

    OpenID

    + +

    In order to setup OpenID, you will need to setup a authentication provider. + This requires a bit of extra setup. Follow these instructions to + setup an OpenID service through google.

    +
      +
    1. Set the oauthBaseUrl, oauthClientId and oauthClientSecret in + the config.ini file (check Configuration (config.ini or environment variables) for + more information). +
        +
      1. You can also setup through environment variables (TRILIUM_OAUTH_BASE_URL, TRILIUM_OAUTH_CLIENT_ID and TRILIUM_OAUTH_CLIENT_SECRET).
        2. +
      +
      2. +
    2. Restart the server
      3. +
    3. Go to "Menu" -> "Options" -> "MFA"
      4. +
    4. Click the “Enable Multi-Factor Authentication” checkbox if not checked
      5. +
    5. Choose “OAuth/OpenID” under MFA Method
      6. +
    6. Refresh the page and login through OpenID provider
      7. +
    \ No newline at end of file diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Code.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Code.html index d84f08784..95e10fd24 100644 --- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Code.html +++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Note Types/Code.html @@ -40,7 +40,7 @@

    Color schemes

    Since Trilium 0.94.0 the colors of code notes can be customized by going  Options → Code Notes and looking for the Appearance section.

    + class="reference-link" href="#root/_help_4TIF1oA4VQRO">Options → Code Notes and looking for the Appearance section.