Skip to content

Commit f31d31c

Browse files
authored
Merge branch 'dev' into dev
2 parents 27747d2 + 4747bdf commit f31d31c

33 files changed

+390
-135
lines changed

β€Ž.all-contributorsrcβ€Ž

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"imageSize": 100,
66
"commit": false,
77
"contributors": [
8-
98
{
109
"login": "DesignrKnight",
1110
"name": "Abel Mathew",
@@ -14,42 +13,38 @@
1413
"contributions": [
1514
"projectManagement",
1615
"code"
17-
]
18-
},
19-
20-
{
16+
]
17+
},
18+
{
2119
"login": "ankitkumarsamota121",
2220
"name": "Ankit Samota",
2321
"avatar_url": "https://avatars0.githubusercontent.com/u/46669484?v=4",
2422
"profile": "https://github.com/ankitkumarsamota121",
2523
"contributions": [
2624
"projectManagement",
2725
"code"
28-
]
29-
},
30-
31-
{
26+
]
27+
},
28+
{
3229
"login": "007vedant",
3330
"name": "Vedant Raghuwanshi",
3431
"avatar_url": "https://avatars3.githubusercontent.com/u/41552480?v=4",
3532
"profile": "https://www.linkedin.com/in/vedantraghuwanshi/",
3633
"contributions": [
3734
"projectManagement",
3835
"code"
39-
]
40-
},
41-
42-
{
36+
]
37+
},
38+
{
4339
"login": "nayakashutosh9",
4440
"name": "Ashutosh Nayak",
4541
"avatar_url": "https://avatars2.githubusercontent.com/u/43809818?v=4",
4642
"profile": "https://nayakashutosh9.github.io/portfolio/",
4743
"contributions": [
4844
"maintenance",
4945
"projectManagement"
50-
]
51-
},
52-
46+
]
47+
},
5348
{
5449
"login": "KoushikSahu",
5550
"name": "Koushik Sahu",
@@ -59,26 +54,33 @@
5954
"doc"
6055
]
6156
},
62-
63-
{
57+
{
6458
"login": "riteshsp2000",
6559
"name": "Ritesh Patil",
6660
"avatar_url": "https://avatars3.githubusercontent.com/u/56112399?v=4",
6761
"profile": "https://github.com/riteshsp2000",
6862
"contributions": [
6963
"projectManagement",
7064
"code"
71-
]
72-
},
73-
74-
{
65+
]
66+
},
67+
{
7568
"login": "all-contributors",
7669
"name": "All Contributors",
7770
"avatar_url": "https://avatars1.githubusercontent.com/u/46410174?v=4",
7871
"profile": "https://allcontributors.org",
7972
"contributions": [
8073
"tool"
8174
]
75+
},
76+
{
77+
"login": "Vedant1202",
78+
"name": "Vedant Nandoskar",
79+
"avatar_url": "https://avatars0.githubusercontent.com/u/35070972?v=4",
80+
"profile": "https://vedantnandoskar.herokuapp.com/",
81+
"contributions": [
82+
"code"
83+
]
8284
}
8385
],
8486
"contributorsPerLine": 7,

β€Ž.editorconfigβ€Ž

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# http://editorconfig.org
2+
root = true
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_size = 2
7+
indent_style = space
8+
insert_final_newline = true
9+
max_line_length = 100
10+
trim_trailing_whitespace = true
11+
[*.md]
12+
max_line_length = 0
13+
trim_trailing_whitespace = false
14+
[{Makefile,**.mk}]
15+
# Use tabs for indentation (Makefiles require tabs)
16+
indent_style = tab
17+
[*.scss]
18+
indent_size = 2
19+
indent_style = space

β€Ž.eslintrcβ€Ž

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"parser": "babel-eslint",
3+
"parserOptions": {
4+
"sourceType": "module",
5+
"allowImportExportEverywhere": false,
6+
"codeFrame": false
7+
},
8+
"extends": ["airbnb", "prettier"],
9+
"env": {
10+
"browser": true,
11+
"jest": true
12+
},
13+
"rules": {
14+
"max-len": ["error", { "code": 100 }],
15+
"prefer-promise-reject-errors": ["off"],
16+
"react/jsx-filename-extension": ["off"],
17+
"no-return-assign": ["off"]
18+
}
19+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
on:
2+
push:
3+
branches: [dev]
4+
pull_request:
5+
paths: ['.css', '.js', '.jsx']
6+
7+
jobs:
8+
prettier:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: actions/setup-node@v1
13+
with:
14+
node-version: 12
15+
16+
- name: Run prettier
17+
run: npm run prettier --write 'src/**/*.{css,js,jsx}'
18+
19+
- uses: stefanzweifel/git-auto-commit-action@v4
20+
with:
21+
commit_message: Apply prettier changes

β€Ž.github/workflows/integration.ymlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ jobs:
1515
- run: npm ci
1616
- run: npm test
1717
- run: npm run build
18+

β€Ž.prettierignoreβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node_modules
2+
dist

β€Ž.prettierrcβ€Ž

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"printWidth": 100,
3+
"trailingComma": "all",
4+
"tabWidth": 2,
5+
"semi": true,
6+
"singleQuote": true,
7+
"arrowParens": "always",
8+
"bracketSpacing": true,
9+
"endOfLine": "auto",
10+
"proseWrap": "preserve",
11+
"quoteProps": "as-needed",
12+
"jsxBracketSameLine": false,
13+
"jsxSingleQuote": true
14+
}

β€ŽCODE_OF_CONDUCT.mdβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
> A code of conduct is a set of rules outlining the social norms and rules and responsibilities of, or proper practices for, an individual, party or organization
44
5-
## Sumary
5+
## Summary
66

77
The OpenCode organization is dedicated to providing a harassment-free working environment for all, regardless of gender, sexual orientation, disability, physical appearance, body size, race, or religion. We do not tolerate harassment of any form. All communication should be appropriate for a professional audience including people of many different backgrounds.
88

β€ŽREADME.mdβ€Ž

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[![Starware](https://img.shields.io/badge/Starware-⭐-black?labelColor=f9b00d)](https://github.com/zepfietje/starware)
22
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
3-
[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors-)
3+
[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
44
<!-- ALL-CONTRIBUTORS-BADGE:END -->
55
### Contributing πŸŽƒ
66
------------
77

88
This repository is one of the many repositories maintained by the NIT Rourkela tech community. To get more info about all of our projects, visit our [Info Doc](https://www.notion.so/c019f8d965c24047b92f227a1b20fe4b?v=b1de077e3ea54a7daf480e8ca59e3167) <br>
99
We are super happy that you are here and invite you to join us at [our Hacktoberfest Meetup](http://bit.ly/NITR-HF). <br>
1010
Our Slack Community: [Slack Invite](http://bit.ly/NITRDevs) <br>
11-
#### We are are excited to see your awesome PRs. As a recognition of your awesome efforts, we would be giving a badge of gratitute to you to showcase your fantastic contribution on sending your first PR in October 2020
11+
#### We are excited to see your awesome PRs. As a recognition of your awesome efforts, we would be giving a badge of gratitute to you to showcase your fantastic contribution on sending your first PR in October 2020
1212
`Contributions for Hacktoberfest 2020 are welcome πŸŽ‰πŸŽ‰`
1313

1414
Please refer to the project's style and contribution guidelines for submitting patches and additions. In general, we follow the "fork-and-pull" Git workflow.
@@ -111,11 +111,14 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
111111
<td align="center"><a href="https://designrknight-website.web.app/"><img src="https://avatars0.githubusercontent.com/u/27865704?v=4" width="100px;" alt=""/><br /><sub><b>Abel Mathew</b></sub></a><br /><a href="#projectManagement-DesignrKnight" title="Project Management">πŸ“†</a> <a href="https://github.com/opencodenitr/project-apollo/commits?author=DesignrKnight" title="Code">πŸ’»</a></td>
112112
<td align="center"><a href="https://github.com/ankitkumarsamota121"><img src="https://avatars0.githubusercontent.com/u/46669484?v=4" width="100px;" alt=""/><br /><sub><b>Ankit Samota</b></sub></a><br /><a href="#projectManagement-ankitkumarsamota121" title="Project Management">πŸ“†</a> <a href="https://github.com/opencodenitr/project-apollo/commits?author=ankitkumarsamota121" title="Code">πŸ’»</a></td>
113113
<td align="center"><a href="https://www.linkedin.com/in/vedantraghuwanshi/"><img src="https://avatars3.githubusercontent.com/u/41552480?v=4" width="100px;" alt=""/><br /><sub><b>Vedant Raghuwanshi</b></sub></a><br /><a href="#projectManagement-007vedant" title="Project Management">πŸ“†</a> <a href="https://github.com/opencodenitr/project-apollo/commits?author=007vedant" title="Code">πŸ’»</a></td>
114-
<td align="center"><a href="https://www.linkedin.com/in/ashutosh-nayak-a67117173/"><img src="https://avatars2.githubusercontent.com/u/43809818?v=4" width="100px;" alt=""/><br /><sub><b>Ashutosh Nayak</b></sub></a><br /><a href="#maintenance-nayakashutosh9" title="Maintenance">🚧</a> <a href="#projectManagement-nayakashutosh9" title="Project Management">πŸ“†</a></td>
114+
<td align="center"><a href="https://nayakashutosh9.github.io/portfolio/"><img src="https://avatars2.githubusercontent.com/u/43809818?v=4" width="100px;" alt=""/><br /><sub><b>Ashutosh Nayak</b></sub></a><br /><a href="#maintenance-nayakashutosh9" title="Maintenance">🚧</a> <a href="#projectManagement-nayakashutosh9" title="Project Management">πŸ“†</a></td>
115115
<td align="center"><a href="https://github.com/KoushikSahu"><img src="https://avatars0.githubusercontent.com/u/39738439?v=4" width="100px;" alt=""/><br /><sub><b>Koushik Sahu</b></sub></a><br /><a href="https://github.com/opencodenitr/project-apollo/commits?author=KoushikSahu" title="Documentation">πŸ“–</a></td>
116116
<td align="center"><a href="https://github.com/riteshsp2000"><img src="https://avatars3.githubusercontent.com/u/56112399?v=4" width="100px;" alt=""/><br /><sub><b>Ritesh Patil</b></sub></a><br /><a href="#projectManagement-riteshsp2000" title="Project Management">πŸ“†</a> <a href="https://github.com/opencodenitr/project-apollo/commits?author=riteshsp2000" title="Code">πŸ’»</a></td>
117117
<td align="center"><a href="https://allcontributors.org"><img src="https://avatars1.githubusercontent.com/u/46410174?v=4" width="100px;" alt=""/><br /><sub><b>All Contributors</b></sub></a><br /><a href="#tool-all-contributors" title="Tools">πŸ”§</a></td>
118118
</tr>
119+
<tr>
120+
<td align="center"><a href="https://vedantnandoskar.herokuapp.com/"><img src="https://avatars0.githubusercontent.com/u/35070972?v=4" width="100px;" alt=""/><br /><sub><b>Vedant Nandoskar</b></sub></a><br /><a href="https://github.com/opencodenitr/project-apollo/commits?author=Vedant1202" title="Code">πŸ’»</a></td>
121+
</tr>
119122
</table>
120123

121124
<!-- markdownlint-enable -->

β€Žpackage-lock.jsonβ€Ž

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

0 commit comments

Comments
Β (0)