From 82836f05f2f83b12e3b2b89b11e40b74de25ee4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:53:41 -0800 Subject: [PATCH 01/14] chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433) Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0add51da52..165eb104cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "jest-preview": "^0.3.1", "lint-staged": "^15.2.8", "postcss-modules": "^6.0.0", - "sass": "^1.80.6", + "sass": "^1.80.7", "tsx": "^4.19.1", "vite-plugin-svgr": "^4.2.0", "whatwg-fetch": "^3.6.20" @@ -10617,9 +10617,9 @@ } }, "node_modules/immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz", + "integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==", "devOptional": true }, "node_modules/import-fresh": { @@ -16284,13 +16284,13 @@ } }, "node_modules/sass": { - "version": "1.80.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz", - "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==", + "version": "1.80.7", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.7.tgz", + "integrity": "sha512-MVWvN0u5meytrSjsU7AWsbhoXi1sc58zADXFllfZzbsBT1GHjjar6JwBINYPRrkx/zqnQ6uqbQuHgE95O+C+eQ==", "devOptional": true, "dependencies": { "chokidar": "^4.0.0", - "immutable": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { diff --git a/package.json b/package.json index 892a1331e4..f31394fce1 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "jest-preview": "^0.3.1", "lint-staged": "^15.2.8", "postcss-modules": "^6.0.0", - "sass": "^1.80.6", + "sass": "^1.80.7", "tsx": "^4.19.1", "vite-plugin-svgr": "^4.2.0", "whatwg-fetch": "^3.6.20" From a97314cbf994d3b02c24a458cd256db1a4148b27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:54:06 -0800 Subject: [PATCH 02/14] chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 13 +++++++------ package.json | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 165eb104cc..872a2773ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,7 +99,7 @@ "babel-jest": "^29.7.0", "cross-env": "^7.0.3", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-import": "^2.30.0", + "eslint-plugin-import": "^2.31.0", "eslint-plugin-jest": "^28.8.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-react": "^7.37.1", @@ -8910,9 +8910,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.30.0.tgz", - "integrity": "sha512-/mHNE9jINJfiD2EKkg1BKyPyUk4zdnT54YgbOgfjSakWT5oyX/qQLVNTkehyfpcMxZXMy1zyonZ2v7hZTX43Yw==", + "version": "2.31.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", + "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", "dev": true, "dependencies": { "@rtsao/scc": "^1.1.0", @@ -8923,7 +8923,7 @@ "debug": "^3.2.7", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.9", - "eslint-module-utils": "^2.9.0", + "eslint-module-utils": "^2.12.0", "hasown": "^2.0.2", "is-core-module": "^2.15.1", "is-glob": "^4.0.3", @@ -8932,13 +8932,14 @@ "object.groupby": "^1.0.3", "object.values": "^1.2.0", "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.8", "tsconfig-paths": "^3.15.0" }, "engines": { "node": ">=4" }, "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" } }, "node_modules/eslint-plugin-import/node_modules/debug": { diff --git a/package.json b/package.json index f31394fce1..89f47e405d 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "babel-jest": "^29.7.0", "cross-env": "^7.0.3", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-import": "^2.30.0", + "eslint-plugin-import": "^2.31.0", "eslint-plugin-jest": "^28.8.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-react": "^7.37.1", From 32eb6a9d37f08c9afa2670ddcd12c162a2d04c51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:54:35 -0800 Subject: [PATCH 03/14] chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435) Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts) --- updated-dependencies: - dependency-name: "@mui/x-charts" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 872a2773ca..a06030b145 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@mui/material": "^6.1.6", "@mui/private-theming": "^6.1.6", "@mui/system": "^6.1.6", - "@mui/x-charts": "^7.22.1", + "@mui/x-charts": "^7.22.2", "@mui/x-data-grid": "^7.22.1", "@mui/x-date-pickers": "^7.22.1", "@pdfme/generator": "^5.1.7", @@ -3938,9 +3938,9 @@ } }, "node_modules/@mui/x-charts": { - "version": "7.22.1", - "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.22.1.tgz", - "integrity": "sha512-zgr8CN4yLen5puqaX7Haj5+AoVG7E13HHsIiDoEAuQvuFDF0gKTxTTdLSKXqhd1qJUIIzJaztZtrr3YCVrENqw==", + "version": "7.22.2", + "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.22.2.tgz", + "integrity": "sha512-0Y2du4Ed7gOT53l8vVJ4vKT+Jz4Dh/iHnLy8TtL3+XhbPH9Ndu9Q30WwyyzOn84yt37hSUru/njQ1BWaSvVPHw==", "dependencies": { "@babel/runtime": "^7.25.7", "@mui/utils": "^5.16.6 || ^6.0.0", diff --git a/package.json b/package.json index 89f47e405d..e1eba54ff0 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@mui/material": "^6.1.6", "@mui/private-theming": "^6.1.6", "@mui/system": "^6.1.6", - "@mui/x-charts": "^7.22.1", + "@mui/x-charts": "^7.22.2", "@mui/x-data-grid": "^7.22.1", "@mui/x-date-pickers": "^7.22.1", "@pdfme/schemas": "^5.1.6", From ab509f625c2b086870e0d10971002391deefdec4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:54:56 -0800 Subject: [PATCH 04/14] chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a06030b145..f54418a39c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -85,7 +85,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.5.4", "@types/node-fetch": "^2.6.10", - "@types/react": "^18.3.3", + "@types/react": "^18.3.12", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-bootstrap": "^0.32.37", "@types/react-chartjs-2": "^2.5.7", @@ -5602,9 +5602,9 @@ "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==" }, "node_modules/@types/react": { - "version": "18.3.3", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz", - "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==", + "version": "18.3.12", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz", + "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==", "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" diff --git a/package.json b/package.json index e1eba54ff0..4560ea5d0e 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "@types/js-cookie": "^3.0.6", "@types/node": "^22.5.4", "@types/node-fetch": "^2.6.10", - "@types/react": "^18.3.3", + "@types/react": "^18.3.12", "@types/react-beautiful-dnd": "^13.1.8", "@types/react-chartjs-2": "^2.5.7", "@types/react-bootstrap": "^0.32.37", From fb913e1882410386564f4c6f2540fe66e2471ae5 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:32:40 -0800 Subject: [PATCH 05/14] Update pull-request.yml --- .github/workflows/pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index aaeebc8345..0cb1b76ee4 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -259,7 +259,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check if the target branch is develop - if: github.event.pull_request.base.ref != 'develop' + if: github.event.pull_request.base.ref != 'develop-postgres' run: | - echo "Error: Pull request target branch must be 'develop'. Please refer PR_GUIDELINES.md" + echo "Error: Pull request target branch must be 'develop-postgres'. Please refer PR_GUIDELINES.md" exit 1 From d16b95ee179900e8e32a2296f14e948e6caea05b Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Sat, 16 Nov 2024 15:04:35 -0800 Subject: [PATCH 06/14] Update dependabot.yaml --- .github/dependabot.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 9a3e9a54e9..81d68df4bd 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -12,7 +12,7 @@ updates: labels: - "dependencies" # Specify the target branch for PRs - target-branch: "develop" + target-branch: "develop-postgres" # Customize commit message prefix commit-message: prefix: "chore(deps):" From 15513f5fa62217bd2ee9f0c6f8e9c822116d8b81 Mon Sep 17 00:00:00 2001 From: Vanshika Sabharwal <143436704+VanshikaSabharwal@users.noreply.github.com> Date: Mon, 18 Nov 2024 00:02:22 +0530 Subject: [PATCH 07/14] added docker check to workflow (#2414) * added docker check to workflow * made recommended changes to docker check in workflow * added changes to docker check inn workflow as recommended * added changes * updated indentation in pull-request.yml file * updated indentation in pull-request.yml file * added Dockerfile and Docker-compose.yml file * added Dockerfile and Docker-compose.yml file * updated .docker-ignore file * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * properly formatted code * trying to make docker check pass * trying to make docker check pass * updated INSTALLATION.md * updated INSTALLATION.md * added recommended changes to INSTALLATION.md * added recommended changes to INSTALLATION.md * added recommended changes to INSTALLATION.md * updated docker workflow * updated INSTALLATION.md --- .dockerignore | 25 +++++++++ .github/workflows/pull-request.yml | 90 ++++++++++++++++++++++++------ Dockerfile | 15 +++++ INSTALLATION.md | 89 +++++++++++++++++++++-------- config/vite.config.ts | 5 +- 5 files changed, 183 insertions(+), 41 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..0ef78f43dc --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +node_modules +npm-debug.log +Dockerfile +.git +.gitignore +.env +.env.* +dist +coverage +.nyc_output +*.md +.github +tests +__tests__ +*.test.* +*.spec.* +# Development files +*.log +*.lock +.DS_Store +.idea +.vscode +# Build artifacts +build +out \ No newline at end of file diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0cb1b76ee4..7eb62357c1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -46,7 +46,7 @@ jobs: - name: Check formatting if: steps.changed-files.outputs.only_changed != 'true' run: npm run format:check - + - name: Run formatting if check fails if: failure() run: npm run format @@ -57,10 +57,10 @@ jobs: - name: Check for linting errors in modified files if: steps.changed-files.outputs.only_changed != 'true' - env: + env: CHANGED_FILES: ${{ steps.changed_files.outputs.all_changed_files }} run: npx eslint ${CHANGED_FILES} && python .github/workflows/eslint_disable_check.py - + - name: Check for TSDoc comments run: npm run check-tsdoc # Run the TSDoc check script @@ -89,7 +89,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - + - name: Get Changed Unauthorized files id: changed-unauth-files uses: tj-actions/changed-files@v40 @@ -123,10 +123,10 @@ jobs: ISSUE_GUIDELINES.md PR_GUIDELINES.md README.md - + - name: List all changed unauthorized files if: steps.changed-unauth-files.outputs.any_changed == 'true' || steps.changed-unauth-files.outputs.any_deleted == 'true' - env: + env: CHANGED_UNAUTH_FILES: ${{ steps.changed-unauth-files.outputs.all_changed_files }} run: | for file in ${CHANGED_UNAUTH_FILES}; do @@ -147,14 +147,14 @@ jobs: uses: tj-actions/changed-files@v40 - name: Echo number of changed files - env: + env: CHANGED_FILES_COUNT: ${{ steps.changed-files.outputs.all_changed_files_count }} run: | echo "Number of files changed: $CHANGED_FILES_COUNT" - name: Check if the number of changed files is less than 100 if: steps.changed-files.outputs.all_changed_files_count > 100 - env: + env: CHANGED_FILES_COUNT: ${{ steps.changed-files.outputs.all_changed_files_count }} run: | echo "Error: Too many files (greater than 100) changed in the pull request." @@ -194,15 +194,15 @@ jobs: - name: Install Dependencies run: npm install - + - name: Get changed TypeScript files id: changed-files uses: tj-actions/changed-files@v40 - + - name: Run tests if: steps.changed-files.outputs.only_changed != 'true' - run: npm run test -- --watchAll=false --coverage - + run: npm run test -- --watchAll=false --coverage + - name: TypeScript compilation for changed files run: | for file in ${{ steps.changed-files.outputs.all_files }}; do @@ -210,7 +210,7 @@ jobs: npx tsc --noEmit "$file" fi done - + - name: Present and Upload coverage to Codecov as ${{env.CODECOV_UNIQUE_NAME}} uses: codecov/codecov-action@v4 with: @@ -222,7 +222,7 @@ jobs: - name: Test acceptable level of code coverage uses: VeryGoodOpenSource/very_good_coverage@v2 with: - path: "./coverage/lcov.info" + path: './coverage/lcov.info' min_coverage: 95.0 Graphql-Inspector: @@ -240,19 +240,75 @@ jobs: - name: resolve dependency run: npm install -g @graphql-inspector/cli - + - name: Clone API Repository run: | # Retrieve the complete branch name directly from the GitHub context FULL_BRANCH_NAME=${{ github.base_ref }} echo "FULL_Branch_NAME: $FULL_BRANCH_NAME" - + # Clone the specified repository using the extracted branch name - git clone --branch $FULL_BRANCH_NAME https://github.com/PalisadoesFoundation/talawa-api && ls -a + git clone --branch $FULL_BRANCH_NAME https://github.com/PalisadoesFoundation/talawa-api && ls -a - name: Validate Documents run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql' + Docker-Start-Check: + name: Check if Talawa Admin app starts in Docker + runs-on: ubuntu-latest + needs: [Code-Quality-Checks, Test-Application] + if: github.actor != 'dependabot' + steps: + - name: Checkout the Repository + uses: actions/checkout@v4 + + - name: Set up Docker + uses: docker/setup-buildx-action@v3 + with: + driver-opts: | + image=moby/buildkit:latest + + - name: Build Docker image + run: | + set -e + echo "Building Docker image..." + docker build -t talawa-admin-app . + echo "Docker image built successfully" + + - name: Run Docker Container + run: | + set -e + echo "Started Docker container..." + docker run -d --name talawa-admin-app-container -p 4321:4321 talawa-admin-app + echo "Docker container started successfully" + + - name: Check if Talawa Admin App is running + run: | + timeout="${HEALTH_CHECK_TIMEOUT:-120}" + echo "Starting health check with ${timeout}s timeout" + while ! nc -z localhost 4321 && [ $timeout -gt 0 ]; do + sleep 1 + + timeout=$((timeout-1)) + if [ $((timeout % 10)) -eq 0 ]; then + echo "Still waiting for app to start... ${timeout}s remaining" + fi + done + + if [ $timeout -eq 0 ]; then + echo "Timeout waiting for application to start" + echo "Container logs:" + docker logs talawa-admin-app-container + exit 1 + fi + echo "Port check passed, verifying health endpoint..." + + - name: Stop Docker Container + if: always() + run: | + docker stop talawa-admin-app-container + docker rm talawa-admin-app-container + Check-Target-Branch: if: ${{ github.actor != 'dependabot[bot]' }} name: Check Target Branch diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000..6b13a712b7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM node:20.10.0 AS build + +WORKDIR /usr/src/app + +COPY package*.json ./ + +RUN npm install + +COPY . . + +RUN npm run build + +EXPOSE 4321 + +CMD ["npm", "run", "serve"] \ No newline at end of file diff --git a/INSTALLATION.md b/INSTALLATION.md index 5813b7d1cb..3c09f69e33 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -13,25 +13,9 @@ This document provides instructions on how to set up and start a running instanc - [Install node.js](#install-nodejs) - [Install TypeScript](#install-typescript) - [Install Required Packages](#install-required-packages) -- [Configuration](#configuration) - - [Creating .env file](#creating-env-file) - - [Setting up PORT in .env file](#setting-up-port-in-env-file) - - [Setting up REACT_APP_TALAWA_URL in .env file](#setting-up-react_app_talawa_url-in-env-file) - - [Setting up REACT_APP_BACKEND_WEBSOCKET_URL in .env file](#setting-up-react_app_backend_websocket_url-in-env-file) - - [Setting up REACT_APP_RECAPTCHA_SITE_KEY in .env file](#setting-up-react_app_recaptcha_site_key-in-env-file) - - [Setting up Compiletime and Runtime logs](#setting-up-compiletime-and-runtime-logs) -- [Post Configuration Steps](#post-configuration-steps) - - [Running Talawa-Admin](#running-talawa-admin) - - [Accessing Talawa-Admin](#accessing-talawa-admin) - - [Talawa-Admin Registration](#talawa-admin-registration) - - [Talawa-Admin Login](#talawa-admin-login) -- [Testing](#testing) - - [Running tests](#running-tests) - - [Debugging tests](#debugging-tests) - - [Linting code files](#linting-code-files) - - [Husky for Git Hooks](#husky-for-git-hooks) - - [pre-commit hook](#pre-commit-hook) - - [post-merge hook](#post-merge-hook) +- [Installation using Docker](#installation-using-docker) + - [Prerequisites](#prerequisites-1) + - [Development Setup](#development-setup) @@ -145,15 +129,47 @@ npm install The prerequisites are now installed. The next step will be to get the app up and running. +# Installation using Docker + +## Prerequisites + +1. Install Docker on your system: + - [Docker Desktop for Windows/Mac](https://www.docker.com/products/docker-desktop) + - [Docker Engine for Linux](https://docs.docker.com/engine/install/) + +### Development Setup + +If you prefer to use Docker, you can install the app using the following command: + +1. Create a `.env` file as described in the Configuration section + +2. Build the Docker Image: + +Run the following command to build the Docker image: + +````bash +docker build -t talawa-admin . +```bash + +3. Run the Docker container: + +After the build is complete, run the Docker container using this command: + +```bash +docker run -p 4321:4321 talawa-admin +```bash + +The application will be accessible at `http://localhost:4321` + # Configuration It's important to configure Talawa-Admin. Here's how to do it. You can use our interactive setup script for the configuration. Use the following command for the same. -``` +```bash npm run setup -``` +```bash All the options in "setup" can be done manually as well and here's how to do it. - [Creating .env file](#creating-env-file) @@ -161,8 +177,10 @@ All the options in "setup" can be done manually as well and here's how to do it. A file named .env is required in the root directory of talawa-admin for storing environment variables used at runtime. It is not a part of the repo and you will have to create it. For a sample of `.env` file there is a file named `.env.example` in the root directory. Create a new `.env` file by copying the contents of the `.env.example` into `.env` file. Use this command: -``` +```` + cp .env.example .env + ``` This `.env` file must be populated with the following environment variables for `talawa-admin` to work: @@ -186,19 +204,25 @@ Add a custom port number for Talawa-Admin development purposes to the variable n Add the endpoint for accessing talawa-api graphql service to the variable named `REACT_APP_TALAWA_URL` in the `.env` file. ``` + REACT_APP_TALAWA_URL="http://API-IP-ADRESS:4000/graphql/" + ``` If you are a software developer working on your local system, then the URL would be: ``` + REACT_APP_TALAWA_URL="http://localhost:4000/graphql/" + ``` If you are trying to access Talawa Admin from a remote host with the API URL containing "localhost", You will have to change the API URL to ``` + REACT_APP_TALAWA_URL="http://YOUR-REMOTE-ADDRESS:4000/graphql/" + ``` ## Setting up REACT_APP_BACKEND_WEBSOCKET_URL in .env file @@ -206,19 +230,25 @@ REACT_APP_TALAWA_URL="http://YOUR-REMOTE-ADDRESS:4000/graphql/" The endpoint for accessing talawa-api WebSocket graphql service for handling subscriptions is automatically added to the variable named `REACT_APP_BACKEND_WEBSOCKET_URL` in the `.env` file. ``` + REACT_APP_BACKEND_WEBSOCKET_URL="ws://API-IP-ADRESS:4000/graphql/" + ``` If you are a software developer working on your local system, then the URL would be: ``` + REACT_APP_BACKEND_WEBSOCKET_URL="ws://localhost:4000/graphql/" + ``` If you are trying to access Talawa Admin from a remote host with the API URL containing "localhost", You will have to change the API URL to ``` + REACT_APP_BACKEND_WEBSOCKET_URL="ws://YOUR-REMOTE-ADDRESS:4000/graphql/" + ``` For additional details, please refer the `How to Access the Talawa-API URL` section in the INSTALLATION.md file found in the [Talawa-API repo](https://github.com/PalisadoesFoundation/talawa-api). @@ -238,7 +268,9 @@ If you want to setup Google reCAPTCHA now, you may refer to the `RECAPTCHA` sect Copy/paste this `reCAPTCHA site key` to the variable named `REACT_APP_RECAPTCHA_SITE_KEY` in `.env` file. ``` + REACT_APP_RECAPTCHA_SITE_KEY="this_is_the_recaptcha_key" + ``` ## Setting up Compiletime and Runtime logs @@ -254,7 +286,9 @@ It's now time to start Talawa-Admin and get it running Run the following command to start `talawa-admin` development server: ``` + npm run serve + ``` ## Accessing Talawa-Admin @@ -262,13 +296,17 @@ npm run serve By default `talawa-admin` runs on port `4321` on your system's localhost. It is available on the following endpoint: ``` + http://localhost:4321/ + ``` If you have specified a custom port number in your `.env` file, Talawa-Admin will run on the following endpoint: ``` + http://localhost:${{customPort}}/ + ``` Replace `${{customPort}}` with the actual custom port number you have configured in your `.env` file. @@ -290,7 +328,9 @@ It is important to test our code. If you are a contributor, please follow these You can run the tests for `talawa-admin` using this command: ``` + npm run test + ``` ## Debugging tests @@ -298,8 +338,10 @@ npm run test You can see the output of failing tests in broswer by running `jest-preview` package before running your tests ``` + npm run jest-preview npm run test + ``` You don't need to re-run the `npm run jest-preview` command each time, simply run the `npm run test` command if the Jest Preview server is already running in the background, it'll automatically detect any failing tests and show the preview at `http://localhost:3336` as shown in this screenshot - @@ -311,7 +353,9 @@ You don't need to re-run the `npm run jest-preview` command each time, simply ru You can lint your code files using this command: ``` + npm run lint:fix + ``` ## Husky for Git Hooks @@ -335,3 +379,4 @@ If you don't want this hook to run, you can manually opt out of this using the ` git pull --no-verify
+``` diff --git a/config/vite.config.ts b/config/vite.config.ts index 71ce6c6f47..28cd47ae5a 100644 --- a/config/vite.config.ts +++ b/config/vite.config.ts @@ -23,8 +23,9 @@ export default defineConfig({ ], server: { // this ensures that the browser opens upon server start - open: true, - // this sets a default port to 3000 + open: false, + host: '0.0.0.0', + // this sets a default port to 4321 port: 4321, }, }); From 3ea2919770eaa2ad912c4a012a3c87b4d1ec4cd4 Mon Sep 17 00:00:00 2001 From: prayansh_chhablani <135210710+prayanshchh@users.noreply.github.com> Date: Mon, 18 Nov 2024 00:43:39 +0530 Subject: [PATCH 08/14] eslint-rule-no_unused_vars (#2428) --- .eslintrc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc.json b/.eslintrc.json index 26470f7aab..b3704d9aa1 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -55,6 +55,7 @@ "import/no-duplicates": "error", "tsdoc/syntax": "error", "@typescript-eslint/ban-ts-comment": "error", + "@typescript-eslint/no-unused-vars": "error", "@typescript-eslint/no-explicit-any": "error", "@typescript-eslint/no-inferrable-types": "error", "@typescript-eslint/no-non-null-asserted-optional-chain": "error", From 084ac7e92dede9766b77e75cf296f40165965140 Mon Sep 17 00:00:00 2001 From: Dhiraj Udhani Date: Wed, 20 Nov 2024 11:53:23 +0530 Subject: [PATCH 09/14] Updated pr template with checklist (#2454) * Updated pr template with checklist * Additional changes for the PR template * Changed the url for the PR template --- .github/pull_request_template.md | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9e3081d0ee..a1e203bfdf 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -9,6 +9,7 @@ We employ the following branching strategy to simplify the development process a NOTE!!! ONLY SUBMIT PRS AGAINST OUR `DEVELOP` BRANCH. THE DEFAULT IS `MAIN`, SO YOU WILL HAVE TO MODIFY THIS BEFORE SUBMITTING YOUR PR FOR REVIEW. PRS MADE AGAINST `MAIN` WILL BE CLOSED. + --> -**Did you add tests for your changes?** - - - **Snapshots/Videos:** @@ -44,10 +41,23 @@ Fixes # +## Checklist + +### CodeRabbit AI Review +- [ ] I have reviewed and addressed all critical issues flagged by CodeRabbit AI +- [ ] I have implemented or provided justification for each non-critical suggestion +- [ ] I have documented my reasoning in the PR comments where CodeRabbit AI suggestions were not implemented + +### Test Coverage +- [ ] I have written tests for all new changes/features +- [ ] I have verified that test coverage meets or exceeds 95% +- [ ] I have run the test suite locally and all tests pass + + **Other information** **Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa-admin/blob/master/CONTRIBUTING.md)?** - + \ No newline at end of file From 58f289b1a090d68f826e51095a7f9cdb98cbc2f5 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Sun, 24 Nov 2024 22:14:52 -0500 Subject: [PATCH 10/14] Update pull-request-target.yml --- .github/workflows/pull-request-target.yml | 25 +++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml index 2560a0dac9..94a9492c8f 100644 --- a/.github/workflows/pull-request-target.yml +++ b/.github/workflows/pull-request-target.yml @@ -25,18 +25,21 @@ jobs: message: | ## Our Pull Request Approval Process - We have these basic policies to make the approval process smoother for our volunteer team. - + Thanks for contributing! + ### Testing Your Code - - Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur: - - 1. The overall code coverage drops below the target threshold of the repository - 2. Any file in the pull request has code coverage levels below the repository threshold - 3. Merge conflicts - - The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing. - + + Remember, your PRs won't be reviewed until these criteria are met: + + 1. We don't merge PRs with poor code quality. + 1. Follow coding best practices such that CodeRabbit.ai approves your PR. + 1. We don't merge PRs with failed tests. + 1. When tests fail, click on the `Details` link to learn more. + 1. Write sufficient tests for your changes (CodeCov Patch Test). Your testing level must be better than the target threshold of the repository + 1. Tests may fail if you edit sensitive files. Ask to add the `sensitive-files-ignore-pr` label if the edits are necessary. + + These policies make our code better. + ### Reviewers Do not assign reviewers. Our Queue Monitors will review your PR and assign them. From 7a991b3aa824070bd53d6367f1ce7f072321af88 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Sun, 24 Nov 2024 22:38:09 -0500 Subject: [PATCH 11/14] Update pull-request-target.yml --- .github/workflows/pull-request-target.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml index 94a9492c8f..5de876cff4 100644 --- a/.github/workflows/pull-request-target.yml +++ b/.github/workflows/pull-request-target.yml @@ -28,17 +28,17 @@ jobs: Thanks for contributing! ### Testing Your Code - Remember, your PRs won't be reviewed until these criteria are met: - + 1. We don't merge PRs with poor code quality. 1. Follow coding best practices such that CodeRabbit.ai approves your PR. 1. We don't merge PRs with failed tests. 1. When tests fail, click on the `Details` link to learn more. 1. Write sufficient tests for your changes (CodeCov Patch Test). Your testing level must be better than the target threshold of the repository - 1. Tests may fail if you edit sensitive files. Ask to add the `sensitive-files-ignore-pr` label if the edits are necessary. - - These policies make our code better. + 1. Tests may fail if you edit sensitive files. Ask to add the `ignore-sensitive-files-pr` label if the edits are necessary. + 1. We cannot merge PRs with conflicting files. These must be fixed. + + Our policies make our code better. ### Reviewers From f9e10b8fb1fe524b91de30d7dafa20ceb7bc037b Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Sat, 30 Nov 2024 19:39:06 -0500 Subject: [PATCH 12/14] Update from develop-postgres 20241130 (#2531) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update pull-request.yml * update the @mui/x-date-pickers (#2439) * chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433) Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435) Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts) --- updated-dependencies: - dependency-name: "@mui/x-charts" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update pull-request.yml * update the @mui/x-date-pickers --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com> * Update dependabot.yaml * chore(deps): bump @pdfme/generator from 5.1.7 to 5.2.3 (#2440) Bumps [@pdfme/generator](https://github.com/pdfme/pdfme) from 5.1.7 to 5.2.3. - [Release notes](https://github.com/pdfme/pdfme/releases) - [Changelog](https://github.com/pdfme/pdfme/blob/main/RELEASE.md) - [Commits](https://github.com/pdfme/pdfme/compare/5.1.7...5.2.3) --- updated-dependencies: - dependency-name: "@pdfme/generator" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @types/node from 22.5.4 to 22.9.0 (#2441) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.5.4 to 22.9.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @babel/preset-env from 7.25.4 to 7.26.0 (#2443) Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.25.4 to 7.26.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.26.0/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @vitejs/plugin-react from 4.3.2 to 4.3.3 (#2442) Bumps [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/tree/HEAD/packages/plugin-react) from 4.3.2 to 4.3.3. - [Release notes](https://github.com/vitejs/vite-plugin-react/releases) - [Changelog](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite-plugin-react/commits/v4.3.3/packages/plugin-react) --- updated-dependencies: - dependency-name: "@vitejs/plugin-react" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Docker 1 (#2445) * added docker check to workflow * made recommended changes to docker check in workflow * added changes to docker check inn workflow as recommended * added changes * updated indentation in pull-request.yml file * updated indentation in pull-request.yml file * added Dockerfile and Docker-compose.yml file * added Dockerfile and Docker-compose.yml file * updated .docker-ignore file * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * properly formatted code * chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433) Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435) Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts) --- updated-dependencies: - dependency-name: "@mui/x-charts" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update pull-request.yml * trying to make docker check pass * trying to make docker check pass * updated INSTALLATION.md * updated INSTALLATION.md * added recommended changes to INSTALLATION.md * added recommended changes to INSTALLATION.md * added recommended changes to INSTALLATION.md * Update dependabot.yaml * updated docker workflow * updated INSTALLATION.md --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com> * ADMIN: Updated all GitHub Actions to the latest versions in the `develop-postres` branch (#2449) * updated pr template for develop-postgress branch (#2458) * Added GitHub PR Workflow Check: Talawa Admin app starts (No Docker) (#2452) * Updated branching strategy * Removed duplicate entry * Updated contributing.md * Added extra markdown styling to contribute.md * Bump dns-packet from 1.3.1 to 1.3.4 Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/mafintosh/dns-packet/releases) - [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md) - [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4) Signed-off-by: dependabot[bot] * Update pull_request_template.md * disabled CodeQL cron jobs and push actions (#72) * Merge Develop into Main (#1099) * Update authorized-changes-detection.yml * Code Coverage @ 87.1% * Update .gitignore * Delete codecov This executable should not be in the repo * added translation hint text in placeholders (#487) * Update pull-requests.yml * Create DOCUMENTATION.md * Rename issue-guidelines.md to ISSUE_GUIDELINES.md * Update CONTRIBUTING.md * Update issue.yml * Rename PR-guidelines.md to PR_GUIDELINES.md * Update CONTRIBUTING.md * Update pull-request-target.yml * Delete PULL_REQUEST_TEMPLATE.md * Delete ISSUE_TEMPLATE.md * Rename Code_Style.md to CODE_STYLE.md * added removeMember mutation (#491) * added removeMember mutation * changed mutation name * remove contributions from router (#502) * Fixed Settings page Header (#501) * fixed cani-use lite warning * fixed the alignments for smaller screens and also added spacing on places where it was needed * fixed the linting errors * ran prettier to remove styling errors * made the orgSetting title dynamic * linted the code and made the settings header as required and also made the settings page navbar responsive * linted code and made necessary changes * errors fixed * Added dropdown for Applanguage in UserUpdation form (#498) * Added dropdown for Applanguage in UserUpdation form * App language code changed to Default language * Change the Scalar Types [Provides relevant client side changes for #1085 in Talawa-API] (#500) * Change typedefs * Fix date parsing * Move ID to ObjectID scalar * Client changes for Adding GraphQL Scalars (#511) * Change typedefs * Fix date parsing * Move ID to ObjectID scalar * Revert ObjectID to ID * Change ObjectID to ID * modal closed after organization creation (#516) * most recently added Org displays at the top (#515) * Add Husky (#520) * updated contributing (#521) * Display and choose Organisation image (#512) * upload image working for createOrganisation * Organisation image showing everywhere * Testcase failure fixed * Linting fixed * convertToBase64 func made and tests for it * CI/CD error fixed * tests added for AdminNavbar & OrganisationDashboard * Linting fixed * fixed translation on the plugin tab (#510) * added OrgName to the Navbar (#525) * Fix create event mutation [Fixes part of #1101 in Talawa-API] (#523) * Add format fix * Fix updation of posts * Test coverage improved for organizationPeople.tsx (#526) * Update INSTALLATION.md * Update INSTALLATION.md * Update INSTALLATION.md * Update stale.yml * Remove tags (#532) * Fixed navbar added tests (#534) * Fixed navbar added tests * Fixed the translation of All orgnaizations btn in AdminNavbar * Fix the updateOrg page, and made it to create mutation request [Fixes #531] (#536) * fix orgUpdate system * fix translations * Update CONTRIBUTING.md * Code Coverage @ 88% * Fixes #478 : Implemeneted calendar to the Event tab (#537) * calendar-implemented * calendar-implemented * fixed tests * Added post-merge hook using husky (#541) * Added post-merge hook using husky * made required changes to installation.md * make changes to documentation for husky * made the required changes in installation guide * Update pull-requests.yml * Fixed yarn installation instructions (#584) * organization sorting for all organization (#619) * removed redundant notification (#577) * Profile Page for Members (#543) * Initial member page made * Changed query added Org and Events section * Homescreen ready * initial translation added for Profile * initial translation added for Profile * Added translations * Added translations * Revised translation * Fixed failing tests for components * Link added to OrgAdminListCard * Linting fixed for OrgPeopleListCard * Added tests, removed logs * Uniform design * Fix:routing issue for orgdash page (#580) * Fix:routing issue for orgdash page * fix:failing test of SuperDashListCard * Rectify Warnings: EventListCard.test.tsx (#595) * Added logic to close modal after successful submission (#623) * Feature Request: Position of the search bar. (#631) * Feature Request: Position of the search bar #614 resolved * Feature Request: Position of the search bar #614 resolved * fixes: #550 added test for the calendar (#552) * added test for the calendar * updates mocks * Update Router Function [Fixes #636] (#638) * Update Router Function * Empty commit * Fix about content overflow (#632) Signed-off-by: Ekene Nwobodo * removed duplicate rows per page section in orgposts (#648) * fixed :made card in organization dashboard interactive (#620) * Implemented manage functionality for admin and super admin after login (#539) * Implememnted manage functinality for admin/superadmin after login * Update AdminDashListCard.module.css * Some formatting issues with module file * resolved workflow issues * Added folding feature to posts (#581) * added folding feature to posts * added fold feature to posts * brought code under code coverage * added tests * added tests for remainging uncovered lines * brought code coverage to 100% for the changes * Code coverage @87.2% * Fix User Update Details Page and Add Update Password Page [Fixes #530] (#657) * fixed updateuser logic * update translations * fix lint * lint fix 2 * fix tests * fixed:move orgLocation & remove duplicate orgName (#655) * fixed:move orgLocation & remove duplicate orgName * Dummy commit * fixes - [#597] - Navbar navlinks hover and button styles (#603) * fixed: #585 - Password error showing. Tested * fix: #590 - fixed navbar hover issues * fix: #590 - fixed navbar hover issues * Code Coverage 87.4% * fixes 599 (#653) * fixed errors and removed window.replace * written test case for ensure window.location.replace * written test case for ensure window.location.replace * added useHistory to keep track of routing behind the scenes * fixed merge conflicts and errors * updated comments for file changes * Added warning comments for routing --------- Co-authored-by: Adepeju * fix org search location (#682) Signed-off-by: Ekene Nwobodo * fixed the issue of validate the input before submit #674 (#678) * Adds required tests for OrganizationEvents.tsx and Fixes a minor bug in Calendar (#527) * adds tests for organization events * removes the unrequired branch from OrganizationEvents.tsx * fixes failing tests * fixes failing lint tests * Update password preview feature with coverage tests (#629) * Fix to the issue #585 (#607) * [fix]- fixed the password error warning * [fix]- fixed the password error warning * [fix]- fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [feat]-added test cases for password error warning * [feat]- added test cases for password error warning * [feat]- added test cases for password error warning * [fix]- fixed the linting * Improve test coverage for calendar.tsx (#679) * Improve test coverage for calendar.tsx * Restore previous tests * remove --coverage * i rebased my codebase and resolved the initial issue (#669) * fixed the issue use of toast in place of window.alert #645 (#687) * Update ISSUE_GUIDELINES.md * fixed the static time data under Organization card in the Organization List tab (#689) * fixed the static time in org card * formatted the date to MM D, YYYY --------- Co-authored-by: thesaaddevloper * Fixed the pagination alignment issue (#702) * [fix]- fixed the password error warning * [fix]- fixed the password error warning * [fix]- fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [feat]-added test cases for password error warning * [feat]- added test cases for password error warning * [feat]- added test cases for password error warning * [fix]- fixed the linting * [fix]- fixed the pagination alignment issue * [fix]- fixed the pagination alignment issue * [fix]- fixed the pagination alignment issue * Removed overlapping (#675) * changes input element to textarea and changes in test (#710) * Code Coverage @90.7% * Indicating active tabs (#691) * added underline to active links in navbar * fixed lint error * fixed the org default image #688 and removed stock image (#695) * fixed the org default image #688 and removed stock image * removed eslint warning * added new img as default org img * Update INSTALLATION.md * Added Clear Error and Warn Messages when API is unavailable (#670) * Added error and warn messages * Added tests & fixed inconsistency in mocks * Lint fix LoginPage * Lint Fix LoginPage.test * minor fix * Minor update to LoginPage * Minor change to LoginPage.test * Replaced toast.warn() with toast.error() * Fixed test accordingly * Lint Fix * Minor fix * Extra edge case handled * code coverage fix * Lint fix * Update LoginPage * Update LoginPage.test * Lint fix * improve test coverage for orgpost.tsx (#718) * Improve test coverage for calendar.tsx * Restore previous tests * remove --coverage * improve test for orgpost.tsx * Implemented Proper Error Handling for all Screens [Fixes: #535] (#731) * Handled error cases for all screens * Some more fixes * Some more fixes * Added StaticMockLink to use Mocks multiple times [Fixes Multiple Issues] (#745) * add StaticMockLink * lint fix * remove showWarning * Added prompt to Register on Login Page (#628) * Add prompt to Login page - Add prompt in other languages: fr, sp, hi, zh. - switch styling of Login Button with Reg Button * format with prettier * fixed event checkboxes to update (#707) * Block/Unblock functionality for only members of the organization (#690) * Implememnted manage functinality for admin/superadmin after login * Update AdminDashListCard.module.css * Some formatting issues with module file * resolved workflow issues * Updated block/unblock page preventing users who are not members of organiztion * Update BlockUser.test.tsx to resolve failing tests Modified the mocks fields according to the corresponding changes in BlockUser.tsx file. * created a reusable postNotFound Component with responsive UI (#717) * created a reusable postNotFound Component with responsive UI * run test error solved * added translation to the component and also created the test.tsx for the error component * fixed the failing test and added the postNotFound reusable component for OrgList --------- Co-authored-by: thesaaddevloper * fix: #601 modal responsive width (#621) * added dynamic title to OrgPeople section (#704) * added dynamic title to OrgPeople section * fixed code coverage * fixed code coverage * uncommented the mistakenly added code * Delete er * Updated session timeout notification toast with already existing one (#734) * Added a toast to notify users that session has expired and redirects to the login page * Updated toast notification on session timeout with already existing one * eliminated the use of magic numbers * minor error correction on the timeout minutes --------- Co-authored-by: TheoCathy * Fixed the empty space in the OrgList (#751) * created a reusable postNotFound Component with responsive UI * run test error solved * added translation to the component and also created the test.tsx for the error component * fixed the failing test and added the postNotFound reusable component for OrgList * fixed the empty space in orgList * fixed the failing test * removed the unwanted files --------- Co-authored-by: thesaaddevloper * align navbar items (#755) * align navbar items * replace More with a hamburger icon * replace More with a hamburger icon to fix workflow error * replace More with a hamburger icon to fix workflow error * Fixes: toggle password for registration (#758) * added toggle-password * updated * formatting * added icon for toggle password * Super Admin Dashboard Error When Organizations Absent (#754) * No Organization Warning on OrgList * Minor Fix * Fixed failing tests * Added Warning on Roles and Request Pages * Added Tests for OrgList * Testing Fixes * Added more tests * Added Tests for Roles and Request Pages * Code Coverage @ 91.0% * Add link to dashboard admin card (#760) * image upload made functional (#677) * image upload made functional * lint * fixed failing test * linting * re run test , remove yarn.lock changes * updateUser test cov * OrgPost * rerun tests * Empty commit * reverted last 2 commits changes * re run code cov * update userUpdate * rerun code cov again * revert last commit * Update PR_GUIDELINES.md * Implemented Search bar and the radio buttons in orgPost page that searches both title and text of post (#770) * created a reusable postNotFound Component with responsive UI * run test error solved * added translation to the component and also created the test.tsx for the error component * fixed the failing test and added the postNotFound reusable component for OrgList * fixed the empty space in orgList * fixed the failing test * removed the unwanted files * the one search bar which searches both text and title of post * testing file * orpost file testing * code coverage is increased * fixed the failing test --------- Co-authored-by: thesaaddevloper Co-authored-by: saadabban76 <–115649011+saadabban76@users.noreply.github.com> * center org image on mobile (#778) Signed-off-by: Ekene Nwobodo * removed link for plugin dropdown toggle (#781) * removed link for plugin dropdown toggle * added id * align superadmin nav items and fix failed tests (#766) * changed the handleSearchByName function in searchByName in Roles page (#735) * changed the handleSearchByName function to search using target's value instead of searchByName variable * updated the file Roles.tsx to take care of useState lag * changed tests for suiting searchByName * changed tests for searchByName including backspaces * added tests for paginationList and changing rowsPerPage * added tests to increase coverage in Roles.tsx * changed the package.json file's test command * removed extra scrollbars (#800) * Recently added Post displays at top (#773) * Recently added Post displays at top * reversed the posts as required in the query * Increased the OrgList Code Coverage (#786) * increased the orgList coverage to 95$ * increased the orgList Code Coverage * increased the orgList Code Coverage * increased the orgList Code Coverage * fixed image rendering in orgPost page * increased the code coverage for orgList Component * increased code coverage to 97% in orgList Component --------- Co-authored-by: saadabban76 <–115649011+saadabban76@users.noreply.github.com> * Modify event visibility for non-admins (#796) * Modify event visibility for non-admins Signed-off-by: Ekene Nwobodo * Add test suites for events visibilty --------- Signed-off-by: Ekene Nwobodo * Bug Fix: Drawer menu visibility (#794) * Remove filter by event field (#807) * increased the orgList coverage to 95$ * increased the orgList Code Coverage * increased the orgList Code Coverage * increased the orgList Code Coverage * fixed image rendering in orgPost page * increased the code coverage for orgList Component * increased code coverage to 97% in orgList Component * removed the filter by event section in orgPeople's component * fixed the failing test --------- Co-authored-by: saadabban76 <–115649011+saadabban76@users.noreply.github.com> * Add image to post (#804) * increased the orgList coverage to 95$ * increased the orgList Code Coverage * increased the orgList Code Coverage * increased the orgList Code Coverage * fixed image rendering in orgPost page * increased the code coverage for orgList Component * increased code coverage to 97% in orgList Component * added Image to the post's card * replaced external links with codebase default image * replaced external links with codebase default image * replaced blank image with the default image * fixed the failing test --------- Co-authored-by: saadabban76 <–115649011+saadabban76@users.noreply.github.com> * Update pull-request-target.yml * Update pull-request-target.yml * Update pull-request-target.yml * Update pull-request-target.yml * Update pull-request-target.yml * Update pull-request-target.yml * Upgrade Yarn to NPM in Talawa Admin Project (#802) * npm upgrade * remove package lock * Update push.yml * empty * upgrade yarn to npm * fix docs * fix scripts * empty * stop watch mode * fix ymls * empty * fix scripts * empty commit * update scripts * Redirect to dashboard on organization update (#816) * Redirect to dashboard on organization update * Minor Change * Proper Testing Of Pagination In All List Views (#797) * install faker package used for mocks in tests * Test init for pagination * install dependencies needed to implement certain tests * add a data-testid attribute to their markup for use in tests * add data-testid attributes to its markup being referenced from tests * add test to ensure the number of organization displayed on the page corresponds to the option selected from rowsPerPage * add prop to allow rendering of component in test environment * add data-testid attributes to their markup being referenced from tests * add data-testid attributes to its markup being referenced from tests * add test to affirm that the number of persons displayed on the webpage is same with the selected option from rowsPerPage * install dependencies for certain tests * fix lint errors * tests fix * remove unnecessary dependencies * lint fix * tests fix update * restore file to previous state * empty commit * tests fix update * lint fix * Conditional Usage of Google reCAPTCHA [Fixes #798] (#820) * conditonal recaptcha * Update INSTALLATION.md * add tests * fixed the issue of Mismatched passwords validation #722 (#824) * fixed the issue of Mismatched passwords validation #722 * fixed lint code error * Code Coverage @ 92% * Replace Talawa Portal with Talawa Admin Portal #817 (#821) * Update website title to Talawa Admin Portal in en * Update website title in fr json file * Update website title in sp json file * Update website title in zh json file * Update website title in hi json file * Update the test in ListNavbar file * Update the test in LoginPage.test file * Create a function for the tex macher to make test * Fix lint errors in the LandingPage test file * Remove console.log in LandingPage test file * Upgrade to use npm instead of yarn * Delete yarn.lock file * Fix lint errors * Fix lint errors * Update the heading in hi.json file * Remove unused codes * Fix lint error in LanfingPage file * Correct the talawa_portal value in Fr json file * Correct the talawa_portal value in sp json file * Remove anused package in package.json file * Organization Form Redirect Issue Prevents User Navigation, Affecting User Experience. Issue #808 (#815) * addressing issue #808 * finished - requested changes * addressing warning * Added: event preview modal to view event details (#772) * added event preview model * added event preview model * fixed formatting * added test * added test * added test * failing tests * test * tests * Update workflow (#832) * Workflow fix (#833) * Update pull-requests.yml * Update pull-requests.yml * Update pull-requests.yml * Code Coverage @ 91.0% * Feature: Separation of ADMIN and SUPERADMIN functionalities (#826) * Initial changes * Commit to sync repo * Made changes to OrgList * Some fixes * Minor fix * Added tests for OrgList * Added tests for OrgList * Coverage fix * Required changes added * Made changes to OrgList * Some fix * Some fixes * fixes test for OrgList * Some more fixes * Empty commit * Lint fix * Fixed test * Lint fix * Added Whitespace Validation to Organization and Post create forms (#838) * Added whitespace check in Org Create form * Added Tests * Added Empty String check to OrgPost Form * Added Tests for OrgPost * fixed the issue of Toast msg is not available in all languages #740 (#845) * fixed the issue of Toast msg is not available in all languages #740 * format issue * Empty-Commit * Fixed Org Update (#843) * Prevent Admins and Super Admins from downgrading their own roles (#840) * Code Cleanup * Disabled Super Admins from changing their roles * Added Tests * Added more tests * Improved Code Quality * Revert "Fixed Org Update (#843)" (#847) This reverts commit 53c3fef28ef986d63b1eec45663acb7d07cf1b8d. * Fixed Organization Update and Translation (#849) * Fixed Organization Update * Minor Changes * Success message updated * Fail tests on warning [Priority Needed] (#856) * fix warnings Signed-off-by: Ansh Goyal * fix warnings Signed-off-by: Ansh Goyal * fix warnings Signed-off-by: Ansh Goyal * fix warnings Signed-off-by: Ansh Goyal * fix warnings Signed-off-by: Ansh Goyal * restore addonregister Signed-off-by: Ansh Goyal --------- Signed-off-by: Ansh Goyal * Code duplicacy removed (#852) * Code duplicacy removed * Tests added * Added comments * Fixed failing tests * Code formatted * Unused packages removed, flag icons package updated to latest version (#860) * Unused packages removed, flag icons updated to latest version * Empty commit * Changes in package-lock.json * Fixes #848: limiting mulitple toast (#851) * limiting-toast * added test * Organization People Filters Improved (#855) * Added Filters to Users and Organizations Query * Added Last Name Filter on User, Member and Admin * Added Translation * Fixed Failing Tests * Added Tests for Filters * Fixed Failing Tests * Code Cleanup * Fixed Tests * Added Translation * remove graphql-boost dep (#866) Signed-off-by: Ansh Goyal * added UserNotFound component to the Roles page and improved the search (#865) * changed the handleSearchByName function to search using target's value instead of searchByName variable * updated the file Roles.tsx to take care of useState lag * changed tests for suiting searchByName * changed tests for searchByName including backspaces * added tests for paginationList and changing rowsPerPage * added tests to increase coverage in Roles.tsx * changed the package.json file's test command * changed PostNotFound component to be used as a reusable one and added it in Roles section and set languages option in locales folder * changed formatting in locales changed files * removed comments in Roles.tsx * Empty commit * renamed the PostNotFound component and modifiied relevant files * changed Roles.tsx filtering * empty commit * reverted changes in package.json * Improved signupform validations (#828) * Improved signupform validations * updated signup form validation to show all messages at once * improved test coverage for LoginPage * Fixed failing test --------- Co-authored-by: Joyce Malicha * added tests for Search Bar in the Organization List Page of SUPERADMIN #827 (#867) * added tests for Search Bar in the Organization List Page of SUPERADMIN #827 * added tests for Search Bar in the Organization List Page of SUPERADMIN #827 * Added Tests Previews (#868) * Installed jest-preview * Automatic Setup * Fiixed Failing Test Command * Added Basic CSS * Added PostCSS Module * Fixed MUI Styling * Minor Changes * Added cross-env to support windows * Adaptar for React 17 and CSS Modules Mock * Added Mocked Styles to Tests * Documentatin Updated * Fixed Failing Tests * Minorr change in documentation * Jest is now Dev Dependency * Workflow Test * Jest Module Path Updates * Module Path Tese 2 * Github Workflow Fixed * Removed Legacy Test Command * Added Documentation to Debug Tests * Fixed Documentation * Docs Image Added To Repo * Images Reorganization * Organized Images * Revert "Improved signupform validations (#828)" (#875) This reverts commit 5820dd9ec05256551b48470c8880fcdc05452fda. * Restored SearchBar Test for OrgList Page (#878) * Restored searchBar test * Lint fix * Coverage fix * Lint fix * Some fixes * Some fixes * fixed the issue of Users filter to fetch corresponding Users to Organisation #701 (#853) * fixed the issue of Users filter to fetch corresponding Users to Organisation #701 * removedd uunused variable * fixed failing text * fixed merged issue * fixed lint error * swap variable * Revert "Restored SearchBar Test for OrgList Page (#878)" (#879) This reverts commit 3d39c524d54e81853490d2d8a1f844ce67252365. * Fixed crashing on error in Block/Unblock page (#862) * Website crash fixed * lint fixed * Added tests for empty response from server * More tests added * Rerun tests empty commit * Redirect on error functioning * Fixed failing tests * Testcase and Title added when users not found * Linting fixed * Typo fixed * Fixed failing tests * Linting fixed * Added NotFound component in OrgPeople and changed Roles.tsx (#882) * changed the handleSearchByName function to search using target's value instead of searchByName variable * updated the file Roles.tsx to take care of useState lag * changed tests for suiting searchByName * changed tests for searchByName including backspaces * added tests for paginationList and changing rowsPerPage * added tests to increase coverage in Roles.tsx * changed the package.json file's test command * changed PostNotFound component to be used as a reusable one and added it in Roles section and set languages option in locales folder * changed formatting in locales changed files * removed comments in Roles.tsx * Empty commit * renamed the PostNotFound component and modifiied relevant files * changed Roles.tsx filtering * empty commit * reverted changes in package.json * added NotFound component in OrgPeople, made changes in the locales files and made some changes to Roles too * added NotFound component to OrgPeople, changerd locales files and changed Roles.tsx * minor change * Restored Search-Bar Test for OrgList Page (#880) * Restored searchBar test * Lint fix * Coverage fix * Lint fix * Some fixes * Some fixes * Fixed Org Dashboard Error (#873) * Fixed TypeError * Minor Change * Fixed Tests * Added back logo512 * Fixed auth header getting copied on login (#890) * fix user update (#876) * fix user detials update * remove userType from update-user page * fix failed test for userUpdate.test.tsx * Removed and Replaced Ant Design from the project (#891) * Fixed auth header getting copied on login * Removed/Replaced Ant Design from the project * Fixed failing tests * Removed comment * Add today functionality in calendar (#897) * Update countline.py * Update pull-requests.yml * Updated countlines.py to cover .spec. files (#900) Co-authored-by: Peter Harrison * fixed the Inability to set user roles for specific organizations #556 (#898) * fixed the Inability to set user roles for specific organizations #556 * added all language translation * Revert "fixed the Inability to set user roles for specific organizations #556 (#898)" (#901) This reverts commit 891d898eb5543116bb9042a6386b5a12e474159c. * Documentation updated, Redundant css files removed (#896) * Doc updated unused files removed * Removed unused css files from setup tests * Added small calendar in the events #887 (#903) * added small clanedar * added small clanedar * fixed Code Coverage: Create tests for OrgSettings.tsx #396 (#905) * remove redundancy from orgPostCard (#906) * Revert "remove redundancy from orgPostCard (#906)" (#910) This reverts commit d5ce4aa27ee241b0687f7db3d6acd1b62339562f. * Block/Unblock Page Improvements (#885) * Added Radio Buttons * Optimized Queries * Optimized Query and Added Last Name Filter * Radio Button Working * Added Translations * Fixed Filter Name * Fixed Debounce * Fixed Asynchronous Debounce * Added Tests * Better Error and Loading State Handline * Fixed Loader * Fixed Loader * Modulrised Mock Data * Minor Change * Fixed Tests * Increase Coverage * User query replaced with OrgMemberConnection * Fixed Tests * Code Coverage Increase * Code Cov * Fixed Translations * Fixed Failing Tests * fix in failing test (#913) * Improve and Standardize Automated Linting Tests (#916) * added linting rules * added linting rules * added linting rules * Rename `data` variables to more readable name [Fixes #829] (#835) * Refactor screens * Update components * Fix test * Fix typecheck errors * Increase test coverage * Merge latest adminUI-Redesign into Develop (#927) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow --------- Co-authored-by: Anwer Sayeed * Introduces API versioning check in CI/CD (#924) * a random change * husky precommit * one more try * one more try * one more try * one more try * one more try * one more try * second try * removed unwanted deps * removed unwanted deps * resolved the error * updated variable name * rerun test * rerun test * added test to pull.yml * removed push check * resolved conflict * Update stale.yml * Update CONTRIBUTING.md * Merge talawa-user-portal into develop (#935) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Merge latest Admin UI Redesign into Develop (#934) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Customised Bootstrap (#929) * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Assets typo fixed * Typo fix * Merge conflict error fixed --------- Co-authored-by: Anwer Sayeed * test PR for API versioning check (#932) * testPR * test2 * testing the change * testing it again * test--no-verify * test--no-verify * echo token * test-again * test-again * test * test * read-only * clone * clone * redesigned newsfeed (#939) * Revert "redesigned newsfeed (#939)" (#943) This reverts commit a645eca7cf2ce1335374f48b52335a293e344580. * Make Talawa-Admin mutations in sync with the backend (#946) * Initial change * Redundant Notification removed * Fixed linting and other issues * Tests fixed * Add Home Screen And People Screen along with other components (#940) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Merge AdminUI-Redesign into Develop (#947) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Customised Bootstrap (#929) * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Assets typo fixed * Typo fix * Initial login page work * Merge conflict error fixed * Theming modified and Added Loader over every screen * Fixed UI issue for navbar and login * Fixed production bug * Removed unused variable * Tests fixed * Added Change Language Btn dropdown * Merge conflict fixed, merge latest develop into adminUI-redesign (#938) * Merge latest adminUI-Redesign into Develop (#927) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow --------- Co-authored-by: Anwer Sayeed * Introduces API versioning check in CI/CD (#924) * a random change * husky precommit * one more try * one more try * one more try * one more try * one more try * one more try * second try * removed unwanted deps * removed unwanted deps * resolved the error * updated variable name * rerun test * rerun test * added test to pull.yml * removed push check * resolved conflict * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Update stale.yml * Typo fix * Update CONTRIBUTING.md * Merge talawa-user-portal into develop (#935) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Merge conflict error fixed --------- Co-authored-by: Anwer Sayeed Co-authored-by: Kanishka Bansode <96020697+kb-0311@users.noreply.github.com> Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Co-authored-by: Noble Mittal <62551163+beingnoble03@users.noreply.github.com> * Random checkout * Design ready for homescreen * Login page 100% code c=coverage * Login page icon adjustment * Added translations * Fixed the failing tests * Revert to older version of loader * Animation added fixed warnings * Fixed accessability * Mutations and Tests foxed * Fixed coloring in UserPortal * Tests fixed and ChangeLanguageDropdown used in UserLoginPage * Linting Fixed --------- Co-authored-by: Anwer Sayeed Co-authored-by: Kanishka Bansode <96020697+kb-0311@users.noreply.github.com> Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Co-authored-by: Noble Mittal <62551163+beingnoble03@users.noreply.github.com> * Merge latest adminUI-Redesign (#950) * Initial Organizations screen done * Removed yellow scrollbar * Linting fixed * Replaced images with svgs for logos * Styling done for btnsContainer * Better typechecking and readability * Animated Drawer working * Responsive page ready * OrgCard responsive * Fixed navbar issue and added webkit keyframes * LeftDrawer ready * Translations added * Added shimmer loading effect * Styling issue fixed * Failing tests fixed for OrgList * Removed unused vars * Tests done for LeftDrawer * Succesfully made component without causing any breaking change * 100% Code coverage achieved for Requests Screen * Fix alignment * Roles screen UI done * Role screen fixed with 100% test coverage * Changing screen activeness fixed * Unused vars and Typos fixed * Language support added * Linting and typos fixed * Fixed failing tests for LeftDrawer * Completed tests of AdminDashListCard with 100% code coverage * OrgListCard done * Finalised tests * Requests user search made functional again ! * Fixed loading on refetch and UX on all screens * OrgList failing errors fixed * Fixed all failing tests * Achieved 100% code coverage for OrgList.tsx * Wrote tests and mod LeftDrawer for admins * Minor ui issue fixed * Fixed failing test * UI bug dropdown * Frontend insync with Backend attempt 1 * Introspection fail fix 1 * Introspection error fix 3 * Introspection error fix another attempt * Another attempt * [Talawa-user-portal] Add Settings and Donate Screen, along with other UI fixes (#953) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Add Settings and Donate Screen * Add multilingual support for the screens * Add Event Project and Volunteer Management (#961) * Add screens for adding and updating event projects * Add delete operation for event projects and debug update * Remove yarn.lock * Begin testing * Add display of tasks and functionality to add tasks * Add modal for edit task * Add UpdateTaskModal * Add Delete Task Modal and volunteers display * Add test for DeleteEventProjectModal.tsx * Add tests for add and update event project modal * Add screen for managing volunteers * Add option to assign and remove volunteers * Add tests for AddTaskModal.tsx * Add tests for TaskListItem.tsx and DeleteTaskModal.tsx * Complete testing for all Task Modals * Add completed display to tasks * Add tests for event dashboard * Restructure files * Add attendee management modal * Add testing for EventAttendeeModal * Move to 100% testing and wrapper for attendees modal * Add basic checkIn functionality for users * Add testing for CheckIn modals * Introduce the tag generation into the repository * Update linting rule and fix errors * Remove alloted seat and alloted room * Fix testing * Correct some tests * Migrate from attendees to registrants * Migrate Event Project modals to new design * Migrate registrants modals and checkin modals to new design with 100% test coverage * Move task modals to new styles * Move to 100% test coverage * Admin workflow completed with updated package.json (#960) * Merge latest AdminUI Redesign into develop (#956) * Initial Organizations screen done * Removed yellow scrollbar * Linting fixed * Replaced images with svgs for logos * Styling done for btnsContainer * Better typechecking and readability * Animated Drawer working * Responsive page ready * OrgCard responsive * Fixed navbar issue and added webkit keyframes * LeftDrawer ready * Translations added * Added shimmer loading effect * Styling issue fixed * Failing tests fixed for OrgList * Removed unused vars * Tests done for LeftDrawer * Succesfully made component without causing any breaking change * 100% Code coverage achieved for Requests Screen * Fix alignment * Roles screen UI done * Role screen fixed with 100% test coverage * Changing screen activeness fixed * Unused vars and Typos fixed * Language support added * Linting and typos fixed * Fixed failing tests for LeftDrawer * Completed tests of AdminDashListCard with 100% code coverage * OrgListCard done * Finalised tests * Requests user search made functional again ! * Fixed loading on refetch and UX on all screens * OrgList failing errors fixed * Fixed all failing tests * Achieved 100% code coverage for OrgList.tsx * Wrote tests and mod LeftDrawer for admins * Minor ui issue fixed * Fixed failing test * UI bug dropdown * Frontend insync with Backend attempt 1 * Introspection fail fix 1 * Introspection error fix 3 * Introspection error fix another attempt * Another attempt * Fixed Default Animation on Organizations Screen * Fixed typo * Loading data from localstorage functional * Fixed name conventions * Fixed typo * UI Fix * Changed screen name * Table Loader added * Added LeftOrg drawer and Organization screen comp to Screens * routesReducer tests fixed * Redundant adminNavbar removed from project * MemberDetail issue fixed * Achieved 100% code coverage for LeftDrawerOrg, Added Empty div in images * Fixed failing tests * Fix tests * Fixed warnings * Linting fixes * Linting issues fixed * Achieved 100% code coverage for CollapsibleDropdown * Achieved 100% CC on IconComponent and removed useless imports * Achieved 100% cc for LeftDrawer Component * Achieved 100% CC on SuperAdminScreen Component * Fixed typo * Integrated Event Dashboard * Failing tests for LeftDrawer LeftDrawerOrg OrgList screen fixed * Removed redundant code * Removed useless imports * Linting fixed * Removed LeftDrawerOrg * Update documentation * copy-docs -to-talawa branch update to develop * removed dependance of code copying from generate segment * Update push.yml (#969) * Update push.yml (#970) * Feature Request: Adding a dialog to go to plugin store after an organization is created by the admin (#951) * Add/ test for OrgPost.tsx * fix: org post back to default * Added Dialog 2 * Updated Dialog UI * Removed Extra code * Updated Plugin store * fix: warnings and solves #951 & #948 * fix: warnings and solves #951 & #948 * fix: warnings and solves #951 & #948 * Fix: UI Redesign * fix: merge * fix * Update AddOnStore.tsx * Fixed Merge Errors * Add test: for OrgEntry * Test 3 * fix test 4 * Merge latest AdminUI Redesign into develop (#972) * Initial Organizations screen done * Removed yellow scrollbar * Linting fixed * Replaced images with svgs for logos * Styling done for btnsContainer * Better typechecking and readability * Animated Drawer working * Responsive page ready * OrgCard responsive * Fixed navbar issue and added webkit keyframes * LeftDrawer ready * Translations added * Added shimmer loading effect * Styling issue fixed * Failing tests fixed for OrgList * Removed unused vars * Tests done for LeftDrawer * Succesfully made component without causing any breaking change * 100% Code coverage achieved for Requests Screen * Fix alignment * Roles screen UI done * Role screen fixed with 100% test coverage * Changing screen activeness fixed * Unused vars and Typos fixed * Language support added * Linting and typos fixed * Fixed failing tests for LeftDrawer * Completed tests of AdminDashListCard with 100% code coverage * OrgListCard done * Finalised tests * Requests user search made functional again ! * Fixed loading on refetch and UX on all screens * OrgList failing errors fixed * Fixed all failing tests * Achieved 100% code coverage for OrgList.tsx * Wrote tests and mod LeftDrawer for admins * Minor ui issue fixed * Fixed failing test * UI bug dropdown * Frontend insync with Backend attempt 1 * Introspection fail fix 1 * Introspection error fix 3 * Introspection error fix another attempt * Another attempt * Fixed Default Animation on Organizations Screen * Fixed typo * Loading data from localstorage functional * Fixed name conventions * Fixed typo * UI Fix * Changed screen name * Table Loader added * Added LeftOrg drawer and Organization screen comp to Screens * routesReducer tests fixed * Redundant adminNavbar removed from project * MemberDetail issue fixed * Achieved 100% code coverage for LeftDrawerOrg, Added Empty div in images * Fixed failing tests * Fix tests * Fixed warnings * Linting fixes * Linting issues fixed * Achieved 100% code coverage for CollapsibleDropdown * Achieved 100% CC on IconComponent and removed useless imports * Achieved 100% cc for LeftDrawer Component * Achieved 100% CC on SuperAdminScreen Component * Fixed typo * Integrated Event Dashboard * Failing tests for LeftDrawer LeftDrawerOrg OrgList screen fixed * Removed redundant code * Removed useless imports * Linting fixed * Removed LeftDrawerOrg * Dashboard screen ui almost ready * Org Dash ready * Block/Unblock screen ready * Organization settings page ready * Lang changes * Page refresh on updating org removed * OrgUpdate tests done * OrgUpdate 100% test coverage achieved * OrgSettings Tests done * Organization Dashboard Cards done * Organization Dashboard achieved 100% CC * 100% CC achieved for BlockUser screen * Finalised changes * Small change * Tests fixed * Separate OrgSettings component made * Linting fixed * Formatting fixed * Events screen and Post Comment Modal for Talawa-user-portal (#963) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Add Settings and Donate Screen * Add multilingual support for the screens * Add events screen without calendar view * Add multilingual support to Events screen * Fix failing tests due to merge * Add Post Comment functionality * Refactor Events tests * Deprecate event registrants from query * Update README.md * Add My Tasks screen and Fix UI bugs [User Portal] (#978) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Add Settings and Donate Screen * Add multilingual support for the screens * Add events screen without calendar view * Add multilingual support to Events screen * Fix failing tests due to merge * Add Post Comment functionality * Refactor Events tests * Deprecate event registrants from query * Add my tasks screen for user portal * Remove unnecessary comments from test files * Add Feedback UI Components to Talawa Admin (#980) * Add feedback component * Add tests for feedback modal * Add handling for empty feedback * Add Average Rating and Reviews component * Add testing for all the added cards * Fix tests and move to 100% coverage * Add bugfix * Add merge function to fix failing tests * Add key definitons * Change merge policy * Add custom merge policy to all the Event Stat tests * remove cache * Migrate to a single query in the parent * Adding Plugin Logic to the Talawa Mobile Web App (#976) * Add/ test for OrgPost.tsx * fix: org post back to default * Added Dialog 2 * Updated Dialog UI * Removed Extra code * Updated Plugin store * fix: warnings and solves #951 & #948 * fix: warnings and solves #951 & #948 * fix: warnings and solves #951 & #948 * Fix: UI Redesign * fix: merge * fix * Update AddOnStore.tsx * Fixed Merge Errors * Add test: for OrgEntry * Test 3 * fix test 4 * chores: version changes * Add: Initial Websocket setup on talawa mobile web * Add: plugin logic * Add: plugin logic * removed extra * removed extra * Added: Tests * fix * Add Side Navigation to Event Dashboard (#981) * Create left drawer for event dashboard * Add basic styles to the event dashboard * Fix button styling * Add testing * Add testing for the left event drawer * Add 100% line coverage for all components * Increase timeout for tests * Move maximum rating in feedback from 10 to 5 [Fixes #990] (#987) * Move maximum rating in feedbacks from 10 to 5 * Fix failing tests * Add chat screen to talawa-user-portal (#986) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Add Settings and Donate Screen * Add multilingual support for the screens * Add events screen without calendar view * Add multilingual support to Events screen * Fix failing tests due to merge * Add Post Comment functionality * Refactor Events tests * Deprecate event registrants from query * Add my tasks screen for user portal * Remove unnecessary comments from test files * Add chat screen along with components * Add mui/system package for x-chart support * Add chat screen tests and fix other bugs * Update issue.yml * Update stale.yml * Merge latest AdminUI Redesign into Master (#1006) * Pagination Done for Orglist * Fixed warnings * Infinite scroll and search working for Requests screen * Simplified the code * Infinite scroll enabled and functioning on OrgList Requests and Users screen * FIxed warning * Fixed typo * Fixed bug * Joined and Blockedbyorgs screen and mdoal ready * Tables ready ! * Remove user from organization functionality working well * Update user role in organization feature ready * Minor changes * Done with tests on OrgList * Done with testss of Requests screen * 100% CC achieved for Users screen * Main tests done for UserTableItem * 100% Code Coverage Achieved for UserTableItem * Removed Redundant Landing Page * 100% CC achieved for TableLoader * Translation added for Users Screen * Translation done for Requests screen * Translation done for dashboard screen * Linting and warnings fixed * Improved login page * UI Done for Forgot Password Screen * Forgot Password Screen Tests done! * Fixed all pending tests * Better message for btns and coloring * Linting issues fixed * Fixed code styles * SUPPRESSED UNKNOWN ERROR * Fixed formatting * Updated typoed message * Fixed failing tests accompanying typo * fix createEvent to close modal and show events without refresh (#1014) * fix: Ensure Full Visibility of Logo on 404 Error Page (#1018) - Adjusted the positioning of the logo on the 404 error page to ensure full visibility. - Implemented CSS modifications to prevent the logo from being covered or cut off. - Tested the changes by navigating to various undefined endpoints, confirming that the logo is now displayed correctly on the 404 error page. This commit addresses the bug by ensuring the proper display of the logo on the 404 error page, enhancing the user experience. Fixes #1016 Signed-off-by: Akhilender * Implemented featurs for Postfeed Management (#982) * redesigned newsfeed * added test * newsfeed management * pinned post * postfeed management * pin unpin tag and video control * changes part 2 * newsfeed changes * changes in Card Preview of newsfeed * changes in Card Preview of newsfeed * testing phase 1 * translation * tests * tests * merged intto develop * test * Added query * Update pull-requests.yml * update and delete buttons of event modal are now working (#1051) * update and delete buttons of event modal are now working * fixed the naming conventions and style of the modal * Dynamic dashboard Enhancements (#979) * Dynamic Organization Dashboard * Dynamic Organization Dashboard * refined organization dashboard * Update src/utils/handleLatestFeed.ts Co-authored-by: Noble Mittal <62551163+beingnoble03@users.noreply.github.com> * fixed inconsistent casing * fixed org dashboard test * fixed org dashboard test * revert previous commit * final changes * final changes --------- Co-authored-by: Noble Mittal <62551163+beingnoble03@users.noreply.github.com> * Fix dashboard items (#1007) * Dashboard items are working now. * added variables for links -fix dashboard items * Added variables for links -fix dashboard items. * made the changes as said * Removed : string from variable assignment. * remove repititive code and resolved falling tests * Fix repeating code and falling tests. * Resolved some more falling tests * write test for missed lines * Fix event creation issue with white spaces. (#1025) * fix event creation with white spaces * Add test for empty input values * chore: fix unit test (#1052) * Fix layout distortion due to untruncated title description of events. (#1049) * Fix layout distortion due to untruncated title description of events * Add test * add test for LeftDrawerEvent.tsx * fixed some tests * add test complete * test: SecuredRouteForUser component 100% Test Coverage and fixed uncovered lines (#1048) * SecuredRouteForUser test case added * Fixed Linting Errors * Update SecuredRouteForUser.test.tsx * Update SecuredRouteForUser.test.tsx * linting fix * Update SecuredRouteForUser.test.tsx * Update SecuredRouteForUser.test.tsx * Fix incorrect toast Notification. (#1053) * correct toast notification for TableRow.tsx with full test coverage * Add correct toast with full code coverage * Add correct toast for deleteEventProjectModal.tsx with full test coverage * Add correct toast for UpdateEventProjectModal.tsx with full test coverage * Add correct toast for EventRegistrantsModal.tsx and full test coverage. * Add correct toast for AddTaskModal.tsx with full test coverage * Add correct toast for UpdateTaskModal.tsx with full test coverage * minor fix * Add correct toast to EventRegistrantsModal.tsx * fix EventRegitrantsModal.tsx * created a return button on event dashboard (#1057) * test: Loader Component 100% Test Coverage and Fix Uncovered Lines (#1047) * test: Achieve 100% Test Coverage and Fix Uncovered Lines - Improved the test coverage for the Loader component, addressing the previously uncovered lines and ensuring that all tests pass successfully. - Added a test to ensure that the component renders correctly with a custom 'sm' size. I verified that both the spinner-wrapper and spinner elements are present and that the correct class is applied. - Added a test to ensure that the component renders correctly with a 'lg' size. I verified that the spinner element has the appropriate class. - Added a test to ensure that the component renders correctly with an 'xl' size. I verified that the spinner element has the correct class. With these new tests, I now have 100% test coverage, and there are no more uncovered lines. The Loader component is thoroughly tested for different size scenarios, and all tests pass successfully. Signed-off-by: Akhilender * Fixed linting in Loader component Signed-off-by: Akhilender * Test: Increasing the test level - Trying to meet the code coverage level for Loader component. Signed-off-by: Akhilender * Fixed Linting Signed-off-by: Akhilender * fix: Linting Signed-off-by: Akhilender * Improving test coverage for Loader Component - Fixed lint errors Signed-off-by: Akhilender * test: Improving the tests on the Loader Component - Added a new aspect in the test-case1 Signed-off-by: Akhilender * Fixed: Removed runtime-generated classes from testing - Eliminated all checks for classes associated with bootstrap components assigned at runtime. - Recognized that validating classes assigned during runtime is inappropriate. Signed-off-by: Akhilender --------- Signed-off-by: Akhilender * Simulated Test Database (#984) * Dynamic Organization Dashboard * Dynamic Organization Dashboard * Sample Org Implementation * removed unnecessary changes * removed unnecessary svgs * removed unnecessary import * added appropriate button style * fixed OrgListCard tests * Fixed OrgList and OrgListCard Tests * Removed Unnecessary 'container' Variable * Added Missing Translations and removed unused variable * Fixed event check in management not updating automatically bug (#1062) * fixed the event checkIn bug * fixed the failing test * fixed the CheckInWrapper test * Fix user profile buttons layout and added form validation (#1064) * Fix user profile buttons layout and added form validation * Fix falling tests and warnings * Add test for missed lines * fix falling tests * test: Achieved 100% test coverage and fixed uncovered lines (#1068) * test: Achieved 100% test coverage and fixed uncovered lines - Improved the test coverage for the User-Password-Update component, addressing the previously uncovered lines and ensuring that all tests pass successfully. - Added two new tests 1. Empty Password Field Test: - The first test ensures that an error is displayed when attempting to save changes with an empty password field. 2. Mismatched New and Confirm Passwords Test - The second test covers the scenario where the new and confirm password fields do not match. With these new tests, I now have 100% test coverage, and there are no more uncovered lines. Signed-off-by: Akhilender … * Adding the no-unused-var check for cleaner coding practices (#2465) * Update pull-request-target.yml * Update pull-request-target.yml * fix failing workflow of TS compilation (#2472) * fix workflows failing of TS and lint * Update pull-request.yml * Update pull-request.yml * feat!: Migrate Testing Framework from Jest to Vitest (#2457) * configuring vitest * migrating AddOn tests to vitest * removing unnecessary alias * eslint fix * suggestion #2 * workflow setup * fix: tsdoc workflow * reformat comment to tsdoc fmt * resolving jest, vitest workflow * lint error * add tsdoc comments * exit for workflow * format yml fix * fixing workflow * cleanup * ts error * Update .eslintignore * tsconfig edit * removing suggestions 2 * Update vitest.config.ts * fmt * config update * ignoring .spec files for cov * new suggestions * merge reports * Update vitest.config.ts * vitest run fix * report dir change * report dir change 2 * check workflow * workflow update * fixing merge report * suggestion reverted * merge cov reports * changing format of jest cov reports * Merge Coverage Reports Using lcov-result-merger * fixing merge report * final changes * final changes 2 --------- Co-authored-by: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> * Update pull-request.yml * Chore/css changes (#2466) * chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433) Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435) Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts) --- updated-dependencies: - dependency-name: "@mui/x-charts" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update pull-request.yml * css for color blinds * fix * lint fix * lint fix * fix failing test * fix * fix * fix * fix * fix * fix * fix * lock file changes * fix type * fix type * Update tagTemplate.ts * Update tagTemplate.ts * Update tagTemplate.ts * Update tagTemplate.ts * Update tagTemplate.ts * Update tagTemplate.ts * Update TableRow.tsx * Update tsconfig.json --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Harrison <16875803+palisadoes@users.noreply.github.com> * Update pull-request.yml * Update pull-request.yml * reverting workflow changes (#2498) * reverting workflow changes * changes 1 * identation fix * Saving before reset 11/30/24 19:27:11 --------- Signed-off-by: dependabot[bot] Signed-off-by: Ekene Nwobodo Signed-off-by: Ansh Goyal Signed-off-by: Akhilender Co-authored-by: Aryan Raj <116114086+Aryan4884@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vanshika Sabharwal <143436704+VanshikaSabharwal@users.noreply.github.com> Co-authored-by: JiyaGupta-cs <140608790+JiyaGupta-cs@users.noreply.github.com> Co-authored-by: Dhiraj Udhani Co-authored-by: adithya <144007420+adithyanotfound@users.noreply.github.com> Co-authored-by: DangaRanga Co-authored-by: Jason Gayle <55003601+DangaRanga@users.noreply.github.com> Co-authored-by: Akshat Garg <60404253+akshatgarg12@users.noreply.github.com> Co-authored-by: Md Noman Khan <54404474+noman2002@users.noreply.github.com> Co-authored-by: Aashima wadhwa <73706697+aashimawadhwa@users.noreply.github.com> Co-authored-by: Kanishka Bansode <96020697+kb-0311@users.noreply.github.com> Co-authored-by: Ansh Goyal Co-authored-by: Anurag Kamboj Co-authored-by: Rishav Jha <76212518+rishav-jha-mech@users.noreply.github.com> Co-authored-by: Eshaan Aggarwal <96648934+EshaanAgg@users.noreply.github.com> Co-authored-by: Nishant Singh Co-authored-by: Aditya Shelke <103348863+adi-uchiha@users.noreply.github.com> Co-authored-by: Aviral Yadav <121368112+aviraldevv@users.noreply.github.com> Co-authored-by: Akanksha <72144454+akankshat05@users.noreply.github.com> Co-authored-by: Syed Aman Ali Co-authored-by: Akunne Pascal <48069624+Kodecheff@users.noreply.github.com> Co-authored-by: Samuel Mintah Co-authored-by: Olofu Ojoachubione <87946002+Shugo52@users.noreply.github.com> Co-authored-by: Nwobodo Leonard Co-authored-by: Pratik Aswani <69317773+pratik9333@users.noreply.github.com> Co-authored-by: Raj Abdulmumin <65510943+techfussion@users.noreply.github.com> Co-authored-by: Manoramsharma <84619980+Manoramsharma@users.noreply.github.com> Co-authored-by: Nafisat Faruk <80838239+Phyya@users.noreply.github.com> Co-authored-by: Orefejo Adepeju Co-authored-by: Adepeju Co-authored-by: Sumit Maithani <86047367+Sumitmaithani@users.noreply.github.com> Co-authored-by: Noble Mittal <62551163+beingnoble03@users.noreply.github.com> Co-authored-by: Aimanosi <104039356+Aimanosi@users.noreply.github.com> Co-authored-by: Arushi Agrawal <78142604+arushi2715@users.noreply.github.com> Co-authored-by: D.karlson Co-authored-by: Mohammed Saad Abban <115649011+saadabban76@users.noreply.github.com> Co-authored-by: thesaaddevloper Co-authored-by: akhilender-bongirwar <112749383+akhilender-bongirwar@users.noreply.github.com> Co-authored-by: Bhuvanesh Patil Co-authored-by: Nweneary Uzochukwu Winnie <99335288+Wineshuga@users.noreply.github.com> Co-authored-by: Theodora <107179983+TheoCathy@users.noreply.github.com> Co-authored-by: TheoCathy Co-authored-by: Prathamesh Mutkure Co-authored-by: saadabban76 <–115649011+saadabban76@users.noreply.github.com> Co-authored-by: R.Pranauv Kumar <97829544+Pranauv-Kumar1803@users.noreply.github.com> Co-authored-by: Indresh Goswami Co-authored-by: Victor Michael <114509848+Sheguun@users.noreply.github.com> Co-authored-by: Toussaint Saraza Co-authored-by: Su Myat Aung Co-authored-by: Joyce <51859049+jmalisha@users.noreply.github.com> Co-authored-by: Joyce Malicha Co-authored-by: Peter Harrison Co-authored-by: Anwer Sayeed Co-authored-by: Nitya Pasrija <97171261+Nitya-Pasrija@users.noreply.github.com> Co-authored-by: TASNEEM KOUSHAR Co-authored-by: Siddhesh Bhupendra Kuakde Co-authored-by: Sandeep Kumar Bhagat Co-authored-by: Kanhaiya yadav <93936630+kanhaiya04@users.noreply.github.com> Co-authored-by: Jamari McFarlane <71823011+JamarTG@users.noreply.github.com> Co-authored-by: Aldrin <53973174+Dhoni77@users.noreply.github.com> Co-authored-by: Shekhar Patel <90516956+duplixx@users.noreply.github.com> Co-authored-by: Mahendra Dani <116940083+MahendraDani@users.noreply.github.com> Co-authored-by: Aarish Shah Mohsin <49566965+aarishshahmohsin@users.noreply.github.com> Co-authored-by: Alok Gupta Co-authored-by: Aman Singh Co-authored-by: Patel Divyesh Co-authored-by: Aditya Agarwal <132701661+adi790uu@users.noreply.github.com> Co-authored-by: Aditya Agarwal Co-authored-by: Pranshu Gupta Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Suyash Mishra Co-authored-by: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Co-authored-by: prayansh_chhablani <135210710+prayanshchh@users.noreply.github.com> Co-authored-by: ANKIT VARSHNEY <132201033+AVtheking@users.noreply.github.com> --- .eslintignore | 5 +- .eslintrc.json | 15 +- .github/pull_request_template.md | 1 + .github/workflows/codeql-codescan.yml | 6 +- .github/workflows/issue.yml | 2 +- .github/workflows/pull-request-target.yml | 8 +- .github/workflows/pull-request.yml | 147 +- .github/workflows/push.yml | 2 +- .github/workflows/stale.yml | 4 +- jest.config.js | 21 +- package-lock.json | 2791 +++++++++++++---- package.json | 26 +- src/assets/css/app.css | 23 + .../AddOn/{AddOn.test.tsx => AddOn.spec.tsx} | 30 +- .../AdvertisementRegister.tsx | 6 +- src/components/CheckIn/tagTemplate.ts | 2 +- .../EventCalendar/EventCalendar.module.css | 91 +- src/components/EventCalendar/EventHeader.tsx | 4 +- src/components/LeftDrawer/LeftDrawer.test.tsx | 8 +- src/components/LeftDrawer/LeftDrawer.tsx | 11 +- .../LoginPortalToggle.module.css | 4 +- .../OrgListCard/OrgListCard.module.css | 3 + src/components/Venues/VenueModal.tsx | 7 +- src/screens/BlockUser/BlockUser.tsx | 36 +- src/screens/LoginPage/LoginPage.module.css | 34 + src/screens/LoginPage/LoginPage.tsx | 11 +- src/screens/OrgList/OrgList.module.css | 9 +- src/screens/OrgList/OrgList.tsx | 11 +- src/screens/OrgPost/OrgPost.tsx | 33 +- .../OrganizationActionItems.tsx | 12 +- .../OrganizationEvents.module.css | 69 +- .../OrganizationEvents/OrganizationEvents.tsx | 3 +- src/screens/OrganizationFunds/FundModal.tsx | 6 +- .../OrganizationFunds/OrganizationFunds.tsx | 40 +- .../OrganizationTags/OrganizationTags.tsx | 2 +- .../OrganizationVenues/OrganizationVenues.tsx | 18 +- src/screens/Requests/Requests.module.css | 120 - src/screens/Requests/Requests.tsx | 15 +- src/style/app.module.css | 216 +- tsconfig.json | 3 +- vitest.config.ts | 35 + 41 files changed, 2908 insertions(+), 982 deletions(-) rename src/components/AddOn/{AddOn.test.tsx => AddOn.spec.tsx} (70%) delete mode 100644 src/screens/Requests/Requests.module.css create mode 100644 vitest.config.ts diff --git a/.eslintignore b/.eslintignore index 7e45de312a..2de71925e4 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1,5 @@ # Contains the PDF file of the Tag as JSON string, thus does not need to be linted -src/components/CheckIn/tagTemplate.ts \ No newline at end of file +src/components/CheckIn/tagTemplate.ts +package.json +package-lock.json +tsconfig.json diff --git a/.eslintrc.json b/.eslintrc.json index b3704d9aa1..165e406024 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,7 +5,6 @@ "es6": true }, - // Specify the rulesets from other ESLint Plugins tobe used "extends": [ "plugin:react/recommended", "eslint:recommended", @@ -28,7 +27,6 @@ "sourceType": "module" }, - // Specify the ESLint plugins tobe used "plugins": [ "react", "@typescript-eslint", @@ -78,13 +76,13 @@ "camelcase": "off", "@typescript-eslint/naming-convention": [ "error", - // Interfaces must begin with Interface or TestInterface followed by a PascalCase name + { "selector": "interface", "format": ["PascalCase"], "prefix": ["Interface", "TestInterface"] }, - // Type Aliases must be in PascalCase + { "selector": ["typeAlias", "typeLike", "enum"], "format": ["PascalCase"] @@ -121,20 +119,17 @@ "format": null } ], - // Ensures that components are always written in PascalCase + "react/jsx-pascal-case": [ "error", { "allowAllCaps": false, "allowNamespace": false } ], - // Enforces whitespace around equal sign operators "react/jsx-equals-spacing": ["warn", "never"], "react/no-this-in-sfc": "error", - // All tests must need not have an assertion "jest/expect-expect": 0, - // Enforce Strictly functional components "react/no-unstable-nested-components": ["error", { "allowAsProps": true }], "react/function-component-definition": [ 0, @@ -143,10 +138,10 @@ "prettier/prettier": "error" }, - // Let ESLint use the react version in the package.json "settings": { "react": { "version": "detect" } - } + }, + "ignorePatterns": ["**/*.css", "**/*.scss", "**/*.less", "**/*.json"] } diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a1e203bfdf..0748858133 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,3 +1,4 @@ +