-
+
{t('password')}
+
setIsInputFocused(true)}
- onBlur={(): void => setIsInputFocused(false)}
+ className="input_box_second"
+ placeholder={t('enterPassword')}
required
- value={signformState.signPassword}
+ value={formState.password}
+ data-testid="password"
onChange={(e): void => {
- setSignFormState({
- ...signformState,
- signPassword: e.target.value,
+ setFormState({
+ ...formState,
+ password: e.target.value,
});
}}
+ autoComplete="current-password"
/>
-
- {isInputFocused &&
- signformState.signPassword.length < 8 && (
-
- {t('atleast_8_char_long')}
-
- )}
- {!isInputFocused &&
- signformState.signPassword.length > 0 &&
- signformState.signPassword.length < 8 && (
-
- {t('atleast_8_char_long')}
-
- )}
+
+
+
+
+ {t('forgotPassword')}
+
+
+ {REACT_APP_USE_RECAPTCHA === 'yes' ? (
+
+
+
+ ) : (
+ /* istanbul ignore next */
+ <>
+ )}
+
+
+
+ {t('OR')}
-
-
+
+
+
+ {/* REGISTER FORM */}
+
+
+
);
diff --git a/src/screens/MemberDetail/MemberDetail.module.css b/src/screens/MemberDetail/MemberDetail.module.css
index f0347e2a04..57df721d70 100644
--- a/src/screens/MemberDetail/MemberDetail.module.css
+++ b/src/screens/MemberDetail/MemberDetail.module.css
@@ -187,29 +187,6 @@
width: 65%;
}
-form label {
- font-weight: bold;
- padding-bottom: 1px;
- font-size: 14px;
- color: #707070;
-}
-
-form > input {
- display: block;
- margin-bottom: 20px;
- border: 1px solid #e8e5e5;
- box-shadow: 2px 1px #e8e5e5;
- padding: 10px 20px;
- border-radius: 5px;
- background: none;
- width: 100%;
- transition: all 0.3s ease-in-out;
- -webkit-transition: all 0.3s ease-in-out;
- -moz-transition: all 0.3s ease-in-out;
- -ms-transition: all 0.3s ease-in-out;
- -o-transition: all 0.3s ease-in-out;
-}
-
.checkboxdiv > label {
margin-right: 50px;
}
diff --git a/src/screens/MemberDetail/MemberDetail.tsx b/src/screens/MemberDetail/MemberDetail.tsx
index d564b4dd68..c898ae9b32 100644
--- a/src/screens/MemberDetail/MemberDetail.tsx
+++ b/src/screens/MemberDetail/MemberDetail.tsx
@@ -16,6 +16,7 @@ import { languages } from 'utils/languages';
import { ADD_ADMIN_MUTATION } from 'GraphQl/Mutations/mutations';
import { toast } from 'react-toastify';
import { errorHandler } from 'utils/errorHandler';
+import Loader from 'components/Loader/Loader';
type MemberDetailProps = {
id: string; // This is the userId
@@ -45,11 +46,7 @@ const MemberDetail: React.FC
= ({ id }): JSX.Element => {
});
if (loading) {
- return (
- <>
-
-
- );
+ return ;
}
/* istanbul ignore next */
diff --git a/src/screens/OrgContribution/OrgContribution.module.css b/src/screens/OrgContribution/OrgContribution.module.css
index 08c273dbbd..1a3930690c 100644
--- a/src/screens/OrgContribution/OrgContribution.module.css
+++ b/src/screens/OrgContribution/OrgContribution.module.css
@@ -175,28 +175,6 @@
border-bottom: 3px solid #31bb6b;
width: 40%;
}
-form > label {
- font-weight: bold;
- padding-bottom: 1px;
- font-size: 14px;
- color: #707070;
-}
-
-form > input {
- display: block;
- margin-bottom: 20px;
- border: 1px solid #e8e5e5;
- box-shadow: 2px 1px #e8e5e5;
- padding: 10px 20px;
- border-radius: 5px;
- background: none;
- width: 100%;
- transition: all 0.3s ease-in-out;
- -webkit-transition: all 0.3s ease-in-out;
- -moz-transition: all 0.3s ease-in-out;
- -ms-transition: all 0.3s ease-in-out;
- -o-transition: all 0.3s ease-in-out;
-}
.cancel > i {
margin-top: 5px;
transform: scale(1.2);
diff --git a/src/screens/OrgList/OrgList.module.css b/src/screens/OrgList/OrgList.module.css
index c0ce4541c8..eddb1b6b36 100644
--- a/src/screens/OrgList/OrgList.module.css
+++ b/src/screens/OrgList/OrgList.module.css
@@ -219,28 +219,6 @@
border-bottom: 3px solid #31bb6b;
width: 65%;
}
-form label {
- font-weight: bold;
- padding-bottom: 1px;
- font-size: 14px;
- color: #707070;
-}
-
-form > input {
- display: block;
- margin-bottom: 20px;
- border: 1px solid #e8e5e5;
- box-shadow: 2px 1px #e8e5e5;
- padding: 10px 20px;
- border-radius: 5px;
- background: none;
- width: 100%;
- transition: all 0.3s ease-in-out;
- -webkit-transition: all 0.3s ease-in-out;
- -moz-transition: all 0.3s ease-in-out;
- -ms-transition: all 0.3s ease-in-out;
- -o-transition: all 0.3s ease-in-out;
-}
.checkboxdiv > label {
margin-right: 50px;
diff --git a/src/screens/OrgList/OrgList.tsx b/src/screens/OrgList/OrgList.tsx
index a603adad35..7d9c872f44 100644
--- a/src/screens/OrgList/OrgList.tsx
+++ b/src/screens/OrgList/OrgList.tsx
@@ -24,6 +24,7 @@ import convertToBase64 from 'utils/convertToBase64';
import AdminDashListCard from 'components/AdminDashListCard/AdminDashListCard';
import { Alert, AlertTitle } from '@mui/material';
import { errorHandler } from 'utils/errorHandler';
+import Loader from 'components/Loader/Loader';
function orgList(): JSX.Element {
const { t } = useTranslation('translation', { keyPrefix: 'orgList' });
@@ -136,11 +137,7 @@ function orgList(): JSX.Element {
};
if (loading || loading2 || loading3) {
- return (
- <>
-
-
- );
+ return ;
}
/* istanbul ignore next */
diff --git a/src/screens/OrgPost/OrgPost.module.css b/src/screens/OrgPost/OrgPost.module.css
index 7623e04083..037e5f40c8 100644
--- a/src/screens/OrgPost/OrgPost.module.css
+++ b/src/screens/OrgPost/OrgPost.module.css
@@ -190,31 +190,10 @@
border-bottom: 3px solid #31bb6b;
width: 40%;
}
-form > label {
- font-weight: bold;
- padding-bottom: 1px;
- font-size: 14px;
- color: #707070;
-}
.postinfo {
height: 80px;
}
-form > input,
-textarea {
- display: block;
- margin-bottom: 20px;
- border: 1px solid #e8e5e5;
- box-shadow: 2px 1px #e8e5e5;
- padding: 10px 20px;
- border-radius: 5px;
- background: none;
- width: 100%;
- transition: all 0.3s ease-in-out;
- -webkit-transition: all 0.3s ease-in-out;
- -moz-transition: all 0.3s ease-in-out;
- -ms-transition: all 0.3s ease-in-out;
- -o-transition: all 0.3s ease-in-out;
-}
+
.postinfo {
height: 80px;
margin-bottom: 20px;
diff --git a/src/screens/OrgPost/OrgPost.tsx b/src/screens/OrgPost/OrgPost.tsx
index 30564f218c..48b6a17020 100644
--- a/src/screens/OrgPost/OrgPost.tsx
+++ b/src/screens/OrgPost/OrgPost.tsx
@@ -22,6 +22,7 @@ import convertToBase64 from 'utils/convertToBase64';
import NotFound from 'components/NotFound/NotFound';
import { Form as StyleBox } from 'react-bootstrap';
import { errorHandler } from 'utils/errorHandler';
+import Loader from 'components/Loader/Loader';
function orgPost(): JSX.Element {
const { t } = useTranslation('translation', {
@@ -108,11 +109,7 @@ function orgPost(): JSX.Element {
};
if (createPostLoading || orgPostListLoading) {
- return (
- <>
-
-
- );
+ return ;
}
/* istanbul ignore next */
diff --git a/src/screens/OrgSettings/OrgSettings.tsx b/src/screens/OrgSettings/OrgSettings.tsx
index d102040a7d..c6f5714052 100644
--- a/src/screens/OrgSettings/OrgSettings.tsx
+++ b/src/screens/OrgSettings/OrgSettings.tsx
@@ -15,6 +15,7 @@ import type { RootState } from 'state/reducers';
import { useTranslation } from 'react-i18next';
import defaultImg from 'assets/images/blank.png';
import Button from 'react-bootstrap/Button';
+import Loader from 'components/Loader/Loader';
function orgSettings(): JSX.Element {
const { t } = useTranslation('translation', {
@@ -54,11 +55,7 @@ function orgSettings(): JSX.Element {
});
if (loading) {
- return (
- <>
-
-
- );
+ return ;
}
/* istanbul ignore next */
diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
index 229162a33c..cdfebb31ca 100644
--- a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
+++ b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx
@@ -20,6 +20,7 @@ import {
} from 'GraphQl/Queries/Queries';
import { DELETE_ORGANIZATION_MUTATION } from 'GraphQl/Mutations/mutations';
import { errorHandler } from 'utils/errorHandler';
+import Loader from 'components/Loader/Loader';
function organizationDashboard(): JSX.Element {
const { t } = useTranslation('translation', { keyPrefix: 'dashboard' });
@@ -77,11 +78,7 @@ function organizationDashboard(): JSX.Element {
};
if (loading || loadingPost || loadingEvent) {
- return (
- <>
-
-
- );
+ return ;
}
/* istanbul ignore next */
diff --git a/src/screens/OrganizationEvents/OrganizationEvents.module.css b/src/screens/OrganizationEvents/OrganizationEvents.module.css
index 005cd0afd8..05a70c3fa3 100644
--- a/src/screens/OrganizationEvents/OrganizationEvents.module.css
+++ b/src/screens/OrganizationEvents/OrganizationEvents.module.css
@@ -177,12 +177,6 @@
border-bottom: 3px solid #31bb6b;
width: 40%;
}
-form > label {
- font-weight: bold;
- padding-bottom: 1px;
- font-size: 14px;
- color: #707070;
-}
.titlemodal {
color: #707070;
font-weight: 600;
@@ -192,21 +186,6 @@ form > label {
border-bottom: 3px solid #31bb6b;
width: 65%;
}
-form > input {
- display: block;
- margin-bottom: 20px;
- border: 1px solid #e8e5e5;
- box-shadow: 2px 1px #e8e5e5;
- padding: 10px 20px;
- border-radius: 5px;
- background: none;
- width: 100%;
- transition: all 0.3s ease-in-out;
- -webkit-transition: all 0.3s ease-in-out;
- -moz-transition: all 0.3s ease-in-out;
- -ms-transition: all 0.3s ease-in-out;
- -o-transition: all 0.3s ease-in-out;
-}
.cancel > i {
margin-top: 5px;
transform: scale(1.2);
diff --git a/src/screens/OrganizationEvents/OrganizationEvents.tsx b/src/screens/OrganizationEvents/OrganizationEvents.tsx
index 1fa5b4f698..d36a3f6ac4 100644
--- a/src/screens/OrganizationEvents/OrganizationEvents.tsx
+++ b/src/screens/OrganizationEvents/OrganizationEvents.tsx
@@ -24,6 +24,7 @@ import { CREATE_EVENT_MUTATION } from 'GraphQl/Mutations/mutations';
import type { RootState } from 'state/reducers';
import dayjs from 'dayjs';
import { errorHandler } from 'utils/errorHandler';
+import Loader from 'components/Loader/Loader';
function organizationEvents(): JSX.Element {
const { t } = useTranslation('translation', {
@@ -125,11 +126,7 @@ function organizationEvents(): JSX.Element {
};
if (loading || loading2) {
- return (
- <>
-
-
- );
+ return ;
}
/* istanbul ignore next */
diff --git a/src/screens/OrganizationPeople/OrganizationPeople.module.css b/src/screens/OrganizationPeople/OrganizationPeople.module.css
index 3934b8e7a1..13972524d7 100644
--- a/src/screens/OrganizationPeople/OrganizationPeople.module.css
+++ b/src/screens/OrganizationPeople/OrganizationPeople.module.css
@@ -179,28 +179,6 @@
border-bottom: 3px solid #31bb6b;
width: 40%;
}
-form > label {
- font-weight: bold;
- padding-bottom: 1px;
- font-size: 14px;
- color: #707070;
-}
-
-form > input {
- display: block;
- margin-bottom: 20px;
- border: 1px solid #e8e5e5;
- box-shadow: 2px 1px #e8e5e5;
- padding: 10px 20px;
- border-radius: 5px;
- background: none;
- width: 100%;
- transition: all 0.3s ease-in-out;
- -webkit-transition: all 0.3s ease-in-out;
- -moz-transition: all 0.3s ease-in-out;
- -ms-transition: all 0.3s ease-in-out;
- -o-transition: all 0.3s ease-in-out;
-}
.cancel > i {
margin-top: 5px;
transform: scale(1.2);