made loading profile to load only when user login status is false

.env.development

@@ -18,7 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=300000
-REACT_APP_SESSION_EXPIRE_CHECKER=60000
+REACT_APP_SESSION_EXPIRE_CHECKER=300000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000

.env.poduction

@@ -18,7 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=300000
-REACT_APP_SESSION_EXPIRE_CHECKER=60000
+REACT_APP_SESSION_EXPIRE_CHECKER=300000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000

src/components/Referral/ReferralDisplay.jsx

@@ -2,6 +2,33 @@ import React, { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { toast } from "react-toastify";
 import usersService from '../../services/UsersService';
+import InputCom from '../Helpers/Inputs/InputCom';
+import LoadingSpinner from '../Spinners/LoadingSpinner';
+
+import {Formik, Form} from 'formik'
+import * as Yup from 'yup'
+
+const validationSchema = Yup.object().shape({
+    email: Yup.string()
+      .email('Wrong email format')
+      .min(3, 'Minimum 3 characters')
+      .max(50, 'Maximum 50 characters')
+      .required('Email is required'),
+    firstname: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Firstname is required'),
+    lastname: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Lastname is required'),
+  })
+  
+  const initialValues = {
+    firstname: '',
+    lastname: '',
+    email: ''
+  }
 
 function ReferralDisplay() {
     const apiCall = new usersService() // GET API CALL
@@ -16,7 +43,7 @@ function ReferralDisplay() {
         data: []
     }) 
 
-    let [error, setError] = useState({message: '', loading: false}) // for displaying error message on the page
+    let [error, setError] = useState({message: '', loading: false, status: false}) // for displaying error message on the page
 
     //function to call referral history API
     const allReferrals = () => {
@@ -38,49 +65,28 @@ function ReferralDisplay() {
     const sendReferralMsg = (postData) => {
         apiCall.sendReferralMsg(postData).then((res)=>{
             if(res.data.internal_return < 0){
-                setError({message:'Email already referred', loading: false})
+                setError({message:'Email already referred', loading: false, status: false})
                 return
             }else{
-                setInputs({ firstname: '', lastname: '', email: '',})
                 toast.success("Message Sent");
-                setError({message:'', loading: false})
+                setError({message:'', loading: false, status: true})
                 setRefHistoryReload(prev => !prev)
             }
         }).catch((error)=>{
-            setError({message:'Opps! an error occured, try again later', loading: false})
+            setError({message:'Opps! an error occured, try again later', loading: false, status: false})
         })
     }
 
-    //STATE FOR CONTROLLED INPUTS
-    let [inputs, setInputs] = useState({
-        firstname: '',
-        lastname: '',
-        email: ''
-    })
-
-    // FUNCTION TO HANDLE INPUT CHANGE
-    const handleChange = ({target:{name, value}}) => {
-        setInputs(prev => ({...prev, [name]:value}))
-    }
-
     //FUNCTION TO HANDLE SUBMIT
-    const handleSubmit = (e) => {
-        e.preventDefault();
-        setError({message: '', loading: true})
-        let {firstname, lastname, email} = inputs
-        if(!firstname || !lastname || !email){
-            setError({message: 'Please fill all fields', loading: false})
-            return
-        }
+    const handleSubmit = (values, helpers) => {
+        setError({message: '', loading: true, status: false})
 
         var postData = {
             uid: localStorage.getItem("uid"),
             member_id: localStorage.getItem("member_id"),
             sessionid: localStorage.getItem("session_token"),
             action: 11032,
-            ref_firstname: firstname,
-            ref_lastname: lastname,
-            ref_email: email
+            ...values
             };
 
         sendReferralMsg(postData) // FUNCTION TO SEND REFERRAL MESSAGE
@@ -95,56 +101,62 @@ function ReferralDisplay() {
         <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
             <div className="referral w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow">
                 <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Send Referral</h2>
-               <form className='referral-info' onSubmit={handleSubmit}>
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Firstname <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.firstname} 
-                            name='firstname' 
-                            type="text" 
-                            placeholder='Firstname' 
-                            onChange={handleChange}
+                <Formik initialValues={initialValues} validationSchema={validationSchema} onSubmit={handleSubmit}>
+                    {(props)=>(
+                        <Form className='referral-info'>
+                            {/* Firstname */}
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Firstname"
+                                type="text"
+                                name="firstname"
+                                placeholder="Firstname"
+                                value={props.values.firstname}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
                             />
-                    </div>
-
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Lastname <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.lastname} 
-                            name='lastname' 
-                            type="text" 
-                            placeholder='Lastname' 
-                            onChange={handleChange}
-                            />
-                    </div>
-
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Email <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.email} 
-                            name='email' 
-                            type="email" 
-                            placeholder='Email' 
-                            onChange={handleChange}
-                            />
-                    </div>
-                    <hr />
-                    {error.message != '' && <p className='text-base text-red-500 py-2'>{error.message}</p>}
-                    <div className='referral-btn flex justify-end items-center py-4 border-b-4'>
-                        {error.loading ?
-                        <div className='flex items-center justify-center'>
-                            <div role="status">
-                                <svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-sky-blue" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-                                    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-                                </svg>
+                            {(props.errors.firstname && props.touched.firstname) && <p className="text-sm text-red-500">{props.errors.firstname}</p>}
                             </div>
-                        </div>
-                        :
-                        <button type='submit' className='text-lg text-white bg-sky-blue p-2 hover:opacity-90 rounded-md'>Send Message</button>
-                        }
-                    </div>
-               </form>
+
+                            {/* Lastname */}
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Lastname"
+                                type="text"
+                                name="lastname"
+                                placeholder="Lastname"
+                                value={props.values.lastname}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
+                            />
+                            {(props.errors.lastname && props.touched.lastname) && <p className="text-sm text-red-500">{props.errors.lastname}</p>}
+                            </div>
+
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Email"
+                                type="text"
+                                name="email"
+                                placeholder="Email"
+                                value={props.values.email}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
+                            />
+                            {(props.errors.email && props.touched.email) && <p className="text-sm text-red-500">{props.errors.email}</p>}
+                            </div>
+
+                            <hr />
+                            {error.message != '' && <p className='text-base text-red-500 py-2'>{error.message}</p>}
+                            <div className='referral-btn flex justify-end items-center py-4 border-b-4'>
+                                {error.loading ?
+                                <LoadingSpinner size='6' color='sky-blue' />
+                                :
+                                <button type='submit' className='text-lg text-white bg-sky-blue p-2 hover:opacity-90 rounded-md'>Send Message</button>
+                                }
+                            </div>
+                        </Form>
+                    )}
+               </Formik>
             </div>
         </div>
 
@@ -153,14 +165,7 @@ function ReferralDisplay() {
                 <h2 className='mb-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Referral List</h2>
                 {referralList.loading ? 
                 (
-                <div className='flex items-center justify-center'>
-                    <div role="status">
-                        <svg aria-hidden="true" class="w-32 h-32 text-gray-200 animate-spin dark:text-gray-600 fill-sky-blue" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-                            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-                        </svg>
-                    </div>
-                </div>
+                <LoadingSpinner size='32' color='sky-blue' />
                 )
                 :
                 (

src/middleware/AuthRoute.jsx

@@ -34,6 +34,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   window.addEventListener('keydown', resetTime)
 
   const loadProfile = ()=>{ // function to load user profile
+    setIsLogin({loading: true, status: false})
     apiCall.loadProfile().then((res)=>{
       if(res.data.internal_return < 0){
         setIsLogin({loading: false, status: false})
@@ -50,7 +51,9 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   }, [])
   
   useEffect(() => {
-    getProfile()
+    if(!isLogin.status){
+      getProfile()
+    }
 
     const checkInactivity = setInterval(() => {
       if (Date.now() - lastActivityTime > process.env.REACT_APP_SESSION_EXPIRE_MINUTES) {