Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix the loading state #2177

Merged
merged 5 commits into from
Aug 17, 2024
Merged

fix the loading state #2177

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d8423b
fix the loading state
AnshulKahar2729 Aug 15, 2024
82bea98
Merge branch 'develop' into loginLoading
AnshulKahar2729 Aug 15, 2024
246be20
changes after review
AnshulKahar2729 Aug 15, 2024
847f509
Merge remote-tracking branch 'upstream/develop' into loginLoading
AnshulKahar2729 Aug 15, 2024
6a10083
Merge branch 'loginLoading' of https://github.com/AnshulKahar2729/tal…
AnshulKahar2729 Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions src/screens/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import { GET_COMMUNITY_DATA, ORGANIZATION_LIST } from 'GraphQl/Queries/Queries';
import { ReactComponent as PalisadoesLogo } from 'assets/svgs/palisadoes.svg';
import { ReactComponent as TalawaLogo } from 'assets/svgs/talawa.svg';
import ChangeLanguageDropDown from 'components/ChangeLanguageDropdown/ChangeLanguageDropDown';
import Loader from 'components/Loader/Loader';
import LoginPortalToggle from 'components/LoginPortalToggle/LoginPortalToggle';
import { errorHandler } from 'utils/errorHandler';
import useLocalStorage from 'utils/useLocalstorage';
Expand Down Expand Up @@ -63,7 +62,6 @@ const loginPage = (): JSX.Element => {
const [recaptchaToken, setRecaptchaToken] = useState<string | null>(null);
const [showTab, setShowTab] = useState<'LOGIN' | 'REGISTER'>('LOGIN');
const [role, setRole] = useState<'admin' | 'user'>('admin');
const [componentLoader, setComponentLoader] = useState(true);
const [isInputFocused, setIsInputFocused] = useState(false);
const [signformState, setSignFormState] = useState({
signfirstName: '',
Expand Down Expand Up @@ -113,22 +111,20 @@ const loginPage = (): JSX.Element => {
if (isLoggedIn == 'TRUE') {
navigate(getItem('userId') !== null ? '/user/organizations' : '/orglist');
}
setComponentLoader(false);
}, []);

const togglePassword = (): void => setShowPassword(!showPassword);
const toggleConfirmPassword = (): void =>
setShowConfirmPassword(!showConfirmPassword);

const { data, loading, refetch } = useQuery(GET_COMMUNITY_DATA);
const { data, refetch } = useQuery(GET_COMMUNITY_DATA);
useEffect(() => {
// refetching the data if the pre-login data updates
refetch();
}, [data]);
const [login, { loading: loginLoading }] = useMutation(LOGIN_MUTATION);
const [signup, { loading: signinLoading }] = useMutation(SIGNUP_MUTATION);
const [recaptcha, { loading: recaptchaLoading }] =
useMutation(RECAPTCHA_MUTATION);
const [recaptcha] = useMutation(RECAPTCHA_MUTATION);
const { data: orgData } = useQuery(ORGANIZATION_LIST);

useEffect(() => {
Expand Down Expand Up @@ -336,15 +332,6 @@ const loginPage = (): JSX.Element => {
}
};

if (
componentLoader ||
loginLoading ||
signinLoading ||
recaptchaLoading ||
loading
) {
return <Loader />;
}
const socialIconsList = socialMediaLinks.map(({ href, logo, tag }, index) =>
data?.getCommunityData ? (
data.getCommunityData?.socialMediaUrls?.[tag] && (
Expand Down Expand Up @@ -435,6 +422,7 @@ const loginPage = (): JSX.Element => {
<div className="position-relative">
<Form.Control
type="email"
disabled={loginLoading}
placeholder={tCommon('enterEmail')}
required
value={formState.email}
Expand Down Expand Up @@ -471,6 +459,7 @@ const loginPage = (): JSX.Element => {
password: e.target.value,
});
}}
disabled={loginLoading}
autoComplete="current-password"
/>
<Button
Expand Down Expand Up @@ -510,6 +499,7 @@ const loginPage = (): JSX.Element => {
<></>
)}
<Button
disabled={loginLoading}
type="submit"
className="mt-3 mb-3 w-100"
value="Login"
Expand Down Expand Up @@ -550,6 +540,7 @@ const loginPage = (): JSX.Element => {
<div>
<Form.Label>{tCommon('firstName')}</Form.Label>
<Form.Control
disabled={signinLoading}
type="text"
id="signfirstname"
className="mb-3"
Expand All @@ -569,6 +560,7 @@ const loginPage = (): JSX.Element => {
<div>
<Form.Label>{tCommon('lastName')}</Form.Label>
<Form.Control
disabled={signinLoading}
type="text"
id="signlastname"
className="mb-3"
Expand All @@ -589,6 +581,7 @@ const loginPage = (): JSX.Element => {
<Form.Label>{tCommon('email')}</Form.Label>
<div className="position-relative">
<Form.Control
disabled={signinLoading}
type="email"
data-testid="signInEmail"
className="mb-3"
Expand Down Expand Up @@ -616,6 +609,7 @@ const loginPage = (): JSX.Element => {
<Form.Label>{tCommon('password')}</Form.Label>
<div className="position-relative">
<Form.Control
disabled={signinLoading}
type={showPassword ? 'text' : 'password'}
data-testid="passwordField"
placeholder={tCommon('password')}
Expand Down Expand Up @@ -770,6 +764,7 @@ const loginPage = (): JSX.Element => {
<Form.Label>{tCommon('confirmPassword')}</Form.Label>
<div className="position-relative">
<Form.Control
disabled={signinLoading}
type={showConfirmPassword ? 'text' : 'password'}
placeholder={tCommon('confirmPassword')}
required
Expand Down Expand Up @@ -851,6 +846,7 @@ const loginPage = (): JSX.Element => {
className="mt-4 w-100 mb-3"
value="Register"
data-testid="registrationBtn"
disabled={signinLoading}
>
{tCommon('register')}
</Button>
Expand Down
Loading