tcsenpai/obsidiangarden_netlify
1
0
Fork 0
mirror of https://github.com/tcsenpai/obsidiangarden_netlify.git synced 2025-06-06 20:55:21 +00:00
Code Issues 5 Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Ole Eskild Steensen 2023-03-25 16:32:15 +01:00
commit 949e07318a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/helpers/filetreeUtils.js
View File

@ -77,8 +77,8 @@ function getPermalinkMeta(note, key) {
if (note.data.hide) { if (note.data.hide) {
hide = note.data.hide; hide = note.data.hide;
} }
if (frontMatter.data.pinned) { if (note.data.pinned) {
pinned = frontMatter.data.pinned; pinned = note.data.pinned;
} }
if (note.data["dg-path"]) { if (note.data["dg-path"]) {
folders = note.data["dg-path"].split("/"); folders = note.data["dg-path"].split("/");

1
src/helpers/linkUtils.js
View File

@ -57,6 +57,7 @@ function getGraph(data) {
neighbors: new Set(), neighbors: new Set(),
backLinks: new Set(), backLinks: new Set(),
noteIcon: v.data.noteIcon || process.env.NOTE_ICON_DEFAULT, noteIcon: v.data.noteIcon || process.env.NOTE_ICON_DEFAULT,
hide: v.data.hideInGraph || false,
}; };
stemURLs[fpath] = v.url; stemURLs[fpath] = v.url;
if ( if (

9
src/site/_includes/components/graphScript.njk
View File

@ -12,7 +12,9 @@
const keys = Object.values(existing).map((n) => n.neighbors).flat(); const keys = Object.values(existing).map((n) => n.neighbors).flat();
const n_remaining = Object.keys(remaining).reduce((acc, key) => { const n_remaining = Object.keys(remaining).reduce((acc, key) => {
if (keys.indexOf(key) != -1) { if (keys.indexOf(key) != -1) {
existing[key] = remaining[key]; if (!remaining[key].hide) {
existing[key] = remaining[key];
}
} else { } else {
acc[key] = remaining[key]; acc[key] = remaining[key];
} }
@ -164,9 +166,10 @@
window.fullGraph = null; window.fullGraph = null;
function renderFullGraph() { function renderFullGraph() {
if (!window.fullGraph) { if (!window.fullGraph) {
const hiddens = Object.values(window.graphData.nodes).filter((n) => n.hide).map((n) => n.id);
const graphData = { const graphData = {
links: JSON.parse(JSON.stringify(window.graphData.links)), links: JSON.parse(JSON.stringify(window.graphData.links)).filter((l) => hiddens.indexOf(l.source) == -1 && hiddens.indexOf(l.target) == -1),
nodes: [...Object.values(window.graphData.nodes)] nodes: [...Object.values(window.graphData.nodes).filter((n) => !n.hide)]
} }
let g = document.createElement('div'); let g = document.createElement('div');