Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7d1e7b975 | ||
|
|
550f6d15b4 | ||
|
|
d4fe273812 | ||
|
|
0b0307b12f | ||
|
|
3e377adc7f | ||
|
|
63c9c8ad4a | ||
|
|
8e74bead62 | ||
|
|
5bf0c327bf | ||
|
|
6538311387 | ||
|
|
ed473e996a | ||
|
|
c772236d1a | ||
|
|
a89c443c25 | ||
|
|
23b79a2473 | ||
|
|
8274180f81 | ||
|
|
3e09a362cc | ||
|
|
8debd99e61 | ||
|
|
be87917443 |
No files matched your search
@@ -0,0 +1,14 @@
|
|||||||
|
{"task": "task_0001", "cmd": "E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\" && grep -q \"pinned\" src/content.config.ts && grep -q \"pinned\" src/components/PostList.astro && grep -q \"pinned\" public/admin/config.yml", "exit": 0, "duration_s": 21.239, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "a4c5572a52c4f546900c03b86c7cfd32056ad32ec27194018ffc175ac700f3c5", "at": "2026-11-02T12:58:45+00:00"}
|
||||||
|
{"task": "task_0002", "cmd": "E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\" && grep -qE \"renderRich|renderMarkdown\" src/components/pages/MomentsPage.astro && python3 -c \"import yaml;d=yaml.safe_load(open('public/admin/config.yml'));m=[c for c in d['collections'] if c['name']=='moments'][0];t=[f for f in m['fields'] if f['name']=='text'][0];assert t['widget']=='markdown',t\"", "exit": 0, "duration_s": 21.893, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "a4c5572a52c4f546900c03b86c7cfd32056ad32ec27194018ffc175ac700f3c5", "at": "2026-11-02T12:59:07+00:00"}
|
||||||
|
{"task": "task_0003", "cmd": "test -f src/components/MomentComments.astro && grep -q \"MomentComments\" src/components/pages/MomentsPage.astro && grep -q \"moments/#\" src/components/MomentComments.astro && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\"", "exit": 0, "duration_s": 21.073, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "a4c5572a52c4f546900c03b86c7cfd32056ad32ec27194018ffc175ac700f3c5", "at": "2026-11-02T12:59:28+00:00"}
|
||||||
|
{"task": "task_0004", "cmd": "test -f src/components/geek/ViewMeta.astro && grep -q \"ViewMeta\" src/components/ArtalkComments.astro && grep -q \"ViewMeta\" src/pages/archives/[...slug].astro && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\"", "exit": 0, "duration_s": 23.015, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "a4c5572a52c4f546900c03b86c7cfd32056ad32ec27194018ffc175ac700f3c5", "at": "2026-11-02T12:59:51+00:00"}
|
||||||
|
{"task": "task_0005", "cmd": "grep -q \"GithubProfile\" src/pages/opensource.astro && python3 -c \"import re,pathlib;p=pathlib.Path('dist/opensource/index.html').read_text();bad=[u for u in ['img.shields.io','readme-typing-svg','github-readme-stats','streak-stats','komarev','github-readme-activity-graph'] if u in p];assert not bad,bad\"", "exit": 0, "duration_s": 0.03, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "a4c5572a52c4f546900c03b86c7cfd32056ad32ec27194018ffc175ac700f3c5", "at": "2026-11-02T12:59:52+00:00"}
|
||||||
|
{"task": "task_0006", "cmd": "python3 -c \"import yaml;d=yaml.safe_load(open('content/site/about.yaml'));types=[b['type'] for b in d.get('blocks') or []];assert 'prose' in types and ('linklist' in types or 'cards' in types),types\" && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\"", "exit": 0, "duration_s": 21.067, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "a4c5572a52c4f546900c03b86c7cfd32056ad32ec27194018ffc175ac700f3c5", "at": "2026-11-02T13:00:13+00:00"}
|
||||||
|
{"task": "task_0007", "cmd": "test -f content/posts/writing-template.md && test -f content/posts-en/writing-template.md && grep -q \"pinned: true\" content/posts/writing-template.md && grep -qE \"font-kai|c-blue\" content/posts/writing-template.md && grep -q \"写作模板\" docs/写作指南.md", "exit": 0, "duration_s": 0.005, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "a4c5572a52c4f546900c03b86c7cfd32056ad32ec27194018ffc175ac700f3c5", "at": "2026-11-02T13:00:13+00:00"}
|
||||||
|
{"task": "task_0001", "cmd": "E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\" && grep -q \"pinned\" src/content.config.ts && grep -q \"pinned\" src/components/PostList.astro && grep -q \"pinned\" public/admin/config.yml", "exit": 0, "duration_s": 20.732, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "f35452f48bd7d96babf34565aeef8d17c25191be02e07d93fd27922795604348", "at": "2026-11-02T13:04:09+00:00"}
|
||||||
|
{"task": "task_0002", "cmd": "E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\" && grep -qE \"renderRich|renderMarkdown\" src/components/pages/MomentsPage.astro && python3 -c \"import yaml;d=yaml.safe_load(open('public/admin/config.yml'));m=[c for c in d['collections'] if c['name']=='moments'][0];t=[f for f in m['fields'] if f['name']=='text'][0];assert t['widget']=='markdown',t\"", "exit": 0, "duration_s": 20.695, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "f35452f48bd7d96babf34565aeef8d17c25191be02e07d93fd27922795604348", "at": "2026-11-02T13:04:30+00:00"}
|
||||||
|
{"task": "task_0003", "cmd": "test -f src/components/MomentComments.astro && grep -q \"MomentComments\" src/components/pages/MomentsPage.astro && grep -q 'moments/${slug}/' src/components/MomentComments.astro && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\"", "exit": 0, "duration_s": 20.501, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "f35452f48bd7d96babf34565aeef8d17c25191be02e07d93fd27922795604348", "at": "2026-11-02T13:04:50+00:00"}
|
||||||
|
{"task": "task_0004", "cmd": "test -f src/components/geek/ViewMeta.astro && grep -q \"ViewMeta\" src/components/ArtalkComments.astro && grep -q \"ViewMeta\" src/pages/archives/[...slug].astro && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\"", "exit": 0, "duration_s": 20.83, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "f35452f48bd7d96babf34565aeef8d17c25191be02e07d93fd27922795604348", "at": "2026-11-02T13:05:11+00:00"}
|
||||||
|
{"task": "task_0005", "cmd": "grep -q \"GithubProfile\" src/pages/opensource.astro && python3 -c \"import re,pathlib;p=pathlib.Path('dist/opensource/index.html').read_text();bad=[u for u in ['img.shields.io','readme-typing-svg','github-readme-stats','streak-stats','komarev','github-readme-activity-graph'] if u in p];assert not bad,bad\"", "exit": 0, "duration_s": 0.029, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "f35452f48bd7d96babf34565aeef8d17c25191be02e07d93fd27922795604348", "at": "2026-11-02T13:05:11+00:00"}
|
||||||
|
{"task": "task_0006", "cmd": "python3 -c \"import yaml;d=yaml.safe_load(open('content/site/about.yaml'));types=[b['type'] for b in d.get('blocks') or []];assert 'prose' in types and ('linklist' in types or 'cards' in types),types\" && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE \"汇总: [0-9]+/[0-9]+ PASS\"", "exit": 0, "duration_s": 21.719, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "f35452f48bd7d96babf34565aeef8d17c25191be02e07d93fd27922795604348", "at": "2026-11-02T13:05:33+00:00"}
|
||||||
|
{"task": "task_0007", "cmd": "test -f content/posts/writing-template.md && test -f content/posts-en/writing-template.md && grep -q \"pinned: true\" content/posts/writing-template.md && grep -qE \"font-kai|c-blue\" content/posts/writing-template.md && grep -q \"写作模板\" docs/写作指南.md", "exit": 0, "duration_s": 0.005, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "f35452f48bd7d96babf34565aeef8d17c25191be02e07d93fd27922795604348", "at": "2026-11-02T13:05:33+00:00"}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
# Phase 5h:内容表达能力与社交反馈 - 项目范围
|
||||||
|
|
||||||
|
<!-- spec-format: 2 -->
|
||||||
|
|
||||||
|
## 1. 问题定义
|
||||||
|
- **项目目标**:①文章支持置顶(作者指定优先)②瞬间的文字与文章同级表达力(字体可换、颜色可换、多段落/列表/强调)③瞬间每条可独立评论 ④浏览量与评论数用统一的「眼睛/气泡」计数徽标呈现(对齐开源页 GitHub 档案的眼图标语汇)⑤开源页开篇从 GitHub README 直接移植导致:`<div align="center">` 内联对齐失效、shields/vercel/snake/komarev 等外链图在慢网下空白破版、README 的「About Me」与开源页主题无关——重构为原生组件并从 README 解耦 ⑥关于页承接读完 README 后仍想保留的个人叙述 ⑦新增一篇「写作模板」示例文章,把可用排版能力一次演示完
|
||||||
|
- **目标用户**:站长(写得更自由,少打字面 HTML)、读者(读到更丰富且不破版的页)
|
||||||
|
- **核心价值**:内容表达力与后台编辑力对上,同时把外链依赖与版式事故面砍掉;社交反馈(浏览/评论)在灰阶体系内可量化可见
|
||||||
|
|
||||||
|
## 2. 假设与待确认
|
||||||
|
|
||||||
|
### 2.1 已确认事实
|
||||||
|
- Artalk v2 匿名可读:`GET /artalk/api/v2/comments?site_name=…&page_key=…&limit=1` 返回 `{count, roots_count, page:{pv}}`(生产实测,2026-11-02);`POST /artalk/api/v2/pages/pv` 返回 `{pv}`(现有组件在用)
|
||||||
|
- 富文本管线已存在且已净化:`renderRich`(markdown + rehype-content-sanitize 标签/属性/协议三层白名单)与 `rehype-class-whitelist`(35 项排版类,单一事实源 `public/admin/typography-classes.js`)
|
||||||
|
- 现有 6 自托管字族(含 font-huiwen 子集化 420KB 单页)与 16 彩色语义类 + 4 灰阶语义类
|
||||||
|
- 开源页 README 现由 `intro_from: "off"` 关闭,缓存文件 `content/.github-readme.md`(3138B)含 6 类外链图(readme-typing-svg / shields.io / github-readme-stats / streak-stats / activity-graph / snake / komarev)
|
||||||
|
- 首页/归档/书架三处列表排序均为 `pubDate` 降序,无置顶概念(`grep pinned` 只命中开源页仓库白名单)
|
||||||
|
|
||||||
|
### 2.2 关键假设
|
||||||
|
- 瞬间富文本走与全站文案同一条净化管线即可满足「字体/颜色可换」且不引入 XSS 面(危险标签整棵丢弃、协议白名单 http/https/mailto)
|
||||||
|
- 每条瞬间一个 Artalk page_key(`/moments/<slug>/`)不会与页面级 pv 冲突;Artalk 实例按需挂载(展开才 init)可避免 "one page one Artalk" 的全局实例冲突
|
||||||
|
- 开源页可用本地数据(已有 repo 元数据 + GitHub GraphQL 拉取)自绘 followers/stars/语言占比,无需任何第三方徽章服务
|
||||||
|
|
||||||
|
### 2.3 待确认问题
|
||||||
|
- [x] 瞬间文字是否允许 HTML 类名(字体/颜色)→ 用户原话「字体可换、颜色可换等」,按富文本管线放行 35 项白名单类
|
||||||
|
- [x] 开源页要不要与 README 完全一致 → 用户原话「可以自行进行美化,无需完全一致」,按原生组件重构
|
||||||
|
- [x] About Me 类内容放哪 → 用户原话「有些可以直接移植到关于页面中」,迁到 about.yaml blocks
|
||||||
|
|
||||||
|
### 2.4 可选解释与取舍
|
||||||
|
- 置顶只作用于列表排序与视觉标记,不改 URL / 不改 pubDate 语义(订阅源按时间仍正确)
|
||||||
|
- 计数徽标一次只拉当前页的 pv(POST 计一次)与评论数(GET 读);瞬间列表按可视区懒拉,避免 N 次请求把首屏拖慢
|
||||||
|
- 开源页保留 `intro_from` 开关作为 compat,但默认 off 且文档标注「不推荐」;README 渲染通道不删除(后台仍可切回)
|
||||||
|
|
||||||
|
### 2.5 已证伪路径
|
||||||
|
- 直接渲染 README HTML 并试图用 CSS 修 `align="center"`:内联属性与 sanitize 的交互不可控,且外链图仍会空白破版 → 弃,改原生组件
|
||||||
|
- 每条瞬间都 init 一个 Artalk 实例常驻:内存与请求成本高、且 Artalk 对多实例的支持未验证 → 改为展开时挂载
|
||||||
|
- 用第三方徽章服务显示访客数(komarev 等):外链依赖 + 灰阶体系外颜色 → 弃,用 Artalk pv 自绘
|
||||||
|
|
||||||
|
## 3. 功能范围
|
||||||
|
|
||||||
|
### 3.1 核心功能(MVP)
|
||||||
|
- [x] T1 文章置顶:posts/postsEn schema `pinned`、四处列表排序(首页双轨/归档/书架)、视觉标记(灰阶 pin)、后台开关
|
||||||
|
- [x] T2 瞬间富文本:moments `text` 支持 markdown + 白名单排版类(字体/颜色/强调/多段/列表)、净化管线复用、后台改 markdown 编辑器、旧纯文本零回归
|
||||||
|
- [x] T3 瞬间逐条评论:每条 moment 独立 page_key 的 Artalk 评论区(折叠、展开时挂载)、评论数联动、双语页共用同一 key
|
||||||
|
- [x] T4 计数徽标:新增 `ViewMeta` 组件(眼睛图标 = 浏览数、气泡图标 = 评论数),接入文章页/瞬间页/关于页/开源页
|
||||||
|
- [x] T5 开源页重构:原生 GitHub 档案卡(头像/名字/关注者/星标/语言占比,本地数据自绘)替换 README 外链图;`align` 失效与破图问题消失;README 通道降级为可选
|
||||||
|
- [x] T6 关于页承接:把 README 的 About Me / Find Me 迁为 about.yaml blocks(prose + linklist),开源页只留开源相关
|
||||||
|
- [x] T7 写作模板示例:中英双语示例文章,演示标题层级/彩色强调/字族/引用/代码/图/表/链接卡片/折叠,并作为置顶功能的活样本;docs 与后台 hint 同步
|
||||||
|
|
||||||
|
### 3.2 扩展功能
|
||||||
|
- 无
|
||||||
|
|
||||||
|
### 3.3 不在范围内
|
||||||
|
- 评论回复通知/邮件推送、点赞/投票、阅读进度、站点级总访问量统计(Artalk 无匿名聚合端点)
|
||||||
|
|
||||||
|
## 4. 最小实现路径
|
||||||
|
- 最简单可行方案:置顶先用 boolean + 排序键;瞬间富文本直接把 `text` 交给既有 `renderRich`;评论用现有 Artalk 组件克隆一份带折叠的;计数徽标只做 pv + count 两个数
|
||||||
|
- 暂不引入:置顶权重/多级置顶、瞬间的图片轮播、评论楼中楼定制、开源页的实时 Star 曲线
|
||||||
|
- 不做的抽象:通用「内容社交层」框架(只服务现有页面)
|
||||||
|
|
||||||
|
## 5. 技术决策
|
||||||
|
- 技术栈:Astro 7.4.4 + zod schema + Artalk v2 HTTP API + GitHub GraphQL(已有 token)
|
||||||
|
- 证据协议:evidence: runs
|
||||||
|
- 本轮允许改动:src/content.config.ts、src/components/{PostList,ArtalkComments}.astro、src/components/pages/{HomePage,MomentsPage,BooksPage}.astro、src/components/geek/{ViewMeta,GithubProfile}.astro(新)、src/pages/archives/[...slug].astro、src/pages/en/archives/[...slug].astro、src/pages/{about,opensource,en/about,en/opensource}.astro、src/lib/{projects,site-content,heatmap}.ts、content/site/{about,opensource}.yaml、content/posts/*(新增示例文章)、content/posts-en/*、public/admin/{config.yml,typography-classes.js}、docs/*、tests/e2e.mjs
|
||||||
|
- 本轮不应触碰:nginx/ESA、灯箱与图库(GalleryPage/PhotoZoom)、Header/Footer 结构、构建链顺序、tokens.css/global.css 基础尺度
|
||||||
|
- Git integration branch:`spec/2026-11-02_blog-5h-content-social`
|
||||||
|
|
||||||
|
### 5.1 验证策略
|
||||||
|
- 范围级别:package
|
||||||
|
- 变更对象:内容模型(置顶/瞬间富文本)、渲染组件(计数/评论/档案卡)、后台配置、示例内容
|
||||||
|
- 快速检查:`pnpm astro build`(node26)+ `python3 scripts/build-perf/config-check.py .`
|
||||||
|
- 集成检查:`E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs`(37 项,本包新增置顶顺序/徽标存在/瞬间富文本断言)+ content-lint 0/0/0
|
||||||
|
- 全项目检查:生产实测四条(开源页零第三方外链图、瞬间评论可发可见、徽标数值与 Artalk 端点对账一致、关于页承接内容渲染);**升级条件**——仅当改动触及 BaseLayout/全局样式(tokens/字体栈)或 Artalk 主题接管层时才执行,本包因往 tokens 补 emoji 回退链已触发一次并记录了理由
|
||||||
|
- 升级触发:若动到 BaseLayout/全局样式或 Artalk 主题接管层,升级为全站视觉复核(glm-5.3-flash:max,≤6 图/轮)
|
||||||
|
|
||||||
|
## 6. 成功标准与验证方式
|
||||||
|
- [x] 置顶文章排在列表首位且带可见标记,取消置顶后恢复时间序 -> verify: task_0001
|
||||||
|
- [x] 瞬间文字可用字体类与彩色强调,危险标签被净化丢弃,旧纯文本渲染不变 -> verify: task_0002
|
||||||
|
- [x] 每条瞬间可展开评论区并成功发帖,双语页共用同一评论流 -> verify: task_0003
|
||||||
|
- [x] 文章/瞬间/关于/开源四页显示「浏览数 + 评论数」徽标且数值与 Artalk 一致 -> verify: task_0004
|
||||||
|
- [x] 开源页零第三方图片请求,档案卡数据来自本地/GraphQL,居中与破图问题不再出现 -> verify: task_0005
|
||||||
|
- [x] README 的个人叙述出现在关于页,开源页只保留开源相关内容 -> verify: task_0006
|
||||||
|
- [x] 示例文章渲染全部演示能力且构建通过,docs/hint 同步 -> verify: task_0007
|
||||||
|
|
||||||
|
## 7. 风险与约束
|
||||||
|
- 灰阶外壳红线不变:徽标图标与数字用 tokens(`--ink-*`/`--line`),不引入第三方彩色徽章
|
||||||
|
- 彩色仅正文强调(≤3 处/页)——示例文章本身要守纪律,成为正面样本而非反例
|
||||||
|
- 瞬间富文本必须复用 `renderRich` 净化链,禁止新增 set:html 直通路径
|
||||||
|
- Artalk 多实例风险:评论区折叠 + 展开挂载,若实测冲突则退回「逐条跳转到锚点页」
|
||||||
|
- 双语链路:所有新文案走 `t()`/`pickBi`,en 轨不得出现中文硬编码
|
||||||
|
- 多车道并行:content.config.ts / public/admin/config.yml 由 orchestrator 先落契约再放行,车道只改各自 boundary 内文件
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
# Phase 5h:内容表达能力与社交反馈 - 任务拆解
|
||||||
|
|
||||||
|
## 使用规则
|
||||||
|
- boundary/verify 齐备;verify 只读断言;车道工作树开发禁 git,收编由 orchestrator 统一提交
|
||||||
|
- 构建一律 `export PATH="$HOME/.local/node/bin:$PATH"`(Node 26)+ `pnpm astro build`
|
||||||
|
- **契约先行**:`src/content.config.ts` 与 `public/admin/config.yml` 由 orchestrator 先落契约(T1 时一并提交),车道不得再改这两个文件;需要新字段一律回报 orchestrator
|
||||||
|
- E2E 口径:`pnpm astro build → cp -a dist /tmp/dist-e2e → 用 18925 端口起快照服务 → E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs`
|
||||||
|
|
||||||
|
## 阶段一:实现
|
||||||
|
|
||||||
|
- [x] T1 文章置顶(契约 + 排序 + 标记 + 后台)
|
||||||
|
- claim: orchestrator
|
||||||
|
- boundary: src/content.config.ts(postsSchema 加 `pinned: z.boolean().optional()`,posts/postsEn 共用)、src/components/PostList.astro(置顶优先排序 + pin 标记)、src/pages/archives/index.astro(排序)、src/components/pages/{HomePage,BooksPage}.astro(排序)、public/admin/config.yml(posts 集合 pinned 开关 + 中文 hint)、src/i18n/ui.ts(置顶标签)
|
||||||
|
- verify: `E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE "汇总: [0-9]+/[0-9]+ PASS" && grep -q "pinned" src/content.config.ts && grep -q "pinned" src/components/PostList.astro && grep -q "pinned" public/admin/config.yml`
|
||||||
|
|
||||||
|
- [x] T2 瞬间富文本(字体可换 / 颜色可换 / 多形式)
|
||||||
|
- claim: worker-one
|
||||||
|
- boundary: src/components/pages/MomentsPage.astro(`text` 由纯文本 `<p>` 改为走 `renderRich` 净化+排版类管线,保留 inline 语义;空文本老数据零回归)、public/admin/config.yml 中 moments 集合 `text` 字段改 markdown widget + 提示可用排版类(**仅在 orchestrator 提交的字段块内改 widget 类型,不改结构**)、docs 提示留给 T7
|
||||||
|
- verify: `E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE "汇总: [0-9]+/[0-9]+ PASS" && grep -qE "renderRich|renderMarkdown" src/components/pages/MomentsPage.astro && python3 -c "import yaml;d=yaml.safe_load(open('public/admin/config.yml'));m=[c for c in d['collections'] if c['name']=='moments'][0];t=[f for f in m['fields'] if f['name']=='text'][0];assert t['widget']=='markdown',t"`
|
||||||
|
|
||||||
|
- [x] T3 瞬间逐条评论(Artalk 独立 page_key + 折叠懒挂载)
|
||||||
|
- claim: worker-one
|
||||||
|
- boundary: 新增 src/components/MomentComments.astro(折叠 disclosure,展开时首次挂载 Artalk;page_key 约定 `/moments/#<slug>`,en 页同一 key 不分裂;评论数徽标复用 T4 的 ViewMeta 计数接口)、src/components/pages/MomentsPage.astro(每条卡片挂评论区)
|
||||||
|
- verify: `test -f src/components/MomentComments.astro && grep -q "MomentComments" src/components/pages/MomentsPage.astro && grep -q 'moments/${slug}/' src/components/MomentComments.astro && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE "汇总: [0-9]+/[0-9]+ PASS"`
|
||||||
|
|
||||||
|
- [x] T4 计数徽标(眼睛图标 = 浏览数,气泡图标 = 评论数)
|
||||||
|
- claim: op-artalk
|
||||||
|
- boundary: src/components/geek/ViewMeta.astro(**契约组件,由 orchestrator 在 T1 提交时一并落盘**,车道只消费不改语义)、src/components/ArtalkComments.astro(pv 小字行改为 ViewMeta,评论数取 `comments?limit=1` 的 count)、src/pages/archives/[...slug].astro、src/pages/en/archives/[...slug].astro(挂 ViewMeta)
|
||||||
|
- verify: `test -f src/components/geek/ViewMeta.astro && grep -q "ViewMeta" src/components/ArtalkComments.astro && grep -q "ViewMeta" src/pages/archives/[...slug].astro && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE "汇总: [0-9]+/[0-9]+ PASS"`
|
||||||
|
|
||||||
|
- [x] T5 开源页重构(原生 GitHub 档案卡,去外链图依赖)
|
||||||
|
- claim: op-gitea
|
||||||
|
- boundary: 新增 src/components/geek/GithubProfile.astro(头像/名字/简介/关注者/总星标/语言占比,数据来自 projects.ts 与 GraphQL;零第三方图片与徽章)、src/lib/projects.ts(补统计聚合:followers/stars/language 汇总,失败降级不炸构建)、src/pages/opensource.astro、src/pages/en/opensource.astro(用 GithubProfile 替换 readme 渲染段;README 通道保留开关但默认 off 且标注不推荐)、content/site/opensource.yaml(注释说明 intro_from 现状)
|
||||||
|
- verify: `grep -q "GithubProfile" src/pages/opensource.astro && python3 -c "import re,pathlib;p=pathlib.Path('dist/opensource/index.html').read_text();bad=[u for u in ['img.shields.io','readme-typing-svg','github-readme-stats','streak-stats','komarev','github-readme-activity-graph'] if u in p];assert not bad,bad"`
|
||||||
|
|
||||||
|
- [x] T6 关于页承接 README 的个人叙述
|
||||||
|
- claim: op-gitea
|
||||||
|
- boundary: content/site/about.yaml(新增 blocks:关于/兴趣 prose、站点与项目 linklist、Find Me 社交块;双语 zh/en;测试值不得留在文件里)、src/pages/about.astro 与 en(仅当块渲染需要时改,优先零改动)
|
||||||
|
- verify: `python3 -c "import yaml;d=yaml.safe_load(open('content/site/about.yaml'));types=[b['type'] for b in d.get('blocks') or []];assert 'prose' in types and ('linklist' in types or 'cards' in types),types" && E2E_BASE=http://127.0.0.1:18925 node tests/e2e.mjs 2>&1 | grep -qE "汇总: [0-9]+/[0-9]+ PASS"`
|
||||||
|
|
||||||
|
- [x] T7 写作模板示例文章 + 文档与 hint 收尾
|
||||||
|
- claim: orchestrator
|
||||||
|
- boundary: content/posts/writing-template.md、content/posts-en/writing-template.md(en 手写 locked:true 直译,不交给 TMT 重译)、docs/写作指南.md(模板用法 + 排版类清单去重指引)、docs/管理台.md(瞬间富文本/逐条评论/置顶/徽标说明)、public/admin/config.yml(moments text hint、posts pinned 已含)
|
||||||
|
- verify: `test -f content/posts/writing-template.md && test -f content/posts-en/writing-template.md && grep -q "pinned: true" content/posts/writing-template.md && grep -qE "font-kai|c-blue" content/posts/writing-template.md && grep -q "写作模板" docs/写作指南.md`
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
# Phase 5g:页面后台化(blocks 模型)与字体子集化 - 完成总结
|
||||||
|
|
||||||
|
## 交付结论
|
||||||
|
- 结果:完成
|
||||||
|
- 完成时间:2026-11-02 19:19
|
||||||
|
|
||||||
|
## 假设回顾
|
||||||
|
### 已验证假设
|
||||||
|
- 块渲染器受控,破版风险低于整页 HTML 直编(方案 10 §2 对比表)
|
||||||
|
- 字体子集化(pyftsubset 按页实际用字)能把艺术字体单页增量压到 ≤150KB 阈值内
|
||||||
|
|
||||||
|
### 仍未完全验证的假设
|
||||||
|
- 无
|
||||||
|
|
||||||
|
## 交付范围
|
||||||
|
### 已交付
|
||||||
|
- T1 blocks 骨架(关于页块式页面构建器)
|
||||||
|
- T2 块型扩充与图片管线
|
||||||
|
- T3 样式即数据(theme.yaml + 对比度闸门)
|
||||||
|
- T4 首页细化与去重
|
||||||
|
- T5 开源页收尾(缓存/回落/告警)
|
||||||
|
- T6 文档与后台 hint 补齐
|
||||||
|
- T7 字体子集化工具
|
||||||
|
|
||||||
|
### 未交付
|
||||||
|
- 无
|
||||||
|
|
||||||
|
### 偏差说明
|
||||||
|
- 无
|
||||||
|
|
||||||
|
## 简化决策
|
||||||
|
### 保持简单的关键选择
|
||||||
|
- 最简单可行方案:块类型先用 3 类跑通闭环(prose/tracks/divider),再扩到 9 类;theme 只做 12 个白名单旋钮
|
||||||
|
- 暂不引入:可视化块预览、块级动画配置
|
||||||
|
- 不做的抽象:通用页面 DSL(只服务现有页面)
|
||||||
|
|
||||||
|
### 本轮明确不做的内容
|
||||||
|
- 换 CMS、页面布局的任意拖拽网格、运行时编辑器
|
||||||
|
|
||||||
|
## 变更边界
|
||||||
|
### 本轮主要改动模块
|
||||||
|
- 见 tasks.md 的 boundary 记录
|
||||||
|
|
||||||
|
### 明确未触碰的区域
|
||||||
|
- 换 CMS、页面布局的任意拖拽网格、运行时编辑器
|
||||||
|
|
||||||
|
## 验证证据
|
||||||
|
### 备注
|
||||||
|
- 机器证据:runs.jsonl(见验证范围的机器验证率)
|
||||||
|
|
||||||
|
## 验证范围
|
||||||
|
- 级别:package
|
||||||
|
- 机器验证率:7/7
|
||||||
|
- 规则:check 与 done 复用该范围;只有记录升级触发时才执行全项目检查
|
||||||
|
|
||||||
|
## 哲学生效证据
|
||||||
|
### 行为成效回填
|
||||||
|
- Development Record 行为门禁通过
|
||||||
|
|
||||||
|
### 一致性门禁回顾
|
||||||
|
- 验收面(checklist 或成功标准)已通过
|
||||||
|
|
||||||
|
## Git 记录
|
||||||
|
- 日期时间:2026-11-02 19:19
|
||||||
|
- 范围:Phase 5g:页面后台化(blocks 模型)与字体子集化
|
||||||
|
- 功能:T1 blocks 骨架(关于页块式页面构建器);T2 块型扩充与图片管线;T3 样式即数据(theme.yaml + 对比度闸门);T4 首页细化与去重;T5 开源页收尾(缓存/回落/告警);T6 文档与后台 hint 补齐;T7 字体子集化工具
|
||||||
|
- 操作:提交 / 推送
|
||||||
|
- 成效:Development Record 行为门禁通过
|
||||||
|
- 提交:pending local commit
|
||||||
|
- 提交区间:3822e150a87ac5fee56c9b2724eae23389e7c34e..23b79a2473674e75608736e2cac491b163a49c35
|
||||||
|
- 推送:not-run (push stage follows commit)
|
||||||
|
|
||||||
|
## AGENTS.md 增量提议
|
||||||
|
```diff
|
||||||
|
Phase 5g 资产:①块式页面构建器(九类 discriminatedUnion + 宽松分支容错:已知块严格校验、未知块 WARN 丢弃不炸构建);②样式即数据(theme.yaml 九组白名单旋钮 + :root:root 特异性注入 + 产物级对比度闸门,负例 1.61:1 被拦);③首页抽 HomePage 消 zh/en 双份;④字体子集化工具(汇文 694→420KB −40%;快乐体实测反向 −9% 故不启用,结论入档避免后人重试);⑤config.yml 重复键结构缺陷的教训——Python yaml 静默覆盖,必须用 StrictLoader/Node yaml 校验,已固化为 build 闸门 config-check.py;⑥并发构建擦 dist 的解法:build→cp -a dist 快照→快照起服务跑 E2E。
|
||||||
|
```
|
||||||
|
|
||||||
|
## 被拒绝的扩展提议
|
||||||
|
- 无
|
||||||
|
|
||||||
|
## 门禁证据
|
||||||
|
- check_spec_package.py exit 0
|
||||||
|
|
||||||
|
## 遗留事项
|
||||||
|
- 无;问题处置见下方结构化区块
|
||||||
|
|
||||||
|
## 问题处置
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"issues": [],
|
||||||
|
"version": 1
|
||||||
|
}
|
||||||
|
```
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{"task": "task_0001", "cmd": "E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q \"37/37 PASS\" && grep -q \"discriminatedUnion\" src/content.config.ts && grep -q \"BlockRenderer\" src/components/pages/AboutPage.astro && grep -q \"typeKey\" public/admin/config.yml", "exit": 0, "duration_s": 18.466, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "7a7e460dbaff3855c2da899e62a1489b19a1d25a4a91ecfb211fadec40bff343", "at": "2026-11-02T11:18:21+00:00"}
|
||||||
|
{"task": "task_0002", "cmd": "E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q \"37/37 PASS\" && ls src/components/blocks/ | grep -qC1 \"Cards\\|Timeline\" && grep -q \"image()\" src/content.config.ts", "exit": 0, "duration_s": 17.177, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "7a7e460dbaff3855c2da899e62a1489b19a1d25a4a91ecfb211fadec40bff343", "at": "2026-11-02T11:18:39+00:00"}
|
||||||
|
{"task": "task_0003", "cmd": "E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q \"37/37 PASS\" && test -f content/site/theme.yaml && node scripts/build-perf/contrast-check.mjs dist", "exit": 0, "duration_s": 17.193, "stdout_tail_sha256": "f66c66c7ce879dad3f789790f8607fbd50e7a5a894e12912a55fd47d082e4f77", "tree_fp": "7a7e460dbaff3855c2da899e62a1489b19a1d25a4a91ecfb211fadec40bff343", "at": "2026-11-02T11:18:56+00:00"}
|
||||||
|
{"task": "task_0004", "cmd": "E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q \"37/37 PASS\" && test -f src/components/pages/HomePage.astro && grep -q \"HomePage\" src/pages/en/index.astro", "exit": 0, "duration_s": 17.189, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "7a7e460dbaff3855c2da899e62a1489b19a1d25a4a91ecfb211fadec40bff343", "at": "2026-11-02T11:19:13+00:00"}
|
||||||
|
{"task": "task_0005", "cmd": "E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q \"37/37 PASS\" && python3 -c \"import json;d=json.load(open('src/data/projects-fallback.json'));assert len(d)>=5\"", "exit": 0, "duration_s": 17.214, "stdout_tail_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "tree_fp": "7a7e460dbaff3855c2da899e62a1489b19a1d25a4a91ecfb211fadec40bff343", "at": "2026-11-02T11:19:30+00:00"}
|
||||||
|
{"task": "task_0006", "cmd": "test -f docs/管理台.md && grep -q \"blocks\\|区块\" docs/管理台.md && grep -c \"hint\" public/admin/config.yml | awk '$1>=20'", "exit": 0, "duration_s": 0.004, "stdout_tail_sha256": "913f5d1da2feaf4deeccc9e55cbb350a20f12b3f507e87be85dbb77fdd3cb9bc", "tree_fp": "7a7e460dbaff3855c2da899e62a1489b19a1d25a4a91ecfb211fadec40bff343", "at": "2026-11-02T11:19:30+00:00"}
|
||||||
|
{"task": "task_0007", "cmd": "test -f scripts/build-perf/subset-fonts.py && python3 -c \"import fontTools; print('fonttools ok')\" && E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q \"37/37 PASS\"", "exit": 0, "duration_s": 17.19, "stdout_tail_sha256": "3bcefe2ef2e30a5bbe067d31368a9765d7843d0cc24738a60c946c020e581348", "tree_fp": "7a7e460dbaff3855c2da899e62a1489b19a1d25a4a91ecfb211fadec40bff343", "at": "2026-11-02T11:19:47+00:00"}
|
||||||
+14
-14
@@ -34,13 +34,13 @@
|
|||||||
## 3. 功能范围
|
## 3. 功能范围
|
||||||
|
|
||||||
### 3.1 核心功能(MVP)
|
### 3.1 核心功能(MVP)
|
||||||
- [ ] T1 blocks 骨架:schema(discriminatedUnion)+ page-blocks.ts + BlockRenderer + prose/tracks/divider 三块 + 后台 types 声明
|
- [x] T1 blocks 骨架:schema(discriminatedUnion)+ page-blocks.ts + BlockRenderer + prose/tracks/divider 三块 + 后台 types 声明
|
||||||
- [ ] T2 块型扩充:cards/timeline/quote/figure/linklist/cta + 图标键白名单 + 图片 image() 管线
|
- [x] T2 块型扩充:cards/timeline/quote/figure/linklist/cta + 图标键白名单 + 图片 image() 管线
|
||||||
- [ ] T3 样式即数据:theme.yaml + theme.ts + BaseLayout 内联变量 + 对比度闸门脚本
|
- [x] T3 样式即数据:theme.yaml + theme.ts + BaseLayout 内联变量 + 对比度闸门脚本
|
||||||
- [ ] T4 首页细化与去重:抽 HomePage.astro 消 zh/en 双份 + 字段细化(projectsLimit/announcement 等)
|
- [x] T4 首页细化与去重:抽 HomePage.astro 消 zh/en 双份 + 字段细化(projectsLimit/announcement 等)
|
||||||
- [ ] T5 开源页收尾:README 缓存策略/超时/回落矩阵 + fallback JSON 回填 + include 未命中 WARN
|
- [x] T5 开源页收尾:README 缓存策略/超时/回落矩阵 + fallback JSON 回填 + include 未命中 WARN
|
||||||
- [ ] T6 文档与 hint:docs/管理台.md(块编辑用法)+ 写作指南扩充 + admin 全字段中文 hint
|
- [x] T6 文档与 hint:docs/管理台.md(块编辑用法)+ 写作指南扩充 + admin 全字段中文 hint
|
||||||
- [ ] T7 字体子集化工具:按页用字裁剪艺术字体为小切片 + build.sh 守卫挂载 + 实测对比
|
- [x] T7 字体子集化工具:按页用字裁剪艺术字体为小切片 + build.sh 守卫挂载 + 实测对比
|
||||||
|
|
||||||
### 3.2 扩展功能
|
### 3.2 扩展功能
|
||||||
- 无
|
- 无
|
||||||
@@ -69,13 +69,13 @@
|
|||||||
- 升级触发:若 theme 变量波及全局排版(字体字号全站变化)或 blocks 改动触及首页/文章页结构,升级为全站视觉复核与 E2E 全量并记录理由
|
- 升级触发:若 theme 变量波及全局排版(字体字号全站变化)或 blocks 改动触及首页/文章页结构,升级为全站视觉复核与 E2E 全量并记录理由
|
||||||
|
|
||||||
## 6. 成功标准与验证方式
|
## 6. 成功标准与验证方式
|
||||||
- [ ] 关于页整页由 yaml blocks 驱动,增删排序生效 -> verify: task_0001
|
- [x] 关于页整页由 yaml blocks 驱动,增删排序生效 -> verify: task_0001
|
||||||
- [ ] 九类块全部可渲染且旧内容零回归(三级回落) -> verify: task_0002
|
- [x] 九类块全部可渲染且旧内容零回归(三级回落) -> verify: task_0002
|
||||||
- [ ] theme.yaml 改值 → 产物 CSS 变量变化,对比度闸门拦截不达标 -> verify: task_0003
|
- [x] theme.yaml 改值 → 产物 CSS 变量变化,对比度闸门拦截不达标 -> verify: task_0003
|
||||||
- [ ] 首页 zh/en 由同一组件渲染且字段可配 -> verify: task_0004
|
- [x] 首页 zh/en 由同一组件渲染且字段可配 -> verify: task_0004
|
||||||
- [ ] 开源页 README 失败矩阵与 fallback 告警可用 -> verify: task_0005
|
- [x] 开源页 README 失败矩阵与 fallback 告警可用 -> verify: task_0005
|
||||||
- [ ] 后台文档与 hint 完整 -> verify: task_0006
|
- [x] 后台文档与 hint 完整 -> verify: task_0006
|
||||||
- [ ] 字体子集化工具把指定字体单页增量压到 ≤150KB -> verify: task_0007
|
- [x] 字体子集化工具把指定字体单页增量压到 ≤150KB -> verify: task_0007
|
||||||
|
|
||||||
## 7. 风险与约束
|
## 7. 风险与约束
|
||||||
- 灰阶体系与双语红线不变;彩色仅正文强调
|
- 灰阶体系与双语红线不变;彩色仅正文强调
|
||||||
+7
-7
@@ -6,37 +6,37 @@
|
|||||||
|
|
||||||
## 阶段一:实现
|
## 阶段一:实现
|
||||||
|
|
||||||
- [ ] T1 blocks 骨架(关于页块式页面构建器)
|
- [x] T1 blocks 骨架(关于页块式页面构建器)
|
||||||
- claim: op-gitea
|
- claim: op-gitea
|
||||||
- boundary: src/content.config.ts(siteAbout 加 blocks: z.array(discriminatedUnion))、新增 src/lib/page-blocks.ts(getAboutBlocks:过滤 enabled、未知 type 跳过+WARN、文本 pickBi 回落、块数≤24/单块≤4000 字)、新增 src/components/blocks/{BlockRenderer,Prose,Tracks,Divider}.astro、AboutPage.astro 改由 blocks 驱动(blocks 空→intro markdown→默认文案三级回落)、public/admin/config.yml 加 list+types(typeKey: type)
|
- boundary: src/content.config.ts(siteAbout 加 blocks: z.array(discriminatedUnion))、新增 src/lib/page-blocks.ts(getAboutBlocks:过滤 enabled、未知 type 跳过+WARN、文本 pickBi 回落、块数≤24/单块≤4000 字)、新增 src/components/blocks/{BlockRenderer,Prose,Tracks,Divider}.astro、AboutPage.astro 改由 blocks 驱动(blocks 空→intro markdown→默认文案三级回落)、public/admin/config.yml 加 list+types(typeKey: type)
|
||||||
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && grep -q "discriminatedUnion" src/content.config.ts && grep -q "BlockRenderer" src/components/pages/AboutPage.astro && grep -q "typeKey" public/admin/config.yml`
|
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && grep -q "discriminatedUnion" src/content.config.ts && grep -q "BlockRenderer" src/components/pages/AboutPage.astro && grep -q "typeKey" public/admin/config.yml`
|
||||||
|
|
||||||
- [ ] T2 块型扩充与图片管线
|
- [x] T2 块型扩充与图片管线
|
||||||
- claim: op-gitea
|
- claim: op-gitea
|
||||||
- boundary: 新增 src/components/blocks/{Cards,Timeline,Quote,Figure,LinkList,Cta}.astro + 图标键白名单(复用 SocialLinks 注册表或新建 icons 注册表)、schema 块型补全(图片字段用 image(),禁止外链字符串)、content/site/assets/ 目录、near docs 图表说明
|
- boundary: 新增 src/components/blocks/{Cards,Timeline,Quote,Figure,LinkList,Cta}.astro + 图标键白名单(复用 SocialLinks 注册表或新建 icons 注册表)、schema 块型补全(图片字段用 image(),禁止外链字符串)、content/site/assets/ 目录、near docs 图表说明
|
||||||
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && ls src/components/blocks/ | grep -qC1 "Cards\|Timeline" && grep -q "image()" src/content.config.ts`
|
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && ls src/components/blocks/ | grep -qC1 "Cards\|Timeline" && grep -q "image()" src/content.config.ts`
|
||||||
|
|
||||||
- [ ] T3 样式即数据(theme.yaml + 对比度闸门)
|
- [x] T3 样式即数据(theme.yaml + 对比度闸门)
|
||||||
- claim: op-artalk
|
- claim: op-artalk
|
||||||
- boundary: 新增 content/site/theme.yaml(12 个白名单旋钮:prose-size/measure/radius/accent/leading 等)、新增 src/lib/theme.ts(getTheme + themeVarsCss 生成 :root:root{…})、BaseLayout.astro head 内联 theme 变量(构建期静态)、新增 scripts/build-perf/contrast-check.mjs(断言 theme 结果下正文对比度 ≥4.5)、public/admin/config.yml 加 theme 单例、build.sh 守卫挂载
|
- boundary: 新增 content/site/theme.yaml(12 个白名单旋钮:prose-size/measure/radius/accent/leading 等)、新增 src/lib/theme.ts(getTheme + themeVarsCss 生成 :root:root{…})、BaseLayout.astro head 内联 theme 变量(构建期静态)、新增 scripts/build-perf/contrast-check.mjs(断言 theme 结果下正文对比度 ≥4.5)、public/admin/config.yml 加 theme 单例、build.sh 守卫挂载
|
||||||
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && test -f content/site/theme.yaml && node scripts/build-perf/contrast-check.mjs dist`
|
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && test -f content/site/theme.yaml && node scripts/build-perf/contrast-check.mjs dist`
|
||||||
|
|
||||||
- [ ] T4 首页细化与去重
|
- [x] T4 首页细化与去重
|
||||||
- claim: op-artalk
|
- claim: op-artalk
|
||||||
- boundary: 新增 src/components/pages/HomePage.astro(承接现 index.astro 区块逻辑,locale prop)、src/pages/{index,en/index}.astro 改为薄壳、home.yaml 增 projectsLimit / announcement(markdown)/ postsTracks(轨开关细分),site-content 访问器同步
|
- boundary: 新增 src/components/pages/HomePage.astro(承接现 index.astro 区块逻辑,locale prop)、src/pages/{index,en/index}.astro 改为薄壳、home.yaml 增 projectsLimit / announcement(markdown)/ postsTracks(轨开关细分),site-content 访问器同步
|
||||||
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && test -f src/components/pages/HomePage.astro && grep -q "HomePage" src/pages/en/index.astro`
|
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && test -f src/components/pages/HomePage.astro && grep -q "HomePage" src/pages/en/index.astro`
|
||||||
|
|
||||||
- [ ] T5 开源页收尾(缓存/回落/告警)
|
- [x] T5 开源页收尾(缓存/回落/告警)
|
||||||
- claim: worker-one
|
- claim: worker-one
|
||||||
- boundary: src/lib/site-content.ts(README 缓存策略与超时、回落矩阵)、content/.github-readme.md 与 README HTML 剥离策略(复用 rehype-content-sanitize 已挡危险标签;补: 外链徽章不阻断)、src/data/projects-fallback.json 回填 5-8 条真实仓、projects.ts include 未命中 console.warn
|
- boundary: src/lib/site-content.ts(README 缓存策略与超时、回落矩阵)、content/.github-readme.md 与 README HTML 剥离策略(复用 rehype-content-sanitize 已挡危险标签;补: 外链徽章不阻断)、src/data/projects-fallback.json 回填 5-8 条真实仓、projects.ts include 未命中 console.warn
|
||||||
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && python3 -c "import json;d=json.load(open('src/data/projects-fallback.json'));assert len(d)>=5"`
|
- verify: `E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS" && python3 -c "import json;d=json.load(open('src/data/projects-fallback.json'));assert len(d)>=5"`
|
||||||
|
|
||||||
- [ ] T6 文档与后台 hint 补齐
|
- [x] T6 文档与后台 hint 补齐
|
||||||
- claim: worker-one
|
- claim: worker-one
|
||||||
- boundary: docs/管理台.md(块编辑怎么用、增删排序、预览限制)、docs/写作指南.md(块字段表/受限类/主题项)、public/admin/config.yml 全字段中文 hint(含 T1-T4 新增字段)
|
- boundary: docs/管理台.md(块编辑怎么用、增删排序、预览限制)、docs/写作指南.md(块字段表/受限类/主题项)、public/admin/config.yml 全字段中文 hint(含 T1-T4 新增字段)
|
||||||
- verify: `test -f docs/管理台.md && grep -q "blocks\|区块" docs/管理台.md && grep -c "hint" public/admin/config.yml | awk '$1>=20'`
|
- verify: `test -f docs/管理台.md && grep -q "blocks\|区块" docs/管理台.md && grep -c "hint" public/admin/config.yml | awk '$1>=20'`
|
||||||
|
|
||||||
- [ ] T7 字体子集化工具
|
- [x] T7 字体子集化工具
|
||||||
- claim: orchestrator
|
- claim: orchestrator
|
||||||
- boundary: 新增 scripts/build-perf/subset-fonts.py(pyftsubset 按指定字体 + 页面实际用字生成子集 woff2 + 重写 fonts.css 指向子集文件)、infra/deploy/build.sh 守卫挂载、docs/写作指南加字流程补"子集化"一节
|
- boundary: 新增 scripts/build-perf/subset-fonts.py(pyftsubset 按指定字体 + 页面实际用字生成子集 woff2 + 重写 fonts.css 指向子集文件)、infra/deploy/build.sh 守卫挂载、docs/写作指南加字流程补"子集化"一节
|
||||||
- verify: `test -f scripts/build-perf/subset-fonts.py && python3 -c "import fontTools; print('fonttools ok')" && E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS"`
|
- verify: `test -f scripts/build-perf/subset-fonts.py && python3 -c "import fontTools; print('fonttools ok')" && E2E_BASE=http://127.0.0.1:18924 node tests/e2e.mjs 2>&1 | grep -q "37/37 PASS"`
|
||||||
@@ -27,5 +27,12 @@
|
|||||||
"image": "https://astro.build/og/astro.jpg",
|
"image": "https://astro.build/og/astro.jpg",
|
||||||
"favicon": "https://astro.build/favicon.svg",
|
"favicon": "https://astro.build/favicon.svg",
|
||||||
"ts": 1793593759816
|
"ts": 1793593759816
|
||||||
|
},
|
||||||
|
"https://astro.build": {
|
||||||
|
"title": "Astro",
|
||||||
|
"desc": "Astro builds fast content sites, powerful web applications, dynamic server APIs, and everything in-between.",
|
||||||
|
"image": "https://astro.build/og/astro.jpg",
|
||||||
|
"favicon": "https://astro.build/favicon.svg",
|
||||||
|
"ts": 1793621147252
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
pubDate: 2026-11-02
|
||||||
|
tags: [站点更新]
|
||||||
|
text: |
|
||||||
|
瞬间现在和文章同级表达力:`text` 支持 markdown 与排版类,<span class="c-teal font-kai">这一句是青色 + 楷体</span>,也可以**加粗**。
|
||||||
|
|
||||||
|
另外每条瞬间自带评论区——展开才加载,不刷时间线就不为它付成本。
|
||||||
|
---
|
||||||
|
|
||||||
|
站点更新记录:瞬间富文本与逐条评论上线。
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
---
|
||||||
|
title: "Writing template: this post is the template"
|
||||||
|
pubDate: 2026-11-02
|
||||||
|
category: tech
|
||||||
|
tags: [writing, template]
|
||||||
|
pinned: true
|
||||||
|
locked: true
|
||||||
|
description: One post that exercises every typographic capability on the site — heading levels, colour emphasis, typefaces, quotes, code windows, tables, images, link cards, folding. Copy it to start a new post.
|
||||||
|
---
|
||||||
|
|
||||||
|
This is not a tutorial — it is a **template you can copy**. Every section below actually runs: what you see is what Markdown produces. To start a new post, copy this file, change the slug, and delete what you do not need.
|
||||||
|
|
||||||
|
It is also the live sample for **pinning**: `pinned: true` in the frontmatter lifts a post to the front of the home page, the archive and the bookshelf, while its date, URL and RSS timestamps stay untouched.
|
||||||
|
|
||||||
|
## 1. Heading levels and paragraphs
|
||||||
|
|
||||||
|
Use `##` for a section and `###` for a subsection. **Never use `#`** — the post title comes from the frontmatter `title`, and a second level-one heading confuses both screen readers and search snippets.
|
||||||
|
|
||||||
|
Leave a blank line between paragraphs. Inline you can use **bold**, *italic*, ~~strikethrough~~, `inline code`, and [ordinary links](https://astro.build).
|
||||||
|
|
||||||
|
## 2. Colour emphasis: three per page at most
|
||||||
|
|
||||||
|
The rule comes from the design baseline: the shell is greyscale, so colour exists to weight one judgement in the body — three per page, maximum. More than that and it turns loud.
|
||||||
|
|
||||||
|
<span class="c-blue">First use: state one key conclusion in blue.</span> Then carry on normally.
|
||||||
|
|
||||||
|
<span class="c-red">Second use: warn about a trap in red.</span> For example, “after changing a Markdown plugin you must clear `node_modules/.astro`, or the change silently does nothing”.
|
||||||
|
|
||||||
|
<span class="c-green">Third use: confirm a working path in green.</span> After three, this section stays uncoloured.
|
||||||
|
|
||||||
|
There are eight hues (blue / teal / green / yellow / orange / red / pink / purple), each with a standard and a `-soft` variant, plus four greyscale classes (`ink-muted` / `ink-warm` / `ink-cool` / `ink-faint`) for lowering tone — those do not count against the colour budget.
|
||||||
|
|
||||||
|
## 3. Typefaces: change only what you wrap
|
||||||
|
|
||||||
|
Body text is sans-serif by default. To give one sentence a different temperament, wrap it:
|
||||||
|
|
||||||
|
<span class="font-kai">This sentence is in Kai. Good for epigraphs, quoted lines in a review, or paragraphs that should be read slowly.</span>
|
||||||
|
|
||||||
|
<span class="font-huiwen">This sentence is in Huiwen Ming. Over a long paragraph it noticeably slows reading, so use it for short lines only.</span>
|
||||||
|
|
||||||
|
Six families are available (`font-kai`, `font-song`, `font-hei-sys`, `font-fangsong`, `font-huiwen`, `font-kuaile`), plus an artistic heading class `font-art-kuaile`. **Mind the weight**: switching a whole page to a family makes every visitor download a CJK font, so avoid changing the body default casually.
|
||||||
|
|
||||||
|
### A level-three heading looks like this
|
||||||
|
|
||||||
|
One step smaller than level two, bold, with tighter spacing. Use it to split a section into topics.
|
||||||
|
|
||||||
|
## 4. Quotes and lists
|
||||||
|
|
||||||
|
> Block quotes are for quoting someone. An attribution can follow as italics.
|
||||||
|
>
|
||||||
|
> — an invented attribution
|
||||||
|
|
||||||
|
Unordered list:
|
||||||
|
|
||||||
|
- First item
|
||||||
|
- Second item, with `inline code`
|
||||||
|
- Third item, nested:
|
||||||
|
- Child one
|
||||||
|
- Child two
|
||||||
|
|
||||||
|
Ordered lists suit steps:
|
||||||
|
|
||||||
|
1. Copy the template
|
||||||
|
2. Change the slug and title in the frontmatter
|
||||||
|
3. Delete the sections you do not need
|
||||||
|
|
||||||
|
## 5. Code blocks
|
||||||
|
|
||||||
|
Blocks of four lines or more get a greyscale window bar (three dots); shorter fragments do not, so small snippets do not look like screenshots.
|
||||||
|
|
||||||
|
```ts
|
||||||
|
// Sort contract: pinned first → newest first → id as a tie-breaker
|
||||||
|
export function sortPosts<T extends Post>(posts: T[]): T[] {
|
||||||
|
return [...posts].sort((a, b) => {
|
||||||
|
const pin = Number(b.data.pinned === true) - Number(a.data.pinned === true);
|
||||||
|
return pin !== 0 ? pin : b.data.pubDate.getTime() - a.data.pubDate.getTime();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Refer to variables inline like `posts`.
|
||||||
|
|
||||||
|
## 6. Tables
|
||||||
|
|
||||||
|
| Capability | Syntax | Note |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| Colour emphasis | `<span class="c-blue">` | three per page at most |
|
||||||
|
| Typeface | `<span class="font-kai">` | a whole page adds font weight |
|
||||||
|
| Image | `` | see the writing guide for size rules |
|
||||||
|
| Video | frontmatter `video:` | lives in public/media, ≤50MB |
|
||||||
|
| Link card | a bare URL on its own line | OG fetched at build time, falls back to a plain link |
|
||||||
|
|
||||||
|
## 7. Images
|
||||||
|
|
||||||
|
Reference images by relative path, stored under `content/posts/assets/<slug>/`; they expand on click and vectors stay sharp:
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## 8. Link cards
|
||||||
|
|
||||||
|
A bare URL on its own line becomes an OG preview card at build time; if the fetch fails it degrades to a plain link, never breaking the layout:
|
||||||
|
|
||||||
|
https://astro.build
|
||||||
|
|
||||||
|
## 9. Folding long content
|
||||||
|
|
||||||
|
Long appendices, full logs and big configs can fold away with zero JavaScript, using native `details`:
|
||||||
|
|
||||||
|
<details>
|
||||||
|
<summary>Open the folded example</summary>
|
||||||
|
|
||||||
|
A folded region can hold anything — paragraphs, lists, code blocks.
|
||||||
|
|
||||||
|
- Best for “read on demand” detail
|
||||||
|
- Not for conclusions (readers may never open it)
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
|
## 10. Closing after the rule
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Three sentences are enough to close: what this covered, what the reader should take away, and where to go next. The template is not a demand to write ten sections — it is a promise that **the capabilities are at hand when you need to express something**.
|
||||||
|
|
||||||
|
Next time, copy this file and delete until only your point remains.
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
---
|
||||||
|
title: "写作模板:这篇文章本身就是模板"
|
||||||
|
pubDate: 2026-11-02
|
||||||
|
category: tech
|
||||||
|
tags: [写作, 模板]
|
||||||
|
pinned: true
|
||||||
|
description: 一篇文章演示全站可用的排版能力:标题层级、彩色强调、字族、引用、代码窗、表格、图、链接卡、折叠。复制它开始写新文。
|
||||||
|
---
|
||||||
|
|
||||||
|
这篇不是教程,是**可复制的模板**。下面每一节都在真跑——你看到的效果,就是 Markdown 源码能产出的效果。写新文章时,把本文件复制一份、改个 slug、删掉不需要的段落即可。
|
||||||
|
|
||||||
|
它同时是**置顶功能**的活样本:`frontmatter` 里的 `pinned: true` 会让它排在首页、归档与书架的最前面,而日期、URL、订阅源里的时间都不变。
|
||||||
|
|
||||||
|
## 一、标题层级与段落
|
||||||
|
|
||||||
|
正文用 `##` 作一级节标题,`###` 作二级。**不要用 `#`**——文章标题由 frontmatter 的 `title` 渲染,正文再写 `#` 会出现两个一级标题,屏幕阅读器与搜索摘要都会困惑。
|
||||||
|
|
||||||
|
段落之间空一行即可。行内可以**加粗**、*斜体*、~~删除线~~、`行内代码`,也可以放[普通链接](https://astro.build)。
|
||||||
|
|
||||||
|
## 二、彩色强调:一页不超过三处
|
||||||
|
|
||||||
|
纪律来自设计基线:站点外壳是灰阶的,颜色只用来给正文某一个判断加重,一页最多三处。超过就变成花哨。
|
||||||
|
|
||||||
|
<span class="c-blue">第一处:一个关键结论用蓝色提出。</span> 后面照常叙述。
|
||||||
|
|
||||||
|
<span class="c-red">第二处:需要警示的坑用红色。</span> 比如「改完 Markdown 插件必须清 `node_modules/.astro`,否则改动静默不生效」。
|
||||||
|
|
||||||
|
<span class="c-green">第三处:确认可行的路径用绿色。</span> 三处之后,本节不再上色。
|
||||||
|
|
||||||
|
可用色相共 8 组(blue / teal / green / yellow / orange / red / pink / purple),每组有标准与 `-soft` 两档;另有 4 个灰阶层级类(`ink-muted` / `ink-warm` / `ink-cool` / `ink-faint`)用于降调,不算彩色额度。
|
||||||
|
|
||||||
|
## 三、字族:换字体只作用于被包裹的文字
|
||||||
|
|
||||||
|
正文默认是无衬线。想给某句话换气质,用类包起来就行:
|
||||||
|
|
||||||
|
<span class="font-kai">这一句是楷体。适合题记、书评里引的原句,或者需要慢一点读的段落。</span>
|
||||||
|
|
||||||
|
<span class="font-huiwen">这一句是汇文明朝体。长段落用它会明显降低阅读速度,所以只用在短句上。</span>
|
||||||
|
|
||||||
|
可用字族共 6 族(`font-kai` 楷、`font-song` 宋、`font-hei-sys` 黑、`font-fangsong` 仿宋、`font-huiwen` 汇文明朝、`font-kuaile` 快乐体),另有 `font-art-kuaile` 艺术字标题类。**注意体积**:整页换字族会让访问者下载一份中文字体,正文默认字体不要轻易改。
|
||||||
|
|
||||||
|
### 三级标题长这样
|
||||||
|
|
||||||
|
比二级小一档、加粗、上下留白更紧。用于把一节拆成几个小话题。
|
||||||
|
|
||||||
|
## 四、引用与列表
|
||||||
|
|
||||||
|
> 引用块用于摘录别人的话。署名可以换成斜体放在最后。
|
||||||
|
>
|
||||||
|
> —— 一句虚构的署名
|
||||||
|
|
||||||
|
无序列表:
|
||||||
|
|
||||||
|
- 第一项
|
||||||
|
- 第二项,可以带 `行内代码`
|
||||||
|
- 第三项,可以嵌套:
|
||||||
|
- 子项一
|
||||||
|
- 子项二
|
||||||
|
|
||||||
|
有序列表适合步骤:
|
||||||
|
|
||||||
|
1. 复制模板
|
||||||
|
2. 改 frontmatter 的 slug 与标题
|
||||||
|
3. 删掉不需要的段落
|
||||||
|
|
||||||
|
## 五、代码块
|
||||||
|
|
||||||
|
四行及以上的代码块会带上灰阶窗条(三个点),短代码块不加——避免小片段看着像截图。
|
||||||
|
|
||||||
|
```ts
|
||||||
|
// 排序契约:置顶优先 → 时间倒序 → id 兜底
|
||||||
|
export function sortPosts<T extends Post>(posts: T[]): T[] {
|
||||||
|
return [...posts].sort((a, b) => {
|
||||||
|
const pin = Number(b.data.pinned === true) - Number(a.data.pinned === true);
|
||||||
|
return pin !== 0 ? pin : b.data.pubDate.getTime() - a.data.pubDate.getTime();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
行内提到变量时用 `posts` 这种形式即可。
|
||||||
|
|
||||||
|
## 六、表格
|
||||||
|
|
||||||
|
| 能力 | 写法 | 注意 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| 彩色强调 | `<span class="c-blue">` | 一页 ≤3 处 |
|
||||||
|
| 换字族 | `<span class="font-kai">` | 整页换会拉字体体积 |
|
||||||
|
| 图片 | `` | 体积纪律见写作指南 |
|
||||||
|
| 视频 | frontmatter `video:` | 放 public/media,≤50MB |
|
||||||
|
| 链接卡片 | 裸链接单独成段 | 构建期抓 OG,失败回落普通链接 |
|
||||||
|
|
||||||
|
## 七、图片
|
||||||
|
|
||||||
|
图片用相对路径引用,挂在 `content/posts/assets/<slug>/` 下,点击可放大(矢量图不糊):
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## 八、链接卡片
|
||||||
|
|
||||||
|
一个裸链接单独成段,构建期会抓取 OG 预览生成卡片;抓不到就退回普通链接,不会坏版:
|
||||||
|
|
||||||
|
https://astro.build
|
||||||
|
|
||||||
|
## 九、折叠长内容
|
||||||
|
|
||||||
|
长附录、完整日志、大段配置可以折叠,零 JS,原生 `details`:
|
||||||
|
|
||||||
|
<details>
|
||||||
|
<summary>展开看一个被折叠的长例子</summary>
|
||||||
|
|
||||||
|
折叠区里可以放任何东西——段落、列表、代码块。
|
||||||
|
|
||||||
|
- 适合放「按需查看」的细节
|
||||||
|
- 不适合放结论(读者可能永远不展开)
|
||||||
|
|
||||||
|
</details>
|
||||||
|
|
||||||
|
## 十、分隔线之后收尾
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
收尾三句就够:这篇讲了什么、读者该带走什么、下一步去哪。模板不是要你写满十节,而是**在你需要表达时,能力都在手边**。
|
||||||
|
|
||||||
|
下一篇开始,复制本文件,删到只剩你要说的。
|
||||||
@@ -62,6 +62,69 @@ blocks:
|
|||||||
zh: 街拍与山野,随身一台无反,在等光的间隙按快门。
|
zh: 街拍与山野,随身一台无反,在等光的间隙按快门。
|
||||||
en: Street and landscapes with a mirrorless camera, pressing the shutter while waiting for the light.
|
en: Street and landscapes with a mirrorless camera, pressing the shutter while waiting for the light.
|
||||||
|
|
||||||
|
- type: prose
|
||||||
|
title:
|
||||||
|
zh: 关于我
|
||||||
|
en: About me
|
||||||
|
body:
|
||||||
|
zh: |
|
||||||
|
气象是我起点的专业——一个想做预报的人,依旧把云图当日常读物。
|
||||||
|
|
||||||
|
写代码是第二条主线:Linux、容器、自托管,把日常工具一件件磨顺手。
|
||||||
|
|
||||||
|
作品大多在 [wait4x.online](https://wait4x.online/)。
|
||||||
|
|
||||||
|
信条:**拥抱开源,热爱开源**。
|
||||||
|
en: |
|
||||||
|
Meteorology is where I started — an aspiring forecaster who still reads weather charts for fun.
|
||||||
|
|
||||||
|
Coding is the second thread: Linux, containers, self-hosting — polishing everyday tools one by one.
|
||||||
|
|
||||||
|
Most of my work lives at [wait4x.online](https://wait4x.online/).
|
||||||
|
|
||||||
|
Motto: **embrace open source, love open source**.
|
||||||
|
|
||||||
|
- type: linklist
|
||||||
|
title:
|
||||||
|
zh: 找到我
|
||||||
|
en: Find me
|
||||||
|
items:
|
||||||
|
- label:
|
||||||
|
zh: 本站
|
||||||
|
en: Website
|
||||||
|
href: 'https://wait4x.online/'
|
||||||
|
note:
|
||||||
|
zh: 文章、图库与瞬间
|
||||||
|
en: Posts, gallery and moments
|
||||||
|
- label:
|
||||||
|
zh: 邮件
|
||||||
|
en: Email
|
||||||
|
href: 'mailto:admin@wait4x.online'
|
||||||
|
note:
|
||||||
|
zh: 有话直说
|
||||||
|
en: Say hello directly
|
||||||
|
- label:
|
||||||
|
zh: GitHub
|
||||||
|
en: GitHub
|
||||||
|
href: 'https://github.com/wait4xx'
|
||||||
|
note:
|
||||||
|
zh: 开源项目与提交
|
||||||
|
en: Open-source projects and commits
|
||||||
|
- label:
|
||||||
|
zh: 自托管 gitea
|
||||||
|
en: Self-hosted gitea
|
||||||
|
href: 'https://git.wait4x.online/wait4x/blog'
|
||||||
|
note:
|
||||||
|
zh: 本站源码
|
||||||
|
en: Source of this site
|
||||||
|
- label:
|
||||||
|
zh: RSS
|
||||||
|
en: RSS
|
||||||
|
href: /rss.xml
|
||||||
|
note:
|
||||||
|
zh: 订阅更新
|
||||||
|
en: Subscribe to updates
|
||||||
|
|
||||||
- type: prose
|
- type: prose
|
||||||
title:
|
title:
|
||||||
zh: 本站如何构建
|
zh: 本站如何构建
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ blurb:
|
|||||||
repo_url: https://git.wait4x.online/wait4x/blog
|
repo_url: https://git.wait4x.online/wait4x/blog
|
||||||
repo_label: git.wait4x.online/wait4x/blog
|
repo_label: git.wait4x.online/wait4x/blog
|
||||||
blurb_after:
|
blurb_after:
|
||||||
zh: —— Astro SSG、双写作流、构建发布全链皆在仓中。以下是我在自托管 gitea 与 GitHub 上的全部公开仓库,以及最近一年的贡献活动。
|
zh: ' —— Astro SSG、双写作流、构建发布全链皆在仓中。以下是我在自托管 gitea 与 GitHub 上的全部公开仓库,以及最近一年的贡献活动。'
|
||||||
en: — the Astro SSG, dual-writing workflow, and the full build & deploy pipeline live in the repo. Below are all my public repositories on self-hosted gitea and GitHub, plus contributions from the past year.
|
en: ' — the Astro SSG, dual-writing workflow, and the full build & deploy pipeline live in the repo. Below are all my public repositories on self-hosted gitea and GitHub, plus contributions from the past year.'
|
||||||
|
|
||||||
# ---- 项目墙可见性与排序(后台「开源页」可改;留空/缺省 = 现状) ----
|
# ---- 项目墙可见性与排序(后台「开源页」可改;留空/缺省 = 现状) ----
|
||||||
# mode: all=全部(默认) | only=仅 include 列出 | exclude=排除 exclude 列出
|
# mode: all=全部(默认) | only=仅 include 列出 | exclude=排除 exclude 列出
|
||||||
@@ -18,5 +18,9 @@ exclude: []
|
|||||||
sort: pinned-first
|
sort: pinned-first
|
||||||
# 来源过滤:both=双源合并(默认) | github | gitea
|
# 来源过滤:both=双源合并(默认) | github | gitea
|
||||||
perSource: both
|
perSource: both
|
||||||
# 开篇文案来源:off=用本文件 blurb(默认) | github-readme=构建期取 wait4xx/wait4xx 的 README 渲染
|
# 开篇来源(compat,**不推荐开启**):off=用本文件 blurb + 原生档案卡(默认)
|
||||||
|
# github-readme = 构建期取 wait4xx/wait4xx 的 README 原样渲染在档案卡下方
|
||||||
|
# ⚠ 开启会引入 7 类第三方外链图(readme-typing-svg / shields.io 徽章 / github-readme-stats /
|
||||||
|
# streak-stats / activity-graph / 贡献蛇 / komarev 访客徽章),慢网或被墙时整片空白;
|
||||||
|
# 且 README 用 <div align="center"> 居中,本站渲染不认该属性 → 居中失效。内容已由档案卡承接。
|
||||||
intro_from: "off"
|
intro_from: "off"
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# 主题旋钮(样式即数据 · 层 4):只放白名单内的 9 组旋钮。
|
||||||
|
# 红线:--measure(版心)与断点/纸墨/code 配色不在此列——它们牵动版面结构与分轨身份。
|
||||||
|
# 全部留空 = 沿用 src/styles/tokens.css 的既有值(零配置零变化)。
|
||||||
|
# 钳制与单调性在 src/lib/theme.ts 里做:越界值被夹取而非报错,构建不会因主题配置失败。
|
||||||
|
|
||||||
|
# ① 强调色(明/暗两值;构建期闸门校验正文对比度 ≥4.5,不达标回落默认)
|
||||||
|
accent_light: '#3454d1'
|
||||||
|
accent_dark: '#8ea2ff'
|
||||||
|
|
||||||
|
# ② 图片圆角(4–16;08 文档裁定上限 14)
|
||||||
|
radius_img: 10
|
||||||
|
|
||||||
|
# ③ 标题字号(22–32;必须 h1 > h2 > h3,否则整体回落默认)
|
||||||
|
text_h1: 27
|
||||||
|
text_h2: 22
|
||||||
|
text_h3: 19
|
||||||
|
|
||||||
|
# ④ 正文字号(16–22)
|
||||||
|
prose_size_reading: 20
|
||||||
|
prose_size_tech: 19
|
||||||
|
|
||||||
|
# ⑤ 正文行高(1.5–2.0)
|
||||||
|
leading_reading: 1.75
|
||||||
|
leading_tech: 1.7
|
||||||
|
|
||||||
|
# ⑥ 间距梯度(8–80;必须严格递增 3 < 4 < 5 < 6,否则回落默认)
|
||||||
|
space_3: 16
|
||||||
|
space_4: 24
|
||||||
|
space_5: 40
|
||||||
|
space_6: 64
|
||||||
|
|
||||||
|
# ⑦ 段落流距(0–2em)
|
||||||
|
flow_p: 0.9
|
||||||
|
flow_h2_post: 0.6
|
||||||
|
|
||||||
|
# ⑧ 过渡时长(150–600ms)
|
||||||
|
dur: 350
|
||||||
+91
-1
@@ -2,6 +2,36 @@
|
|||||||
|
|
||||||
> 适用:`content/posts/*.md`(书评与技术轨通用)。资产目录约定 + 三种媒体的写法 + 体积纪律。
|
> 适用:`content/posts/*.md`(书评与技术轨通用)。资产目录约定 + 三种媒体的写法 + 体积纪律。
|
||||||
|
|
||||||
|
## 写作模板(从这里开始,2026-11-02 起)
|
||||||
|
|
||||||
|
别从空白文件起步——**复制现成的模板**:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cp content/posts/writing-template.md content/posts/my-new-post.md
|
||||||
|
# 改 frontmatter 的 title / pubDate / tags / description,删掉不需要的段落
|
||||||
|
```
|
||||||
|
|
||||||
|
模板本身是一篇真文章(线上读:`/archives/writing-template/`),每节都在跑一种能力,你看到的效果就是源码的效果:标题层级、三处彩色强调、两族字体、引用、列表、代码窗条、表格、图片放大、链接卡片、`<details>` 折叠、分隔线。
|
||||||
|
|
||||||
|
写之前只需记住三条纪律:
|
||||||
|
- **彩色 ≤3 处/页**:外壳是灰阶,颜色只用来给某个判断加重;超过就花哨
|
||||||
|
- **整页换字族要谨慎**:会给访问者拉一份中文字体(汇文明朝整页约 420KB,已子集化)
|
||||||
|
- **折叠放细节不放结论**:`<details>` 里的内容可能永远没人展开
|
||||||
|
|
||||||
|
## 置顶文章
|
||||||
|
|
||||||
|
首页、归档、书架三处列表默认按日期倒序。想让某篇长期排在最前,frontmatter 加一行:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
pinned: true
|
||||||
|
```
|
||||||
|
|
||||||
|
语义边界(刻意设计成这样):
|
||||||
|
- **只影响列表顺序**,不改 `pubDate`、不改 URL、不影响 RSS 的时间序列(订阅者不会看到时间错乱)
|
||||||
|
- 多篇同时置顶时,它们内部仍按日期倒序
|
||||||
|
- 列表里会显示一个灰阶「置顶」小徽标,取消置顶后立刻回到时间序
|
||||||
|
- 后台「文章」编辑页有「置顶」开关,不必手改 frontmatter
|
||||||
|
|
||||||
## 目录约定
|
## 目录约定
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -153,6 +183,18 @@ https://astro.build/
|
|||||||
|
|
||||||
体积账结论(2026-11-02 实测,本地无 gzip 的相对值):**未使用某字体的页面,字体字节增量恒为 0**(构建期按页子集化 + unicode-range 按需拉取)。汇文采用文风开源的 cn-font-split 切片包(339 片),实测只拉用到字符的 19 片。
|
体积账结论(2026-11-02 实测,本地无 gzip 的相对值):**未使用某字体的页面,字体字节增量恒为 0**(构建期按页子集化 + unicode-range 按需拉取)。汇文采用文风开源的 cn-font-split 切片包(339 片),实测只拉用到字符的 19 片。
|
||||||
|
|
||||||
|
**再裁一刀(按本站实际用字子集化)**:切片包本身粒度粗(一片含数百字),只做标题/短句的艺术字体往往只用到几十个字符。`scripts/build-perf/subset-fonts.py` 读字体 CSS 的 `@font-face`、收集内容里真实出现的字符、逐片求交集后用 `pyftsubset` 重写——实测汇文整页 **694KB → 420KB**(约 −40%)。命令:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 scripts/build-perf/subset-fonts.py \
|
||||||
|
--css node_modules/@fontsource/huiwen-mincho/index.css \
|
||||||
|
--out public/fonts/subset/huiwen \
|
||||||
|
--chars-from content/posts content/moments content/site/*.yaml
|
||||||
|
# 可选:--chars-mode all|headings(只统计标题字)、--min-bytes 4096(小于该值的片不裁)
|
||||||
|
```
|
||||||
|
|
||||||
|
子集化产物输出到 `--out` 指定目录(如 `public/fonts/subset/`);把它接进站点(构建链挂守卫 + 字体 CSS 指向子集)是独立一步,接线后随构建自动生成,未接线前需手动跑。**换字/加字后重跑一次**,否则新字会回落到下一个切片或系统字体。
|
||||||
|
|
||||||
### 候补字体清单(未落地,加一款约"一条命令 + 一次体积账")
|
### 候补字体清单(未落地,加一款约"一条命令 + 一次体积账")
|
||||||
|
|
||||||
| 字体 | 许可证 | 允许 webfont 嵌入 | 未落地原因 |
|
| 字体 | 许可证 | 允许 webfont 嵌入 | 未落地原因 |
|
||||||
@@ -168,7 +210,7 @@ https://astro.build/
|
|||||||
| 阿里妈妈东方大楷 / 演示悠然小楷 | 免费商用 / 个人免费 | ⚠️ 需逐款核嵌入条款 | 无包;"个人免费"字体常禁 @font-face |
|
| 阿里妈妈东方大楷 / 演示悠然小楷 | 免费商用 / 个人免费 | ⚠️ 需逐款核嵌入条款 | 无包;"个人免费"字体常禁 @font-face |
|
||||||
| 霞鹜文楷 Light/Bright | OFL-1.1 | ✅ | 实测 **+8605KB**(CJK 切片粒度所致) |
|
| 霞鹜文楷 Light/Bright | OFL-1.1 | ✅ | 实测 **+8605KB**(CJK 切片粒度所致) |
|
||||||
|
|
||||||
> 加新字体的流程:①核许可证与 **web 嵌入条款**(很多"个人免费"字体明文禁 @font-face,只能进系统回退)②npm 装或放入 `public/fonts/<family>/`(优选 cn-font-split 类切片包)③`global.css` 加类 + `rehype-class-whitelist` 放行 + `public/admin/typography-classes.js` 加一项 ④跑体积账,超 150KB/页 的要评估是否值得。
|
> 加新字体的流程:①核许可证与 **web 嵌入条款**(很多"个人免费"字体明文禁 @font-face,只能进系统回退)②npm 装或放入 `public/fonts/<family>/`(优选 cn-font-split 类切片包)③`global.css` 加类 + `rehype-class-whitelist` 放行 + `public/admin/typography-classes.js` 加一项 ④跑体积账,超 150KB/页 的要评估是否值得;展示类字体再跑一次 `scripts/build-perf/subset-fonts.py` 按实际用字裁切(命令见上节)。
|
||||||
|
|
||||||
```markdown
|
```markdown
|
||||||
<span class="ink-muted">次要说明</span>
|
<span class="ink-muted">次要说明</span>
|
||||||
@@ -211,6 +253,51 @@ typography:
|
|||||||
|
|
||||||
**层 3 · 艺术字体**:`font-art-kuaile`(站酷快乐体,艺术字专用类)。⚠️ **仅用于标题/短句**:艺术字字形大,CJK 切片体积高(实测用到页 +163KB),长段使用会显著抬高单页字体成本。
|
**层 3 · 艺术字体**:`font-art-kuaile`(站酷快乐体,艺术字专用类)。⚠️ **仅用于标题/短句**:艺术字字形大,CJK 切片体积高(实测用到页 +163KB),长段使用会显著抬高单页字体成本。
|
||||||
|
|
||||||
|
## 瞬间(/moments)怎么写
|
||||||
|
|
||||||
|
瞬间与文章一样支持富文本,但入口在后台「瞬间」集合(`content/moments/*.md`):
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
---
|
||||||
|
pubDate: 2026-11-02
|
||||||
|
tags: [随手拍]
|
||||||
|
text: 今天把**置顶**做完了,顺手试了 <span class="c-teal">彩色</span>
|
||||||
|
---
|
||||||
|
```
|
||||||
|
|
||||||
|
- `text` 支持 markdown(`**加粗**`、列表、`> 引用`)与**同一套排版类**(字体/颜色),因为走的是与全站文案相同的净化管线:危险标签整棵丢弃,只放行 35 项白名单类
|
||||||
|
- 一条瞬间 = 一行时间线卡片,**每条都带独立评论区**(展开才挂载,双语页共用同一评论流,评论不分裂)
|
||||||
|
- 每条的「浏览 / 评论」数字是只读统计(不会因为别人点开评论而虚增浏览)
|
||||||
|
- `text` 与 `image` 至少填一项;图片建议先压缩
|
||||||
|
|
||||||
|
## 页面块(关于页 blocks,字段速查)
|
||||||
|
|
||||||
|
关于页正文可由九个块拼成(后台拖拽排序,每块有「显示」开关)。完整操作见 [管理台](./管理台.md);这里是写内容时对照的字段表——文本字段一律 `{zh, en}`。
|
||||||
|
|
||||||
|
| 块型 | 必填 | 可选 | 一句话 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `prose` | `body` | `title`、`width`(narrow/full) | markdown 长文 |
|
||||||
|
| `tracks` | `title`、`items[].name` | `items[].icon`、`items[].desc` | 主线/能力面 |
|
||||||
|
| `cards` | `items[].title` | `title`、`columns`(2/3)、`items[].desc/href/tag` | 并列卡片墙 |
|
||||||
|
| `timeline` | `items[].time`、`items[].title` | `title`、`items[].desc` | 时间线(时间可自由文本) |
|
||||||
|
| `quote` | `text` | `cite` | 单句引文 |
|
||||||
|
| `figure` | `image` | `alt`、`caption` | 单图(必须上传,禁外链) |
|
||||||
|
| `linklist` | `items[].label`、`items[].href` | `title`、`items[].note` | 链接清单 |
|
||||||
|
| `cta` | `text`、`href`、`label` | — | 行动按钮 |
|
||||||
|
| `divider` | — | `style`(line/space) | 分隔 |
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
blocks:
|
||||||
|
- type: prose
|
||||||
|
body: { zh: 正文 markdown,可含排版类 span, en: Body markdown }
|
||||||
|
- type: cards
|
||||||
|
columns: 3
|
||||||
|
items:
|
||||||
|
- { title: { zh: 写作, en: Writing }, desc: { zh: 书评与技术文, en: Reviews & tech } }
|
||||||
|
```
|
||||||
|
|
||||||
|
边界:块数 ≤24、单块文本 ≤4000 字(超限截断并 WARN);未知块型跳过 + WARN;`blocks` 为空时回落 `intro` markdown,再空回落内置文案。图片字段走 `image()`,只能后台上传进 `content/site/assets/`。
|
||||||
|
|
||||||
## 发布提醒
|
## 发布提醒
|
||||||
|
|
||||||
- push main → webhook 自动构建发布(约 10 秒)
|
- push main → webhook 自动构建发布(约 10 秒)
|
||||||
@@ -303,6 +390,9 @@ markdown 原生语法,无需任何配置:
|
|||||||
| `latestPhotos` | 0-6 | 4 | 「最新影像」张数;**0 = 隐藏该区块** |
|
| `latestPhotos` | 0-6 | 4 | 「最新影像」张数;**0 = 隐藏该区块** |
|
||||||
| `perTrackLimit` | 4-8 | 6 | 首页阅读/技术两轨各显示条数 |
|
| `perTrackLimit` | 4-8 | 6 | 首页阅读/技术两轨各显示条数 |
|
||||||
| `sections` | `{tracks, photos, heatmap, projects}` 布尔 | 全开 | 区块开关,关掉即不渲染 |
|
| `sections` | `{tracks, photos, heatmap, projects}` 布尔 | 全开 | 区块开关,关掉即不渲染 |
|
||||||
|
| `projectsLimit` | 1-99 | 6 | 首页项目墙条数(越界夹取) |
|
||||||
|
| `announcement` | `{zh, en}`(markdown 富文本) | 空 | 名片区下方公告;空 = 不渲染 |
|
||||||
|
| `postsTracks` | `{reading, tech, photo}` 布尔 | 全开 | 关掉某轨则该轨文章不在首页列出(归档页仍可见) |
|
||||||
|
|
||||||
越界值会被夹取(如 perTrackLimit=20 按 8 处理),不报错;**全部留空 = 现有形态不变**。
|
越界值会被夹取(如 perTrackLimit=20 按 8 处理),不报错;**全部留空 = 现有形态不变**。
|
||||||
|
|
||||||
|
|||||||
+169
@@ -1,17 +1,186 @@
|
|||||||
# 管理台(Sveltia CMS)使用指南
|
# 管理台(Sveltia CMS)使用指南
|
||||||
|
|
||||||
> 地址:`https://wait4x.online/admin/`(页脚「管理」入口)| 用途:照片上传与 sidecar 编辑的图形界面 | 保存即 commit 到 main → webhook 自动构建发布(约 10 秒上线)
|
> 地址:`https://wait4x.online/admin/`(页脚「管理」入口)| 用途:照片上传与 sidecar 编辑的图形界面 | 保存即 commit 到 main → webhook 自动构建发布(约 10 秒上线)
|
||||||
|
>
|
||||||
|
> 这份是**操作手册**:每个入口能改什么、字段怎么填、改完会发生什么。写文章正文的排版技巧见 [写作指南](./写作指南.md)——两份分工:这里讲"后台怎么用",那里讲"正文怎么写"。
|
||||||
|
|
||||||
## 登录
|
## 登录
|
||||||
|
|
||||||
选 **Sign In with Token** → 用 gitea 的 access token(宿主 `~/docker_apps/gitea/init-templates.txt` 里的 api-token,或 gitea 网页新建 scope=read/write:repository)。token 存浏览器 localStorage,下次免登。
|
选 **Sign In with Token** → 用 gitea 的 access token(宿主 `~/docker_apps/gitea/init-templates.txt` 里的 api-token,或 gitea 网页新建 scope=read/write:repository)。token 存浏览器 localStorage,下次免登。
|
||||||
|
|
||||||
|
## 四类内容集合
|
||||||
|
|
||||||
|
| 入口 | 文件位置 | 用来放什么 | 关键约束 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| 文章 | `content/posts/<slug>.md` | 书评 / 技术文 / 摄影札记三轨 | `category` 三选一(`reading` / `tech` / `photo`),首页分轨由它派生 |
|
||||||
|
| 瞬间 | `content/moments/*.md` | 一句话 + 一张图的时间线 | `text` 与 `image` **至少填一项**(后台无法表达条件必填,保存前自查) |
|
||||||
|
| 照片 | `content/photos/*.json` + 图 | 图库(街拍 / 风景两组) | 标题**必填**(空标题会让构建炸,实测坑);EXIF 由构建期 loader 自动补全 |
|
||||||
|
| 站点页面 | `content/site/*.yaml` | 首页、关于页、开源页、主题 | 后台改的是**单例文件**,没有"新建" |
|
||||||
|
|
||||||
|
几条通用规则:
|
||||||
|
|
||||||
|
- **双语字段成对出现**:中文 / 英文两个输入框。英文留空不是错误——构建期回落中文并在日志里打 WARN(`[blocks] 缺译…`),页面不会破版。
|
||||||
|
- **留空 = 用默认**:任何字段清空都回到仓库自带的默认文案 / 默认值,构建永远成功。想让某段彻底消失,请看字段自带的"留空则不渲染"提示。
|
||||||
|
- **文章英文版**:不在后台写。跑 `python3 scripts/translate/translate_posts.py` 生成 `content/posts-en/` 同名文件;手写润色过的译文在 frontmatter 写 `locked: true`,翻译脚本会无条件跳过它。
|
||||||
|
- **保存即提交**:后台保存等于向仓库提交,push 后约 10 秒自动构建上线。
|
||||||
|
|
||||||
|
## 文章置顶(5h 新增)
|
||||||
|
|
||||||
|
文章编辑页有一个「置顶」开关。打开后这篇文章排在首页分轨、归档、书架三处列表的最前面,列表里显示一个灰阶「置顶」小徽标。
|
||||||
|
|
||||||
|
语义边界(刻意如此,别当 bug 报):
|
||||||
|
- **只影响列表顺序**:`pubDate` 不变、URL 不变、RSS 里的时间序列不变,订阅者不会看到时间错乱
|
||||||
|
- 多篇同时置顶时,置顶组内部仍按日期倒序
|
||||||
|
- 关掉开关立即恢复时间序,没有"冷却期"
|
||||||
|
|
||||||
|
## 瞬间(5h 起与文章同级)
|
||||||
|
|
||||||
|
「瞬间」集合的「文字」字段是 **markdown 编辑器**,与文章同一套表达力:
|
||||||
|
|
||||||
|
- markdown:`**加粗**`、`*斜体*`、列表、`> 引用`、`` `行内代码` ``
|
||||||
|
- 排版类 HTML:`<span class="c-blue font-kai">彩色 + 楷体</span>`(可用类清单见写作指南「文章排版类」一节,与文章完全同一份白名单)
|
||||||
|
- 仍守外壳灰阶纪律:彩色是**强调**不是装饰,一页 ≤3 处
|
||||||
|
|
||||||
|
**每条瞬间自带评论区**:时间线卡片下方有「评论」折叠条,读者点开才加载评论(不点开不为它付任何加载成本)。中文页与英文页共用同一条评论流,语言切换不会丢评论。
|
||||||
|
|
||||||
|
**每条的浏览 / 评论数字是只读的**:读者点开评论区不会虚增浏览数(只有整页访问才计一次)。
|
||||||
|
|
||||||
## 照片上传流
|
## 照片上传流
|
||||||
|
|
||||||
1. 图库照片 → New Entry:填标题(**必填**,空标题会让构建炸——实测坑)、选分组(street/landscape)、可写 alt
|
1. 图库照片 → New Entry:填标题(**必填**,空标题会让构建炸——实测坑)、选分组(street/landscape)、可写 alt
|
||||||
2. 图片字段 → 资产库上传 jpg(与 sidecar 同目录落位,零重压缩)
|
2. 图片字段 → 资产库上传 jpg(与 sidecar 同目录落位,零重压缩)
|
||||||
3. Save → 自动 commit + 构建 → 画廊出现(EXIF 构建期自动提取,exif 字段留空即可)
|
3. Save → 自动 commit + 构建 → 画廊出现(EXIF 构建期自动提取,exif 字段留空即可)
|
||||||
|
|
||||||
|
## 块编辑:关于页的块式页面构建器
|
||||||
|
|
||||||
|
关于页(`content/site/about.yaml`)的正文由 **blocks 列表**构成,后台里是一串可拖拽排序的卡片。每个块都有「显示」开关;关掉只是不渲染,块本身留在数据里。
|
||||||
|
|
||||||
|
两条渲染纪律:
|
||||||
|
|
||||||
|
- 列表为空(或全关)时,页面回落到 `intro` 字段的 markdown 正文;`intro` 也空则用内置默认文案。三级回落,任何一级为空都不会出白页。
|
||||||
|
- 未知块型(手工编辑 yaml 写错的 `type`)会被**跳过并打印 `[blocks]` 警告**,不会炸构建;块数上限 24,单块文本上限 4000 字,超限截断并 WARN。
|
||||||
|
|
||||||
|
九类块与字段(文本字段一律 `{zh, en}` 双语对象):
|
||||||
|
|
||||||
|
| 块型 | 必填 | 可选 | 用途 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `prose` 正文 | `body` | `title`、`width`(`narrow` 版心 / `full` 通栏) | markdown 长文,最常用 |
|
||||||
|
| `tracks` 版图 | `title`、`items[].name` | `items[].icon`、`items[].desc` | 几条主线 / 能力面,图标白名单外或留空显示首字占位 |
|
||||||
|
| `cards` 卡片墙 | `items[].title` | `title`、`columns`(2 或 3,默认 3)、`items[].desc/href/tag` | 并列展示若干条目 |
|
||||||
|
| `timeline` 时间线 | `items[].time`、`items[].title` | `title`、`items[].desc` | 时间列是自由文本(`2024 — 2026` 也行) |
|
||||||
|
| `quote` 引文 | `text` | `cite` | 单句金句,配 `font-kai` 更出效果 |
|
||||||
|
| `figure` 图片 | `image` | `alt`、`caption` | **只能后台上传**(落 `content/site/assets/`,走图片管线),禁止外链 |
|
||||||
|
| `linklist` 链接清单 | `items[].label`、`items[].href` | `title`、`items[].note` | 相关阅读 / 外部资源 |
|
||||||
|
| `cta` 行动按钮 | `text`、`href`、`label` | — | 一页建议不超过一个 |
|
||||||
|
| `divider` 分隔 | — | `style`(`line` 细线 / `space` 纯留白) | 长页分段 |
|
||||||
|
|
||||||
|
yaml 形态示例(手工编辑时照此写):
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
blocks:
|
||||||
|
- type: prose
|
||||||
|
title: { zh: 关于这个站点, en: About this site }
|
||||||
|
body:
|
||||||
|
zh: 这里写 markdown 正文,支持列表、粗斜体、链接与排版类。
|
||||||
|
en: Markdown body here.
|
||||||
|
width: narrow
|
||||||
|
- type: quote
|
||||||
|
text: { zh: 所谓暮色,就是光慢慢地承认自己要走。, en: Dusk is light admitting it has to go. }
|
||||||
|
cite: { zh: 本站, en: this site }
|
||||||
|
- type: figure
|
||||||
|
image: ./assets/desk.jpg # 后台会替你写成这个相对路径
|
||||||
|
caption: { zh: 工作台一角, en: A corner of the desk }
|
||||||
|
```
|
||||||
|
|
||||||
|
其它可用字段:`layout.showIdCard`(关掉则不渲染名片区,默认开)、`typography`(见下一节)。
|
||||||
|
|
||||||
|
**预览限制**:后台只提供字段编辑与列表摘要(摘要显示块型名),块的真实排版以下次构建后的页面为准——想调间距 / 字号,请用「主题设置」而不是在块里硬凑空行。
|
||||||
|
|
||||||
|
## 页面排版覆盖(每页一处)
|
||||||
|
|
||||||
|
首页 / 关于页 / 开源页各自有一个「页面排版覆盖(可选)」对象:
|
||||||
|
|
||||||
|
| 字段 | 取值 | 说明 |
|
||||||
|
|---|---|---|
|
||||||
|
| `font` | 字族下拉(10 项) | 本页**正文**默认字体类 |
|
||||||
|
| `accent` | 颜色下拉(18 项) | 本页强调色类 |
|
||||||
|
| `scale` | 0.8–1.25 | 字号缩放,1 = 全站默认 |
|
||||||
|
|
||||||
|
- 只作用于**该页内容容器**(挂 `.page-typo` + CSS 变量),不写全站 tokens,其它页面零影响。
|
||||||
|
- **体积成本提醒**:整页换艺术/展示字族(`font-huiwen` 汇文、`font-kuaile` 快乐体)意味着整页正文都要下载对应切片——单页字体成本会明显抬升,见写作指南的体积账。
|
||||||
|
- 白名单外的类名会被忽略(构建期过滤),写错不报错、也不生效。
|
||||||
|
|
||||||
|
## 主题设置(全站 17 个旋钮)
|
||||||
|
|
||||||
|
「主题设置」入口写 `content/site/theme.yaml`,17 项全部可选,留空 = 仓库默认值。**配错不会炸站**:越界值回落默认,组内单调性被破坏则整组回落。
|
||||||
|
|
||||||
|
| 组 | 字段 | 范围 | 约束语义 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| 强调色 | `accent_light` / `accent_dark` | `#rrggbb` | 明暗各一份;构建期对比度闸门断言正文 ≥4.5:1,不达标构建失败 |
|
||||||
|
| 圆角 | `radius_img` | 4–16 | 图片圆角,建议 ≤14 |
|
||||||
|
| 标题字号 | `text_h1` / `text_h2` / `text_h3` | h1/h2:22–32,h3:16–32 | **必须严格递减**(h1 > h2 > h3),否则三档一起回落默认 |
|
||||||
|
| 正文字号 | `prose_size_reading` / `prose_size_tech` | 16–22 | 书评 / 技术文分轨独立 |
|
||||||
|
| 行高 | `leading_reading` / `leading_tech` | 1.5–2.0 | 同上分轨 |
|
||||||
|
| 间距梯度 | `space_3` / `space_4` / `space_5` / `space_6` | 8–80 | **必须严格递增**,否则整组回落 |
|
||||||
|
| 流距 | `flow_p` / `flow_h2_post` | 0–2(em) | 段间距 / 标题下间距 |
|
||||||
|
| 动效 | `dur` | 150–600(ms) | 过渡时长;`prefers-reduced-motion` 下自动归零 |
|
||||||
|
|
||||||
|
不能配的东西(有意为止):版心宽度、断点、纸墨色、代码配色——它们牵动版面结构与分轨身份,属于设计红线。注入方式是构建期内联 `:root:root{…}`,运行时零 JS、零请求。
|
||||||
|
|
||||||
|
## 首页与开源页的其余旋钮
|
||||||
|
|
||||||
|
### 首页三字段(5g 新增)
|
||||||
|
|
||||||
|
| 字段 | 取值 | 默认 | 作用 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `projectsLimit` | 1–99 | 6 | 首页项目墙条数(越界夹取) |
|
||||||
|
| `announcement` | `{zh, en}` markdown | 空 | 名片区下方公告;**空 = 不渲染**,走富文本管线(可写排版类 span) |
|
||||||
|
| `postsTracks` | `{reading, tech, photo}` 布尔 | 全开 | 关掉某轨,该轨文章不在首页列出(归档页仍可见) |
|
||||||
|
|
||||||
|
### 开源页(opensource.yaml)
|
||||||
|
|
||||||
|
**开篇是原生「GitHub 档案卡」(5h 起)**:头像 / 名字@handle / 定位叙述 / 社交图标 / 统计四格(关注者、公开仓、总星标)/ 语言占比灰阶条(只有第一名用强调色,其余灰阶)。**零第三方图片、零 iframe**。数据失败只隐藏对应数字,不会破版。
|
||||||
|
|
||||||
|
想换那段「定位叙述」,改本文件的 `blurb` + `blurb_after`(双语,后台可改)——它们现在同时供给档案卡与项目墙下方的说明。
|
||||||
|
|
||||||
|
下面的 `intro_from: "github-readme"` **仍可用但不推荐**:那会把 GitHub 专用 README 原样渲染,带 7 类外链图(shields.io、readme-typing-svg、github-readme-stats、streak-stats、activity-graph、snake、komarev 访客徽章)与 `<div align="center">` 居中——本站按普通块渲染,故居中失效;外链图在慢网或被墙时全空白。这也是当初"部分内容没居中、有些图片没显示"的根因。
|
||||||
|
|
||||||
|
| 字段 | 取值 | 说明 |
|
||||||
|
|---|---|---|
|
||||||
|
| `pinned` | 仓短名数组 | 置顶顺序即展示顺序 |
|
||||||
|
| `mode` | `all` / `only` / `exclude` | 可见性模式 |
|
||||||
|
| `include` / `exclude` | 仓短名数组 | 对应模式的白 / 黑名单 |
|
||||||
|
| `sort` | `pinned-first` / `stars` / `updated` | 排序 |
|
||||||
|
| `perSource` | `both` / `github` / `gitea` | 来源过滤 |
|
||||||
|
| `intro_from` | `"off"` / `"github-readme"` | 开篇文案来源(**带引号写**,YAML 1.1 里裸 `off` 是布尔 false) |
|
||||||
|
|
||||||
|
**`mode: only` 的"看不见"排查**:构建日志会给每个没显示出来的 include 项打一行 `[opensource] projects:include 里的「X」…`,并区分两种原因——双源结果里根本没有这个仓(拼写 / 私有仓 / 该源刚失败),或者命中了但被 `perSource` 过滤掉。看到哪一行就知道该改什么。
|
||||||
|
|
||||||
|
**README 开篇(`intro_from: "github-readme"`)的回落矩阵**,构建日志逐级点名:
|
||||||
|
|
||||||
|
1. 取到 → 内容有变化才刷新缓存 `content/.github-readme.md`(入仓,保证构建确定性)
|
||||||
|
2. token 缺位 / HTTP 非 2xx / 内容为空 / 超时(10 秒)/ 网络异常 → 改用缓存(日志标注"可能陈旧")
|
||||||
|
3. 缓存也不在 → 回落本文件 `blurb` 的叙述文案
|
||||||
|
4. 缓存回写失败(构建仓只读挂载等)→ 只告警,本次渲染照常
|
||||||
|
|
||||||
|
token 位在 `~/docker_apps/blog/github-token.txt`(本机,0600)。
|
||||||
|
|
||||||
|
**两条已知限制**:
|
||||||
|
|
||||||
|
- **README 里的相对链接不重写**(如 `./img/x.png`、`docs/foo.md`):它们相对 GitHub 仓根解析,在本站没有对应产物,点了多半 404。保原样比猜一个基址可信,所以不做改写。
|
||||||
|
- **外部徽章图片加固但不参与构建**:shields.io、readme-typing-svg 这类第三方徽章在构建期**不抓取**,渲染时统一补 `loading="lazy"`(缺 alt 补空),它们慢、被墙或 404 都不影响页面渲染;尺寸已由样式限制在内容宽度内。
|
||||||
|
|
||||||
|
## 浏览与评论计数(5h 新增)
|
||||||
|
|
||||||
|
文章页、瞬间页、开源页、关于页都用同一枚灰阶徽标:**眼睛图标 = 浏览数,气泡图标 = 条评论**,数据来自自建 Artalk,不依赖任何第三方徽章服务。
|
||||||
|
|
||||||
|
几条行为约定(省得当成 bug):
|
||||||
|
|
||||||
|
- **一页只计一次浏览**:「计一次」发生在这页唯一那个 `page` 模式徽标(文章页在标题下方),同一页其余徽标都是只读镜像,显示的是同一个数字——不会出现"页头 17、评论区 16"
|
||||||
|
- **开评论不算浏览**:瞬间逐条徽标是只读的,读者展开评论区不会给那条动态虚增浏览量
|
||||||
|
- **接口挂掉显示「–」而不是 0**:宁可留白,也不给读者看一个错误的零
|
||||||
|
- **换页重计、同页刷新重计**:这是浏览量的定义,不是重复计数的 bug(软导航回同一页也算新一次访问)
|
||||||
|
|
||||||
## 纪律(与写作指南同源)
|
## 纪律(与写作指南同源)
|
||||||
|
|
||||||
- **图片体积**:上传前自行压缩(长边 ≤2400px)——Sveltia 内建优化**刻意关闭**(会抹 EXIF 断构建期提取管线)
|
- **图片体积**:上传前自行压缩(长边 ≤2400px)——Sveltia 内建优化**刻意关闭**(会抹 EXIF 断构建期提取管线)
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ pnpm astro build
|
|||||||
# 按页字体 CSS 子集化(车道 A 任务 1):裁 @font-face 声明数,构建仓与本地同链;
|
# 按页字体 CSS 子集化(车道 A 任务 1):裁 @font-face 声明数,构建仓与本地同链;
|
||||||
# 存在性守卫:新文件未推送到 main 前构建仓无此脚本,绝不让发布链因车道在途文件断掉
|
# 存在性守卫:新文件未推送到 main 前构建仓无此脚本,绝不让发布链因车道在途文件断掉
|
||||||
[ -f scripts/build-perf/subset-font-css.mjs ] && node scripts/build-perf/subset-font-css.mjs dist || echo "[build] subset 脚本未就绪,跳过"
|
[ -f scripts/build-perf/subset-font-css.mjs ] && node scripts/build-perf/subset-font-css.mjs dist || echo "[build] subset 脚本未就绪,跳过"
|
||||||
|
[ -f scripts/build-perf/config-check.py ] && python3 scripts/build-perf/config-check.py || echo "[build] config-check 未就绪,跳过"
|
||||||
|
[ -f scripts/build-perf/contrast-check.mjs ] && node scripts/build-perf/contrast-check.mjs dist || echo "[build] contrast 脚本未就绪,跳过"
|
||||||
# 首页阻塞 CSS 内联(车道 D):守卫先行同上——脚本未到 main 前绝不炸链
|
# 首页阻塞 CSS 内联(车道 D):守卫先行同上——脚本未到 main 前绝不炸链
|
||||||
[ -f scripts/build-perf/gen-sw-precache.mjs ] && node scripts/build-perf/gen-sw-precache.mjs dist || echo "[build] sw-precache 生成器未就绪,跳过"
|
[ -f scripts/build-perf/gen-sw-precache.mjs ] && node scripts/build-perf/gen-sw-precache.mjs dist || echo "[build] sw-precache 生成器未就绪,跳过"
|
||||||
[ -f scripts/build-perf/inline-home-css.mjs ] && node scripts/build-perf/inline-home-css.mjs || echo "[build] inline-home 脚本未就绪,跳过"
|
[ -f scripts/build-perf/inline-home-css.mjs ] && node scripts/build-perf/inline-home-css.mjs || echo "[build] inline-home 脚本未就绪,跳过"
|
||||||
|
|||||||
+78
-9
@@ -38,6 +38,7 @@ collections:
|
|||||||
- { label: 日期, name: pubDate, widget: datetime, date_format: 'YYYY-MM-DD', time_format: false, format: 'YYYY-MM-DD' }
|
- { label: 日期, name: pubDate, widget: datetime, date_format: 'YYYY-MM-DD', time_format: false, format: 'YYYY-MM-DD' }
|
||||||
- { label: 分轨, name: category, widget: select, options: [{label: 阅读, value: reading}, {label: 技术, value: tech}, {label: 照片, value: photo}] }
|
- { label: 分轨, name: category, widget: select, options: [{label: 阅读, value: reading}, {label: 技术, value: tech}, {label: 照片, value: photo}] }
|
||||||
- { label: 标签, name: tags, widget: list, required: false }
|
- { label: 标签, name: tags, widget: list, required: false }
|
||||||
|
- { label: 置顶, name: pinned, widget: boolean, required: false, default: false, hint: '置顶文章排在首页/归档/书架最前;只影响顺序,不改日期、URL 与 RSS 时间语义' }
|
||||||
- { label: 情绪色(书评色脊), name: mood, widget: color, required: false, hint: '#RRGGBB,仅阅读轨使用' }
|
- { label: 情绪色(书评色脊), name: mood, widget: color, required: false, hint: '#RRGGBB,仅阅读轨使用' }
|
||||||
- { label: 原书作者, name: bookAuthor, widget: string, required: false }
|
- { label: 原书作者, name: bookAuthor, widget: string, required: false }
|
||||||
- { label: 一句话描述(书架策展语), name: description, widget: text, required: false }
|
- { label: 一句话描述(书架策展语), name: description, widget: text, required: false }
|
||||||
@@ -58,6 +59,34 @@ collections:
|
|||||||
- { label: 草稿, name: draft, widget: boolean, required: false, default: false }
|
- { label: 草稿, name: draft, widget: boolean, required: false, default: false }
|
||||||
- { label: 正文, name: body, widget: markdown }
|
- { label: 正文, name: body, widget: markdown }
|
||||||
|
|
||||||
|
# 主题旋钮(样式即数据 · 层 4):只放白名单内的 9 组,越界值会被构建期钳制
|
||||||
|
- name: site_theme
|
||||||
|
label: 主题设置
|
||||||
|
# 文件集合必须是 files: [{file,label,fields}] 结构;把 file 直接写在集合层级会被 Sveltia 判非法(2026-11-02 实测报 "The file option ... is invalid")
|
||||||
|
files:
|
||||||
|
- name: theme
|
||||||
|
label: 主题设置
|
||||||
|
file: content/site/theme.yaml
|
||||||
|
format: yaml
|
||||||
|
fields:
|
||||||
|
- { label: 强调色(亮), name: accent_light, widget: color, required: false, hint: '亮色模式强调色,如 #3454d1;构建期校验正文对比度 ≥4.5' }
|
||||||
|
- { label: 强调色(暗), name: accent_dark, widget: color, required: false, hint: '暗色模式强调色,如 #8ea2ff' }
|
||||||
|
- { label: 图片圆角, name: radius_img, widget: number, required: false, value_type: int, min: 4, max: 16, hint: '范围 4–16(建议 ≤14)' }
|
||||||
|
- { label: 一级标题字号, name: text_h1, widget: number, required: false, value_type: int, min: 22, max: 32, hint: '22–32,且必须大于 h2' }
|
||||||
|
- { label: 二级标题字号, name: text_h2, widget: number, required: false, value_type: int, min: 22, max: 32, hint: '22–32,必须小于 h1、大于 h3' }
|
||||||
|
- { label: 三级标题字号, name: text_h3, widget: number, required: false, value_type: int, min: 16, max: 32, hint: '16–32,必须小于 h2' }
|
||||||
|
- { label: 书评正文字号, name: prose_size_reading, widget: number, required: false, value_type: int, min: 16, max: 22, hint: '16–22' }
|
||||||
|
- { label: 技术文正文字号, name: prose_size_tech, widget: number, required: false, value_type: int, min: 16, max: 22, hint: '16–22' }
|
||||||
|
- { label: 书评行高, name: leading_reading, widget: number, required: false, value_type: float, min: 1.5, max: 2.0, step: 0.05, hint: '1.5–2.0' }
|
||||||
|
- { label: 技术文行高, name: leading_tech, widget: number, required: false, value_type: float, min: 1.5, max: 2.0, step: 0.05, hint: '1.5–2.0' }
|
||||||
|
- { label: 间距 3, name: space_3, widget: number, required: false, value_type: int, min: 8, max: 80, hint: '8–80,必须 < 间距 4' }
|
||||||
|
- { label: 间距 4, name: space_4, widget: number, required: false, value_type: int, min: 8, max: 80, hint: '8–80,必须 > 间距 3 且 < 间距 5' }
|
||||||
|
- { label: 间距 5, name: space_5, widget: number, required: false, value_type: int, min: 8, max: 80, hint: '8–80,必须 > 间距 4 且 < 间距 6' }
|
||||||
|
- { label: 间距 6, name: space_6, widget: number, required: false, value_type: int, min: 8, max: 80, hint: '8–80,必须 > 间距 5' }
|
||||||
|
- { label: 段间距, name: flow_p, widget: number, required: false, value_type: float, min: 0, max: 2, step: 0.05, hint: '0–2(em)' }
|
||||||
|
- { label: 标题下间距, name: flow_h2_post, widget: number, required: false, value_type: float, min: 0, max: 2, step: 0.05, hint: '0–2(em)' }
|
||||||
|
- { label: 过渡时长, name: dur, widget: number, required: false, value_type: int, min: 150, max: 600, hint: '150–600(毫秒)' }
|
||||||
|
|
||||||
# 瞬间:随手发(text/image 至少其一——Sveltia 无法表达条件必填,两者都设可选,
|
# 瞬间:随手发(text/image 至少其一——Sveltia 无法表达条件必填,两者都设可选,
|
||||||
# 保存前自查;pubDate 必填)。图片走图库媒体库(content/photos 同源可复用)
|
# 保存前自查;pubDate 必填)。图片走图库媒体库(content/photos 同源可复用)
|
||||||
- name: moments
|
- name: moments
|
||||||
@@ -69,7 +98,11 @@ collections:
|
|||||||
sortable_fields: [pubDate, text]
|
sortable_fields: [pubDate, text]
|
||||||
fields:
|
fields:
|
||||||
- { label: 时间, name: pubDate, widget: datetime, date_format: 'YYYY-MM-DD', time_format: false, format: 'YYYY-MM-DD' }
|
- { label: 时间, name: pubDate, widget: datetime, date_format: 'YYYY-MM-DD', time_format: false, format: 'YYYY-MM-DD' }
|
||||||
- { label: 文字, name: text, widget: text, required: false, hint: '一句话(与图片至少填一项)' }
|
- label: 文字
|
||||||
|
name: text
|
||||||
|
widget: markdown
|
||||||
|
required: false
|
||||||
|
hint: '与图片至少填一项。支持 markdown(**加粗**、列表、> 引用)与排版类 HTML,例如 <span class="c-blue font-kai">彩色+楷体</span>;装饰色仍守“外壳灰阶、彩色只作强调”的纪律'
|
||||||
- { label: 图片, name: image, widget: image, required: false, hint: '与文字至少填一项;建议先压缩' }
|
- { label: 图片, name: image, widget: image, required: false, hint: '与文字至少填一项;建议先压缩' }
|
||||||
- label: 标签
|
- label: 标签
|
||||||
name: tags
|
name: tags
|
||||||
@@ -113,12 +146,19 @@ collections:
|
|||||||
- name: home
|
- name: home
|
||||||
label: 主页设置
|
label: 主页设置
|
||||||
file: content/site/home.yaml
|
file: content/site/home.yaml
|
||||||
|
format: yaml
|
||||||
# 头像上传落 content/site/assets/,yaml 写 ./assets/xxx(Astro 图片管线优化)
|
# 头像上传落 content/site/assets/,yaml 写 ./assets/xxx(Astro 图片管线优化)
|
||||||
media_folder: content/site/assets
|
media_folder: content/site/assets
|
||||||
public_folder: ./assets
|
public_folder: ./assets
|
||||||
fields:
|
fields:
|
||||||
- label: 身份语
|
- label: 身份语
|
||||||
name: tagline
|
name: tagline
|
||||||
|
widget: object
|
||||||
|
required: false
|
||||||
|
hint: 首页大字身份语(双语,markdown 富文本);可写 <span class="font-kai c-blue">…</span> 做局部强调
|
||||||
|
fields:
|
||||||
|
- { label: 中文, name: zh, widget: string, required: false }
|
||||||
|
- { label: 英文, name: en, widget: string, required: false }
|
||||||
- label: 页面排版覆盖(可选)
|
- label: 页面排版覆盖(可选)
|
||||||
name: typography
|
name: typography
|
||||||
widget: object
|
widget: object
|
||||||
@@ -129,17 +169,32 @@ collections:
|
|||||||
name: font
|
name: font
|
||||||
widget: select
|
widget: select
|
||||||
required: false
|
required: false
|
||||||
|
hint: 整页正文换字族;艺术/展示类字族(汇文、快乐体)体积大,单页成本会上升
|
||||||
options: [font-serif, font-kai, font-sans, font-mono, font-song, font-kai-sys, font-hei-sys, font-fangsong, font-huiwen, font-kuaile]
|
options: [font-serif, font-kai, font-sans, font-mono, font-song, font-kai-sys, font-hei-sys, font-fangsong, font-huiwen, font-kuaile]
|
||||||
- label: 强调色类
|
- label: 强调色类
|
||||||
name: accent
|
name: accent
|
||||||
widget: select
|
widget: select
|
||||||
required: false
|
required: false
|
||||||
options: [ink-accent, ink-accent-soft, c-blue, c-blue-soft, c-teal, c-teal-soft, c-green, c-green-soft, c-yellow, c-yellow-soft, c-orange, c-orange-soft, c-red, c-red-soft, c-pink, c-pink-soft, c-purple, c-purple-soft]
|
options: [ink-accent, ink-accent-soft, c-blue, c-blue-soft, c-teal, c-teal-soft, c-green, c-green-soft, c-yellow, c-yellow-soft, c-orange, c-orange-soft, c-red, c-red-soft, c-pink, c-pink-soft, c-purple, c-purple-soft]
|
||||||
- { label: 字号缩放, name: scale, widget: number, required: false, value_type: float, min: 0.8, max: 1.25, step: 0.05 }
|
- { label: 字号缩放, name: scale, widget: number, required: false, value_type: float, min: 0.8, max: 1.25, step: 0.05, hint: '0.8–1.25;1 = 全站默认' }
|
||||||
|
- label: 公告(可选,markdown)
|
||||||
|
name: announcement
|
||||||
widget: object
|
widget: object
|
||||||
|
required: false
|
||||||
|
hint: 渲染在名片区下方;留空则不显示公告块
|
||||||
fields:
|
fields:
|
||||||
- { label: 中文, name: zh, widget: string, required: false }
|
- { label: 中文, name: zh, widget: markdown, required: false }
|
||||||
- { label: 英文, name: en, widget: string, required: false }
|
- { label: 英文, name: en, widget: markdown, required: false }
|
||||||
|
- { label: 项目墙条数, name: projectsLimit, widget: number, required: false, value_type: int, min: 1, max: 99, hint: '首页项目墙显示几条(1–99,缺省 6)' }
|
||||||
|
- label: 轨细分开关(首页文章列表)
|
||||||
|
name: postsTracks
|
||||||
|
widget: object
|
||||||
|
required: false
|
||||||
|
hint: 关掉某轨则该轨文章不在首页列出(全开=现状)
|
||||||
|
fields:
|
||||||
|
- { label: 阅读轨, name: reading, widget: boolean, required: false, default: true }
|
||||||
|
- { label: 技术轨, name: tech, widget: boolean, required: false, default: true }
|
||||||
|
- { label: 照片轨, name: photo, widget: boolean, required: false, default: true }
|
||||||
- label: 副标题(可选,markdown 短文本)
|
- label: 副标题(可选,markdown 短文本)
|
||||||
name: subtitle
|
name: subtitle
|
||||||
widget: object
|
widget: object
|
||||||
@@ -200,6 +255,7 @@ collections:
|
|||||||
- name: about
|
- name: about
|
||||||
label: 关于页
|
label: 关于页
|
||||||
file: content/site/about.yaml
|
file: content/site/about.yaml
|
||||||
|
format: yaml
|
||||||
# 块内图片上传落 content/site/assets/,yaml 写 ./assets/xxx(Astro 图片管线)
|
# 块内图片上传落 content/site/assets/,yaml 写 ./assets/xxx(Astro 图片管线)
|
||||||
media_folder: content/site/assets
|
media_folder: content/site/assets
|
||||||
public_folder: ./assets
|
public_folder: ./assets
|
||||||
@@ -215,6 +271,7 @@ collections:
|
|||||||
- label: 正文(markdown)
|
- label: 正文(markdown)
|
||||||
name: prose
|
name: prose
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: markdown 正文块;可选小标题与版心/通栏宽度,长文分段改内容用
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- label: 小标题(可选)
|
- label: 小标题(可选)
|
||||||
@@ -239,6 +296,7 @@ collections:
|
|||||||
- label: 版图(图标+名称+描述)
|
- label: 版图(图标+名称+描述)
|
||||||
name: tracks
|
name: tracks
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: 版图块:图标 + 名称 + 描述,适合「几条主线/能力面」式介绍
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- label: 标题
|
- label: 标题
|
||||||
@@ -274,6 +332,7 @@ collections:
|
|||||||
- label: 卡片(2/3 列)
|
- label: 卡片(2/3 列)
|
||||||
name: cards
|
name: cards
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: 卡片墙(2/3 列):每卡 = 标题 + 描述 + 可选链接/角标
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- label: 标题(可选)
|
- label: 标题(可选)
|
||||||
@@ -313,6 +372,7 @@ collections:
|
|||||||
- label: 时间线
|
- label: 时间线
|
||||||
name: timeline
|
name: timeline
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: 时间线:一条时间 + 标题 + 描述;时间可写自由文本(如 2024 — 2026)
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- label: 标题(可选)
|
- label: 标题(可选)
|
||||||
@@ -344,6 +404,7 @@ collections:
|
|||||||
- label: 引文
|
- label: 引文
|
||||||
name: quote
|
name: quote
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: 单句引文 + 可选署名;配 font-kai 排版效果更好
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- label: 引文
|
- label: 引文
|
||||||
@@ -362,6 +423,7 @@ collections:
|
|||||||
- label: 图片
|
- label: 图片
|
||||||
name: figure
|
name: figure
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: 单图 + 可选说明;图片只能后台上传(落 content/site/assets),禁外链
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- { label: 图片(必填,请用后台上传), name: image, widget: image, hint: '禁止填外链:只能上传(落 content/site/assets/),走 Astro 图片管线' }
|
- { label: 图片(必填,请用后台上传), name: image, widget: image, hint: '禁止填外链:只能上传(落 content/site/assets/),走 Astro 图片管线' }
|
||||||
@@ -376,6 +438,7 @@ collections:
|
|||||||
- label: 链接清单
|
- label: 链接清单
|
||||||
name: linklist
|
name: linklist
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: 链接清单(标签 + 链接 + 备注),适合「相关阅读 / 外部资源」
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- label: 标题(可选)
|
- label: 标题(可选)
|
||||||
@@ -407,6 +470,7 @@ collections:
|
|||||||
- label: 行动按钮
|
- label: 行动按钮
|
||||||
name: cta
|
name: cta
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: 行动按钮(文案 + 链接 + 按钮字);一页建议不超过一个
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- label: 说明文字
|
- label: 说明文字
|
||||||
@@ -425,6 +489,7 @@ collections:
|
|||||||
- label: 分隔
|
- label: 分隔
|
||||||
name: divider
|
name: divider
|
||||||
widget: object
|
widget: object
|
||||||
|
hint: 分隔块:细分隔线或纯留白,给长页分段
|
||||||
fields:
|
fields:
|
||||||
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
- { label: 显示, name: enabled, widget: boolean, required: false, default: true }
|
||||||
- label: 样式
|
- label: 样式
|
||||||
@@ -468,9 +533,16 @@ collections:
|
|||||||
- name: opensource
|
- name: opensource
|
||||||
label: 开源页
|
label: 开源页
|
||||||
file: content/site/opensource.yaml
|
file: content/site/opensource.yaml
|
||||||
|
format: yaml
|
||||||
fields:
|
fields:
|
||||||
- label: 叙述(链接前)
|
- label: 叙述(链接前)
|
||||||
name: blurb
|
name: blurb
|
||||||
|
widget: object
|
||||||
|
required: false
|
||||||
|
hint: 富文本(markdown + 排版类),渲染在仓库链接之前
|
||||||
|
fields:
|
||||||
|
- { label: 中文, name: zh, widget: string, required: false }
|
||||||
|
- { label: 英文, name: en, widget: string, required: false }
|
||||||
- label: 页面排版覆盖(可选)
|
- label: 页面排版覆盖(可选)
|
||||||
name: typography
|
name: typography
|
||||||
widget: object
|
widget: object
|
||||||
@@ -481,17 +553,14 @@ collections:
|
|||||||
name: font
|
name: font
|
||||||
widget: select
|
widget: select
|
||||||
required: false
|
required: false
|
||||||
|
hint: 整页正文换字族;艺术/展示类字族(汇文、快乐体)体积大,单页成本会上升
|
||||||
options: [font-serif, font-kai, font-sans, font-mono, font-song, font-kai-sys, font-hei-sys, font-fangsong, font-huiwen, font-kuaile]
|
options: [font-serif, font-kai, font-sans, font-mono, font-song, font-kai-sys, font-hei-sys, font-fangsong, font-huiwen, font-kuaile]
|
||||||
- label: 强调色类
|
- label: 强调色类
|
||||||
name: accent
|
name: accent
|
||||||
widget: select
|
widget: select
|
||||||
required: false
|
required: false
|
||||||
options: [ink-accent, ink-accent-soft, c-blue, c-blue-soft, c-teal, c-teal-soft, c-green, c-green-soft, c-yellow, c-yellow-soft, c-orange, c-orange-soft, c-red, c-red-soft, c-pink, c-pink-soft, c-purple, c-purple-soft]
|
options: [ink-accent, ink-accent-soft, c-blue, c-blue-soft, c-teal, c-teal-soft, c-green, c-green-soft, c-yellow, c-yellow-soft, c-orange, c-orange-soft, c-red, c-red-soft, c-pink, c-pink-soft, c-purple, c-purple-soft]
|
||||||
- { label: 字号缩放, name: scale, widget: number, required: false, value_type: float, min: 0.8, max: 1.25, step: 0.05 }
|
- { label: 字号缩放, name: scale, widget: number, required: false, value_type: float, min: 0.8, max: 1.25, step: 0.05, hint: '0.8–1.25;1 = 全站默认' }
|
||||||
widget: object
|
|
||||||
fields:
|
|
||||||
- { label: 中文, name: zh, widget: string, required: false }
|
|
||||||
- { label: 英文, name: en, widget: string, required: false }
|
|
||||||
- { label: 仓库链接地址, name: repo_url, widget: string, required: false }
|
- { label: 仓库链接地址, name: repo_url, widget: string, required: false }
|
||||||
- { label: 仓库链接文字, name: repo_label, widget: string, required: false }
|
- { label: 仓库链接文字, name: repo_label, widget: string, required: false }
|
||||||
- label: 叙述(链接后)
|
- label: 叙述(链接后)
|
||||||
|
|||||||
Executable
+123
@@ -0,0 +1,123 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
站点 YAML 配置结构校验(2026-11-02 教训驱动)
|
||||||
|
|
||||||
|
为什么需要:Python 默认 yaml.safe_load 对重复键是"后者覆盖前者"的静默行为,
|
||||||
|
收编时用它验收会漏。本包实测 public/admin/config.yml 里 typography 被插进双语
|
||||||
|
字段的 name: 与 widget: object 之间 → 同一 mapping 出现重复键 widget/fields,
|
||||||
|
后台双语编辑器退化成字符串、排版选择器字段被劫持。本脚本用自定义构造器在
|
||||||
|
解析阶段对重复键直接报错,并附带后台 hint 覆盖率体检。
|
||||||
|
|
||||||
|
用法:python3 scripts/build-perf/config-check.py [repo根=.]
|
||||||
|
退出码:0 通过;1 有失败项
|
||||||
|
"""
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
try:
|
||||||
|
import yaml
|
||||||
|
except ImportError:
|
||||||
|
print('[config-check] 缺少 pyyaml:pip install pyyaml')
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
FILES = [
|
||||||
|
'public/admin/config.yml',
|
||||||
|
'content/site/home.yaml',
|
||||||
|
'content/site/about.yaml',
|
||||||
|
'content/site/opensource.yaml',
|
||||||
|
'content/site/theme.yaml',
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
class StrictLoader(yaml.SafeLoader):
|
||||||
|
"""对重复键报错的 SafeLoader(默认行为是静默覆盖)。"""
|
||||||
|
|
||||||
|
|
||||||
|
def _construct_mapping(loader, node, deep=False):
|
||||||
|
seen = set()
|
||||||
|
for key_node, _value_node in node.value:
|
||||||
|
key = loader.construct_object(key_node, deep=deep)
|
||||||
|
if key in seen:
|
||||||
|
raise yaml.YAMLError(
|
||||||
|
f'duplicate key {key!r} at line {key_node.start_mark.line + 1}'
|
||||||
|
)
|
||||||
|
seen.add(key)
|
||||||
|
return yaml.SafeLoader.construct_mapping(loader, node, deep=deep)
|
||||||
|
|
||||||
|
|
||||||
|
StrictLoader.add_constructor(
|
||||||
|
yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG, _construct_mapping
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> int:
|
||||||
|
root = Path(sys.argv[1] if len(sys.argv) > 1 else '.')
|
||||||
|
failed = 0
|
||||||
|
loaded = {}
|
||||||
|
|
||||||
|
for rel in FILES:
|
||||||
|
path = root / rel
|
||||||
|
if not path.exists():
|
||||||
|
print(f'[config-check] SKIP {rel}(不存在)')
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
loaded[rel] = yaml.load(path.read_text(encoding='utf-8'), Loader=StrictLoader)
|
||||||
|
print(f'[config-check] OK {rel}')
|
||||||
|
except yaml.YAMLError as exc:
|
||||||
|
failed += 1
|
||||||
|
first = str(exc).splitlines()[0]
|
||||||
|
print(f'[config-check] FAIL {rel}\n {first}')
|
||||||
|
|
||||||
|
admin = loaded.get('public/admin/config.yml')
|
||||||
|
if admin:
|
||||||
|
# 结构断言(2026-11-02 教训):每个集合必须二选一——folder 集合或
|
||||||
|
# files 文件集合;files 项必须齐 file/label/fields,且 file 指向真实文件。
|
||||||
|
# 把 file 直接写在集合层级会被 Sveltia 判非法(后台整体报错)。
|
||||||
|
for coll in admin.get('collections', []):
|
||||||
|
name = coll.get('name', '<unnamed>')
|
||||||
|
has_folder, has_files = 'folder' in coll, 'files' in coll
|
||||||
|
if not has_folder and not has_files:
|
||||||
|
failed += 1
|
||||||
|
print(f'[config-check] FAIL 集合 {name}: 既无 folder 也无 files(Sveltia 会拒绝加载)')
|
||||||
|
if has_files:
|
||||||
|
for entry in coll.get('files') or []:
|
||||||
|
miss = [k for k in ('file', 'label', 'fields') if k not in entry]
|
||||||
|
if miss:
|
||||||
|
failed += 1
|
||||||
|
print(f'[config-check] FAIL 集合 {name} 的文件项缺 {miss}')
|
||||||
|
continue
|
||||||
|
if not (root / entry['file']).exists():
|
||||||
|
failed += 1
|
||||||
|
print(f"[config-check] FAIL 集合 {name}: 文件不存在 {entry['file']}")
|
||||||
|
|
||||||
|
if admin:
|
||||||
|
fields = hints = 0
|
||||||
|
|
||||||
|
def walk(node):
|
||||||
|
nonlocal fields, hints
|
||||||
|
if isinstance(node, dict):
|
||||||
|
if 'name' in node:
|
||||||
|
fields += 1
|
||||||
|
if 'hint' in node:
|
||||||
|
hints += 1
|
||||||
|
for value in node.values():
|
||||||
|
walk(value)
|
||||||
|
elif isinstance(node, list):
|
||||||
|
for value in node:
|
||||||
|
walk(value)
|
||||||
|
|
||||||
|
walk(admin)
|
||||||
|
print(f'[config-check] 后台字段 {fields} 个,其中带 hint {hints} 个')
|
||||||
|
if hints < 20:
|
||||||
|
failed += 1
|
||||||
|
print('[config-check] FAIL hint 覆盖不足(<20),后台字段缺少中文说明')
|
||||||
|
|
||||||
|
if failed:
|
||||||
|
print(f'[config-check] {failed} 项未通过')
|
||||||
|
return 1
|
||||||
|
print('[config-check] 全部通过')
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
raise SystemExit(main())
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* 主题对比度闸门(样式即数据 · 层 4):从**构建产物**里读实际生效的 CSS 变量,
|
||||||
|
* 断言正文与强调色在两态下的对比度都 ≥4.5:1。构建期跑,失败即 exit 1 拦住发布。
|
||||||
|
*
|
||||||
|
* 为什么读产物而不是读 yaml:断言的对象必须是"用户最终看到的颜色"——
|
||||||
|
* theme.yaml 经 theme.ts 钳制/回落后的真值只存在于 dist 内联样式里。
|
||||||
|
*
|
||||||
|
* 用法:node scripts/build-perf/contrast-check.mjs [distRoot]
|
||||||
|
*/
|
||||||
|
import { readFileSync, existsSync, readdirSync } from 'node:fs';
|
||||||
|
import { join } from 'node:path';
|
||||||
|
|
||||||
|
const distRoot = process.argv[2] ?? 'dist';
|
||||||
|
const MIN = 4.5;
|
||||||
|
|
||||||
|
const read = (p) => readFileSync(p, 'utf8');
|
||||||
|
|
||||||
|
function normalize(hex) {
|
||||||
|
const h = hex.replace('#', '');
|
||||||
|
return '#' + (h.length === 3 ? h.split('').map((c) => c + c).join('') : h);
|
||||||
|
}
|
||||||
|
function lum(hex) {
|
||||||
|
const h = normalize(hex).replace('#', '');
|
||||||
|
const [r, g, b] = [0, 2, 4].map((i) => parseInt(h.slice(i, i + 2), 16) / 255);
|
||||||
|
const f = (c) => (c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4);
|
||||||
|
return 0.2126 * f(r) + 0.7152 * f(g) + 0.0722 * f(b);
|
||||||
|
}
|
||||||
|
function ratio(a, b) {
|
||||||
|
const [la, lb] = [lum(a), lum(b)];
|
||||||
|
const [hi, lo] = [Math.max(la, lb), Math.min(la, lb)];
|
||||||
|
return (hi + 0.05) / (lo + 0.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── 1. 从产物取主题变量(内联 style 的 :root:root / [data-theme=dark] 块) ──
|
||||||
|
let html = '';
|
||||||
|
if (!existsSync(distRoot)) {
|
||||||
|
console.error(`[contrast] dist 不存在:${distRoot}(先 build)`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
const htmlFile = join(distRoot, 'index.html');
|
||||||
|
if (existsSync(htmlFile)) html = read(htmlFile);
|
||||||
|
else {
|
||||||
|
// 兜底:任取一个页面
|
||||||
|
const walk = (d) => {
|
||||||
|
for (const e of readdirSync(d, { withFileTypes: true })) {
|
||||||
|
const p = join(d, e.name);
|
||||||
|
if (e.isDirectory()) {
|
||||||
|
const r = walk(p);
|
||||||
|
if (r) return r;
|
||||||
|
} else if (e.name === 'index.html') return p;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
const f = walk(distRoot);
|
||||||
|
if (f) html = read(f);
|
||||||
|
}
|
||||||
|
if (!html) {
|
||||||
|
console.error('[contrast] 产物里找不到任何页面');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const varOf = (scope, name) => {
|
||||||
|
const re = new RegExp(`${scope.replace(/[[\]]/g, '\\$&')}[^{]*\\{([^}]*)\\}`, 'g');
|
||||||
|
let m;
|
||||||
|
while ((m = re.exec(html))) {
|
||||||
|
const hit = new RegExp(`${name}\\s*:\\s*(#[0-9a-fA-F]{3,6})`).exec(m[1]);
|
||||||
|
if (hit) return hit[1];
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
// tokens.css 的底色与正文色(不在主题旋钮白名单内,故从产物 CSS 取)
|
||||||
|
const cssFiles = [];
|
||||||
|
const walkCss = (d) => {
|
||||||
|
for (const e of readdirSync(d, { withFileTypes: true })) {
|
||||||
|
const p = join(d, e.name);
|
||||||
|
if (e.isDirectory()) walkCss(p);
|
||||||
|
else if (e.name.endsWith('.css')) cssFiles.push(p);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
walkCss(distRoot);
|
||||||
|
let tokensCss = '';
|
||||||
|
for (const f of cssFiles) {
|
||||||
|
const c = read(f);
|
||||||
|
// 必须是**定义**(--bg:#xxx),而不是 var(--bg-soft) 这类引用——
|
||||||
|
// 后者会误命中只用到变量名、并不定义 base token 的页面级 CSS
|
||||||
|
if (/--ink-2\s*:\s*#/.test(c) && /--bg\s*:\s*#/.test(c)) { tokensCss = c; break; }
|
||||||
|
}
|
||||||
|
const tokenVar = (name) => {
|
||||||
|
const m = new RegExp(`${name}\\s*:\\s*(#[0-9a-fA-F]{3,6})`).exec(tokensCss);
|
||||||
|
return m ? m[1] : null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const checks = [];
|
||||||
|
const bgLight = tokenVar('--bg');
|
||||||
|
const bgDark = (() => {
|
||||||
|
// 暗态 --bg 在 [data-theme=dark] 块里
|
||||||
|
const m = /\[data-theme=["']?dark["']?\][^{]*\{([^}]*)\}/.exec(tokensCss);
|
||||||
|
if (!m) return null;
|
||||||
|
const h = /--bg\s*:\s*(#[0-9a-fA-F]{3,6})/.exec(m[1]);
|
||||||
|
return h ? h[1] : null;
|
||||||
|
})();
|
||||||
|
const ink2Light = tokenVar('--ink-2');
|
||||||
|
const ink2Dark = (() => {
|
||||||
|
const m = /\[data-theme=["']?dark["']?\][^{]*\{([^}]*)\}/.exec(tokensCss);
|
||||||
|
if (!m) return null;
|
||||||
|
const h = /--ink-2\s*:\s*(#[0-9a-fA-F]{3,6})/.exec(m[1]);
|
||||||
|
return h ? h[1] : null;
|
||||||
|
})();
|
||||||
|
|
||||||
|
const accentLight = varOf(':root:root', '--accent');
|
||||||
|
const accentDark = (() => {
|
||||||
|
const m = /\[data-theme=["']?dark["']?\]:root:root\{([^}]*)\}/.exec(html);
|
||||||
|
if (!m) return null;
|
||||||
|
const h = /--accent\s*:\s*(#[0-9a-fA-F]{3,6})/.exec(m[1]);
|
||||||
|
return h ? h[1] : null;
|
||||||
|
})();
|
||||||
|
|
||||||
|
if (bgLight && ink2Light) checks.push(['正文(亮)', ink2Light, bgLight]);
|
||||||
|
if (bgDark && ink2Dark) checks.push(['正文(暗)', ink2Dark, bgDark]);
|
||||||
|
if (accentLight && bgLight) checks.push(['强调色(亮)', accentLight, bgLight]);
|
||||||
|
if (accentDark && bgDark) checks.push(['强调色(暗)', accentDark, bgDark]);
|
||||||
|
|
||||||
|
if (checks.length === 0) {
|
||||||
|
console.error('[contrast] 未能从产物解析出主题/正文色变量,请检查注入是否生效');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
let failed = 0;
|
||||||
|
for (const [label, fg, bg] of checks) {
|
||||||
|
const r = ratio(fg, bg);
|
||||||
|
const ok = r >= MIN;
|
||||||
|
if (!ok) failed++;
|
||||||
|
console.log(`[contrast] ${ok ? 'PASS' : 'FAIL'} ${label} ${fg} on ${bg} = ${r.toFixed(2)}:1`);
|
||||||
|
}
|
||||||
|
if (failed > 0) {
|
||||||
|
console.error(`[contrast] ${failed} 项低于 ${MIN}:1 —— 主题配色不可读,请调亮/调暗后再构建`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
console.log(`[contrast] 全部通过(${checks.length} 项 ≥ ${MIN}:1)`);
|
||||||
@@ -7,15 +7,14 @@ interface Props {
|
|||||||
}
|
}
|
||||||
const { pageKey, pageTitle } = Astro.props;
|
const { pageKey, pageTitle } = Astro.props;
|
||||||
import { t } from '../i18n/ui';
|
import { t } from '../i18n/ui';
|
||||||
|
import ViewMeta from './geek/ViewMeta.astro';
|
||||||
import { localeOf } from '../lib/locale';
|
import { localeOf } from '../lib/locale';
|
||||||
const locale = localeOf(Astro.url.pathname);
|
const locale = localeOf(Astro.url.pathname);
|
||||||
---
|
---
|
||||||
|
|
||||||
<!-- pv 小字:计数由本组件下方脚本独立 POST(页面加载即计),与 Artalk init 的 pvAdd 解耦 -->
|
<!-- 浏览/评论徽标(Phase 5h T4):评论区这枚是 **readonly** —— 整页的计数点唯一在
|
||||||
<p class="atk-pv-line" aria-label={t('pv_viewed', locale)}>
|
详情页标题下的 ViewMeta(mode="page"),此处只读展示,避免同页两处各计一次。 -->
|
||||||
<span data-artalk-pv data-page-key={pageKey} data-page-title={pageTitle}>–</span>
|
<ViewMeta pageKey={pageKey} locale={locale} mode="readonly" variant="chip" />
|
||||||
{' '}{t('pv_viewed', locale)}
|
|
||||||
</p>
|
|
||||||
<div id="artalk-container" data-page-key={pageKey} data-page-title={pageTitle}></div>
|
<div id="artalk-container" data-page-key={pageKey} data-page-title={pageTitle}></div>
|
||||||
<p class="atk-load-hint" id="artalk-retry" hidden>
|
<p class="atk-load-hint" id="artalk-retry" hidden>
|
||||||
<span>评论区加载失败。</span>
|
<span>评论区加载失败。</span>
|
||||||
@@ -100,37 +99,11 @@ const locale = localeOf(Astro.url.pathname);
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.atk-retry-btn:hover { border-color: var(--accent); }
|
.atk-retry-btn:hover { border-color: var(--accent); }
|
||||||
.atk-pv-line {
|
|
||||||
font-family: var(--font-mono);
|
|
||||||
font-size: 12px;
|
|
||||||
color: var(--ink-4);
|
|
||||||
margin: var(--space-2) 0 0;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// 访问量:POST /artalk/api/v2/pages/pv 计数并取数(POST 天然绕过 ESA 边缘缓存;
|
// 浏览计数已移交 ViewMeta 组件(Phase 5h T4),此处只管评论挂载。
|
||||||
// GET /stats/* 会被 ESA 缓存出冻结数字,勿改查询式)。page-load 兼容软导航换页重计。
|
//
|
||||||
const bumpPv = async () => {
|
|
||||||
const el = document.querySelector('[data-artalk-pv]');
|
|
||||||
if (!el) return;
|
|
||||||
const key = el.dataset.pageKey ?? '';
|
|
||||||
if (!key) return;
|
|
||||||
try {
|
|
||||||
const res = await fetch('/artalk/api/v2/pages/pv', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ page_key: key, page_title: el.dataset.pageTitle ?? '', site_name: 'wait4x.online' }),
|
|
||||||
});
|
|
||||||
const d = await res.json();
|
|
||||||
el.textContent = String(d.pv ?? '–');
|
|
||||||
} catch {
|
|
||||||
el.textContent = '–'; // 计数失败静默:小字不可见性优于报错
|
|
||||||
}
|
|
||||||
};
|
|
||||||
document.addEventListener('astro:page-load', () => void bumpPv());
|
|
||||||
void bumpPv();
|
|
||||||
|
|
||||||
// ── 挂载健壮化(用户实测「总没加载出来」)──
|
// ── 挂载健壮化(用户实测「总没加载出来」)──
|
||||||
// 触发路径三条:IO 进入视口(主)/ 点击评论区锚点(兜底)/ 滚到页底 2s 后(兜底);
|
// 触发路径三条:IO 进入视口(主)/ 点击评论区锚点(兜底)/ 滚到页底 2s 后(兜底);
|
||||||
// 失败路径:脚本 5s 未 onload → 灰阶提示 + 重试钮;成功后容器打 data-artalk-mounted 供 E2E 断言。
|
// 失败路径:脚本 5s 未 onload → 灰阶提示 + 重试钮;成功后容器打 data-artalk-mounted 供 E2E 断言。
|
||||||
|
|||||||
@@ -154,6 +154,10 @@ const switchLabel = curLocale === 'zh' ? 'EN' : '中';
|
|||||||
阈值 350→450(E 车道 6 项后 en 词长实测:360-430px 页溢 42-51px;zh 无感知) */
|
阈值 350→450(E 车道 6 项后 en 词长实测:360-430px 页溢 42-51px;zh 无感知) */
|
||||||
@media (max-width: 450px) {
|
@media (max-width: 450px) {
|
||||||
nav ul { overflow-x: auto; scrollbar-width: none; -webkit-overflow-scrolling: touch; }
|
nav ul { overflow-x: auto; scrollbar-width: none; -webkit-overflow-scrolling: touch; }
|
||||||
|
/* 视觉终审 P1:flex 子项默认可压缩,中文词被压到就地折成两行(开/源),
|
||||||
|
overflow-x 永远不触发。钉死不许压缩 + 不许换行,内滚才真正接管 */
|
||||||
|
nav ul > li { flex: none; }
|
||||||
|
.nav-link { white-space: nowrap; }
|
||||||
nav { min-width: 0; }
|
nav { min-width: 0; }
|
||||||
.header-inner { flex-wrap: nowrap; }
|
.header-inner { flex-wrap: nowrap; }
|
||||||
/* 中段再收一档地板(en 五词在 360-430 差 55-61px):字号 11px 下限仍可读,
|
/* 中段再收一档地板(en 五词在 360-430 差 55-61px):字号 11px 下限仍可读,
|
||||||
|
|||||||
@@ -0,0 +1,237 @@
|
|||||||
|
---
|
||||||
|
/**
|
||||||
|
* 瞬间逐条评论(Phase 5h T3):每条瞬间一个 `<details>` 折叠区,**展开才首次挂载 Artalk**。
|
||||||
|
*
|
||||||
|
* 为什么惰性挂载:时间线一屏能有十几条,若每张卡常驻一个 Artalk 实例,内存与请求
|
||||||
|
* 都白付;Artalk 官方也未背书"同页多实例长期并存"。于是「展开才挂」是折中:
|
||||||
|
* 读者点了才付成本,未点零开销(连 Artalk.js 都不下载)。
|
||||||
|
*
|
||||||
|
* 评论流约定:`page_key = /moments/<slug>/`(虚拟路径),**中英双语共用同一键**
|
||||||
|
* (评论不分裂,与文章页 `/archives/<slug>/` 同理);site 恒为 wait4x.online。
|
||||||
|
* 为什么不用 `#<slug>` 形态:`#` 在查询串里是 fragment 分隔符,裸传会被服务端截断成
|
||||||
|
* 页面级键 `/moments/`(实测),届时所有瞬间会共用同一个评论流、pv 也串在一起。
|
||||||
|
* 虚拟路径既无转义风险,将来真做单条瞬间页时键也天然对齐。
|
||||||
|
*
|
||||||
|
* 计数不在这里自己 fetch:复用 geek/ViewMeta(mode="readonly" 只读,不写 pv),
|
||||||
|
* 放在卡片底部让读者不开评论也能看见条数。
|
||||||
|
*/
|
||||||
|
import ViewMeta from './geek/ViewMeta.astro';
|
||||||
|
import { t } from '../i18n/ui';
|
||||||
|
import type { Locale } from '../lib/locale';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
/** 瞬间条目 id(即文件名 slug),用于生成评论流键与容器 id */
|
||||||
|
slug: string;
|
||||||
|
locale?: Locale;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { slug, locale = 'zh' } = Astro.props;
|
||||||
|
|
||||||
|
/** 评论流键:双语共用的虚拟路径(形如 /moments/2026-11-02/),无转义风险 */
|
||||||
|
const pageKey = `/moments/${slug}/`;
|
||||||
|
/** 容器 id 只允许 CSS 安全字符(slug 理论上是文件名,仍兜一层) */
|
||||||
|
const panelId = `mom-atk-${slug.replace(/[^a-zA-Z0-9_-]/g, '-')}`;
|
||||||
|
const label = t('moment_comments', locale);
|
||||||
|
const failText = locale === 'zh' ? '评论加载失败' : 'Comments failed to load';
|
||||||
|
const retryText = locale === 'zh' ? '重试' : 'Retry';
|
||||||
|
---
|
||||||
|
|
||||||
|
<div class="mom-cm">
|
||||||
|
<details class="mom-cm-box" data-mom-comments data-page-key={pageKey} data-page-title={`瞬间 · ${slug}`}>
|
||||||
|
<summary class="mom-cm-sum">
|
||||||
|
<span class="mom-cm-label">{label}</span>
|
||||||
|
<svg class="mom-cm-chev" viewBox="0 0 16 16" width="12" height="12" aria-hidden="true">
|
||||||
|
<path d="M4 6l4 4 4-4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"></path>
|
||||||
|
</svg>
|
||||||
|
</summary>
|
||||||
|
<div class="mom-cm-body">
|
||||||
|
<div class="mom-cm-panel" id={panelId} data-artalk-panel></div>
|
||||||
|
<p class="mom-cm-fail" hidden>
|
||||||
|
<span>{failText}</span>
|
||||||
|
<button type="button" class="mom-cm-retry">{retryText}</button>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</details>
|
||||||
|
<div class="mom-cm-meta">
|
||||||
|
<ViewMeta pageKey={pageKey} locale={locale} mode="readonly" showPv={false} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// ── 惰性挂载:details 首次展开才拉 Artalk 库并 init ──
|
||||||
|
// toggle 事件不冒泡,但捕获阶段能拿到;astro:page-load 后重新扫描(软导航换页)
|
||||||
|
const SITE = 'wait4x.online';
|
||||||
|
const SERVER = 'https://wait4x.online/artalk';
|
||||||
|
const LIB_CSS = 'https://wait4x.online/artalk/dist/Artalk.css';
|
||||||
|
const LIB_JS = 'https://wait4x.online/artalk/dist/Artalk.js';
|
||||||
|
|
||||||
|
type ArtalkLib = { init: (opts: Record<string, unknown>) => unknown };
|
||||||
|
interface Mounted {
|
||||||
|
/** 已 init 的容器 id,避免重复 init(详情反复开合只在首次付成本) */
|
||||||
|
[key: string]: boolean;
|
||||||
|
}
|
||||||
|
const mounted: Mounted = {};
|
||||||
|
const pending: { [key: string]: boolean } = {};
|
||||||
|
/** 同页多实例:记录已 init 的容器,供排障(window.__momArtalk 可查) */
|
||||||
|
const instances: string[] = [];
|
||||||
|
(window as unknown as { __momArtalk?: string[] }).__momArtalk = instances;
|
||||||
|
|
||||||
|
const lib = () => (window as unknown as { Artalk?: ArtalkLib }).Artalk;
|
||||||
|
|
||||||
|
const loadAssets = () =>
|
||||||
|
new Promise<void>((done) => {
|
||||||
|
// 复用全站同一对资产 id:文章页已加载过就不再重复拉
|
||||||
|
if (document.getElementById('artalk-lib') && lib()) return done();
|
||||||
|
const cssReady = new Promise<void>((cssDone) => {
|
||||||
|
if (document.getElementById('artalk-css')) return cssDone();
|
||||||
|
const link = document.createElement('link');
|
||||||
|
link.id = 'artalk-css';
|
||||||
|
link.rel = 'stylesheet';
|
||||||
|
link.href = LIB_CSS;
|
||||||
|
link.onload = () => cssDone();
|
||||||
|
link.onerror = () => cssDone(); // CSS 失败不阻塞挂载(降级 UA 样式)
|
||||||
|
document.head.appendChild(link);
|
||||||
|
});
|
||||||
|
const existing = document.getElementById('artalk-lib') as HTMLScriptElement | null;
|
||||||
|
if (existing) {
|
||||||
|
// 脚本标签已在但库还没就绪:等它 onload
|
||||||
|
existing.addEventListener('load', () => void cssReady.then(() => done()));
|
||||||
|
if (lib()) void cssReady.then(() => done());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const s = document.createElement('script');
|
||||||
|
s.id = 'artalk-lib';
|
||||||
|
s.src = LIB_JS;
|
||||||
|
s.onload = () => void cssReady.then(() => done());
|
||||||
|
s.onerror = () => done(); // 失败也让调用方走"库不存在"分支显示重试
|
||||||
|
document.head.appendChild(s);
|
||||||
|
});
|
||||||
|
|
||||||
|
const mountOne = async (box: HTMLDetailsElement) => {
|
||||||
|
const key = box.dataset.pageKey ?? '';
|
||||||
|
const panel = box.querySelector<HTMLElement>('[data-artalk-panel]');
|
||||||
|
const fail = box.querySelector<HTMLElement>('.mom-cm-fail');
|
||||||
|
if (!key || !panel) return;
|
||||||
|
const id = panel.id;
|
||||||
|
if (mounted[id] || pending[id]) return;
|
||||||
|
pending[id] = true;
|
||||||
|
|
||||||
|
const showFail = (show: boolean) => {
|
||||||
|
if (fail) fail.hidden = !show;
|
||||||
|
};
|
||||||
|
const timer = window.setTimeout(() => {
|
||||||
|
if (!mounted[id]) showFail(true);
|
||||||
|
}, 5000);
|
||||||
|
|
||||||
|
await loadAssets();
|
||||||
|
const a = lib();
|
||||||
|
if (!a) {
|
||||||
|
window.clearTimeout(timer);
|
||||||
|
pending[id] = false;
|
||||||
|
showFail(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
a.init({
|
||||||
|
el: `#${id}`,
|
||||||
|
server: SERVER,
|
||||||
|
site: SITE,
|
||||||
|
pageKey: key,
|
||||||
|
pageTitle: box.dataset.pageTitle ?? '',
|
||||||
|
locale: 'zh-CN',
|
||||||
|
// 明暗交给站点 tokens 接管(与文章页同策略),pv 不计(ViewMeta 只读)
|
||||||
|
darkMode: false,
|
||||||
|
pvAdd: false,
|
||||||
|
});
|
||||||
|
mounted[id] = true;
|
||||||
|
panel.dataset.artalkMounted = '1';
|
||||||
|
instances.push(id);
|
||||||
|
showFail(false);
|
||||||
|
} catch {
|
||||||
|
showFail(true);
|
||||||
|
} finally {
|
||||||
|
window.clearTimeout(timer);
|
||||||
|
pending[id] = false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 展开时挂载;重复展开只挂一次 */
|
||||||
|
const onToggle = (target: EventTarget | null) => {
|
||||||
|
const box = target as HTMLDetailsElement | null;
|
||||||
|
if (!box || box.tagName !== 'DETAILS' || !box.hasAttribute('data-mom-comments')) return;
|
||||||
|
if (box.open) void mountOne(box);
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener('toggle', (e) => onToggle(e.target), true);
|
||||||
|
|
||||||
|
// 重试钮:失败后点一下重新挂(清掉挂载标记再走一遍)
|
||||||
|
document.addEventListener('click', (e) => {
|
||||||
|
const btn = (e.target as HTMLElement)?.closest?.('.mom-cm-retry');
|
||||||
|
if (!btn) return;
|
||||||
|
const box = btn.closest<HTMLDetailsElement>('details[data-mom-comments]');
|
||||||
|
const panel = box?.querySelector<HTMLElement>('[data-artalk-panel]');
|
||||||
|
if (!box || !panel) return;
|
||||||
|
delete mounted[panel.id];
|
||||||
|
void mountOne(box);
|
||||||
|
});
|
||||||
|
|
||||||
|
// 软导航回到本页时,已展开的(浏览器可能保留 open 状态)补挂一次
|
||||||
|
document.addEventListener('astro:page-load', () => {
|
||||||
|
for (const box of document.querySelectorAll<HTMLDetailsElement>('details[data-mom-comments][open]')) {
|
||||||
|
void mountOne(box);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.mom-cm {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: var(--space-2);
|
||||||
|
margin-top: var(--space-2);
|
||||||
|
padding-top: var(--space-2);
|
||||||
|
border-top: 1px dashed var(--line);
|
||||||
|
}
|
||||||
|
.mom-cm-box {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
.mom-cm-sum {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 5px;
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ink-3);
|
||||||
|
cursor: pointer;
|
||||||
|
list-style: none;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
.mom-cm-sum::-webkit-details-marker { display: none; }
|
||||||
|
.mom-cm-sum:hover { color: var(--ink-2); }
|
||||||
|
.mom-cm-chev { transition: rotate var(--dur) var(--ease); }
|
||||||
|
details[open] > .mom-cm-sum .mom-cm-chev { rotate: 180deg; }
|
||||||
|
.mom-cm-body { margin-top: var(--space-2); }
|
||||||
|
.mom-cm-panel { font-size: 13px; }
|
||||||
|
.mom-cm-meta { flex: none; }
|
||||||
|
.mom-cm-fail {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
margin: var(--space-2) 0 0;
|
||||||
|
font-size: 12.5px;
|
||||||
|
color: var(--ink-4);
|
||||||
|
}
|
||||||
|
.mom-cm-retry {
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ink-2);
|
||||||
|
background: var(--bg);
|
||||||
|
border: 1px solid var(--line);
|
||||||
|
border-radius: 6px;
|
||||||
|
padding: 2px 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.mom-cm-retry:hover { border-color: var(--accent); }
|
||||||
|
</style>
|
||||||
@@ -89,6 +89,9 @@ const byMonth = (list: CollectionEntry<'posts'>[]) => {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<span class="row-title">{titleOverrides?.[post.id] ?? post.data.title}</span>
|
<span class="row-title">{titleOverrides?.[post.id] ?? post.data.title}</span>
|
||||||
|
{post.data.pinned && (
|
||||||
|
<span class="pin" title={t('pinned_label', locale)}>{t('pinned_label', locale)}</span>
|
||||||
|
)}
|
||||||
{key !== 'reading' &&
|
{key !== 'reading' &&
|
||||||
post.data.tags.map((tag) => <code class="tag">{`#${tag}`}</code>)}
|
post.data.tags.map((tag) => <code class="tag">{`#${tag}`}</code>)}
|
||||||
<time class="row-date" datetime={post.data.pubDate.toISOString()}>
|
<time class="row-date" datetime={post.data.pubDate.toISOString()}>
|
||||||
@@ -130,6 +133,9 @@ const byMonth = (list: CollectionEntry<'posts'>[]) => {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<span class="row-title">{titleOverrides?.[post.id] ?? post.data.title}</span>
|
<span class="row-title">{titleOverrides?.[post.id] ?? post.data.title}</span>
|
||||||
|
{post.data.pinned && (
|
||||||
|
<span class="pin" title={t('pinned_label', locale)}>{t('pinned_label', locale)}</span>
|
||||||
|
)}
|
||||||
{post.data.category !== 'reading' &&
|
{post.data.category !== 'reading' &&
|
||||||
post.data.tags.map((tag) => <code class="tag">{`#${tag}`}</code>)}
|
post.data.tags.map((tag) => <code class="tag">{`#${tag}`}</code>)}
|
||||||
<time class="row-date" datetime={post.data.pubDate.toISOString()}>
|
<time class="row-date" datetime={post.data.pubDate.toISOString()}>
|
||||||
@@ -174,6 +180,9 @@ const byMonth = (list: CollectionEntry<'posts'>[]) => {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<span class="row-title">{titleOverrides?.[post.id] ?? post.data.title}</span>
|
<span class="row-title">{titleOverrides?.[post.id] ?? post.data.title}</span>
|
||||||
|
{post.data.pinned && (
|
||||||
|
<span class="pin" title={t('pinned_label', locale)}>{t('pinned_label', locale)}</span>
|
||||||
|
)}
|
||||||
{cat !== 'reading' &&
|
{cat !== 'reading' &&
|
||||||
post.data.tags.map((tag) => <code class="tag">{`#${tag}`}</code>)}
|
post.data.tags.map((tag) => <code class="tag">{`#${tag}`}</code>)}
|
||||||
<time class="row-date" datetime={post.data.pubDate.toISOString()}>
|
<time class="row-date" datetime={post.data.pubDate.toISOString()}>
|
||||||
@@ -261,6 +270,18 @@ const byMonth = (list: CollectionEntry<'posts'>[]) => {
|
|||||||
-webkit-line-clamp: 2;
|
-webkit-line-clamp: 2;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
overflow: hidden; color: var(--accent); }
|
overflow: hidden; color: var(--accent); }
|
||||||
|
/* 置顶标记:灰阶 hairline 小徽标,不抢标题注意力 */
|
||||||
|
.pin {
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 10.5px;
|
||||||
|
line-height: 1.5;
|
||||||
|
color: var(--ink-4);
|
||||||
|
border: 1px solid var(--line);
|
||||||
|
border-radius: 4px;
|
||||||
|
padding: 0 5px;
|
||||||
|
white-space: nowrap;
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
.tag {
|
.tag {
|
||||||
flex: none;
|
flex: none;
|
||||||
font-family: var(--font-mono);
|
font-family: var(--font-mono);
|
||||||
|
|||||||
@@ -27,6 +27,9 @@ const { block } = Astro.props;
|
|||||||
margin-top: var(--space-3);
|
margin-top: var(--space-3);
|
||||||
}
|
}
|
||||||
.prose-body.full { max-width: none; }
|
.prose-body.full { max-width: none; }
|
||||||
|
/* 标题下正文不再叠一档 margin:同级标题到内容统一 16px(tracks 块实测 16px,
|
||||||
|
prose 原来 16+16=32,两块相邻时节奏不齐——视觉终审) */
|
||||||
|
.sec-title + .prose-body { margin-top: 0; }
|
||||||
.prose-body :global(p) { margin-block: 0 var(--space-2); }
|
.prose-body :global(p) { margin-block: 0 var(--space-2); }
|
||||||
.prose-body :global(ul) {
|
.prose-body :global(ul) {
|
||||||
margin: var(--space-1) 0 var(--space-2);
|
margin: var(--space-1) 0 var(--space-2);
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const commitUrl = `https://git.wait4x.online/wait4x/blog/commit/${sha}`;
|
|||||||
---
|
---
|
||||||
|
|
||||||
<p class="build-info">
|
<p class="build-info">
|
||||||
built from
|
built from{' '}
|
||||||
{short === 'dev' ? <span>dev</span> : <a href={commitUrl} class="link mono-link">{short}</a>}
|
{short === 'dev' ? <span>dev</span> : <a href={commitUrl} class="link mono-link">{short}</a>}
|
||||||
· {new Date(date).toISOString().slice(0, 16).replace('T', ' ')}Z · Astro
|
· {new Date(date).toISOString().slice(0, 16).replace('T', ' ')}Z · Astro
|
||||||
</p>
|
</p>
|
||||||
@@ -0,0 +1,260 @@
|
|||||||
|
---
|
||||||
|
// 开源页原生档案卡(5h T5):零第三方图片、零 iframe
|
||||||
|
// 数据来源:①content/site/home.yaml 的头像/社交(单一事实源)②content/site/opensource.yaml 的
|
||||||
|
// 定位叙述(blurb/blurb_after,双语可后台改)③GitHub REST 的 followers/公开仓数(token 在宿主
|
||||||
|
// 0600 文件,缺位或失败即隐藏该数字)④src/lib/projects.ts 的仓库列表(语言占比与星标汇总)
|
||||||
|
// 降级纪律:任何一项取数失败只隐藏该项,绝不炸构建、不出现空图片框
|
||||||
|
import { Image } from 'astro:assets';
|
||||||
|
import { homeAvatar, homeSocials, openSourceCopy } from '../../lib/site-content';
|
||||||
|
import { githubUserStats, loadProjects } from '../../lib/projects';
|
||||||
|
import { iconPath } from '../../lib/icons';
|
||||||
|
import type { Locale } from '../../lib/locale';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
locale?: Locale;
|
||||||
|
}
|
||||||
|
const { locale = 'zh' } = Astro.props;
|
||||||
|
|
||||||
|
const avatar = await homeAvatar();
|
||||||
|
const socials = await homeSocials();
|
||||||
|
const copy = await openSourceCopy(locale);
|
||||||
|
|
||||||
|
// 仓库数据:档案卡只关心"语言占比 + 星标汇总",取全量(不受项目墙可见性影响)
|
||||||
|
let langs: { name: string; count: number; pct: number }[] = [];
|
||||||
|
let totalStars: number | null = null;
|
||||||
|
try {
|
||||||
|
const repos = await loadProjects({ mode: 'all', sort: 'stars' });
|
||||||
|
if (repos.length) {
|
||||||
|
totalStars = repos.reduce((sum, r) => sum + (r.stars ?? 0), 0);
|
||||||
|
const tally = new Map<string, number>();
|
||||||
|
for (const r of repos) {
|
||||||
|
if (!r.language) continue;
|
||||||
|
tally.set(r.language, (tally.get(r.language) ?? 0) + 1);
|
||||||
|
}
|
||||||
|
const total = [...tally.values()].reduce((a, b) => a + b, 0);
|
||||||
|
langs = [...tally.entries()]
|
||||||
|
.sort((a, b) => b[1] - a[1])
|
||||||
|
.slice(0, 5)
|
||||||
|
.map(([name, count]) => ({
|
||||||
|
name,
|
||||||
|
count,
|
||||||
|
pct: total ? Math.round((count / total) * 100) : 0,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
console.warn('[profile] 仓库数据不可用,语言占比与星标汇总已隐藏');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 并列判定用百分比最大值(四舍五入后并列很常见:Python/TS 各 36%):
|
||||||
|
// 只给第一根上强调色会让并列者显得"落后",故并列者一并着色
|
||||||
|
const maxPct = langs.reduce((m, l) => Math.max(m, l.pct), 0);
|
||||||
|
const stats = await githubUserStats();
|
||||||
|
const L = {
|
||||||
|
zh: { followers: '关注者', repos: '公开仓库', stars: '总星标', langs: '语言占比' },
|
||||||
|
en: { followers: 'Followers', repos: 'Public repos', stars: 'Total stars', langs: 'Languages' },
|
||||||
|
}[locale];
|
||||||
|
---
|
||||||
|
|
||||||
|
<section class="profile" aria-label={locale === 'zh' ? 'GitHub 档案' : 'GitHub profile'}>
|
||||||
|
<div class="who">
|
||||||
|
{avatar ? (
|
||||||
|
<Image class="pf-avatar" src={avatar} alt="wait4x" width={64} height={64} format="webp" quality={84} />
|
||||||
|
) : (
|
||||||
|
<span class="pf-avatar pf-avatar-fallback" aria-hidden="true">w4</span>
|
||||||
|
)}
|
||||||
|
<div class="who-main">
|
||||||
|
<p class="pf-name">
|
||||||
|
wait4x<span class="pf-handle mono">@wait4xx</span>
|
||||||
|
</p>
|
||||||
|
<p class="pf-bio">
|
||||||
|
{copy.blurb}<a class="pf-link" href={copy.repoUrl}>{copy.repoLabel}</a>{copy.blurbAfter}
|
||||||
|
</p>
|
||||||
|
<ul class="pf-socials">
|
||||||
|
{socials.map((s) => (
|
||||||
|
<li>
|
||||||
|
<a
|
||||||
|
class="tap"
|
||||||
|
href={s.url}
|
||||||
|
aria-label={s.label}
|
||||||
|
title={s.label}
|
||||||
|
rel={s.url.startsWith('http') ? 'noopener noreferrer' : undefined}
|
||||||
|
>
|
||||||
|
{iconPath(s.icon) ? (
|
||||||
|
<svg viewBox="0 0 24 24" width="15" height="15" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">
|
||||||
|
<path d={iconPath(s.icon)} />
|
||||||
|
</svg>
|
||||||
|
) : (
|
||||||
|
<span class="pf-social-text mono">{s.label}</span>
|
||||||
|
)}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{(stats || totalStars !== null) && (
|
||||||
|
<dl class="pf-stats mono">
|
||||||
|
{stats && (
|
||||||
|
<>
|
||||||
|
<div><dt>{L.followers}</dt><dd>{stats.followers}</dd></div>
|
||||||
|
<div><dt>{L.repos}</dt><dd>{stats.publicRepos}</dd></div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
{totalStars !== null && (
|
||||||
|
<div><dt>{L.stars}</dt><dd>{totalStars}</dd></div>
|
||||||
|
)}
|
||||||
|
</dl>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{langs.length > 0 && (
|
||||||
|
<div class="pf-langs">
|
||||||
|
<p class="pf-langs-title mono">{L.langs}</p>
|
||||||
|
<ul>
|
||||||
|
{langs.map((l) => (
|
||||||
|
<li class:list={['pf-lang', { top: l.pct === maxPct }]}>
|
||||||
|
<span class="pf-lang-name mono">{l.name}</span>
|
||||||
|
<span class="pf-bar" aria-hidden="true">
|
||||||
|
<span class="pf-bar-fill" style={`width:${Math.max(l.pct, 2)}%`} />
|
||||||
|
</span>
|
||||||
|
<span class="pf-lang-pct mono">{l.pct}%</span>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.profile {
|
||||||
|
margin: var(--space-3) 0 var(--space-5);
|
||||||
|
padding: var(--space-4);
|
||||||
|
border: 1px solid var(--line);
|
||||||
|
border-radius: 12px;
|
||||||
|
max-width: var(--measure);
|
||||||
|
}
|
||||||
|
.who {
|
||||||
|
display: flex;
|
||||||
|
gap: var(--space-3);
|
||||||
|
align-items: flex-start;
|
||||||
|
}
|
||||||
|
.pf-avatar {
|
||||||
|
flex: none;
|
||||||
|
width: 64px;
|
||||||
|
height: 64px;
|
||||||
|
border-radius: 14px;
|
||||||
|
object-fit: cover;
|
||||||
|
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
.pf-avatar-fallback {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 15px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--ink-2);
|
||||||
|
background: var(--bg-soft);
|
||||||
|
}
|
||||||
|
.who-main { min-width: 0; }
|
||||||
|
.pf-name {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--ink-1);
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
gap: 0.4rem;
|
||||||
|
}
|
||||||
|
.pf-handle { font-size: 12.5px; font-weight: 400; color: var(--ink-4); }
|
||||||
|
.pf-bio {
|
||||||
|
margin-top: 0.3rem;
|
||||||
|
font-size: 14.5px;
|
||||||
|
line-height: 1.65;
|
||||||
|
color: var(--ink-2);
|
||||||
|
}
|
||||||
|
.pf-link {
|
||||||
|
color: var(--accent);
|
||||||
|
text-decoration: underline;
|
||||||
|
text-underline-offset: 3px;
|
||||||
|
}
|
||||||
|
.pf-socials {
|
||||||
|
display: flex;
|
||||||
|
gap: var(--space-2);
|
||||||
|
list-style: none;
|
||||||
|
margin: var(--space-2) 0 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
.pf-socials a { color: var(--ink-3); display: inline-flex; }
|
||||||
|
.pf-socials a:hover { color: var(--accent); }
|
||||||
|
.pf-social-text { font-size: 12px; }
|
||||||
|
|
||||||
|
.pf-stats {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: var(--space-4);
|
||||||
|
margin: var(--space-4) 0 0;
|
||||||
|
padding-top: var(--space-3);
|
||||||
|
border-top: 1px solid var(--line);
|
||||||
|
}
|
||||||
|
.pf-stats div { display: flex; flex-direction: column; gap: 2px; }
|
||||||
|
.pf-stats dt {
|
||||||
|
font-size: 11.5px;
|
||||||
|
color: var(--ink-4);
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
}
|
||||||
|
.pf-stats dd {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 17px;
|
||||||
|
color: var(--ink-1);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pf-langs { margin-top: var(--space-3); }
|
||||||
|
.pf-langs-title {
|
||||||
|
font-size: 11.5px;
|
||||||
|
color: var(--ink-4);
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
margin-bottom: var(--space-2);
|
||||||
|
}
|
||||||
|
.pf-langs ul {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: 0.35rem;
|
||||||
|
max-width: 32rem;
|
||||||
|
}
|
||||||
|
.pf-lang {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 7.5rem 1fr 3rem;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
}
|
||||||
|
.pf-lang-name { font-size: 12px; color: var(--ink-3); }
|
||||||
|
.pf-bar {
|
||||||
|
display: block;
|
||||||
|
height: 6px;
|
||||||
|
border-radius: 3px;
|
||||||
|
background: var(--bg-soft);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.pf-bar-fill {
|
||||||
|
display: block;
|
||||||
|
height: 100%;
|
||||||
|
background: var(--ink-3);
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
/* 灰阶体系:仅第一名用 accent 强调,其余走 ink 灰阶(不沿用 GitHub 彩色语言点) */
|
||||||
|
.pf-lang.top .pf-bar-fill { background: var(--accent); }
|
||||||
|
.pf-lang.top .pf-lang-name { color: var(--ink-2); }
|
||||||
|
.pf-lang-pct {
|
||||||
|
font-size: 11.5px;
|
||||||
|
color: var(--ink-4);
|
||||||
|
text-align: right;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
@media (max-width: 560px) {
|
||||||
|
.pf-lang { grid-template-columns: 5.5rem 1fr 2.6rem; }
|
||||||
|
.pf-stats { gap: var(--space-3); }
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -23,11 +23,9 @@ interface Props {
|
|||||||
}
|
}
|
||||||
const { limit = 6, locale = 'zh', pinned, options } = Astro.props;
|
const { limit = 6, locale = 'zh', pinned, options } = Astro.props;
|
||||||
const title = t('open_source_projects', locale);
|
const title = t('open_source_projects', locale);
|
||||||
const LANG_COLORS: Record<string, string> = {
|
// 2026-11-02 视觉终审:原先按 GitHub linguist 给每个仓染语言色点,开源页一次铺
|
||||||
Astro: '#ff5a03', TypeScript: '#3178c6', JavaScript: '#f1e05a',
|
// 15+ 个仓 = 15 种彩色,破「外壳灰阶、彩色只作正文强调(≤3 处/页)」红线。
|
||||||
Python: '#3572a5', Go: '#00add8', Rust: '#dea584', Shell: '#89e051',
|
// 改为统一灰阶点:语言信息靠文字承载,颜色不再做无意义的编码。
|
||||||
HTML: '#e34c26', CSS: '#563d7c', Dockerfile: '#384d54',
|
|
||||||
};
|
|
||||||
|
|
||||||
let projects: RepoCard[] = [];
|
let projects: RepoCard[] = [];
|
||||||
try {
|
try {
|
||||||
@@ -50,7 +48,7 @@ try {
|
|||||||
<span class="repo-meta">
|
<span class="repo-meta">
|
||||||
{p.language && (
|
{p.language && (
|
||||||
<span class="lang">
|
<span class="lang">
|
||||||
<span class="dot" style={`background:${LANG_COLORS[p.language] ?? '#8b8f98'}`} />
|
<span class="dot" />
|
||||||
{p.language}
|
{p.language}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
@@ -87,5 +85,12 @@ try {
|
|||||||
.repo-desc { font-size: 13px; color: var(--ink-3); }
|
.repo-desc { font-size: 13px; color: var(--ink-3); }
|
||||||
.repo-meta { display: flex; gap: var(--space-3); font-size: 12px; color: var(--ink-3); margin-top: 4px; }
|
.repo-meta { display: flex; gap: var(--space-3); font-size: 12px; color: var(--ink-3); margin-top: 4px; }
|
||||||
.lang { display: inline-flex; align-items: center; gap: 4px; }
|
.lang { display: inline-flex; align-items: center; gap: 4px; }
|
||||||
.dot { width: 8px; height: 8px; border-radius: 50%; display: inline-block; }
|
.dot {
|
||||||
|
width: 7px;
|
||||||
|
height: 7px;
|
||||||
|
border-radius: 50%;
|
||||||
|
display: inline-block;
|
||||||
|
background: var(--ink-4);
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -0,0 +1,208 @@
|
|||||||
|
---
|
||||||
|
/**
|
||||||
|
* 浏览 / 评论计数徽标(Phase 5h T4):眼睛图标 = 浏览数,气泡图标 = 评论数。
|
||||||
|
*
|
||||||
|
* 为什么这么设计:
|
||||||
|
* - 语汇对齐开源页从 GitHub README 移植过来的「👀 Visitors」徽章,但改成本地
|
||||||
|
* SVG + tokens 着色,不引入任何第三方图片(komarev/shields 在慢网下空白破版)。
|
||||||
|
* - 数据只用 Artalk 匿名可读端点(2026-11-02 生产实测):
|
||||||
|
* GET /artalk/api/v2/comments?site_name=…&page_key=…&limit=1
|
||||||
|
* → { count, roots_count, page: { pv } } (一次拿到评论数与浏览量)
|
||||||
|
* POST /artalk/api/v2/pages/pv { page_key, site_name } → { pv }
|
||||||
|
* - `mode="readonly"` 只读(瞬间列表每条都要显示,逐条计数会污染数据);
|
||||||
|
* `mode="page"` 计入一次浏览(文章/关于/开源等整页场景)。
|
||||||
|
*
|
||||||
|
* SSR 渲染占位「–」:无 JS / 接口失败时退化为一个短横,不显示 0 误导读者。
|
||||||
|
*/
|
||||||
|
interface Props {
|
||||||
|
/** 评论流键(与 ArtalkComments 的 pageKey 同语义,双语页共用) */
|
||||||
|
pageKey: string;
|
||||||
|
locale?: 'zh' | 'en';
|
||||||
|
/** page = 计入一次浏览;readonly = 只读,不改动计数 */
|
||||||
|
mode?: 'page' | 'readonly';
|
||||||
|
/** 是否显示评论数(瞬间逐条场景也显示) */
|
||||||
|
showComments?: boolean;
|
||||||
|
/** 是否显示浏览数 */
|
||||||
|
showPv?: boolean;
|
||||||
|
/** 视觉变体:inline = 行内小字(默认);chip = 带底框的徽标条 */
|
||||||
|
variant?: 'inline' | 'chip';
|
||||||
|
}
|
||||||
|
|
||||||
|
const {
|
||||||
|
pageKey,
|
||||||
|
locale = 'zh',
|
||||||
|
mode = 'page',
|
||||||
|
showComments = true,
|
||||||
|
showPv = true,
|
||||||
|
variant = 'inline',
|
||||||
|
} = Astro.props;
|
||||||
|
|
||||||
|
const L = {
|
||||||
|
pv: locale === 'zh' ? '次浏览' : 'views',
|
||||||
|
cm: locale === 'zh' ? '条评论' : 'comments',
|
||||||
|
};
|
||||||
|
---
|
||||||
|
|
||||||
|
<p
|
||||||
|
class:list={['viewmeta', variant === 'chip' && 'chip']}
|
||||||
|
data-viewmeta
|
||||||
|
data-page-key={pageKey}
|
||||||
|
data-mode={mode}
|
||||||
|
data-i18n-pv={L.pv}
|
||||||
|
data-i18n-cm={L.cm}
|
||||||
|
>
|
||||||
|
{showPv && (
|
||||||
|
<span class="vm-item" title={L.pv}>
|
||||||
|
<svg class="vm-icon" viewBox="0 0 16 16" width="13" height="13" aria-hidden="true">
|
||||||
|
<path
|
||||||
|
d="M1.3 8S3.9 3.9 8 3.9 14.7 8 14.7 8 12.1 12.1 8 12.1 1.3 8 1.3 8Z"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="1.25"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"></path>
|
||||||
|
<circle cx="8" cy="8" r="1.9" fill="none" stroke="currentColor" stroke-width="1.25"></circle>
|
||||||
|
</svg>
|
||||||
|
<span data-vm-pv aria-label={L.pv}>–</span>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{showComments && (
|
||||||
|
<span class="vm-item" title={L.cm}>
|
||||||
|
<svg class="vm-icon" viewBox="0 0 16 16" width="13" height="13" aria-hidden="true">
|
||||||
|
<path
|
||||||
|
d="M2.4 3.2h11.2v7.3H7.1L4 13.2v-2.7H2.4z"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="1.25"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"></path>
|
||||||
|
</svg>
|
||||||
|
<span data-vm-cm aria-label={L.cm}>–</span>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// 同一页可能有多个实例(瞬间时间线逐条),脚本只跑一份,统一批量处理。
|
||||||
|
const SITE = 'wait4x.online';
|
||||||
|
const API = '/artalk/api/v2';
|
||||||
|
|
||||||
|
interface Meta {
|
||||||
|
count?: number;
|
||||||
|
page?: { pv?: number };
|
||||||
|
}
|
||||||
|
|
||||||
|
const fill = (root: HTMLElement, meta: Meta) => {
|
||||||
|
const pv = root.querySelector<HTMLElement>('[data-vm-pv]');
|
||||||
|
const cm = root.querySelector<HTMLElement>('[data-vm-cm]');
|
||||||
|
const locale = document.documentElement.lang === 'en' ? 'en' : 'zh';
|
||||||
|
const unitPv = locale === 'zh' ? '次浏览' : 'views';
|
||||||
|
const unitCm = locale === 'zh' ? '条评论' : 'comments';
|
||||||
|
if (pv) {
|
||||||
|
const n = meta.page?.pv;
|
||||||
|
pv.textContent = typeof n === 'number' ? `${n} ${unitPv}` : '–';
|
||||||
|
}
|
||||||
|
if (cm) {
|
||||||
|
const n = meta.count;
|
||||||
|
cm.textContent = typeof n === 'number' ? `${n} ${unitCm}` : '–';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const loadOne = async (root: HTMLElement) => {
|
||||||
|
const key = root.dataset.pageKey;
|
||||||
|
if (!key) return;
|
||||||
|
// 每元素只处理一次(2026-11-02 实测教训):首屏 astro:page-load 与本脚本的
|
||||||
|
// 立即调用会双触发,page 模式每元素会 POST 两次 → 浏览量翻倍(实测
|
||||||
|
// 15→17→19 每载 +2,加此守卫后 1/2/3 每载 +1)。软导航新页面元素是新的,
|
||||||
|
// 故不牺牲「换页重计」语义。
|
||||||
|
if (root.dataset.vmDone === '1') return;
|
||||||
|
root.dataset.vmDone = '1';
|
||||||
|
const mode = root.dataset.mode ?? 'page';
|
||||||
|
try {
|
||||||
|
// page 模式先计一次浏览(POST 绕 ESA 缓存),再读评论数;
|
||||||
|
// readonly 模式只读:一次 GET 同时拿到 pv 与 count,零写入。
|
||||||
|
if (mode === 'page') {
|
||||||
|
const bumped = await fetch(`${API}/pages/pv`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ page_key: key, site_name: SITE }),
|
||||||
|
});
|
||||||
|
const data = (await bumped.json()) as Meta;
|
||||||
|
const res = await fetch(
|
||||||
|
`${API}/comments?site_name=${encodeURIComponent(SITE)}&page_key=${encodeURIComponent(key)}&limit=1`,
|
||||||
|
);
|
||||||
|
const meta = (await res.json()) as Meta;
|
||||||
|
const merged: Meta = { count: meta.count, page: { pv: data.pv ?? meta.page?.pv } };
|
||||||
|
fill(root, merged);
|
||||||
|
// 同页同键的其它实例(如评论区 chip)复用本次结果:否则它独立 GET 到的
|
||||||
|
// pv 可能比计过数的这份少 1,两个徽标同页显示不同数字会像 bug。
|
||||||
|
for (const other of document.querySelectorAll<HTMLElement>('[data-viewmeta]')) {
|
||||||
|
if (other === root || other.dataset.pageKey !== key) continue;
|
||||||
|
other.dataset.vmDone = '1';
|
||||||
|
fill(other, merged);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const res = await fetch(
|
||||||
|
`${API}/comments?site_name=${encodeURIComponent(SITE)}&page_key=${encodeURIComponent(key)}&limit=1`,
|
||||||
|
);
|
||||||
|
fill(root, (await res.json()) as Meta);
|
||||||
|
} catch {
|
||||||
|
// 页模式失败:同键 readonly 兄弟此前被跳过,这里放它们自己读,避免永远「–」
|
||||||
|
for (const other of document.querySelectorAll<HTMLElement>('[data-viewmeta]')) {
|
||||||
|
if (other === root || other.dataset.pageKey !== key || other.dataset.vmDone === '1') continue;
|
||||||
|
delete other.dataset.vmDone;
|
||||||
|
void loadOne(other);
|
||||||
|
}
|
||||||
|
/* 接口不可用:保留占位「–」,不显示 0 误导读者 */
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const run = () => {
|
||||||
|
const all = [...document.querySelectorAll<HTMLElement>('[data-viewmeta]')];
|
||||||
|
// 同键存在 page 实例时,readonly 实例等它回填(它拿到的是计过数的 pv,
|
||||||
|
// 与 section 内另一枚徽标必然一致);否则同页两枚会显示差 1 的两个数字。
|
||||||
|
const pageKeys = new Set(
|
||||||
|
all
|
||||||
|
.filter((el) => (el.dataset.mode ?? 'page') === 'page' && el.dataset.pageKey)
|
||||||
|
.map((el) => el.dataset.pageKey as string),
|
||||||
|
);
|
||||||
|
for (const root of all) {
|
||||||
|
if ((root.dataset.mode ?? 'page') === 'readonly' && pageKeys.has(root.dataset.pageKey ?? '')) continue;
|
||||||
|
void loadOne(root);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener('astro:page-load', run);
|
||||||
|
run();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.viewmeta {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: var(--space-2);
|
||||||
|
margin: 0;
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--ink-4);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
.viewmeta.chip {
|
||||||
|
padding: 3px 9px;
|
||||||
|
border: 1px solid var(--line);
|
||||||
|
border-radius: 999px;
|
||||||
|
background: var(--bg-soft);
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
.vm-item {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.vm-icon {
|
||||||
|
flex: none;
|
||||||
|
opacity: 0.85;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -5,13 +5,15 @@ import { getCollection } from 'astro:content';
|
|||||||
import BaseLayout from '../../layouts/BaseLayout.astro';
|
import BaseLayout from '../../layouts/BaseLayout.astro';
|
||||||
import { t } from '../../i18n/ui';
|
import { t } from '../../i18n/ui';
|
||||||
import type { Locale } from '../../lib/locale';
|
import type { Locale } from '../../lib/locale';
|
||||||
|
import { sortPosts } from '../../lib/post-order';
|
||||||
import { Image } from 'astro:assets';
|
import { Image } from 'astro:assets';
|
||||||
|
|
||||||
interface Props { locale?: Locale }
|
interface Props { locale?: Locale }
|
||||||
const { locale = 'zh' } = Astro.props;
|
const { locale = 'zh' } = Astro.props;
|
||||||
|
|
||||||
const books = (await getCollection('posts', ({ data }) => !data.draft && data.category === 'reading' && !data.tags.includes('hidden')))
|
const books = sortPosts(
|
||||||
.sort((a, b) => b.data.pubDate.valueOf() - a.data.pubDate.valueOf());
|
await getCollection('posts', ({ data }) => !data.draft && data.category === 'reading' && !data.tags.includes('hidden')),
|
||||||
|
);
|
||||||
|
|
||||||
// 回退契约(schema 注释声称而此前未实现——视觉复核抓到的缺口):
|
// 回退契约(schema 注释声称而此前未实现——视觉复核抓到的缺口):
|
||||||
// description 缺省取正文第一个非空段落(去 markdown 记号)前 60 字
|
// description 缺省取正文第一个非空段落(去 markdown 记号)前 60 字
|
||||||
|
|||||||
@@ -0,0 +1,216 @@
|
|||||||
|
---
|
||||||
|
// 首页(zh/en 共用):名片区 / 文章列表 / 最新影像 / 热力图 / 项目墙 / 心跳
|
||||||
|
// 两个 index.astro 只是薄壳(传 locale),区块逻辑与样式集中在这里,避免双份漂移。
|
||||||
|
import { Image } from 'astro:assets';
|
||||||
|
import { getCollection } from 'astro:content';
|
||||||
|
import BaseLayout from '../../layouts/BaseLayout.astro';
|
||||||
|
import IdCard from '../IdCard.astro';
|
||||||
|
import PostList from '../PostList.astro';
|
||||||
|
import ProjectWall from '../geek/ProjectWall.astro';
|
||||||
|
import Heatmap from '../geek/Heatmap.astro';
|
||||||
|
import SocialLinks from '../SocialLinks.astro';
|
||||||
|
import { t } from '../../i18n/ui';
|
||||||
|
import { sortPosts } from '../../lib/post-order';
|
||||||
|
import type { Locale } from '../../lib/locale';
|
||||||
|
import {
|
||||||
|
homeConfig,
|
||||||
|
homeTagline,
|
||||||
|
pageTypography,
|
||||||
|
renderMarkdown,
|
||||||
|
renderRich,
|
||||||
|
} from '../../lib/site-content';
|
||||||
|
import { fetchHeartbeat, agoZh } from '../../lib/heartbeat';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
locale?: Locale;
|
||||||
|
}
|
||||||
|
const { locale = 'zh' } = Astro.props;
|
||||||
|
|
||||||
|
// 首页可配项(后台主页设置):副标题/影像张数/区块开关/每轨条数/项目墙条数/公告/轨细分
|
||||||
|
const cfg = await homeConfig(locale);
|
||||||
|
const subtitleHtml = cfg.subtitle ? await renderMarkdown(cfg.subtitle) : '';
|
||||||
|
const announcementHtml = cfg.announcement ? await renderRich(cfg.announcement) : '';
|
||||||
|
|
||||||
|
// 置顶优先 → 时间倒序(sortPosts 契约见 src/lib/post-order.ts)
|
||||||
|
const posts = sortPosts(
|
||||||
|
await getCollection('posts', ({ data }) => !data.draft && !data.tags.includes('hidden')),
|
||||||
|
);
|
||||||
|
|
||||||
|
// en 轨列表标题吃 postsEn 译题(缺译回退 zh,与 /en/archives 同策略)
|
||||||
|
const enTitle = locale === 'en'
|
||||||
|
? Object.fromEntries((await getCollection('postsEn')).map((e) => [e.id, e.data.title]))
|
||||||
|
: undefined;
|
||||||
|
|
||||||
|
// 最新影像取集合前 N 张;照片时间序由照片管线治理,此处只裁切
|
||||||
|
const photos = (await getCollection('photos')).slice(0, Math.max(1, cfg.latestPhotos));
|
||||||
|
|
||||||
|
const tagline = await homeTagline(locale);
|
||||||
|
const taglineHtml = await renderRich(tagline, { inline: true });
|
||||||
|
const typo = await pageTypography('siteHome', 'home');
|
||||||
|
// 心跳只出现在中文首页(en 轨历史形态如此,保持零回归)
|
||||||
|
const heartbeat = locale === 'zh' ? await fetchHeartbeat() : null;
|
||||||
|
const galleryHref = locale === 'en' ? '/en/gallery/' : '/gallery/';
|
||||||
|
|
||||||
|
// 轨细分开关:只保留开启的轨道(全开时等价于不过滤,零回归)
|
||||||
|
const activeTracks = Object.entries(cfg.postsTracks)
|
||||||
|
.filter(([, on]) => on)
|
||||||
|
.map(([k]) => k);
|
||||||
|
const allTracksOn = activeTracks.length === Object.keys(cfg.postsTracks).length;
|
||||||
|
const visiblePosts = allTracksOn
|
||||||
|
? posts
|
||||||
|
: posts.filter((p) => activeTracks.includes(p.data.category));
|
||||||
|
---
|
||||||
|
|
||||||
|
<BaseLayout
|
||||||
|
title="wait4x"
|
||||||
|
description={locale === 'en' ? "wait4x's blog: reading · code · photography" : undefined}
|
||||||
|
>
|
||||||
|
<div class={typo.className || undefined} style={typo.style || undefined}>
|
||||||
|
<IdCard>
|
||||||
|
<p class="tagline rich" set:html={taglineHtml} />
|
||||||
|
{subtitleHtml && <div class="subtitle" set:html={subtitleHtml} />}
|
||||||
|
<SocialLinks />
|
||||||
|
</IdCard>
|
||||||
|
|
||||||
|
{announcementHtml && (
|
||||||
|
<div class="announcement rich" set:html={announcementHtml} aria-label={locale === 'en' ? 'Announcement' : '公告'} />
|
||||||
|
)}
|
||||||
|
|
||||||
|
{cfg.sections.tracks && (
|
||||||
|
<PostList
|
||||||
|
posts={visiblePosts}
|
||||||
|
locale={locale}
|
||||||
|
titleOverrides={enTitle}
|
||||||
|
perTrack={cfg.perTrackLimit}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{cfg.sections.photos && cfg.latestPhotos > 0 && (
|
||||||
|
<section class="latest" aria-label={t('latest_photos', locale)}>
|
||||||
|
<div class="latest-head">
|
||||||
|
<span class="lab">{t('latest_photos', locale)}</span>
|
||||||
|
<a class="tap more" href={galleryHref}>{t('enter_gallery', locale)}</a>
|
||||||
|
</div>
|
||||||
|
<div class="thumbs">
|
||||||
|
{photos.map((photo, i) => (
|
||||||
|
<a class="thumb" href={galleryHref} aria-label={`${t('latest_photos', locale)}: ${photo.data.title}`}>
|
||||||
|
{/* 首两图 eager(Astro Image 默认 lazy 会把 LCP 压到 6s+),首图再拔 fetchpriority */}
|
||||||
|
<Image
|
||||||
|
src={photo.data.image}
|
||||||
|
alt={photo.data.alt ?? photo.data.title}
|
||||||
|
widths={[180, 360]}
|
||||||
|
sizes="(min-width: 820px) 20vw, 42vw"
|
||||||
|
loading={i < 2 ? 'eager' : 'lazy'}
|
||||||
|
fetchpriority={i === 0 ? 'high' : undefined}
|
||||||
|
/>
|
||||||
|
</a>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{cfg.sections.heatmap && (
|
||||||
|
<Heatmap
|
||||||
|
labels={{
|
||||||
|
title: t('heatmap_title', locale),
|
||||||
|
summary: t('heatmap_summary', locale),
|
||||||
|
less: t('heatmap_less', locale),
|
||||||
|
more: t('heatmap_more', locale),
|
||||||
|
note: t('heatmap_note', locale),
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{cfg.sections.projects && <ProjectWall limit={cfg.projectsLimit} />}
|
||||||
|
{heartbeat && (
|
||||||
|
<p class="heartbeat" aria-label="最近心跳">
|
||||||
|
<span class="beat-dot" aria-hidden="true"></span>
|
||||||
|
最近心跳:{agoZh(heartbeat.when)} · {heartbeat.msg}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</BaseLayout>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.subtitle {
|
||||||
|
font-size: 13.5px;
|
||||||
|
color: var(--ink-4);
|
||||||
|
margin-top: 2px;
|
||||||
|
letter-spacing: 0.01em;
|
||||||
|
}
|
||||||
|
.subtitle :global(p) { margin: 0; }
|
||||||
|
.subtitle :global(a) { color: var(--accent); }
|
||||||
|
.tagline {
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--ink-3);
|
||||||
|
margin-top: 4px;
|
||||||
|
letter-spacing: 0.01em;
|
||||||
|
}
|
||||||
|
/* 公告块:独立于区块开关,空则不渲染(markdown 富文本,左缘细线做提示) */
|
||||||
|
.announcement {
|
||||||
|
margin-top: var(--space-4);
|
||||||
|
padding: var(--space-2) 0 var(--space-2) var(--space-3);
|
||||||
|
border-left: 2px solid var(--line);
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1.7;
|
||||||
|
color: var(--ink-2);
|
||||||
|
}
|
||||||
|
.announcement :global(p) { margin: 0; }
|
||||||
|
.announcement :global(p + p) { margin-top: 0.6em; }
|
||||||
|
.announcement :global(a) { color: var(--accent); }
|
||||||
|
.heartbeat {
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 12.5px;
|
||||||
|
color: var(--ink-3);
|
||||||
|
margin-top: var(--space-2);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
.beat-dot {
|
||||||
|
width: 7px; height: 7px; border-radius: 50%;
|
||||||
|
background: var(--ink-2);
|
||||||
|
animation: beat 2.4s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
@keyframes beat { 0%, 100% { opacity: 0.35; } 50% { opacity: 1; } }
|
||||||
|
@media (prefers-reduced-motion: reduce) { .beat-dot { animation: none; } }
|
||||||
|
.latest { margin-top: var(--space-6); }
|
||||||
|
.latest-head {
|
||||||
|
display: flex;
|
||||||
|
align-items: baseline;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: var(--space-3);
|
||||||
|
}
|
||||||
|
.lab {
|
||||||
|
font-size: 12.5px;
|
||||||
|
color: var(--ink-4);
|
||||||
|
letter-spacing: 0.08em;
|
||||||
|
}
|
||||||
|
.more {
|
||||||
|
font-size: 13px;
|
||||||
|
color: var(--accent);
|
||||||
|
padding-inline: var(--space-2);
|
||||||
|
transition: color var(--dur) var(--ease);
|
||||||
|
}
|
||||||
|
.more:hover { color: var(--ink-1); }
|
||||||
|
.thumbs {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(2, 1fr);
|
||||||
|
gap: var(--space-2);
|
||||||
|
margin-top: var(--space-3);
|
||||||
|
}
|
||||||
|
.thumb {
|
||||||
|
aspect-ratio: 1;
|
||||||
|
border-radius: 8px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.thumb :global(img) {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
|
transition: transform var(--dur) var(--ease);
|
||||||
|
}
|
||||||
|
.thumb:hover :global(img) { transform: scale(1.03); }
|
||||||
|
@media (min-width: 820px) {
|
||||||
|
.thumbs { grid-template-columns: repeat(4, 1fr); }
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -2,7 +2,10 @@
|
|||||||
import { Image } from 'astro:assets';
|
import { Image } from 'astro:assets';
|
||||||
import { getCollection } from 'astro:content';
|
import { getCollection } from 'astro:content';
|
||||||
import BaseLayout from '../../layouts/BaseLayout.astro';
|
import BaseLayout from '../../layouts/BaseLayout.astro';
|
||||||
|
import MomentComments from '../MomentComments.astro';
|
||||||
|
import ViewMeta from '../geek/ViewMeta.astro';
|
||||||
import { t } from '../../i18n/ui';
|
import { t } from '../../i18n/ui';
|
||||||
|
import { renderRich } from '../../lib/site-content';
|
||||||
import type { Locale } from '../../lib/locale';
|
import type { Locale } from '../../lib/locale';
|
||||||
|
|
||||||
// /en/ 侧由 T4 薄页传 locale='en';zh 路由无人传参,默认 zh 零回归
|
// /en/ 侧由 T4 薄页传 locale='en';zh 路由无人传参,默认 zh 零回归
|
||||||
@@ -14,16 +17,25 @@ const { locale = 'zh' } = Astro.props;
|
|||||||
const moments = (await getCollection('moments')).sort(
|
const moments = (await getCollection('moments')).sort(
|
||||||
(a, b) => b.data.pubDate.getTime() - a.data.pubDate.getTime(),
|
(a, b) => b.data.pubDate.getTime() - a.data.pubDate.getTime(),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// 富文本预渲染(Phase 5h T2):text 走与页面文案同一条管线(markdown → 内容净化 →
|
||||||
|
// class 白名单 → 链接卡片),因此瞬间支持 **加粗**、<span class="c-blue font-kai">、列表与换行。
|
||||||
|
// 预渲染成 map 再进模板:renderRich 是 async,模板里不能 await。
|
||||||
|
// 纯文本老数据零回归:无 markdown 的文本会得到单个 <p>,与旧的 {text} 直出视觉等价。
|
||||||
|
const richText = new Map<string, string>();
|
||||||
|
for (const m of moments) {
|
||||||
|
if (!m.data.text) continue;
|
||||||
|
richText.set(m.id, await renderRich(m.data.text));
|
||||||
|
}
|
||||||
const iso = (d: Date) => d.toISOString();
|
const iso = (d: Date) => d.toISOString();
|
||||||
---
|
---
|
||||||
|
|
||||||
<BaseLayout title={`${t('moments_title', locale)} · wait4x`}>
|
<BaseLayout title={`${t('moments_title', locale)} · wait4x`}>
|
||||||
<h1 class="page-title">{t('moments_title', locale)}</h1>
|
<h1 class="page-title">{t('moments_title', locale)}</h1>
|
||||||
<p class="page-note">{t('moments_note', locale)}</p>
|
<p class="page-note">{t('moments_note', locale)}</p>
|
||||||
<p class="pv-line" aria-label={t('pv_viewed', locale)}>
|
<!-- 整页计数(Phase 5h T4):这是本页唯一的计数点(page 模式);
|
||||||
<span data-artalk-pv data-page-key={locale === 'en' ? '/en/moments/' : '/moments/'}>–</span>
|
每条瞬间卡片底部的徽标是 readonly,读者开评论不会虚增浏览数 -->
|
||||||
{' '}{t('pv_viewed', locale)}
|
<ViewMeta class="mom-page-meta" pageKey={locale === 'en' ? '/en/moments/' : '/moments/'} {locale} variant="chip" />
|
||||||
</p>
|
|
||||||
<ol class="tl">
|
<ol class="tl">
|
||||||
{moments.map((m) => (
|
{moments.map((m) => (
|
||||||
<li class="tl-item">
|
<li class="tl-item">
|
||||||
@@ -46,12 +58,13 @@ const iso = (d: Date) => d.toISOString();
|
|||||||
/>
|
/>
|
||||||
</figure>
|
</figure>
|
||||||
)}
|
)}
|
||||||
{m.data.text && <p>{m.data.text}</p>}
|
{m.data.text && <div class="mom-text" set:html={richText.get(m.id) ?? ''} />}
|
||||||
{m.data.tags.length > 0 && (
|
{m.data.tags.length > 0 && (
|
||||||
<p class="mom-tags">
|
<p class="mom-tags">
|
||||||
{m.data.tags.map((tag) => <code class="tag">{`#${tag}`}</code>)}
|
{m.data.tags.map((tag) => <code class="tag">{`#${tag}`}</code>)}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
<MomentComments slug={m.id} locale={locale} />
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
@@ -67,25 +80,6 @@ const iso = (d: Date) => d.toISOString();
|
|||||||
</BaseLayout>
|
</BaseLayout>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
// 访问量:与 ArtalkComments 同款独立 POST(双轨 pageKey 分开计数;POST 绕 ESA 缓存)
|
|
||||||
const bumpPv = async () => {
|
|
||||||
const el = document.querySelector('[data-artalk-pv]');
|
|
||||||
if (!el) return;
|
|
||||||
const key = el.dataset.pageKey ?? '';
|
|
||||||
if (!key) return;
|
|
||||||
try {
|
|
||||||
const res = await fetch('/artalk/api/v2/pages/pv', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ page_key: key, site_name: 'wait4x.online' }),
|
|
||||||
});
|
|
||||||
const d = await res.json();
|
|
||||||
el.textContent = String(d.pv ?? '–');
|
|
||||||
} catch {
|
|
||||||
el.textContent = '–';
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// 时间线渐显:html[data-mom-anim] 由 JS 前置标记——无 JS / reduced-motion 时
|
// 时间线渐显:html[data-mom-anim] 由 JS 前置标记——无 JS / reduced-motion 时
|
||||||
// 标记缺席,CSS 初始隐藏规则整体不生效(渐进降级,元素永远可见)
|
// 标记缺席,CSS 初始隐藏规则整体不生效(渐进降级,元素永远可见)
|
||||||
let io: IntersectionObserver | null = null;
|
let io: IntersectionObserver | null = null;
|
||||||
@@ -109,11 +103,9 @@ const iso = (d: Date) => d.toISOString();
|
|||||||
};
|
};
|
||||||
|
|
||||||
document.addEventListener('astro:page-load', () => {
|
document.addEventListener('astro:page-load', () => {
|
||||||
void bumpPv();
|
|
||||||
armAnim();
|
armAnim();
|
||||||
refreshInstallCta();
|
refreshInstallCta();
|
||||||
});
|
});
|
||||||
void bumpPv();
|
|
||||||
armAnim();
|
armAnim();
|
||||||
|
|
||||||
// —— PWA 安装引导:beforeinstallprompt 早在页面加载初期触发,
|
// —— PWA 安装引导:beforeinstallprompt 早在页面加载初期触发,
|
||||||
@@ -173,8 +165,11 @@ const iso = (d: Date) => d.toISOString();
|
|||||||
}
|
}
|
||||||
/* 时间线骨架:左 mono 日期 + 竖线 + --accent 节点 + 右侧内容卡 */
|
/* 时间线骨架:左 mono 日期 + 竖线 + --accent 节点 + 右侧内容卡 */
|
||||||
.tl-item {
|
.tl-item {
|
||||||
|
/* 日期轨宽度集中一处:10 字符 mono 日期(2026-04-29)在 12.5px 下约 75px,
|
||||||
|
原来复用 var(--space-5)=40px 导致在「-」处折成两行(视觉终审 P1) */
|
||||||
|
--tl-rail: 5.4rem;
|
||||||
position: relative;
|
position: relative;
|
||||||
margin: 0 0 var(--space-4) calc(var(--space-5) + var(--space-4));
|
margin: 0 0 var(--space-4) calc(var(--tl-rail) + var(--space-4));
|
||||||
padding-left: var(--space-4);
|
padding-left: var(--space-4);
|
||||||
border-left: 1px solid var(--line);
|
border-left: 1px solid var(--line);
|
||||||
}
|
}
|
||||||
@@ -192,9 +187,10 @@ const iso = (d: Date) => d.toISOString();
|
|||||||
}
|
}
|
||||||
.tl-date {
|
.tl-date {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: calc(-1 * (var(--space-5) + var(--space-4)));
|
left: calc(-1 * (var(--tl-rail) + var(--space-4)));
|
||||||
top: 4px;
|
top: 4px;
|
||||||
width: var(--space-5);
|
width: var(--tl-rail);
|
||||||
|
white-space: nowrap;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
font-family: var(--font-mono);
|
font-family: var(--font-mono);
|
||||||
font-size: 12.5px;
|
font-size: 12.5px;
|
||||||
@@ -208,6 +204,41 @@ const iso = (d: Date) => d.toISOString();
|
|||||||
background: var(--bg-soft);
|
background: var(--bg-soft);
|
||||||
}
|
}
|
||||||
.mom-card > p { font-size: 15px; color: var(--ink-2); }
|
.mom-card > p { font-size: 15px; color: var(--ink-2); }
|
||||||
|
/* 富文本正文(T2):首尾 margin 归零,避免卡片被 <p> 的默认外边距撑开;
|
||||||
|
段间只留半档间距,列表缩进对齐正文基线。基调保持 15px / ink-2。 */
|
||||||
|
.mom-text {
|
||||||
|
font-size: 15px;
|
||||||
|
color: var(--ink-2);
|
||||||
|
line-height: 1.7;
|
||||||
|
}
|
||||||
|
.mom-text :global(> :first-child) { margin-top: 0; }
|
||||||
|
.mom-text :global(> :last-child) { margin-bottom: 0; }
|
||||||
|
.mom-text :global(p) { margin: 0 0 var(--space-1); }
|
||||||
|
.mom-text :global(ul),
|
||||||
|
.mom-text :global(ol) {
|
||||||
|
margin: 0 0 var(--space-1);
|
||||||
|
padding-left: 1.35em;
|
||||||
|
}
|
||||||
|
.mom-text :global(li) { margin: 0; }
|
||||||
|
.mom-text :global(li + li) { margin-top: 2px; }
|
||||||
|
.mom-text :global(blockquote) {
|
||||||
|
margin: var(--space-1) 0;
|
||||||
|
padding-left: var(--space-2);
|
||||||
|
border-left: 2px solid var(--line);
|
||||||
|
color: var(--ink-3);
|
||||||
|
}
|
||||||
|
.mom-text :global(code) {
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 0.92em;
|
||||||
|
background: var(--bg);
|
||||||
|
border-radius: 4px;
|
||||||
|
padding: 1px 5px;
|
||||||
|
}
|
||||||
|
.mom-text :global(a) {
|
||||||
|
color: var(--accent);
|
||||||
|
text-decoration: underline;
|
||||||
|
text-underline-offset: 0.18em;
|
||||||
|
}
|
||||||
.mom-fig {
|
.mom-fig {
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
@@ -270,12 +301,7 @@ const iso = (d: Date) => d.toISOString();
|
|||||||
transition: border-color var(--dur) var(--ease);
|
transition: border-color var(--dur) var(--ease);
|
||||||
}
|
}
|
||||||
.install-btn:hover { border-color: var(--accent); }
|
.install-btn:hover { border-color: var(--accent); }
|
||||||
.pv-line {
|
.mom-page-meta { margin: 0 0 var(--space-4); }
|
||||||
font-family: var(--font-mono);
|
|
||||||
font-size: 12px;
|
|
||||||
color: var(--ink-4);
|
|
||||||
margin: 0 0 var(--space-4);
|
|
||||||
}
|
|
||||||
/* 初始隐藏仅在 JS 标记存在时生效:宁轻勿闹——透明度+8px 上移,进入视口一次性点亮 */
|
/* 初始隐藏仅在 JS 标记存在时生效:宁轻勿闹——透明度+8px 上移,进入视口一次性点亮 */
|
||||||
[data-mom-anim] .tl-item {
|
[data-mom-anim] .tl-item {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
|
|||||||
@@ -123,6 +123,8 @@ const postsSchema = z.object({
|
|||||||
video: z.string().optional(),
|
video: z.string().optional(),
|
||||||
/** 视频封面(可选):同 public/media 下的图片 URL */
|
/** 视频封面(可选):同 public/media 下的图片 URL */
|
||||||
poster: z.string().optional(),
|
poster: z.string().optional(),
|
||||||
|
/** 置顶:列表排序优先(只影响顺序,不改 pubDate/URL/RSS 时间语义) */
|
||||||
|
pinned: z.boolean().optional(),
|
||||||
draft: z.boolean().optional(),
|
draft: z.boolean().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -184,6 +186,18 @@ export const collections = {
|
|||||||
latestPhotos: z.number().int().optional(),
|
latestPhotos: z.number().int().optional(),
|
||||||
/** 首页每轨条数:4-8(越界由访问器夹取,缺省 6) */
|
/** 首页每轨条数:4-8(越界由访问器夹取,缺省 6) */
|
||||||
perTrackLimit: z.number().int().optional(),
|
perTrackLimit: z.number().int().optional(),
|
||||||
|
/** 首页项目墙条数:1-99(缺省 6;越界夹取) */
|
||||||
|
projectsLimit: z.number().int().optional(),
|
||||||
|
/** 首页公告(markdown 富文本,走富文本管线);空 = 不渲染 */
|
||||||
|
announcement: bilingual.optional(),
|
||||||
|
/** 首页轨细分开关:分开关阅读/技术/照片三轨(缺省全开) */
|
||||||
|
postsTracks: z
|
||||||
|
.object({
|
||||||
|
reading: z.boolean().optional(),
|
||||||
|
tech: z.boolean().optional(),
|
||||||
|
photo: z.boolean().optional(),
|
||||||
|
})
|
||||||
|
.optional(),
|
||||||
/** 区块开关:缺省全开 */
|
/** 区块开关:缺省全开 */
|
||||||
sections: z
|
sections: z
|
||||||
.object({
|
.object({
|
||||||
|
|||||||
@@ -112,6 +112,9 @@ const dict = {
|
|||||||
|
|
||||||
// ===== F 车道:访问量小字(Artalk pv,组件内独立计数) =====
|
// ===== F 车道:访问量小字(Artalk pv,组件内独立计数) =====
|
||||||
pv_viewed: { zh: '人看过', en: 'views' },
|
pv_viewed: { zh: '人看过', en: 'views' },
|
||||||
|
pinned_label: { zh: '置顶', en: 'Pinned' },
|
||||||
|
comment_count: { zh: '条评论', en: 'comments' },
|
||||||
|
moment_comments: { zh: '评论', en: 'Comments' },
|
||||||
lb_hint: { zh: '滚轮缩放 · 双击放大 · Esc 关闭', en: 'Wheel to zoom · Double-click · Esc' },
|
lb_hint: { zh: '滚轮缩放 · 双击放大 · Esc 关闭', en: 'Wheel to zoom · Double-click · Esc' },
|
||||||
lb_hint_touch: { zh: '双指缩放 · 双击放大', en: 'Pinch to zoom · Double-tap' },
|
lb_hint_touch: { zh: '双指缩放 · 双击放大', en: 'Pinch to zoom · Double-tap' },
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import { siteFavicon } from '../lib/site-content';
|
|||||||
import SearchDialog from '../components/SearchDialog.astro';
|
import SearchDialog from '../components/SearchDialog.astro';
|
||||||
import BuildInfo from '../components/geek/BuildInfo.astro';
|
import BuildInfo from '../components/geek/BuildInfo.astro';
|
||||||
import { ClientRouter } from 'astro:transitions';
|
import { ClientRouter } from 'astro:transitions';
|
||||||
|
import { themeCss } from '../lib/theme';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
title: string;
|
title: string;
|
||||||
@@ -36,6 +37,7 @@ const withSlash = (p: string) => (p.endsWith('/') ? p : `${p}/`);
|
|||||||
const favicon = await siteFavicon();
|
const favicon = await siteFavicon();
|
||||||
// 自指 canonical(T2):SEO 权重收敛到当前页自身,与 hreflang 组合覆盖双轨
|
// 自指 canonical(T2):SEO 权重收敛到当前页自身,与 hreflang 组合覆盖双轨
|
||||||
const canonicalUrl = new URL(withSlash(rawPath), Astro.site).href;
|
const canonicalUrl = new URL(withSlash(rawPath), Astro.site).href;
|
||||||
|
const themeStyle = await themeCss();
|
||||||
---
|
---
|
||||||
|
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
@@ -100,6 +102,8 @@ const canonicalUrl = new URL(withSlash(rawPath), Astro.site).href;
|
|||||||
<link rel="alternate" hreflang="zh" href={new URL(withSlash(zhPath), Astro.site)} />
|
<link rel="alternate" hreflang="zh" href={new URL(withSlash(zhPath), Astro.site)} />
|
||||||
<link rel="alternate" hreflang="en" href={new URL(withSlash(enPath), Astro.site)} />
|
<link rel="alternate" hreflang="en" href={new URL(withSlash(enPath), Astro.site)} />
|
||||||
<link rel="alternate" hreflang="x-default" href={new URL(withSlash(zhPath), Astro.site)} />
|
<link rel="alternate" hreflang="x-default" href={new URL(withSlash(zhPath), Astro.site)} />
|
||||||
|
<!-- 样式即数据:theme.yaml 白名单旋钮(构建期内联,零运行时;:root:root 靠特异性压 tokens.css) -->
|
||||||
|
<style is:inline set:html={themeStyle}></style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<!-- 背景辉光:跟随鼠标的 ink 色径向渐变(丙灰阶语言,3-4% 透明度;
|
<!-- 背景辉光:跟随鼠标的 ink 色径向渐变(丙灰阶语言,3-4% 透明度;
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
/**
|
||||||
|
* 文章列表排序契约(置顶功能,Phase 5h T1)
|
||||||
|
*
|
||||||
|
* 为什么集中在这里:首页双轨 / 归档折叠 / 书架 / en 归档四处列表各自写
|
||||||
|
* `sort((a,b)=>b.pubDate-a.pubDate)`,加置顶必须四处同步,否则同一篇文章
|
||||||
|
* 在不同页面位置不一致。排序键固定为「置顶优先 → 时间倒序」,时间相等时
|
||||||
|
* 用 id 兜底保证构建确定(同一份内容两次构建产出一致,便于快照比对)。
|
||||||
|
*
|
||||||
|
* 置顶语义:`pinned: true` 只影响列表展示顺序,不改 pubDate、不改 URL、
|
||||||
|
* 不影响 RSS/订阅源的时间语义。
|
||||||
|
*/
|
||||||
|
import type { CollectionEntry } from 'astro:content';
|
||||||
|
|
||||||
|
type SortablePost = { id: string; data: { pubDate: Date; pinned?: boolean } };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 置顶优先、其次按发布日期倒序。
|
||||||
|
*
|
||||||
|
* @param posts 任意文章条目数组(不修改入参,返回新数组)
|
||||||
|
* @returns 新数组;`pinned` 为真者在前,其内部与其余条目均按 pubDate 倒序,
|
||||||
|
* 同日按 id 升序保证确定性
|
||||||
|
*/
|
||||||
|
export function sortPosts<T extends SortablePost>(posts: T[]): T[] {
|
||||||
|
return [...posts].sort((a, b) => {
|
||||||
|
const pin = Number(b.data.pinned === true) - Number(a.data.pinned === true);
|
||||||
|
if (pin !== 0) return pin;
|
||||||
|
const dt = b.data.pubDate.getTime() - a.data.pubDate.getTime();
|
||||||
|
if (dt !== 0) return dt;
|
||||||
|
return a.id < b.id ? -1 : a.id > b.id ? 1 : 0;
|
||||||
|
});
|
||||||
|
}
|
||||||
+53
-1
@@ -1,3 +1,5 @@
|
|||||||
|
import { readFileSync } from 'node:fs';
|
||||||
|
import { join } from 'node:path';
|
||||||
// 项目墙数据(极客层 P0):构建时双源拉取 + 仓内缓存兜底
|
// 项目墙数据(极客层 P0):构建时双源拉取 + 仓内缓存兜底
|
||||||
// 双源 = 自家 gitea(数据自控叙事)+ GitHub(社区 star 真值);置顶清单人工维护
|
// 双源 = 自家 gitea(数据自控叙事)+ GitHub(社区 star 真值);置顶清单人工维护
|
||||||
export interface RepoCard {
|
export interface RepoCard {
|
||||||
@@ -28,8 +30,18 @@ export const GITHUB_API = 'https://api.github.com/users/wait4xx/repos?per_page=1
|
|||||||
export const PINNED_DEFAULT: string[] = ['blog'];
|
export const PINNED_DEFAULT: string[] = ['blog'];
|
||||||
|
|
||||||
async function fetchJson(url: string): Promise<RawRepo[]> {
|
async function fetchJson(url: string): Promise<RawRepo[]> {
|
||||||
|
const headers: Record<string, string> = { 'User-Agent': 'wait4x-blog-build' };
|
||||||
|
// GitHub 无鉴权仅 60 次/小时(多次构建就耗尽)→ 有 token 就带上(5000/小时)
|
||||||
|
if (url.includes('api.github.com')) {
|
||||||
|
try {
|
||||||
|
const token = readFileSync(join(process.env.HOME ?? '', 'docker_apps/blog/github-token.txt'), 'utf8').trim();
|
||||||
|
if (token) headers.Authorization = `Bearer ${token}`;
|
||||||
|
} catch {
|
||||||
|
/* token 缺位则匿名(可能被限流,走兜底) */
|
||||||
|
}
|
||||||
|
}
|
||||||
const res = await fetch(url, {
|
const res = await fetch(url, {
|
||||||
headers: { Accept: 'application/json', 'User-Agent': 'wait4x-blog-build' },
|
headers: { ...headers, Accept: 'application/json' },
|
||||||
signal: AbortSignal.timeout(10_000),
|
signal: AbortSignal.timeout(10_000),
|
||||||
});
|
});
|
||||||
if (!res.ok) throw new Error(`${url} -> ${res.status}`);
|
if (!res.ok) throw new Error(`${url} -> ${res.status}`);
|
||||||
@@ -158,3 +170,43 @@ function arrange(
|
|||||||
return b.stars - a.stars;
|
return b.stars - a.stars;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** GitHub 账号统计(followers / public repos):token 缺位或请求失败一律返回 null(调用方隐藏数字) */
|
||||||
|
export interface GithubUserStats {
|
||||||
|
followers: number;
|
||||||
|
publicRepos: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function githubUserStats(
|
||||||
|
login = 'wait4xx',
|
||||||
|
): Promise<GithubUserStats | null> {
|
||||||
|
const { readFileSync } = await import('node:fs');
|
||||||
|
const { join } = await import('node:path');
|
||||||
|
let token: string | null = null;
|
||||||
|
try {
|
||||||
|
token = readFileSync(join(process.env.HOME ?? '', 'docker_apps/blog/github-token.txt'), 'utf8').trim() || null;
|
||||||
|
} catch {
|
||||||
|
token = null;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const res = await fetch(`https://api.github.com/users/${login}`, {
|
||||||
|
headers: {
|
||||||
|
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||||
|
Accept: 'application/vnd.github+json',
|
||||||
|
'User-Agent': 'wait4x-blog-build',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!res.ok) {
|
||||||
|
console.warn(`[profile] GitHub 用户统计获取失败 HTTP ${res.status},相关数字已隐藏`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const data = (await res.json()) as { followers?: number; public_repos?: number };
|
||||||
|
return {
|
||||||
|
followers: Number(data.followers ?? 0),
|
||||||
|
publicRepos: Number(data.public_repos ?? 0),
|
||||||
|
};
|
||||||
|
} catch (err) {
|
||||||
|
console.warn(`[profile] GitHub 用户统计请求异常(${(err as Error).message}),相关数字已隐藏`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,12 @@ export interface Bi {
|
|||||||
|
|
||||||
/** 与仓库现状逐字一致的默认文案:yaml 全空时产物不变(零回归可视验证锚点) */
|
/** 与仓库现状逐字一致的默认文案:yaml 全空时产物不变(零回归可视验证锚点) */
|
||||||
export const SITE_DEFAULTS = {
|
export const SITE_DEFAULTS = {
|
||||||
|
/** 首页项目墙条数(旧 yaml 无此字段时的默认:6 条) */
|
||||||
|
homeProjectsLimit: 6,
|
||||||
|
/** 首页公告(默认空 = 不渲染) */
|
||||||
|
homeAnnouncement: { zh: '', en: '' },
|
||||||
|
/** 首页轨细分(默认全开 = 现状) */
|
||||||
|
homePostsTracks: { reading: true, tech: true, photo: true },
|
||||||
homeTagline: {
|
homeTagline: {
|
||||||
zh: '写作者 · 读者 · 快门按压者,拥抱开源。',
|
zh: '写作者 · 读者 · 快门按压者,拥抱开源。',
|
||||||
en: 'Writer · Reader · Shutter-presser — embracing open source.',
|
en: 'Writer · Reader · Shutter-presser — embracing open source.',
|
||||||
@@ -223,9 +229,21 @@ export interface HomeSections {
|
|||||||
projects: boolean;
|
projects: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface HomeTracks {
|
||||||
|
reading: boolean;
|
||||||
|
tech: boolean;
|
||||||
|
photo: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
export interface HomeConfig {
|
export interface HomeConfig {
|
||||||
/** 副标题 markdown 原文;空串 = 不渲染 */
|
/** 副标题 markdown 原文;空串 = 不渲染 */
|
||||||
subtitle: string;
|
subtitle: string;
|
||||||
|
/** 公告 markdown 原文;空串 = 不渲染 */
|
||||||
|
announcement: string;
|
||||||
|
/** 首页项目墙条数(1-99,缺省 6) */
|
||||||
|
projectsLimit: number;
|
||||||
|
/** 轨细分开关(缺省全开) */
|
||||||
|
postsTracks: HomeTracks;
|
||||||
/** 最新影像张数:0 = 隐藏区块 */
|
/** 最新影像张数:0 = 隐藏区块 */
|
||||||
latestPhotos: number;
|
latestPhotos: number;
|
||||||
/** 每轨文章条数 */
|
/** 每轨文章条数 */
|
||||||
@@ -244,6 +262,13 @@ export async function homeConfig(locale: Locale): Promise<HomeConfig> {
|
|||||||
const d = entry?.data;
|
const d = entry?.data;
|
||||||
return {
|
return {
|
||||||
subtitle: pickBi(d?.subtitle, { zh: '', en: '' }, locale),
|
subtitle: pickBi(d?.subtitle, { zh: '', en: '' }, locale),
|
||||||
|
announcement: pickBi(d?.announcement, SITE_DEFAULTS.homeAnnouncement, locale),
|
||||||
|
projectsLimit: clampInt(d?.projectsLimit, 1, 99, SITE_DEFAULTS.homeProjectsLimit),
|
||||||
|
postsTracks: {
|
||||||
|
reading: d?.postsTracks?.reading ?? SITE_DEFAULTS.homePostsTracks.reading,
|
||||||
|
tech: d?.postsTracks?.tech ?? SITE_DEFAULTS.homePostsTracks.tech,
|
||||||
|
photo: d?.postsTracks?.photo ?? SITE_DEFAULTS.homePostsTracks.photo,
|
||||||
|
},
|
||||||
latestPhotos: clampInt(d?.latestPhotos, 0, 6, 4),
|
latestPhotos: clampInt(d?.latestPhotos, 0, 6, 4),
|
||||||
perTrackLimit: clampInt(d?.perTrackLimit, 4, 8, 6),
|
perTrackLimit: clampInt(d?.perTrackLimit, 4, 8, 6),
|
||||||
sections: {
|
sections: {
|
||||||
|
|||||||
@@ -0,0 +1,143 @@
|
|||||||
|
/**
|
||||||
|
* 样式即数据(层 4):把 content/site/theme.yaml 的白名单旋钮编译成 CSS 变量注入串。
|
||||||
|
*
|
||||||
|
* 三条红线(docs/research/10 方案 §3.6):
|
||||||
|
* ① 只认 9 组白名单旋钮;--measure / 断点 / 纸墨 / code 配色一律不可配(牵动版面结构与分轨身份)。
|
||||||
|
* ② 注入用 `:root:root{…}`(0,2,0)与 `[data-theme="dark"]:root:root{…}`(0,3,0)——
|
||||||
|
* 必须靠特异性压过 tokens.css 的 `:root`(0,1,0),**不能靠 DOM 顺序**(link 与内联 style 的相对次序不可控)。
|
||||||
|
* ③ 值全部钳制 + 单调性校验:越界只回落默认,绝不让构建失败(主题配错不该炸站)。
|
||||||
|
*
|
||||||
|
* 构建期静态:BaseLayout 直接把返回串内联进 <style>,运行时零 JS、零请求。
|
||||||
|
*/
|
||||||
|
import { getEntry } from 'astro:content';
|
||||||
|
|
||||||
|
/** 与 tokens.css 完全一致的默认值(零配置 = 现状) */
|
||||||
|
const DEFAULTS = {
|
||||||
|
accentLight: '#3454d1',
|
||||||
|
accentDark: '#8ea2ff',
|
||||||
|
radiusImg: 10,
|
||||||
|
textH1: 27,
|
||||||
|
textH2: 22,
|
||||||
|
textH3: 19,
|
||||||
|
proseReading: 20,
|
||||||
|
proseTech: 19,
|
||||||
|
leadingReading: 1.75,
|
||||||
|
leadingTech: 1.7,
|
||||||
|
space3: 16,
|
||||||
|
space4: 24,
|
||||||
|
space5: 40,
|
||||||
|
space6: 64,
|
||||||
|
flowP: 0.9,
|
||||||
|
flowH2Post: 0.6,
|
||||||
|
dur: 350,
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
const clamp = (v: unknown, min: number, max: number, fallback: number): number =>
|
||||||
|
typeof v === 'number' && Number.isFinite(v) ? Math.min(max, Math.max(min, v)) : fallback;
|
||||||
|
|
||||||
|
const isHex = (v: unknown): v is string =>
|
||||||
|
typeof v === 'string' && /^#[0-9a-fA-F]{6}$/.test(v.trim());
|
||||||
|
|
||||||
|
export interface Theme {
|
||||||
|
accentLight: string;
|
||||||
|
accentDark: string;
|
||||||
|
radiusImg: number;
|
||||||
|
textH1: number;
|
||||||
|
textH2: number;
|
||||||
|
textH3: number;
|
||||||
|
proseReading: number;
|
||||||
|
proseTech: number;
|
||||||
|
leadingReading: number;
|
||||||
|
leadingTech: number;
|
||||||
|
space3: number;
|
||||||
|
space4: number;
|
||||||
|
space5: number;
|
||||||
|
space6: number;
|
||||||
|
flowP: number;
|
||||||
|
flowH2Post: number;
|
||||||
|
dur: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 读 theme 单例并做钳制/单调校验(任一约束不满足即整组回落默认) */
|
||||||
|
export async function getTheme(): Promise<Theme> {
|
||||||
|
const entry = await getEntry('siteTheme', 'theme');
|
||||||
|
const d = (entry?.data ?? {}) as Record<string, unknown>;
|
||||||
|
const num = (k: string) => (typeof d[k] === 'number' ? (d[k] as number) : undefined);
|
||||||
|
|
||||||
|
// 标题三级必须单调递减,否则整组回落(避免 h2 比 h1 大的畸形版式)
|
||||||
|
let textH1 = clamp(num('text_h1'), 22, 32, DEFAULTS.textH1);
|
||||||
|
let textH2 = clamp(num('text_h2'), 22, 32, DEFAULTS.textH2);
|
||||||
|
let textH3 = clamp(num('text_h3'), 16, 32, DEFAULTS.textH3);
|
||||||
|
if (!(textH1 > textH2 && textH2 > textH3)) {
|
||||||
|
textH1 = DEFAULTS.textH1;
|
||||||
|
textH2 = DEFAULTS.textH2;
|
||||||
|
textH3 = DEFAULTS.textH3;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 间距梯度必须严格递增,否则整组回落
|
||||||
|
let space3 = clamp(num('space_3'), 8, 80, DEFAULTS.space3);
|
||||||
|
let space4 = clamp(num('space_4'), 8, 80, DEFAULTS.space4);
|
||||||
|
let space5 = clamp(num('space_5'), 8, 80, DEFAULTS.space5);
|
||||||
|
let space6 = clamp(num('space_6'), 8, 80, DEFAULTS.space6);
|
||||||
|
if (!(space3 < space4 && space4 < space5 && space5 < space6)) {
|
||||||
|
space3 = DEFAULTS.space3;
|
||||||
|
space4 = DEFAULTS.space4;
|
||||||
|
space5 = DEFAULTS.space5;
|
||||||
|
space6 = DEFAULTS.space6;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
accentLight: isHex(d.accent_light) ? d.accent_light.trim() : DEFAULTS.accentLight,
|
||||||
|
accentDark: isHex(d.accent_dark) ? d.accent_dark.trim() : DEFAULTS.accentDark,
|
||||||
|
radiusImg: clamp(num('radius_img'), 4, 16, DEFAULTS.radiusImg),
|
||||||
|
textH1,
|
||||||
|
textH2,
|
||||||
|
textH3,
|
||||||
|
proseReading: clamp(num('prose_size_reading'), 16, 22, DEFAULTS.proseReading),
|
||||||
|
proseTech: clamp(num('prose_size_tech'), 16, 22, DEFAULTS.proseTech),
|
||||||
|
leadingReading: clamp(num('leading_reading'), 1.5, 2.0, DEFAULTS.leadingReading),
|
||||||
|
leadingTech: clamp(num('leading_tech'), 1.5, 2.0, DEFAULTS.leadingTech),
|
||||||
|
space3,
|
||||||
|
space4,
|
||||||
|
space5,
|
||||||
|
space6,
|
||||||
|
flowP: clamp(num('flow_p'), 0, 2, DEFAULTS.flowP),
|
||||||
|
flowH2Post: clamp(num('flow_h2_post'), 0, 2, DEFAULTS.flowH2Post),
|
||||||
|
dur: clamp(num('dur'), 150, 600, DEFAULTS.dur),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 亮态变量块(不含 accent,accent 分态) */
|
||||||
|
function lightVars(t: Theme): string {
|
||||||
|
return [
|
||||||
|
`--accent:${t.accentLight}`,
|
||||||
|
`--radius-img:${t.radiusImg}px`,
|
||||||
|
`--text-h1:${t.textH1}px`,
|
||||||
|
`--text-h2:${t.textH2}px`,
|
||||||
|
`--text-h3:${t.textH3}px`,
|
||||||
|
`--prose-size-reading:${t.proseReading}px`,
|
||||||
|
`--prose-size-tech:${t.proseTech}px`,
|
||||||
|
`--leading-reading:${t.leadingReading}`,
|
||||||
|
`--leading-tech:${t.leadingTech}`,
|
||||||
|
`--space-3:${t.space3}px`,
|
||||||
|
`--space-4:${t.space4}px`,
|
||||||
|
`--space-5:${t.space5}px`,
|
||||||
|
`--space-6:${t.space6}px`,
|
||||||
|
`--flow-p:${t.flowP}em`,
|
||||||
|
`--flow-h2-post:${t.flowH2Post}em`,
|
||||||
|
`--dur:${t.dur}ms`,
|
||||||
|
].join(';');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 生成内联样式串:`:root:root{…}` 压 tokens.css 的 `:root`(0,1,0),
|
||||||
|
* `[data-theme="dark"]:root:root{…}` 压其暗态覆盖——不依赖注入顺序。
|
||||||
|
*/
|
||||||
|
export function themeVarsCss(t: Theme): string {
|
||||||
|
return `:root:root{${lightVars(t)}}[data-theme="dark"]:root:root{--accent:${t.accentDark}}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 一次取全(BaseLayout 用):返回内联 CSS 串 */
|
||||||
|
export async function themeCss(): Promise<string> {
|
||||||
|
return themeVarsCss(await getTheme());
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import LinkCardStyles from '../../components/geek/LinkCardStyles.astro';
|
|||||||
import PhotoZoom from '../../components/geek/PhotoZoom.astro';
|
import PhotoZoom from '../../components/geek/PhotoZoom.astro';
|
||||||
import BaseLayout from '../../layouts/BaseLayout.astro';
|
import BaseLayout from '../../layouts/BaseLayout.astro';
|
||||||
import ArtalkComments from '../../components/ArtalkComments.astro';
|
import ArtalkComments from '../../components/ArtalkComments.astro';
|
||||||
|
import ViewMeta from '../../components/geek/ViewMeta.astro';
|
||||||
import { trackOf } from '../../content.config';
|
import { trackOf } from '../../content.config';
|
||||||
|
|
||||||
// URL = /archives/{slug},slug 即文件名,与 Halo 旧结构 1:1(不可改)
|
// URL = /archives/{slug},slug 即文件名,与 Halo 旧结构 1:1(不可改)
|
||||||
@@ -61,6 +62,7 @@ const toc = headings.filter((h) => h.depth === 2 || h.depth === 3);
|
|||||||
<span aria-hidden="true">·</span>
|
<span aria-hidden="true">·</span>
|
||||||
<span>阅读时长 {minutes} 分钟</span>
|
<span>阅读时长 {minutes} 分钟</span>
|
||||||
</p>
|
</p>
|
||||||
|
<ViewMeta pageKey={`/archives/${entry.id}/`} mode="page" variant="inline" />
|
||||||
</header>
|
</header>
|
||||||
<div class="prose-reading">
|
<div class="prose-reading">
|
||||||
<Content />
|
<Content />
|
||||||
@@ -88,6 +90,7 @@ const toc = headings.filter((h) => h.depth === 2 || h.depth === 3);
|
|||||||
<span aria-hidden="true">·</span>
|
<span aria-hidden="true">·</span>
|
||||||
<span>阅读时长 {minutes} 分钟</span>
|
<span>阅读时长 {minutes} 分钟</span>
|
||||||
</p>
|
</p>
|
||||||
|
<ViewMeta pageKey={`/archives/${entry.id}/`} mode="page" variant="inline" />
|
||||||
</header>
|
</header>
|
||||||
<div class="tech-grid">
|
<div class="tech-grid">
|
||||||
<div class="prose-tech">
|
<div class="prose-tech">
|
||||||
@@ -209,6 +212,8 @@ const toc = headings.filter((h) => h.depth === 2 || h.depth === 3);
|
|||||||
margin-top: var(--space-2);
|
margin-top: var(--space-2);
|
||||||
text-wrap: balance;
|
text-wrap: balance;
|
||||||
}
|
}
|
||||||
|
/* 计数徽标(ViewMeta 组件根元素)紧贴 meta 行;scoped 样式够不着子组件内部,需 :global */
|
||||||
|
.post-head :global(.viewmeta) { margin-top: 8px; }
|
||||||
.post-meta {
|
.post-meta {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
@@ -3,9 +3,11 @@
|
|||||||
import { getCollection } from 'astro:content';
|
import { getCollection } from 'astro:content';
|
||||||
import BaseLayout from '../../layouts/BaseLayout.astro';
|
import BaseLayout from '../../layouts/BaseLayout.astro';
|
||||||
import PostList from '../../components/PostList.astro';
|
import PostList from '../../components/PostList.astro';
|
||||||
|
import { sortPosts } from '../../lib/post-order';
|
||||||
|
|
||||||
const posts = (await getCollection('posts', ({ data }) => !data.draft && !data.tags.includes('hidden'))).sort(
|
// 置顶优先 → 时间倒序(sortPosts 契约见 src/lib/post-order.ts)
|
||||||
(a, b) => b.data.pubDate.getTime() - a.data.pubDate.getTime(),
|
const posts = sortPosts(
|
||||||
|
await getCollection('posts', ({ data }) => !data.draft && !data.tags.includes('hidden')),
|
||||||
);
|
);
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import LinkCardStyles from '../../../components/geek/LinkCardStyles.astro';
|
|||||||
import PhotoZoom from '../../../components/geek/PhotoZoom.astro';
|
import PhotoZoom from '../../../components/geek/PhotoZoom.astro';
|
||||||
import BaseLayout from '../../../layouts/BaseLayout.astro';
|
import BaseLayout from '../../../layouts/BaseLayout.astro';
|
||||||
import ArtalkComments from '../../../components/ArtalkComments.astro';
|
import ArtalkComments from '../../../components/ArtalkComments.astro';
|
||||||
|
import ViewMeta from '../../../components/geek/ViewMeta.astro';
|
||||||
import AiTranslatedBadge from '../../../components/AiTranslatedBadge.astro';
|
import AiTranslatedBadge from '../../../components/AiTranslatedBadge.astro';
|
||||||
import { t } from '../../../i18n/ui';
|
import { t } from '../../../i18n/ui';
|
||||||
|
|
||||||
@@ -58,6 +59,7 @@ const minutes = Math.max(1, Math.ceil(words / 220));
|
|||||||
<span aria-hidden="true">·</span>
|
<span aria-hidden="true">·</span>
|
||||||
<span>{minutes} {t('reading_time_min', 'en')}</span>
|
<span>{minutes} {t('reading_time_min', 'en')}</span>
|
||||||
</p>
|
</p>
|
||||||
|
<ViewMeta pageKey={`/archives/${entry.id}/`} locale="en" mode="page" variant="inline" />
|
||||||
</header>
|
</header>
|
||||||
<AiTranslatedBadge />
|
<AiTranslatedBadge />
|
||||||
<div class={isReading ? 'prose-reading' : 'prose-tech'}>
|
<div class={isReading ? 'prose-reading' : 'prose-tech'}>
|
||||||
@@ -85,6 +87,8 @@ const minutes = Math.max(1, Math.ceil(words / 220));
|
|||||||
.post-head { margin-bottom: var(--space-4); }
|
.post-head { margin-bottom: var(--space-4); }
|
||||||
.post-cat { font-family: var(--font-mono); font-size: 12px; color: var(--ink-3); letter-spacing: 0.08em; }
|
.post-cat { font-family: var(--font-mono); font-size: 12px; color: var(--ink-3); letter-spacing: 0.08em; }
|
||||||
.post-title { font-size: var(--text-h1); line-height: var(--leading-heading); color: var(--ink-1); text-wrap: balance; }
|
.post-title { font-size: var(--text-h1); line-height: var(--leading-heading); color: var(--ink-1); text-wrap: balance; }
|
||||||
|
/* 计数徽标紧贴 meta 行(组件根元素在子作用域,需 :global) */
|
||||||
|
.post-head :global(.viewmeta) { margin-top: 8px; }
|
||||||
.post-meta { display: flex; align-items: center; gap: var(--space-2); margin-top: var(--space-2); font-size: 13px; color: var(--ink-3); }
|
.post-meta { display: flex; align-items: center; gap: var(--space-2); margin-top: var(--space-2); font-size: 13px; color: var(--ink-3); }
|
||||||
.emo { display: inline-block; width: 10px; height: 10px; border-radius: 50%; }
|
.emo { display: inline-block; width: 10px; height: 10px; border-radius: 50%; }
|
||||||
.pn { display: flex; flex-direction: column; gap: var(--space-2); margin-top: var(--space-5); }
|
.pn { display: flex; flex-direction: column; gap: var(--space-2); margin-top: var(--space-5); }
|
||||||
|
|||||||
@@ -3,9 +3,10 @@
|
|||||||
import { getCollection } from 'astro:content';
|
import { getCollection } from 'astro:content';
|
||||||
import BaseLayout from '../../../layouts/BaseLayout.astro';
|
import BaseLayout from '../../../layouts/BaseLayout.astro';
|
||||||
import PostList from '../../../components/PostList.astro';
|
import PostList from '../../../components/PostList.astro';
|
||||||
|
import { sortPosts } from '../../../lib/post-order';
|
||||||
|
|
||||||
const posts = (await getCollection('posts', ({ data }) => !data.draft && !data.tags.includes('hidden'))).sort(
|
const posts = sortPosts(
|
||||||
(a, b) => b.data.pubDate.getTime() - a.data.pubDate.getTime(),
|
await getCollection('posts', ({ data }) => !data.draft && !data.tags.includes('hidden')),
|
||||||
);
|
);
|
||||||
const enTitle = Object.fromEntries(
|
const enTitle = Object.fromEntries(
|
||||||
(await getCollection('postsEn')).map((e) => [e.id, e.data.title]),
|
(await getCollection('postsEn')).map((e) => [e.id, e.data.title]),
|
||||||
|
|||||||
+3
-141
@@ -1,143 +1,5 @@
|
|||||||
---
|
---
|
||||||
// /en/ 首页:与 zh 版结构逐区对齐(名片区/文章列表/最新影像/热力图/项目墙)
|
// /en/ 首页薄壳(与 zh 共用 HomePage 组件,仅 locale 不同)
|
||||||
import { Image } from 'astro:assets';
|
import HomePage from '../../components/pages/HomePage.astro';
|
||||||
import { getCollection } from 'astro:content';
|
|
||||||
import BaseLayout from '../../layouts/BaseLayout.astro';
|
|
||||||
import IdCard from '../../components/IdCard.astro';
|
|
||||||
import PostList from '../../components/PostList.astro';
|
|
||||||
import ProjectWall from '../../components/geek/ProjectWall.astro';
|
|
||||||
import Heatmap from '../../components/geek/Heatmap.astro';
|
|
||||||
import { t } from '../../i18n/ui';
|
|
||||||
import { homeConfig, homeTagline, pageTypography, renderMarkdown, renderRich } from '../../lib/site-content';
|
|
||||||
import SocialLinks from '../../components/SocialLinks.astro';
|
|
||||||
|
|
||||||
// 首页可配项(后台主页设置):副标题/影像张数/区块开关/每轨条数,字段级回落
|
|
||||||
const cfg = await homeConfig('en');
|
|
||||||
const subtitleHtml = cfg.subtitle ? await renderMarkdown(cfg.subtitle) : '';
|
|
||||||
const posts = (await getCollection('posts', ({ data }) => !data.draft && !data.tags.includes('hidden'))).sort(
|
|
||||||
(a, b) => b.data.pubDate.getTime() - a.data.pubDate.getTime(),
|
|
||||||
);
|
|
||||||
// 列表标题吃 postsEn 译题(缺译回退 zh,与 /en/archives 同策略)
|
|
||||||
const enTitle = Object.fromEntries(
|
|
||||||
(await getCollection('postsEn')).map((e) => [e.id, e.data.title]),
|
|
||||||
);
|
|
||||||
const photos = (await getCollection('photos')).slice(0, Math.max(1, cfg.latestPhotos));
|
|
||||||
// 身份语与 zh 版同源(content/site/home.yaml 的 en 字段),缺值回落默认
|
|
||||||
const tagline = await homeTagline('en');
|
|
||||||
const taglineHtml = await renderRich(tagline, { inline: true });
|
|
||||||
const typo = await pageTypography('siteHome', 'home');
|
|
||||||
---
|
---
|
||||||
|
<HomePage locale="en" />
|
||||||
<BaseLayout title="wait4x" description="wait4x's blog: reading · code · photography">
|
|
||||||
<div class={typo.className || undefined} style={typo.style || undefined}>
|
|
||||||
<IdCard>
|
|
||||||
<p class="tagline rich" set:html={taglineHtml} />
|
|
||||||
{subtitleHtml && <div class="subtitle" set:html={subtitleHtml} />}
|
|
||||||
<SocialLinks />
|
|
||||||
</IdCard>
|
|
||||||
|
|
||||||
{cfg.sections.tracks && <PostList {posts} locale="en" titleOverrides={enTitle} perTrack={cfg.perTrackLimit} />}
|
|
||||||
|
|
||||||
{cfg.sections.photos && cfg.latestPhotos > 0 && (
|
|
||||||
<section class="latest" aria-label={t('latest_photos', 'en')}>
|
|
||||||
<div class="latest-head">
|
|
||||||
<span class="lab">{t('latest_photos', 'en')}</span>
|
|
||||||
<a class="tap more" href="/en/gallery/">{t('enter_gallery', 'en')}</a>
|
|
||||||
</div>
|
|
||||||
<div class="thumbs">
|
|
||||||
{photos.map((photo) => (
|
|
||||||
<a class="thumb" href="/en/gallery/" aria-label={`Gallery: ${photo.data.title}`}>
|
|
||||||
<Image
|
|
||||||
src={photo.data.image}
|
|
||||||
alt={photo.data.alt ?? photo.data.title}
|
|
||||||
widths={[180, 360]}
|
|
||||||
sizes="(min-width: 820px) 20vw, 42vw"
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{cfg.sections.heatmap && <Heatmap
|
|
||||||
labels={{
|
|
||||||
title: t('heatmap_title', 'en'),
|
|
||||||
summary: t('heatmap_summary', 'en'),
|
|
||||||
less: t('heatmap_less', 'en'),
|
|
||||||
more: t('heatmap_more', 'en'),
|
|
||||||
note: t('heatmap_note', 'en'),
|
|
||||||
}}
|
|
||||||
/>}
|
|
||||||
{cfg.sections.projects && <ProjectWall locale="en" />}
|
|
||||||
</div>
|
|
||||||
</BaseLayout>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.subtitle {
|
|
||||||
font-size: 13.5px;
|
|
||||||
color: var(--ink-4);
|
|
||||||
margin-top: 2px;
|
|
||||||
letter-spacing: 0.01em;
|
|
||||||
}
|
|
||||||
.subtitle :global(p) { margin: 0; }
|
|
||||||
.subtitle :global(a) { color: var(--accent); }
|
|
||||||
.tagline {
|
|
||||||
font-size: 14px;
|
|
||||||
color: var(--ink-3);
|
|
||||||
margin-top: 4px;
|
|
||||||
letter-spacing: 0.01em;
|
|
||||||
}
|
|
||||||
.socials {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-2);
|
|
||||||
margin-top: var(--space-2);
|
|
||||||
}
|
|
||||||
.social {
|
|
||||||
color: var(--ink-3);
|
|
||||||
border-radius: 8px;
|
|
||||||
transition: color var(--dur) var(--ease);
|
|
||||||
}
|
|
||||||
.social:hover { color: var(--accent); }
|
|
||||||
|
|
||||||
.latest { margin-top: var(--space-6); }
|
|
||||||
.latest-head {
|
|
||||||
display: flex;
|
|
||||||
align-items: baseline;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: var(--space-3);
|
|
||||||
}
|
|
||||||
.lab {
|
|
||||||
font-size: 12.5px;
|
|
||||||
color: var(--ink-4);
|
|
||||||
letter-spacing: 0.08em;
|
|
||||||
}
|
|
||||||
.more {
|
|
||||||
font-size: 13px;
|
|
||||||
color: var(--accent);
|
|
||||||
padding-inline: var(--space-2);
|
|
||||||
transition: color var(--dur) var(--ease);
|
|
||||||
}
|
|
||||||
.more:hover { color: var(--ink-1); }
|
|
||||||
.thumbs {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(2, 1fr);
|
|
||||||
gap: var(--space-2);
|
|
||||||
margin-top: var(--space-3);
|
|
||||||
}
|
|
||||||
.thumb {
|
|
||||||
aspect-ratio: 1;
|
|
||||||
border-radius: 8px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.thumb :global(img) {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
object-fit: cover;
|
|
||||||
transition: transform var(--dur) var(--ease);
|
|
||||||
}
|
|
||||||
.thumb:hover :global(img) { transform: scale(1.03); }
|
|
||||||
@media (min-width: 820px) {
|
|
||||||
.thumbs { grid-template-columns: repeat(4, 1fr); }
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -2,25 +2,23 @@
|
|||||||
import ProjectWall from '../../components/geek/ProjectWall.astro';
|
import ProjectWall from '../../components/geek/ProjectWall.astro';
|
||||||
import Heatmap from '../../components/geek/Heatmap.astro';
|
import Heatmap from '../../components/geek/Heatmap.astro';
|
||||||
import BaseLayout from '../../layouts/BaseLayout.astro';
|
import BaseLayout from '../../layouts/BaseLayout.astro';
|
||||||
|
import GithubProfile from '../../components/geek/GithubProfile.astro';
|
||||||
import { t } from '../../i18n/ui';
|
import { t } from '../../i18n/ui';
|
||||||
import { githubReadmeMarkdown, openSourceCopy, openSourceOptions, pageTypography, renderMarkdown, renderRich } from '../../lib/site-content';
|
import { githubReadmeMarkdown, openSourceCopy, openSourceOptions, pageTypography, renderMarkdown } from '../../lib/site-content';
|
||||||
|
|
||||||
const copy = await openSourceCopy('en');
|
const copy = await openSourceCopy('en');
|
||||||
const options = await openSourceOptions();
|
const options = await openSourceOptions();
|
||||||
const readmeMd = options.introFrom === 'github-readme' ? await githubReadmeMarkdown() : null;
|
const readmeMd = options.introFrom === 'github-readme' ? await githubReadmeMarkdown() : null;
|
||||||
const readmeHtml = readmeMd ? await renderMarkdown(readmeMd) : null;
|
const readmeHtml = readmeMd ? await renderMarkdown(readmeMd) : null;
|
||||||
const blurbHtml = await renderRich(copy.blurb, { inline: true });
|
|
||||||
const blurbAfterHtml = await renderRich(copy.blurbAfter, { inline: true });
|
|
||||||
const typo = await pageTypography('siteOpenSource', 'opensource');
|
const typo = await pageTypography('siteOpenSource', 'opensource');
|
||||||
---
|
---
|
||||||
<BaseLayout title="Open Source · wait4x" description="My open-source activity: repos, contributions, and this site's source">
|
<BaseLayout title="Open Source · wait4x" description="My open-source activity: repos, contributions, and this site's source">
|
||||||
<h1 class="page-title">Open Source</h1>
|
<h1 class="page-title">Open Source</h1>
|
||||||
<div class={typo.className || undefined} style={typo.style || undefined}>
|
<div class={typo.className || undefined} style={typo.style || undefined}>
|
||||||
{readmeHtml ? (
|
<GithubProfile locale="en" />
|
||||||
<div class="blurb readme-intro" set:html={readmeHtml} />
|
{/* compat path (not recommended): renders the profile README below the card when
|
||||||
) : (
|
intro_from=github-readme. It pulls 7 kinds of third-party images and loses align centering. */}
|
||||||
<p class="blurb rich" set:html={`${blurbHtml}<a class="link" href="${copy.repoUrl}">${copy.repoLabel}</a>${blurbAfterHtml}`} />
|
{readmeHtml && <div class="blurb readme-intro" set:html={readmeHtml} />}
|
||||||
)}
|
|
||||||
<Heatmap labels={{
|
<Heatmap labels={{
|
||||||
title: t('heatmap_title', 'en'), summary: t('heatmap_summary', 'en'),
|
title: t('heatmap_title', 'en'), summary: t('heatmap_summary', 'en'),
|
||||||
less: t('heatmap_less', 'en'), more: t('heatmap_more', 'en'), note: t('heatmap_note', 'en'),
|
less: t('heatmap_less', 'en'), more: t('heatmap_more', 'en'), note: t('heatmap_note', 'en'),
|
||||||
|
|||||||
+3
-165
@@ -1,167 +1,5 @@
|
|||||||
---
|
---
|
||||||
import { Image } from 'astro:assets';
|
// 首页薄壳(逻辑与样式在 src/components/pages/HomePage.astro,zh/en 共用)
|
||||||
import { getCollection } from 'astro:content';
|
import HomePage from '../components/pages/HomePage.astro';
|
||||||
import BaseLayout from '../layouts/BaseLayout.astro';
|
|
||||||
import IdCard from '../components/IdCard.astro';
|
|
||||||
import PostList from '../components/PostList.astro';
|
|
||||||
import ProjectWall from '../components/geek/ProjectWall.astro';
|
|
||||||
import Heatmap from '../components/geek/Heatmap.astro';
|
|
||||||
import { pageTypography, renderRich } from '../lib/site-content';
|
|
||||||
import { fetchHeartbeat, agoZh } from '../lib/heartbeat';
|
|
||||||
import { t } from '../i18n/ui';
|
|
||||||
import { homeConfig, homeTagline, renderMarkdown } from '../lib/site-content';
|
|
||||||
import SocialLinks from '../components/SocialLinks.astro';
|
|
||||||
|
|
||||||
// 首页可配项(后台主页设置):副标题/影像张数/区块开关/每轨条数,字段级回落
|
|
||||||
const cfg = await homeConfig('zh');
|
|
||||||
const subtitleHtml = cfg.subtitle ? await renderMarkdown(cfg.subtitle) : '';
|
|
||||||
const posts = (await getCollection('posts', ({ data }) => !data.draft && !data.tags.includes('hidden'))).sort(
|
|
||||||
(a, b) => b.data.pubDate.getTime() - a.data.pubDate.getTime(),
|
|
||||||
);
|
|
||||||
// 最新影像取集合前 4 张;照片时间序由照片管线(exif 车道)治理,此处只裁切
|
|
||||||
const photos = (await getCollection('photos')).slice(0, Math.max(1, cfg.latestPhotos));
|
|
||||||
const heartbeat = await fetchHeartbeat();
|
|
||||||
// 身份语改由 content/site/home.yaml 供给(后台可改),缺值回落默认文案
|
|
||||||
const tagline = await homeTagline('zh');
|
|
||||||
// 层 1:tagline 走富文本(后台可写 <span class="font-kai c-blue">)
|
|
||||||
const taglineHtml = await renderRich(tagline, { inline: true });
|
|
||||||
const typo = await pageTypography('siteHome', 'home');
|
|
||||||
---
|
---
|
||||||
|
<HomePage locale="zh" />
|
||||||
<BaseLayout title="wait4x">
|
|
||||||
<div class={typo.className || undefined} style={typo.style || undefined}>
|
|
||||||
<IdCard>
|
|
||||||
<p class="tagline rich" set:html={taglineHtml} />
|
|
||||||
{subtitleHtml && <div class="subtitle" set:html={subtitleHtml} />}
|
|
||||||
<SocialLinks />
|
|
||||||
</IdCard>
|
|
||||||
|
|
||||||
{cfg.sections.tracks && <PostList {posts} perTrack={cfg.perTrackLimit} />}
|
|
||||||
|
|
||||||
{cfg.sections.photos && cfg.latestPhotos > 0 && (
|
|
||||||
<section class="latest" aria-label="最新影像">
|
|
||||||
<div class="latest-head">
|
|
||||||
<span class="lab">最新影像</span>
|
|
||||||
<a class="tap more" href="/gallery/">进入图库 →</a>
|
|
||||||
</div>
|
|
||||||
<div class="thumbs">
|
|
||||||
{photos.map((photo, i) => (
|
|
||||||
<a class="thumb" href="/gallery/" aria-label={`查看图库:${photo.data.title}`}>
|
|
||||||
{/* 首两图 eager(Astro Image 默认 lazy 会把 LCP 压到 6s+),首图再拔 fetchpriority */}
|
|
||||||
<Image
|
|
||||||
src={photo.data.image}
|
|
||||||
alt={photo.data.alt ?? photo.data.title}
|
|
||||||
widths={[180, 360]}
|
|
||||||
sizes="(min-width: 820px) 20vw, 42vw"
|
|
||||||
loading={i < 2 ? 'eager' : 'lazy'}
|
|
||||||
fetchpriority={i === 0 ? 'high' : undefined}
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{cfg.sections.heatmap && <Heatmap
|
|
||||||
labels={{
|
|
||||||
title: t('heatmap_title', 'zh'),
|
|
||||||
summary: t('heatmap_summary', 'zh'),
|
|
||||||
less: t('heatmap_less', 'zh'),
|
|
||||||
more: t('heatmap_more', 'zh'),
|
|
||||||
note: t('heatmap_note', 'zh'),
|
|
||||||
}}
|
|
||||||
/>}
|
|
||||||
{cfg.sections.projects && <ProjectWall />}
|
|
||||||
{heartbeat && (
|
|
||||||
<p class="heartbeat" aria-label="最近心跳">
|
|
||||||
<span class="beat-dot" aria-hidden="true"></span>
|
|
||||||
最近心跳:{agoZh(heartbeat.when)} · {heartbeat.msg}
|
|
||||||
</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</BaseLayout>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.subtitle {
|
|
||||||
font-size: 13.5px;
|
|
||||||
color: var(--ink-4);
|
|
||||||
margin-top: 2px;
|
|
||||||
letter-spacing: 0.01em;
|
|
||||||
}
|
|
||||||
.subtitle :global(p) { margin: 0; }
|
|
||||||
.subtitle :global(a) { color: var(--accent); }
|
|
||||||
.tagline {
|
|
||||||
font-size: 14px;
|
|
||||||
color: var(--ink-3);
|
|
||||||
margin-top: 4px;
|
|
||||||
letter-spacing: 0.01em;
|
|
||||||
}
|
|
||||||
.heartbeat {
|
|
||||||
font-family: var(--font-mono);
|
|
||||||
font-size: 12.5px;
|
|
||||||
color: var(--ink-3);
|
|
||||||
margin-top: var(--space-2);
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
.beat-dot {
|
|
||||||
width: 7px; height: 7px; border-radius: 50%;
|
|
||||||
background: var(--ink-2);
|
|
||||||
animation: beat 2.4s ease-in-out infinite;
|
|
||||||
}
|
|
||||||
@keyframes beat { 0%, 100% { opacity: 0.35; } 50% { opacity: 1; } }
|
|
||||||
@media (prefers-reduced-motion: reduce) { .beat-dot { animation: none; } }
|
|
||||||
.socials {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--space-2);
|
|
||||||
margin-top: var(--space-2);
|
|
||||||
}
|
|
||||||
.social {
|
|
||||||
color: var(--ink-3);
|
|
||||||
border-radius: 8px;
|
|
||||||
transition: color var(--dur) var(--ease);
|
|
||||||
}
|
|
||||||
.social:hover { color: var(--accent); }
|
|
||||||
.latest { margin-top: var(--space-6); }
|
|
||||||
.latest-head {
|
|
||||||
display: flex;
|
|
||||||
align-items: baseline;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: var(--space-3);
|
|
||||||
}
|
|
||||||
.lab {
|
|
||||||
font-size: 12.5px;
|
|
||||||
color: var(--ink-4);
|
|
||||||
letter-spacing: 0.08em;
|
|
||||||
}
|
|
||||||
.more {
|
|
||||||
font-size: 13px;
|
|
||||||
color: var(--accent);
|
|
||||||
padding-inline: var(--space-2);
|
|
||||||
transition: color var(--dur) var(--ease);
|
|
||||||
}
|
|
||||||
.more:hover { color: var(--ink-1); }
|
|
||||||
.thumbs {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(2, 1fr);
|
|
||||||
gap: var(--space-2);
|
|
||||||
margin-top: var(--space-3);
|
|
||||||
}
|
|
||||||
.thumb {
|
|
||||||
aspect-ratio: 1;
|
|
||||||
border-radius: 8px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.thumb :global(img) {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
object-fit: cover;
|
|
||||||
transition: transform var(--dur) var(--ease);
|
|
||||||
}
|
|
||||||
.thumb:hover :global(img) { transform: scale(1.03); }
|
|
||||||
@media (min-width: 820px) {
|
|
||||||
.thumbs { grid-template-columns: repeat(4, 1fr); }
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -2,8 +2,9 @@
|
|||||||
import ProjectWall from '../components/geek/ProjectWall.astro';
|
import ProjectWall from '../components/geek/ProjectWall.astro';
|
||||||
import Heatmap from '../components/geek/Heatmap.astro';
|
import Heatmap from '../components/geek/Heatmap.astro';
|
||||||
import BaseLayout from '../layouts/BaseLayout.astro';
|
import BaseLayout from '../layouts/BaseLayout.astro';
|
||||||
|
import GithubProfile from '../components/geek/GithubProfile.astro';
|
||||||
import { t } from '../i18n/ui';
|
import { t } from '../i18n/ui';
|
||||||
import { githubReadmeMarkdown, openSourceCopy, openSourceOptions, pageTypography, renderMarkdown, renderRich } from '../lib/site-content';
|
import { githubReadmeMarkdown, openSourceCopy, openSourceOptions, pageTypography, renderMarkdown } from '../lib/site-content';
|
||||||
|
|
||||||
// 叙述文案 + 置顶名单 + 项目墙选项均改由 content/site/opensource.yaml 供给(后台可改)
|
// 叙述文案 + 置顶名单 + 项目墙选项均改由 content/site/opensource.yaml 供给(后台可改)
|
||||||
const copy = await openSourceCopy('zh');
|
const copy = await openSourceCopy('zh');
|
||||||
@@ -11,19 +12,16 @@ const options = await openSourceOptions();
|
|||||||
// 开篇来源:github-readme → 构建期取 profile 仓 README(缓存 content/.github-readme.md,失败回落 yaml blurb)
|
// 开篇来源:github-readme → 构建期取 profile 仓 README(缓存 content/.github-readme.md,失败回落 yaml blurb)
|
||||||
const readmeMd = options.introFrom === 'github-readme' ? await githubReadmeMarkdown() : null;
|
const readmeMd = options.introFrom === 'github-readme' ? await githubReadmeMarkdown() : null;
|
||||||
const readmeHtml = readmeMd ? await renderMarkdown(readmeMd) : null;
|
const readmeHtml = readmeMd ? await renderMarkdown(readmeMd) : null;
|
||||||
// 层 1:blurb 两段走统一富文本管线(后台可写 <span class="font-kai c-blue">)
|
|
||||||
const blurbHtml = await renderRich(copy.blurb, { inline: true });
|
|
||||||
const blurbAfterHtml = await renderRich(copy.blurbAfter, { inline: true });
|
|
||||||
const typo = await pageTypography('siteOpenSource', 'opensource');
|
const typo = await pageTypography('siteOpenSource', 'opensource');
|
||||||
---
|
---
|
||||||
<BaseLayout title="开源 · wait4x" description="我的开源活动:仓库、贡献与本站源码">
|
<BaseLayout title="开源 · wait4x" description="我的开源活动:仓库、贡献与本站源码">
|
||||||
<h1 class="page-title">开源<span class="count mono">Open Source</span></h1>
|
<h1 class="page-title">开源<span class="count mono">Open Source</span></h1>
|
||||||
<div class={typo.className || undefined} style={typo.style || undefined}>
|
<div class={typo.className || undefined} style={typo.style || undefined}>
|
||||||
{readmeHtml ? (
|
<GithubProfile locale="zh" />
|
||||||
<div class="blurb readme-intro" set:html={readmeHtml} />
|
{/* 兼容通道(不推荐):intro_from=github-readme 时把 profile README 原样渲染在档案卡下方。
|
||||||
) : (
|
它会引入 7 类第三方外链图(shields.io / readme-typing-svg / stats / snake / 访客徽章)并带失效的
|
||||||
<p class="blurb rich" set:html={`${blurbHtml}<a class="link" href="${copy.repoUrl}">${copy.repoLabel}</a>${blurbAfterHtml}`} />
|
align 居中;慢网或被墙时整片空白。默认 off,正常内容由上方原生档案卡 + opensource.yaml 叙述承载。 */}
|
||||||
)}
|
{readmeHtml && <div class="blurb readme-intro" set:html={readmeHtml} />}
|
||||||
<Heatmap labels={{
|
<Heatmap labels={{
|
||||||
title: t('heatmap_title', 'zh'), summary: t('heatmap_summary', 'zh'),
|
title: t('heatmap_title', 'zh'), summary: t('heatmap_summary', 'zh'),
|
||||||
less: t('heatmap_less', 'zh'), more: t('heatmap_more', 'zh'), note: t('heatmap_note', 'zh'),
|
less: t('heatmap_less', 'zh'), more: t('heatmap_more', 'zh'), note: t('heatmap_note', 'zh'),
|
||||||
|
|||||||
@@ -72,12 +72,16 @@
|
|||||||
|
|
||||||
/* ---- 字体三轨 ---- */
|
/* ---- 字体三轨 ---- */
|
||||||
/* 书评正文:思源宋(用户对标模板的宋体质感拍板);文楷降级为金句点缀 */
|
/* 书评正文:思源宋(用户对标模板的宋体质感拍板);文楷降级为金句点缀 */
|
||||||
|
/* 链尾 emoji 回退(视觉终审 2026-11-02):用户正文里的 emoji 若字体栈无覆盖会落
|
||||||
|
豆腐块(无彩色 emoji 字体的构建机/精简系统实测出黑方块) */
|
||||||
--font-serif: "Noto Serif SC Variable", "Noto Serif SC", Georgia, "Songti SC", STSong,
|
--font-serif: "Noto Serif SC Variable", "Noto Serif SC", Georgia, "Songti SC", STSong,
|
||||||
"Noto Serif CJK SC", "Source Han Serif SC", SimSun, serif;
|
"Noto Serif CJK SC", "Source Han Serif SC", SimSun,
|
||||||
|
"Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Noto Emoji", serif;
|
||||||
--font-kai: "LXGW WenKai Screen", "Songti SC", serif;
|
--font-kai: "LXGW WenKai Screen", "Songti SC", serif;
|
||||||
/* UI / 技术文:思源黑 */
|
/* UI / 技术文:思源黑 */
|
||||||
--font-sans: "Noto Sans SC Variable", "Noto Sans SC", system-ui, -apple-system, "PingFang SC",
|
--font-sans: "Noto Sans SC Variable", "Noto Sans SC", system-ui, -apple-system, "PingFang SC",
|
||||||
"Hiragino Sans GB", "Microsoft YaHei", sans-serif;
|
"Hiragino Sans GB", "Microsoft YaHei",
|
||||||
|
"Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Noto Emoji", sans-serif;
|
||||||
/* 代码 */
|
/* 代码 */
|
||||||
--font-mono: "JetBrains Mono", ui-monospace, Consolas, "Courier New", monospace;
|
--font-mono: "JetBrains Mono", ui-monospace, Consolas, "Courier New", monospace;
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,28 @@ ok('首页加载', (await page.title()).includes('wait4x'));
|
|||||||
ok('热力图渲染', await page.locator('.hm-grid').count() > 0);
|
ok('热力图渲染', await page.locator('.hm-grid').count() > 0);
|
||||||
ok('项目墙渲染', await page.locator('.project-wall, .repo').count() > 0);
|
ok('项目墙渲染', await page.locator('.project-wall, .repo').count() > 0);
|
||||||
|
|
||||||
|
// 0) Phase 5h:置顶 / 计数徽标 / 瞬间富文本与逐条评论 / 块式关于页
|
||||||
|
await page.goto(BASE + '/archives/', { waitUntil: 'networkidle' });
|
||||||
|
const firstArchive = await page.locator('.post-list a.row').first().getAttribute('href');
|
||||||
|
ok('5h·置顶排在归档首位', (firstArchive ?? '').includes('/archives/writing-template/'), firstArchive ?? 'none');
|
||||||
|
ok('5h·置顶徽标可见', (await page.locator('.pin').count()) > 0);
|
||||||
|
|
||||||
|
await page.goto(BASE + '/archives/writing-template/', { waitUntil: 'networkidle' });
|
||||||
|
ok('5h·文章页计数组件挂载', (await page.locator('[data-viewmeta]').count()) >= 2, `count=${await page.locator('[data-viewmeta]').count()}`);
|
||||||
|
ok('5h·模板彩色强调生效', (await page.locator('.prose-tech .c-blue').count()) > 0);
|
||||||
|
ok('5h·模板折叠块渲染', (await page.locator('.prose-tech details').count()) > 0);
|
||||||
|
|
||||||
|
await page.goto(BASE + '/moments/', { waitUntil: 'networkidle' });
|
||||||
|
ok('5h·瞬间带逐条评论区', (await page.locator('details[data-mom-comments]').count()) > 0);
|
||||||
|
ok('5h·瞬间卡片带只读计数', (await page.locator('.mom-card [data-viewmeta]').count()) > 0);
|
||||||
|
await page.locator('details[data-mom-comments]').first().locator('summary').click();
|
||||||
|
await page.waitForTimeout(400);
|
||||||
|
// 计数徽标是 details 的兄弟(ViewMeta 根节点为 <p>,塞进 <summary> 属非法嵌套)
|
||||||
|
ok('5h·瞬间计数为只读模式', (await page.locator('.mom-cm-meta [data-viewmeta]').first().getAttribute('data-mode')) === 'readonly');
|
||||||
|
|
||||||
|
await page.goto(BASE + '/about/', { waitUntil: 'networkidle' });
|
||||||
|
ok('5h·关于页由块驱动', (await page.locator('[data-block]').count()) > 0, `blocks=${await page.locator('[data-block]').count()}`);
|
||||||
|
|
||||||
// 1) 明暗切换:按钮 + 状态持久 + t 键
|
// 1) 明暗切换:按钮 + 状态持久 + t 键
|
||||||
const before = await page.getAttribute('html', 'data-theme');
|
const before = await page.getAttribute('html', 'data-theme');
|
||||||
await page.click('[data-theme-toggle]');
|
await page.click('[data-theme-toggle]');
|
||||||
|
|||||||
Reference in new issue
Block a user