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

Update to Trilium 0.62.3

Browse Source
This commit is contained in:
Zack Rauen 2023-12-05 20:50:29 -05:00
parent 5391521c08
commit 0016b43c09
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scripts/modules/search.ts
View File

@ -27,10 +27,10 @@ export default function setupSearch() {
searchInput.addEventListener("keyup", debounce(async () => { searchInput.addEventListener("keyup", debounce(async () => {
// console.log("CHANGE EVENT"); // console.log("CHANGE EVENT");
const current = document.body.dataset.noteId; const ancestor = document.body.dataset.ancestorNoteId;
const query = searchInput.value; const query = searchInput.value;
if (query.length < 3) return; if (query.length < 3) return;
const resp = await fetch(`api/search/${current}?query=${query}`); const resp = await fetch(`api/notes?search=${query}&ancestorNoteId=${ancestor}`);
const json = await resp.json() as SearchResults; const json = await resp.json() as SearchResults;
const results = json.results.slice(0, 5); const results = json.results.slice(0, 5);
const lines = [`<div class="search-results">`]; const lines = [`<div class="search-results">`];

22
src/templates/page.ejs
View File

@ -43,7 +43,7 @@ const customServerYml = `- url: "{protocol}://{domain}:{port}/etapi"
dom_id: "#content", dom_id: "#content",
responseInterceptor: resp => { responseInterceptor: resp => {
if (resp.url !== `<%= note.getLabelValue("shareSwagger") %>`) return resp; if (resp.url !== `<%= note.getLabelValue("shareSwagger") %>`) return resp;
resp.text = resp.text.replace("37740", "37840"); resp.text = resp.text.replace("- url: http://localhost:37740/etapi", "- url: http://localhost:37840/etapi");
resp.text = resp.text.replace(`- url: http://localhost:8080/etapi`, customServerYml); resp.text = resp.text.replace(`- url: http://localhost:8080/etapi`, customServerYml);
return resp; return resp;
} }
@ -64,21 +64,21 @@ const customServerYml = `- url: "{protocol}://{domain}:{port}/etapi"
<meta name="robots" content="noindex,follow" /> <meta name="robots" content="noindex,follow" />
<% } %> <% } %>
<%- header %> <%- header %>
<title><%= note.title %><% if (note.noteId !== subRoot.noteId) { %> - <%= subRoot.title %><% } %></title> <title><%= note.title %><% if (note.noteId !== subRoot.note.noteId) { %> - <%= subRoot.note.title %><% } %></title>
<!-- HTML Meta Tags --> <!-- HTML Meta Tags -->
<meta name="description" content="A website for guides, reference, showcase, inspiration, and more, all for Trilium Notes! Not convinced? Come see for yourself just what Trilium can do." <meta name="description" content="A website for guides, reference, showcase, inspiration, and more, all for Trilium Notes! Not convinced? Come see for yourself just what Trilium can do."
><!-- Facebook Meta Tags --> ><!-- Facebook Meta Tags -->
<meta property="og:url" content="https://trilium.rocks/"> <meta property="og:url" content="https://trilium.rocks/">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
<meta property="og:title" content="<%= note.title %><% if (note.noteId !== subRoot.noteId) { %> - <%= subRoot.title %><% } %>"> <meta property="og:title" content="<%= note.title %><% if (note.noteId !== subRoot.note.noteId) { %> - <%= subRoot.note.title %><% } %>">
<meta property="og:description" content="<%= note.getLabelValue("shareDescription") %>"> <meta property="og:description" content="<%= note.getLabelValue("shareDescription") %>">
<meta property="og:image" content="https://github.com/zadam/trilium/wiki/images/screenshot.png"> <meta property="og:image" content="https://github.com/zadam/trilium/wiki/images/screenshot.png">
<!-- Twitter Meta Tags --> <!-- Twitter Meta Tags -->
<meta name="twitter:card" content="summary_large_image"> <meta name="twitter:card" content="summary_large_image">
<meta property="twitter:domain" content="trilium.rocks"> <meta property="twitter:domain" content="trilium.rocks">
<meta property="twitter:url" content="https://trilium.rocks/"> <meta property="twitter:url" content="https://trilium.rocks/">
<meta name="twitter:title" content="<%= note.title %><% if (note.noteId !== subRoot.noteId) { %> - <%= subRoot.title %><% } %>"> <meta name="twitter:title" content="<%= note.title %><% if (note.noteId !== subRoot.note.noteId) { %> - <%= subRoot.note.title %><% } %>">
<meta name="twitter:description" content="<%= note.getLabelValue("shareDescription") %>"> <meta name="twitter:description" content="<%= note.getLabelValue("shareDescription") %>">
<meta name="twitter:image" content="https://github.com/zadam/trilium/wiki/images/screenshot.png"> <meta name="twitter:image" content="https://github.com/zadam/trilium/wiki/images/screenshot.png">
<!-- Meta Tags Generated via https://opengraph.dev --> <!-- Meta Tags Generated via https://opengraph.dev -->
@ -98,10 +98,10 @@ content = content.replaceAll(headingRe, (...match) => {
<body data-note-id="<%= note.noteId %>" class="type-<%= note.type %><%= themeClass %>"> <body data-note-id="<%= note.noteId %>" class="type-<%= note.type %><%= themeClass %>">
<div id="mobile-header"> <div id="mobile-header">
<a href="./"> <a href="./">
<% if (subRoot.hasRelation("shareLogo")) { %> <% if (subRoot.note.hasRelation("shareLogo")) { %>
<img src="api/images/<%= subRoot.getRelation("shareLogo").value %>/logo.svg" alt="Logo" /> <img src="api/images/<%= subRoot.note.getRelation("shareLogo").value %>/logo.svg" alt="Logo" />
<% } %> <% } %>
<%= subRoot.title %> <%= subRoot.note.title %>
</a> </a>
<button 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 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>
</div> </div>
@ -110,10 +110,10 @@ content = content.replaceAll(headingRe, (...match) => {
<div id="navigation"> <div id="navigation">
<div id="site-header"> <div id="site-header">
<a href="./"> <a href="./">
<% if (subRoot.hasRelation("shareLogo")) { %> <% if (subRoot.note.hasRelation("shareLogo")) { %>
<img src="api/images/<%= subRoot.getRelation("shareLogo").value %>/logo.svg" alt="Logo" /> <img src="api/images/<%= subRoot.note.getRelation("shareLogo").value %>/logo.svg" alt="Logo" />
<% } %> <% } %>
<%= subRoot.title %> <%= subRoot.note.title %>
</a> </a>
<div class="theme-selection"> <div class="theme-selection">
Site Theme Site Theme
@ -129,7 +129,7 @@ content = content.replaceAll(headingRe, (...match) => {
<input type="text" class="search-input" placeholder="Search..."> <input type="text" class="search-input" placeholder="Search...">
</div> </div>
</div> </div>
<% if (subRoot.hasVisibleChildren()) { %> <% if (subRoot.note.hasVisibleChildren()) { %>
<nav id="menu"> <nav id="menu">
<%- include('tree_item', {note: subRoot, activeNote: note, subRoot: subRoot}) %> <%- include('tree_item', {note: subRoot, activeNote: note, subRoot: subRoot}) %>
</nav> </nav>