Fix/some badges fix (#254)

* refactor: remove unused badge environment variables * refactor: remove unused commissionRole field in generateBadges.test.ts * fix: update text color in generateBadge function * fix: adjust vertical positioning of last name in generateBadge function * feat: add image field to BadgeField interface --------- Co-authored-by: Antoine D <[email protected]>
ungdev · Oct 11, 2024 · 09b5c29 · 09b5c29
1 parent e0721e7
commit 09b5c29
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 16 deletions.
diff --git a/src/controllers/admin/badges/generateBadges.ts b/src/controllers/admin/badges/generateBadges.ts
@@ -175,7 +175,7 @@ export default [
               type: field.permission,
               firstName: field.firstname ?? '',
               lastName: field.lastname ?? '',
-              image: '',
+              image: field.image ?? '',
               commissionName: field.commissionId,
             });
             break;

diff --git a/src/types.ts b/src/types.ts
@@ -256,6 +256,7 @@ export interface BadgeField {
   firstname?: string;
   lastname?: string;
   name?: string;
+  image?: string;
 }
 
 /**********/

diff --git a/src/utils/badge.ts b/src/utils/badge.ts
@@ -148,7 +148,7 @@ export const generateBadge = async (badges: Badge[]) => {
 
       // Place the text containing the name is the bottom middle in bold and in uppercase
       // Define a text format
-      const textFormat = document.font(fontFamily).fill([239, 220, 235]).fontSize(fontSize);
+      const textFormat = document.font(fontFamily).fill([23, 18, 74]).fontSize(fontSize);
 
       // 'for' because I dont like to repeat but I like potatoes and pain au chocolat
       for (let col = 0; col < columns; col++) {
@@ -168,7 +168,7 @@ export const generateBadge = async (badges: Badge[]) => {
           textFormat.text(
             lastName.toUpperCase(),
             offsetX - textFormat.widthOfString(lastName.toUpperCase()) / 2,
-            offsetY - 277 - lastNameHeight / 2,
+            offsetY - 282 - lastNameHeight / 2,
           );
           // Firstname
           const firstNameHeight = textFormat.heightOfString(firstName);

diff --git a/src/utils/env.ts b/src/utils/env.ts
@@ -9,18 +9,6 @@ if (process.env.NODE_ENV === 'test') {
   process.env.DATABASE_URL = environmentVariables.DATABASE_URL ?? process.env.DATABASE_URL;
   process.env.LOG_LEVEL = environmentVariables.LOG_LEVEL ?? process.env.DATABASE_URL;
   process.env.LOG_IN_TEST = environmentVariables.LOG_IN_TEST ?? process.env.DATABASE_URL;
-
-  const DEFAULT_BADGE_VALUE =
-    'UklGRuQAAABXRUJQVlA4INgAAADwBACdASoUABQAPpE8mEgloyKhKA1QsBIJQBdgZYJxgK4JKssRDyp7lsJ5Rak3yQAA/vnI9CS/M7kRjFmvnjfmI4TJM+XIMCRJagu7Gfl1v0cH9qxDy7E/T9HCIDF0nlAW0v1naOAP0lpIeJYgCMO3vbv8V0mW7p0duzFR0+ElIfb2Q9hHuypJruTnig9l3fTTsD7JF8wChfGL6UIA0/KHyuFplejMC0losqvbUAqsJlqd1jfz+cvAYTOfgUZ/4B3RvppVbKE0r9DgNXtEMp0UcsYV84AAAAA=';
-
-  process.env.BADGE_RESTRICTED = environmentVariables.BADGE_RESTRICTED ?? DEFAULT_BADGE_VALUE;
-  process.env.BADGE_RESTRICTED_BACK = environmentVariables.BADGE_RESTRICTED_BACK ?? DEFAULT_BADGE_VALUE;
-  process.env.BADGE_FULLACCESS = environmentVariables.BADGE_FULLACCESS ?? DEFAULT_BADGE_VALUE;
-  process.env.BADGE_FULLACCESS_BACK = environmentVariables.BADGE_FULLACCESS_BACK ?? DEFAULT_BADGE_VALUE;
-  process.env.BADGE_ORGAPRICE = environmentVariables.BADGE_ORGAPRICE ?? DEFAULT_BADGE_VALUE;
-  process.env.BADGE_ORGAPRICE_BACK = environmentVariables.BADGE_ORGAPRICE_BACK ?? DEFAULT_BADGE_VALUE;
-  process.env.BADGE_INVITE = environmentVariables.BADGE_INVITE ?? DEFAULT_BADGE_VALUE;
-  process.env.BADGE_INVITE_BACK = environmentVariables.BADGE_INVITE_BACK ?? DEFAULT_BADGE_VALUE;
 } else {
   // Load everything in another environment
   dotenv.config();

diff --git a/tests/admin/badges/generateBadges.test.ts b/tests/admin/badges/generateBadges.test.ts
@@ -208,7 +208,6 @@ describe('POST /admin/badges', () => {
         fields: [
           {
             type: 'singlecustom',
-            commissionRole: 'member',
             commissionId: 'dev / annimation',
             permission: 'orgaprice',
             firstname: 'John',