Merge branch 'PalisadoesFoundation:develop' into develop

PalisadoesFoundation · Feb 8, 2024 · 3fd0675 · 3fd0675
2 parents ad9a412 + fa10711
commit 3fd0675
Show file tree

Hide file tree

Showing 408 changed files with 3,236 additions and 1,385 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -19,7 +19,8 @@
       "plugins": ["@graphql-eslint"],
       // Do not apply naming conventions to .graphql files
       "rules": {
-        "@typescript-eslint/naming-convention": "off"
+        "@typescript-eslint/naming-convention": "off",
+        "@typescript-eslint/consistent-type-assertions": "off"
       }
     },
     {

diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml
@@ -39,6 +39,7 @@ jobs:
 
             ### Reviewers
 
+            Do not assign reviewers. Our Queue Monitors will review your PR and assign them. 
             When your PR has been assigned reviewers contact them to get your code reviewed and approved via:
 
             1. comments in this PR or

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -4,7 +4,7 @@
 # NOTE!
 #
 # Please read the README.md file in this directory that defines what should
-# be placed in this file
+# be placed in this file.
 #
 ##############################################################################
 ##############################################################################
@@ -25,6 +25,8 @@ jobs:
     steps:
       - name: Checkout repository content
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
 
       - name: Count number of lines
         run: |
@@ -49,8 +51,21 @@ jobs:
       - name: Install Dependencies
         run: npm ci
 
+      # Lint, but exclude typescript files in the .eslintignore file
+      # or else we'll get failures
+      - name: Get changed files
+        id: changed_files
+        uses: tj-actions/changed-files@v42
+        with:
+          files: |
+            **.ts
+            '!src/types/**.ts'
+
       - name: Run ESLint to check for linting errors in modified files
-        run: npx eslint $(git diff --name-only --diff-filter=d ${{ github.event.before }} ${{ github.sha }} -- '***.ts') 
+        if: steps.changed_files.outputs.any_changed == 'true'
+        env:
+          CHANGED_FILES: ${{ steps.changed_files.outputs.all_changed_files }}
+        run: npx eslint ${CHANGED_FILES} 
 
       - name: Check for formatting errors
         run: npm run format:check
@@ -180,6 +195,3 @@ jobs:
         run: |
           echo "PR is not against develop branch. Please refer PR_GUIDELINES.md"
           exit 1
-
-      
-
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -96,7 +96,7 @@ jobs:
   Generate-Documentation:
     name: Generate Documentation
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/develop'
+    # if: github.ref == 'refs/heads/automated-docs'
     needs: Push-Workflow
     steps:
       - name: Checkout repository
@@ -139,7 +139,7 @@ jobs:
           git config --global user.email "${{env.email}}"
           git add .
           git commit -m "Update documentation"
-          git push -f https://$GH_TOKEN@github.com/PalisadoesFoundation/talawa-api.git HEAD:develop
+          git push -f https://$GH_TOKEN@github.com/PalisadoesFoundation/talawa-api.git HEAD:automated-docs
           echo -e "🚀${Green} Hurrah! doc updated${NoColor}"
         env:
           ACCESS_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -152,7 +152,6 @@ jobs:
 
   Copy-docs-to-talawa-docs:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/develop'
     needs: Generate-Documentation
     steps:
     - uses: actions/checkout@v3
@@ -194,12 +193,12 @@ jobs:
           INPUT_MAIL_PASSWORD: ${{ secrets.API_DEMO_MAIL_PASSWORD }}
           INPUT_LAST_RESORT_SUPERADMIN_EMAIL: ${{ secrets.API_DEMO_LAST_RESORT_SUPERADMIN_EMAIL }}
         with:
-          host: ${{ secrets.API_DEMO_HOST }}
+          host: ${{secrets.API_DEMO_HOST}}
           username: ${{ secrets.API_DEMO_USERNAME }}
           key: ${{ secrets.API_DEMO_SSH_KEY }}
           port: ${{ secrets.API_DEMO_SSH_PORT}}
           allenvs: true
           command_timeout: 30m
           script: |
             python3 /usr/local/bin/scripts/create_env.py --access_token_secret $INPUT_ACCESS_TOKEN_SECRET --refresh_token_secret $INPUT_REFRESH_TOKEN_SECRET --recaptcha_secret_key $INPUT_RECAPTCHA_SECRET_KEY --mail_username $INPUT_MAIL_USERNAME --mail_password $INPUT_MAIL_PASSWORD --last_resort_superadmin_email $INPUT_LAST_RESORT_SUPERADMIN_EMAIL
-            python3 /usr/local/bin/scripts/deploy.py --path ~/develop --branch develop
+            python3 /usr/local/bin/scripts/deploy.py --path ~/develop --branch develop
diff --git a/README.md b/README.md
@@ -25,10 +25,11 @@ Core features include:
 
 <!-- toc -->
 
-- [Talawa Components](#talawa-components)
-- [Documentation](#documentation)
-- [Installation](#installation)
-- [Image Upload](#image-upload)
+- [Talawa API](#talawa-api)
+  - [Talawa Components](#talawa-components)
+  - [Documentation](#documentation)
+  - [Installation](#installation)
+  - [Image Upload](#image-upload)
 
 <!-- tocstop -->
 
@@ -52,4 +53,4 @@ Core features include:
 
 ## Image Upload
 
-To enable image upload functionalities create an images folder in the root of the project
+To enable image upload functionalities create an images folder in the root of the project
diff --git a/codegen.ts b/codegen.ts
@@ -47,6 +47,8 @@ const config: CodegenConfig = {
 
           EventAttendee: "../models/EventAttendee#InterfaceEventAttendee",
 
+          UserFamily: "../models/userFamily#InterfaceUserFamily",
+
           Feedback: "../models/Feedback#InterfaceFeedback",
 
           // File: '../models/File#InterfaceFile',