Compare commits

..

4 Commits

Author SHA1 Message Date
victorAnumudu 9cfb4651af added common practice endpoint 2025-08-13 19:08:35 +01:00
ameye 2d141b529c Merge branch 'complete-profile-aside' of MERMS/MermsPanelReactJS into master 2025-08-13 16:00:48 +00:00
victorAnumudu b418ca7d58 added aside menu back 2025-08-13 16:51:59 +01:00
ameye 9eea804f71 Merge branch 'profile-complete-layout' of MERMS/MermsPanelReactJS into master 2025-08-13 11:09:57 +00:00
4 changed files with 136 additions and 107 deletions
+1 -11
View File
@@ -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>
)
}
@@ -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>
@@ -1,29 +1,31 @@
import React, { useEffect } from "react";
import React, { useEffect, useState } from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
import { useLocation } from "react-router-dom";
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';
const validationSchema = Yup.object().shape({
practice: 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 = {
practice: '',
specialization: '',
information: '',
introduction: '',
};
export default function ProfileCompleteCom(){
const [practices, setPractices] = useState({practice: [], specialization: []})
const {state:{profile_completed}} = useLocation()
const mutation = useMutation({
@@ -46,101 +48,130 @@ export default function ProfileCompleteCom(){
// mutation.mutate(reqData)
}
const commonPractices = useMutation({ // FUNCTION TO GET COMMON PRACTICES
mutationFn: (fields) => {
return getCommonPractice(fields)
},
onError: ()=> {
setPractices({practice: [], specialization: []})
},
onSuccess: (res) => {
let returnPractices = []
let returnSpecialization = []
setPractices(res)
}
})
useEffect(()=>{
let reqData = {
token: localStorage.getItem('token'), // USER TOKEN
uid: localStorage.getItem('uid') // USER UID
}
commonPractices.mutate(reqData)
},[])
console.log('practices', practices)
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">*/}
{/* <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="card-heading">*/}
{/* <h4 className="card-title">My Product URLs</h4>*/}
{/* </div>*/}
{/* </div> *!/*/}
{/* </div>*/}
{/*</div>*/}
<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>
{commonPractices?.isFetching ?
<>
<div className="row">
<div className="col-12">
<p className='text-mute'>Loading...</p>
</div>
</div>
</>
: commonPractices?.isError ?
<div className="row">
<div className="col-12">
<p className='text-danger'>{commonPractices?.error?.message}</p>
</div>
</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">
<Formik
initialValues={initialValues}
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.introduction && props.touched.introduction) && 'text-danger'}`}>General Information :</label>
<textarea name='introduction' rows={10} style={{resize: 'none'}} className="form-control" value={props.values.introduction} onChange={props.handleChange} />
</div>
</div>
{/* {(mutation.isError || 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 style={{minHeight: '400px'}}></div> */}
<div className="card-body">
<Formik
initialValues={initialValues}
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 className="col-md-6 m-b-30">
<div className="text-center img-block left-column wow fadeInRight">
<img className="img-fluid" src={getImage('img-07.png')} alt="content-image" />
</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>
}
</>;
}
+9 -1
View File
@@ -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)
}