feat(MiniGraph): Implement 2-level depth, square aspect ratio & fix hero image

This commit is contained in:
Daniel LaForce 2025-04-26 18:47:08 -06:00
parent 7d0851f489
commit 1853271bd6
2 changed files with 322 additions and 212 deletions

View File

@ -8,6 +8,8 @@ interface Props {
title: string; // Current post title
tags?: string[]; // Current post tags
category?: string; // Current post category
relatedPosts?: any[]; // Related posts data
allPosts?: any[]; // All posts for second level relationships
}
// Extract props with defaults
@ -15,34 +17,127 @@ const {
slug,
title,
tags = [],
category = "Uncategorized"
category = "Uncategorized",
relatedPosts = [],
allPosts = []
} = Astro.props;
// Generate unique ID for the graph container
const graphId = `graph-${Math.random().toString(36).substring(2, 8)}`;
// Prepare simple graph data for just the post and its tags
// Get all unique tags from related posts (Level 1 tags)
const relatedPostsTags = relatedPosts
.flatMap(post => post.data.tags || [])
.filter(tag => !tags.includes(tag)); // Exclude current post tags to avoid duplicates
// Get Level 2 posts: posts related to Level 1 tags (excluding current post and Level 1 posts)
const level2PostIds = new Set();
const level2Posts = [];
// For each Level 1 tag, find related posts
tags.forEach(tag => {
allPosts.forEach(post => {
// Skip if post is current post or already in related posts
if (post.slug === slug || relatedPosts.some(rp => rp.slug === post.slug)) {
return;
}
// If post has the tag and isn't already added
if (post.data.tags?.includes(tag) && !level2PostIds.has(post.slug)) {
level2PostIds.add(post.slug);
level2Posts.push(post);
}
});
});
// Get Level 2 tags from Level 2 posts
const level2Tags = new Set();
level2Posts.forEach(post => {
(post.data.tags || []).forEach(tag => {
// Only add if not already in Level 0 or Level 1 tags
if (!tags.includes(tag) && !relatedPostsTags.includes(tag)) {
level2Tags.add(tag);
}
});
});
// Prepare nodes data with different levels
const nodes = [
// Current post node
// Level 0: Current post node
{
id: slug,
label: title,
type: "post"
type: "post",
level: 0
},
// Tag nodes
// Level 1: Tag nodes
...tags.map(tag => ({
id: `tag-${tag}`,
label: tag,
type: "tag"
type: "tag",
level: 1
})),
// Level 1: Related post nodes
...relatedPosts.map(post => ({
id: post.slug,
label: post.data.title,
type: "post",
level: 1
})),
// Level 2: Related tags nodes
...relatedPostsTags.map(tag => ({
id: `tag-${tag}`,
label: tag,
type: "tag",
level: 2
})),
// Level 2: Posts related to tags
...level2Posts.map(post => ({
id: post.slug,
label: post.data.title,
type: "post",
level: 2
})),
// Level 2: Tags from Level 2 posts
...[...level2Tags].map(tag => ({
id: `tag-${tag}`,
label: tag.toString(),
type: "tag",
level: 2
}))
];
// Create edges connecting post to tags
const edges = tags.map(tag => ({
source: slug,
target: `tag-${tag}`,
type: "post-tag"
}));
// Create edges connecting nodes
const edges = [
// Level 0 to Level 1: Current post to its tags
...tags.map(tag => ({
source: slug,
target: `tag-${tag}`,
type: "post-tag"
})),
// Level 0 to Level 1: Current post to related posts
...relatedPosts.map(post => ({
source: slug,
target: post.slug,
type: "post-related"
})),
// Level 1 to Level 2: Related posts to their tags
...relatedPosts.flatMap(post =>
(post.data.tags || []).map(tag => ({
source: post.slug,
target: `tag-${tag}`,
type: "post-tag"
}))
),
// Level 1 to Level 2: Tags to related posts
...level2Posts.flatMap(post =>
tags.filter(tag => post.data.tags?.includes(tag)).map(tag => ({
source: `tag-${tag}`,
target: post.slug,
type: "tag-post"
}))
)
];
// Prepare graph data object
const graphData = { nodes, edges };
@ -69,7 +164,7 @@ const graphData = { nodes, edges };
.mini-graph-container {
width: 100%;
height: 200px;
aspect-ratio: 1 / 1; /* Create square aspect ratio */
border-radius: 8px;
overflow: hidden;
border: 1px solid var(--card-border, rgba(56, 189, 248, 0.2));
@ -125,7 +220,8 @@ const graphData = { nodes, edges };
data: {
id: node.id,
label: node.label,
type: node.type
type: node.type,
level: node.level
}
})),
...graphData.edges.map((edge, index) => ({
@ -155,47 +251,104 @@ const graphData = { nodes, edges };
'text-max-width': '60px'
}
},
// Post node style
// Current post node style (Level 0)
{
selector: 'node[type="post"]',
selector: 'node[type="post"][level=0]',
style: {
'background-color': '#06B6D4',
'width': 30,
'height': 30,
'font-size': '9px',
'text-max-width': '80px'
'text-max-width': '80px',
'border-width': 2,
'border-color': '#38BDF8'
}
},
// Tag node style
// Related post node style (Level 1)
{
selector: 'node[type="tag"]',
selector: 'node[type="post"][level=1]',
style: {
'background-color': '#3B82F6',
'width': 25,
'height': 25,
'font-size': '8px'
}
},
// Distant post node style (Level 2)
{
selector: 'node[type="post"][level=2]',
style: {
'background-color': '#60A5FA',
'width': 20,
'height': 20,
'font-size': '7px',
'opacity': 0.8
}
},
// Primary tag node style (Level 1)
{
selector: 'node[type="tag"][level=1]',
style: {
'background-color': '#10B981',
'shape': 'diamond',
'width': 18,
'height': 18
'width': 20,
'height': 20
}
},
// Edge style
// Secondary tag node style (Level 2)
{
selector: 'edge',
selector: 'node[type="tag"][level=2]',
style: {
'width': 1,
'line-color': 'rgba(16, 185, 129, 0.6)',
'background-color': '#34D399',
'shape': 'diamond',
'width': 15,
'height': 15,
'opacity': 0.8
}
},
// Direct edge style
{
selector: 'edge[type="post-tag"]',
style: {
'width': 1.5,
'line-color': 'rgba(16, 185, 129, 0.7)',
'line-style': 'solid',
'curve-style': 'bezier',
'opacity': 0.8
}
},
// Related post edge style
{
selector: 'edge[type="post-related"]',
style: {
'width': 1.5,
'line-color': 'rgba(59, 130, 246, 0.7)',
'line-style': 'dashed',
'curve-style': 'bezier',
'opacity': 0.7
'opacity': 0.8
}
},
// Secondary connections
{
selector: 'edge[type="tag-post"]',
style: {
'width': 1,
'line-color': 'rgba(16, 185, 129, 0.4)',
'line-style': 'dotted',
'curve-style': 'bezier',
'opacity': 0.6
}
}
],
// Simple layout for small space
// Improved layout for multi-level visualization
layout: {
name: 'concentric',
concentric: function(node) {
return node.data('type') === 'post' ? 10 : 1;
// Use node level for concentric layout
return 10 - node.data('level') * 3;
},
levelWidth: function() { return 1; },
minNodeSpacing: 50,
levelWidth: function() { return 2; },
minNodeSpacing: 40,
animate: false
}
});
@ -207,6 +360,12 @@ const graphData = { nodes, edges };
window.location.href = `/tag/${tagName}`;
});
cy.on('tap', 'node[type="post"][level!=0]', function(evt) {
const node = evt.target;
const postSlug = node.id();
window.location.href = `/posts/${postSlug}/`;
});
// Fit graph to container
cy.fit(undefined, 20);

View File

@ -2,7 +2,7 @@
// src/pages/posts/[slug].astro
import { getCollection } from 'astro:content';
import BaseLayout from '../../layouts/BaseLayout.astro';
import MiniGraph from '../../components/MiniGraph.astro'; // Add import for MiniGraph
import MiniGraph from '../../components/MiniGraph.astro';
// Required getStaticPaths function for dynamic routes
export async function getStaticPaths() {
@ -11,7 +11,7 @@ export async function getStaticPaths() {
const allPosts = await getCollection('posts', ({ data }) => {
return import.meta.env.PROD ? !data.draft : true;
});
return allPosts.map(post => ({
params: { slug: post.slug },
props: { post, allPosts },
@ -58,10 +58,10 @@ const getISODate = (date) => {
// Find related posts by tags
const getRelatedPosts = (currentPost, allPosts, maxPosts = 3) => {
if (!currentPost || !allPosts) return [];
// Get current post tags
const postTags = currentPost.data.tags || [];
// If no tags, just return recent posts
if (postTags.length === 0) {
return allPosts
@ -73,7 +73,7 @@ const getRelatedPosts = (currentPost, allPosts, maxPosts = 3) => {
})
.slice(0, maxPosts);
}
// Score posts by matching tags
const scoredPosts = allPosts
.filter(p => p.slug !== currentPost.slug && !p.data.draft)
@ -86,20 +86,20 @@ const getRelatedPosts = (currentPost, allPosts, maxPosts = 3) => {
.sort((a, b) => {
// Sort by score first
if (b.score !== a.score) return b.score - a.score;
// If scores are equal, sort by date
const dateA = a.post.data.pubDate ? new Date(a.post.data.pubDate) : new Date(0);
const dateB = b.post.data.pubDate ? new Date(b.post.data.pubDate) : new Date(0);
return dateB.getTime() - dateA.getTime();
})
.slice(0, maxPosts);
// If we don't have enough related posts by tags, add recent posts
if (scoredPosts.length < maxPosts) {
const recentPosts = allPosts
.filter(p => {
return p.slug !== currentPost.slug &&
!p.data.draft &&
return p.slug !== currentPost.slug &&
!p.data.draft &&
!scoredPosts.some(sp => sp.post.slug === p.slug);
})
.sort((a, b) => {
@ -108,10 +108,10 @@ const getRelatedPosts = (currentPost, allPosts, maxPosts = 3) => {
return dateB.getTime() - dateA.getTime();
})
.slice(0, maxPosts - scoredPosts.length);
return [...scoredPosts.map(sp => sp.post), ...recentPosts];
}
return scoredPosts.map(sp => sp.post);
};
@ -119,7 +119,7 @@ const getRelatedPosts = (currentPost, allPosts, maxPosts = 3) => {
const relatedPosts = getRelatedPosts(post, allPosts);
// Check for explicitly related posts in frontmatter
const explicitRelatedPosts = post.data.related_posts
const explicitRelatedPosts = post.data.related_posts
? allPosts.filter(p => post.data.related_posts.includes(p.slug))
: [];
@ -144,51 +144,44 @@ const { Content } = await post.render();
{post.data.author && <div class="author">By {post.data.author}</div>}
</div>
</header>
{post.data.heroImage && (
<div class="hero-image">
<img src={post.data.heroImage} alt={post.data.title} />
</div>
)}
<div class="post-content">
<div class="post-body">
<Content />
<div class="post-main-column">
{post.data.heroImage && (
<div class="hero-image">
<img src={post.data.heroImage} alt={post.data.title} />
</div>
)}
<div class="post-body">
<Content />
</div>
</div>
<aside class="post-sidebar">
<!-- 1. Author Card (New) -->
{post.data.author && (
<div class="author-card sidebar-block">
<h3 class="sidebar-title">Author</h3>
<div class="author-profile">
<div class="author-avatar">
{post.data.authorImage ?
<img src={post.data.authorImage} alt={post.data.author} /> :
<div class="default-avatar">{post.data.author.charAt(0)}</div>
}
</div>
<div class="author-info">
<div class="author-name">{post.data.author}</div>
{post.data.authorBio && <div class="author-bio">{post.data.authorBio}</div>}
{post.data.authorUrl && <a href={post.data.authorUrl} class="author-link">Profile</a>}
</div>
<div class="author-section sidebar-block">
<h3>Author</h3>
<div class="author-card">
<div class="author-name">{post.data.author}</div>
</div>
</div>
)}
<!-- 2. Mini Knowledge Graph (New) -->
<MiniGraph
slug={post.slug}
title={post.data.title}
tags={post.data.tags || []}
category={post.data.category || ''}
/>
<div class="knowledge-graph-section sidebar-block">
<MiniGraph
slug={post.slug}
title={post.data.title}
tags={post.data.tags || []}
category={post.data.category || "Uncategorized"}
relatedPosts={combinedRelatedPosts}
allPosts={allPosts}
/>
</div>
<!-- 3. Tags (Existing, moved below MiniGraph) -->
{post.data.tags && post.data.tags.length > 0 && (
<div class="tags-section sidebar-block">
<h3 class="sidebar-title">Tags</h3>
<h3>Tags</h3>
<div class="tags">
{post.data.tags.map(tag => (
<a href={`/tag/${tag}`} class="tag">{tag}</a>
@ -196,19 +189,19 @@ const { Content } = await post.render();
</div>
</div>
)}
{post.data.category && (
<div class="category-section sidebar-block">
<h3 class="sidebar-title">Category</h3>
<h3>Category</h3>
<a href={`/categories/${post.data.category}`} class="category">
{post.data.category}
</a>
</div>
)}
{post.data.categories && post.data.categories.length > 0 && (
<div class="categories-section sidebar-block">
<h3 class="sidebar-title">Categories</h3>
<h3>Categories</h3>
<div class="categories">
{post.data.categories.map(category => (
<a href={`/categories/${category}`} class="category">
@ -218,10 +211,10 @@ const { Content } = await post.render();
</div>
</div>
)}
{combinedRelatedPosts.length > 0 && (
<div class="related-posts-section sidebar-block">
<h3 class="sidebar-title">Related Articles</h3>
<h3>Related Articles</h3>
<ul class="related-posts">
{combinedRelatedPosts.map(relatedPost => (
<li>
@ -238,7 +231,7 @@ const { Content } = await post.render();
)}
</aside>
</div>
<div class="post-navigation">
<a href="/blog" class="back-to-blog">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@ -257,22 +250,22 @@ const { Content } = await post.render();
margin: 0 auto;
padding: 0 var(--container-padding, 1.5rem);
}
.blog-post {
padding: 2rem 0;
}
.post-header {
margin-bottom: 2rem;
text-align: center;
}
.post-header h1 {
font-size: var(--font-size-4xl, 2.25rem);
margin-bottom: 1rem;
line-height: 1.2;
}
.post-meta {
display: flex;
flex-wrap: wrap;
@ -282,117 +275,61 @@ const { Content } = await post.render();
font-size: var(--font-size-sm, 0.875rem);
font-family: var(--font-mono);
}
.hero-image {
margin-bottom: 2rem;
border-radius: 12px;
overflow: hidden;
border: 1px solid var(--border-primary);
}
.hero-image img {
width: 100%;
height: auto;
display: block;
}
.post-content {
display: grid;
grid-template-columns: 3fr 1fr;
gap: 2rem;
}
.post-main-column {
display: flex;
flex-direction: column;
}
.hero-image {
margin-bottom: 2rem;
border-radius: 12px;
overflow: hidden;
border: 1px solid var(--border-primary);
/* Hero image now contained within post-main-column */
width: 100%;
}
.hero-image img {
width: 100%;
height: auto;
display: block;
}
.post-body {
background: var(--card-bg);
border-radius: 12px;
padding: 2rem;
border: 1px solid var(--border-primary);
}
.post-sidebar {
display: flex;
flex-direction: column;
gap: 1.5rem;
}
.sidebar-block {
background: var(--card-bg);
border-radius: 12px;
padding: 1.5rem;
border: 1px solid var(--border-primary);
}
.sidebar-block h3, .sidebar-title {
.sidebar-block h3 {
font-size: var(--font-size-lg, 1.125rem);
margin-bottom: 1rem;
color: var(--text-primary);
}
/* Author Card Styles */
.author-profile {
display: flex;
align-items: center;
gap: 1rem;
}
.author-avatar {
width: 60px;
height: 60px;
border-radius: 50%;
overflow: hidden;
border: 2px solid var(--accent-primary);
}
.author-avatar img {
width: 100%;
height: 100%;
object-fit: cover;
}
.default-avatar {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
background: linear-gradient(135deg, var(--accent-primary), var(--accent-secondary));
color: white;
font-size: 1.5rem;
font-weight: bold;
}
.author-info {
flex: 1;
}
.author-name {
font-weight: 600;
font-size: 1.1rem;
margin-bottom: 0.25rem;
color: var(--text-primary);
}
.author-bio {
font-size: 0.875rem;
color: var(--text-secondary);
margin-bottom: 0.5rem;
line-height: 1.4;
}
.author-link {
display: inline-block;
font-size: 0.8rem;
padding: 0.25rem 0.75rem;
background: rgba(6, 182, 212, 0.1);
border-radius: 20px;
color: var(--accent-primary);
text-decoration: none;
transition: all 0.2s ease;
}
.author-link:hover {
background: rgba(6, 182, 212, 0.2);
transform: translateY(-2px);
.knowledge-graph-section {
padding: 1rem;
}
.tags {
@ -400,7 +337,7 @@ const { Content } = await post.render();
flex-wrap: wrap;
gap: 0.5rem;
}
.tag {
display: inline-block;
padding: 0.25rem 0.75rem;
@ -411,18 +348,18 @@ const { Content } = await post.render();
text-decoration: none;
transition: all 0.2s ease;
}
.tag:hover {
background: rgba(16, 185, 129, 0.2);
transform: translateY(-2px);
}
.category, .categories {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
.category {
display: inline-block;
padding: 0.5rem 1rem;
@ -435,27 +372,41 @@ const { Content } = await post.render();
transition: all 0.3s ease;
text-align: center;
}
.category:hover {
transform: translateY(-2px);
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.1);
}
/* Author Card */
.author-card {
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}
.author-name {
font-weight: 600;
margin-top: 0.5rem;
color: var(--text-primary);
}
/* Related Posts */
.related-posts {
list-style: none;
padding: 0;
margin: 0;
}
.related-posts li {
margin-bottom: 1rem;
}
.related-posts li:last-child {
margin-bottom: 0;
}
.related-post {
display: block;
padding: 0.75rem;
@ -464,20 +415,20 @@ const { Content } = await post.render();
text-decoration: none;
transition: all 0.2s ease;
}
.related-post:hover {
background: rgba(6, 182, 212, 0.05);
border-color: var(--accent-primary);
transform: translateY(-2px);
}
.related-post-title {
color: var(--text-primary);
font-size: 0.9rem;
margin-bottom: 0.5rem;
font-weight: 500;
}
.related-post-meta {
font-size: 0.75rem;
color: var(--text-tertiary);
@ -490,7 +441,7 @@ const { Content } = await post.render();
display: flex;
justify-content: center;
}
.back-to-blog {
display: flex;
align-items: center;
@ -504,57 +455,57 @@ const { Content } = await post.render();
font-weight: 500;
transition: all 0.2s ease;
}
.back-to-blog:hover {
border-color: var(--accent-primary);
background: var(--bg-tertiary);
transform: translateY(-2px);
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.05);
}
/* Content Styling */
.post-body {
font-size: 1.05rem;
line-height: 1.7;
color: var(--text-primary);
}
.post-body h2 {
font-size: 1.8rem;
margin: 2rem 0 1rem;
color: var(--text-primary);
}
.post-body h3 {
font-size: 1.4rem;
margin: 1.75rem 0 0.75rem;
color: var(--text-primary);
}
.post-body p {
margin-bottom: 1.25rem;
}
.post-body a {
color: var(--accent-primary);
text-decoration: none;
border-bottom: 1px dashed var(--accent-primary);
transition: all 0.2s ease;
}
.post-body a:hover {
color: var(--accent-secondary);
border-bottom-style: solid;
}
.post-body ul, .post-body ol {
margin: 1rem 0 1.5rem 1.5rem;
}
.post-body li {
margin-bottom: 0.5rem;
}
.post-body blockquote {
margin: 1.5rem 0;
padding: 1rem 1.5rem;
@ -564,7 +515,7 @@ const { Content } = await post.render();
color: var(--text-secondary);
font-style: italic;
}
.post-body code {
font-family: var(--font-mono);
background: rgba(15, 23, 42, 0.3);
@ -572,7 +523,7 @@ const { Content } = await post.render();
border-radius: 4px;
font-size: 0.9em;
}
.post-body pre {
background: rgba(15, 23, 42, 0.3);
padding: 1rem;
@ -581,54 +532,54 @@ const { Content } = await post.render();
margin: 1.5rem 0;
border: 1px solid var(--border-primary);
}
.post-body pre code {
background: transparent;
padding: 0;
font-size: 0.9em;
color: var(--text-primary);
}
.post-body img {
max-width: 100%;
height: auto;
border-radius: 8px;
margin: 1.5rem 0;
}
.post-body table {
width: 100%;
border-collapse: collapse;
margin: 1.5rem 0;
}
.post-body th, .post-body td {
border: 1px solid var(--border-primary);
padding: 0.75rem;
}
.post-body th {
background: rgba(15, 23, 42, 0.3);
font-weight: 600;
text-align: left;
}
/* Responsive Adjustments */
@media (max-width: 1024px) {
.post-header h1 {
font-size: var(--font-size-3xl, 1.875rem);
}
}
@media (max-width: 768px) {
.post-content {
grid-template-columns: 1fr;
}
.post-header h1 {
font-size: var(--font-size-2xl, 1.5rem);
}
.post-body {
padding: 1.5rem;
}
@ -644,7 +595,7 @@ const { Content } = await post.render();
// Already links, no need for additional JS
});
});
// Add scroll-to-top button when scrolling down
const scrollToTop = document.createElement('button');
scrollToTop.className = 'scroll-to-top';
@ -654,7 +605,7 @@ const { Content } = await post.render();
</svg>
`;
document.body.appendChild(scrollToTop);
// Show/hide scroll-to-top button
window.addEventListener('scroll', () => {
if (window.scrollY > 500) {
@ -663,7 +614,7 @@ const { Content } = await post.render();
scrollToTop.classList.remove('visible');
}
});
// Scroll to top when clicked
scrollToTop.addEventListener('click', () => {
window.scrollTo({
@ -697,18 +648,18 @@ const { Content } = await post.render();
transform: translateY(20px);
z-index: 100;
}
.scroll-to-top.visible {
opacity: 1;
visibility: visible;
transform: translateY(0);
}
.scroll-to-top:hover {
transform: translateY(-5px);
box-shadow: 0 8px 20px rgba(0, 0, 0, 0.3);
}
@media (max-width: 768px) {
.scroll-to-top {
width: 40px;
@ -716,7 +667,7 @@ const { Content } = await post.render();
bottom: 20px;
right: 20px;
}
.scroll-to-top svg {
width: 20px;
height: 20px;