Merge branch 'develop' into reply-functionality

PalisadoesFoundation · Oct 16, 2024 · 08ad877 · 08ad877
2 parents da87a78 + c1dc667
commit 08ad877
Show file tree

Hide file tree

Showing 27 changed files with 2,508 additions and 2,004 deletions.
diff --git a/.github/workflows/codeql-codescan.yml b/.github/workflows/codeql-codescan.yml
@@ -21,7 +21,8 @@ on:
 
 jobs:
   CodeQL:
-    name: CodeQL
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    name: Analyse Code With CodeQL
     runs-on: ubuntu-latest
     permissions:
       actions: read

diff --git a/.github/workflows/md_mdx_format_adjuster.py → ...lows/talawa_api_md_mdx_format_adjuster.py b/.github/workflows/md_mdx_format_adjuster.py → ...lows/talawa_api_md_mdx_format_adjuster.py
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Core features include:
 
 `talawa` is based on the original `quito` code created by the [Palisadoes Foundation](http://www.palisadoes.org) as part of its annual Calico Challenge program. Calico provides paid summer internships for Jamaican university students to work on selected open source projects. They are mentored by software professionals and receive stipends based on the completion of predefined milestones. Calico was started in 2015. Visit [The Palisadoes Foundation's website](http://www.palisadoes.org/) for more details on its origin and activities.
 
-## Table of Contents
+##  Table of Contents
 
 <!-- toc -->
 

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -3,126 +3,160 @@ import tsdoc from "eslint-plugin-tsdoc";
 import _import from "eslint-plugin-import";
 import { fixupPluginRules } from "@eslint/compat";
 import tsParser from "@typescript-eslint/parser";
+import * as parser from "@graphql-eslint/eslint-plugin";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import js from "@eslint/js";
 import { FlatCompat } from "@eslint/eslintrc";
+import * as graphqlEslint from "@graphql-eslint/eslint-plugin";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const compat = new FlatCompat({
-    baseDirectory: __dirname,
-    recommendedConfig: js.configs.recommended,
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
 });
 
-export default [{
+export default [
+  {
     ignores: [
-        "**/.github",
-        "**/.vscode",
-        "**/build",
-        "**/coverage",
-        "**/node_modules",
-        "src/types",
-        "docs/Schema.md",
+      "**/.github",
+      "**/.vscode",
+      "**/build",
+      "**/coverage",
+      "**/node_modules",
+      "src/types",
+      "docs/Schema.md",
     ],
-}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"), {
+  },
+  ...compat.extends(
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier",
+  ),
+  {
     plugins: {
-        "@typescript-eslint": typescriptEslint,
-        tsdoc,
-        "import": fixupPluginRules(_import),
+      "@typescript-eslint": typescriptEslint,
+      tsdoc,
+      import: fixupPluginRules(_import),
     },
 
     languageOptions: {
-        parser: tsParser,  
+      parser: tsParser,
+      globals: globals.node,
     },
-
     rules: {
-        "no-restricted-imports": ["error", {
-            patterns: ["**/src/**"],
-        }],
-
-        "import/no-duplicates": "error",
-        "tsdoc/syntax": "error",
-        "@typescript-eslint/ban-ts-comment": "error",
-        "@typescript-eslint/no-duplicate-enum-values": "error",
-        "@typescript-eslint/no-explicit-any": "warn",
-        "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
-        "@typescript-eslint/no-non-null-assertion": "error",
-        "@typescript-eslint/no-var-requires": "error",
+      "no-restricted-imports": [
+        "error",
+        {
+          patterns: ["**/src/**"],
+        },
+      ],
+      "import/no-duplicates": "error",
+      "tsdoc/syntax": "error",
+      "@typescript-eslint/ban-ts-comment": "error",
+      "@typescript-eslint/no-empty-object-type": "error", 
+      "@typescript-eslint/no-unsafe-function-type": "error", 
+      "@typescript-eslint/no-wrapper-object-types": "error", 
+      "@typescript-eslint/no-duplicate-enum-values": "error",
+      "@typescript-eslint/no-explicit-any": "warn",
+      "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
+      "@typescript-eslint/no-non-null-assertion": "error",
+      "@typescript-eslint/no-var-requires": "error",
     },
-}, {
+  },
+  {
     files: ["**/*.ts"],
 
     languageOptions: {
-        parser: tsParser,
-        ecmaVersion: "latest",
-        sourceType: "module",
+      parser: tsParser,
+      ecmaVersion: "latest",
+      sourceType: "module",
 
-        parserOptions: {
-            project: "./tsconfig.json",
-            tsconfigRootDir: ".",
-        },
+      parserOptions: {
+        project: "./tsconfig.json",
+        tsconfigRootDir: ".",
+      },
     },
 
     rules: {
-        "@typescript-eslint/array-type": "error",
-        "@typescript-eslint/consistent-type-assertions": "error",
-        "@typescript-eslint/consistent-type-imports": "error",
-        "@typescript-eslint/explicit-function-return-type": "error",
+      "@typescript-eslint/array-type": "error",
+      "@typescript-eslint/consistent-type-assertions": "error",
+      "@typescript-eslint/consistent-type-imports": "error",
+      "@typescript-eslint/explicit-function-return-type": "error",
 
-        "@typescript-eslint/naming-convention": ["error", {
-            selector: "interface",
-            format: ["PascalCase"],
-            prefix: ["Interface", "TestInterface"],
-        }, {
-            selector: ["typeAlias", "typeLike", "enum"],
-            format: ["PascalCase"],
-        }, {
-            selector: "typeParameter",
-            format: ["PascalCase"],
-            prefix: ["T"],
-        }, {
-            selector: "variable",
-            format: ["camelCase", "UPPER_CASE"],
-            leadingUnderscore: "allow",
-        }, {
-            selector: "parameter",
-            format: ["camelCase"],
-            leadingUnderscore: "allow",
-        }, {
-            selector: "function",
-            format: ["camelCase"],
-        }, {
-            selector: "memberLike",
-            modifiers: ["private"],
-            format: ["camelCase"],
-            leadingUnderscore: "require",
-        }, {
-            selector: "variable",
-            modifiers: ["exported"],
-            format: null,
-        }],
+      "@typescript-eslint/naming-convention": [
+        "error",
+        {
+          selector: "interface",
+          format: ["PascalCase"],
+          prefix: ["Interface", "TestInterface"],
+        },
+        {
+          selector: ["typeAlias", "typeLike", "enum"],
+          format: ["PascalCase"],
+        },
+        {
+          selector: "typeParameter",
+          format: ["PascalCase"],
+          prefix: ["T"],
+        },
+        {
+          selector: "variable",
+          format: ["camelCase", "UPPER_CASE"],
+          leadingUnderscore: "allow",
+        },
+        {
+          selector: "parameter",
+          format: ["camelCase"],
+          leadingUnderscore: "allow",
+        },
+        {
+          selector: "function",
+          format: ["camelCase"],
+        },
+        {
+          selector: "memberLike",
+          modifiers: ["private"],
+          format: ["camelCase"],
+          leadingUnderscore: "require",
+        },
+        {
+          selector: "variable",
+          modifiers: ["exported"],
+          format: null,
+        },
+      ],
     },
-}, {
+  },
+  {
     files: ["./src/typeDefs/**/*.ts"],
     processor: "@graphql-eslint/graphql",
-}, {
+  },
+  {
     files: ["./src/typeDefs/**/*.graphql"],
 
     plugins: {
-        "@graphql-eslint": typescriptEslint,
+      "@graphql-eslint": graphqlEslint,
+    },
+
+    languageOptions: {
+      parser: parser,
     },
-}, {
+  },
+  {
     files: ["tests/**/*"],
 
     rules: {
-        "no-restricted-imports": "off",
+      "no-restricted-imports": "off",
     },
-}, {
+  },
+  {
     files: ["./src/index.ts", "./src/utilities/copyToClipboard.ts"],
 
     rules: {
-        "@typescript-eslint/explicit-function-return-type": "off",
-        "@typescript-eslint/no-empty-function": "off",
+      "@typescript-eslint/explicit-function-return-type": "off",
+      "@typescript-eslint/no-empty-function": "off",
     },
-}];
+  },
+];
diff --git a/locales/en.json b/locales/en.json
@@ -29,6 +29,7 @@
   "invalid.fileType": "Invalid file type",
   "invalid.refreshToken": "Invalid refresh token",
   "invalid.credentials": "Invalid credentials",
+  "invalid.timeoutRange": "Invalid timeout range",
   "registrant.alreadyExist": "Already registered for the event",
   "member.notFound": "Member not found",
   "registrant.alreadyUnregistered": "Already unregistered for the event",

diff --git a/locales/fr.json b/locales/fr.json
@@ -28,6 +28,7 @@
   "invalid.fileType": "Type de fichier non valide",
   "invalid.refreshToken": "Jeton d'actualisation non valide",
   "invalid.credentials": "Informations d'identification non valides",
+  "invalid.timeoutRange": "Plage de temps d'attente non valide",
   "registrant.alreadyExist": "Déjà inscrit à l'événement",
   "member.notFound": "Membre introuvable",
   "registrant.alreadyUnregistered": "Déjà non inscrit à l'événement",

diff --git a/locales/hi.json b/locales/hi.json
@@ -29,6 +29,7 @@
   "invalid.fileType": "अमान्य फ़ाइल प्रकार",
   "invalid.refreshToken": "अमान्य रीफ़्रेश टोकन",
   "invalid.credentials": "अवैध प्रत्यय पत्र",
+  "invalid.timeoutRange": "अमान्य टाइमआउट रेंज",
   "registrant.alreadyExist": "घटना के लिए पहले से पंजीकृत",
   "member.notFound": "सदस्य अनुपस्थित",
   "registrant.alreadyUnregistered": "घटना के लिए पहले से ही अपंजीकृत",

diff --git a/locales/sp.json b/locales/sp.json
@@ -28,6 +28,7 @@
   "invalid.fileType": "Tipo de archivo no válido",
   "invalid.refreshToken": "Token de actualización no válido",
   "invalid.credentials": "Credenciales no válidas",
+  "invalid.timeoutRange": "Rango de tiempo de espera no válido",
   "registrant.alreadyExist": "Ya inscrito para el evento",
   "member.notFound": "Miembro no encontrado",
   "registrant.alreadyUnregistered": "Ya no está registrado para el evento",

diff --git a/locales/zh.json b/locales/zh.json
@@ -28,6 +28,7 @@
   "invalid.fileType": "無效的文件類型",
   "invalid.refreshToken": "無效的刷新令牌",
   "invalid.credentials": "無效的憑據",
+  "invalid.timeoutRange": "无效的超时范围",
   "registrant.alreadyExist": "已经报名参加活动",
   "member.notFound": "未找到成员",
   "registrant.alreadyUnregistered": "已取消注册该活动",