bug fix

.env

@@ -1,6 +1,6 @@
 SKIP_PREFLIGHT_CHECK=true 
 REACT_APP_NODE_ENV="development"
-REACT_APP_SOCKET_URL="https://dev-socket.mermsemr.com"
+REACT_APP_SOCKET_URL="https://devsocket.mermsemr.com"
 REACT_APP_MAIN_API="https://devapi.mermsemr.com"
 REACT_APP_MEDIA_SERVER="https://dev-media.mermsemr.com"
 REACT_APP_MAIN_SOCKET="https://dev-socket.mermsemr.com"

.env.development

@@ -1,6 +1,6 @@
 SKIP_PREFLIGHT_CHECK=true 
 REACT_APP_NODE_ENV="development"
-REACT_APP_SOCKET_URL="https://dev-socket.mermsemr.com"
+REACT_APP_SOCKET_URL="https://devsocket.mermsemr.com"
 REACT_APP_MAIN_API="https://devapi.mermsemr.com"
 REACT_APP_MEDIA_SERVER="https://dev-media.mermsemr.com"
 REACT_APP_MAIN_SOCKET="https://dev-socket.mermsemr.com"

.env.production

@@ -1,7 +1,7 @@
 SKIP_PREFLIGHT_CHECK=true 
 REACT_APP_NODE_ENV="production"
 REACT_APP_SOCKET_URL="https://socket.mermsemr.com"
-REACT_APP_MAIN_API="https://api.mermsemr.com"
+REACT_APP_MAIN_API="https://devapi.mermsemr.com"
 REACT_APP_MEDIA_SERVER="https://media.mermsemr.com"
 
 # login footer links

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   merms-panel:
-    # image: registry.chiefsoft.net/wrenchboard-users-wrench:latest
+    image: registry.chiefsoft.net/merms-panel-reactjs:latest
     build:
       context: .
       dockerfile: docker/Dockerfile

package.json

@@ -33,7 +33,8 @@
   },
   "scripts": {
     "start": "react-scripts start -e .env.development",
-    "build": "GENERATE_SOURCEMAP=false react-scripts build -e .env.production",
+    "build": "react-scripts start -e .env.development",
+    "build_real": "GENERATE_SOURCEMAP=false react-scripts build -e .env.production",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

src/App.css

@@ -10,18 +10,21 @@
   background-repeat: no-repeat;
 }
 
+.register{
+  border-radius: 10px;
+}
+
 .login-links{
-  margin-top: 20px;
+  margin-top: 50px;
   display: flex;
   flex-direction: row;
   justify-content: center;
 }
 
 .login-links a {
-  font-size: 15px;
-  font-weight: 700;
+  font-size: 14px;
   padding: 0px 20px;
-  border-right: 2px solid;
+  border-right: 2px solid #6c757d;
   cursor: pointer;
 }
 
@@ -31,4 +34,17 @@
 
 .login-links a:last-child{
   border: 0px;
+}
+
+button{
+  font-size: 1rem!important;
+  font-weight: 700!important;
+}
+
+.font-600 {
+  font-weight: 600;
+}
+
+.accordion-button, .accordion-button:not(.collapsed) {
+  background-color: transparent!important;
 }

src/App.js

@@ -1,23 +1,28 @@
 import { QueryClientProvider, QueryClient } from '@tanstack/react-query'
+import { Provider } from 'react-redux';
+import store from './store/store'
 import AppRouters from './AppRouters';
 
 import './App.css';
 
 
-function App() {
-  const queryClient = new QueryClient({
-    defaultOptions: {
-      queries: {
-        refetchOnWindowFocus: false,
-        retry: 3,
-        // refetchOnMount: false,
-        staleTime: Infinity // can also be a number in millisecond
-      },
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      refetchOnWindowFocus: false,
+      retry: 3,
+      // refetchOnMount: false,
+      staleTime: 360000 // can also be a number in millisecond
     },
-  })
+  },
+})
+
+function App() {
   return (
     <QueryClientProvider client={queryClient}>
-      <AppRouters />
+      <Provider store={store}>
+        <AppRouters />
+      </Provider>
     </QueryClientProvider>
   );
 }

src/AppRouters.jsx

@@ -2,6 +2,7 @@ import { Routes, Route } from 'react-router-dom';
 
 import UserExist from './component/authorization/UserExist';
 import AuthLayout from './component/auth/AuthLayout';
+import BearerToken from './component/authorization/BearerToken';
 import siteLinks from './links/siteLinks';
 
 import LoginPage from './views/LoginPage';
@@ -17,32 +18,36 @@ import SettingsPage from './views/SettingsPage'
 import ProductPage from './views/ProductPage'
 import SocketIOContextProvider from './component/context/SocketIOContext';
 import CSignupPage from './views/CSignupPage';
+import HelpPage from './views/HelpPage';
 
 function AppRouters() {
   return (
     <div className="">
       <Routes>
-        {/* auth routes wrapper */}
-        <Route element={<AuthLayout />}>
-          <Route path={siteLinks.home} element={<LoginPage />} />
-          <Route path={siteLinks.login} element={<LoginPage />} />
-          <Route path={siteLinks.signup} element={<SignupPage />} />
-          <Route path={siteLinks.forgetpwd} element={<ForgetpwdPage />} />
-          <Route path={siteLinks.csignup} element={<CSignupPage />} />
-          <Route path={siteLinks.error} element={<LoginPage />} />
-        </Route>
+        <Route element={<BearerToken />}>
+          {/* auth routes wrapper */}
+          <Route element={<AuthLayout />}>
+            <Route path={siteLinks.home} element={<LoginPage />} />
+            <Route path={siteLinks.login} element={<LoginPage />} />
+            <Route path={siteLinks.signup} element={<SignupPage />} />
+            <Route path={siteLinks.forgetpwd} element={<ForgetpwdPage />} />
+            <Route path={siteLinks.csignup} element={<CSignupPage />} />
+            <Route path={siteLinks.error} element={<LoginPage />} />
+          </Route>
 
-        {/* protected routes */}
-        <Route element={<SocketIOContextProvider />}>
-          <Route element={<UserExist />}> 
-            <Route path={siteLinks.dash} element={<HomePage />} />
-            <Route path={siteLinks.product} element={<ProductPage />} />
-            <Route path={siteLinks.reports} element={<ReportsPage />} />
-            <Route path={siteLinks.comments} element={<CommentsPage />} />
-            <Route path={siteLinks.contacts} element={<ContactsPage />} />
-            <Route path={siteLinks.user} element={<UserPage />} />
-            <Route path={siteLinks.calendar} element={<CalendarPage />} />
-            <Route path={siteLinks.settings} element={<SettingsPage />} />
+          {/* protected routes */}
+          <Route element={<SocketIOContextProvider />}>
+            <Route element={<UserExist />}> 
+              <Route path={siteLinks.dash} element={<HomePage />} />
+              <Route path={siteLinks.product} element={<ProductPage />} />
+              <Route path={siteLinks.reports} element={<ReportsPage />} />
+              <Route path={siteLinks.comments} element={<CommentsPage />} />
+              <Route path={siteLinks.contacts} element={<ContactsPage />} />
+              <Route path={siteLinks.user} element={<UserPage />} />
+              <Route path={siteLinks.calendar} element={<CalendarPage />} />
+              <Route path={siteLinks.settings} element={<SettingsPage />} />
+              <Route path={siteLinks.help} element={<HelpPage />} />
+            </Route>
           </Route>
         </Route>
       </Routes>

src/component/auth/CSignup.jsx

@@ -1,11 +1,13 @@
 import React, { useEffect, useState } from 'react'
 import { Form, Formik } from "formik";
 import * as Yup from "yup";
+import { useDispatch } from 'react-redux'
 
 import { Link, useNavigate, useParams } from 'react-router-dom'
 import siteLinks from '../../links/siteLinks'
 import { useMutation } from '@tanstack/react-query';
 import { completeRegistration, verifyEmail } from '../../services/services';
+import { updateUserDetails } from '../../store/UserDetails'
 
 import { IoMdArrowDropdown } from "react-icons/io";
 
@@ -29,6 +31,8 @@ export default function CSignup() {
 
     const {jwt} = useParams()
 
+    const dispatch = useDispatch()
+
     const navigate = useNavigate()
 
     const [user, setUser] = useState(null)
@@ -51,15 +55,19 @@ export default function CSignup() {
         return completeRegistration(fields)
     },
     onSuccess: (res) => {
-        const {token, room} = res?.data?.data
-        if(token){
-            localStorage.setItem('token', token)
-            localStorage.setItem('room', room)
-            // const data = {token}
-            // dispatch(updateUserDetails({ ...data }));
-            navigate('/dash') // later add redux to dispatch state
+        if(res?.data?.resultCode != '0'){
+            throw({message: res?.data?.resultDescription})
         }
-    }
+        const {token, room, uid} = res?.data
+        if(!token || !room){
+            throw({message: 'something went wrong, try again!'})
+        }
+        localStorage.setItem('token', token)
+        localStorage.setItem('room', room)
+        localStorage.setItem('uid', uid)
+        dispatch(updateUserDetails({ ...res?.data }));
+        navigate('/dash') // later add redux to dispatch state
+    },
     // onError: (err) => {
     //     console.log('err', err)
     // }

src/component/auth/Login2.jsx

@@ -1,6 +1,6 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { useMutation } from '@tanstack/react-query'
-import { useDispatch } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 
 // import LoginImg from '../../assets/bg/login.svg'
 
@@ -14,14 +14,17 @@ import IOSDownload from '../../assets/img/download/apple.jpg'
 
 export default function Login() {
 
+  const { userDetails: { token, room }} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
+  let loggedIn = token && room ? true : false; // variable to determine if user is logged in
+
   const dispatch = useDispatch()
 
   const navigate = useNavigate()
 
   const [fields, setFields] = useState({
-    username: localStorage.getItem('username') || '',
+    username: '',
     password: '',
-    remember: localStorage.getItem('username') ? true : false
+    remember: false
   })
 
   const handleChange = ({target:{name, value}}) => {
@@ -37,20 +40,25 @@ export default function Login() {
             throw new Error('Please provide all fields marked *')
         }
         rememberMe(fields.remember) // FUNCTION TO SAVE USERNAME OF THE USER TO LOCAL STORAGE
+        delete fields.remember // REMOVING REMEMBER FROM THE PAYLOAD
         return loginUser(fields)
     },
     onError: (error) => {
         console.log(error)
     },
       onSuccess: (res) => {
-        const {token, room} = res?.data?.data
-        if(token){
-            localStorage.setItem('token', token)
-            localStorage.setItem('room', room)
-            // const data = {token}
-            // dispatch(updateUserDetails({ ...data }));
-            navigate('/dash') // later add redux to dispatch state
+        if(res?.data?.error_message){
+            throw({message: res?.data?.error_message})
         }
+        const {token, room, uid} = res?.data
+        if(!token || !room){
+            throw({message: 'something went wrong, try again!'})
+        }
+        localStorage.setItem('token', token)
+        localStorage.setItem('room', room)
+        localStorage.setItem('uid', uid)
+        dispatch(updateUserDetails({ ...res?.data }));
+        navigate('/dash') // later add redux to dispatch state
     }
   })
 
@@ -62,6 +70,12 @@ export default function Login() {
     }
   }
 
+  useEffect(()=>{ // NAVIGATES USER TO HOME PAGE IF USER IS ACTIVE
+    if(loggedIn){
+        navigate(siteLinks.dash)
+    }
+  },[])
+
   return (
     <div className="app">
         <div className="app-wrap">
@@ -71,7 +85,7 @@ export default function Login() {
                         <div className="row no-gutters justify-content-center">
                             <div className="col-11 col-sm-6 col-lg-5 col-xxl-3 align-self-center order-2 order-sm-1">
                                 <div className="mt-5 d-flex">
-                                    <div className="bg-white register p-5">
+                                    <div className="bg-white register px-5 pt-5 pb-3">
                                         <h1 className="mb-2">MERMS Panel</h1>
                                         <p>Welcome back, please login to your account.</p>
                                         <form className="mt-3 mt-sm-5">
@@ -79,19 +93,19 @@ export default function Login() {
                                                 <div className="col-12">
                                                     <div className="form-group">
                                                         <label className="control-label text-black fw-bold">User Name*</label>
-                                                        <input name='username' value={fields.username} onChange={handleChange} type="text" className="form-control" placeholder="Username" />
+                                                        <input maxLength={55} name='username' value={fields.username} onChange={handleChange} type="text" className="form-control" placeholder="Username" />
                                                     </div>
                                                 </div>
                                                 <div className="col-12">
                                                     <div className="form-group">
                                                         <label className="control-label text-black fw-bold">Password*</label>
-                                                        <input name='password' value={fields.password} onChange={handleChange} type="password" className="form-control" placeholder="Password" />
+                                                        <input maxLength={55} name='password' value={fields.password} onChange={handleChange} type="password" className="form-control" placeholder="Password" />
                                                     </div>
                                                 </div>
                                                 <div className="col-12">
                                                     <div className="d-block d-sm-flex  align-items-center">
                                                         <div className="form-check">
-                                                            <input className="form-check-input" type="checkbox" id="gridCheck" name='remember' checked={fields.remember} onChange={handleChange} disabled={!fields.username ? true : false} />
+                                                            <input className="form-check-input" type="checkbox" id="gridCheck" name='remember' checked={fields.remember || false} onChange={handleChange} disabled={!fields.username ? true : false} />
                                                             <label className="form-check-label text-black" htmlFor="gridCheck">
                                                                 Remember Me
                                                             </label>

src/component/auth/Signup2.jsx

@@ -49,6 +49,7 @@ export default function Signup2() {
   const signUp = (values) => {
     // helpers.resetForm()
     // console.log('values', values, helpers)
+    delete values.isChecked
     mutation.mutate(values)
   }
 

src/component/authorization/BearerToken.jsx

@@ -0,0 +1,47 @@
+import {useEffect} from 'react'
+import { useMutation } from '@tanstack/react-query'
+import { Outlet } from 'react-router-dom'
+import MainLoaderBS from '../loaders/MainLoaderBS'
+
+import { userToken } from '../../services/services'
+
+export default function BearerToken() {
+    const bearerToken = useMutation({
+    mutationFn: (fields) => {
+        return userToken(fields)
+    },
+    onError: (error) => {
+      console.log(error)
+      // window.location.reload(true)
+    },
+      onSuccess: (res) => {
+        if(res?.data?.resultCode != '0'){
+            throw({message: 'Something went wrong'})
+        }
+        const {access_token, refresh_token} = res?.data?.data
+        if(access_token){
+            localStorage.setItem('access_token', access_token)
+        }else{
+            throw({message: 'Something went wrong'})
+        }
+    }
+  })
+
+  useEffect(()=>{
+    let reqData = {
+      "username": "user",
+      "password": "password"
+    }
+    bearerToken.mutate(reqData)
+  },[])
+
+  return (
+    <>
+        {bearerToken.isPending  ? 
+            <MainLoaderBS />
+            :
+            <Outlet />
+        }
+    </>
+  )
+}

src/component/authorization/UserExist.jsx

@@ -1,13 +1,15 @@
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from "react-redux";
 import { Outlet, useNavigate } from 'react-router-dom'
+import { useMutation } from '@tanstack/react-query'
+
 import { updateUserDetails } from "../../store/UserDetails";
+import { userInfo } from '../../services/services'
 import MainLoaderBS from '../loaders/MainLoaderBS'
 import Layout from '../layout/Layout'
 import siteLinks from '../../links/siteLinks'
 
 import debounceFunction from '../../utils/debounceFunction'
-import { accountDashboard } from '../../services/services';
 import { SocketContextValues } from '../context/SocketIOContext';
 
 
@@ -23,9 +25,9 @@ export default function UserExist() {
     
     const [lastActivityTime, setLastActivityTime] = useState(Date.now()); // HOLDS THE INITIAL TIME USER LOGS IN
 
-    const { userDetails: { lastname }} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
+    const { userDetails: { token, room }} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
   
-    let loggedIn = lastname ? true : false; // variable to determine if user is logged in
+    let loggedIn = token && room ? true : false; // variable to determine if user is logged in
     // console.log('loggedIn', loggedIn)
   
     // Function to log the user out
@@ -40,6 +42,31 @@ export default function UserExist() {
       debounceFunction(setLastActivityTime(Date.now()), 1000)
     };
 
+
+
+    const getUser = useMutation({
+      mutationFn: (fields) => {
+          return userInfo(fields)
+      },
+      onError: (error) => {
+        navigate(siteLinks.login)
+        setLoading(false)
+      },
+        onSuccess: (res) => {
+          const {token, room, uid} = res?.data
+          if(!token || !room){
+            navigate(siteLinks.login)
+            setLoading(false)
+            return
+          }
+          localStorage.setItem('token', token)
+          localStorage.setItem('room', room)
+          localStorage.setItem('uid', uid)
+          dispatch(updateUserDetails({ ...res?.data }));
+          setLoading(false)
+      }
+    })
+
     useEffect(()=>{
       const timer = setTimeout(()=>{
         if(Date.now() - Number(lastActivityTime) >= Number(process.env.REACT_APP_TIMEOUT)){
@@ -61,37 +88,21 @@ export default function UserExist() {
           window.removeEventListener(event, resetTimer);
         })
       }
-    },[lastActivityTime])
-
+    },[lastActivityTime])  
+  
     useEffect(()=>{
-      accountDashboard().then(res => {
-        const {dash_data} = res?.data
+      let token = localStorage.getItem('token') // USER TOKEN
+      let uid = localStorage.getItem('uid') // USER UID
+      if(token && loggedIn){
         setLoading(false)
-        dispatch(updateUserDetails({ ...dash_data }));
-      }).catch(err => {
+      }else if(token && uid && !loggedIn){
+        const reqData = {token, uid}
+        getUser.mutate(reqData)
+      }else{
         navigate(siteLinks.login)
         setLoading(false)
-      })
+      }
     },[])
-  
-  
-    // useEffect(()=>{
-    //   let token = localStorage.getItem('token')
-    //   const timer = setTimeout(()=>{
-    //     if(token && loggedIn){
-    //       setLoading(false)
-    //     }else if(token && !loggedIn){
-    //       const data = {token}
-    //       dispatch(updateUserDetails({ ...data }));
-    //       setLoading(false)
-    //       // dispatch(updateUserDetails({ ...res.data }));
-    //     }else{
-    //       navigate('auth/login')
-    //     }
-    //   },1000)
-  
-    //   return () => clearTimeout(timer)
-    // },[])
 
     useEffect(()=>{
       if(localStorage.getItem('room')){

src/component/calendar/Calendar.jsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from "react";
-import { useQuery } from '@tanstack/react-query'
+import { useMutation, useQuery } from '@tanstack/react-query'
 
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 import EventCalendar from "./EventCalendar";
@@ -16,12 +16,42 @@ export default function Calendar(){
     //     setDraggedEvent(event)
     // }
 
+    // const {data, isFetching, isError, error} = useQuery({
+    //     queryKey: queryKeys.calendar_events,
+    //     queryFn: () => getCalendarEvents()
+    // })
+
+    // const calendarEvents = useMutation({
+    //     mutationFn: (reqData) => {
+    //         return getCalendarEvents(reqData)
+    //     },
+    //     onError: (error) => {
+    //         console.log(error)
+    //     },
+    //     onSuccess: (res) => {
+    //         if(res?.data?.resultCode != '0'){
+    //             throw({message: 'Something went wrong'})
+    //         }
+    //     }
+    // })
+
+    // useEffect(()=>{
+    // let reqData = {
+    //     token: localStorage.getItem('token'), // USER TOKEN
+    //     uid: localStorage.getItem('uid') // USER UID
+    // }
+    // calendarEvents.mutate(reqData)
+    // },[])
+    let reqData = {
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
     const {data, isFetching, isError, error} = useQuery({
         queryKey: queryKeys.calendar_events,
-        queryFn: () => getCalendarEvents()
+        queryFn: () => getCalendarEvents(reqData)
     })
 
-    const receievedEvents = data?.data?.bar_data
+    const receievedEvents = data?.data
     const category = receievedEvents?.category  //EVENT CATEGORIES FROM API
     const eventList = receievedEvents?.list //EVENT LIST FROM API
 
@@ -70,7 +100,7 @@ export default function Calendar(){
                                 </>
                                 : isError ?
                                 <div className="col-12">
-                                    <p className='text-danger'>{error.message}</p>
+                                    <p className='text-danger'>{error?.message}</p>
                                 </div>
                                 :
                                 <>
@@ -83,7 +113,7 @@ export default function Calendar(){
                                             Drag and drop your event or click in the calendar.
                                         </p> */}
 
-                                        {category.map((item, index) => {
+                                        {category?.map((item, index) => {
                                             let color = item?.cid == '1' ? 'fc-event-success' : item?.cid == '2' ? 'fc-event-danger' : item?.cid == '3' ? 'fc-event-warning' : 'fc-event-primary'
                                             let circleColor = item?.cid == '1' ? 'text-success' : item?.cid == '2' ? 'text-danger' : item?.cid == '3' ? 'text-warning' : 'text-primary'
                                             return (

src/component/calendar/EventCalendar.jsx

@@ -81,7 +81,7 @@ export default function EventCalendar({removeAfterDrop, eventList, activeCategor
   useEffect(()=>{
     // let newEventList = eventList?.map(item => ({...item, start: new Date(item?.start)}))
     let newEventList = eventList?.filter(item => (Number(item.category) == Number(activeCategory)))?.map(item => ({...item, start: new Date(item?.start)}))
-    console.log('newEventList', newEventList)
+    // console.log('newEventList', newEventList)
     setCurrentEvents(newEventList)
   },[activeCategory])
 

src/component/contacts/Contacts.js

@@ -2,27 +2,40 @@
 import React, { useEffect, useState } from "react";
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 import getImage from "../../utils/getImage";
-import { useQuery } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import { contactData } from "../../services/services";
 import queryKeys from "../../services/queryKeys";
 import getCustomTime from "../../utils/getCustomTime";
 
 export default function Contacts(){
 
-    const {data:contacts, isFetching, isError, error} = useQuery({
-        queryKey: queryKeys.contacts,
-        queryFn: () => contactData()
-    })
-
-    const contactsData = contacts?.data?.calendar_data?.contacts // LIST OF CONTACTS
-    const contactsCategory = contacts?.data?.calendar_data?.category // LIST OF CATEGORY
+    // const {data:contacts, isFetching, isError, error} = useQuery({
+    //     queryKey: queryKeys.contacts,
+    //     queryFn: () => contactData()
+    // })
 
     const [activeCategoryUID, setActiveCategoryUID] = useState('0') // HOLDS VALUE OF THE ACTIVE CATEGORY
 
-    const [activeContactUID, setActiveContactUID] = useState(null)
-    const [activeDetail, setActiveDetail] = useState(null)
+    const [activeContactUID, setActiveContactUID] = useState('')
+    const [activeDetail, setActiveDetail] = useState([])
 
-    const [filteredContactData, setFiltererdContactData] = useState(null)
+    const [filteredContactData, setFiltererdContactData] = useState([])
+
+    
+    const getContactData = useMutation({
+        mutationFn: (reqData) => {
+            return contactData(reqData)
+        },
+        onError: (error) => {
+            console.log(error)
+        },
+        onSuccess: (res) => {
+            if(res?.data?.resultCode != '0'){
+                throw({message: 'Something went wrong'})
+            }
+            setFiltererdContactData(res?.data?.contacts)
+        }
+    })
 
     const changeActiveUID = (uid) => {
         setActiveContactUID(uid)
@@ -42,10 +55,21 @@ export default function Contacts(){
         changeActiveUID(filteredConData[0]?.uid)
     }
 
+    useEffect(()=>{
+    let reqData = {
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    getContactData.mutate(reqData)
+    },[])
+
+    const contactsData = getContactData?.data?.data?.contacts // LIST OF CONTACTS
+    const contactsCategory = getContactData?.data?.data?.category // LIST OF CATEGORY
+
     return(
         <>
             <BreadcrumbComBS title='Contacts' paths={['Dashboard', 'Contacts']} />
-            {isFetching ? 
+            {getContactData?.isPending ? 
                 <>
                     <div className="row">
                         <div className="col-12">
@@ -53,10 +77,10 @@ export default function Contacts(){
                         </div>
                     </div>
                 </>
-                : isError ?
+                : getContactData?.error ?
                 <div className="row">
                     <div className="col-12">
-                        <p className='text-danger'>{error.message}</p>
+                        <p className='text-danger'>{getContactData?.error?.message}</p>
                     </div>
                 </div>
                 :
@@ -121,14 +145,14 @@ export default function Contacts(){
                                                                     </div>
                                                                 </li>
                                                             {contactsCategory && contactsCategory.map(item => (
-                                                                <li key={item?.product_id} className="py-2" onClick={()=>changeActiveCategoryUID(item?.product_id)} style={{cursor: 'pointer'}}>
+                                                                <li key={item?.cid} className="py-2" onClick={()=>changeActiveCategoryUID(`A00000${item?.cid}`)} style={{cursor: 'pointer'}}>
                                                                     <div>
                                                                         <span className="nav align-items-center">
                                                                             <span>
-                                                                                <i className={`fa fa-circle-o pr-4 ${activeCategoryUID == item?.product_id ? 'text-primary' : 'text-warning'}`}></i>
+                                                                                <i className={`fa fa-circle-o pr-4 ${activeCategoryUID == `A00000${item?.cid}` ? 'text-primary' : 'text-warning'}`}></i>
                                                                             </span>
                                                                         <span>
-                                                                            <span>{item?.title}</span>
+                                                                            <span>{item?.description}</span>
                                                                         </span>
                                                                         </span>
                                                                     </div>
@@ -177,10 +201,10 @@ export default function Contacts(){
                                                 </div>
                                             </div>
                                             <div className="mail-msg scrollbar scroll_dark">
-                                                {contactsData && (filteredContactData || contactsData).map((contact, index)=> {
-                                                    const isActive = (contact.uid == activeContactUID) || (!activeContactUID && index == 0)
+                                                {contactsData && filteredContactData?.map((contact, index)=> {
+                                                    const isActive = (contact?.uid == activeContactUID) || (!activeContactUID && index == 0)
                                                     return (
-                                                        <div key={contact.uid} onClick={()=>changeActiveUID(contact.uid)} className={`mail-msg-item ${isActive && 'bg-light'}`}>
+                                                        <div key={contact?.uid} onClick={()=>changeActiveUID(contact?.uid)} className={`mail-msg-item ${isActive && 'bg-light'}`}>
                                                             <a href="#">
                                                                 <div className="media align-items-center">
                                                                     <div className="mr-3">
@@ -190,15 +214,15 @@ export default function Contacts(){
                                                                     </div>
                                                                     <div className="w-100">
                                                                         <div className="mail-msg-item-titel justify-content-between">
-                                                                            <p>{contact.sender}</p>
+                                                                            <p>{contact?.sender}</p>
                                                                             {/* <p className="d-none d-xl-block">06:59 <span> PM </span></p> */}
-                                                                            <p className="d-none d-xl-block"><span>{new Date(contact.added).toDateString()}</span></p>
+                                                                            <p className="d-none d-xl-block"><span>{new Date(contact?.added).toDateString()}</span></p>
                                                                         </div>
-                                                                        <h5 className="mb-0 my-2">{contact.title}</h5>
-                                                                        <p>{contact.message.length < 100 ? contact.message : contact.message.substring(0,101) + ' ...' }</p>
+                                                                        <h5 className="mb-0 my-2">{contact?.title}</h5>
+                                                                        <p>{contact?.message?.length < 100 ? contact?.message : contact?.message.substring(0,101) + ' ...' }</p>
                                                                         <p className="d-xl-none">
                                                                             <span>
-                                                                            {new Date(contact.added).toDateString()}
+                                                                            {new Date(contact?.added).toDateString()}
                                                                             {/* {getCustomTime(contact.added)} */}
                                                                             </span>
                                                                         </p>
@@ -219,13 +243,13 @@ export default function Contacts(){
                                                     <img  src={getImage("avtar/03.jpg")}  className="img-fluid" alt="user" />
                                                 </div>
                                                 <div>
-                                                    <h4 className="mb-0">{activeContactUID ? activeDetail[0].sender : contactsData[0].sender}</h4>
-                                                    <p>{activeContactUID ? new Date(activeDetail[0].added).toDateString() : new Date(contactsData[0].added).toDateString()}</p>
+                                                    <h4 className="mb-0">{activeContactUID ? activeDetail[0]?.sender : filteredContactData[0]?.sender}</h4>
+                                                    <p>{activeContactUID ? new Date(activeDetail[0]?.added).toDateString() : new Date(filteredContactData[0]?.added).toDateString()}</p>
                                                 </div>
                                             </div>
                                             <div className="mt-4 d-flex justify-content-between">
                                                 <div>
-                                                    <h3>{activeContactUID ? activeDetail[0].title : contactsData[0].title}</h3>
+                                                    <h3>{activeContactUID ? activeDetail[0]?.title : filteredContactData[0]?.title}</h3>
                                                 </div>
                                                 <div className="d-flex">
                                                     {/*<a href="javascript:void(0)"><i className="fa fa-reply font-22 pr-3"></i></a>*/}
@@ -233,7 +257,7 @@ export default function Contacts(){
                                                 </div>
                                             </div>
                                             <div>
-                                                <p>{activeContactUID ? activeDetail[0].message : contactsData[0].message}</p>
+                                                <p>{activeContactUID ? activeDetail[0]?.message : filteredContactData[0]?.message}</p>
                                                 {/* <p className="my-4">hey adminjon...</p>
                                                 <p className="mb-2">I truly believe Augustine’s words are true and if you look at history you know it is true. There are many people in the world with amazing talents who realize only a small percentage of their potential. We all know people who live this truth.</p>
                                                 <p>We also know those epic stories, those modern-day legends surrounding the early failures of such supremely successful folks as Michael Jordan and Bill Gates. We can look a bit further back in time to Albert Einstein or even further back to Abraham Lincoln. What made each of these people so successful? Motivation.</p>

src/component/help/HelpCom.jsx

@@ -0,0 +1,48 @@
+import React from "react";
+import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
+
+
+export default function HelpCom(){
+
+    return(
+        <>
+            <BreadcrumbComBS title='Frequesntly Asked Questions' paths={['Dashboard', 'Help']} />
+            {/*<div className="row">*/}
+            {/*    <div className="vh-100 col-12 flex align-items-center">Coming Soon</div>*/}
+            {/*</div>*/}
+
+
+            <div className="row account-contant">
+                <div className="col-12">
+                    <div className="card card-statistics">
+                        <div className="card-body p-lg-15" style={{backgroundColor:"#f9f9fb"}}>
+                            
+                                <p className="mb-4">First, a disclaimer – the entire process of writing a blog post often takes more than a couple of hours, even if you can type eighty words as per minute and your writing skills are sharp.</p>
+                            <div className="row">
+                                <div className="accordion" id="accordionExample">
+                                    {['a', 'b', 'c', 'd'].map((item, index)=>{
+                                        return (
+                                            <div className="accordion-item">
+                                                <h2 className="accordion-header">
+                                                <button className="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target={`#${item}`} aria-expanded="true" aria-controls="collapseOne">
+                                                    {`Accordion Item ${item} 1`}
+                                                </button>
+                                                </h2>
+                                                <div id={item} className={`accordion-collapse collapse ${index == 0 && 'show'}`} data-bs-parent="#accordionExample">
+                                                <div className="accordion-body">
+                                                    <strong>This is the first item’s accordion body.</strong> It is shown by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It’s also worth noting that just about any HTML can go within the accordion-body, though the transition does limit overflow.
+                                                </div>
+                                                </div>
+                                            </div>
+                                        )
+                                    })}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </>
+    )
+}

src/component/home/Products.jsx

@@ -1,29 +1,22 @@
 import { useQuery } from '@tanstack/react-query'
-import React from 'react'
-import { productData } from '../../services/services'
-import queryKeys from '../../services/queryKeys'
+import { productsData } from '../../services/services'
 import productPath from "../../utils/productpath";
 import { Link } from 'react-router-dom';
+
+import queryKeys from '../../services/queryKeys'
+
+
 export default function Products() {
 
+    let reqData = {
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
     const {data, isFetching, isError, error} = useQuery({
         queryKey: queryKeys.product,
-        queryFn: () => productData()
+        queryFn: () => productsData(reqData)
     })
-/*
-   {
-      "banner": "p1.jpg",
-      "description": "Your personal professional web presence",
-      "id": 1,
-      "name": "Personal Website",
-      "product_id": "A000001",
-      "product_uid": "e92282b4-3ee1-4026-92ac-12cfd214b43a",
-      "status": 5,
-      "status_text": "Activate Now"
-    },
- */
-    //const products = data?.data?.products_list?.products
-    const products = data?.data?.products_list
+    const products = data?.data?.products_data // PRODUCTS DATA
 
   return (
     <>
@@ -43,7 +36,7 @@ export default function Products() {
                 : isError ?
                 <div className="row">
                     <div className="col-12">
-                        <p className='text-danger'>{error.message}</p>
+                        <p className='text-danger'>{error?.message}</p>
                     </div>
                 </div>
                 :

src/component/home/ProductsURL.jsx

@@ -5,12 +5,18 @@ import queryKeys from '../../services/queryKeys'
 
 export default function ProductsURL() {
 
-    const {data:data, isFetching, isError, error} = useQuery({
+    let reqData = {
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+
+    const {data, isFetching, isError, error} = useQuery({
         queryKey: queryKeys.product_url,
-        queryFn: () => productsURL()
+        queryFn: () => productsURL(reqData)
     })
 
-    const urlData = data?.data?.url_data?.url
+    const urlData = data?.data?.products_data
+    // console.log('data', urlData)
 
   return (
     <>
@@ -57,8 +63,8 @@ export default function ProductsURL() {
                                     let productUrl = '/product/'+ item?.product_id
                                     return (
                                         <tr key={index}>
-                                            <td>{Number(item?.no) + Number(index)}</td>
-                                            <td>{item?.description} - <a href={productUrl} target='_blank'>{item?.url}</a></td>
+                                            <td>{Number(item?.id)}</td>
+                                            <td>{item?.description} - <a href={productUrl} target='_blank'>{item?.external_url}</a></td>
 
                                             <td><span className={`badge ${statusColor}`}>{item?.status}</span></td>
                                             <td><a className="mr-3" href=""><i className="fe fe-edit"></i></a></td>

src/component/home/TopBar.jsx

@@ -1,16 +1,40 @@
 import { useQuery } from '@tanstack/react-query'
-import React from 'react'
 import { topBar } from '../../services/services'
 import queryKeys from '../../services/queryKeys'
 
 export default function TopBar() {
 
-    const {data, isFetching, isError, error} = useQuery({
-        queryKey: queryKeys.topBar,
-        queryFn: () => topBar()
-    })
+//   const topBarData = useMutation({
+//     mutationFn: (reqData) => {
+//         return topBar(reqData)
+//     },
+//     onError: (error) => {
+//         console.log(error)
+//     },
+//       onSuccess: (res) => {
+//         if(res?.data?.resultCode != '0'){
+//             throw({message: 'Something went wrong'})
+//         }
+//     }
+//   })
 
-    const topData = data?.data?.bar_data?.top_bar
+//     useEffect(()=>{
+//       let reqData = {
+//         token: localStorage.getItem('token'), // USER TOKEN
+//         uid: localStorage.getItem('uid') // USER UID
+//       }
+//       topBarData.mutate(reqData)
+//     },[])
+    
+    let reqData = {
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    const {data:topBarData, isFetching, isError, error} = useQuery({
+        queryKey: queryKeys.topBar,
+        queryFn: () => topBar(reqData)
+    })
+    const data = topBarData?.data?.top_bar // top bar data
 
   return (
     <>
@@ -22,7 +46,7 @@ export default function TopBar() {
                 </div>
             </div>
         </>
-        : isError ?
+        : isError?
         <div className="col-12">
             <div className="card p-4">
                 <p className='text-danger'>{error.message}</p>
@@ -30,7 +54,7 @@ export default function TopBar() {
         </div>
         :
         <>
-        {topData && topData?.map((item, index)=>{
+        {data && data?.map((item, index)=>{
             let textColor = item?.description == 'Contacts' ? 'text-danger' : item?.description == 'Site Traffic' ? 'text-primary' : item?.description == 'Appointments' ? 'text-orange' : 'text-success'
             return (
             <div key={item.id + index} className="col-sm-6 col-xxl-3">

src/component/home/_TopBar.jsx

@@ -0,0 +1,67 @@
+import React from 'react'
+import { useQuery } from '@tanstack/react-query'
+import { topBar } from '../../services/services'
+import queryKeys from '../../services/queryKeys'
+
+export default function TopBar() {
+
+    const {data, isFetching, isError, error} = useQuery({
+        queryKey: queryKeys.topBar,
+        queryFn: () => topBar()
+    })
+
+    const topData = data?.data?.bar_data?.top_bar
+    console.log('topData', topData)
+
+  return (
+    <>
+        {isFetching ? 
+        <>
+            <div className="col-12">
+                <div className="card p-4">
+                    <p className='text-mute'>Loading...</p>
+                </div>
+            </div>
+        </>
+        : isError ?
+        <div className="col-12">
+            <div className="card p-4">
+                <p className='text-danger'>{error.message}</p>
+            </div>
+        </div>
+        :
+        <>
+        {topData && topData?.map((item, index)=>{
+            let textColor = item?.description == 'Contacts' ? 'text-danger' : item?.description == 'Site Traffic' ? 'text-primary' : item?.description == 'Appointments' ? 'text-orange' : 'text-success'
+            return (
+            <div key={item.id + index} className="col-sm-6 col-xxl-3">
+                <div className="card card-statistics ecommerce-contant overflow-h">
+                    <div className="card-body p-0">
+                        <div className="d-flex m-b-0 ecommerce-contant-text h-100">
+                            <div className="w-100">
+                                <div className="row p-3">
+                                    <div className="col">
+                                        <h3 className="mb-0">{item?.value || 0}</h3>
+                                        <small className="d-block">{item?.data_span}</small>
+                                    </div>
+                                    <div className="col text-right">
+                                        <h5 className="text-muted mb-0">{item?.description}</h5>
+                                        <strong className={`${textColor} m-t-5`}><i
+                                            className="zmdi zmdi-long-arrow-up font-weight-bold"></i> N/A</strong>
+                                    </div>
+                                </div>
+                                <div className="apexchart-wrapper">
+                                    <div id="ecommercedemo3" className="chart-fit"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            )
+        })}
+        </>
+        }
+    </>
+  )
+}

src/component/layout/layoutcom/UserFooter.jsx

@@ -2,11 +2,13 @@ import React from "react";
 
 export default function UserFooter(){
 
+    const year = new Date().getFullYear()
+
     return <>
         <footer className="footer">
             <div className="row">
                 <div className="col-12 col-sm-6 text-center text-sm-left">
-                    <p>&copy; Copyright 2024. All rights reserved.</p>
+                    <p>&copy; Copyright {year}. All rights reserved.</p>
                 </div>
                 <div className="col  col-sm-6 ml-sm-auto text-center text-sm-right">
                     <p>A division of <i className="fa fa-key text-danger mx-1"></i> autoMedSys A.I.</p>

src/component/layout/layoutcom/UserHeader.jsx

@@ -38,8 +38,8 @@ export default function UserHeader(){
                 <div className="navbar-header d-flex align-items-center">
                     <a href="#" onClick={toggleSidebar} className="mobile-toggle"><i className="ti ti-align-right"></i></a>
                     <a className="navbar-brand" href="/dash">
-                        <img src={getImage('logo-light.png')} className="img-fluid logo-desktop" alt="logo"/>
-                        <img src={getImage('logo-icon.png')} className="img-fluid logo-mobile" alt="logo"/>
+                        <img src={getImage('logo-pink.png')} className="img-fluid logo-desktop" alt="logo"/>
+                        <img src={getImage('logo-pink.png')} className="img-fluid logo-mobile" alt="logo"/>
                     </a>
                 </div>
                 <button onClick={removeSidebar} className="navbar-toggler" type="button" data-bs-toggle="collapse"
@@ -67,15 +67,15 @@ export default function UserHeader(){
                         <ul className="navbar-nav nav-right ml-auto">
                             <li className="nav-item user-profile">
                                 <a href="#" className="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdown">
-                                    <img src={getImage('avtar/02.jpg')} alt="avtar-img" />
+                                    <img src={getImage('profile-pic-circle.png')} alt="avtar-img" />
                                     <span className="bg-success user-status"></span>
                                 </a>
                                 <div className="dropdown-menu animated fadeIn">
                                     <div className="bg-gradient px-4 py-3">
                                         <div className="d-flex align-items-center justify-content-between">
                                             <div className="mr-1">
-                                                <h5 className="text-white mb-0">{userDetails?.firstname} {userDetails?.lastname}</h5>
-                                                <small className="text-white">{userDetails.email}</small>
+                                                <h4 className="text-white mb-0 font-600">{userDetails?.firstname} {userDetails?.lastname}</h4>
+                                                <p className="text-white font-600">{userDetails.email}</p>
                                             </div>
                                             <a href="#" onClick={logout} className="text-white font-20 tooltip-wrapper" data-toggle="tooltip"
                                                data-placement="top" title="" data-original-title="Logout"> <i
@@ -92,8 +92,10 @@ export default function UserHeader(){
                                         <Link className="dropdown-item d-flex nav-link" to={siteLinks.settings}>
                                             <i className=" ti ti-settings pr-2 text-info"></i> Settings
                                         </Link>
-                                        <a className="dropdown-item d-flex nav-link" href="#">
-                                            <i className="fa fa-compass pr-2 text-warning"></i> Need help?</a>
+                                        <Link className="dropdown-item d-flex nav-link" to={siteLinks.help}>
+                                            <i className="fa fa-compass pr-2 text-warning"></i> 
+                                            Need help?
+                                        </Link>
 
                                         {/*<div className="row mt-2">*/}
                                         {/*    <div className="col">*/}

src/component/product/ProductFactory.jsx

@@ -1,11 +1,10 @@
-import React, {useState} from "react";
-import { useQuery } from '@tanstack/react-query'
+import {useEffect} from "react";
+import { useMutation, useQuery } from '@tanstack/react-query'
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 // import getImage from "../../utils/getImage";
 import ProductStart from "./ProductStart";
 import { useLocation } from 'react-router-dom';
-import {MyProductData, productData} from "../../services/services";
-import queryKeys from "../../services/queryKeys";
+import {MyProductData} from "../../services/services";
 import ProductActive from "./ProductActive";
 import ProductProvision from "./ProductProvision";
 import {productConst} from "../../constants/products";
@@ -13,34 +12,42 @@ import {productConst} from "../../constants/products";
 export default function ProductFactory(){
     const location = useLocation();
     const pathname = location.pathname;
-    const [productStatus, setProductStatus] = useState(0);
-
-    //productConst.PRODUCT_ACTIVE
-
 
     // Split the pathname by '/' and get the last element
-    const lastPart = pathname.split('/').pop();
-    // console.log(lastPart)
+    const productID = pathname.split('/').pop();
 
-    const {data, isFetching, isError, error} = useQuery({
-        queryKey: queryKeys.product,
-        queryFn: () => MyProductData(lastPart)
+    const getProductData = useMutation({
+        mutationFn: (reqData) => {
+            return MyProductData(reqData)
+        },
+        onError: (error) => {
+            console.log(error)
+        },
+        onSuccess: (res) => {
+            if(res?.data?.resultCode != '0'){
+                throw({message: 'Something went wrong'})
+            }
+        }
     })
 
-
-
-    const myproduct_data = data?.data?.myproduct_data
-    //setProductStatus(myproduct_data?.status)
-
+    useEffect(()=>{
+    let reqData = {
+        product_id : productID,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    getProductData.mutate(reqData)
+    },[])
+        
+    const myproduct_data = getProductData?.data?.data?.myproduct?.myproudct // PRODUCT DETAILS
     const product_name =  myproduct_data?.product_name;
-
     const product_status  = myproduct_data?.status;
 
     return(
         <>
             <BreadcrumbComBS title={product_name} paths={['Dashboard', 'Product']} />
             <div className="row">
-                {isFetching ?
+                {getProductData?.isPending ?
                     <>
                         <div className="row">
                             <div className="col-12">
@@ -48,10 +55,10 @@ export default function ProductFactory(){
                             </div>
                         </div>
                     </>
-                    : isError ?
+                    : getProductData?.error ?
                         <div className="row">
                             <div className="col-12">
-                                <p className='text-danger'>{error.message}</p>
+                                <p className='text-danger'>{getProductData?.error?.message}</p>
                             </div>
                         </div>
                         :

src/component/product/ProductProvision.jsx

@@ -25,7 +25,7 @@ export default function ProductProvision(props){
         queryFn: () => productProvision(reqData)
     })
 
-    const provisionData = provision?.data?.provision
+    const provisionData = provision?.data
 
     useEffect(()=>{
         joinRoom(productSubUID); // provision subscription room
@@ -60,7 +60,7 @@ export default function ProductProvision(props){
                                     <div className="card-body">
                                         <div className="progress">
                                             <div className="progress-bar progress-bar-striped progress-bar-animated" role="progressbar"
-                                            aria-valuenow={`${provisionData.percent_completed}%`} aria-valuemin="0" aria-valuemax="100" style={{width:`${provisionData.percent_completed}%`}} ></div>
+                                            aria-valuenow={`${provisionData?.percent_completed}%`} aria-valuemin="0" aria-valuemax="100" style={{width:`${provisionData?.percent_completed}%`}} ></div>
                                         </div>
                                 </div>
                             </div>
@@ -111,9 +111,7 @@ export default function ProductProvision(props){
                                 <h4 className="card-title" style={{padding:'10px'}}>Started creating your selection</h4>
                                 <img className="card-img-top" src={getImage('widget/working.jpg')}  alt="Card image cap" />
                                 <div className="card-body">
-                                <p>
-                                    {productDescription}
-                                </p>
+                                    <div className="" dangerouslySetInnerHTML={{__html: productDescription}}/>
                                 </div>
                             </div>
 

src/component/product/ProductStart.jsx

@@ -18,6 +18,8 @@ export default function ProductStart(props){
     const productDescription  = props.productData?.description;
     const promotion_text  = props.productData?.promotion_text;
     const product_status  = props.productData?.status;
+    const saleText  = props.productData?.sale_text;
+    
     const modalRef = useRef()
 
     const refetch = () => {
@@ -59,7 +61,8 @@ export default function ProductStart(props){
                         <img className="card-img-top" src={getImage(productBanner)}  alt="Card image cap" />
                         <div className="card-body">
                             <h4 className="card-title">{productTitle}</h4>
-                            <p className="card-text">{productDescription}</p>
+                            <div className="card-text" dangerouslySetInnerHTML={{__html: productDescription}}/>
+                            {/* <p className="card-text">{productDescription}</p> */}
                         </div>
                     </div>
                 </div>
@@ -115,16 +118,7 @@ export default function ProductStart(props){
                             </button>
                         </div>
                         <div className="modal-body">
-                            <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis
-                                in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at
-                                eros. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus
-                            </p>
-                            <p>
-                                sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Aenean lacinia
-                                bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque
-                                nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor
-                                fringilla. Cras mattis consectetur purus sit amet fermentum. Cras justo odio,
-                            </p>
+                            <div className="" dangerouslySetInnerHTML={{__html: saleText}}/>
                             {/* {mutation.error &&
                             <>
                                 <div className="col-12">

src/component/settings/Settings.jsx

@@ -15,7 +15,7 @@ export default function Settings(){
             <div className="row account-contant">
                 <div className="col-12">
                     <div className="card card-statistics">
-                        <div className="card-body p-0">
+                        <div className="card-body p-0" style={{backgroundColor:"#f9f9fb"}}>
                             <div className="row no-gutters">
                                 <div className="col-xl-3 pb-xl-0 pb-5 border-right">
                                     <div className="page-account-profil pt-5">
@@ -62,9 +62,9 @@ export default function Settings(){
                                                 <button className="btn btn-light text-primary mb-2">Upload New Avatar
                                                 </button>
                                             </div>
-                                            <div>
-                                                <button className="btn btn-danger">Delete</button>
-                                            </div>
+                                            {/*<div>*/}
+                                            {/*    <button className="btn btn-danger">Delete</button>*/}
+                                            {/*</div>*/}
                                         </div>
                                     </div>
                                 </div>
@@ -77,15 +77,25 @@ export default function Settings(){
                                             <form>
                                                 <div className="form-row">
                                                     <div className="form-group col-md-12">
-                                                        <label htmlFor="name1">Full Name</label>
+                                                        <label htmlFor="name1">First Name</label>
                                                         <input type="text" className="form-control" id="name1"
-                                                               value="Alice Williams" />
+                                                               value="Alice" />
                                                     </div>
                                                     <div className="form-group col-md-12">
-                                                        <label htmlFor="title1">Title</label>
-                                                        <input type="text" className="form-control" id="title1"
-                                                               value="Marketing expert" />
+                                                        <label htmlFor="name1">Last Name</label>
+                                                        <input type="text" className="form-control" id="name1"
+                                                               value="Williams" />
                                                     </div>
+                                                    <div className="form-group col-md-12">
+                                                        <label htmlFor="name1">Account Name</label>
+                                                        <input type="text" className="form-control" id="name1"
+                                                               value="This is the best hospital name" />
+                                                    </div>
+                                                    {/*<div className="form-group col-md-12">*/}
+                                                    {/*    <label htmlFor="title1">Email</label>*/}
+                                                    {/*    <input type="text" className="form-control" id="title1"*/}
+                                                    {/*           value="email@email.com" />*/}
+                                                    {/*</div>*/}
                                                     <div className="form-group col-md-12">
                                                         <label htmlFor="phone1">Phone Number</label>
                                                         <input type="text" className="form-control" id="phone1"
@@ -108,135 +118,47 @@ export default function Settings(){
                                                            value="1234 North Avenue Luke Lane, South Bend, IN 360001" />
                                                 </div>
 
-                                                <div className="form-row">
-                                                    <div className="col-12">
-                                                        <label className="mb-1">Birthday</label>
-                                                    </div>
-                                                    <div className="form-group col-md-4">
-                                                        <select id="inputState" className="form-control">
-                                                            <option>Date</option>
-                                                            <option>01</option>
-                                                            <option>02</option>
-                                                            <option>03</option>
-                                                            <option>04</option>
-                                                            <option>05</option>
-                                                            <option>06</option>
-                                                            <option>07</option>
-                                                            <option>08</option>
-                                                            <option>09</option>
-                                                            <option>10</option>
-                                                            <option selected="">11</option>
-                                                            <option>12</option>
-                                                            <option>13</option>
-                                                            <option>14</option>
-                                                            <option>15</option>
-                                                            <option>16</option>
-                                                            <option>17</option>
-                                                            <option>18</option>
-                                                            <option>19</option>
-                                                            <option>20</option>
-                                                            <option>21</option>
-                                                            <option>22</option>
-                                                            <option>23</option>
-                                                            <option>24</option>
-                                                            <option>25</option>
-                                                            <option>26</option>
-                                                            <option>27</option>
-                                                            <option>28</option>
-                                                            <option>29</option>
-                                                            <option>30</option>
-                                                            <option>31</option>
-                                                        </select>
-                                                    </div>
-                                                    <div className="form-group col-md-4">
-                                                        <select id="inputState1" className="form-control">
-                                                            <option>Month</option>
-                                                            <option>January</option>
-                                                            <option>February</option>
-                                                            <option>March</option>
-                                                            <option>April</option>
-                                                            <option selected="">May</option>
-                                                            <option>June</option>
-                                                            <option>July</option>
-                                                            <option>August</option>
-                                                            <option>September</option>
-                                                            <option>October</option>
-                                                            <option>November</option>
-                                                            <option>December</option>
-                                                        </select>
-                                                    </div>
+                                                {/*<div className="form-row">*/}
+                                                {/*    <div className="form-group col-md-4">*/}
+                                                {/*        <label htmlFor="inputState3">City</label>*/}
+                                                {/*        <select id="inputState3" className="form-control">*/}
+                                                {/*            <option>Choose...</option>*/}
+                                                {/*            <option selected="">London</option>*/}
+                                                {/*            <option>Montreal</option>*/}
+                                                {/*            <option>Delhi</option>*/}
+                                                {/*            <option>Tokyo</option>*/}
+                                                {/*        </select>*/}
+                                                {/*    </div>*/}
+                                                {/*    <div className="form-group col-md-4">*/}
+                                                {/*        <label htmlFor="inputState4">State</label>*/}
+                                                {/*        <select id="inputState4" className="form-control">*/}
+                                                {/*            <option>Choose...</option>*/}
+                                                {/*            <option selected="">England</option>*/}
+                                                {/*            <option>California</option>*/}
+                                                {/*            <option>Texas</option>*/}
+                                                {/*            <option>Scotland</option>*/}
+                                                {/*        </select>*/}
+                                                {/*    </div>*/}
+                                                {/*    <div className="form-group col-md-4">*/}
+                                                {/*        <label htmlFor="inputZip">Zip</label>*/}
+                                                {/*        <input type="text" className="form-control" id="inputZip"*/}
+                                                {/*               value="EC1A 1BB" />*/}
+                                                {/*    </div>*/}
+                                                {/*</div>*/}
+                                                {/*<div className="form-group">*/}
+                                                {/*    <div className="form-check">*/}
+                                                {/*        <input className="form-check-input" type="checkbox"*/}
+                                                {/*               id="gridCheck" />*/}
+                                                {/*            <label className="form-check-label" htmlFor="gridCheck">*/}
+                                                {/*                I agree to receive email notification.*/}
+                                                {/*            </label>*/}
+                                                {/*    </div>*/}
+                                                {/*</div>*/}
+                                                <div style={{textAlign:"right"}}>
+                                                    <button type="submit" className="btn btn-primary">Update Profile
+                                                    </button>
+                                                </div>
 
-                                                    <div className="form-group col-md-4">
-                                                        <select id="inputState2" className="form-control">
-                                                            <option>Year</option>
-                                                            <option>1984</option>
-                                                            <option>1985</option>
-                                                            <option>1986</option>
-                                                            <option>1987</option>
-                                                            <option>1988</option>
-                                                            <option>1989</option>
-                                                            <option>1990</option>
-                                                            <option>1991</option>
-                                                            <option>1992</option>
-                                                            <option>1993</option>
-                                                            <option selected="">1994</option>
-                                                            <option>1995</option>
-                                                            <option>1996</option>
-                                                            <option>1997</option>
-                                                            <option>1998</option>
-                                                            <option>1999</option>
-                                                            <option>2000</option>
-                                                            <option>2001</option>
-                                                            <option>2002</option>
-                                                            <option>2003</option>
-                                                            <option>2004</option>
-                                                            <option>2005</option>
-                                                            <option>2006</option>
-                                                            <option>2007</option>
-                                                            <option>2008</option>
-                                                            <option>2009</option>
-                                                            <option>2010</option>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div className="form-row">
-                                                    <div className="form-group col-md-4">
-                                                        <label htmlFor="inputState3">City</label>
-                                                        <select id="inputState3" className="form-control">
-                                                            <option>Choose...</option>
-                                                            <option selected="">London</option>
-                                                            <option>Montreal</option>
-                                                            <option>Delhi</option>
-                                                            <option>Tokyo</option>
-                                                        </select>
-                                                    </div>
-                                                    <div className="form-group col-md-4">
-                                                        <label htmlFor="inputState4">State</label>
-                                                        <select id="inputState4" className="form-control">
-                                                            <option>Choose...</option>
-                                                            <option selected="">England</option>
-                                                            <option>California</option>
-                                                            <option>Texas</option>
-                                                            <option>Scotland</option>
-                                                        </select>
-                                                    </div>
-                                                    <div className="form-group col-md-4">
-                                                        <label htmlFor="inputZip">Zip</label>
-                                                        <input type="text" className="form-control" id="inputZip"
-                                                               value="EC1A 1BB" />
-                                                    </div>
-                                                </div>
-                                                <div className="form-group">
-                                                    <div className="form-check">
-                                                        <input className="form-check-input" type="checkbox"
-                                                               id="gridCheck" />
-                                                            <label className="form-check-label" htmlFor="gridCheck">
-                                                                I agree to receive email notification.
-                                                            </label>
-                                                    </div>
-                                                </div>
-                                                <button type="submit" className="btn btn-primary">Update Information
-                                                </button>
                                             </form>
                                         </div>
                                     </div>
@@ -282,7 +204,10 @@ export default function Settings(){
                                                     <input type="text" className="form-control" id="we"
                                                            value="https://yourwebsite.com" />
                                                 </div>
-                                                <button type="submit" className="btn btn-primary">Save & Update</button>
+                                                <div style={{textAlign:"right"}}>
+                                                    <button type="submit" className="btn btn-primary">Update Links</button>
+                                                </div>
+
                                             </form>
                                         </div>
                                     </div>

src/component/users/Users.jsx

@@ -53,172 +53,172 @@ export default function Users(){
                             </div>
                         </div>
                     </div>
-                    <div className="col-xxl-3 col-xl-4 col-sm-6">
-                        <div className="card card-statistics contact-contant">
-                            <div className="card-body py-4">
-                                <div className="d-flex align-items-center">
-                                    <div className="bg-img">
-                                        <img src="assets/img/avtar/02.jpg" alt="" className="img-fluid" />
-                                    </div>
-                                    <div className="ml-3">
-                                        <h4 className="mb-0">Samuel Woods</h4>
-                                        <p><span className="badge badge-success-inverse px-2 py-1 mt-1">Friends</span></p>
-                                    </div>
-                                </div>
-                                <div>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon">
-                                                <div className="img-icon"><i className="fa fa-mobile"></i></div>
-                                            </div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>026-123-8546</p>
-                                        </li>
-                                    </ul>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-phone"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>80-1230-8546</p>
-                                        </li>
-                                    </ul>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-envelope-o"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>Samuel.Woods@gmail.com</p>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div className="col-xxl-3 col-xl-4  col-sm-6">
-                        <div className="card card-statistics contact-contant">
-                            <div className="card-body py-4">
-                                <div className="d-flex align-items-center">
-                                    <div className="bg-img">
-                                        <img src="assets/img/avtar/03.jpg" alt="" className="img-fluid" />
-                                    </div>
-                                    <div className="ml-3">
-                                        <h4 className="mb-0">Garettdon</h4>
-                                        <p><span className="badge badge-primary-inverse px-2 py-1 mt-1">Office</span></p>
-                                    </div>
-                                </div>
-                                <div>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-mobile"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>026-123-8546</p>
-                                        </li>
-                                    </ul>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-phone"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>80-1230-8546</p>
-                                        </li>
-                                    </ul>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-envelope-o"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>Garettdon@gmail.com</p>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div className="col-xxl-3 col-xl-4  col-sm-6">
-                        <div className="card card-statistics contact-contant">
-                            <div className="card-body py-4">
-                                <div className="d-flex align-items-center">
-                                    <div className="bg-img">
-                                        <img src="assets/img/avtar/04.jpg" alt="" className="img-fluid" />
-                                    </div>
-                                    <div className="ml-3">
-                                        <h4 className="mb-0">Garynice</h4>
-                                        <p><span className="badge badge-warning-inverse px-2 py-1 mt-1">Home</span></p>
-                                    </div>
-                                </div>
-                                <div>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-mobile"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>026-123-8546</p>
-                                        </li>
-                                    </ul>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-phone"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>80-1230-8546</p>
-                                        </li>
-                                    </ul>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-envelope-o"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>Garynice@gmail.com</p>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div className="col-xxl-3 col-xl-4  col-sm-6">
-                        <div className="card card-statistics contact-contant">
-                            <div className="card-body py-4">
-                                <div className="d-flex align-items-center">
-                                    <div className="bg-img">
-                                        <img src="assets/img/avtar/05.jpg" alt="" className="img-fluid" />
-                                    </div>
-                                    <div className="ml-3">
-                                        <h4 className="mb-0">Andrew nico</h4>
-                                        <p><span className="badge badge-success-inverse px-2 py-1 mt-1">Friends</span></p>
-                                    </div>
-                                </div>
-                                <div>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-mobile"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>026-123-8546</p>
-                                        </li>
-                                    </ul>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-phone"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>80-1230-8546</p>
-                                        </li>
-                                    </ul>
-                                    <ul className="nav">
-                                        <li className="nav-item">
-                                            <div className="img-icon"><i className="fa fa-envelope-o"></i></div>
-                                        </li>
-                                        <li className="nav-item">
-                                            <p>Andrew.nico@gmail.com</p>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                    {/*<div className="col-xxl-3 col-xl-4 col-sm-6">*/}
+                    {/*    <div className="card card-statistics contact-contant">*/}
+                    {/*        <div className="card-body py-4">*/}
+                    {/*            <div className="d-flex align-items-center">*/}
+                    {/*                <div className="bg-img">*/}
+                    {/*                    <img src="assets/img/avtar/02.jpg" alt="" className="img-fluid" />*/}
+                    {/*                </div>*/}
+                    {/*                <div className="ml-3">*/}
+                    {/*                    <h4 className="mb-0">Samuel Woods</h4>*/}
+                    {/*                    <p><span className="badge badge-success-inverse px-2 py-1 mt-1">Friends</span></p>*/}
+                    {/*                </div>*/}
+                    {/*            </div>*/}
+                    {/*            <div>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon">*/}
+                    {/*                            <div className="img-icon"><i className="fa fa-mobile"></i></div>*/}
+                    {/*                        </div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>026-123-8546</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-phone"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>80-1230-8546</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-envelope-o"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>Samuel.Woods@gmail.com</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*            </div>*/}
+                    {/*        </div>*/}
+                    {/*    </div>*/}
+                    {/*</div>*/}
+                    {/*<div className="col-xxl-3 col-xl-4  col-sm-6">*/}
+                    {/*    <div className="card card-statistics contact-contant">*/}
+                    {/*        <div className="card-body py-4">*/}
+                    {/*            <div className="d-flex align-items-center">*/}
+                    {/*                <div className="bg-img">*/}
+                    {/*                    <img src="assets/img/avtar/03.jpg" alt="" className="img-fluid" />*/}
+                    {/*                </div>*/}
+                    {/*                <div className="ml-3">*/}
+                    {/*                    <h4 className="mb-0">Garettdon</h4>*/}
+                    {/*                    <p><span className="badge badge-primary-inverse px-2 py-1 mt-1">Office</span></p>*/}
+                    {/*                </div>*/}
+                    {/*            </div>*/}
+                    {/*            <div>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-mobile"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>026-123-8546</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-phone"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>80-1230-8546</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-envelope-o"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>Garettdon@gmail.com</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*            </div>*/}
+                    {/*        </div>*/}
+                    {/*    </div>*/}
+                    {/*</div>*/}
+                    {/*<div className="col-xxl-3 col-xl-4  col-sm-6">*/}
+                    {/*    <div className="card card-statistics contact-contant">*/}
+                    {/*        <div className="card-body py-4">*/}
+                    {/*            <div className="d-flex align-items-center">*/}
+                    {/*                <div className="bg-img">*/}
+                    {/*                    <img src="assets/img/avtar/04.jpg" alt="" className="img-fluid" />*/}
+                    {/*                </div>*/}
+                    {/*                <div className="ml-3">*/}
+                    {/*                    <h4 className="mb-0">Garynice</h4>*/}
+                    {/*                    <p><span className="badge badge-warning-inverse px-2 py-1 mt-1">Home</span></p>*/}
+                    {/*                </div>*/}
+                    {/*            </div>*/}
+                    {/*            <div>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-mobile"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>026-123-8546</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-phone"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>80-1230-8546</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-envelope-o"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>Garynice@gmail.com</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*            </div>*/}
+                    {/*        </div>*/}
+                    {/*    </div>*/}
+                    {/*</div>*/}
+                    {/*<div className="col-xxl-3 col-xl-4  col-sm-6">*/}
+                    {/*    <div className="card card-statistics contact-contant">*/}
+                    {/*        <div className="card-body py-4">*/}
+                    {/*            <div className="d-flex align-items-center">*/}
+                    {/*                <div className="bg-img">*/}
+                    {/*                    <img src="assets/img/avtar/05.jpg" alt="" className="img-fluid" />*/}
+                    {/*                </div>*/}
+                    {/*                <div className="ml-3">*/}
+                    {/*                    <h4 className="mb-0">Andrew nico</h4>*/}
+                    {/*                    <p><span className="badge badge-success-inverse px-2 py-1 mt-1">Friends</span></p>*/}
+                    {/*                </div>*/}
+                    {/*            </div>*/}
+                    {/*            <div>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-mobile"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>026-123-8546</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-phone"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>80-1230-8546</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*                <ul className="nav">*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <div className="img-icon"><i className="fa fa-envelope-o"></i></div>*/}
+                    {/*                    </li>*/}
+                    {/*                    <li className="nav-item">*/}
+                    {/*                        <p>Andrew.nico@gmail.com</p>*/}
+                    {/*                    </li>*/}
+                    {/*                </ul>*/}
+                    {/*            </div>*/}
+                    {/*        </div>*/}
+                    {/*    </div>*/}
+                    {/*</div>*/}
                     <div className="col-xxl-3 col-xl-4  col-sm-6">
                         <div className="card card-statistics contact-contant">
                             <div className="card-body py-4">

src/css/mail/_mail.scss

@@ -85,7 +85,13 @@
 }
 
 .mail-contant .mail-f{
-	position: absolute;
+	position: relative;
 	width: 100%;
 	bottom: 0;
+	@include desktop {
+		position: absolute;
+	}
+	@include desktop-lg {
+		position: absolute;
+	}
 }

src/css/partials/_layout.scss

@@ -10,6 +10,7 @@ body {
     outline:0;
     background:$body;
     color:$muted;
+    font-weight: $font-regular;
     &.sidebar-mini {
         .app-main {
             padding-left:$sidebar-mini;

src/css/partials/_typography.scss

@@ -39,8 +39,7 @@ h6 {
 
 p {
 	color: $muted;
-	font-weight: $font-regular;
-	font-size: $font-base;
+	font-size: $font-18;
 	line-height: $line-md;
 }
 a {

src/css/partials/_variables.scss

@@ -35,13 +35,13 @@ $container-max-widths: (
 
 // Colors
 $body 	  		: #f9f9fb;
-$primary  		: #8E54E9;
+$primary  		: #148399; //#8E54E9;
 $primary2		  : #4776E6;
 $secondary    : #a1a1a1;
 $light-gray		: #eceef3;
 $dark-gray		: #2c2e3e;
 $darker-gray  : #333333;
-$muted 			  : #a6a9b7;
+$muted 			  : #6c757d; //#a6a9b7;
 $info			    : #45aaf2;
 $danger			  : #e3324c;
 $cyan			    : #2bcbba;
@@ -75,7 +75,7 @@ $behance      : #053eff;
 $whatsapp     : #4FCE5D;
 
 // Font family
-$font-primary	: 'Roboto', sans-serif;
+$font-primary	: 'Plus Jakarta Sans', sans-serif;
 
 //Font size
 

src/index.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 // import './index.css';
-import { Provider } from 'react-redux';
+// import { Provider } from 'react-redux';
+// import store from './store/store'
 import { BrowserRouter } from 'react-router-dom';
-import store from './store/store'
 
 import App from './App';
 //import reportWebVitals from './reportWebVitals';
@@ -17,9 +17,7 @@ const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(
   <React.StrictMode>
     <BrowserRouter>
-      <Provider store={store}>
-        <App />
-      </Provider>
+      <App />
     </BrowserRouter>
   </React.StrictMode>
 );

src/links/siteLinks.js

@@ -1,5 +1,6 @@
 const siteLinks = {
     error: '*',
+    help: '/help',
     home: '/',
     dash: '/dash',
     product: '/product/*',

src/services/queryKeys.js

@@ -1,4 +1,6 @@
 const queryKeys = {
+    user_details: ['user_details'],
+    
     dashboard: ['dashboard'],
     topBar: ['top-bar'],
     recentAction: ['recent-action'],

src/services/services.js

@@ -4,12 +4,13 @@ import axios from "axios"
 axios.interceptors.request.use(
     config => {
         config.headers = {
-            // Accept: "application/json",
+            Accept: "application/json",
             "Access-Control-Allow-Origin": "*",
             // "Access-Control-Expose-Headers": "Access-Control-Allow-Origin",
             // "Access-Control-Allow-Headers": "Origin, X-API-KEY, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Allow-Headers, Authorization, observe, enctype, Content-Length, X-Csrf-Token",
             // "Content-Type": "application/json;charset=UTF-8",
-            'Authorization': `Bearer ${localStorage.getItem('token')}`
+            'Authorization': (localStorage && localStorage.getItem('access_token')) ? `Bearer ${localStorage.getItem('access_token')}` : '',
+            // 'uuid': 'dummy'
           };
     // config.headers['Authorization'] = `Bearer ${localStorage.getItem('token')}`;
     // config.baseURL = process.env.REACT_APP_MAIN_API
@@ -25,7 +26,7 @@ const postAuxEnd = (path, postData, media=false) => {
     return axios.post(`${basePath}${path}`, postData).then(res => {
         return res
     }).catch(err => {
-        throw new Error(err.response.data.message);
+        throw new Error(err.response.data.msg);
     })
 }
 
@@ -42,20 +43,103 @@ const getAuxEnd = (path, reqData= null) => {
     })
 }
 
+// FUNCTION TO AUTHORIZE USER IN
+export const userToken = (reqData) => {
+    let postData = {
+        ...reqData
+    }
+    return postAuxEnd('/Authorize', postData, false)
+}
+
 // FUNCTION TO LOGIN USER IN
 export const loginUser = (reqData) => {
     let postData = {
         ...reqData
     }
-    return postAuxEnd('/panel/auth/login', postData, false)
+    return postAuxEnd('/panel/Login', postData, false)
 }
 
+// FUNCTION TO GET USER INFO DATA
+export const userInfo = (reqData) => {
+    let postData = {
+        ...reqData
+    }
+    return postAuxEnd('/panel/account', postData, false)
+}
+
+// FUNCTION TO GET DASHBOARD TOP BAR SECTION
+export const topBar = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/account/bar`, postData, false)
+}
+
+// FUNCTION TO GET PRODUCT BY ID
+export const MyProductData = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/myproduct/dash`, postData, false)
+}
+
+// FUNCTION TO GET CALENDAR EVENTS
+export const getCalendarEvents = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/account/calendar`, postData, false)
+}
+
+// FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION
+export const contactData = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/contacts`, postData, false)
+}
+
+// FUNCTION TO GET DASHBOARD PRODUCT URL DATA SECTION
+export const productsURL = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/account/products/url`, postData, false)
+}
+
+// FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION
+export const productsData = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/account/products`, postData, false)
+}
+
+// FUNCTION TO GET DASHBOARD RECENT ACTIONS SECTION
+export const recentActions = (reqData) => {
+    let postData = {
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    //return getAuxEnd(`/panel/account/actions`)
+    return postAuxEnd(`/panel/account/actions`, postData, false)
+}
+
+
+
+
+
+
+
+
+
 // FUNCTION TO REGISTER USER
 export const signUpUser = (reqData) => {
     let postData = {
         ...reqData
     }
-    return postAuxEnd('/panel/auth/register', postData, false)
+    return postAuxEnd('/panel/Register', postData, false)
 }
 
 // FUNCTION TO VERIFY EMAIL
@@ -63,7 +147,7 @@ export const verifyEmail = (reqData) => {
     let postData = {
         ...reqData
     }
-    return postAuxEnd('/panel/auth/register/verify', postData, false)
+    return postAuxEnd('/panel/Register/verify', postData, false)
 }
 
 // FUNCTION TO COMPLETE REGISTRATION
@@ -71,15 +155,17 @@ export const completeRegistration = (reqData) => {
     let postData = {
         ...reqData
     }
-    return postAuxEnd('/panel/auth/register/complete', postData, false)
+    return postAuxEnd('/panel/Register/complete', postData, false)
 }
 
 // FUNCTION TO SUBSCRIBE
 export const subscribe = (reqData) => {
     let postData = {
-        ...reqData
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
     }
-    return postAuxEnd('/panel/myproduct/subscription', postData, false)
+    return postAuxEnd(`/panel/myproduct/subscription`, postData, false)
 }
 
 
@@ -91,49 +177,14 @@ export const recoverPWD = (reqData) => {
     return postAuxEnd('/panel/auth/reset', postData, false)
 }
 
-// FUNCTION TO GET DASHBOARD DATA
-export const accountDashboard = () => {
-    return getAuxEnd(`/panel/account/dash`)
-}
-
-// FUNCTION TO GET DASHBOARD TOP BAR SECTION
-export const topBar = () => {
-    return getAuxEnd(`/panel/account/bar`)
-}
-
-// FUNCTION TO GET CALENDAR EVENTS
-export const getCalendarEvents = () => {
-    return getAuxEnd(`/panel/account/calendar`)
-}
-
-// FUNCTION TO GET DASHBOARD RECENT ACTIONS SECTION
-export const recentActions = () => {
-    return getAuxEnd(`/panel/account/actions`)
-}
-
 // FUNCTION TO GET MY PRODUCT PROVISION DATA
 export const productProvision = (reqData) => {
-    const postData = { ...reqData }
-    return getAuxEnd(`/panel/myproduct/provision`, postData)
+    let postData = {
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    return postAuxEnd(`/panel/myproduct/provision`, postData, false)
+    // return getAuxEnd(`/panel/myproduct/provision`, postData)
 }
 
-// FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION
-export const productData = () => {
-    return getAuxEnd(`/panel/account/products`)
-}
-
-// FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION
-export const contactData = () => {
-    return getAuxEnd(`/panel/contacts`)
-}
-
-// FUNCTION TO GET DASHBOARD PRODUCT URL DATA SECTION
-export const productsURL = () => {
-    return getAuxEnd(`/panel/account/products/url`)
-}
-
-export const MyProductData = (productID) => {
-    const reqData = { product_id : productID}
-    //console.log(reqData)
-    return getAuxEnd(`/panel/myproduct/dash`,reqData)
-}

src/utils/getImage.js

@@ -1,6 +1,6 @@
 let getImage = (location) => {
     if (!location) {
-        return require(`../assets/img/logo.png`);
+        return require(`../assets/img/logo-pink.png`);
     } else {
         return require(`../assets/img/${location}`);
     }

src/views/HelpPage.jsx

@@ -0,0 +1,7 @@
+import HelpCom from '../component/help/HelpCom'
+
+export default function HelpPage() {
+  return (
+    <HelpCom />
+  )
+}