Merge branch 'uroybd-graph-hover'

This commit is contained in:
Ole Eskild Steensen 2023-02-14 17:00:07 +01:00
commit c3c27293d2
8 changed files with 207 additions and 109 deletions

View File

@ -5,5 +5,5 @@ See the README in the plugin repo for information on how to set it up.
[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https://github.com/oleeskild/digitalgarden)
---
## Custom Styling
I encourage you to change the default styling to make the site your own. Please modify the custom-style.scss when doing so to avoid future conflict when updating the template.
## Docs
Docs are available at [dg-docs.ole.dev](https://dg-docs.ole.dev/)

24
package-lock.json generated
View File

@ -785,9 +785,9 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
},
"node_modules/axios": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz",
"integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==",
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.3.2.tgz",
"integrity": "sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==",
"dependencies": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
@ -5103,9 +5103,9 @@
}
},
"node_modules/sass": {
"version": "1.57.1",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz",
"integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==",
"version": "1.58.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
"integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
"dev": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
@ -7153,9 +7153,9 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
},
"axios": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz",
"integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==",
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.3.2.tgz",
"integrity": "sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==",
"requires": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
@ -10502,9 +10502,9 @@
}
},
"sass": {
"version": "1.57.1",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz",
"integrity": "sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==",
"version": "1.58.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
"integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0",

View File

@ -50,9 +50,17 @@
var Graph;
function renderGraph(graphData, id, width, height, delay) {
function renderGraph(graphData, id, delay) {
const el = document.getElementById(id);
width = el.offsetWidth;
height = el.offsetHeight;
const highlightNodes = new Set();
let hoverNode = null;
const color = getCssVar("--text-accent");
const mutedColor = getCssVar("--text-muted");
let Graph = ForceGraph()
(document.getElementById(id))
(el)
.graphData(graphData)
.nodeId('id')
.nodeLabel('title')
@ -63,15 +71,34 @@
.height(height)
.linkDirectionalArrowLength(2)
.linkDirectionalArrowRelPos(0.5)
.linkColor(() => getCssVar("--text-muted") || getCssVar("--text-normal"))
.autoPauseRedraw(false)
.linkColor((link) => {
if (hoverNode == null) {
return color;
}
if (link.source.id == hoverNode.id || link.target.id == hoverNode.id) {
return color;
} else {
return mutedColor;
}
})
.nodeCanvasObject((node, ctx) => {
const color = getCssVar("--text-accent");
const numberOfNeighbours = (node.neighbors && node.neighbors.length) || 2;
const nodeR = Math.min(7, Math.max(numberOfNeighbours / 2, 2));
ctx.beginPath();
ctx.arc(node.x, node.y, nodeR, 0, 2 * Math.PI, false);
ctx.fillStyle = color;
if (hoverNode == null) {
ctx.fillStyle = color;
} else {
if (node == hoverNode || highlightNodes.has(node.url)) {
ctx.fillStyle = color;
} else {
ctx.fillStyle = mutedColor;
}
}
ctx.fill();
if (node.current) {
@ -91,36 +118,48 @@
ctx.fillText(label, node.x, node.y + nodeR + 2);
})
.onNodeClick(node => {
window.location = node.url;
});
if (delay != null && graphData.nodes.length > 2) {
setTimeout(() => {
Graph.zoomToFit(5, 75);
}, delay);
window.location = node.url;
})
.onNodeHover(node => {
highlightNodes.clear();
if (node) {
highlightNodes.add(node);
node.neighbors.forEach(neighbor => highlightNodes.add(neighbor));
}
hoverNode = node || null;
});
if (delay != null && graphData.nodes.length > 4) {
setTimeout(() => {
Graph.zoomToFit(5, 75);
}, delay);
}
return Graph;
}
function fetchGraphData() {
fetch('/graph.json').then(res => res.json()).then(data => {
window.graphData = data;
Graph = renderGraph(filterToDepth(JSON.parse(JSON.stringify(data))), "link-graph", 320, 320, 1);
Graph = renderGraph(filterToDepth(JSON.parse(JSON.stringify(data))), "link-graph", 1);
});
}
fetchGraphData();
window.document.getElementById('graph-depth').value = window.maxGraphDepth;
window.document.getElementById('depth-display').innerText = window.maxGraphDepth;
window.document.getElementById('graph-depth').addEventListener('input', (evt) => {
window.document.getElementById('graph-depth').value = window.maxGraphDepth;
window.document.getElementById('depth-display').innerText = window.maxGraphDepth;
window.document.getElementById('graph-depth').addEventListener('input', (evt) => {
window.maxGraphDepth = evt.target.value;
window.document.getElementById('depth-display').innerText = window.maxGraphDepth;
window.maxGraphDepth = evt.target.value;
window.document.getElementById('depth-display').innerText = window.maxGraphDepth;
if (Graph != null) {
Graph._destructor();
Graph = null;
}
renderGraph(filterToDepth(JSON.parse(JSON.stringify(window.graphData))), "link-graph", 320, 320, 1);
})
Graph = renderGraph(filterToDepth(JSON.parse(JSON.stringify(window.graphData))), "link-graph", 1);
setTimeout(() => {
Graph.zoomToFit(5, 75);
}, 1);
});
window.fullGraph = null;
function renderFullGraph() {
@ -135,7 +174,7 @@
g.classList.add('show');
document.body.appendChild(g);
g.innerHTML = '<i class="fa fa-times" id="full-graph-close" aria-hidden="true"></i><div id="full-graph-container"></div>';
window.fullGraph = renderGraph(graphData, "full-graph-container", g.offsetWidth, g.offsetHeight, 200);
window.fullGraph = renderGraph(graphData, "full-graph-container", 200);
document.getElementById('full-graph-close').addEventListener('click', (evt) => {
g.classList.remove('show');
window.fullGraph._destructor();
@ -146,8 +185,23 @@
}
document.getElementById('graph-full-btn').addEventListener('click', (evt) => {
if (!fullGraph) {
document.getElementById('graph-fs-btn').addEventListener('click', (evt) => {
const el = document.querySelector('.graph');
if (el.classList.contains('graph-fs')) {
el.classList.remove('graph-fs');
Graph.width(el.offsetWidth).height(el.offsetWidth);
} else {
el.classList.add('graph-fs');
Graph.width(el.offsetWidth).height(el.offsetWidth);
}
setTimeout(() => {
Graph.zoomToFit(5, 75);
}, 1);
});
document.getElementById('global-graph-btn').addEventListener('click', (evt) => {
if (!window.fullGraph) {
renderFullGraph();
}
});

View File

@ -19,7 +19,10 @@
</div>
<span id="depth-display"></span>
</div>
<i class="fa fa-arrows-alt" id="graph-full-btn" aria-hidden="true"></i>
<div class="ctrl-right">
<i class="fa fa-globe" id="global-graph-btn" aria-hidden="true"></i>
<i class="fa fa-arrows-alt" id="graph-fs-btn" aria-hidden="true"></i>
</div>
</div>
</div>
<div id="link-graph"></div>

View File

@ -15,16 +15,15 @@ body {
margin-top: 90px;
position: relative;
@media(max-width: 800px) {
@media (max-width: 800px) {
margin-top: 75px;
}
}
.external-link {
background-position: center right;
background-repeat: no-repeat;
background-image: linear-gradient(transparent, transparent), url('/img/outgoing.svg');
background-image: linear-gradient(transparent, transparent), url("/img/outgoing.svg");
background-size: 13px;
padding-right: 16px;
background-position-y: 4px;
@ -54,14 +53,56 @@ ul.task-list {
.sidebar {
position: fixed;
top: 50%;
transform: translateY(calc(-50% + 75px));
top: 75px;
right: 0;
height: 100%;
min-width: 25px;
display: flex;
z-index: 3;
max-width: 350px;
.graph {
width: 320px;
min-height: 320px;
#link-graph {
width: 320px;
height: 320px;
}
#graph-fs-btn {
margin-right: 10px;
}
}
.graph-fs {
position: fixed;
top: 50%;
left: 50%;
height: calc(100vmin - 100px);
width: calc(100vmin - 100px);
min-height: 350px;
min-width: 350px;
transform: translate(-50%, -50%);
z-index: 9999;
display: block;
background-color: var(--background-secondary);
border: 1px solid var(--text-accent);
border-radius: 5px;
padding-top: 5px;
#link-graph {
width: 100%;
height: 100%;
}
#graph-controls{
margin-top: 10px;
}
.graph-title {
display: none;
}
}
}
.expand-line {
@ -91,7 +132,7 @@ ul.task-list {
font-size: 1rem;
max-height: 220px;
overflow-y: auto;
margin-bottom:10px;
margin-bottom: 10px;
border-left: 1px solid var(--text-accent);
ul {
list-style-type: none;
@ -100,19 +141,19 @@ ul.task-list {
margin-bottom: 0;
}
ul:not(:first-child) {
margin-bottom:3px;
margin-bottom: 3px;
}
li{
li {
padding-top: 4px;
&::before{
content: '# ' !important;
&::before {
content: "# " !important;
color: var(--text-accent);
font-size: 0.8rem;
}
a{
a {
text-decoration: none;
&:hover{
&:hover {
text-decoration: underline;
}
}
@ -149,7 +190,7 @@ ul.task-list {
border-left: 1px solid var(--text-accent);
max-height: 200px;
overflow-y: auto;
overflow-x:hidden;
overflow-x: hidden;
}
.backlink-card {
@ -164,17 +205,16 @@ ul.task-list {
}
}
.no-backlinks-message{
.no-backlinks-message {
font-size: 0.8rem;
color: var(--text-normal);
}
.graph {
.graph-title-container {
display: flex;
justify-content: flex-end;
width: 320px;
width: 100%;
}
.graph-title {
@ -195,9 +235,7 @@ ul.task-list {
width: fit-content;
}
@media(max-width: 1400px) {
@media (max-width: 1400px) {
#link-graph {
border-radius: 0 10px 10px 10px;
}
@ -213,7 +251,7 @@ ul.task-list {
justify-content: space-between;
}
.sidebar-container{
.sidebar-container {
display: flex;
flex-direction: row;
justify-content: space-between;
@ -221,7 +259,7 @@ ul.task-list {
.graph {
flex: 1;
.graph-title-container{
.graph-title-container {
justify-content: flex-start;
}
}
@ -230,8 +268,8 @@ ul.task-list {
display: none;
}
}
@media(max-width: 800px) {
.sidebar-container{
@media (max-width: 800px) {
.sidebar-container {
display: flex;
flex-direction: column-reverse;
}
@ -252,7 +290,7 @@ ul.task-list {
h1 {
font-size: 32px !important;
}
@media(max-width: 800px) {
@media (max-width: 800px) {
h1 {
display: none;
}
@ -269,7 +307,7 @@ ul.task-list {
justify-content: flex-end;
margin-bottom: -60px;
@media(max-width: 800px) {
@media (max-width: 800px) {
justify-content: center;
}
@ -290,11 +328,11 @@ ul.task-list {
display: flex;
justify-content: space-between;
align-items: center;
@media(max-width: 1400px) {
@media (max-width: 1400px) {
position: fixed;
}
@media(max-width: 800px) {
@media (max-width: 800px) {
h1 {
font-size: 18px !important;
}
@ -307,8 +345,7 @@ ul.task-list {
}
.search-button {
@media(max-width: 800px) {
@media (max-width: 800px) {
min-width: 36px;
margin: 10px 25px 10px 25px;
}
@ -317,7 +354,7 @@ ul.task-list {
.search-text {
display: flex;
justify-content: center;
@media(max-width: 800px){
@media (max-width: 800px) {
display: none;
}
}
@ -325,7 +362,7 @@ ul.task-list {
.notelink {
padding: 5px 0 5px 25px;
a{
a {
&:hover {
text-decoration: underline !important;
}
@ -361,10 +398,9 @@ ul.task-list {
right: 0;
left: 0;
bottom: 0;
z-index: 5
z-index: 5;
}
.search-container {
background-color: rgba(0, 0, 0, 0.5);
position: fixed;
@ -400,7 +436,6 @@ ul.task-list {
font-size: 2rem;
background-color: var(--background-primary);
color: var(--text-primary);
}
.search-box input:focus {
@ -425,7 +460,7 @@ ul.task-list {
font-size: 1.2rem;
cursor: pointer;
&.active{
&.active {
border: 2px solid var(--text-accent);
}
}
@ -459,25 +494,21 @@ ul.task-list {
border: 1px solid var(--text-normal);
cursor: pointer;
>span {
> span {
padding: 3px 3px 3px 10px;
}
>i {
> i {
margin-left: 10px;
}
&:hover {
border: 1px solid var(--text-accent);
}
}
.search-keys {
@media(max-width: 800px) {
@media (max-width: 800px) {
display: none;
}
}
@ -487,12 +518,12 @@ ul.task-list {
.callout-icon,
.callout-fold,
.callout-content {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}
.callout-fold{
cursor: pointer;
.callout-fold {
cursor: pointer;
}
.callout-title {
@ -501,10 +532,10 @@ ul.task-list {
}
.callout {
font-family: "Roboto", sans-serif;
word-wrap: break-word;
display: block;
font-size: 1rem;
font-family: "Roboto", sans-serif;
word-wrap: break-word;
display: block;
font-size: 1rem;
}
.callout.is-collapsed {
@ -529,8 +560,6 @@ ul.task-list {
margin-right: -10px;
}
// Graph Controls
.graph-title-container {
position: relative;
@ -540,14 +569,21 @@ ul.task-list {
position: fixed;
top: 50%;
left: 50%;
height: 60vh;
width: 60vw;
min-height: 400px;
min-width: 400px;
height: calc(100vmin - 100px);
width: calc(100vmin - 100px);
min-height: 350px;
min-width: 350px;
transform: translate(-50%, -50%);
z-index: 9999;
display: none;
background-color: var(--background-secondary);
border: 1px solid var(--text-accent);
border-radius: 5px;
#full-graph-container {
width: 100%;
height: 100%;
}
#full-graph-close {
position: absolute;
@ -580,6 +616,11 @@ ul.task-list {
color: var(--text-accent);
z-index: 9;
i {
cursor: pointer;
padding-right: 10px;
}
.depth-control {
display: flex;
flex-direction: row;
@ -604,8 +645,8 @@ ul.task-list {
#depth-display {
background-color: var(--text-accent);
color: white;
width: 1rem;
height: 1rem;
width: 1.3rem;
height: 1.3rem;
font-size: 0.8rem;
display: flex;
justify-content: center;
@ -616,7 +657,7 @@ ul.task-list {
}
}
input[type=range]::-webkit-slider-thumb {
-webkit-appearance: none;
margin-top: -10px;
input[type="range"]::-webkit-slider-thumb {
-webkit-appearance: none;
margin-top: -10px;
}

View File

@ -5867,7 +5867,7 @@ body {
.callout[data-callout="quote"],
.callout[data-callout="cite"] {
--callout-color: 158, 158, 158;
--callout-icon: quote-glyph;
--callout-icon: lucide-quote;
}
.callout {
overflow: hidden;

View File

@ -168,7 +168,7 @@ p>code {
.callout[data-callout="quote"],
.callout[data-callout="cite"] {
--callout-color: 158, 158, 158;
--callout-icon: quote-glyph;
--callout-icon: lucide-quote;
}
.callout {
overflow: hidden;