Add support for tracking commits pushed to branch (core)

.env

@@ -1,21 +1,36 @@
 ## -- Organization Details -- ##
-NEXT_PUBLIC_ORG_NAME=ohc.network
-NEXT_PUBLIC_ORG_INFO=Open Healthcare Network is a free and open-source disaster management system that is used by National Health Mission, Government of India and various state governments for reimaging digital war rooms. The solution that students got an opportunity to intern with has supported 3.34Lac patient management and 1.29 Lac ambulance shiftings and is approved by the United Nations as a Digital Public Good.
-NEXT_PUBLIC_ORG_LOGO=/logo.webp 
-NEXT_PUBLIC_GITHUB_ORG=coronasafe
-NEXT_PUBLIC_SLACK_URL=https://slack.ohc.network
-NEXT_PUBLIC_ORG_START_DATE=2020-03-08
+NEXT_PUBLIC_ORG_NAME="ohc.network"
+NEXT_PUBLIC_ORG_INFO="Open Healthcare Network is a free and open-source disaster management system that is used by National Health Mission, Government of India and various state governments for reimaging digital war rooms. The solution that students got an opportunity to intern with has supported 3.34Lac patient management and 1.29 Lac ambulance shiftings and is approved by the United Nations as a Digital Public Good."
+NEXT_PUBLIC_ORG_LOGO="/logo.png"
+NEXT_PUBLIC_ORG_URL= "https://ohc.network/"
+NEXT_PUBLIC_GITHUB_ORG="ohcnetwork"
+NEXT_PUBLIC_SLACK_URL="https://slack.ohc.network"
+NEXT_PUBLIC_ORG_START_DATE="2020-03-08"
+NEXT_PUBLIC_TIMEZONE="Asia/Kolkata"
+NEXT_PUBLIC_GITHUB_URL="https://github.com/ohcnetwork"
+NEXT_PUBLIC_LINKEDIN_URL="https://www.linkedin.com/company/ohcn/"
+NEXT_PUBLIC_YOUTUBE_URL="https://www.youtube.com/@ohc.network"
+NEXT_PUBLIC_CONTACT_EMAIL="info@ohc.network"
 
 ## -- SEO details -- ##
-NEXT_PUBLIC_META_TITLE=Open Healthcare Network
-NEXT_PUBLIC_META_IMG=/logo.webp
-NEXT_PUBLIC_META_DESCRIPTION=OHC Network Leaderboard tracks the weekly progress of all coronasafe contributors.
-NEXT_PUBLIC_META_URL=https://leaderboard.ohc.network
+NEXT_PUBLIC_META_TITLE="Open Healthcare Network"
+NEXT_PUBLIC_META_IMG="/logo.webp"
+NEXT_PUBLIC_META_DESCRIPTION="ohc.network Leaderboard tracks the weekly contributions across different contributors working on projects in the organisation."
+NEXT_PUBLIC_META_URL="https://contributors.ohc.network"
 
 ## -- Page Details -- ##
-NEXT_PUBLIC_PAGE_TITLE=OHC Network Contributors
+NEXT_PUBLIC_PAGE_TITLE="OHC Network Contributors"
 NEXT_PUBLIC_CONTRIBUTORS_INFO=""
-NEXT_PUBLIC_LEADERBOARD_DEFAULT_ROLES=core,intern,contributor
+NEXT_PUBLIC_LEADERBOARD_DEFAULT_ROLES="core,intern,contributor"
 
 ## -- Data Source -- ##
-DATA_SOURCE=https://github.com/coronasafe/leaderboard-data.git
+DATA_SOURCE="https://github.com/ohcnetwork/leaderboard-data.git"
+NEXT_PUBLIC_DATA_SOURCE="https://github.com/ohcnetwork/leaderboard-data.git"
+NEXT_PUBLIC_FLAT_REPO_EXPLORER_URL="https://flatgithub.com/ohcnetwork/leaderboard-data"
+
+## -- Slack -- ##
+# SLACK_EOD_BOT_TOKEN=<Slack EOD Bot User's OAuth Token>
+# SLACK_EOD_BOT_SIGNING_SECRET=<Slack EOD Bot App's Signing Secret>
+
+## -- Features -- ##
+NEXT_PUBLIC_FEATURES=Leaderboard,Contributors,Feed,Releases,Projects,Discussions

.envrc

@@ -0,0 +1,2 @@
+dotenv
+test -f .env.local && dotenv .env.local

.eslintrc.json

@@ -18,5 +18,5 @@
       }
     ]
   },
-  "ignorePatterns": ["data"]  
+  "ignorePatterns": ["data"]
 }

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,19 @@
+name: Suggest a new feature or improvement for the leaderboard Website
+description: 'Do you have an idea or a suggestion and you want to share?'
+labels: [feature request]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        You have an idea how to improve the site? That's awesome!
+        Before submitting, please have a look at the existing issues if there's already
+        something related to your suggestion.
+  - type: textarea
+    attributes:
+      label: 'Enter your suggestions in details:'
+      placeholder: |
+        1. What I expected to happen.
+        2. Your reason (if possible, images or videos are welcome).
+        3. What I plan to do (Optional but better).
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/technical-visual.yml

@@ -0,0 +1,50 @@
+name: Report a Technical/Visual Issue on the leaderboard Website
+description: 'Is something not working as expected? Did you encounter a glitch or a bug with the Website?'
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting an issue you've found on the leaderboard website.
+        Please fill in the template below. If unsure about something, just do as best
+        as you're able. If you are reporting a visual glitch, it will be much easier
+        for us to fix it when you attach a screenshot as well.
+  - type: input
+    attributes:
+      label: 'URL:'
+      description: The URL of the page you are reporting an issue on.
+      placeholder: https://contributors.ohc.network/
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 'Browser Name:'
+      description: What kind of browser are you using?
+      placeholder: Chrome
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 'Browser Version:'
+      description: What version of browser are you using?
+      placeholder: '103.0.5060.134'
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 'Operating System:'
+      description: What kind of operation system are you using
+        (Write it in full, with version number)?
+      placeholder: 'Windows 10, 21H2, 19044.1826'
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 'How to reproduce the issue:'
+      placeholder: |
+        1. What I did.
+        2. What I expected to happen.
+        3. What I actually got.
+        4. If possible, images or videos are welcome.
+    validations:
+      required: true

.github/workflows/scraper-dry-run.yaml

@@ -1,9 +1,12 @@
-name: Scraper Dry Run
+name: Scraper Dry Run & Validate Schema
 
 on:
+  workflow_dispatch:
   pull_request:
     paths:
       - scraper/**
+      - tests/**
+      - schemas/**
 
 jobs:
   test-run-github-scraper:
@@ -12,23 +15,35 @@ jobs:
     permissions:
       issues: read
       pull-requests: read
+    env:
+      DATA_REPO: ./
     steps:
       - uses: actions/checkout@v4
 
-      - name: setup python
-        uses: actions/setup-python@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
         with:
-          python-version: "3.10"
+          node-version: "20.14.0"
 
-      - run: rm data contributors && mkdir data contributors
+      - name: Install pnpm
+        run: npm install -g pnpm
 
       - name: Install dependencies
-        run: pip install -r scraper/requirements.txt
+        run: pnpm install --frozen-lockfile
+        working-directory: scraper
+
+      - name: Build the project
+        run: pnpm build
+        working-directory: scraper
 
       - name: Scrape data from GitHub
-        run: python scraper/src/github.py ${{ github.repository_owner }} data/github -l DEBUG
+        run: pnpm start ${{ github.repository_owner }} ../data/github
+        working-directory: scraper
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.SCRAPER_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          PROJECTS_BOARD_ID: PVT_kwDOA7JD8804yA
+
+      - run: mkdir contributors
 
       - name: Generate markdown files for new contributors
         run: node scripts/generateNewContributors.js
@@ -42,3 +57,20 @@ jobs:
           path: |
             data
             contributors
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Run Tests
+        run: pnpm test

.github/workflows/scraper.yaml

@@ -4,7 +4,21 @@ on:
       slack-eod-channel:
         required: false
         type: string
+      leaderboard_ref:
+        required: false
+        type: string
+        default: main
+        description: A specific branch of scraper that is to be used.
+      projects-board-id:
+        required: false
+        type: string
+        description: Experimental; Works only with particular project board structure. Requires `read:project` scope for the SCRAPER_GITHUB_TOKEN. Disabled if not configured.
     secrets:
+      SCRAPER_GITHUB_TOKEN:
+        required: false
+        description: Allows overriding the default GITHUB_TOKEN for providing scopes beyond what GITHUB_TOKEN can offer.
+      GIT_ACCESS_TOKEN:
+        required: true
       SLACK_API_TOKEN:
         required: false
 
@@ -13,42 +27,53 @@ jobs:
     name: Scrape data from GitHub and Slack
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4 # This pulls the caller workflow's repo (eg: coronasafe/leaderboard-data)
+      - uses: actions/checkout@v4 # This pulls the caller workflow's repo (eg: ohcnetwork/leaderboard-data)
         with:
           token: ${{ secrets.GIT_ACCESS_TOKEN }}
       - uses: actions/checkout@v4
         with:
-          repository: coronasafe/leaderboard
+          repository: ohcnetwork/leaderboard
           path: ./leaderboard
+          ref: ${{ inputs.leaderboard_ref }}
           sparse-checkout: |
             scraper
             scripts
 
-      - name: setup python
-        uses: actions/setup-python@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20.14.0"
+      - run: npm install -g pnpm
+
+      - run: pnpm install --frozen-lockfile
+        working-directory: scraper
+
+      - run: pnpm build
+        working-directory: scraper
+
+      - name: Scrape data from GitHub
+        run: pnpm start ${{ github.repository_owner }} ../../data/github
+        working-directory: scraper
+        env:
+          GITHUB_TOKEN: ${{ secrets.SCRAPER_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
+          PROJECTS_BOARD_ID: ${{ inputs.projects-board-id }}
+
+      - uses: actions/setup-python@v3
         with:
           python-version: "3.10"
 
       - name: Install dependencies
         run: pip install -r scraper/requirements.txt
 
-      - name: Scrape GitHub data
-        uses: nick-fields/retry@v2
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: python scraper/src/github.py ${{ github.repository_owner }} data/github -l DEBUG
-          on_retry_command: git checkout .
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Scrape EOD updates from Slack Channel
         if: ${{ env.SLACK_API_TOKEN && env.SLACK_CHANNEL }}
         run: python scraper/src/slack.py --lookback_days=2
+        continue-on-error: true
         env:
           SLACK_API_TOKEN: ${{ secrets.SLACK_API_TOKEN }}
           SLACK_CHANNEL: ${{ inputs.slack-eod-channel }}
 
+      - run: mkdir -p contributors
+
       - name: Generate markdown files for new contributors
         run: node scripts/generateNewContributors.js
         env:

.gitignore

@@ -7,7 +7,6 @@
 .pnp.js
 bun.lockb
 package-lock.json
-pnpm-lock.yaml
 
 # testing
 /coverage
@@ -43,4 +42,10 @@ data-repo
 
 # Package Lock
 package-lock.json
-yarn.lock
+yarn.lock
+
+# Files placed by data-repo
+
+data/views/
+
+.venv/

.prettierrc.json

@@ -5,6 +5,11 @@
   "semi": true,
   "jsxSingleQuote": false,
   "arrowParens": "always",
-  "tailwindFunctions": ["classNames"],
-  "plugins": ["prettier-plugin-tailwindcss"]
-}
+  "tailwindFunctions": [
+    "classNames"
+  ],
+  "plugins": [
+    "prettier-plugin-tailwindcss"
+  ],
+  "endOfLine":"auto"
+}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Open Health Care Network
+Copyright (c) 2024 Open Health Care Network
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal