mirror of
https://github.com/zadam/trilium.git
synced 2025-10-20 15:19:01 +02:00
fix(nx/docker): icon, manifest & robots.txt
This commit is contained in:
parent
b63a5d348a
commit
d8ee579204
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
@ -6,7 +6,7 @@ import helmet from "helmet";
|
|||||||
import compression from "compression";
|
import compression from "compression";
|
||||||
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";
|
||||||
@ -64,6 +64,8 @@ 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 publicDir = path.join(getResourceDir(), "public");
|
||||||
|
const publicAssetsDir = path.join(publicDir, "assets");
|
||||||
const assetsDir = RESOURCE_DIR;
|
const assetsDir = RESOURCE_DIR;
|
||||||
|
|
||||||
// view engine setup
|
// view engine setup
|
||||||
@ -105,12 +107,12 @@ export default async function buildApp() {
|
|||||||
app.use(express.urlencoded({ extended: false }));
|
app.use(express.urlencoded({ extended: false }));
|
||||||
app.use(cookieParser());
|
app.use(cookieParser());
|
||||||
|
|
||||||
app.use(express.static(path.join(assetsDir, "public/root")));
|
app.use(express.static(path.join(publicDir, "root")));
|
||||||
app.use(`/manifest.webmanifest`, express.static(path.join(assetsDir, "public/manifest.webmanifest")));
|
app.use(`/manifest.webmanifest`, express.static(path.join(publicAssetsDir, "manifest.webmanifest")));
|
||||||
app.use(`/robots.txt`, express.static(path.join(assetsDir, "public/robots.txt")));
|
app.use(`/robots.txt`, express.static(path.join(publicAssetsDir, "robots.txt")));
|
||||||
app.use(`/icon.png`, express.static(path.join(assetsDir, "public/icon.png")));
|
app.use(`/icon.png`, express.static(path.join(publicAssetsDir, "icon.png")));
|
||||||
app.use(sessionParser);
|
app.use(sessionParser);
|
||||||
app.use(favicon(`${assetsDir}/icon.ico`));
|
app.use(favicon(path.join(assetsDir, "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