Merge pull request #21 from Havilah-Blockchain-Studios/main

Chore: fix the changes for github pages

Author: christianchimezie

.github/workflows/deploy-pages.yml

@@ -36,14 +36,73 @@ jobs:
         pip install requests python-dateutil
 
     - name: Generate submission data
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         python << 'EOF'
         import json
         import os
         import glob
+        import requests
         from pathlib import Path
         from datetime import datetime, timezone
 
+        def fetch_pr_data():
+            """Fetch PR data from GitHub API"""
+            token = os.environ.get('GITHUB_TOKEN')
+            repo = os.environ.get('GITHUB_REPOSITORY', 'PlotSenseAI/PlotSenseAI-Hackathon-Submissions')
+
+            headers = {'Authorization': f'token {token}'} if token else {}
+
+            # Fetch open PRs targeting review branch
+            open_prs_url = f'https://api.github.com/repos/{repo}/pulls?state=open&base=review&per_page=100'
+            merged_prs_url = f'https://api.github.com/repos/{repo}/pulls?state=closed&base=review&per_page=100'
+
+            pr_data = {
+                'open_prs': [],
+                'merged_prs': [],
+                'total_open': 0,
+                'total_merged': 0
+            }
+
+            try:
+                # Get open PRs
+                response = requests.get(open_prs_url, headers=headers, timeout=10)
+                if response.status_code == 200:
+                    open_prs = response.json()
+                    pr_data['open_prs'] = [{
+                        'number': pr['number'],
+                        'title': pr['title'],
+                        'user': pr['user']['login'],
+                        'created_at': pr['created_at'],
+                        'html_url': pr['html_url'],
+                        'state': 'open'
+                    } for pr in open_prs]
+                    pr_data['total_open'] = len(pr_data['open_prs'])
+
+                # Get merged PRs
+                response = requests.get(merged_prs_url, headers=headers, timeout=10)
+                if response.status_code == 200:
+                    closed_prs = response.json()
+                    merged_prs = [pr for pr in closed_prs if pr.get('merged_at')]
+                    pr_data['merged_prs'] = [{
+                        'number': pr['number'],
+                        'title': pr['title'],
+                        'user': pr['user']['login'],
+                        'created_at': pr['created_at'],
+                        'merged_at': pr['merged_at'],
+                        'html_url': pr['html_url'],
+                        'state': 'merged'
+                    } for pr in merged_prs]
+                    pr_data['total_merged'] = len(pr_data['merged_prs'])
+
+                print(f"Fetched {pr_data['total_open']} open PRs and {pr_data['total_merged']} merged PRs")
+
+            except Exception as e:
+                print(f"Error fetching PR data: {e}")
+
+            return pr_data
+
         def collect_submissions():
             submissions = []
             submission_files = []
@@ -83,7 +142,7 @@ jobs:
 
             return submissions
 
-        def generate_metrics(submissions):
+        def generate_metrics(submissions, pr_data):
             if not submissions:
                 return {
                     'total_submissions': 0,
@@ -92,7 +151,8 @@ jobs:
                     'status_counts': {'validated': 0, 'pending': 0, 'failed': 0},
                     'tech_stack_usage': {},
                     'team_sizes': {},
-                    'submission_timeline': []
+                    'submission_timeline': [],
+                    'prs': pr_data
                 }
 
             metrics = {
@@ -102,7 +162,8 @@ jobs:
                 'status_counts': {'validated': 0, 'pending': 0, 'failed': 0},
                 'tech_stack_usage': {},
                 'team_sizes': {},
-                'submission_timeline': []
+                'submission_timeline': [],
+                'prs': pr_data
             }
 
             for track in ['PlotSense ML', 'PlotSense Dev']:
@@ -131,9 +192,12 @@ jobs:
 
             return metrics
 
+        # Fetch PR data
+        pr_data = fetch_pr_data()
+
         # Collect September 2025 submissions
         submissions = collect_submissions()
-        metrics = generate_metrics(submissions)
+        metrics = generate_metrics(submissions, pr_data)
 
         # Create directory structure for September 2025 hackathon
         os.makedirs('docs/data/september-2025', exist_ok=True)

.github/workflows/validate-submission.yml

@@ -31,6 +31,7 @@ jobs:
           pip install jsonschema requests
 
       - name: Validate submission
+        id: validate
         run: |
           python << 'EOF'
           import json
@@ -136,19 +137,76 @@ jobs:
                   else:
                       validation_results.append("INFO: **Contribution PRs** - Not required for ML track")
 
-              # Build report
+              # Build detailed report
               report = "## Submission Validation Results\n\n"
-              report += f"**File:** `{json_file.name}`\n\n"
+              report += f"**Submission File:** `{json_file.name}`\n\n"
 
-              if missing_fields:
+              # Determine overall status
+              failed_checks = [r for r in results + validation_results if "FAIL" in r]
+              passed_checks = [r for r in results + validation_results if "PASS" in r]
+              info_checks = [r for r in results + validation_results if "INFO" in r]
+
+              if missing_fields or any("FAIL" in r for r in validation_results):
                   report += "### VALIDATION FAILED\n\n"
-              elif any("FAIL" in r for r in validation_results):
-                  report += "### PARTIAL VALIDATION\n\n"
+                  report += f"**Status:** {len(failed_checks)} check(s) failed, {len(passed_checks)} check(s) passed\n\n"
+                  report += "---\n\n"
               else:
                   report += "### VALIDATION PASSED\n\n"
-
-              report += "**Required Fields Check:**\n" + "\n".join(f"- {r}" for r in results) + "\n\n"
-              report += "**Additional Validations:**\n" + "\n".join(f"- {r}" for r in validation_results) + "\n"
+                  report += f"**Status:** All {len(passed_checks)} checks passed successfully!\n\n"
+                  report += "---\n\n"
+
+              # Show failed checks first if any
+              if failed_checks:
+                  report += "### Failed Checks (Action Required)\n\n"
+                  report += "**Please fix the following issues:**\n\n"
+                  for i, check in enumerate(failed_checks, 1):
+                      clean_check = check.replace("FAIL: ", "")
+                      report += f"{i}. {clean_check}\n"
+                  report += "\n---\n\n"
+
+              # Show all required fields check
+              report += "### Required Fields\n\n"
+              for result in results:
+                  if "PASS" in result:
+                      clean_result = result.replace("PASS: ", "")
+                      report += f"- [PASS] {clean_result}\n"
+                  elif "FAIL" in result:
+                      clean_result = result.replace("FAIL: ", "")
+                      report += f"- [FAIL] {clean_result}\n"
+              report += "\n"
+
+              # Show additional validations
+              report += "### Additional Validations\n\n"
+              for result in validation_results:
+                  if "PASS" in result:
+                      clean_result = result.replace("PASS: ", "")
+                      report += f"- [PASS] {clean_result}\n"
+                  elif "FAIL" in result:
+                      clean_result = result.replace("FAIL: ", "")
+                      report += f"- [FAIL] {clean_result}\n"
+                  elif "INFO" in result:
+                      clean_result = result.replace("INFO: ", "")
+                      report += f"- [INFO] {clean_result}\n"
+              report += "\n"
+
+              # Add helpful instructions if there are failures
+              if failed_checks:
+                  report += "---\n\n"
+                  report += "### How to Fix\n\n"
+                  report += "1. Review the **Failed Checks** section above\n"
+                  report += "2. Update your submission JSON file with the required information\n"
+                  report += "3. Commit and push your changes to re-trigger validation\n"
+                  report += "4. Ensure your repository URL follows the format: `plotsenseai-hackathon-PSH2025-XXX`\n"
+                  report += "5. For Dev track submissions, include valid PR links to the PlotSense repository\n\n"
+
+              # Summary
+              report += "---\n\n"
+              report += "### Validation Summary\n\n"
+              report += f"- **Total Checks:** {len(results) + len(validation_results)}\n"
+              report += f"- **Passed:** {len(passed_checks)}\n"
+              report += f"- **Failed:** {len(failed_checks)}\n"
+              if info_checks:
+                  report += f"- **Info:** {len(info_checks)}\n"
 
               return report
 
@@ -157,11 +215,15 @@ jobs:
           with open('validation_results.txt', 'w') as f:
               f.write(validation_report)
 
+          # Write to GitHub Actions summary
+          with open(os.environ.get('GITHUB_STEP_SUMMARY', 'summary.md'), 'w') as f:
+              f.write(validation_report)
+
           if "VALIDATION FAILED" in validation_report or "PARTIAL VALIDATION" in validation_report:
-              print("Validation failed - check results")
+              print("::error::Validation failed - check results for details")
               sys.exit(1)
           else:
-              print("Validation passed!")
+              print("::notice::Validation passed successfully!")
           EOF
 
       - name: Comment on PR

DEV_TRACK_GUIDE.md

@@ -142,8 +142,8 @@ Create or update your team's submission file:
 ### Submission Steps
 
 1. **Create Your Contribution PR**: Submit your PR to PlotSenseAI/PlotSense
-2. **Document Your Submission**: Create a JSON file in `submissions/september-2025/dev/your-team-name.json`
-3. **Submit Your Entry**: Create a PR to this repository with your submission file
+2. **Document Your Submission**: Create a JSON file in `submissions/plotsense-2025-dev/your-team-name.json`
+3. **Submit Your Entry**: Create a PR to the official [PlotSenseAI-Hackathon-Submissions](https://github.com/PlotSenseAI/PlotSenseAI-Hackathon-Submissions) repository with your submission file
 
 ## Quality Guidelines
 

README.md

@@ -1,5 +1,5 @@
 
-# 🚀 PlotSenseAI OpenSource Hackathon Submissions
+# PlotSenseAI OpenSource Hackathon Submissions
 
 ![Submission Validation](https://github.com/PlotSenseAI/PlotSenseAI-Hackathon-Submissions/workflows/Validate%20Submission/badge.svg)
 
@@ -9,19 +9,19 @@ Welcome to the official submission repository for the **PlotSenseAI Hackathon**
 Access the live dashboard of submissions and their statuses here:
 [![Hackathon Dashboard](https://img.shields.io/badge/Dashboard-View%20Submissions-blue?logo=github)](https://plotsenseai.github.io/PlotSenseAI-Hackathon-Submissions/)
 
-## 🏆 Prize Pool Breakdown
+## Prize Pool Breakdown
 
-💰 **Total Prize Pool: £600**
+**Total Prize Pool: £600**
 
-### 🏅 Track 1 — PlotSense ML (£200)
+### Track 1 — PlotSense ML (£200)
 Use PlotSenseAI as your primary tool for exploratory data analysis (EDA) in a machine learning project.
 
-### 🏅 Track 2 — PlotSense Dev (£400)
+### Track 2 — PlotSense Dev (£400)
 Develop modules that add advanced analytical capabilities to PlotSenseAI's core functionality.
 
-📖 **For detailed guidelines on Dev Track contributions, see [DEV_TRACK_GUIDE.md](DEV_TRACK_GUIDE.md)**
+**For detailed guidelines on Dev Track contributions, see [DEV_TRACK_GUIDE.md](DEV_TRACK_GUIDE.md)**
 
-## 📋 Submission Process
+## Submission Process
 
 ### Step 1: Fill the Submission Form
 - Complete the [Google Form](https://forms.gle/pdBzSpuJ9iV3Tkhy8 "Open the submission form") with:
@@ -44,8 +44,11 @@ Create a **public GitHub repository** with:
 
 ### Step 3: Submit to This Repository
 
-#### 🍴 Fork & Create Submission
-1. **Fork** this repository to your GitHub account
+> **Important:** Submit your entry to the official PlotSense Hackathon Submissions repository:
+> **https://github.com/PlotSenseAI/PlotSenseAI-Hackathon-Submissions/**
+
+#### Fork & Create Submission
+1. **Fork** the [PlotSenseAI-Hackathon-Submissions](https://github.com/PlotSenseAI/PlotSenseAI-Hackathon-Submissions) repository to your GitHub account
 2. **Choose your track** and navigate to the appropriate directory:
    - **PlotSense ML Track**: `submissions/plotsense-2025-ml/`
    - **PlotSense Dev Track**: `submissions/plotsense-2025-dev/`
@@ -100,7 +103,7 @@ Create a **public GitHub repository** with:
 }
 ```
 
-#### 📤 Submit Pull Request
+#### Submit Pull Request
 1. **Commit** your JSON file to your fork
 2. **Open a Pull Request** to the `review` branch
 3. **PR Title:** `Submission: [YOUR-ID] - [Project Name]`
@@ -121,13 +124,13 @@ Create a **public GitHub repository** with:
 Post in the `#submissions` Discord channel with:
 - GitHub repo link
 
-## 🔀 Branch Structure
+## Branch Structure
 
 - **`main`** → Official docs and approved submissions
 - **`review`** → Submit PRs here for review
 - **`archive/plotsense-2025`** → Post-hackathon archive
 
-## ✅ Requirements Checklist
+## Requirements Checklist
 
 Before submitting, ensure you have:
 - [ ] Filled out the Google Form and received your User ID
@@ -141,26 +144,26 @@ Before submitting, ensure you have:
 - [ ] Followed PlotSenseAI and Havilah Academy on X/Twitter, LinkedIn, and YouTube
 - [ ] Posted in Discord #submissions channel
 
-## 🎯 Important Notes
+## Important Notes
 
 - **One submission per team** - Only one JSON file per team
 - **Valid contact email required** - We'll use it for updates
 - **Complete all requirements** - Incomplete submissions may not be considered
 - **Public repositories only** - Ensure your project repo is public
 
-## 🤖 Automated Validation
+## Automated Validation
 
 When you submit your PR, our automated system will:
-- ✅ **Validate your JSON format** - Check all required fields are present
-- ✅ **Verify User ID format** - Ensure it matches PSH2025-XXX pattern
-- ✅ **Check repository URL** - Confirm it's a GitHub URL with your User ID
-- ✅ **Validate social media** - Ensure both Twitter/X and LinkedIn links are provided
-- ✅ **Verify email format** - Check your contact email is valid
-- ✅ **Review team structure** - Validate team member information
+- **Validate your JSON format** - Check all required fields are present
+- **Verify User ID format** - Ensure it matches PSH2025-XXX pattern
+- **Check repository URL** - Confirm it's a GitHub URL with your User ID
+- **Validate social media** - Ensure both Twitter/X and LinkedIn links are provided
+- **Verify email format** - Check your contact email is valid
+- **Review team structure** - Validate team member information
 
 The bot will comment on your PR with validation results. **Fix any issues** and push changes to re-trigger validation.
 
-## 🏆 Post-Hackathon
+## Post-Hackathon
 
 After the hackathon, all approved submissions will be:
 - Showcased on the PlotSenseAI website
@@ -172,6 +175,6 @@ After the hackathon, all approved submissions will be:
 
 **Questions?** Reach out in the Discord server.
 
-Happy hacking! 🚀
+Happy hacking!