Skip to content

Commit dc33b51

Browse files
SpriCoderSpriCoder
committed
Unify topics and courses in a vertical list
1 parent bb26e92 commit dc33b51

4 files changed

Lines changed: 27 additions & 23 deletions

File tree

‎src/pages/courses/[...slug].astro‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ if (ungroupedPosts.length > 0) groups.push({ id: 'other', label: '其他笔记',
2727
<SiteLayout title={`${course.name} · 课程笔记`} description={course.description}>
2828
<div class="container">
2929
<header class="page-header course-header">
30-
<a class="breadcrumb" href="/courses/">← 全部课程</a>
30+
<a class="breadcrumb" href="/series/#course-collections">← 全部专题</a>
3131
<p class="eyebrow">{course.domain} · {course.year ? course.year : '学习笔记'}</p>
3232
<h1>{course.name}</h1>
3333
<p>{course.description}</p>
3434
<div class="collection-summary"><span><strong>{posts.length}</strong> 篇笔记</span></div>
3535
</header>
3636
<div class="course-layout">
37-
<nav class="course-outline" aria-label="课程目录"><p>课程目录</p><ul>{groups.map((group, index) => <li><a href={`#group-${index + 1}`}><span>{group.label}</span><span>{group.posts.length}</span></a></li>)}</ul><a class="course-outline-back" href="/courses/">浏览其他课程 →</a></nav>
37+
<nav class="course-outline" aria-label="课程目录"><p>课程目录</p><ul>{groups.map((group, index) => <li><a href={`#group-${index + 1}`}><span>{group.label}</span><span>{group.posts.length}</span></a></li>)}</ul></nav>
3838
<div class="course-chapters">{groups.map((group, index) => <section class="course-chapter" aria-labelledby={`group-${index + 1}`}><div class="course-chapter-heading"><h2 id={`group-${index + 1}`}>{group.label}</h2><span>{group.posts.length} 篇笔记</span></div><ol class="course-note-list">{group.posts.map((post, noteIndex) => <li><a class="course-note-link" href={post.url}><span class="course-note-number" aria-hidden="true">{String(noteIndex + 1).padStart(2, '0')}</span><span class="course-note-title">{post.title}</span><span class="course-note-reading">约 {Math.max(1, post.readingMinutes || 1)} 分钟</span><span class="course-note-arrow" aria-hidden="true">↗</span></a></li>)}</ol></section>)}</div>
3939
</div>
4040
</div>

‎src/pages/index.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const descriptions: Record<string, string> = {
3636
<nav class="home-courses" aria-label="课程笔记">
3737
<span class="home-courses-label">课程笔记</span>
3838
{featuredCourses.map(course => <a href={`/courses/${course.slug}/`}>{course.name.replace(/\s*（\d{4}）$/, '')}</a>)}
39-
<a class="home-courses-all" href="/courses/">全部课程 →</a>
39+
<a class="home-courses-all" href="/series/#course-collections">全部课程 →</a>
4040
</nav>
4141
<section class="home-section" aria-labelledby="latest-posts">
4242
<div class="section-heading"><h2 id="latest-posts">最新文章</h2><a class="text-link" href="/archives/">全部文章</a></div>

‎src/pages/series/index.astro‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,26 @@ const descriptions: Record<string, string> = {
1111
'玩转时序数据集': 'TsFile、IoTDB、数据访问与常用工具。',
1212
'基准测试方法与实践': '工作负载设计、测试工具与性能结果分析。',
1313
};
14+
const topics = [
15+
...series.map((name, index) => ({
16+
name,
17+
description: descriptions[name],
18+
url: `/series/${seriesSlug(name)}/`,
19+
count: posts.filter(post => post.series === name).length,
20+
anchor: index === 0 ? 'technical-series' : undefined,
21+
})),
22+
...domains.flatMap(domain => courses.filter(course => course.domain === domain)).map((course, index) => ({
23+
name: course.name,
24+
description: course.description,
25+
url: `/courses/${course.slug}/`,
26+
count: courseCounts.get(course.slug),
27+
anchor: index === 0 ? 'course-collections' : undefined,
28+
})),
29+
];
1430
---
1531
<SiteLayout title="专题" description="数据库、AI 协作与基准测试的技术系列，以及计算机和软件工程课程笔记。">
1632
<div class="container">
17-
<header class="page-header"><h1>专题</h1><p>技术系列与课程笔记。</p></header>
18-
<section aria-labelledby="technical-series">
19-
<div class="section-heading"><h2 id="technical-series">技术系列</h2><span class="section-label">{series.length} 个系列</span></div>
20-
<div class="series-grid">{series.map(name => <a class="series-card" href={`/series/${seriesSlug(name)}/`}><h3>{name}</h3><p>{descriptions[name]}</p><span class="series-card-meta">{posts.filter(post => post.series === name).length} 篇文章</span></a>)}</div>
21-
</section>
22-
<section class="home-section" aria-labelledby="course-collections">
23-
<div class="section-heading"><h2 id="course-collections">课程笔记</h2><a class="text-link" href="/courses/">全部课程</a></div>
24-
<div class="course-directory">{domains.map(domain => <section class="course-domain"><h3>{domain}</h3><ul class="course-directory-list">{courses.filter(course => course.domain === domain).map(course => <li><a class="course-directory-link" href={`/courses/${course.slug}/`}><span class="course-directory-title">{course.name}</span><span class="course-directory-meta"><span>{course.year ? course.year : '学习笔记'}</span><span>{courseCounts.get(course.slug)} 篇</span><span aria-hidden="true">↗</span></span></a></li>)}</ul></section>)}</div>
25-
</section>
33+
<header class="page-header"><h1>专题</h1><p>{topics.length} 个专题</p></header>
34+
<ul class="course-directory-list" aria-label="全部专题">{topics.map(topic => <li id={topic.anchor}><a class="course-directory-link" href={topic.url}><span class="course-directory-main"><span class="course-directory-title">{topic.name}</span><span class="course-directory-description">{topic.description}</span></span><span class="course-directory-meta"><span>{topic.count} 篇</span><span aria-hidden="true">→</span></span></a></li>)}</ul>
2635
</div>
2736
</SiteLayout>

‎src/styles/global.css‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,27 +127,26 @@ html[data-theme='dark'] .theme-icon-moon { display: none; }
127127
.course-domain-nav { display: flex; flex-wrap: wrap; gap: 8px 20px; margin-top: 26px; font-size: 12px; }
128128
.course-domain-nav a { color: var(--ink); border-bottom: 1px solid var(--line); padding-bottom: 4px; }
129129
.course-domain-nav a:hover { color: var(--accent); border-color: var(--accent); }
130-
.course-directory { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 36px 40px; }
130+
.course-directory { display: grid; grid-template-columns: minmax(0, 1fr); gap: 32px; }
131131
.course-domain { min-width: 0; }
132132
.course-domain > h2, .course-domain > h3 { font: 600 21px/1.6 var(--serif); margin-bottom: 14px; }
133133
.course-directory-list { list-style: none; padding: 0; margin: 0; border-top: 1px solid var(--line); }
134134
.course-directory-list li { border-bottom: 1px solid var(--line); }
135135
.course-directory-link { display: flex; gap: 20px; align-items: center; justify-content: space-between; padding-block: 15px; }
136136
.course-directory-main { min-width: 0; }
137-
.course-directory-title { display: block; color: var(--ink); font-size: 15px; font-weight: 600; line-height: 1.7; }
137+
.course-directory-title { display: block; overflow-wrap: anywhere; color: var(--ink); font-size: 15px; font-weight: 600; line-height: 1.7; }
138138
.course-directory-link:hover .course-directory-title { color: var(--accent); }
139139
.course-directory-description { display: block; margin-top: 4px; color: var(--muted); font-size: 11px; line-height: 1.8; }
140140
.course-directory-meta { display: flex; flex-wrap: wrap; justify-content: flex-end; align-items: center; gap: 4px 10px; flex-shrink: 0; color: var(--muted); font-size: 10px; }
141141
.course-directory-meta > :last-child { color: var(--accent); font-size: 15px; }
142142
.course-header { border-bottom: 1px solid var(--line); padding-bottom: 30px; margin-bottom: 36px; }
143-
.course-layout { display: grid; grid-template-columns: 190px minmax(0, 1fr); gap: 48px; align-items: start; }
144-
.course-outline { position: sticky; top: 28px; min-width: 0; font-size: 12px; }
143+
.course-layout { display: grid; grid-template-columns: minmax(0, 1fr); gap: 28px; }
144+
.course-outline { min-width: 0; max-width: 360px; font-size: 12px; }
145145
.course-outline > p { margin-bottom: 12px; color: var(--ink); font-weight: 600; }
146146
.course-outline ul { margin: 0; padding: 0; list-style: none; }
147147
.course-outline li a { display: flex; justify-content: space-between; gap: 18px; padding-block: 8px; color: var(--muted); }
148148
.course-outline li a:hover { color: var(--accent); }
149149
.course-outline li a > :last-child { font-family: var(--mono); font-size: 10px; }
150-
.course-outline-back { display: inline-block; margin-top: 18px; padding-top: 16px; border-top: 1px solid var(--line); color: var(--accent); }
151150
.course-chapters { min-width: 0; }
152151
.course-chapter + .course-chapter { margin-top: 40px; }
153152
.course-chapter-heading { display: flex; align-items: baseline; justify-content: space-between; gap: 20px; margin-bottom: 14px; }
@@ -299,7 +298,6 @@ html[data-theme='dark'] .theme-icon-moon { display: none; }
299298
.course-directory { gap: 28px; }
300299
.course-directory-link { gap: 12px; }
301300
.course-directory-meta { max-width: 82px; }
302-
.course-layout { grid-template-columns: 150px minmax(0, 1fr); gap: 28px; }
303301
}
304302
@media (max-width: 720px) {
305303
html { scroll-padding-top: 24px; }
@@ -330,15 +328,12 @@ html[data-theme='dark'] .theme-icon-moon { display: none; }
330328
.series-grid { grid-template-columns: 1fr; gap: 14px; }
331329
.series-card { padding: 21px; }
332330
.home-courses { gap: 18px; margin-top: 24px; padding-block: 16px; font-size: 12px; }
333-
.course-directory { grid-template-columns: 1fr; gap: 30px; }
331+
.course-directory { gap: 30px; }
334332
.course-directory-meta { max-width: none; }
335333
.course-directory-title { font-size: 14px; }
336334
.course-directory-description { font-size: 11px; }
337-
.course-layout { grid-template-columns: 1fr; gap: 28px; }
338-
.course-outline { position: static; padding: 18px; border: 1px solid var(--line); border-radius: 4px; }
339-
.course-outline ul { display: flex; flex-wrap: wrap; gap: 4px 22px; }
335+
.course-outline { padding: 18px; border: 1px solid var(--line); border-radius: 4px; }
340336
.course-outline li a { gap: 10px; padding-block: 4px; }
341-
.course-outline-back { margin-top: 12px; padding-top: 10px; }
342337
.course-header { margin-bottom: 24px; }
343338
.course-chapter-heading h2 { font-size: 21px; }
344339
.course-note-link { grid-template-columns: 22px minmax(0, 1fr) 12px; gap: 12px; padding-block: 14px; }

0 commit comments

Comments
 (0)