fresh-main #8
|
|
@ -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 => ({
|
||||
// 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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
@ -145,50 +145,43 @@ const { Content } = await post.render();
|
|||
</div>
|
||||
</header>
|
||||
|
||||
<div class="post-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-content">
|
||||
<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-section sidebar-block">
|
||||
<h3>Author</h3>
|
||||
<div class="author-card">
|
||||
<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>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<!-- 2. Mini Knowledge Graph (New) -->
|
||||
<div class="knowledge-graph-section sidebar-block">
|
||||
<MiniGraph
|
||||
slug={post.slug}
|
||||
title={post.data.title}
|
||||
tags={post.data.tags || []}
|
||||
category={post.data.category || ''}
|
||||
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>
|
||||
|
|
@ -199,7 +192,7 @@ const { Content } = await post.render();
|
|||
|
||||
{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>
|
||||
|
|
@ -208,7 +201,7 @@ const { Content } = await post.render();
|
|||
|
||||
{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">
|
||||
|
|
@ -221,7 +214,7 @@ const { Content } = await post.render();
|
|||
|
||||
{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>
|
||||
|
|
@ -283,11 +276,24 @@ const { Content } = await post.render();
|
|||
font-family: var(--font-mono);
|
||||
}
|
||||
|
||||
.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 {
|
||||
|
|
@ -296,12 +302,6 @@ const { Content } = await post.render();
|
|||
display: block;
|
||||
}
|
||||
|
||||
.post-content {
|
||||
display: grid;
|
||||
grid-template-columns: 3fr 1fr;
|
||||
gap: 2rem;
|
||||
}
|
||||
|
||||
.post-body {
|
||||
background: var(--card-bg);
|
||||
border-radius: 12px;
|
||||
|
|
@ -322,77 +322,14 @@ const { Content } = await post.render();
|
|||
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 {
|
||||
|
|
@ -441,6 +378,20 @@ const { Content } = await post.render();
|
|||
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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue