diff --git a/apps/server/src/assets/views/login.ejs b/apps/server/src/assets/views/login.ejs index 01efc8720..1daf91a3d 100644 --- a/apps/server/src/assets/views/login.ejs +++ b/apps/server/src/assets/views/login.ejs @@ -21,7 +21,7 @@
- +

<%= t("login.heading") %>

<% if (ssoEnabled) { %> diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index 710feeb7a..c11742132 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -39,9 +39,9 @@ async function register(app: express.Application) { app.use(`/${assetUrlFragment}/libraries`, persistentCacheStatic(path.join(publicDir, "libraries"))); app.use(`/${assetUrlFragment}/fonts`, persistentCacheStatic(path.join(publicDir, "fonts"))); app.use(`/${assetUrlFragment}/translations/`, persistentCacheStatic(path.join(publicDir, "translations"))); - app.use(`/${assetUrlFragment}/images`, persistentCacheStatic(path.join(resourceDir, "assets", "images"))); app.use(`/node_modules/`, persistentCacheStatic(path.join(publicDir, "node_modules"))); } + app.use(`/${assetUrlFragment}/images`, persistentCacheStatic(path.join(resourceDir, "assets", "images"))); app.use(`/${assetUrlFragment}/doc_notes`, persistentCacheStatic(path.join(resourceDir, "assets", "doc_notes"))); app.use(`/assets/vX/fonts`, express.static(path.join(srcRoot, "public/fonts"))); app.use(`/assets/vX/images`, express.static(path.join(srcRoot, "..", "images"))); diff --git a/apps/server/src/routes/login.ts b/apps/server/src/routes/login.ts index 877d65577..234f9e1d8 100644 --- a/apps/server/src/routes/login.ts +++ b/apps/server/src/routes/login.ts @@ -3,7 +3,7 @@ import optionService from "../services/options.js"; import myScryptService from "../services/encryption/my_scrypt.js"; import log from "../services/log.js"; import passwordService from "../services/encryption/password.js"; -import assetPath from "../services/asset_path.js"; +import assetPath, { assetUrlFragment } from "../services/asset_path.js"; import appPath from "../services/app_path.js"; import ValidationError from "../errors/validation_error.js"; import type { Request, Response } from 'express'; @@ -19,6 +19,7 @@ function loginPage(req: Request, res: Response) { totpEnabled: totp.isTotpEnabled(), ssoEnabled: openID.isOpenIDEnabled(), assetPath: assetPath, + assetPathFragment: assetUrlFragment, appPath: appPath, }); }