Merge branch 'main' of https://github.com/fixit-theme/FixIt

Author: geekswg

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,51 +1,55 @@
-name: "Bug Report 错误报告"
-description: "Create a bug report 创建一个错误报告"
-title: "[BUG] Some problem ..."
-labels: ["bug"]
+name: Bug Report
+description: Create a report to help us improve
+title: '[Bug report] '
 body:
-  - type: textarea
-    id: describe
+  - type: markdown
     attributes:
-      label: Describe the bug 描述你遇到的错误
-      description: |
-        A clear and concise description of what the bug is.
-        一段简短的对于你遇到的错误的描述。
+      value: |
+        Thanks for taking the time to fill out this bug report!
   - type: textarea
-    id: expected
+    id: bug-description
     attributes:
-      label: Expected behavior 期待的行为
-      description: |
-        A clear and concise description of what you expected to happen.
-        一段简短的对于你期待的行为的描述。
-  - type: textarea
-    id: screenshots
+      label: Description
+      description: A clear and concise description of what the bug is. If applicable, add screenshots to help explain your problem. If you intend to submit a PR for this issue, tell us in the description. Thanks!
+      placeholder: Bug description
+    validations:
+      required: true
+  - type: input
+    id: reproduction
     attributes:
-      label: Screenshots 屏幕截图
-      description: |
-       If applicable, add screenshots to help explain your problem.
-       如果可以的话，提供屏幕截图对解决问题很有帮助。
+      label: Reproduction
+      description: Please provide a link to a repo that can reproduce the problem you ran into. A [minimal reproduction](https://stackoverflow.com/help/minimal-reproducible-example) is required.
+      placeholder: Reproduction
+    validations:
+      required: true
+  - type: dropdown
+    id: installation-method
+    attributes:
+      label: Installation Method
+      description: Select the installation method you used.
+      options:
+        - Hugo Module
+        - Git Submodule
+        - Git Clone
+        - Manual
+        - Other
+    validations:
+      required: true
   - type: textarea
     id: environment
     attributes:
-      label: Build Environment 构建环境
+      label: Build Environment
       description: |
         Please try to use Hugo **extended** version before opening the issue.
-        请在创建 issue 之前尝试使用 Hugo **extended** 版本。
       placeholder: |
-        - OS: [e.g. Windows 10, macOS, Ubuntu]
         - Theme version/commit [e.g. 0.2.0, 2ccba79]
-        - Hugo version [e.g. 0.69.0]
-  - type: textarea
-    id: preview
-    attributes:
-      label: Preview Environment 预览环境
-      placeholder: |
-        - OS: [e.g. Windows 10, macOS, Ubuntu, iOS, Android]
-        - Browser [e.g. Chrome, Safari, Firefox]
+        - Hugo version [e.g. 0.147.0]
+        - OS: [e.g. Windows 10, macOS, Ubuntu]
+    validations:
+      required: true
   - type: textarea
     id: additional
     attributes:
-      label: Additional Information 补充信息
+      label: Additional Information
       description: |
-        Configuration files or front matter code ...
-        配置文件或者前置参数的代码……
+        Configuration files or front matter code snippets that may help us understand the issue.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +1,8 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
-  - name: Questions 问题讨论
+  - name: Questions
     url: https://github.com/hugo-fixit/FixIt/discussions/new
-    about: Please ask questions in Discussion. 请在讨论中提问。
-
-  - name: Theme Documentation 主题文档
-    url: https://fixit.lruihao.cn/documentation/
-    about: Please read the documentation carefully. 请先仔细阅读主题文档。
+    about: Please ask questions in Discussion.
+  - name: Theme Documentation
+    url: https://fixit.lruihao.cn/
+    about: Please read the documentation carefully.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,22 +1,35 @@
-name: "Feature request 功能请求"
-description: "Suggest an idea for this project 为这个项目提供一个建议"
-title: "[FEATURE] Some feature"
-labels: ["enhancement"]
+name: Feature Request
+description: Suggest an idea for this project
+title: '[Feature request] '
 body:
-    - type: textarea
-      id: describe
-      attributes:
-        label: Describe the feature you want 描述你的功能需求
-        description: |
-            Please submit new issues for different features.
-            请针对不同的功能建议提交新的 issue。
-        placeholder: |
-          I recommend adding this feature ...
-          我希望添加这样的一个功能……
-    - type: textarea
-      id: reference
-      attributes:
-        label: Useful reference 有价值的参考
-        description: |
-          If available, provide useful links to fulfill the feature. 
-          如果可以的话，提供实现这个功能的相关参考链接。
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your interest in the project and taking the time to fill out this feature request!
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Clear and concise description of the problem
+      description: As a user or developer using FixIt, what feature your want in details. If you intend to submit a PR for this issue, tell us in the description. Thanks!
+      placeholder: Feature description
+    validations:
+      required: true
+  - type: textarea
+    id: suggested-solution
+    attributes:
+      label: Suggested solution
+      description: We could provide following implementation...
+      placeholder: Suggested solution
+    validations:
+      required: true
+  - type: textarea
+    id: alternative
+    attributes:
+      label: Alternative
+      description: Clear and concise description of any alternative solutions or features you've considered.
+      placeholder: Alternative solution
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,24 @@
+<!-- Thank you for contributing! -->
+
+### Description
+
+<!-- Please insert your description here and provide especially info about the "what" this PR is solving -->
+
+### Before submitting the PR, please make sure you do the following <!-- (put an "X" next to an item) -->
+
+- [ ] Read the [Contributing Guidelines](https://github.com/hugo-fixit/FixIt/blob/main/CONTRIBUTING.md).
+- [ ] Provide a description in this PR that addresses **what** the PR is solving. If this PR is going to solve an existing issue, please reference the issue (e.g. `close #123`).
+
+### What is the purpose of this pull request? <!-- (put an "X" next to an item) -->
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Other
+
+### Screenshots
+
+<!-- If your PR includes UI changes, please provide before/after screenshots. If there are any other images that add context to the PR, add them here as well -->
+
+**Before**
+
+**After**

.github/configs/codeql.yml

@@ -1,5 +1,4 @@
-name: "CodeQL config"
+name: CodeQL config
 
 paths-ignore:
   - assets/lib/**
-  - docs/**