fix Requests to Membership Requests

INSTALLATION.md

@@ -6,8 +6,6 @@ This document provides instructions on how to set up and start a running instanc
 
 <!-- toc -->
 
-- [Talawa-Admin Installation](#talawa-admin-installation)
-- [Table of Contents](#table-of-contents)
 - [Installation Steps Summary](#installation-steps-summary)
 - [Prerequisites](#prerequisites)
   - [Install git](#install-git)
@@ -18,8 +16,8 @@ This document provides instructions on how to set up and start a running instanc
 - [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\_RECAPTCHA\_SITE\_KEY in .env file](#setting-up-react_app_recaptcha_site_key-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_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)
@@ -36,7 +34,6 @@ This document provides instructions on how to set up and start a running instanc
 
 <!-- tocstop -->
 
-
 # Installation Steps Summary
 
 Installation is not difficult, but there are many steps. This is a brief explanation of what needs to be done:

public/locales/en.json

@@ -95,7 +95,7 @@
     "menu": "Menu",
     "my organizations": "My Organizations",
     "users": "Users",
-    "requests": "Requests",
+    "requests": "Membership Requests",
     "communityProfile": "Community Profile",
     "logout": "Logout"
   },
@@ -177,17 +177,17 @@
     "all": "All"
   },
   "requests": {
-    "title": "Requests",
+    "title": "Membership Requests",
     "sl_no": "Sl. No.",
     "name": "Name",
     "email": "Email",
     "accept": "Accept",
     "reject": "Reject",
-    "searchRequests": "Search requests",
+    "searchRequests": "Search membership requests",
     "endOfResults": "End of results",
     "noOrgError": "Organizations not found, please create an organization through dashboard",
     "noResultsFoundFor": "No results found for ",
-    "noRequestsFound": "No Request Found",
+    "noRequestsFound": "No Membership Requests Found",
     "acceptedSuccessfully": "Request accepted successfully",
     "rejectedSuccessfully": "Request rejected successfully",
     "noOrgErrorTitle": "Organizations Not Found",

src/components/EventCalendar/EventCalendar.test.tsx

@@ -11,8 +11,7 @@ import {
 } from 'GraphQl/Mutations/mutations';
 import i18nForTest from 'utils/i18nForTest';
 import { StaticMockLink } from 'utils/StaticMockLink';
-import { weekdays } from './constants';
-import { months } from './constants';
+import { weekdays, months } from './constants';
 import { BrowserRouter as Router } from 'react-router-dom';
 
 const eventData = [

src/components/EventCalendar/YearlyEventCalender.tsx

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import Button from 'react-bootstrap/Button';
 import React, { useState, useEffect } from 'react';
 import styles from './YearlyEventCalender.module.css';
-import { ViewType } from 'screens/OrganizationEvents/OrganizationEvents';
+import type { ViewType } from 'screens/OrganizationEvents/OrganizationEvents';
 import { ChevronLeft, ChevronRight } from '@mui/icons-material';
 import type { InterfaceRecurrenceRule } from 'utils/recurrenceUtils';
 

src/components/LeftDrawerOrg/LeftDrawerOrg.tsx

@@ -141,7 +141,7 @@ const leftDrawerOrg = ({
                   >
                     <div className={styles.iconWrapper}>
                       <IconComponent
-                        name={name}
+                        name={name == 'Membership Requests' ? 'Requests' : name}
                         fill={
                           isActive === true
                             ? 'var(--bs-white)'

src/screens/Requests/Requests.test.tsx

@@ -198,7 +198,7 @@ describe('Testing Requests screen', () => {
     );
 
     await wait();
-    expect(screen.getByText(/No Request Found/i)).toBeTruthy();
+    expect(screen.getByText(/No Membership Requests Found/i)).toBeTruthy();
   });
 
   test('Should render warning alert when there are no organizations', async () => {

src/state/reducers/routesReducer.test.ts

@@ -23,7 +23,7 @@ describe('Testing Routes reducer', () => {
         },
         { name: 'Advertisement', url: '/orgads/undefined' },
         { name: 'Funds', url: '/orgfunds/undefined' },
-        { name: 'Requests', url: '/requests/undefined' },
+        { name: 'Membership Requests', url: '/requests/undefined' },
         {
           name: 'Plugins',
           subTargets: [
@@ -76,7 +76,7 @@ describe('Testing Routes reducer', () => {
           component: 'OrganizationFunds',
         },
         {
-          name: 'Requests',
+          name: 'Membership Requests',
           comp_id: 'requests',
           component: 'Requests',
         },
@@ -117,7 +117,7 @@ describe('Testing Routes reducer', () => {
         { name: 'Block/Unblock', url: '/blockuser/orgId' },
         { name: 'Advertisement', url: '/orgads/orgId' },
         { name: 'Funds', url: '/orgfunds/orgId' },
-        { name: 'Requests', url: '/requests/orgId' },
+        { name: 'Membership Requests', url: '/requests/orgId' },
         {
           name: 'Plugins',
           subTargets: [
@@ -166,7 +166,7 @@ describe('Testing Routes reducer', () => {
         },
         { name: 'Funds', comp_id: 'orgfunds', component: 'OrganizationFunds' },
         {
-          name: 'Requests',
+          name: 'Membership Requests',
           comp_id: 'requests',
           component: 'Requests',
         },
@@ -210,7 +210,7 @@ describe('Testing Routes reducer', () => {
         },
         { name: 'Advertisement', url: '/orgads/undefined' },
         { name: 'Funds', url: '/orgfunds/undefined' },
-        { name: 'Requests', url: '/requests/undefined' },
+        { name: 'Membership Requests', url: '/requests/undefined' },
         { name: 'Settings', url: '/orgsetting/undefined' },
         {
           comp_id: null,
@@ -266,7 +266,7 @@ describe('Testing Routes reducer', () => {
           component: 'OrganizationFunds',
         },
         {
-          name: 'Requests',
+          name: 'Membership Requests',
           comp_id: 'requests',
           component: 'Requests',
         },

src/state/reducers/routesReducer.ts

@@ -80,7 +80,7 @@ const components: ComponentType[] = [
   { name: 'Block/Unblock', comp_id: 'blockuser', component: 'BlockUser' },
   { name: 'Advertisement', comp_id: 'orgads', component: 'Advertisements' },
   { name: 'Funds', comp_id: 'orgfunds', component: 'OrganizationFunds' },
-  { name: 'Requests', comp_id: 'requests', component: 'Requests' },
+  { name: 'Membership Requests', comp_id: 'requests', component: 'Requests' },
   {
     name: 'Plugins',
     comp_id: null,