Merge pull request #58 from CodeWithAloha/tyliec/contributors-and-col…

…laborators

website fixes

.github/workflows/contributors.yml

@@ -3,15 +3,18 @@ name: Credit the contributors
 on:
   workflow_dispatch: {}
   schedule:
-    - cron: "0 0 1 * *"
+    - cron: "0 0 1 * *" # Run at midnight on the first of every month
 
 env:
   ORGANIZATION_NAME: "CodeWithAloha"
+  # This is a list of repositories that you want to gather contributors from
+  # To add a new repository, add a new line with the repository name in quotes
   REPOSITORY_NAMES: |
     (
       "Hawaii-Zoning-Atlas"
       "HIERR"
-      "CWAWebsite"
+      "website"
+      "uipa"
     )
 jobs:
   gather-the-contributors:
@@ -29,14 +32,23 @@ jobs:
             echo "  \"$item\": " >> contributors.json
 
             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 .)
-            for contributor in $contributors
-            do
-
-              echo $contributor >> contributors.json
-              # "  {\"name\": \"$contributor\"},"
+            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')
+            
+            echo $contributors > copy_contributors.json
 
+            # Filter for only the contributors that are also collaborators
+            jq -c '.[]' copy_contributors.json | while read i; do
+              username=$(echo $i | jq -r '.username')
+              if [[ " ${collaborators[@]} " =~ "${username}" ]]; then
+                echo $i | jq -c . >> filtered_contributors.json
+              fi
             done
+
+            echo $(jq -s . filtered_contributors.json) >> contributors.json
+
             sed -i '$ s/.$//' contributors.json
+            rm copy_contributors.json
+            rm filtered_contributors.json
             echo "  ]," >> contributors.json
           done
           sed -i '$ s/.$//' contributors.json

README.md

@@ -1,10 +1,10 @@
-# Code with Aloha Website
+# Code With Aloha's Website
 
-**Code with Aloha** is a group of civic-minded tech enthusiasts. This site is a testament to our dedication towards community improvement through technology.
+**Code With Aloha** is a group of civic-minded tech enthusiasts. This site is a testament to our dedication towards community improvement through technology.
 
-![Screenshot 2023-09-10 120435](https://github.com/CodeWithAloha/CWAWebsite/assets/113944962/f32b6d02-037c-4d23-910b-83a21fd2ab38)
+![Screenshot 2023-09-10 120435](https://github.com/CodeWithAloha/website/assets/113944962/f32b6d02-037c-4d23-910b-83a21fd2ab38)
 
-:computer: **Live Site** [here](https://codewithaloha.github.io/CWAWebsite/).
+:computer: **Live Site** [here](https://codewithaloha.github.io/website/).
 
 :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.
 
@@ -16,13 +16,13 @@ To contribute to this project, follow these steps:
 **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:
 
 ```Node
-git clone https://github.com/[your-username]/CWAWebsite.git
+git clone https://github.com/[your-username]/website.git
 ```
 
 **3. Navigate to the project directory**:
 
 ```Node
-cd CWAWebsite
+cd website
 ```
 
 **4. Install the dependencies**:
@@ -51,4 +51,4 @@ This project is licensed under the MIT License.
 
 :speech_balloon: **Contact**
 
-For inquiries and feedback, please reach out to [codewithaloha@gmail.com](mailto:your-email@email.com).
+For inquiries and feedback, please reach out to [codewithaloha@gmail.com](mailto:codewithaloha@gmail.com).

contributors.json

@@ -21,11 +21,6 @@
         "avatar_url": "https://avatars.githubusercontent.com/u/105579826?v=4",
         "url": "https://github.com/operator130"
       },
-      {
-        "username": "ilyankou",
-        "avatar_url": "https://avatars.githubusercontent.com/u/10443203?v=4",
-        "url": "https://github.com/ilyankou"
-      },
       {
         "username": "TyPushesButtons",
         "avatar_url": "https://avatars.githubusercontent.com/u/124652716?v=4",
@@ -89,9 +84,9 @@
         "url": "https://github.com/dinoboy197"
       },
       {
-        "username": "dependabot[bot]",
-        "avatar_url": "https://avatars.githubusercontent.com/in/29110?v=4",
-        "url": "https://github.com/apps/dependabot"
+        "username": "MichaelTamaki",
+        "avatar_url": "https://avatars.githubusercontent.com/u/13753033?v=4",
+        "url": "https://github.com/MichaelTamaki"
       },
       {
         "username": "MichaelTamaki",
@@ -129,7 +124,7 @@
         "url": "https://github.com/lprimiano"
       }
     ],
-    "CWAWebsite": [
+    "website": [
       {
         "username": "kobebuckley",
         "avatar_url": "https://avatars.githubusercontent.com/u/42805189?v=4",
@@ -140,20 +135,15 @@
         "avatar_url": "https://avatars.githubusercontent.com/u/113944962?v=4",
         "url": "https://github.com/Alexandra-Haynes"
       },
-      {
-        "username": "github-actions[bot]",
-        "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
-        "url": "https://github.com/apps/github-actions"
-      },
       {
         "username": "MichaelTamaki",
         "avatar_url": "https://avatars.githubusercontent.com/u/13753033?v=4",
         "url": "https://github.com/MichaelTamaki"
       },
       {
-        "username": "sarafurd",
-        "avatar_url": "https://avatars.githubusercontent.com/u/67877801?v=4",
-        "url": "https://github.com/sarafurd"
+        "username": "tyliec",
+        "avatar_url": "https://avatars.githubusercontent.com/u/15609358?v=4",
+        "url": "https://github.com/tyliec"
       },
       {
         "username": "DerekMalone",
@@ -165,25 +155,37 @@
         "avatar_url": "https://avatars.githubusercontent.com/u/73650949?v=4",
         "url": "https://github.com/Hooobot"
       },
+      {
+        "username": "avenmia",
+        "avatar_url": "https://avatars.githubusercontent.com/u/17712276?v=4",
+        "url": "https://github.com/avenmia"
+      }
+    ],
+    "uipa": [
+      {
+        "username": "ryankanno",
+        "avatar_url": "https://avatars.githubusercontent.com/u/57014?v=4",
+        "url": "https://github.com/ryankanno"
+      },
       {
         "username": "tyliec",
         "avatar_url": "https://avatars.githubusercontent.com/u/15609358?v=4",
         "url": "https://github.com/tyliec"
       },
       {
-        "username": "AnaBaldinger",
-        "avatar_url": "https://avatars.githubusercontent.com/u/145423118?v=4",
-        "url": "https://github.com/AnaBaldinger"
+        "username": "keokilee",
+        "avatar_url": "https://avatars.githubusercontent.com/u/191770?v=4",
+        "url": "https://github.com/keokilee"
       },
       {
-        "username": "Cozhee",
-        "avatar_url": "https://avatars.githubusercontent.com/u/55909913?v=4",
-        "url": "https://github.com/Cozhee"
+        "username": "knowsuchagency",
+        "avatar_url": "https://avatars.githubusercontent.com/u/11974795?v=4",
+        "url": "https://github.com/knowsuchagency"
       },
       {
-        "username": "avenmia",
-        "avatar_url": "https://avatars.githubusercontent.com/u/17712276?v=4",
-        "url": "https://github.com/avenmia"
+        "username": "sakamosa",
+        "avatar_url": "https://avatars.githubusercontent.com/u/14817912?v=4",
+        "url": "https://github.com/sakamosa"
       }
     ]
   }