Update data sources for projects until 2024-04-24 and correct mapping of projects by name from HubSpot (#58)

Author: conradolandia

src/lib/config/data/donate.yaml

@@ -3,7 +3,7 @@ projects:
     slug: spyder
     image: /assets/media/spyder_splash_bg.webp
     donationLinkID: Pjm6SyqYNb
-    pastDonations: 19144
+    pastDonations: 15744
   - id: 1
     slug: code-completions
     image: /assets/media/donations-code_completions.webp

src/lib/i18n/en-US/donate.yaml

@@ -13,7 +13,7 @@ page:
 projects:
   - id: 0
     title: Support Spyder
-    collected: Raised so far
+    collected: Current balance
     separator: of
     intro: >-
       Do you want to support the Spyder project as a whole, with the money used where it is needed most? Donate here!

src/routes/donate/+page.js

@@ -23,12 +23,27 @@ export async function load({ fetch }) {
       };
     });
 
+    // Create a mapping of common terms in deal names to project slugs
+    const dealNameToSlugMap = {
+      "spyder": ["spyder"],
+      "code-completions": ["code completion", "smarter code"],
+      "new-viewer-pane": ["viewer pane", "new viewer"],
+      "syntax-highlighting": ["syntax highlight", "syntax-highlight"],
+      "variable-explorer-improvements": ["variable explorer", "level-up the variable"]
+    };
+
     // Sort deals into their respective projects
     hubspotData.pipelineDeals.forEach((deal) => {
+      const dealNameLower = deal.properties.dealname.toLowerCase();
+      
+      // Check each project for potential matches
       content.props.projects.forEach((project) => {
-        // Replace hyphens with spaces for comparison
-        const projectNameForComparison = project.slug.toLowerCase().replace(/-/g, ' ');
-        if (deal.properties.dealname.toLowerCase().includes(projectNameForComparison)) {
+        const possibleMatches = dealNameToSlugMap[project.slug] || [project.slug.replace(/-/g, ' ')];
+        
+        // Check if any of the possible matches are in the deal name
+        const isMatch = possibleMatches.some(match => dealNameLower.includes(match.toLowerCase()));
+        
+        if (isMatch) {
           projectDonations[project.slug].deals.push(deal);
           projectDonations[project.slug].total +=
             parseFloat(deal.properties.amount) || 0;

src/routes/donate/[slug]/+page.js

@@ -36,21 +36,32 @@ export async function load({ params, fetch }) {
       oneTime: 0,
     };
 
+    // Create a mapping of common terms in deal names to project slugs
+    const dealNameToSlugMap = {
+      "spyder": ["spyder"],
+      "code-completions": ["code completion", "smarter code"],
+      "new-viewer-pane": ["viewer pane", "new viewer"],
+      "syntax-highlighting": ["syntax highlight", "syntax-highlight"],
+      "variable-explorer-improvements": ["variable explorer", "level-up the variable"]
+    };
+
+    // Get the possible matches for this project's slug
+    const possibleMatches = dealNameToSlugMap[project.slug] || [project.slug.replace(/-/g, ' ')];
+
     // Get deals for this project
     hubspotData.pipelineDeals.forEach((deal) => {
-      // Replace hyphens with spaces for comparison
-      const projectNameForComparison = project.slug.toLowerCase().replace(/-/g, ' ');
-      if (
-        deal.properties.dealname.toLowerCase().includes(
-          projectNameForComparison
-        )
-      ) {
+      const dealNameLower = deal.properties.dealname.toLowerCase();
+      
+      // Check if any of the possible matches are in the deal name
+      const isMatch = possibleMatches.some(match => dealNameLower.includes(match.toLowerCase()));
+      
+      if (isMatch) {
         projectDonations.deals.push(deal);
         const amount = parseFloat(deal.properties.amount) || 0;
         projectDonations.total += amount;
 
         // Separate monthly and one-time donations
-        if (deal.properties.dealname.toLowerCase().includes("monthly")) {
+        if (dealNameLower.includes("monthly")) {
           projectDonations.monthly += amount;
         } else {
           projectDonations.oneTime += amount;

static/data/github-contributors.json

@@ -19,7 +19,7 @@
     "type": "User",
     "user_view_type": "public",
     "site_admin": false,
-    "contributions": 14409
+    "contributions": 14428
   },
   {
     "login": "dalthviz",
@@ -41,7 +41,7 @@
     "type": "User",
     "user_view_type": "public",
     "site_admin": false,
-    "contributions": 2465
+    "contributions": 2471
   },
   {
     "login": "PierreRaybaut",
@@ -129,7 +129,7 @@
     "type": "User",
     "user_view_type": "public",
     "site_admin": false,
-    "contributions": 943
+    "contributions": 985
   },
   {
     "login": "jnsebgosselin",
@@ -305,7 +305,7 @@
     "type": "User",
     "user_view_type": "public",
     "site_admin": false,
-    "contributions": 292
+    "contributions": 297
   },
   {
     "login": "hlouzada",
@@ -371,7 +371,7 @@
     "type": "User",
     "user_view_type": "public",
     "site_admin": false,
-    "contributions": 168
+    "contributions": 176
   },
   {
     "login": "bcolsen",
@@ -503,7 +503,7 @@
     "type": "User",
     "user_view_type": "public",
     "site_admin": false,
-    "contributions": 94
+    "contributions": 95
   },
   {
     "login": "dhoegh",