Merge branch 'PalisadoesFoundation:develop' into develop

AdityaRaimec22 · Jul 1, 2023 · 6af8fff · 6af8fff
2 parents fa089e3 + ce51aa7
commit 6af8fff
Show file tree

Hide file tree

Showing 119 changed files with 22,170 additions and 9,702 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -27,6 +27,15 @@
       "rules": {
         "no-restricted-imports": "off"
       }
+    },
+    {
+      // Disable explicit function return type for index.ts as it uses a lot of templated code
+      // which has convulated return types
+      "files": ["./src/index.ts", "./src/utilities/copyToClipboard.ts"],
+      "rules": {
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/no-empty-function": "off"
+      }
     }
   ],
 

diff --git a/codegen.ts b/codegen.ts
@@ -25,6 +25,8 @@ const config: CodegenConfig = {
         // functionality is useful because what we retrieve from the database and what we choose to return from a graphql server
         // could be completely different fields. Address to models here is relative to the location of generated types.
         mappers: {
+          CheckIn: "../models/CheckIn#InterfaceCheckIn",
+
           MessageChat: "../models/MessageChat#InterfaceMessageChat",
 
           Comment: "../models/Comment#InterfaceComment",
@@ -38,7 +40,9 @@ const config: CodegenConfig = {
 
           Event: "../models/Event#InterfaceEvent",
 
-          // EventProject: '../models/EventProject#InterfaceEventProject'
+          EventAttendee: "../models/EventAttendee#InterfaceEventAttendee",
+
+          EventProject: "../models/EventProject#InterfaceEventProject",
 
           // File: '../models/File#InterfaceFile',