gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 15:19:01 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

fix(nx/docker): icon, manifest & robots.txt

Browse Source
This commit is contained in:
Elian Doran 2025-04-25 14:01:39 +03:00
parent b63a5d348a
commit d8ee579204
No known key found for this signature in database
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
apps/client/src/assets/.gitkeep
View File

0
apps/server/src/public/icon.png → apps/client/src/assets/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
apps/server/src/public/manifest.webmanifest → apps/client/src/assets/manifest.webmanifest
View File

0
apps/server/src/public/robots.txt → apps/client/src/assets/robots.txt
View File

14
apps/server/src/app.ts
View File

@ -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()));