Skip to content

Commit 131dfa0

Browse files
Merge branch 'main' into #216-Responsive-projects-page
2 parents 135efd0 + fb5da97 commit 131dfa0

33 files changed

+667
-427
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ Closes: # <!-- issue number that will be closed through this PR -->
1111
## Type of change
1212

1313
What sort of change have you made:
14+
1415
<!--
1516
Example how to mark a checkbox:-
1617
- [x] My code follows the code style of this project.
1718
-->
19+
1820
- [ ] Bug fix (non-breaking change which fixes an issue)
1921
- [ ] New feature (non-breaking change which adds functionality)
2022
- [ ] Code style update (formatting, local variables)
@@ -27,10 +29,12 @@ Example how to mark a checkbox:-
2729
<!-- Describe how have you verified the changes made -->
2830

2931
## Checklist
32+
3033
<!--
3134
Example how to mark a checkbox:-
3235
- [x] My code follows the code style of this project.
3336
-->
37+
3438
- [ ] My code follows the guidelines of this project.
3539
- [ ] I have performed a self-review of my own code.
3640
- [ ] I have commented on my code, particularly wherever it was hard to understand.
@@ -41,9 +45,9 @@ Example how to mark a checkbox:-
4145

4246
## Screenshots (if applicable)
4347

44-
Original | Updated
45-
:--------------------: |:--------------------:
46-
original screenshot | updated screenshot |
48+
| Original | Updated |
49+
| :-----------------: | :----------------: |
50+
| original screenshot | updated screenshot |
4751

4852
## Code of Conduct
4953

.github/workflows/autoprettier.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: AutoPrettier
2+
3+
# Controls when the workflow will run
4+
on:
5+
# Triggers the workflow on push or pull request events but only for the main branch
6+
push:
7+
branches:
8+
- main
9+
pull_request:
10+
branches:
11+
- "*"
12+
13+
jobs:
14+
autoprettier:
15+
runs-on: ubuntu-latest
16+
17+
# Steps represent a sequence of tasks that will be executed as part of the job
18+
steps:
19+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
20+
- uses: actions/checkout@v2
21+
- uses: actions/setup-node@v2
22+
with:
23+
node-version: 14
24+
25+
# Runs a single command using the runners shell
26+
- name: Install
27+
run: |
28+
npm install
29+
npm install --save-dev prettier
30+
# Runs a set of commands using the runners shell
31+
- name: Execute Prettier
32+
run: npx prettier --write .
33+
34+
# Commit formated files
35+
- name: Check for modified files
36+
id: git-check
37+
run: |
38+
git config --global user.name 'autoprettier'
39+
git config --global user.email '[email protected]'
40+
echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)
41+
- name: Commit if any changes.
42+
if: steps.git-check.outputs.modified == 'true'
43+
run: |
44+
git commit -am "🎨 Format Next.js code with Prettier"

.github/workflows/deploy-node.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-node@v2
2323
with:
2424
node-version: ${{ matrix.node-version }}
25-
cache: 'npm'
25+
cache: "npm"
2626
- run: npm ci
2727
- run: npm run build
2828
- run: npm run export

.prettierrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"trailingComma": "es5",
3+
"singleQuote": false,
4+
"jsxSingleQuote": false,
5+
"printWidth": 100,
6+
"tabWidth": 2,
7+
"semi": true,
8+
"endOfLine": "auto"
9+
}

CODE_OF_CONDUCT.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
1717
Examples of behavior that contributes to a positive environment for our
1818
community include:
1919

20-
* Demonstrating empathy and kindness toward other people
21-
* Being respectful of differing opinions, viewpoints, and experiences
22-
* Giving and gracefully accepting constructive feedback
23-
* Accepting responsibility and apologizing to those affected by our mistakes,
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
2424
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
25+
- Focusing on what is best not just for us as individuals, but for the
2626
overall community
2727

2828
Examples of unacceptable behavior include:
2929

30-
* The use of sexualized language or imagery, and sexual attention or
30+
- The use of sexualized language or imagery, and sexual attention or
3131
advances of any kind
32-
* Trolling, insulting or derogatory comments, and personal or political attacks
33-
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email
3535
address, without their explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
36+
- Other conduct which could reasonably be considered inappropriate in a
3737
professional setting
3838

3939
## Enforcement Responsibilities
@@ -60,7 +60,7 @@ representative at an online or offline event.
6060

6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6262
reported to the community leaders responsible for enforcement at
63-
63+
6464
All complaints will be reviewed and investigated promptly and fairly.
6565

6666
All community leaders are obligated to respect the privacy and security of the
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
106106
### 4. Permanent Ban
107107

108108
**Community Impact**: Demonstrating a pattern of violation of community
109-
standards, including sustained inappropriate behavior, harassment of an
109+
standards, including sustained inappropriate behavior, harassment of an
110110
individual, or aggression toward or disparagement of classes of individuals.
111111

112112
**Consequence**: A permanent ban from any sort of public interaction within
@@ -119,14 +119,14 @@ version 2.1, available at
119119
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
120120

121121
Community Impact Guidelines were inspired by
122-
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
122+
[Mozilla's code of conduct enforcement ladder][mozilla coc].
123123

124124
For answers to common questions about this code of conduct, see the FAQ at
125-
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
125+
[https://www.contributor-covenant.org/faq][faq]. Translations are available
126126
at [https://www.contributor-covenant.org/translations][translations].
127127

128128
[homepage]: https://www.contributor-covenant.org
129129
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
130-
[Mozilla CoC]: https://github.com/mozilla/diversity
131-
[FAQ]: https://www.contributor-covenant.org/faq
130+
[mozilla coc]: https://github.com/mozilla/diversity
131+
[faq]: https://www.contributor-covenant.org/faq
132132
[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ Please follow all instructions in [the template](https://github.com/WebXDAO/WebX
4848

4949
- Use the present tense. (Example: "Add feature" instead of "Added feature")
5050
- Use the imperative mood. (Example: "Move item to...", instead of "Moves item to...")
51-
- Limit the first line (also called the Subject Line) to *50 characters or less*.
51+
- Limit the first line (also called the Subject Line) to _50 characters or less_.
5252
- Capitalize the Subject Line.
5353
- Separate subject from body with a blank line.
5454
- Do not end the subject line with a period.
55-
- Wrap the body at *72 characters*.
56-
- Use the body to explain the *what*, *why*, *vs*, and *how*.
55+
- Wrap the body at _72 characters_.
56+
- Use the body to explain the _what_, _why_, _vs_, and _how_.
5757
- Reference [Issues](https://github.com/WebXDAO/WebXDAO.github.io/issues) and [Pull Requests](https://github.com/WebXDAO/WebXDAO.github.io/pulls) liberally after the first line.
5858
- Follow [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/)
5959

@@ -65,7 +65,7 @@ Please follow all instructions in [the template](https://github.com/WebXDAO/WebX
6565

6666
- Create a pull request which will be promptly reviewed and suggestions would be added to improve it.
6767

68-
- Add Screenshots to help us know what changes you have done.
68+
- Add Screenshots to help us know what changes you have done.
6969

7070
## 🤔 How to make a pull request
7171

@@ -97,15 +97,16 @@ git checkout -b your-branch-name
9797
git add .
9898
git commit -m "<your_commit_message>"
9999
```
100-
*Follow our commit guide from above*
100+
101+
_Follow our commit guide from above_
101102

102103
**7.** Push your local commits to the remote repo.
103104

104105
```bash
105106
git push origin your-branch-name
106107
```
107108

108-
**8.** Create a new [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request) from ```your-branch-name```
109+
**8.** Create a new [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request) from `your-branch-name`
109110

110111
**9.** 🎉 Congratulations! You've made your first pull request! Now, you should just wait until the maintainers review your pull request.
111112

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
<img alt="WebXDAO banner" src="https://user-images.githubusercontent.com/72812470/189705065-58fe76da-080b-4798-94fe-2400af2bbfa8.png"/>
33

44
---
5+
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/WebXDAO/WebXDAO.github.io/blob/master/LICENSE)
56

67
The content in this repository is temporary, we are making new web design for WebX DAO. If you want to help, please message us on [Discord](https://discord.gg/TSRwqx4K2v)
78

89
---
910

10-
## Getting Started
11+
## 🚀 Getting Started
1112

1213
> Make sure to read our [contributing guidelines](https://github.com/WebXDAO/WebXDAO.github.io/blob/main/CONTRIBUTING.md)
1314
@@ -38,3 +39,9 @@ npm install
3839
```
3940
npm run dev
4041
```
42+
43+
## ⚡ Our valuable Contributors
44+
45+
<p align="center"><a href="https://github.com/WebXDAO/WebXDAO.github.io/graphs/contributors">
46+
<img src="https://contributors-img.web.app/image?repo=WebXDAO/WebXDAO.github.io" />
47+
</a></p>

package-lock.json

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"build": "next build",
88
"start": "next start",
99
"lint": "next lint",
10-
"export": "next build && next export"
10+
"export": "next build && next export",
11+
"format": "npx prettier --write ."
1112
},
1213
"dependencies": {
1314
"@headlessui/react": "^1.7.1",
@@ -22,6 +23,7 @@
2223
},
2324
"devDependencies": {
2425
"autoprefixer": "^10.4.2",
26+
"prettier": "^2.7.1",
2527
"eslint": "8.6.0",
2628
"eslint-config-next": "12.3.0",
2729
"postcss": "^8.4.5",

postcss.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ module.exports = {
33
tailwindcss: {},
44
autoprefixer: {},
55
},
6-
}
6+
};

0 commit comments

Comments
 (0)