Merge branch 'master' into master

.github/readme-generate.js

@@ -17,6 +17,11 @@ const categories = {
     readme: '',
     mkdocs: '',
   },
+  aquatic: {
+    title: '水产',
+    readme: '',
+    mkdocs: '',
+  },
   breakfast: {
     title: '早餐',
     readme: '',
@@ -56,7 +61,7 @@ const categories = {
 
 let README_TEMPLATE = `# 程序员做饭指南
 
-[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Anduin2017/HowToCook/Continuous%20Integration/master)](https://github.com/Anduin2017/HowToCook/actions/workflows/ci.yml)
+[![build](https://github.com/Anduin2017/HowToCook/actions/workflows/build.yml/badge.svg)](https://github.com/Anduin2017/HowToCook/actions/workflows/build.yml)
 [![License](https://img.shields.io/github/license/Anduin2017/HowToCook)](./LICENSE)
 [![GitHub contributors](https://img.shields.io/github/contributors/Anduin2017/HowToCook)](https://github.com/Anduin2017/HowToCook/graphs/contributors)
 

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Rebuild project
+name: build
 
 on:
   push:
@@ -11,6 +11,8 @@ jobs:
     steps:
       # Preparation.
       - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.PAT }}
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
@@ -25,7 +27,7 @@ jobs:
         with:
           commit_message: '[ci skip] Automatic file changes/fix'
           branch: 'master'
-          file_pattern: ':/*.md'
+          file_pattern: ':/*.*'
           commit_user_name: github-actions[bot]
           commit_user_email: github-actions[bot]@users.noreply.github.com
           commit_author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -1,13 +1,11 @@
 name: Continuous Integration
 
 on:
-  push:
-    branches: [ master ]
   pull_request:
     branches: [ master ]
 
 jobs:
-  markdown:
+  markdown-lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -15,5 +13,7 @@ jobs:
         run: sudo gem install mdl
       - name: Lint markdown files
         run: mdl . -r ~MD036,~MD024,~MD004,~MD029
+      - name: Try build docs
+        uses: jnanadarshan/mkdocs-build-action@v1
         # Suppress 036 Emphasis used instead of a header
         # Suppress 024 Multiple headers with the same content

README.md

@@ -1,6 +1,6 @@
 # 程序员做饭指南
 
-[![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Anduin2017/HowToCook/Continuous%20Integration/master)](https://github.com/Anduin2017/HowToCook/actions/workflows/ci.yml)
+[![build](https://github.com/Anduin2017/HowToCook/actions/workflows/build.yml/badge.svg)](https://github.com/Anduin2017/HowToCook/actions/workflows/build.yml)
 [![License](https://img.shields.io/github/license/Anduin2017/HowToCook)](./LICENSE)
 [![GitHub contributors](https://img.shields.io/github/contributors/Anduin2017/HowToCook)](https://github.com/Anduin2017/HowToCook/graphs/contributors)
 
@@ -58,38 +58,27 @@
 ### 荤菜
 
 - [白菜猪肉炖粉条](./dishes/meat_dish/白菜猪肉炖粉条.md)
-- [白灼虾](./dishes/meat_dish/白灼虾/白灼虾.md)
-- [鳊鱼炖豆腐](./dishes/meat_dish/鳊鱼炖豆腐/鳊鱼炖豆腐.md)
 - [宫保鸡丁](./dishes/meat_dish/宫保鸡丁/宫保鸡丁.md)
 - [咕噜肉](./dishes/meat_dish/咕噜肉.md)
-- [红烧鲤鱼](./dishes/meat_dish/红烧鲤鱼.md)
 - [简易红烧肉](./dishes/meat_dish/红烧肉/简易红烧肉.md)
 - [南派红烧肉](./dishes/meat_dish/红烧肉/南派红烧肉.md)
-- [红烧鱼头](./dishes/meat_dish/红烧鱼头.md)
 - [红烧猪蹄](./dishes/meat_dish/红烧猪蹄/红烧猪蹄.md)
 - [黄瓜炒肉](./dishes/meat_dish/黄瓜炒肉.md)
-- [黄油煎虾](./dishes/meat_dish/黄油煎虾/黄油煎虾.md)
 - [回锅肉](./dishes/meat_dish/回锅肉.md)
-- [烤鱼](./dishes/meat_dish/混合烤鱼/烤鱼.md)
 - [茄子炖土豆](./dishes/meat_dish/茄子炖土豆.md)
 - [尖椒炒牛肉](./dishes/meat_dish/尖椒炒牛肉.md)
 - [姜炒鸡](./dishes/meat_dish/姜炒鸡/姜炒鸡.md)
 - [酱牛肉](./dishes/meat_dish/酱牛肉/酱牛肉.md)
-- [咖喱炒蟹](./dishes/meat_dish/咖喱炒蟹.md)
 - [可乐鸡翅](./dishes/meat_dish/可乐鸡翅.md)
 - [口水鸡](./dishes/meat_dish/口水鸡/口水鸡.md)
 - [辣椒炒肉](./dishes/meat_dish/辣椒炒肉.md)
 - [老式锅包肉](./dishes/meat_dish/老式锅包肉/老式锅包肉.md)
 - [凉拌鸡丝](./dishes/meat_dish/凉拌鸡丝/凉拌鸡丝.md)
 - [萝卜炖羊排](./dishes/meat_dish/萝卜炖羊排.md)
-- [清蒸鲈鱼](./dishes/meat_dish/清蒸鲈鱼/清蒸鲈鱼.md)
-- [清蒸生蚝](./dishes/meat_dish/清蒸生蚝.md)
 - [水煮牛肉](./dishes/meat_dish/水煮牛肉/水煮牛肉.md)
 - [水煮肉片](./dishes/meat_dish/水煮肉片.md)
 - [糖醋里脊](./dishes/meat_dish/糖醋里脊.md)
-- [糖醋鲤鱼](./dishes/meat_dish/糖醋鲤鱼/糖醋鲤鱼.md)
 - [土豆炖排骨](./dishes/meat_dish/土豆炖排骨/土豆炖排骨.md)
-- [微波葱姜黑鳕鱼](./dishes/meat_dish/微波葱姜黑鳕鱼.md)
 - [西红柿牛腩](./dishes/meat_dish/西红柿牛腩/西红柿牛腩.md)
 - [西红柿土豆炖牛肉](./dishes/meat_dish/西红柿土豆炖牛肉/西红柿土豆炖牛肉.md)
 - [香干芹菜炒肉](./dishes/meat_dish/香干芹菜炒肉/香干芹菜炒肉.md)
@@ -104,6 +93,20 @@
 - [鱼香肉丝](./dishes/meat_dish/鱼香肉丝.md)
 - [孜然牛肉](./dishes/meat_dish/孜然牛肉.md)
 
+### 水产
+
+- [白灼虾](./dishes/aquatic/白灼虾/白灼虾.md)
+- [鳊鱼炖豆腐](./dishes/aquatic/鳊鱼炖豆腐/鳊鱼炖豆腐.md)
+- [红烧鲤鱼](./dishes/aquatic/红烧鲤鱼.md)
+- [红烧鱼头](./dishes/aquatic/红烧鱼头.md)
+- [黄油煎虾](./dishes/aquatic/黄油煎虾/黄油煎虾.md)
+- [烤鱼](./dishes/aquatic/混合烤鱼/烤鱼.md)
+- [咖喱炒蟹](./dishes/aquatic/咖喱炒蟹.md)
+- [清蒸鲈鱼](./dishes/aquatic/清蒸鲈鱼/清蒸鲈鱼.md)
+- [清蒸生蚝](./dishes/aquatic/清蒸生蚝.md)
+- [糖醋鲤鱼](./dishes/aquatic/糖醋鲤鱼/糖醋鲤鱼.md)
+- [微波葱姜黑鳕鱼](./dishes/aquatic/微波葱姜黑鳕鱼.md)
+
 ### 早餐
 
 - [茶叶蛋](./dishes/breakfast/茶叶蛋.md)

dishes/meat_dish/洋葱炒猪肉.md

@@ -1,9 +1,6 @@
 # 洋葱炒猪肉的做法
 
-咸中带甜
+咸中带甜，简单上手，一不小心可能让你多吃一碗饭。一般只需 15 分钟即可完成。
-简单上手
-一不小心可能让你多吃一碗饭
-一般只需 15 分钟即可完成
 
 ## 必备原料和工具
 

dishes/staple/日式咖喱饭/日式咖喱饭.md

@@ -53,7 +53,7 @@
 
 ### 3.冷藏后加热
 
-冷藏的咖喱每次取出需要吃的份量，加热后盖在[米饭](../米饭/米饭.md)上。
+冷藏的咖喱每次取出需要吃的份量，加热后盖在[米饭](../米饭/电饭煲蒸米饭.md)上。
 
 - 微波炉：单人份高火 2-3 分钟
 - 锅：需额外加 50ml 水，加热时保持搅拌

dishes/staple/蛋炒饭.md

@@ -14,7 +14,7 @@
 * 香葱
 * 灯影牛肉丝（备选）
 
-准备时，米饭可以参考[米饭的做法](./米饭/米饭.md)。
+准备时，米饭可以参考[米饭的做法](./米饭/电饭煲蒸米饭.md)。
 
 ## 计算
 

dishes/staple/韩式拌饭/韩式拌饭.md

@@ -38,7 +38,7 @@
 - 蔬菜清洗 切丝 放锅中翻炒 食材变软 便可称出
 - 煮水 等沸腾时 焯牛肉卷 只需煮熟 大概三分钟即可捞出
 - 煎[溏心蛋](../../breakfast/溏心蛋.md)
-- 将[米饭](../../staple/米饭/米饭.md)放在一个碗里 然后倒扣在大碗
+- 将[米饭](../../staple/米饭/电饭煲蒸米饭.md)放在一个碗里 然后倒扣在大碗
 - 将准备好的蔬菜和肉卷依次绕圈放在米饭上面 将煎蛋放中间
 - 备酱汁
   - 两勺韩式辣酱（甜辣口）+ 一勺生抽 + 两瓶盖雪碧（减肥的话 可以放无糖雪碧）+ 少许芝麻 + 一勺芝麻油

mkdocs.yml

@@ -112,38 +112,27 @@ nav:
 
       - 荤菜:
           - 白菜猪肉炖粉条: ./dishes/meat_dish/白菜猪肉炖粉条.md
-          - 白灼虾: ./dishes/meat_dish/白灼虾/白灼虾.md
-          - 鳊鱼炖豆腐: ./dishes/meat_dish/鳊鱼炖豆腐/鳊鱼炖豆腐.md
           - 宫保鸡丁: ./dishes/meat_dish/宫保鸡丁/宫保鸡丁.md
           - 咕噜肉: ./dishes/meat_dish/咕噜肉.md
-          - 红烧鲤鱼: ./dishes/meat_dish/红烧鲤鱼.md
           - 简易红烧肉: ./dishes/meat_dish/红烧肉/简易红烧肉.md
           - 南派红烧肉: ./dishes/meat_dish/红烧肉/南派红烧肉.md
-          - 红烧鱼头: ./dishes/meat_dish/红烧鱼头.md
           - 红烧猪蹄: ./dishes/meat_dish/红烧猪蹄/红烧猪蹄.md
           - 黄瓜炒肉: ./dishes/meat_dish/黄瓜炒肉.md
-          - 黄油煎虾: ./dishes/meat_dish/黄油煎虾/黄油煎虾.md
           - 回锅肉: ./dishes/meat_dish/回锅肉.md
-          - 烤鱼: ./dishes/meat_dish/混合烤鱼/烤鱼.md
           - 茄子炖土豆: ./dishes/meat_dish/茄子炖土豆.md
           - 尖椒炒牛肉: ./dishes/meat_dish/尖椒炒牛肉.md
           - 姜炒鸡: ./dishes/meat_dish/姜炒鸡/姜炒鸡.md
           - 酱牛肉: ./dishes/meat_dish/酱牛肉/酱牛肉.md
-          - 咖喱炒蟹: ./dishes/meat_dish/咖喱炒蟹.md
           - 可乐鸡翅: ./dishes/meat_dish/可乐鸡翅.md
           - 口水鸡: ./dishes/meat_dish/口水鸡/口水鸡.md
           - 辣椒炒肉: ./dishes/meat_dish/辣椒炒肉.md
           - 老式锅包肉: ./dishes/meat_dish/老式锅包肉/老式锅包肉.md
           - 凉拌鸡丝: ./dishes/meat_dish/凉拌鸡丝/凉拌鸡丝.md
           - 萝卜炖羊排: ./dishes/meat_dish/萝卜炖羊排.md
-          - 清蒸鲈鱼: ./dishes/meat_dish/清蒸鲈鱼/清蒸鲈鱼.md
-          - 清蒸生蚝: ./dishes/meat_dish/清蒸生蚝.md
           - 水煮牛肉: ./dishes/meat_dish/水煮牛肉/水煮牛肉.md
           - 水煮肉片: ./dishes/meat_dish/水煮肉片.md
           - 糖醋里脊: ./dishes/meat_dish/糖醋里脊.md
-          - 糖醋鲤鱼: ./dishes/meat_dish/糖醋鲤鱼/糖醋鲤鱼.md
           - 土豆炖排骨: ./dishes/meat_dish/土豆炖排骨/土豆炖排骨.md
-          - 微波葱姜黑鳕鱼: ./dishes/meat_dish/微波葱姜黑鳕鱼.md
           - 西红柿牛腩: ./dishes/meat_dish/西红柿牛腩/西红柿牛腩.md
           - 西红柿土豆炖牛肉: ./dishes/meat_dish/西红柿土豆炖牛肉/西红柿土豆炖牛肉.md
           - 香干芹菜炒肉: ./dishes/meat_dish/香干芹菜炒肉/香干芹菜炒肉.md
@@ -158,6 +147,19 @@ nav:
           - 鱼香肉丝: ./dishes/meat_dish/鱼香肉丝.md
           - 孜然牛肉: ./dishes/meat_dish/孜然牛肉.md
 
+      - 水产:
+          - 白灼虾: ./dishes/aquatic/白灼虾/白灼虾.md
+          - 鳊鱼炖豆腐: ./dishes/aquatic/鳊鱼炖豆腐/鳊鱼炖豆腐.md
+          - 红烧鲤鱼: ./dishes/aquatic/红烧鲤鱼.md
+          - 红烧鱼头: ./dishes/aquatic/红烧鱼头.md
+          - 黄油煎虾: ./dishes/aquatic/黄油煎虾/黄油煎虾.md
+          - 烤鱼: ./dishes/aquatic/混合烤鱼/烤鱼.md
+          - 咖喱炒蟹: ./dishes/aquatic/咖喱炒蟹.md
+          - 清蒸鲈鱼: ./dishes/aquatic/清蒸鲈鱼/清蒸鲈鱼.md
+          - 清蒸生蚝: ./dishes/aquatic/清蒸生蚝.md
+          - 糖醋鲤鱼: ./dishes/aquatic/糖醋鲤鱼/糖醋鲤鱼.md
+          - 微波葱姜黑鳕鱼: ./dishes/aquatic/微波葱姜黑鳕鱼.md
+
       - 早餐:
           - 茶叶蛋: ./dishes/breakfast/茶叶蛋.md
           - 鸡蛋三明治: ./dishes/breakfast/鸡蛋三明治.md
@@ -201,6 +203,7 @@ nav:
       - 半成品加工:
           - 懒人蛋挞: ./dishes/semi-finished/懒人蛋挞/懒人蛋挞.md
           - 凉皮: ./dishes/semi-finished/凉皮.md
+          - 薯条: ./dishes/semi-finished/薯条.md
           - 速冻馄饨: ./dishes/semi-finished/速冻馄饨.md
           - 速冻水饺: ./dishes/semi-finished/速冻水饺.md
           - 速冻汤圆: ./dishes/semi-finished/速冻汤圆/速冻汤圆.md

tips/learn/微波炉.md

@@ -22,7 +22,7 @@
 
 中火适用于：
 
-* [烹煮] 海鲜 （例如 [微波葱姜黑鳕鱼](../../dishes/home-cooking/微波葱姜黑鳕鱼.md)）
+* [烹煮] 海鲜 （例如 [微波葱姜黑鳕鱼](../../dishes/aquatic/微波葱姜黑鳕鱼.md)）
 * [烹煮] 软化肉类
 * [脱水] 干燥蔬果皮
 * [脱水] 制作肉干