mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-07-29 19:12:27 +08:00
fix(nx/docker): wrong paths at app level
This commit is contained in:
parent
a808f0680c
commit
b9a16c6173
@ -1,14 +1,12 @@
|
|||||||
import express from "express";
|
import express from "express";
|
||||||
import path from "path";
|
import path, { join } from "path";
|
||||||
import favicon from "serve-favicon";
|
import favicon from "serve-favicon";
|
||||||
import cookieParser from "cookie-parser";
|
import cookieParser from "cookie-parser";
|
||||||
import helmet from "helmet";
|
import helmet from "helmet";
|
||||||
import compression from "compression";
|
import compression from "compression";
|
||||||
import { fileURLToPath } from "url";
|
|
||||||
import { dirname } from "path";
|
|
||||||
import sessionParser from "./routes/session_parser.js";
|
import sessionParser from "./routes/session_parser.js";
|
||||||
import config from "./services/config.js";
|
import config from "./services/config.js";
|
||||||
import utils from "./services/utils.js";
|
import utils, { getResourceDir } from "./services/utils.js";
|
||||||
import assets from "./routes/assets.js";
|
import assets from "./routes/assets.js";
|
||||||
import routes from "./routes/routes.js";
|
import routes from "./routes/routes.js";
|
||||||
import custom from "./routes/custom.js";
|
import custom from "./routes/custom.js";
|
||||||
@ -26,8 +24,6 @@ import "./becca/becca_loader.js";
|
|||||||
export default async function buildApp() {
|
export default async function buildApp() {
|
||||||
const app = express();
|
const app = express();
|
||||||
|
|
||||||
const scriptDir = dirname(fileURLToPath(import.meta.url));
|
|
||||||
|
|
||||||
// Initialize DB
|
// Initialize DB
|
||||||
sql_init.initializeDb();
|
sql_init.initializeDb();
|
||||||
|
|
||||||
@ -67,8 +63,10 @@ export default async function buildApp() {
|
|||||||
console.log("Database not initialized yet. LLM features will be initialized after setup.");
|
console.log("Database not initialized yet. LLM features will be initialized after setup.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const assetsDir = getResourceDir();
|
||||||
|
|
||||||
// view engine setup
|
// view engine setup
|
||||||
app.set("views", path.join(scriptDir, "views"));
|
app.set("views", path.join(assetsDir, "views"));
|
||||||
app.engine("ejs", (await import("ejs")).renderFile);
|
app.engine("ejs", (await import("ejs")).renderFile);
|
||||||
app.set("view engine", "ejs");
|
app.set("view engine", "ejs");
|
||||||
|
|
||||||
@ -105,12 +103,13 @@ export default async function buildApp() {
|
|||||||
app.use(express.raw({ limit: "500mb" }));
|
app.use(express.raw({ limit: "500mb" }));
|
||||||
app.use(express.urlencoded({ extended: false }));
|
app.use(express.urlencoded({ extended: false }));
|
||||||
app.use(cookieParser());
|
app.use(cookieParser());
|
||||||
app.use(express.static(path.join(scriptDir, "public/root")));
|
|
||||||
app.use(`/manifest.webmanifest`, express.static(path.join(scriptDir, "public/manifest.webmanifest")));
|
app.use(express.static(path.join(assetsDir, "public/root")));
|
||||||
app.use(`/robots.txt`, express.static(path.join(scriptDir, "public/robots.txt")));
|
app.use(`/manifest.webmanifest`, express.static(path.join(assetsDir, "public/manifest.webmanifest")));
|
||||||
app.use(`/icon.png`, express.static(path.join(scriptDir, "public/icon.png")));
|
app.use(`/robots.txt`, express.static(path.join(assetsDir, "public/robots.txt")));
|
||||||
|
app.use(`/icon.png`, express.static(path.join(assetsDir, "public/icon.png")));
|
||||||
app.use(sessionParser);
|
app.use(sessionParser);
|
||||||
app.use(favicon(`${scriptDir}/assets/icon.ico`));
|
app.use(favicon(`${assetsDir}/assets/icon.ico`));
|
||||||
|
|
||||||
if (openID.isOpenIDEnabled())
|
if (openID.isOpenIDEnabled())
|
||||||
app.use(auth(openID.generateOAuthConfig()));
|
app.use(auth(openID.generateOAuthConfig()));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user