diff --git a/.gitmodules b/.gitmodules index 68fa7f0..dceab5a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule ".obsidian/plugins/vitepress-exporter"] - path = .obsidian/plugins/vitepress-exporter - url = https://git.omoolab.xyz/icrdr/vitepress-exporter.git +[submodule ".obsidian/plugins/odox"] + path = .obsidian/plugins/odox + url = https://git.omoolab.xyz/icrdr/odox.git \ No newline at end of file diff --git a/.obsidian/plugins/odox b/.obsidian/plugins/odox new file mode 160000 index 0000000..0e051b7 --- /dev/null +++ b/.obsidian/plugins/odox @@ -0,0 +1 @@ +Subproject commit 0e051b7293ec8578d154cc207c22433ef4cd4c1c diff --git a/.obsidian/plugins/vitepress-exporter b/.obsidian/plugins/vitepress-exporter deleted file mode 160000 index e5e7d72..0000000 --- a/.obsidian/plugins/vitepress-exporter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5e7d724c616fcd26674f76c7afefb0d016689ae diff --git a/CLAUDE.md b/CLAUDE.md index b20699a..525ca0c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -9,7 +9,7 @@ - 使用的依赖越少越好 - 选用简单直接的方式实现 - 代码、执行方式改变，调整已有的文档、计划，而非新建 - +- Markdown 中不使用`---`分割器 本地运行 action ```bash diff --git a/deploy.sh b/deploy.sh index 029c5c4..72881a4 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,18 +1,36 @@ #!/bin/bash +# 检查 wiki 目录是否有变更 +CHANGED_FILES=$(git diff --name-only wiki && git ls-files --others --exclude-standard wiki) + +if [ -n "$CHANGED_FILES" ]; then + echo "检测到 wiki 目录有变更，正在提交..." + git add wiki + git commit -m "Update wiki" +else + echo "wiki 目录没有变更，跳过提交" +fi + # 自动获取当前 Git 分支名 BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) +# 获取仓库名称 +REMOTE_URL=$(git remote get-url origin) +REPO_NAME=$(basename -s .git "$REMOTE_URL") + # 拼接 Tag 名称：wiki-分支名 TAG_NAME="wiki-$BRANCH_NAME" echo "当前分支：$BRANCH_NAME" -echo "即将创建 Tag：$TAG_NAME" # 创建本地 Tag -git tag "$TAG_NAME" +git tag -f "$TAG_NAME" # 推送到远程仓库 -git push origin "$TAG_NAME" - -echo -e "\n✅ Tag 创建并推送成功：$TAG_NAME" \ No newline at end of file +if git push origin -f "$TAG_NAME"; then + echo -e "\n✅ $BRANCH_NAME 创建并推送成功，等待部署完毕" + echo -e "\n🌍 部署地址：https://wiki.omoolab.com/$REPO_NAME/$BRANCH_NAME/" +else + echo -e "\n❌ $BRANCH_NAME 推送失败！" + exit 1 +fi \ No newline at end of file diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts deleted file mode 100644 index 2faacce..0000000 --- a/docs/.vitepress/config.mts +++ /dev/null @@ -1,8 +0,0 @@ -import { defineConfig } from 'vitepress' - -// https://vitepress.dev/reference/site-config -export default defineConfig({ - title: "OmooLab", - description: "An OmooLab Project", - base: '/', // Replace with your repository name if deploying to GitHub Pages -}) diff --git a/docs/.vitepress/theme/components/Viewer.vue b/docs/.vitepress/theme/components/Viewer.vue deleted file mode 100644 index 4e81999..0000000 --- a/docs/.vitepress/theme/components/Viewer.vue +++ /dev/null @@ -1,1113 +0,0 @@ - - - - - diff --git a/docs/.vitepress/theme/index.js b/docs/.vitepress/theme/index.js deleted file mode 100644 index 4221058..0000000 --- a/docs/.vitepress/theme/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import DefaultTheme from 'vitepress/theme' -import Viewer from './components/Viewer.vue' - -/** @type {import('vitepress').Theme} */ -export default { - extends: DefaultTheme, - enhanceApp({ app }) { - app.component('Viewer', Viewer) - } -} \ No newline at end of file diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index c64eec3..0000000 --- a/docs/index.md +++ /dev/null @@ -1 +0,0 @@ -# OmooLab Wiki \ No newline at end of file diff --git a/docs/notes/测试导出/index.md b/docs/notes/测试导出/index.md deleted file mode 100644 index 0650ad7..0000000 --- a/docs/notes/测试导出/index.md +++ /dev/null @@ -1,7 +0,0 @@ -# 测试笔记 - Canvas 导出 - -这是一个用于测试 Canvas 导出功能的笔记。 - - - - diff --git a/docs/public/Untitled.png b/docs/public/Untitled.png deleted file mode 100644 index d38b2e8..0000000 --- a/docs/public/Untitled.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90e1a945542bdca8fd995b2de3eb157c2de0ab347f82822ec4d33faa6199328c -size 16047 diff --git a/docs/public/canvas.png b/docs/public/canvas.png deleted file mode 100644 index 55b8d8d..0000000 --- a/docs/public/canvas.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cfcb403f8fc2675fbd5cd8d9ce4ce8f2831b32ca0453131dbdbd992712c9d70 -size 765136 diff --git a/notes/assets/20260421-074743.png b/notes/assets/20260421-074743.png new file mode 100644 index 0000000..d1dbf8d --- /dev/null +++ b/notes/assets/20260421-074743.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42045cdf5c13c544ebd632d1c13dadb9c5992d4e30d4092d19e1c896853b933b +size 27006 diff --git a/notes/assets/Untitled.png b/notes/assets/Untitled.png new file mode 100644 index 0000000..d1458f8 --- /dev/null +++ b/notes/assets/Untitled.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3feb27f63647dcc9bec527a4c237624f2b74f5e600da47d3db3bb63dc4f88121 +size 2517530 diff --git a/notes/canvas.canvas b/notes/canvas.canvas deleted file mode 100644 index c72dc34..0000000 --- a/notes/canvas.canvas +++ /dev/null @@ -1,7 +0,0 @@ -{ - "nodes":[ - {"id":"860c29754b1b08bf","type":"text","text":"sdfasdf\nasdfasdfasdf\n# fsadfs fasdf asdf asdf ","x":8640,"y":-4480,"width":496,"height":293}, - {"id":"ad3484c9e0322d05","type":"text","text":"发色粉撒而非","x":5200,"y":-1840,"width":1920,"height":4946} - ], - "edges":[] -} \ No newline at end of file diff --git a/notes/测试导出.md b/notes/测试导出.md index f68ec8d..ac3aa72 100644 --- a/notes/测试导出.md +++ b/notes/测试导出.md @@ -2,6 +2,6 @@ 这是一个用于测试 Canvas 导出功能的笔记。 -![](Untitled.canvas) +![](测试画板-2.canvas) -![[canvas.canvas]] +![[测试画板-1.canvas]] diff --git a/notes/测试画板-1.canvas b/notes/测试画板-1.canvas new file mode 100644 index 0000000..054340e --- /dev/null +++ b/notes/测试画板-1.canvas @@ -0,0 +1,14 @@ +{ + "nodes":[ + {"id":"b42845a8ff7d51dc","x":6380,"y":-3440,"width":1330,"height":1418,"color":"3","type":"group","label":"Untitled group"}, + {"id":"2780851064da9bdb","type":"file","file":"notes/assets/Untitled.png","x":6580,"y":-3160,"width":460,"height":460}, + {"id":"596415dba7899135","type":"text","text":"发生的方式方式大幅\n\n撒地方士大夫三大发生的f\n\n的萨芬阿斯蒂芬撒地方\n\n\n撒地方撒地方啊色粉啊色粉\n\n啊色粉啊色粉啊色粉","x":7744,"y":-2649,"width":376,"height":313}, + {"id":"860c29754b1b08bf","type":"text","text":"sdfasdf\nasdfasdfasdf\n# fsadfs fasdf asdf asdf ","x":6810,"y":-3310,"width":496,"height":300}, + {"id":"ad3484c9e0322d05","type":"text","text":"发色粉撒而非","x":6360,"y":-2740,"width":500,"height":280}, + {"id":"c494f34282f42d91","type":"file","file":"notes/assets/20260421-074743.png","x":7306,"y":-2938,"width":198,"height":198} + ], + "edges":[ + {"id":"a7a9eb1b8977f036","fromNode":"ad3484c9e0322d05","fromSide":"right","toNode":"c494f34282f42d91","toSide":"left"}, + {"id":"fdb0bd6d9376876f","fromNode":"c494f34282f42d91","fromSide":"right","toNode":"596415dba7899135","toSide":"left"} + ] +} \ No newline at end of file diff --git a/notes/Untitled.canvas b/notes/测试画板-2.canvas similarity index 100% rename from notes/Untitled.canvas rename to notes/测试画板-2.canvas diff --git a/wiki/.vitepress/config.mts b/wiki/.vitepress/config.mts index 2faacce..68becf2 100644 --- a/wiki/.vitepress/config.mts +++ b/wiki/.vitepress/config.mts @@ -5,4 +5,49 @@ export default defineConfig({ title: "OmooLab", description: "An OmooLab Project", base: '/', // Replace with your repository name if deploying to GitHub Pages + themeConfig: { + logo: '/logo.png', + siteTitle: false, + nav: [ + { text: '首页', link: '/' }, + { text: '记录', link: '/notes/' }, + { text: '我们', link: 'https://www.omoolab.xyz' } + ], + sidebar: { + '/': [ + { + text: '导航', + items: [ + { text: '首页', link: '/' }, + { text: '笔记列表', link: '/notes/' }, + { text: '测试笔记', link: '/notes/测试导出/' } + ] + } + ], + '/notes/': [ + { + text: '笔记', + items: [ + { text: '所有笔记', link: '/notes/' }, + { text: '测试笔记', link: '/notes/测试导出/' } + ] + }, + { + text: '画板', + items: [ + { text: '测试画板 1', link: '/notes/测试画板-1.canvas/' }, + { text: '测试画板 2', link: '/notes/测试画板-2.canvas/' } + ] + } + ] + }, + footer: { + message: '浙ICP备2025208399号-1', + copyright: 'Copyright © 2025-present OmooLab' + }, + search: { + provider: 'local' + } + }, + }) diff --git a/wiki/.vitepress/theme/components/Viewer.vue b/wiki/.vitepress/theme/components/Viewer.vue index 12ded17..932a65f 100644 --- a/wiki/.vitepress/theme/components/Viewer.vue +++ b/wiki/.vitepress/theme/components/Viewer.vue @@ -1,10 +1,56 @@