mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 04:51:31 +08:00 
			
		
		
		
	fix(nx/docker): serving most assets
This commit is contained in:
		
							parent
							
								
									db71c18d2b
								
							
						
					
					
						commit
						b63a5d348a
					
				| @ -1,12 +1,12 @@ | |||||||
| import express from "express"; | import express from "express"; | ||||||
| import path, { join } from "path"; | import path 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 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, { getResourceDir } from "./services/utils.js"; | import utils 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"; | ||||||
| @ -20,6 +20,7 @@ import eventService from "./services/events.js"; | |||||||
| import log from "./services/log.js"; | import log from "./services/log.js"; | ||||||
| import "./services/handlers.js"; | import "./services/handlers.js"; | ||||||
| import "./becca/becca_loader.js"; | import "./becca/becca_loader.js"; | ||||||
|  | import { RESOURCE_DIR } from "./services/resource_dir.js"; | ||||||
| 
 | 
 | ||||||
| export default async function buildApp() { | export default async function buildApp() { | ||||||
|     const app = express(); |     const app = express(); | ||||||
| @ -63,7 +64,7 @@ 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(); |     const assetsDir = RESOURCE_DIR; | ||||||
| 
 | 
 | ||||||
|     // view engine setup
 |     // view engine setup
 | ||||||
|     app.set("views", path.join(assetsDir, "views")); |     app.set("views", path.join(assetsDir, "views")); | ||||||
| @ -109,7 +110,7 @@ export default async function buildApp() { | |||||||
|     app.use(`/robots.txt`, express.static(path.join(assetsDir, "public/robots.txt"))); |     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(`/icon.png`, express.static(path.join(assetsDir, "public/icon.png"))); | ||||||
|     app.use(sessionParser); |     app.use(sessionParser); | ||||||
|     app.use(favicon(`${assetsDir}/assets/icon.ico`)); |     app.use(favicon(`${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
	 Elian Doran
						Elian Doran