Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 21:11:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(share): add the Trilium logo by default

Browse Source
This commit is contained in:
Elian Doran 2025-06-09 15:10:50 +03:00
parent 157b4f9398
commit 50777faa02
No known key found for this signature in database
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/server/src/share/routes.ts
View File

@ -6,7 +6,7 @@ import shaca from "./shaca/shaca.js";
import shacaLoader from "./shaca/shaca_loader.js"; import shacaLoader from "./shaca/shaca_loader.js";
import shareRoot from "./share_root.js"; import shareRoot from "./share_root.js";
import contentRenderer from "./content_renderer.js"; import contentRenderer from "./content_renderer.js";
import assetPath from "../services/asset_path.js"; import assetPath, { assetUrlFragment } from "../services/asset_path.js";
import appPath from "../services/app_path.js"; import appPath from "../services/app_path.js";
import searchService from "../services/search/services/search.js"; import searchService from "../services/search/services/search.js";
import SearchContext from "../services/search/search_context.js"; import SearchContext from "../services/search/search_context.js";
@ -168,6 +168,7 @@ function register(router: Router) {
isEmpty, isEmpty,
subRoot, subRoot,
assetPath: isDev ? assetPath : `../${assetPath}`, assetPath: isDev ? assetPath : `../${assetPath}`,
assetUrlFragment,
appPath: isDev ? appPath : `../${appPath}`, appPath: isDev ? appPath : `../${appPath}`,
showLoginInShareTheme, showLoginInShareTheme,
t, t,

14
packages/share-theme/src/templates/page.ejs
View File

@ -93,8 +93,10 @@ const customServerYml = `- url: "{protocol}://{domain}:{port}/etapi"
<meta name="theme-color" content="<%= openGraphColor %>"> <meta name="theme-color" content="<%= openGraphColor %>">
</head> </head>
<% <%
const logoWidth = subRoot.note.getLabelValue("shareLogoWidth"); const customLogoId = subRoot.note.getRelation("shareLogo")?.value;
const logoHeight = subRoot.note.getLabelValue("shareLogoHeight"); const logoUrl = customLogoId ? `api/images/${customLogoId}/image.png` : `../${assetUrlFragment}/images/icon-color.svg`;
const logoWidth = subRoot.note.getLabelValue("shareLogoWidth") ?? 53;
const logoHeight = subRoot.note.getLabelValue("shareLogoHeight") ?? 40;
const mobileLogoHeight = logoHeight && logoWidth ? 32 / (logoWidth / logoHeight) : ""; const mobileLogoHeight = logoHeight && logoWidth ? 32 / (logoWidth / logoHeight) : "";
const shareRootLink = subRoot.note.hasLabel("shareRootLink") ? subRoot.note.getLabelValue("shareRootLink") : `./${subRoot.note.noteId}`; const shareRootLink = subRoot.note.hasLabel("shareRootLink") ? subRoot.note.getLabelValue("shareRootLink") : `./${subRoot.note.noteId}`;
const currentTheme = note.getLabel("shareTheme") === "light" ? "light" : "dark"; const currentTheme = note.getLabel("shareTheme") === "light" ? "light" : "dark";
@ -123,9 +125,7 @@ content = content.replaceAll(headingRe, (...match) => {
</script> </script>
<div id="mobile-header"> <div id="mobile-header">
<a href="<%= shareRootLink %>"> <a href="<%= shareRootLink %>">
<% if (subRoot.note.hasRelation("shareLogo")) { %> <img src="<%= logoUrl %>" width="32" height="<%= mobileLogoHeight %>" alt="Logo" />
<img src="api/images/<%= subRoot.note.getRelation("shareLogo").value %>/image.png" width="32" height="<%= mobileLogoHeight %>" alt="Logo" />
<% } %>
<%= subRoot.note.title %> <%= subRoot.note.title %>
</a> </a>
<button aria-label="Show Mobile Menu" id="show-menu-button"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><path d="M4 6h16v2H4zm0 5h16v2H4zm0 5h16v2H4z"></path></svg></button> <button aria-label="Show Mobile Menu" id="show-menu-button"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><path d="M4 6h16v2H4zm0 5h16v2H4zm0 5h16v2H4z"></path></svg></button>
@ -135,9 +135,7 @@ content = content.replaceAll(headingRe, (...match) => {
<div id="navigation"> <div id="navigation">
<div id="site-header"> <div id="site-header">
<a href="<%= shareRootLink %>"> <a href="<%= shareRootLink %>">
<% if (subRoot.note.hasRelation("shareLogo")) { %> <img src="<%= logoUrl %>" width="<%= logoWidth %>" height="<%= logoHeight %>" alt="Logo" />
<img src="api/images/<%= subRoot.note.getRelation("shareLogo").value %>/image.png" width="<%= logoWidth %>" height="<%= logoHeight %>" alt="Logo" />
<% } %>
<%= subRoot.note.title %> <%= subRoot.note.title %>
</a> </a>
<div class="theme-selection"> <div class="theme-selection">