Revert "Merge pull request #14 from gitcoinco/card-update"

This reverts commit a326d24, reversing
changes made to e5216aa.

Author: 0xKurt

package.json

@@ -19,14 +19,13 @@
     "ethers": "^6.13.2",
     "express": "^4.18.2",
     "express-rate-limit": "^6.0.5",
-    "graphql": "^16.10.0",
     "graphql-request": "^6.1.0",
     "helmet": "^6.0.0",
     "jsdom": "^25.0.1",
     "jsonwebtoken": "^9.0.0",
     "next": "14.2.13",
     "postcss": "^8",
-    "puppeteer": "^23.11.1",
+    "puppeteer": "^23.5.3",
     "puppeteer-core": "^23.6.0",
     "react": "^18",
     "react-dom": "^18",

pnpm-lock.yaml

@@ -1,5 +1,5 @@
 import { Donation } from "@/app/types";
-import { Alts, getCardSvg, ProjectCount } from "../media/card2";
+import { Alts, getCardSvg, ProjectCount } from "../media/card";
 import { JSDOM } from "jsdom";
 import puppeteer from "puppeteer";
 import { getEnsName } from "./ens";
@@ -27,7 +27,7 @@ export async function fetchImageAndEns(
   }
 
   setRoundAndChainDetails(document, sortedDonations);
-  setSimpleTopRoundName(document, sortedDonations);
+  setTopRoundName(document, sortedDonations);
 
   const ensName = await getEnsName(donations[0].donorAddress);
   setWalletAddress(document, ensName || donations[0].donorAddress);
@@ -74,13 +74,13 @@ function sortDonationsByAmount(donations: Donation[]): Donation[] {
 }
 
 function singularify(document: Document, elementId: string): void {
-  // const element = document.getElementById(elementId);
-  // const textContent = element!.textContent ?? "";
-  // const words = textContent.split(" ");
-  // const singularWords = words.map((word) =>
-  //   word.endsWith("s") ? word.slice(0, -1) : word,
-  // );
-  // element!.textContent = singularWords.join(" ");
+  const element = document.getElementById(elementId);
+  const textContent = element!.textContent ?? "";
+  const words = textContent.split(" ");
+  const singularWords = words.map((word) =>
+    word.endsWith("s") ? word.slice(0, -1) : word,
+  );
+  element!.textContent = singularWords.join(" ");
 }
 
 function setRoundAndChainDetails(
@@ -167,20 +167,6 @@ function setTopRoundName(document: Document, donations: Donation[]): void {
   }
 }
 
-function setSimpleTopRoundName(document: Document, donations: Donation[]): void {
-  const topRound = findTopRound(donations);
-  const roundName = donations.find(
-    (donation) => donation.roundId === topRound.roundId,
-  )?.application?.round?.roundMetadata?.name || "";
-
-  const maxCharacters = 26;
-  const truncatedName = roundName.length > maxCharacters 
-    ? roundName.substring(0, maxCharacters - 3) + "..."
-    : roundName;
-
-  setElementTextContent(document, "top-round-0", truncatedName);
-}
-
 function setWalletAddress(document: Document, ensOrAddress: string): void {
   setElementTextContentAndFontSize(
     document,
@@ -296,12 +282,12 @@ function renderProjectDetails(
   setElementTextContent(
     document,
     `project${index}`,
-    trunc(30, donation.application?.project?.name) || "",
+    trunc(23, donation.application?.project?.name) || "",
   );
   setElementTextContent(
     document,
     `round${index}`,
-    trunc(50, donation.application?.round?.roundMetadata.name) || "",
+    trunc(30, donation.application?.round?.roundMetadata.name) || "",
   );
 
   const circle = document.getElementById(`logo${index}`);
@@ -436,12 +422,12 @@ async function generateBase64Image(dom: JSDOM): Promise<string> {
 
   const page = await browser.newPage();
   await page.setContent(dom.serialize());
-  await page.setViewport({ width: 1200, height: 600 });
+  await page.setViewport({ width: 800, height: 800 });
 
   const pngBuffer = await page.screenshot({
     type: "png",
     encoding: "binary",
-    clip: { x: 0, y: 0, width: 1200, height: 600 },
+    clip: { x: 0, y: 0, width: 800, height: 800 },
     omitBackground: true,
   });
 

src/app/api/getAttestation/attestationUtils.ts

@@ -1,7 +1,7 @@
 import { NextResponse, NextRequest } from "next/server";
 import { createDelegationRequest } from "@/services/CreateDelegationRequest";
 import { fetchDonationsByTransactionHashes } from "@/lib/indexer/queries";
-import { backgroundMapper, cardBackgrounds } from "../media/card2";
+import { backgroundMapper, cardBackgrounds } from "../media/card";
 import { fetchImageAndEns } from "./attestationUtils";
 import { allowedOrigins } from "@/app/config";
 

src/app/api/getAttestation/route.ts

@@ -1,8 +1,6 @@
 // NOTE: Update this file anytime a new allo is deployed.
 
 import { AddressLike } from "ethers";
-import dotenv from "dotenv";
-dotenv.config();
 
 type EASConfig = {
   eas: AddressLike;
@@ -143,7 +141,6 @@ export const allowedOrigins = [
   "http://localhost:3000",
   "https://grants-stack-explorer-staging.vercel.app",
   "https://explorer.gitcoin.co",
-  "https://explorer-git-update-attestations-grants-stack.vercel.app",
 ];
 
 export const config = {

src/app/api/media/card2.ts

@@ -4,22 +4,5 @@
       "memory": 3008,
       "maxDuration": 60
     }
-  },
-  "build": {
-    "env": {
-      "PUPPETEER_SKIP_DOWNLOAD": "true",
-      "PUPPETEER_EXECUTABLE_PATH": "/usr/bin/chromium"
-    }
-  },
-  "headers": [
-    {
-      "source": "/api/(.*)",
-      "headers": [
-        { "key": "Access-Control-Allow-Credentials", "value": "true" },
-        { "key": "Access-Control-Allow-Origin", "value": "*" },
-        { "key": "Access-Control-Allow-Methods", "value": "GET,OPTIONS,PATCH,DELETE,POST,PUT" },
-        { "key": "Access-Control-Allow-Headers", "value": "X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version" }
-      ]
-    }
-  ]
+  }
 }