fixed page settings return value bug

.env

@@ -1,15 +1,15 @@
 SKIP_PREFLIGHT_CHECK=true 
 REACT_APP_NODE_ENV="development"
-REACT_APP_SOCKET_URL="https://devsocket.mermsemr.com"
-REACT_APP_MAIN_API="https://devapi.mermsemr.com"
-REACT_APP_MEDIA_SERVER="https://qa-media.mermsemr.com"
-REACT_APP_MAIN_SOCKET="https://devsocket.mermsemr.com"
+REACT_APP_SOCKET_URL="https://socket.mermsemr.com"
+REACT_APP_MAIN_API="https://api.mermsemr.com"
+REACT_APP_MEDIA_SERVER="https://media.mermsemr.com"
+REACT_APP_MAIN_SOCKET="https://dsocket.mermsemr.com"
 
 # login footer links
-REACT_APP_HOME_LINK='https://qa-www.mermsemr.com/'
-REACT_APP_ABOUT_LINK='https://qa-www.mermsemr.com/about'
-REACT_APP_CONTACTS_LINK='https://qa-www.mermsemr.com/contacts'
-REACT_APP_TERMS_LINK='https://qa-www.mermsemr.com/terms'
+REACT_APP_HOME_LINK='https://www.mermsemr.com/'
+REACT_APP_ABOUT_LINK='https://www.mermsemr.com/about'
+REACT_APP_CONTACTS_LINK='https://www.mermsemr.com/contacts'
+REACT_APP_TERMS_LINK='https://www.mermsemr.com/terms'
 
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000

src/AppRouters.jsx

@@ -22,7 +22,8 @@ import HelpPage from './views/HelpPage';
 import SubscriptionPage from './views/SubscriptionPage';
 import OnboardPage from "./views/OnboardPage";
 import AccPWDResetPage from './views/AccPWDResetPage';
-
+import ProfileCompletePage from './views/ProfileCompletePage';
+import  SubscribePage from './views/Subscribe'
 
 function AppRouters() {
   return (
@@ -44,6 +45,7 @@ function AppRouters() {
           <Route element={<SocketIOContextProvider />}>
             <Route element={<UserExist />}> 
               <Route path={siteLinks.dash} element={<HomePage />} />
+              <Route path={siteLinks.profile_complete} element={<ProfileCompletePage />} />
               <Route path={siteLinks.product} element={<ProductPage />} />
               <Route path={siteLinks.reports} element={<ReportsPage />} />
               <Route path={siteLinks.comments} element={<CommentsPage />} />
@@ -53,6 +55,7 @@ function AppRouters() {
               <Route path={siteLinks.onboard} element={<OnboardPage />} />
               <Route path={siteLinks.calendar} element={<CalendarPage />} />
               <Route path={siteLinks.settings} element={<SettingsPage />} />
+              <Route path={siteLinks.subscribe} element={<SubscribePage />} />
               <Route path={siteLinks.help} element={<HelpPage />} />
             </Route>
           </Route>

src/component/layout/Layout.jsx

@@ -1,16 +1,22 @@
 import React from 'react'
+import { Outlet, useLocation } from 'react-router-dom';
 import UserMenu from "./layoutcom/UserMenu";
 import UserHeader from "./layoutcom/UserHeader";
 import UserFooter from "./layoutcom/UserFooter";
-import { Outlet } from 'react-router-dom';
+import siteLinks from '../../links/siteLinks';
 
 
 export default function Layout() {
+
+  const {pathname} = useLocation()
+  // const isProfileComplete = pathname == siteLinks.profile_complete
+
   return (
       <div className="app">
         <div className="app-wrap">
           <UserHeader />
           <div className="app-container">
+            
             <aside className="app-navbar">
               <UserMenu />
             </aside>

src/component/layout/layoutcom/UserFooter.jsx

@@ -5,7 +5,7 @@ export default function UserFooter(){
     const year = new Date().getFullYear()
 
     return <>
-        <footer className="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/layout/layoutcom/UserHeader.jsx

@@ -73,7 +73,7 @@ export default function UserHeader(){
 
                         <ul className="navbar-nav nav-right ml-auto">
                             <li className="nav-item user-profile">
-                                <a onClick={toggleMenu} href="#" className="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdow">
+                                <a onClick={toggleMenu} className="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdow">
                                     <img src={getImage('profile-pic-circle.png')} alt="avtar-img" />
                                     <span className="bg-success user-status"></span>
                                 </a>

src/component/product/settingsTab/GeneralTab.jsx

@@ -1,11 +1,15 @@
 import React, {memo, useState} from 'react'
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { pageSettings } from "../../../services/services";
 import SiteTemplateSelector from './SiteTemplateSelector';
 import NoYesBooleanDropdown from './NoYesBooleanDropdown';
+import { IoMdArrowDropdown } from 'react-icons/io';
+import queryKeys from '../../../services/queryKeys';
 
 const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backendValues, setFieldsChanged}) =>{
 
+    const queryClient = useQueryClient()
+
     const [reqStatus, setReqStatus] = useState({error: null, message: ''})
 
     const fieldData = {}
@@ -40,6 +44,9 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
             setReqStatus({error: true, message: 'Unable to complete, try again later'})
         },
         onSettled: () => {
+            queryClient.refetchQueries({  // refetches productProvision API call
+                queryKey: [...queryKeys.settingsData],
+            })
             setTimeout(()=>{
                 setReqStatus({error: null, message: ''})
             },3000)
@@ -83,11 +90,14 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
                                             <textarea name={fieldName} rows={5} style={{resize: 'none'}} type="text" className="form-control" id={key} value={fieldValue} onChange={handleChange} />
                                             : value.controls == 'SELECT_NO_YES' ?
                                             // <NoYesBooleanDropdown name={fieldName} value={fieldValue} onChange={handleChange}  />
-                                            <select onChange={handleChange} name={fieldName} value={fieldValue} className="form-control">
-                                                <option value=''>Select</option>
-                                                <option value='0'>No</option>
-                                                <option value='1'>Yes</option>
-                                            </select>
+                                            <div className='position-relative'>
+                                                <select onChange={handleChange} name={fieldName} value={fieldValue} className="form-control">
+                                                    <option value=''>Select</option>
+                                                    <option value='0'>No</option>
+                                                    <option value='1'>Yes</option>
+                                                </select>
+                                                <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} />                                               
+                                            </div>
                                             :
                                             null
                                         }

src/component/profile_complete/ProfileCompleteCom.jsx

@@ -0,0 +1,210 @@
+import React, { useEffect, useMemo, 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, useQuery } from "@tanstack/react-query";
+import getImage from "../../utils/getImage";
+import { IoMdArrowDropdown } from "react-icons/io";
+import { completeProfile, getCommonPractice } from '../../services/services';
+import siteLinks from "../../links/siteLinks";
+import { useNavigate } from "react-router-dom";
+
+
+// const validationSchema = Yup.object().shape({
+//     practice: Yup.string().required("Required"),
+//     specialization: Yup.string().required("Required"),
+//     introduction: Yup.string().min(1, "Minimum 10 characters").max(50, "Maximum 50 characters").required("Required"),
+// })
+
+//   const initialValues = {
+//     practice: '',
+//     specialization: '',
+//     introduction: '',
+//   };
+
+
+export default function ProfileCompleteCom(){
+
+    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) => {
+            if(res.data.resultCode != '0'){
+                throw({message: res?.data?.resultDescription})
+            }
+            setTimeout(()=>{
+                navigate(siteLinks.home)
+            },2000)
+            // console.log('res', res)
+        }
+    })
+
+    const commonPractices = useMutation({ // FUNCTION TO GET COMMON PRACTICES
+        mutationFn: (fields) => {
+            return getCommonPractice(fields)
+        },
+        onError: ()=> {
+            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}))
+    }
+
+    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 <>
+
+        <BreadcrumbComBS title='Update Profile' paths={['Dashboard', 'Profile']} />
+
+        {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">
+                            <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 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>
+        }
+    </>;
+
+}

src/component/subscribe/Subscribe.jsx

@@ -0,0 +1,90 @@
+import React from 'react'
+import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
+import getImage from "../../utils/getImage";
+import { getSubscriptions } from '../../services/services';
+import { useQuery } from '@tanstack/react-query';
+import queryKeys from '../../services/queryKeys';
+import siteLinks from "../../links/siteLinks";
+import { Link, useNavigate } from 'react-router-dom'
+
+export default function Subscribe() {
+    const navigate = useNavigate()
+    const pricingFields ={
+        starter: { name: 'Starter', price:  5.99, active: true },
+        basic:   { name: 'Basic',   price: 12.99, active: true },
+        premium: { name: 'Premium', price: 20.00, active: true },
+    }
+
+    const {data, isFetching, isError, error} = useQuery({
+        queryKey: queryKeys.subscriptions,
+        queryFn: () => {
+            let reqData = {
+                token: localStorage.getItem('token'), // USER TOKEN
+                uid: localStorage.getItem('uid') // USER UID
+            }
+            return getSubscriptions(reqData)
+        }
+    })
+
+    const currentSubscription = data?.data?.current_product
+    const otherSubscriptions = data?.data?.options
+    console.log('urlData', data?.data)
+
+    return (
+        <>
+            <BreadcrumbComBS title='Subscription' paths={['Dashboard', 'Subscription']} />
+
+            {isFetching ?
+                <>
+                    <div className="col-12">
+                        <p className='text-mute'>Loading...</p>
+                    </div>
+                </>
+                : isError ?
+                    <div className="col-12">
+                        <p className='text-danger'>{error.message}</p>
+                    </div>
+                    :
+                    <div className="row">
+                        <div className="col-12 col-lg-6 col-xl-3">
+                            <div className="card card-statistics text-center py-3">
+                                <div className="card-body pricing-content">
+                                    <div className="pricing-content-card">
+                                        <h5>Current Subscription(s)</h5>
+                                        <h2 className="text-primary pt-3">{currentSubscription?.display_name}</h2>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <>
+                            {Object.entries(otherSubscriptions)?.map(([key, value]) => (
+
+                                <div key={key} className="col-12 col-lg-6 col-xl-3">
+                                    <div className="card card-statistics text-center py-3">
+                                        <div className="card-body pricing-content">
+                                            <div className="pricing-content-card">
+                                                <h5>{value.display_name}</h5>
+                                                <h2 className="text-primary pt-3">${value.monthly}</h2>
+                                                <p className="text-primary pb-3">/ Monthly</p>
+                                                <ul className="py-2">
+                                                    {value?.items?.map(item =>(
+                                                        <li key={item}>{item}</li>
+                                                    ))}
+                                                </ul>
+                                                <div className="pt-2">
+                                                    <button  onClick={()=>{navigate(siteLinks.subscribe)}} className="btn btn-inverse-secondary btn-round btn-sm">Go {value.display_name}</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            ))}
+                        </>
+
+                    </div>
+            }
+        </>
+    )
+}

src/component/subscription/Subscription.jsx

@@ -4,9 +4,11 @@ import getImage from "../../utils/getImage";
 import { getSubscriptions } from '../../services/services';
 import { useQuery } from '@tanstack/react-query';
 import queryKeys from '../../services/queryKeys';
+import siteLinks from "../../links/siteLinks";
+import { Link, useNavigate } from 'react-router-dom'
 
 export default function Subscription() {
-
+    const navigate = useNavigate()
     const pricingFields ={
         starter: { name: 'Starter', price:  5.99, active: true },
         basic:   { name: 'Basic',   price: 12.99, active: true },
@@ -71,7 +73,7 @@ export default function Subscription() {
                                             ))}
                                         </ul>
                                     <div className="pt-2">
-                                        <button className="btn btn-inverse-secondary btn-round btn-sm">Go {value.display_name}</button>
+                                        <button  onClick={()=>{navigate(siteLinks.subscribe)}} className="btn btn-inverse-secondary btn-round btn-sm">Go {value.display_name}</button>
                                     </div>
                                 </div>
                             </div>
@@ -85,4 +87,4 @@ export default function Subscription() {
         }
         </>
     )
-}
+}

src/links/siteLinks.js

@@ -3,11 +3,13 @@ const siteLinks = {
     help: '/help',
     home: '/',
     dash: '/dash',
+    profile_complete: '/profile-complete',
     product: '/product/*',
     contacts: '/contacts',
     comments: '/comments',
     reports: '/reports',
     subscription: '/subscription',
+    subscribe: '/subscribe',
     onboard: '/subscription',
     user: '/user',
     calendar: '/calendar',

src/services/services.js

@@ -167,6 +167,14 @@ export const getSettingsData = (reqData) => {
 }
 
 // FUNCTION TO GET PRODUCT SUBSCRIPTIONS
+export const completeProfile = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/account/startprofile`, postData, false)
+}
+
+// FUNCTION TO COMPLETE PROFILE
 export const getSubscriptions = (reqData) => {
     let postData = {
         ...reqData,
@@ -174,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)
+}
+
 
 
 

src/views/ProductPage.jsx

@@ -1,6 +1,22 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import ProductFactory from '../component/product/ProductFactory'
+import { useSelector } from 'react-redux';
+import siteLinks from '../links/siteLinks';
+import { useNavigate } from 'react-router-dom';
+
+
 export default function ProductPage() {
+
+    const navigate = useNavigate()
+
+    const { userDetails: { profile_completed }} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
+
+    useEffect(()=>{
+        if(!profile_completed){
+            navigate(siteLinks.profile_complete, {replace: true, state:{profile_completed: false}})
+        }
+    },[])
+    
     return (
         <ProductFactory />
     )

src/views/ProfileCompletePage.jsx

@@ -0,0 +1,5 @@
+import ProfileCompleteCom from '../component/profile_complete/ProfileCompleteCom';
+
+export default function ProfileCompletePage(){
+    return <ProfileCompleteCom />
+}

src/views/Subscribe.jsx

@@ -0,0 +1,9 @@
+import React from 'react'
+//import Signup2 from '../component/auth/Signup2'
+import Subscribe from '../component/subscribe/Subscribe'
+
+export default function SubscribePage() {
+    return (
+        <Subscribe />
+    )
+}