Merge pull request #41 from SilverRainZ/friendly-index

Friendly index page

Author: SilverRainZ

Makefile

@@ -40,9 +40,9 @@ clean:
 fast: Makefile
 	@$(SPHINXBUILD) -b $@html -c "$(CONFIGDIR)" "$(SOURCEDIR)" "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
 
-# Snippet builder: https://sphinx.silverrainz.me/snippet/, for shell completion.
+# Picker builder: https://sphinx.silverrainz.me/picker/, for shell completion.
 .PHONY: snip
-snip: snippet
+pick: picker
 
 ################################################################################
 # View Helpers

conf.py

@@ -154,9 +154,7 @@
 html_css_files.append(f'{html_theme}-custom.css')
 
 # Setup announcement as your need
-html_theme_options['announcement'] = '2025 年底翻新计划进行中，' \
-'详见 <a href="https://github.com/SilverRainZ/silverrainz.github.io/issues/34">' \
-'#34</a>'
+html_theme_options['announcement'] = ''
 
 if _D.is_mirror():
     if not _D.is_private():
@@ -259,9 +257,8 @@
     gtagjs_ids = ['G-FYHS50G6DL']
 
 if _D is _D.Local:
-    extensions.append('sphinxnotes.snippet')
-    snippetconfig = {}
-    snippet_patterns = {
+    extensions.append('sphinxnotes.picker')
+    picker_patterns = {
         'd': ['.*'],
         's': ['notes/.*', 'jour/.*', 'collections/.*', 'about/.*', 'p/.*', 'in/.*'],
         'c': ['p/.*', 'notes/man/.*'],

confs/fetch_artwork.py

@@ -5,7 +5,7 @@
 from sphinx.application import Sphinx
 from sphinx.environment import BuildEnvironment
 from sphinx.util import logging
-from sphinxnotes.data.render.template import _JinjaEnv
+from sphinxnotes.render.template import _JinjaEnv
 
 from .deploy import Deployment
 

confs/redirect.yml

@@ -14,3 +14,7 @@ notes/music-making/linux-recording: /p/linux-recording.html
 about/resume: /resume/index.html # external links to https://github.com/SilverRainZ/resume
 about/swan: /about/people.html#Swan
 notes/zxsys/way-to-artist/find-yourself2: /in/inbox/be-fall-in-love.html
+notes/artstory/artistory/index: /p/artistory/index.html
+collections/github-halloween: /p/github-halloween.html
+collections/devices/instruments: /p/instruments.html
+collections/scores/index: /p/lyscores/index.html

confs/schemas.py

@@ -62,7 +62,7 @@
             'name': 'lines of str, required, ref',
             'attrs': {
                 'movement': 'words of str, ref',
-                'gallery': 'words of str, ref',
+                'gallery': 'words of str', # deprecated
                 'enwiki': 'str',
                 'zhwiki': 'str',
                 'artwork': 'words of str',
@@ -74,19 +74,6 @@
             'header': '{{ name[0] }}',
         },
     },
-    'gallery': {
-        'schema': {
-            'name': 'lines of str, required, uniq, ref',
-            'attrs': {
-                'website': 'str',
-            },
-        },
-        'templates': {
-            'obj': open('confs/templates/gallery.rst', 'r').read(),
-            'ref': '🖼️{{ name[0] }}',
-            'header': '{{ name[0] }}',
-        },
-    },
     'event': {
         'schema': {
             'name': 'str, required, ref',
@@ -130,7 +117,7 @@
         'templates': {
             'obj': open('confs/templates/term.rst', 'r').read(),
             'ref': '#️⃣{{ name[0] }}',
-            'ref': '#️⃣{{ name[0] }}',
+            'header': '{{ name[0] }}',
         },
     },
     'jour': {

confs/templates/artist.rst

@@ -1,5 +1,4 @@
 {% if movement %}:艺术运动: {% for m in movement %}:artist.movement:`{{ m }} <{{ m }}>` {% endfor %}{% endif %}
-{% if gallery %}:画廊: {% for g in gallery %}:gallery:`{{ g }}` {% endfor %}{% endif %}
 {% if enwiki %}:维基: :enwiki:`{{ enwiki }}`{% endif %}
 {% if zhwiki %}:维基: :zhwiki:`{{ zhwiki }}`{% endif %}
 {% if artwork %}:知名作品: {% for a in artwork %} :search:`🎨{{ a }} <{{ name }} {{ a }}>` {% endfor %}{% endif %}

confs/templates/gallery.rst

@@ -1,5 +1,6 @@
 :orphan:
 :nosearch:
+:layout: 404
 
 ==========
 本来无一物

src/404.rst

@@ -19,7 +19,7 @@ SilverRainZ
 I am...
 
 :a programmer: I am SilverRainZ__ on GitHub, checkout my resume__ if you are interested
-:an artist on the road: my :ref:`works <any-artwork.id+by-hyphen>` are listed here, todo: portfolio
+:an artist on the road: my :doc:`works </gallery>` are listed here, todo: portfolio
 :a |linux| user: also a member of `Arch Linux CN Community`__
 :an |oss| author: I created `Srain IRC Client`__, `Sphinx Notes`__ and `more...`__
 
@@ -32,18 +32,8 @@ __ https://github.com/SilverRainZ?tab=repositories&q=&type=source&language=&sort
 
 .. |linux| replace:: :abbr:`Linux (I use Arch, btw)` 
 .. |oss| replace:: :abbr:`OSS (Open Source Software)` 
-.. |love| replace:: :abbr:`love (❤️)` 
 
-I am passionate about (in no particular order):
-
-- creating interesting images (in other words: painting)
-- programming (what a typical programmer!)
-- building `structured note taking system`__, which is the website you're visiting now (+2!)
-- building self-hosted services (+3!)
-- saving money (what a typical Chinese!)
-- :people:`Swan`, a lovely girl
-
-__ https://github.com/SilverRainZ/bullet
+.. _contact-me:
 
 Contact
 -------

src/about/me.rst

@@ -15,132 +15,164 @@
 Sphinx + Sphinx Notes
 =====================
 
-本站由 Sphinx |sphinx-badge| + Sphinx Notes |sphinx-notes-badge| 强力驱动。
+本站由 Sphinx__ |sphinx-badge| + `Sphinx Notes`__ |sphinx-notes-badge| 强力驱动，
+源码托管于 :ghrepo:`SilverRainZ/bullet`。
 
 .. |sphinx-badge| image:: /_assets/sphinx.webp
    :target: https://www.sphinx-doc.org
-   :height: 4em
+   :height: 2em
 
 .. |sphinx-notes-badge| image:: /_assets/sphinxnotes.webp
-   :target: https://github.com/sphinx-notes/
-   :height: 4em
+   :target: https://sphinx.silverrainz.me/
+   :height: 2em
+
+__ https://www.sphinx-doc.org
+__ https://sphinx.silverrainz.me/
 
 变更记录
 ========
 
 .. container:: timeline
 
-   .. card:: 2025-10
+   .. card:: :octicon:`calendar` 2026-02
+      :width: 50%
+      :margin: 0 2 auto 0
+      :class-card: surface
+
+      得益于 :pypi:`sphinxnotes-render` 的完成，现在 :pypi:`sphinxnotes-any`
+      支持 ``.. xxx+embed::`` 来嵌入一个对象了。
+
+      以此为契机，更新了首页，分为：画廊、博客、笔记 三个大类。
+
+      .. seealso:: `2025 TODOs`__ 终于完成了……
+
+         __ https://github.com/SilverRainZ/silverrainz.github.io/issues/34
+
+   .. card:: :octicon:`calendar` 2025-10
       :width: 50%
       :margin: 0 2 0 auto
+      :class-card: surface
 
       换上了 :ghuser:`lepture` 的主题 `Shibuya <https://shibuya.lepture.com/>`_，看上去现代了很多。
       但不支持我现在用的 :pypi:`ABlog`，花了一些时间做了点适配工作：
       `sunpy/ablog#310 <https://github.com/sunpy/ablog/issues/310>`_
 
-   .. card:: 2025-07
+   .. card:: :octicon:`calendar` 2025-07
       :width: 50%
       :margin: 0 2 auto 0
+      :class-card: surface
 
       所有二进制内容（图片、PDF、演示文稿）从仓库里移除（尚未 ``git filter-repo``），
       放到单独的私有仓库中。
 
       特别地，:doc:`画作 </collections/art-works/index>` 现在通过 latree
       （我的统一文件树）的 artwork 组件，指定 ID 便可获取。
 
-
-
-   .. card:: 2025-06
+   .. card:: :octicon:`calendar` 2025-06
       :width: 50%
       :margin: 0 2 0 auto
+      :class-card: surface
 
       重写 `简历 </resume>`_，新增英文版本。
       因为需要 LaTeX build 所以拆分到单独仓库 :ghrepo:`SilverRainZ/resume`。
 
-   .. card:: 2022-02
+   .. card:: :octicon:`calendar` 2022-02
       :width: 50%
       :margin: 0 2 auto 0
+      :class-card: surface
 
       换了个新主题 :pypi:`sphinx-book-theme`，侧边栏支持固定，兼容 ABlog，移动端体验好多了。
       主题自带 local-toc 支持，因此文档里的 `.. contents::` 指令没用了，写了个扩展 :pypi:`sphinxnotes-mock` 来屏蔽它。
 
-   .. card:: 2021-03
+   .. card:: :octicon:`calendar` 2021-03
       :width: 50%
       :margin: 0 2 0 auto
+      :class-card: surface
 
       - 扩展 :pypi:`sphinxnotes-isso` 投入使用，用了阿哥的腾讯云机器，重新启用 Isso 评论
       - 扩展 :pypi:`sphinxnotes.snippet` 投入使用
 
-   .. card:: 2021-02
+   .. card:: :octicon:`calendar` 2021-02
       :width: 50%
       :margin: 0 2 auto 0
+      :class-card: surface
 
       :del:`为方便国内访问，建立 Gitee 镜像，地址为： https://silverrainz.gitee.io`
 
       .. seealso:: Gitee Pages 因不可抗力潦草下线：`关于GiteePages无法启动和更新的看过来！ · Issue #I9L5FJ · 开源中国/Gitee Feedback - Gitee.com <https://gitee.com/oschina/git-osc/issues/I9L5FJ>`_
 
-   .. card:: 2020-12
+   .. card:: :octicon:`calendar` 2020-12
       :width: 50%
       :margin: 0 2 0 auto
+      :class-card: surface
 
       - 将博客迁移到 Sphinx + ABlog，详见 :doc:`/blog/migrate-to-sphinx`
       - 扩展 :pypi:`sphinxnotes.any` 投入使用
 
-   .. card:: 2020-04
+   .. card:: :octicon:`calendar` 2020-04
       :width: 50%
       :margin: 0 2 auto 0
+      :class-card: surface
 
       评论框维护成本高且各有限制，弃用之，交流请发邮件。
 
-   .. card:: 2017-06
+   .. card:: :octicon:`calendar` 2017-06
       :width: 50%
       :margin: 0 2 0 auto
+      :class-card: surface
 
       多说停止服务，评论系统切换到 Isso，之前的评论数据已迁移。参见文章：:doc:`/blog/switch-from-duoshuo-to-isso`
 
-   .. card:: 2017-04
+   .. card:: :octicon:`calendar` 2017-04
       :width: 50%
       :margin: 0 2 auto 0
+      :class-card: surface
 
       借助 CloudFlare 缓存了 silverrainz.me 和 tech.silverrainz.me，同时启用了 HTTPS。
 
-   .. card:: 2017-03
+   .. card:: :octicon:`calendar` 2017-03
       :width: 50%
       :margin: 0 2 0 auto
+      :class-card: surface
 
       将个人笔记 notes.silverrainz.me 从 Gitbook 迁移到 Sphinx，
       托管于 Read The Docs，参见文章： 用 Sphinx + reStructuredText 构建笔记系统。
 
-   .. card:: 2017-01
+   .. card:: :octicon:`calendar` 2017-01
       :width: 50%
       :margin: 0 2 auto 0
+      :class-card: surface
 
       域名变更为 silverrainz.me，博客地址亦变更为 tech.silverrainz.me，
       域名 lastavengers.me 将于 2017 年 8 月失效。
 
-   .. card:: 2016-08
+   .. card:: :octicon:`calendar` 2016-08
       :width: 50%
       :margin: 0 2 0 auto
+      :class-card: surface
 
       - Markdown 引擎从 Rdiscount 切换到 Kramdown，
       - 启用了域名 lastavengers.me 作为个人主页，博客地址变更为 tech.lastavengers.me
       - 移除了 Project 页
 
-   .. card:: 2015-11 ~ 2016-01
+   .. card:: :octicon:`calendar` 2015-11 ~ 2016-01
       :width: 50%
       :margin: 0 2 auto 0
+      :class-card: surface
 
       博客升级，增加了 Project，About 页面，支持点击浏览大图，加入了 font-awesome。
 
-   .. card:: 2015-03
+   .. card:: :octicon:`calendar` 2015-03
       :width: 50%
       :margin: 0 2 0 auto
+      :class-card: surface
 
       使用 Jekyll 搭建新博客，托管在 Github 上。
 
-   .. card:: 2014-01
+   .. card:: :octicon:`calendar` 2014-01
       :width: 50%
       :margin: 0 2 auto 0
+      :class-card: surface
 
       注册 博客园_ 。