Skip to content

Commit 303651d

Browse files
tyliectyliec
authored
Merge pull request #58 from CodeWithAloha/tyliec/contributors-and-collaborators
website fixes
2 parents 4ee0447 + 8837f13 commit 303651d

3 files changed

Lines changed: 54 additions & 40 deletions

File tree

‎.github/workflows/contributors.yml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ name: Credit the contributors
33
on:
44
workflow_dispatch: {}
55
schedule:
6-
- cron: "0 0 1 * *"
6+
- cron: "0 0 1 * *" # Run at midnight on the first of every month
77

88
env:
99
ORGANIZATION_NAME: "CodeWithAloha"
10+
# This is a list of repositories that you want to gather contributors from
11+
# To add a new repository, add a new line with the repository name in quotes
1012
REPOSITORY_NAMES: |
1113
(
1214
"Hawaii-Zoning-Atlas"
1315
"HIERR"
14-
"CWAWebsite"
16+
"website"
17+
"uipa"
1518
)
1619
jobs:
1720
gather-the-contributors:
@@ -29,14 +32,23 @@ jobs:
2932
echo " \"$item\": " >> contributors.json
3033
3134
contributors=$(curl -s -H "Accept: application/vnd.github+json" https://api.github.com/repos/${{ env.ORGANIZATION_NAME }}/$item/contributors | jq -r '.[] | {username: .login, avatar_url: .avatar_url, url: .html_url }' | jq -s .)
32-
for contributor in $contributors
33-
do
34-
35-
echo $contributor >> contributors.json
36-
# " {\"name\": \"$contributor\"},"
35+
collaborators=$(curl -s -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.CWA_BOT_TOKEN }}" -H "X-GitHub-Api-Version: 2022-11-28" "https://api.github.com/repos/${{ env.ORGANIZATION_NAME }}/$item/collaborators?per_page=100" | jq -r '.[].login')
36+
37+
echo $contributors > copy_contributors.json
3738
39+
# Filter for only the contributors that are also collaborators
40+
jq -c '.[]' copy_contributors.json | while read i; do
41+
username=$(echo $i | jq -r '.username')
42+
if [[ " ${collaborators[@]} " =~ "${username}" ]]; then
43+
echo $i | jq -c . >> filtered_contributors.json
44+
fi
3845
done
46+
47+
echo $(jq -s . filtered_contributors.json) >> contributors.json
48+
3949
sed -i '$ s/.$//' contributors.json
50+
rm copy_contributors.json
51+
rm filtered_contributors.json
4052
echo " ]," >> contributors.json
4153
done
4254
sed -i '$ s/.$//' contributors.json

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Code with Aloha Website
1+
# Code With Aloha's Website
22

3-
**Code with Aloha** is a group of civic-minded tech enthusiasts. This site is a testament to our dedication towards community improvement through technology.
3+
**Code With Aloha** is a group of civic-minded tech enthusiasts. This site is a testament to our dedication towards community improvement through technology.
44

5-
![Screenshot 2023-09-10 120435](https://github.com/CodeWithAloha/CWAWebsite/assets/113944962/f32b6d02-037c-4d23-910b-83a21fd2ab38)
5+
![Screenshot 2023-09-10 120435](https://github.com/CodeWithAloha/website/assets/113944962/f32b6d02-037c-4d23-910b-83a21fd2ab38)
66

7-
:computer: **Live Site** [here](https://codewithaloha.github.io/CWAWebsite/).
7+
:computer: **Live Site** [here](https://codewithaloha.github.io/website/).
88

99
:books: **Features** of our project include a dynamic and responsive user interface powered by NextJS & React, stylish components with Tailwind CSS, and smooth animations and transitions through Framer Motion to enhance the user experience.
1010

@@ -16,13 +16,13 @@ To contribute to this project, follow these steps:
1616
**2. Clone Your Fork**: Now, you need to clone your forked repository to your local machine. Replace [your-username] with your GitHub username in the URL below:
1717

1818
```Node
19-
git clone https://github.com/[your-username]/CWAWebsite.git
19+
git clone https://github.com/[your-username]/website.git
2020
```
2121

2222
**3. Navigate to the project directory**:
2323

2424
```Node
25-
cd CWAWebsite
25+
cd website
2626
```
2727

2828
**4. Install the dependencies**:
@@ -51,4 +51,4 @@ This project is licensed under the MIT License.
5151

5252
:speech_balloon: **Contact**
5353

54-
For inquiries and feedback, please reach out to [codewithaloha@gmail.com](mailto:your-email@email.com).
54+
For inquiries and feedback, please reach out to [codewithaloha@gmail.com](mailto:codewithaloha@gmail.com).

‎contributors.json‎

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
"avatar_url": "https://avatars.githubusercontent.com/u/105579826?v=4",
2222
"url": "https://github.com/operator130"
2323
},
24-
{
25-
"username": "ilyankou",
26-
"avatar_url": "https://avatars.githubusercontent.com/u/10443203?v=4",
27-
"url": "https://github.com/ilyankou"
28-
},
2924
{
3025
"username": "TyPushesButtons",
3126
"avatar_url": "https://avatars.githubusercontent.com/u/124652716?v=4",
@@ -89,9 +84,9 @@
8984
"url": "https://github.com/dinoboy197"
9085
},
9186
{
92-
"username": "dependabot[bot]",
93-
"avatar_url": "https://avatars.githubusercontent.com/in/29110?v=4",
94-
"url": "https://github.com/apps/dependabot"
87+
"username": "MichaelTamaki",
88+
"avatar_url": "https://avatars.githubusercontent.com/u/13753033?v=4",
89+
"url": "https://github.com/MichaelTamaki"
9590
},
9691
{
9792
"username": "MichaelTamaki",
@@ -129,7 +124,7 @@
129124
"url": "https://github.com/lprimiano"
130125
}
131126
],
132-
"CWAWebsite": [
127+
"website": [
133128
{
134129
"username": "kobebuckley",
135130
"avatar_url": "https://avatars.githubusercontent.com/u/42805189?v=4",
@@ -140,20 +135,15 @@
140135
"avatar_url": "https://avatars.githubusercontent.com/u/113944962?v=4",
141136
"url": "https://github.com/Alexandra-Haynes"
142137
},
143-
{
144-
"username": "github-actions[bot]",
145-
"avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
146-
"url": "https://github.com/apps/github-actions"
147-
},
148138
{
149139
"username": "MichaelTamaki",
150140
"avatar_url": "https://avatars.githubusercontent.com/u/13753033?v=4",
151141
"url": "https://github.com/MichaelTamaki"
152142
},
153143
{
154-
"username": "sarafurd",
155-
"avatar_url": "https://avatars.githubusercontent.com/u/67877801?v=4",
156-
"url": "https://github.com/sarafurd"
144+
"username": "tyliec",
145+
"avatar_url": "https://avatars.githubusercontent.com/u/15609358?v=4",
146+
"url": "https://github.com/tyliec"
157147
},
158148
{
159149
"username": "DerekMalone",
@@ -165,25 +155,37 @@
165155
"avatar_url": "https://avatars.githubusercontent.com/u/73650949?v=4",
166156
"url": "https://github.com/Hooobot"
167157
},
158+
{
159+
"username": "avenmia",
160+
"avatar_url": "https://avatars.githubusercontent.com/u/17712276?v=4",
161+
"url": "https://github.com/avenmia"
162+
}
163+
],
164+
"uipa": [
165+
{
166+
"username": "ryankanno",
167+
"avatar_url": "https://avatars.githubusercontent.com/u/57014?v=4",
168+
"url": "https://github.com/ryankanno"
169+
},
168170
{
169171
"username": "tyliec",
170172
"avatar_url": "https://avatars.githubusercontent.com/u/15609358?v=4",
171173
"url": "https://github.com/tyliec"
172174
},
173175
{
174-
"username": "AnaBaldinger",
175-
"avatar_url": "https://avatars.githubusercontent.com/u/145423118?v=4",
176-
"url": "https://github.com/AnaBaldinger"
176+
"username": "keokilee",
177+
"avatar_url": "https://avatars.githubusercontent.com/u/191770?v=4",
178+
"url": "https://github.com/keokilee"
177179
},
178180
{
179-
"username": "Cozhee",
180-
"avatar_url": "https://avatars.githubusercontent.com/u/55909913?v=4",
181-
"url": "https://github.com/Cozhee"
181+
"username": "knowsuchagency",
182+
"avatar_url": "https://avatars.githubusercontent.com/u/11974795?v=4",
183+
"url": "https://github.com/knowsuchagency"
182184
},
183185
{
184-
"username": "avenmia",
185-
"avatar_url": "https://avatars.githubusercontent.com/u/17712276?v=4",
186-
"url": "https://github.com/avenmia"
186+
"username": "sakamosa",
187+
"avatar_url": "https://avatars.githubusercontent.com/u/14817912?v=4",
188+
"url": "https://github.com/sakamosa"
187189
}
188190
]
189191
}

0 commit comments

Comments
 (0)