Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	package-lock.json
  • Loading branch information
matmen committed Feb 25, 2022
2 parents 0fa3c9b + f804925 commit e992303
Show file tree
Hide file tree
Showing 124 changed files with 50,938 additions and 11,746 deletions.
18 changes: 14 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
[*.{js,jsx,ts,tsx,vue}]
indent_style = space
indent_size = 2
root = true

[*]
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{js,jsx,ts,tsx,vue}]
indent_style = space
max_line_length = 100

[*.{md,markdown}]
max_line_length = 0
trim_trailing_whitespace = false
49 changes: 0 additions & 49 deletions .github/ISSUE_TEMPLATE/bug-report.md

This file was deleted.

42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Bug report
description: Create a report to help us improve
labels: ["bug", "triage"]
body:
- type: markdown
attributes:
value: |
This issue form is for reporting bugs only!
If you have a feature request, please use [feature_request](/new?template=feature_request.yml)
- type: textarea
id: what-happened
attributes:
label: What happened
description: >-
A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: expected-behavior
attributes:
label: What did you expect to happen
description: >-
A clear and concise description of what you expected to happen.
validations:
required: true
- type: textarea
id: repro-steps
attributes:
label: How to reproduce
description: >-
Minimal and precise steps to reproduce this bug.
validations:
required: true
- type: textarea
id: additional-info
attributes:
label: Additional information
description: |
If you have any additional information for us, use the field below.
Please note, you can attach screenshots or screen recordings here, by
dragging and dropping files in the field below.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Fluidd Discord
url: https://discord.gg/GZ3D5tqfcF/
about: Quickest way to get in contact
29 changes: 0 additions & 29 deletions .github/ISSUE_TEMPLATE/feature-request.md

This file was deleted.

40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Feature Request
description: Have a cool feature in mind? Use this template!
labels: ["enhancement"]
body:
- type: markdown
attributes:
value: |
This issue form is for feature requests only!
If you've found a bug, please use [bug_report](/new?template=bug_report.yml)
- type: textarea
id: problem-description
attributes:
label: Is your feature request related to a problem? Please describe
description: >-
A clear and concise description of what the problem is.
validations:
required: true
- type: textarea
id: solution-description
attributes:
label: Describe the solution you'd like
description: >-
A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
id: possible-alternatives
attributes:
label: Describe alternatives you've considered
description: >-
A clear and concise description of any alternative solutions or features you've considered.
- type: textarea
id: additional-info
attributes:
label: Additional information
description: |
If you have any additional information for us, use the field below.
Please note, you can attach screenshots or screen recordings here, by
dragging and dropping files in the field below.
Binary file removed .github/images/preview.png
Binary file not shown.
Binary file modified .github/images/preview_sliced.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '16'

- name: Install deps
run: npm install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/multiarch_dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ jobs:
push: true
tags: ${{ steps.prep.outputs.tags }}
build-args: |
FRONTEND_ZIP_URL=https://github.com/cadriel/fluidd/releases/download/${{ steps.prep.outputs.git_tag }}/fluidd.zip
FRONTEND_ZIP_URL=https://github.com/fluidd-core/fluidd/releases/download/${{ steps.prep.outputs.git_tag }}/fluidd.zip
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '16'

- name: Install deps
run: npm install
Expand Down
32 changes: 32 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

die () {
cat <<'EOF'
Error: Commit messages should follow the conventional commits standard, and should have a Signed-off-by line, for example:
```
feat: My feature.
Some description.
Signed-off-by: Your Name <your email address>
```
EOF

exit 1
}

COMMIT_MESSAGE=$(cat $1)

COMMIT_HEAD="^merge.+|(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert|types)(\(.+\))?: .{1,50}"
COMMIT_SIGNED_OFF="signed-off-by: .*<.*@.*>"

if ! echo "$COMMIT_MESSAGE" | grep -iqE "$COMMIT_HEAD"; then
die
fi

if ! echo "$COMMIT_MESSAGE" | grep -iqE "$COMMIT_SIGNED_OFF"; then
die
fi
8 changes: 8 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

FILES_TO_LINT=$(git diff --cached --name-only --diff-filter=ACM | grep -iE "\.(js|jsx|ts|tsx|vue)$" || true)

if [ -n "$FILES_TO_LINT" ]; then
npx --no-install vue-cli-service lint --no-fix $FILES_TO_LINT
fi
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.1
16.13.2
Loading

0 comments on commit e992303

Please sign in to comment.