From e47c848ec88dce28f025285ad8137e697c2bc68b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 7 Jan 2026 20:26:41 +0200 Subject: [PATCH] chore(server): reintegrate mobile layout --- apps/client/src/{desktop.html => index.html} | 2 +- apps/server/src/assets/views/desktop.ejs | 11 -- apps/server/src/assets/views/mobile.ejs | 136 ------------------- apps/server/src/routes/assets.ts | 2 +- 4 files changed, 2 insertions(+), 149 deletions(-) rename apps/client/src/{desktop.html => index.html} (98%) delete mode 100644 apps/server/src/assets/views/desktop.ejs delete mode 100644 apps/server/src/assets/views/mobile.ejs diff --git a/apps/client/src/desktop.html b/apps/client/src/index.html similarity index 98% rename from apps/client/src/desktop.html rename to apps/client/src/index.html index 8d4f2f315..4bd8a775a 100644 --- a/apps/client/src/desktop.html +++ b/apps/client/src/index.html @@ -100,7 +100,7 @@ async function loadScripts() { const assetPath = glob.assetPath; await import(`./${assetPath}/runtime.js`); - await import(`./${assetPath}/desktop.js`); + await import(`./${assetPath}/${glob.device}.js`); } bootstrap(); diff --git a/apps/server/src/assets/views/desktop.ejs b/apps/server/src/assets/views/desktop.ejs deleted file mode 100644 index f58856985..000000000 --- a/apps/server/src/assets/views/desktop.ejs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/apps/server/src/assets/views/mobile.ejs b/apps/server/src/assets/views/mobile.ejs deleted file mode 100644 index e329d92ff..000000000 --- a/apps/server/src/assets/views/mobile.ejs +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - Trilium Notes - - - - - - - - - - -
- - - -<%- include("./partials/windowGlobal.ejs", locals) %> - - - - - -<% if (themeCssUrl) { %> - -<% } %> - -<% if (themeUseNextAsBase === "next") { %> - -<% } else if (themeUseNextAsBase === "next-dark") { %> - -<% } else if (themeUseNextAsBase === "next-light") { %> - -<% } %> - - - - - diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index d8a67d881..36512398c 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -38,7 +38,7 @@ async function register(app: express.Application) { // The page is restored from cache, but the API call fail. res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); - req.url = `/${assetUrlFragment}/src/desktop.html`; + req.url = `/${assetUrlFragment}/src/index.html`; vite.middlewares(req, res, next); }); app.use(`/node_modules/@excalidraw/excalidraw/dist/prod`, persistentCacheStatic(path.join(srcRoot, "../../node_modules/@excalidraw/excalidraw/dist/prod")));