fixed API issue

src/component/layout/Layout.jsx

@@ -9,19 +9,10 @@ import siteLinks from '../../links/siteLinks';
 export default function Layout() {
 
   const {pathname} = useLocation()
-  const isProfileComplete = pathname == siteLinks.profile_complete
+  // const isProfileComplete = pathname == siteLinks.profile_complete
 
   return (
       <div className="app">
-        {isProfileComplete ?
-        <div className="app-wrap">
-          <UserHeader />
-          <div className="container-fluid">
-            <Outlet />
-          </div>
-          <UserFooter isProfileComplete={isProfileComplete} />
-        </div>
-        :
         <div className="app-wrap">
           <UserHeader />
           <div className="app-container">
@@ -37,7 +28,6 @@ export default function Layout() {
           </div>
           <UserFooter />
         </div>
-        }
       </div>
   )
 }

src/component/layout/layoutcom/UserFooter.jsx

@@ -1,11 +1,11 @@
 import React from "react";
 
-export default function UserFooter({isProfileComplete=false}){
+export default function UserFooter(){
 
     const year = new Date().getFullYear()
 
     return <>
-        <footer className={`${isProfileComplete && 'w-100'} footer`}>
+        <footer className={`footer`}>
             <div className="row">
                 <div className="col-12 col-sm-6 text-center text-sm-left">
                     <p>&copy; Copyright {year}. All rights reserved.</p>

src/component/profile_complete/ProfileCompleteCom.jsx

@@ -1,146 +1,207 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
-import { useLocation } from "react-router-dom";
+// import { useLocation } from "react-router-dom";
-import { Form, Formik } from "formik";
+// import { Form, Formik } from "formik";
 import * as Yup from "yup";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import getImage from "../../utils/getImage";
 import { IoMdArrowDropdown } from "react-icons/io";
-import { completeProfile } from '../../services/services';
+import { completeProfile, getCommonPractice } from '../../services/services';
+import siteLinks from "../../links/siteLinks";
+import { useNavigate } from "react-router-dom";
 
 
-const validationSchema = Yup.object().shape({
+// const validationSchema = Yup.object().shape({
-    practice: Yup.string().required("Required"),
+//     practice: Yup.string().required("Required"),
-    specialization: Yup.string().required("Required"),
+//     specialization: Yup.string().required("Required"),
-    information: Yup.string().min(1, "Minimum 10 characters").max(50, "Maximum 50 characters").required("Required"),
+//     introduction: Yup.string().min(1, "Minimum 10 characters").max(50, "Maximum 50 characters").required("Required"),
-  })
+// })
 
-  const initialValues = {
+//   const initialValues = {
-    practice: '',
+//     practice: '',
-    specialization: '',
+//     specialization: '',
-    information: '',
+//     introduction: '',
-  };
+//   };
 
 
 export default function ProfileCompleteCom(){
 
-    const {state:{profile_completed}} = useLocation()
+    const navigate = useNavigate()
+
+    const [practices, setPractices] = useState([])
+    
+    const [initialValues, setInitialValues] = useState({
+        practice: '',
+        specialization: '',
+        introduction: '',
+    })
+
+    const specialties = useMemo(()=>{ // FUNCTION TO UPDATE SPECIALITY ARRAY EACH TIME PRACTICE CHANGES
+        setInitialValues(prev => ({...prev, specialization: ''}))
+        if(!initialValues.practice){
+            return []
+        }
+        const specialtiesArr = practices.filter(item => item.practice == initialValues.practice)[0]?.specialties
+        return specialtiesArr
+    },[initialValues.practice])
+
 
     const mutation = useMutation({
         mutationFn: (fields) => {
+            const {practice, specialization} = fields
+            if(!practice || !specialization){
+                throw new Error('Please select both practice and specialization fields')
+            }
             return completeProfile(fields)
         },
+        onError: () => {
+            setTimeout(()=>{mutation.reset()}, 4000)
+        },
         onSuccess: (res) => {
-            console.log('res', res)
+            setTimeout(()=>{
+                navigate(siteLinks.home)
+            },2000)
+            // console.log('res', res)
         }
     })
 
-    const handleCompleteProfile = (values, helpers) => {
+    const commonPractices = useMutation({ // FUNCTION TO GET COMMON PRACTICES
-    // helpers.resetForm()
+        mutationFn: (fields) => {
-    let reqData = {
+            return getCommonPractice(fields)
-        token: localStorage.getItem('token'), // USER TOKEN
+        },
-        uid: localStorage.getItem('uid'), // USER UID
+        onError: ()=> {
-        // ...values
+            setPractices([])
+        },
+        onSuccess: (res) => {
+            if(!res?.data){
+                return setPractices([])
+            }
+            let returnPractices = Object.entries(res?.data).filter(([key, value]) => typeof value == 'object')?.map(item => item[1])
+            setPractices(returnPractices)
+        }
+    })
+
+    const handlePracticeChange = ({target:{name, value}}) => {
+        setInitialValues(prev => ({...prev, [name]:value}))
     }
-    console.log('values', values, helpers)
+
-    // mutation.mutate(reqData)
+    const handleCompleteProfile = () => { // FUNCTION TO COMPLETE PROFILE
+        let reqData = {
+            token: localStorage.getItem('token'), // USER TOKEN
+            uid: localStorage.getItem('uid'), // USER UID
+            ...initialValues
+        }
+        mutation.mutate(reqData)
     }
 
+    useEffect(()=>{
+        let reqData = {
+            token: localStorage.getItem('token'), // USER TOKEN
+            uid: localStorage.getItem('uid') // USER UID
+        }
+        commonPractices.mutate(reqData)
+    },[])
+
     return <>
-        <div style={{marginTop: '90px'}}>
-            <BreadcrumbComBS title='Update Profile' paths={['Dashboard', 'Profile']} />
-        </div>
 
-        <div className="row pt-1">
+        <BreadcrumbComBS title='Update Profile' paths={['Dashboard', 'Profile']} />
 
-            {/*<div className="col-xxl-6 m-b-30">*/}
+        {commonPractices?.isFetching ?
-            {/*    <div className="card card-statistics h-100 mb-0" style={{minHeight: '100px'}}>*/}
+            <>
-            {/*        /!* <div className="card-header d-flex align-items-center justify-content-between">*/}
+                <div className="row">
-            {/*            <div className="card-heading">*/}
+                    <div className="col-12">
-            {/*                <h4 className="card-title">My Product URLs</h4>*/}
+                        <p className='text-mute'>Loading...</p>
-            {/*            </div>*/}
+                    </div>
-            {/*        </div> *!/*/}
+                </div>
-            {/*    </div>*/}
+            </>
-            {/*</div>*/}
+            : commonPractices?.isError ?
-            <div className="col-md-6 m-b-30">
+                <div className="row">
-                <div className="card card-statistics h-100 mb-0">
+                    <div className="col-12">
-                    {/* <div className="card-header d-flex align-items-center justify-content-between">
+                        <p className='text-danger'>{commonPractices?.error?.message}</p>
-                        <div className="card-heading">
+                    </div>
-                            <h4 className="card-title">My Product URLs</h4>
+                </div>
+            :
+            <div className="row pt-1">
+                <div className="col-md-6 m-b-30">
+                    <div className="card card-statistics h-100 mb-0">
+                        {/* <div className="card-header d-flex align-items-center justify-content-between">
+                            <div className="card-heading">
+                                <h4 className="card-title">My Product URLs</h4>
+                            </div>
+                        </div> */}
+                        {/* <div style={{minHeight: '400px'}}></div> */}
+                        <div className="card-body">
+                            <div className='h-100 row flex-column'>
+                                {/* <div className="row"> */}
+                                    <>
+                                        <div className="">
+                                            <div className="form-group position-relative">
+                                                <label className={`text-black fw-bold control-label`}>Practice :</label>
+                                                <div className="position-relative">    
+                                                    {/* <select onChange={props.handleChange} name='practice' value={props.values.practice} className="form-control">
+                                                        <option value=''>Select</option>
+                                                        {practices.map((practice, index)=>(
+                                                            <option key={index} value={practice.practice}>{practice.practice}</option>
+                                                        ))}
+                                                    </select> */}
+                                                    <select onChange={handlePracticeChange} name='practice' value={initialValues.practice} className="form-control">
+                                                        <option value=''>Select</option>
+                                                        {practices.map((practice, index)=>(
+                                                            <option key={index} value={practice.practice}>{practice.practice}</option>
+                                                        ))}
+                                                    </select>
+                                                    <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} /> 
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div className="">
+                                            <div className="form-group">
+                                                <label className={`text-black fw-bold control-label`}>Specialization :</label>
+                                                <div className="position-relative">
+                                                    <select onChange={handlePracticeChange} name='specialization' value={initialValues.specialization} className="form-control">
+                                                        <option value=''>Select</option>
+                                                        {specialties.map((specialty, index)=>(
+                                                            <option key={index} value={specialty}>{specialty}</option>
+                                                        ))}
+                                                    </select>
+                                                    <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} /> 
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div className="">
+                                            <div className="form-group position-relative">
+                                                <label className={`text-black fw-bold control-label`}>General Information :</label>
+                                                <textarea name='introduction' rows={10} style={{resize: 'none'}} className="form-control" value={initialValues.introduction} onChange={handlePracticeChange} />
+                                            </div>
+                                        </div>
+                        
+
+                                        {(mutation.isError || mutation.isSuccess) &&
+                                            <>
+                                            <div className="">
+                                                <p className={`${mutation.isSuccess ? 'text-success' : 'text-danger'}`}>{mutation.isSuccess ? 'Completed successfully, redirecting...' : mutation.error.message}</p>
+                                            </div>
+                                            </>
+                                        }
+
+                                        <div className="mt-auto text-end">
+                                            <button type='button' onClick={handleCompleteProfile} className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Continue'}</button>
+                                        </div>
+                                    </>
+                                {/* </div> */}
+                            </div>
                         </div>
-                    </div> */}
+                    </div>
-                    {/* <div style={{minHeight: '400px'}}></div> */}
+                </div>
-                    <div className="card-body">
+                <div className="col-md-6 m-b-30">
-                        <Formik
+                    <div className="text-center img-block left-column wow fadeInRight">
-                            initialValues={initialValues}
+                        <img className="img-fluid" src={getImage('img-07.png')} alt="content-image" />
-                            validationSchema={validationSchema}
-                            onSubmit={handleCompleteProfile}
-                        >
-                            {(props) => {
-                            return (
-                                <Form className='h-100 row flex-column'>
-                                    {/* <div className="row"> */}
-                                        <>
-                                            <div className="">
-                                                <div className="form-group position-relative">
-                                                    <label className={`text-black fw-bold control-label ${(props.errors.practice && props.touched.practice) && 'text-danger'}`}>Practice :</label>
-                                                    <div className="position-relative">    
-                                                        <select onChange={props.handleChange} name='practice' value={props.values.practice} className="form-control">
-                                                            <option value=''>Select</option>
-                                                            <option value='engineering'>Engineering</option>
-                                                        </select>
-                                                        <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} /> 
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                            <div className="">
-                                                <div className="form-group">
-                                                    <label className={`text-black fw-bold control-label ${(props.errors.specialization && props.touched.specialization) && 'text-danger'}`}>Specialization :</label>
-                                                    <div className="position-relative">
-                                                        <select onChange={props.handleChange} name='specialization' value={props.values.specialization} className="form-control">
-                                                            <option value=''>Select</option>
-                                                            <option value='construction'>Construction</option>
-                                                        </select>
-                                                        <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} /> 
-                                                    </div>
-                                                </div>
-                                            </div>
-
-                                            <div className="">
-                                                <div className="form-group position-relative">
-                                                    <label className={`text-black fw-bold control-label ${(props.errors.information && props.touched.information) && 'text-danger'}`}>General Information :</label>
-                                                    <textarea name='information' rows={10} style={{resize: 'none'}} className="form-control" value={props.values.information} onChange={props.handleChange} />
-                                                </div>
-                                            </div>
-                               
-
-                                            {/* {(mutation.isErrorrror || mutation.isSuccess) &&
-                                                <>
-                                                <div className="col-12">
-                                                    <p className={`${mutation.isSuccess ? 'text-success' : 'text-danger'}`}>{mutation.isSuccess ? 'Completed successfully' : mutation.error.message}</p>
-                                                </div>
-                                                </>
-                                            } */}
-
-                                            <div className="mt-auto text-end">
-                                                <button type='submit' className="btn btn-primary text-uppercase">{false ? 'loading...' : 'Continue'}</button>
-                                            </div>
-                                        </>
-                                    {/* </div> */}
-                                </Form>
-                            );
-                            }}
-                        </Formik>
                     </div>
                 </div>
             </div>
-            <div className="col-md-6 m-b-30">
+        }
-                <div class="text-center img-block left-column wow fadeInRight">
-                    <img className="img-fluid" src={getImage('img-07.png')} alt="content-image" />
-                </div>
-            </div>
-        </div>
     </>;
 
 }

src/services/services.js

@@ -171,7 +171,7 @@ export const completeProfile = (reqData) => {
     let postData = {
         ...reqData,
     }
-    return postAuxEnd(`/panel/`, postData, false)
+    return postAuxEnd(`/panel/account/startprofile`, postData, false)
 }
 
 // FUNCTION TO COMPLETE PROFILE
@@ -182,6 +182,14 @@ export const getSubscriptions = (reqData) => {
     return postAuxEnd(`/panel/subscription/products`, postData, false)
 }
 
+// FUNCTION TO GET COMMON PRACTICE
+export const getCommonPractice = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/common/practice`, postData, false)
+}
+