Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/Anduin2017/HowToCook:
  Avoid google font file.
  [ci skip] Automatic file changes/fix
  Add docker support.
  [ci skip] Automatic file changes/fix
  Feat/add pineapple coffee cocktail (Anduin2017#1313)
  • Loading branch information
github-actions[bot] committed Mar 12, 2024
2 parents 72913ff + 1aa9cc2 commit 51c30b4
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/templates/mkdocs_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ edit_uri: ""
use_directory_urls: true
docs_dir: .
theme:
font: false
name: material
language: zh
features:
Expand Down
1 change: 1 addition & 0 deletions .github/templates/readme_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[![GitHub contributors](https://img.shields.io/github/contributors/Anduin2017/HowToCook)](https://github.com/Anduin2017/HowToCook/graphs/contributors)
[![npm](https://img.shields.io/npm/v/how-to-cook)](https://www.npmjs.com/package/how-to-cook)
![Man hours](https://manhours.aiursoft.cn/r/github.com/anduin2017/howtocook.svg)
[![Docker](https://img.shields.io/badge/docker-latest-blue?logo=docker)](https://hub.aiursoft.cn/#!/taglist/anduin/howtocook)

最近在家隔离,出不了门。只能宅在家做饭了。作为程序员,我偶尔在网上找找菜谱和做法。但是这些菜谱往往写法千奇百怪,经常中间莫名出来一些材料。对于习惯了形式语言的程序员来说极其不友好。

Expand Down
8 changes: 8 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
stages:
- deploy

deploy_docker:
stage: deploy
script:
- docker build . -t hub.aiursoft.cn/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:latest
- docker push hub.aiursoft.cn/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:latest
19 changes: 19 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# ============================
# Prepare Node Environment
FROM hub.aiursoft.cn/node:21-alpine as node-env
WORKDIR /app
COPY . .
RUN node ./.github/readme-generate.js

# ============================
# Prepare Build Environment
FROM hub.aiursoft.cn/python:3.11 as python-env
WORKDIR /app
COPY --from=node-env /app .
RUN pip install -r requirements.txt
RUN mkdocs build --strict

# ============================
# Prepare Runtime Environment
FROM hub.aiursoft.cn/aiursoft/static
COPY --from=python-env /app/site /data
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[![GitHub contributors](https://img.shields.io/github/contributors/Anduin2017/HowToCook)](https://github.com/Anduin2017/HowToCook/graphs/contributors)
[![npm](https://img.shields.io/npm/v/how-to-cook)](https://www.npmjs.com/package/how-to-cook)
![Man hours](https://manhours.aiursoft.cn/r/github.com/anduin2017/howtocook.svg)
[![Docker](https://img.shields.io/badge/docker-latest-blue?logo=docker)](https://hub.aiursoft.cn/#!/taglist/anduin/howtocook)

最近在家隔离,出不了门。只能宅在家做饭了。作为程序员,我偶尔在网上找找菜谱和做法。但是这些菜谱往往写法千奇百怪,经常中间莫名出来一些材料。对于习惯了形式语言的程序员来说极其不友好。

Expand Down Expand Up @@ -296,6 +297,7 @@
- [耙耙柑茶](./dishes/drink/耙耙柑茶/耙耙柑茶.md)
- [百香果橙子特调](./dishes/drink/百香果橙子特调/百香果橙子特调.md)
- [冰粉](./dishes/drink/冰粉/冰粉.md)
- [菠萝咖啡特调](./dishes/drink/菠萝咖啡特调/菠萝咖啡特调.md)
- [金菲士](./dishes/drink/金菲士/金菲士.md)
- [金汤力](./dishes/drink/金汤力/金汤力.md)
- [可乐桶](./dishes/drink/可乐桶.md)
Expand Down
48 changes: 48 additions & 0 deletions dishes/drink/菠萝咖啡特调/菠萝咖啡特调.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# 菠萝咖啡特调的做法

![示例菜成品](./菠萝咖啡特调.png)

菠萝咖啡特调是非常适合家庭出品的饮料,酸甜可口。

## 必备原料和工具

- 咖啡液(推荐浓缩或者冷萃)
- 菠萝汁(鲜榨或者 nfc)
- 冰块
- 苏打水
- 奶油
- 牛奶
-
- 海盐(可选)
- 朗姆酒 (可选)

## 计算

每次制作前需要确定计划做几份。一份正好够 1 个人吃。

每份:

- 咖啡液 30ml
- 菠萝汁 60ml
- 冰块 50g
- 苏打水 30ml
- 奶油 30ml
- 牛奶 10ml
- 糖 8g
- 海盐 0.5g
- 朗姆酒 5ml

## 操作

- 杯子里依次加入冰块,咖啡液,菠萝汁和苏打水
- 奶油加糖打发至湿性发泡,加入朗姆酒和牛奶均匀只有流动性
- 在第一部混合液上方倒入奶油
- 奶油顶面撒上海盐

## 附加内容

- 咖啡液建议选用花果风味,浓缩可以用中烘豆,冷萃可以用普通水洗或者日晒
- 倒入奶油时,高度尽量放低,让奶油能均匀漂浮在饮料表面形成奶盖
- 用新鲜的咖啡液和菠萝汁能大大提升整体风味口感

如果您遵循本指南的制作流程而发现有问题或可以改进的流程,请提出 Issue 或 Pull request 。
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ edit_uri: ""
use_directory_urls: true
docs_dir: .
theme:
font: false
name: material
language: zh
features:
Expand Down Expand Up @@ -343,6 +344,7 @@ nav:
- 耙耙柑茶: ./dishes/drink/耙耙柑茶/耙耙柑茶.md
- 百香果橙子特调: ./dishes/drink/百香果橙子特调/百香果橙子特调.md
- 冰粉: ./dishes/drink/冰粉/冰粉.md
- 菠萝咖啡特调: ./dishes/drink/菠萝咖啡特调/菠萝咖啡特调.md
- 金菲士: ./dishes/drink/金菲士/金菲士.md
- 金汤力: ./dishes/drink/金汤力/金汤力.md
- 可乐桶: ./dishes/drink/可乐桶.md
Expand Down

0 comments on commit 51c30b4

Please sign in to comment.