Skip to content

Commit 3f28f82

Browse files
mrthedutsmrtheduts
committed
Merged main and resolved conflicts
2 parents 1560a8c + 9a7d7b1 commit 3f28f82

File tree

25 files changed

+1096
-654
lines changed

25 files changed

+1096
-654
lines changed

‎.github/ISSUE_TEMPLATE/01-bug_report.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Bug Report
2+
description: Create a report to help us improve
3+
title: "[Bug]: "
4+
labels: ["bug"]
5+
assignees:
6+
- L4Ph
7+
- saicaca
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
Thanks for taking the time to fill out this bug report!
13+
- type: textarea
14+
id: bug-description
15+
attributes:
16+
label: Describe the bug
17+
description: A clear and concise description of what the bug is.
18+
validations:
19+
required: true
20+
- type: textarea
21+
id: to-reproduce
22+
attributes:
23+
label: To Reproduce
24+
description: Steps to reproduce the behavior.
25+
placeholder: |
26+
1. Go to '...'
27+
2. Click on '....'
28+
3. Scroll down to '....'
29+
4. See error
30+
validations:
31+
required: true
32+
- type: textarea
33+
id: expected-behavior
34+
attributes:
35+
label: Expected behavior
36+
description: A clear and concise description of what you expected to happen.
37+
validations:
38+
required: true
39+
- type: dropdown
40+
id: os
41+
attributes:
42+
label: OS
43+
multiple: true
44+
options:
45+
- Windows
46+
- macOS
47+
- Linux
48+
- Android
49+
- iOS
50+
- type: input
51+
id: browser
52+
attributes:
53+
label: Browser
54+
placeholder: e.g. chrome, safari
55+
- type: textarea
56+
id: additional-context
57+
attributes:
58+
label: Additional context
59+
description: Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/02-feature_request.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Feature Request
2+
description: Suggest an idea for this project
3+
title: "[Feature]: "
4+
labels: ["enhancement"]
5+
assignees:
6+
- saicaca
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
Thanks for taking the time to fill out this feature request!
12+
- type: textarea
13+
id: related-problem
14+
attributes:
15+
label: Is your feature request related to a problem?
16+
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
17+
validations:
18+
required: true
19+
- type: textarea
20+
id: solution
21+
attributes:
22+
label: Describe the solution you'd like
23+
description: A clear and concise description of what you want to happen.
24+
validations:
25+
required: true
26+
- type: textarea
27+
id: alternatives
28+
attributes:
29+
label: Describe alternatives you've considered
30+
description: A clear and concise description of any alternative solutions or features you've considered.
31+
- type: textarea
32+
id: additional-context
33+
attributes:
34+
label: Additional context
35+
description: Add any other context or screenshots about the feature request here.
36+
- type: markdown
37+
attributes:
38+
value: |
39+
**Disclaimer**
40+
41+
Please note that this feature request is at the discretion of the repository owner, @saicaca, and its implementation is not guaranteed.

‎.github/ISSUE_TEMPLATE/03-custom_issue.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Custom Issue
2+
description: Describe your issue here.
3+
title: "[Other]: "
4+
body:
5+
- type: textarea
6+
id: issue-description
7+
attributes:
8+
label: Issue Description
9+
description: Please describe your issue.
10+
validations:
11+
required: true

‎.github/pull_request_template.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## Type of change
2+
3+
- [ ] Bug fix (a non-breaking change that fixes an issue)
4+
- [ ] New feature (a non-breaking change that adds functionality)
5+
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
6+
- [ ] Other (please describe):
7+
8+
## Checklist
9+
10+
- [ ] I have read the [**CONTRIBUTING**](https://github.com/saicaca/fuwari/blob/main/CONTRIBUTING.md) document.
11+
- [ ] I have checked to ensure that this Pull Request is not for personal changes.
12+
- [ ] I have performed a self-review of my own code.
13+
- [ ] My changes generate no new warnings.
14+
15+
## Related Issue
16+
17+
<!-- Please link to the issue that this pull request addresses. e.g. #123 -->
18+
19+
20+
## Changes
21+
22+
<!-- Please describe the changes you made in this pull request. -->
23+
24+
25+
## How To Test
26+
27+
<!-- Please describe how you tested your changes. -->
28+
29+
30+
## Screenshots (if applicable)
31+
32+
<!-- If you made any UI changes, please include screenshots. -->
33+
34+
35+
## Additional Notes
36+
37+
<!-- Any additional information that you want to share with the reviewer. -->

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ pnpm-debug.log*
2525
package-lock.json
2626
bun.lockb
2727
yarn.lock
28+
29+
# ide
30+
.idea
31+
*.iml

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ A static blog template built with [Astro](https://astro.build).
1515
[**日本語**](https://github.com/saicaca/fuwari/blob/main/docs/README.ja.md) /
1616
[**한국어**](https://github.com/saicaca/fuwari/blob/main/docs/README.ko.md) /
1717
[**Español**](https://github.com/saicaca/fuwari/blob/main/docs/README.es.md) /
18-
[**ไทย**](https://github.com/saicaca/fuwari/blob/main/docs/README.th.md) (Provided by the community and may not always be up-to-date)
18+
[**ไทย**](https://github.com/saicaca/fuwari/blob/main/docs/README.th.md) /
19+
[**Tiếng Việt**](https://github.com/saicaca/fuwari/blob/main/docs/README.vi.md) /
20+
[**Bahasa Indonesia**](https://github.com/saicaca/fuwari/blob/main/docs/README.id.md) (Provided by the community and may not always be up-to-date)
1921

2022
## ✨ Features
2123

‎docs/README.id.md‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
# 🍥 Fuwari
2+
3+
Template blog statis yang dibangun dengan [Astro](https://astro.build).
4+
5+
[**🖥️ Demo Langsung (Vercel)**](https://fuwari.vercel.app)
6+
7+
![Gambar Pratinjau](https://raw.githubusercontent.com/saicaca/resource/main/fuwari/home.png)
8+
9+
🌏 README dalam
10+
[**中文**](https://github.com/saicaca/fuwari/blob/main/docs/README.zh-CN.md) /
11+
[**日本語**](https://github.com/saicaca/fuwari/blob/main/docs/README.ja.md) /
12+
[**한국어**](https://github.com/saicaca/fuwari/blob/main/docs/README.ko.md) /
13+
[**Español**](https://github.com/saicaca/fuwari/blob/main/docs/README.es.md) /
14+
[**ไทย**](https://github.com/saicaca/fuwari/blob/main/docs/README.th.md) /
15+
[**Tiếng Việt**](https://github.com/saicaca/fuwari/blob/main/docs/README.vi.md) /
16+
**Bahasa Indonesia (ini)** (Disediakan oleh komunitas, mungkin tidak selalu paling mutakhir)
17+
18+
## ✨ Fitur
19+
20+
- [x] Dibangun dengan [Astro](https://astro.build) dan [Tailwind CSS](https://tailwindcss.com)
21+
- [x] Animasi dan transisi halaman yang halus
22+
- [x] Mode terang / gelap
23+
- [x] Warna tema & banner yang bisa dikustomisasi
24+
- [x] Desain responsif
25+
- [x] Fitur pencarian dengan [Pagefind](https://pagefind.app/)
26+
- [x] [Fitur markdown tambahan](#-markdown-sintaks-ekstensi)
27+
- [x] Daftar isi (Table of Contents)
28+
- [x] RSS feed
29+
30+
## 🚀 Memulai
31+
32+
1. Buat repositori blog kamu:
33+
- [Generate repositori baru](https://github.com/saicaca/fuwari/generate) dari template ini atau fork repositori ini.
34+
- Atau jalankan salah satu perintah berikut:
35+
```sh
36+
# npm
37+
npm create fuwari@latest.
38+
39+
# yarn
40+
yarn create fuwari.
41+
42+
# pnpm
43+
pnpm create fuwari@latest
44+
45+
# bun
46+
bun create fuwari@latest
47+
48+
# deno
49+
deno run -A npm:create-fuwari@latest
50+
```
51+
2. Untuk mengedit blog secara lokal, klon repositori kamu, jalankan `pnpm install` untuk instalasi dependensi.
52+
- Install [pnpm](https://pnpm.io) `npm install -g pnpm` jika belum punya.
53+
3. Edit file konfigurasi `src/config.ts` untuk menyesuaikan blog.
54+
4. Jalankan `pnpm new-post <nama-file>` untuk membuat postingan baru dan edit di `src/content/posts/`.
55+
5. Deploy blog ke Vercel, Netlify, GitHub Pages, dll. sesuai [panduan](https://docs.astro.build/en/guides/deploy/). Jangan lupa edit konfigurasi situs di `astro.config.mjs` sebelum deploy.
56+
57+
## 📝 Frontmatter Postingan
58+
59+
```yaml
60+
---
61+
title: Judul Postingan Pertama Saya
62+
published: 2023-09-09
63+
description: Ini adalah postingan pertama blog Astro saya.
64+
image: ./cover.jpg
65+
tags: [Foo, Bar]
66+
category: Front-end
67+
draft: false
68+
lang: id # Isi hanya jika bahasa postingan berbeda dari bahasa default di `config.ts`
69+
---
70+
```
71+
72+
## 🧩 Markdown Sintaks Ekstensi
73+
74+
Selain dukungan default Astro untuk [GitHub Flavored Markdown](https://github.github.com/gfm/), terdapat beberapa fitur tambahan:
75+
76+
- Admonisi ([Pratinjau & Cara Pakai](https://fuwari.vercel.app/posts/markdown-extended/#admonitions))
77+
- Kartu repositori GitHub ([Pratinjau & Cara Pakai](https://fuwari.vercel.app/posts/markdown-extended/#github-repository-cards))
78+
- Kode blok ekspresif lewat Expressive Code ([Pratinjau](https://fuwari.vercel.app/posts/expressive-code/) / [Dokumentasi](https://expressive-code.com/))
79+
80+
## ⚡ Perintah
81+
82+
Semua perintah dijalankan dari root proyek, via terminal:
83+
84+
| Perintah | Aksi |
85+
|:-----------------------------|:----------------------------------------------------------|
86+
| `pnpm install` | Instalasi dependensi |
87+
| `pnpm dev` | Menjalankan server dev lokal di `localhost:4321` |
88+
| `pnpm build` | Build untuk produksi ke folder `./dist/` |
89+
| `pnpm preview` | Pratinjau hasil build sebelum deploy |
90+
| `pnpm check` | Cek error atau masalah di kode |
91+
| `pnpm format` | Format kode dengan Biome |
92+
| `pnpm new-post <nama-file>` | Membuat postingan baru |
93+
| `pnpm astro ...` | Jalankan perintah CLI seperti `astro add`, `astro check` |
94+
| `pnpm astro --help` | Bantuan menggunakan Astro CLI |
95+
96+
## ✏️ Kontribusi
97+
98+
Lihat [Panduan Kontribusi](https://github.com/saicaca/fuwari/blob/main/CONTRIBUTING.md) untuk detail tentang cara berkontribusi ke proyek ini.
99+
100+
## 📄 Lisensi
101+
102+
Proyek ini dilisensikan di bawah MIT License.
103+
104+
---
105+
106+
> Dokumentasi ini tersedia dalam Bahasa Indonesia. Untuk bahasa lain, lihat README di direktori docs.

‎docs/README.ko.md‎

Lines changed: 42 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,27 @@
1313
- [x] 라이트 모드 / 다크 모드
1414
- [x] 사용자 정의 가능한 테마 색상 및 배너
1515
- [x] 반응형 디자인
16-
- [ ] 댓글
17-
- [x] 검색
16+
- [x] [Pagefind](https://pagefind.app/)를 이용한 검색 기능
17+
- [x] [Markdown 확장 기능](https://github.com/saicaca/fuwari?tab=readme-ov-file#-markdown-extended-syntax)
1818
- [x] 목차
19-
20-
## 요구 사항
21-
22-
- Node.js <= 22
23-
- pnpm <= 9
24-
25-
## 🚀 사용하는 방법 1
26-
27-
[create-fuwari](https://github.com/L4Ph/create-fuwari)를 사용하여 로컬에서 프로젝트를 초기화합니다.
28-
29-
```sh
30-
# npm
31-
npm create fuwari@latest
32-
33-
# yarn
34-
yarn create fuwari
35-
36-
# pnpm
37-
pnpm create fuwari@latest
38-
39-
# bun
40-
bun create fuwari@latest
41-
42-
# deno
43-
deno run -A npm:create-fuwari@latest
44-
```
45-
46-
1. 블로그를 사용자 정의하려면 `src/config.ts` 구성 파일을 편집하세요.
47-
2. `pnpm new-post <filename>`을 실행하여 새 게시물을 만들고 `src/content/posts/`에서 편집하세요.
48-
3. [가이드](https://docs.astro.build/en/guides/deploy/)에 따라 블로그를 Vercel, Netlify, GitHub 페이지 등에 배포하세요. 배포하기 전에 `astro.config.mjs`에서 사이트 구성을 편집해야 합니다.
49-
50-
## 🚀 사용하는 방법
51-
52-
1. 이 템플릿에서 [새 저장소를 생성](https://github.com/saicaca/fuwari/generate)하거나 이 저장소를 포크하세요.
53-
2. 블로그를 로컬에서 편집하려면 저장소를 복제하고 `pnpm install` 및 `pnpm add sharp`를 실행하여 종속성을 설치하세요.
54-
- 아직 [pnpm](https://pnpm.io)을 설치하지 않았다면 `npm install -g pnpm`을 실행하여 [pnpm](https://pnpm.io)을 설치하세요.
55-
3. 블로그를 사용자 정의하려면 `src/config.ts` 구성 파일을 편집하세요.
56-
4. `pnpm new-post <filename>`을 실행하여 새 게시물을 만들고 `src/content/posts/`에서 편집하세요.
57-
5. [가이드](https://docs.astro.build/en/guides/deploy/)에 따라 블로그를 Vercel, Netlify, GitHub 페이지 등에 배포하세요. 배포하기 전에 `astro.config.mjs`에서 사이트 구성을 편집해야 합니다.
19+
- [x] RSS 피드
20+
21+
## 🚀 시작하기
22+
1. 블로그 저장소를 생성하세요:
23+
- 이 템플릿에서 [새 저장소를 생성](https://github.com/saicaca/fuwari/generate)하거나 이 저장소를 포크하세요.
24+
- 또는 다음 명령어 중 하나를 실행하세요:
25+
```sh
26+
npm create fuwari@latest
27+
yarn create fuwari
28+
pnpm create fuwari@latest
29+
bun create fuwari@latest
30+
deno run -A npm:create-fuwari@latest
31+
```
32+
2. 로컬에서 블로그를 수정하려면, 저장소를 복제하고 `pnpm install`을 실행하여 종속성을 설치하세요.
33+
- [pnpm](https://pnpm.io)이 설치되어 있지 않다면 `npm install -g pnpm`을 실행하여 설치하세요.
34+
3. `src/config.ts`설정 파일을 수정하여 블로그를 커스터마이징하세요.
35+
4. `pnpm new-post <filename>`을 실행하여 새 게시물을 만들고 `src/content/posts/`에서 수정하세요.
36+
5. [가이드](https://docs.astro.build/en/guides/deploy/)에 따라 블로그를 Vercel, Netlify, Github Pages 등에 배포하세요. 배포하기 전에 `astro.config.mjs`에서 사이트 구성을 수정해야 합니다.
5837

5938
## ⚙️ 게시물의 머리말 설정
6039

@@ -63,24 +42,41 @@ deno run -A npm:create-fuwari@latest
6342
title: 내 첫 블로그 게시물
6443
published: 2023-09-09
6544
description: 내 새로운 Astro 블로그의 첫 번째 게시물입니다!
66-
image: /images/cover.jpg
67-
tags: [푸, 바, 오]
68-
category: 앞-끝
45+
image: ./cover.jpg
46+
tags: [Foo, Bar]
47+
category: Front-end
6948
draft: false
7049
lang: jp # 게시물의 언어가 `config.ts`의 사이트 언어와 다른 경우에만 설정합니다.
7150
---
7251
```
52+
## 🧩 마크다운 확장 구문
53+
Astro의 기본 [GitHub Flavored Markdown](https://github.github.com/gfm/) 지원 외에도 몇 가지 추가적인 마크다운 기능이 포함되어 있습니다.
54+
- Admonitions ([미리보기 및 사용법](https://fuwari.vercel.app/posts/markdown-extended/#admonitions))
55+
- GitHub 저장소 카드 ([미리보기 및 사용법](https://fuwari.vercel.app/posts/markdown-extended/#github-repository-cards))
56+
- Expressive Code를 사용한 향상된 코드 블록 ([미리보기](https://fuwari.vercel.app/posts/expressive-code/) / [문서](https://expressive-code.com/))
57+
7358

74-
## 🧞 명령어
59+
60+
## ⚡ 명령어
7561

7662
모든 명령어는 프로젝트 최상단, 터미널에서 실행됩니다:
7763

7864
| Command | Action |
7965
|:------------------------------------|:-------------------------------------------------|
80-
| `pnpm install` AND `pnpm add sharp` | 종속성을 설치합니다. |
66+
| `pnpm install` | 종속성을 설치합니다. |
8167
| `pnpm dev` | `localhost:4321`에서 로컬 개발 서버를 시작합니다. |
8268
| `pnpm build` | `./dist/`에 프로덕션 사이트를 구축합니다. |
69+
| `pnpm check` | 코드에서 오류를 확인합니다. |
70+
| `pnpm format` | Biome을 사용하여 코드를 포멧합니다. |
8371
| `pnpm preview` | 배포하기 전에 로컬에서 빌드 미리보기 |
8472
| `pnpm new-post <filename>` | 새 게시물 작성 |
8573
| `pnpm astro ...` | `astro add`, `astro check`와 같은 CLI 명령어 실행 |
8674
| `pnpm astro --help` | Astro CLI를 사용하여 도움 받기 |
75+
76+
## ✏️ 기여
77+
이 프로젝트에 기여하는 방법에 대한 자세한 내용은 [기여 가이드](https://github.com/saicaca/fuwari/blob/main/CONTRIBUTING.md)를 확인하세요.
78+
79+
## 📄 라이선스
80+
이 프로젝트는 MIT 라이선스에 따라 라이선스가 부여됩니다.
81+
82+
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fsaicaca%2Ffuwari.svg?type=large&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fsaicaca%2Ffuwari?ref=badge_large&issueType=license)

0 commit comments

Comments
 (0)