route bug fixed

Merge branch 'master' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS
Merge branch 'signup-payload' of MERMS/MermsPanelReactJS into master
2025-07-10 11:53:55 +01:00 · 2025-07-10 11:08:41 +01:00 · 2025-07-10 08:36:37 +00:00 · 2025-07-10 09:05:30 +01:00 · 2025-07-10 08:59:20 +01:00 · 2025-07-10 08:54:41 +01:00
50 changed files with 1449 additions and 1052 deletions
@@ -1,10 +1,16 @@
 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"

+# login footer links
+REACT_APP_HOME_LINK='https://dev-www.mermsemr.com/'
+REACT_APP_ABOUT_LINK='https://dev-www.mermsemr.com/about'
+REACT_APP_CONTACTS_LINK='https://dev-www.mermsemr.com/contacts'
+REACT_APP_TERMS_LINK='https://dev-www.mermsemr.com/terms'
+
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000

@@ -1,9 +1,15 @@
 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"

+# login footer links
+REACT_APP_HOME_LINK='https://dev-www.mermsemr.com/'
+REACT_APP_ABOUT_LINK='https://dev-www.mermsemr.com/about'
+REACT_APP_CONTACTS_LINK='https://dev-www.mermsemr.com/contacts'
+REACT_APP_TERMS_LINK='https://dev-www.mermsemr.com/terms'
+
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000
@@ -1,8 +1,14 @@
 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
+REACT_APP_HOME_LINK='https://www.mermsemr.com/'
+REACT_APP_ABOUT_LINK='https://www.mermsemr.com/about'
+REACT_APP_CONTACTS_LINK='https://www.mermsemr.com/contacts'
+REACT_APP_TERMS_LINK='https://www.mermsemr.com/terms'
+
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000
@@ -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
@@ -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"
  },
@@ -8,4 +8,43 @@
  background-image: url('./assets/bg/signup_bg.jpg') !important;
  background-size: cover;
  background-repeat: no-repeat;
+}
+
+.register{
+  border-radius: 10px;
+}
+
+.login-links{
+  margin-top: 50px;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+}
+
+.login-links a {
+  font-size: 14px;
+  padding: 0px 20px;
+  border-right: 2px solid #6c757d;
+  cursor: pointer;
+}
+
+.login-links a:nth-of-type(1){
+  padding-left: 0px;
+}
+
+.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;
 }
@@ -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: 3000
-      },
+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>
  );
 }
@@ -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>
@@ -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";

@@ -28,6 +30,8 @@ const validationSchema = Yup.object().shape({
 export default function CSignup() {

    const {jwt} = useParams()
+    
+    const dispatch = useDispatch()

    const navigate = useNavigate()

@@ -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)
    // }
@@ -70,7 +78,7 @@ export default function CSignup() {
        country : values.country,    
        username: values.username,
        password: values.password,
-        verify_link: user.verify_link
+        verify_link: jwt
    }
    cSignup.mutate(reqData)
  }
@@ -86,10 +94,10 @@ export default function CSignup() {
    <div className="app">
        <div className="app-wrap">
            <div className="app-contant">
-                <div className="bg-white custom-bg">
+                <div className="vh-100 bg-white custom-bg">
                    <div className="container-fluid p-0">
                        <div className="row no-gutters justify-content-center">
-                        <div className="col-sm-6 col-lg-5 col-xxl-3 align-self-center order-2 order-sm-1 h-100-vh">
+                        <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">
                                    <h1 className="mb-2">MERMS Panel</h1>
@@ -196,7 +204,7 @@ export default function CSignup() {
                                                }

                                                <div className="col-12 mt-3 text-center">
-                                                    <Link to={siteLinks.login} className='text-primary' style={{color: '#6FCAEF'}}>Need help with logging in or signing up?</Link>
+                                                    <Link to={siteLinks.signup} className='text-primary' style={{color: '#6FCAEF'}}>Need help with logging in or signing up?</Link>
                                                </div>
                                                
                                                <div className="col-12 mt-3 text-center">
@@ -10,7 +10,7 @@ import { recoverPWD } from '../../services/services';

 const validationSchema = Yup.object().shape({
    username: Yup.string()
-      .email("Wrong email format")
+    //   .email("Wrong email format")
    //   .matches(
    //     /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/,
    //     "Invalid email format"
@@ -43,14 +43,14 @@ export default function Forgetpwd2() {
    <div className="app">
        <div className="app-wrap">
            <div className="app-contant">
-                <div className="bg-white">
+                <div className="vh-100 bg-white custom-bg">
                    <div className="container-fluid p-0">
-                        <div className="row no-gutters">
-                            <div className="col-sm-6 col-lg-5 col-xxl-3  align-self-center order-2 order-sm-1">
-                                <div className="d-flex align-items-center h-100-vh">
-                                    <div className="login p-50">
-                                        <h1 className="mb-2">Recover Password</h1>
-                                        <p>Please enter your email.</p>
+                        <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-1h">
+                                <div className="mt-5 d-flex">
+                                    <div className="bg-white register p-5">
+                                        <h1 className="mb-2">MERMS Panel</h1>
+                                        <p>Please enter your username.</p>
                                        <Formik
                                        initialValues={initialValues}
                                        validationSchema={validationSchema}
@@ -64,8 +64,8 @@ export default function Forgetpwd2() {
                                                        <>
                                                            <div className="col-12">
                                                                <div className="form-group">
-                                                                    <label className={`text-black fw-bold control-label ${(props.errors.username && props.touched.username) && 'text-danger'}`}>Email*</label>
-                                                                    <input type="email" name='username' className="form-control" placeholder="Email" value={props.values.username} onChange={props.handleChange} />
+                                                                    <label className={`text-black fw-bold control-label ${(props.errors.username && props.touched.username) && 'text-danger'}`}>Username*</label>
+                                                                    <input type="text" name='username' className="form-control" placeholder="Username" value={props.values.username} onChange={props.handleChange} />
                                                                </div>
                                                            </div>
                                                            {mutation.error &&
@@ -98,13 +98,13 @@ export default function Forgetpwd2() {
                                    </div>
                                </div>
                            </div>
-                            <div className="custom-bg col-sm-6 col-xxl-9 col-lg-7 b-gradient o-hidden order-1 order-sm-2">
+                            {/* <div className="custom-bg col-sm-6 col-xxl-9 col-lg-7 b-gradient o-hidden order-1 order-sm-2">
                                <div className="row align-items-center h-100">
                                    <div className="col-7 mx-auto ">
-                                        {/* <img className="img-fluid" src={LoginImg} alt="" /> */}
+                                        <img className="img-fluid" src={LoginImg} alt="" />
                                    </div>
                                </div>
-                            </div>
+                            </div> */}
                        </div>
                    </div>
                </div>
@@ -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,16 +70,22 @@ 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">
            <div className="app-contant">
-                <div className="bg-white">
+                <div className="vh-100 custom-bg">
                    <div className="container-fluid p-0">
-                        <div className="row no-gutters">
-                            <div className="col-sm-6 col-lg-5 col-xxl-3  align-self-center order-2 order-sm-1">
-                                <div className="d-flex align-items-center h-100-vh">
-                                    <div className="login p-50">
+                        <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 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>
@@ -132,16 +146,23 @@ export default function Login() {
                                                </div>
                                            </div>
                                        </div>
+
+                                        <div className="login-links">
+                                            <a href={process.env.REACT_APP_HOME_LINK}>Home</a>
+                                            <a href={process.env.REACT_APP_ABOUT_LINK}>About</a>
+                                            <a href={process.env.REACT_APP_CONTACTS_LINK}>Contact</a>
+                                            <a href={process.env.REACT_APP_TERMS_LINK}>Terms</a>
+                                        </div>
                                    </div>
                                </div>
                            </div>
-                            <div className="custom-bg col-sm-6 col-xxl-9 col-lg-7 b-gradient o-hidden order-1 order-sm-2">
+                            {/* <div className="custom-bg col-sm-6 col-xxl-9 col-lg-7 b-gradient o-hidden order-1 order-sm-2">
                                <div className="row align-items-center h-100">
                                    <div className="col-7 mx-auto ">
-                                        {/* <img className="img-fluid" src={LoginImg} alt="" /> */}
+                                        <img className="img-fluid" src={LoginImg} alt="" />
                                    </div>
                                </div>
-                            </div>
+                            </div> */}
                        </div>
                    </div>
                </div>
@@ -49,6 +49,7 @@ export default function Signup2() {
  const signUp = (values) => {
    // helpers.resetForm()
    // console.log('values', values, helpers)
+    delete values.isChecked
    mutation.mutate(values)
  }

@@ -56,104 +57,104 @@ export default function Signup2() {
    <div className="app">
        <div className="app-wrap">
            <div className="app-contant">
-                <div className="bg-white">
+                <div className="vh-100 bg-white custom-bg">
                    <div className="container-fluid p-0">
-                        <div className="row no-gutters">
-                        <div className="col-sm-6 col-lg-5 col-xxl-3  align-self-center order-2 order-sm-1">
-                            <div className="d-flex align-items-center h-100-vh">
-                                <div className="register p-5">
-                                    <h1 className="mb-2">MERMS Panel</h1>
-                                    <p>Welcome, Please create your account.</p>
-                                    <Formik
-                                        initialValues={initialValues}
-                                        validationSchema={validationSchema}
-                                        onSubmit={signUp}
-                                    >
-                                        {(props) => {
-                                        return (
-                                            <Form className='mt-2 mt-sm-5'>
-                                                <div className="row">
-                                                    {!mutation.isSuccess ?
-                                                        <>
-                                                            <div className="col-12 col-sm-6">
-                                                                <div className="form-group">
-                                                                    <label className={`text-black fw-bold control-label ${(props.errors.firstname && props.touched.firstname) && 'text-danger'}`}>First Name*</label>
-                                                                    <input type="text" name='firstname' className="form-control" placeholder="First Name" value={props.values.firstname} onChange={props.handleChange} />
+                        <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">
+                                        <h1 className="mb-2">MERMS Panel</h1>
+                                        <p>Welcome, Please create your account.</p>
+                                        <Formik
+                                            initialValues={initialValues}
+                                            validationSchema={validationSchema}
+                                            onSubmit={signUp}
+                                        >
+                                            {(props) => {
+                                            return (
+                                                <Form className='mt-2 mt-sm-5'>
+                                                    <div className="row">
+                                                        {!mutation.isSuccess ?
+                                                            <>
+                                                                <div className="col-12 col-md-6">
+                                                                    <div className="form-group">
+                                                                        <label className={`text-black fw-bold control-label ${(props.errors.firstname && props.touched.firstname) && 'text-danger'}`}>First Name*</label>
+                                                                        <input type="text" name='firstname' className="form-control" placeholder="First Name" value={props.values.firstname} onChange={props.handleChange} />
+                                                                    </div>
                                                                </div>
-                                                            </div>
-                                                            <div className="col-12 col-sm-6">
-                                                                <div className="form-group">
-                                                                    <label className={`text-black fw-bold control-label ${(props.errors.lastname && props.touched.lastname) && 'text-danger'}`}>Last Name*</label>
-                                                                    <input type="text" name='lastname' className="form-control" placeholder="Last Name" value={props.values.lastname} onChange={props.handleChange} />
+                                                                <div className="col-12 col-md-6">
+                                                                    <div className="form-group">
+                                                                        <label className={`text-black fw-bold control-label ${(props.errors.lastname && props.touched.lastname) && 'text-danger'}`}>Last Name*</label>
+                                                                        <input type="text" name='lastname' className="form-control" placeholder="Last Name" value={props.values.lastname} onChange={props.handleChange} />
+                                                                    </div>
                                                                </div>
-                                                            </div>
-                                                            <div className="col-12">
-                                                                <div className="form-group">
-                                                                    <label className={`text-black fw-bold control-label ${(props.errors.email && props.touched.email) && 'text-danger'}`}>Email*</label>
-                                                                    <input type="email" name='email' className="form-control" placeholder="Email" value={props.values.email} onChange={props.handleChange} />
-                                                                </div>
-                                                            </div>
-                                                            {/* <div className="col-12">
-                                                                <div className="form-group">
-                                                                    <label className={`text-black fw-bold control-label ${(props.errors.username && props.touched.username) && 'text-danger'}`}>Username*</label>
-                                                                    <input type="text" name='username' className="form-control" placeholder="Username" value={props.values.username} onChange={props.handleChange} />
-                                                                </div>
-                                                            </div>
-                                                            <div className="col-12">
-                                                                <div className="form-group">
-                                                                    <label className={`text-black fw-bold control-label ${(props.errors.password && props.touched.password) && 'text-danger'}`}>Password*</label>
-                                                                    <input type="password" name='password' className="form-control" placeholder="Password" value={props.values.password} onChange={props.handleChange} />
-                                                                </div>
-                                                            </div> */}
-                                                            <div className="col-12">
-                                                                <div className="form-check">
-                                                                    <input name='isChecked' className="form-check-input" type="checkbox" id="gridCheck" value={props.values.isChecked} onChange={props.handleChange} />
-                                                                    <label className="form-check-label" htmlFor="gridCheck">
-                                                                        I accept terms & policy
-                                                                    </label>
-                                                                </div>
-                                                                <span className={`${(props.errors.isChecked && props.touched.isChecked) && 'text-danger'}`}>{props.errors.isChecked}</span>
-                                                            </div>
-
-                                                            {mutation.error &&
-                                                                <>
                                                                <div className="col-12">
-                                                                    <p className='text-danger'>{mutation.error.message}</p>
+                                                                    <div className="form-group">
+                                                                        <label className={`text-black fw-bold control-label ${(props.errors.email && props.touched.email) && 'text-danger'}`}>Email*</label>
+                                                                        <input type="email" name='email' className="form-control" placeholder="Email" value={props.values.email} onChange={props.handleChange} />
+                                                                    </div>
+                                                                </div>
+                                                                {/* <div className="col-12">
+                                                                    <div className="form-group">
+                                                                        <label className={`text-black fw-bold control-label ${(props.errors.username && props.touched.username) && 'text-danger'}`}>Username*</label>
+                                                                        <input type="text" name='username' className="form-control" placeholder="Username" value={props.values.username} onChange={props.handleChange} />
+                                                                    </div>
+                                                                </div>
+                                                                <div className="col-12">
+                                                                    <div className="form-group">
+                                                                        <label className={`text-black fw-bold control-label ${(props.errors.password && props.touched.password) && 'text-danger'}`}>Password*</label>
+                                                                        <input type="password" name='password' className="form-control" placeholder="Password" value={props.values.password} onChange={props.handleChange} />
+                                                                    </div>
+                                                                </div> */}
+                                                                <div className="col-12">
+                                                                    <div className="form-check">
+                                                                        <input name='isChecked' className="form-check-input" type="checkbox" id="gridCheck" value={props.values.isChecked} onChange={props.handleChange} />
+                                                                        <label className="form-check-label" htmlFor="gridCheck">
+                                                                            I accept terms & policy
+                                                                        </label>
+                                                                    </div>
+                                                                    <span className={`${(props.errors.isChecked && props.touched.isChecked) && 'text-danger'}`}>{props.errors.isChecked}</span>
                                                                </div>
-                                                                </>
-                                                            }

-                                                            <div className="col-12 mt-3 text-end">
-                                                                <button type='submit' className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Sign up'}</button>
-                                                            </div>
-                                                        </>
-                                                        :
-                                                        <div className='col-12'>
-                                                            <div className="rounded-2 d-flex flex-column justify-content-between align-items-center" style={{height: '200px', backgroundColor: '#F2FAF7'}}>
-                                                                <h4 className='p-4 text-black'>Check your email to continue.</h4>
-                                                                <Link to={siteLinks.login} className='p-2 text-primary' style={{color: '#6FCAEF'}}>Home</Link>
+                                                                {mutation.error &&
+                                                                    <>
+                                                                    <div className="col-12">
+                                                                        <p className='text-danger'>{mutation.error.message}</p>
+                                                                    </div>
+                                                                    </>
+                                                                }
+
+                                                                <div className="col-12 mt-3 text-end">
+                                                                    <button type='submit' className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Sign up'}</button>
+                                                                </div>
+                                                            </>
+                                                            :
+                                                            <div className='col-12'>
+                                                                <div className="rounded-2 d-flex flex-column justify-content-between align-items-center" style={{height: '200px', backgroundColor: '#F2FAF7'}}>
+                                                                    <h4 className='p-4 text-black'>Check your email to continue.</h4>
+                                                                    <Link to={siteLinks.login} className='p-2 text-primary' style={{color: '#6FCAEF'}}>Home</Link>
+                                                                </div>
                                                            </div>
+                                                        }
+                                                        
+                                                        <div className="col-12 mt-3">
+                                                            <p>Already have an account ?<Link to={siteLinks.login}> Sign In</Link></p>
                                                        </div>
-                                                    }
-                                                    
-                                                    <div className="col-12 mt-3">
-                                                        <p>Already have an account ?<Link to={siteLinks.login}> Sign In</Link></p>
                                                    </div>
-                                                </div>
-                                            </Form>
-                                        );
-                                        }}
-                                    </Formik>
-                                </div>
-                            </div>
-                        </div>
-                            <div className="signup-bg col-sm-6 col-xxl-9 col-lg-7 b-gradient o-hidden order-1 order-sm-2">
-                                <div className="row align-items-center h-100">
-                                    <div className="col-7 mx-auto ">
-                                        {/* <img className="img-fluid" src={LoginImg} alt="" /> */}
+                                                </Form>
+                                            );
+                                            }}
+                                        </Formik>
                                    </div>
                                </div>
                            </div>
+                            {/* <div className="signup-bg col-sm-6 col-xxl-9 col-lg-7 b-gradient o-hidden order-1 order-sm-2">
+                                <div className="row align-items-center h-100">
+                                    <div className="col-7 mx-auto ">
+                                        <img className="img-fluid" src={LoginImg} alt="" />
+                                    </div>
+                                </div>
+                            </div> */}
                        </div>
                    </div>
                </div>
@@ -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 />
+        }
+    </>
+  )
+}
@@ -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')){
@@ -1,8 +1,13 @@
-import React, { useCallback, useState } from "react";
+import React, { useCallback, useEffect, useState } from "react";
+import { useMutation, useQuery } from '@tanstack/react-query'
+
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 import EventCalendar from "./EventCalendar";
 import ExternalDraggable from "./ExternalDraggable";

+import { getCalendarEvents } from '../../services/services'
+import queryKeys from '../../services/queryKeys'
+

 export default function Calendar(){

@@ -11,14 +16,46 @@ export default function Calendar(){
    //     setDraggedEvent(event)
    // }

-    const events = [
-        {id: '1111', title: 'Family Vacation', color: 'fc-event-primary', start: new Date('2025-01-18')},
-        {id: '2222', title: 'Meeting In Office', color: 'fc-event-warning', start: new Date('2025-01-19')},
-        {id: '3333', title: 'Client Call', color: 'fc-event-danger', start: new Date('2025-01-22')},
-        {id: '4444', title: 'Interview', color: 'fc-event-success', start: new Date('2025-01-1')}
-    ]
+    // const {data, isFetching, isError, error} = useQuery({
+    //     queryKey: queryKeys.calendar_events,
+    //     queryFn: () => getCalendarEvents()
+    // })

-    const [dummyEvents, setDummyEvents] = useState(events)
+    // 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(reqData)
+    })
+
+    const receievedEvents = data?.data
+    const category = receievedEvents?.category  //EVENT CATEGORIES FROM API
+    const eventList = receievedEvents?.list //EVENT LIST FROM API
+
+    const [activeCategory, setActiveCategory] = useState('1')

    const [removeAfterDrop, setRemoveAfterDrop] = useState(false)

@@ -33,11 +70,14 @@ export default function Calendar(){
    const handleAddNewEvent = () => {
        if(newEvent.title && newEvent.color){
            const eventToAdd = {...newEvent}
-            setDummyEvents(prev => ([...prev, eventToAdd]))
+            // setDefaultCategory(prev => ([...prev, eventToAdd]))
            setNewEvent({title: '', color: ''})
        }
    }

+    const handleActiveCategory = (id) => {
+        setActiveCategory(id)
+    }

    return(
        <>
@@ -52,42 +92,87 @@ export default function Calendar(){
                        </div>
                        <div className="card-body">
                            <div className="row">
-                                <div className="col-xl-3">
-                                    <div id="external-events">
+                            {isFetching ? 
+                                <>
+                                    <div className="col-12">
+                                        <p className='text-mute'>Loading...</p>
+                                    </div>
+                                </>
+                                : isError ?
+                                <div className="col-12">
+                                    <p className='text-danger'>{error?.message}</p>
+                                </div>
+                                :
+                                <>
+                                    <div className="col-xl-3">
+                                       
                                        {/* <button className="btn btn-primary btn-block" data-bs-toggle="modal" data-bs-target="#eventModal">
                                            Add New Event
                                        </button>
                                        <p className="mt-3">
                                            Drag and drop your event or click in the calendar.
                                        </p> */}
-                                        {/* {dummyEvents.map((item, index) => (
-                                            <div key={index} className={`fc-event ${item.color}`} data-color={`${item.color}`} 
-                                                draggable="true"
-                                                onDragStart={() =>
-                                                handleDragStart({...item})
-                                                }
-                                            >
-                                                <span></span> {item.title}
-                                            </div>
-                                        ))} */}
-                                        <ExternalDraggable dummyEvents={dummyEvents} />
+
+                                        {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 (
+                                                // <div key={index} className={`fc-event ${color}`} data-color={`${color}`} 
+                                                //     // draggable={false}
+                                                //     // onDragStart={() =>
+                                                //     // handleDragStart({...item})
+                                                //     // }
+                                                // >
+                                                //     <span>{item.description}</span>
+                                                // </div>
+
+                                                // <div key={index} className={`form-check ${color}`}>
+                                                //     <input className="form-check-input" type="radio" value={item.cid}
+                                                //         id={item.cid} name='category' checked={item.cid == activeCategory} onChange={() => handleActiveCategory(item.cid)} />
+                                                //         <label className={`w-100 form-check-label`} htmlFor={item.cid}>
+                                                //         {item.description}
+                                                //         </label>
+                                                // </div>
+
+                                                <div key={index} className={`form-check ${color}`} onClick={() => handleActiveCategory(item.cid)} style={{cursor: 'pointer'}}>
+                                                    <div>
+                                                        <span className="nav align-items-center">
+                                                            <span>
+                                                                <i className={`fa fa-circle-o pr-4 ${item.cid == activeCategory ? circleColor : 'text-light'}`}></i>
+                                                            </span>
+                                                        <span>
+                                                            <span>{item?.description}</span>
+                                                        </span>
+                                                        </span>
+                                                    </div>
+                                                </div>
+                                            )
+                                        }
+                                        )}
+
+                                        {/* <div id="external-events">
+                                            <ExternalDraggable category={category} />
+                                        </div> */}
+
                                        {/* <div className="form-check">
                                            <input className="form-check-input" type="checkbox" value={removeAfterDrop}
-                                                   id="defaultCheck1" onChange={() => setRemoveAfterDrop(prev => !prev)} />
+                                                id="defaultCheck1" onChange={() => setRemoveAfterDrop(prev => !prev)} />
                                                <label className="form-check-label" htmlFor="defaultCheck1">
                                                    Remove After Drop
                                                </label>
                                        </div> */}
                                    </div>
-                                </div>
-                                <div className="col-xl-9">
-                                    <div className="event-calendar">
-                                        <EventCalendar 
-                                            removeAfterDrop={removeAfterDrop} 
-                                            setDummyEvents={setDummyEvents} 
-                                        />
+                                    <div className="col-xl-9">
+                                        <div className="event-calendar">
+                                            <EventCalendar 
+                                                removeAfterDrop={removeAfterDrop} 
+                                                eventList={eventList}
+                                                activeCategory={activeCategory}
+                                            />
+                                        </div>
                                    </div>
-                                </div>
+                                </>
+                            }
                            </div>

                        </div>
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { formatDate } from '@fullcalendar/core';
 import FullCalendar from '@fullcalendar/react';
 import dayGridPlugin from '@fullcalendar/daygrid';
@@ -6,9 +6,9 @@ import timeGridPlugin from '@fullcalendar/timegrid';
 import interactionPlugin from '@fullcalendar/interaction';
 import { INITIAL_EVENTS, createEventId } from './event-utils';

-export default function EventCalendar({draggedEvent, setDraggedEvent, removeAfterDrop, setDummyEvents}) {
+export default function EventCalendar({removeAfterDrop, eventList, activeCategory}) {
  const [weekendsVisible, setWeekendsVisible] = useState(true);
-  const [currentEvents, setCurrentEvents] = useState(INITIAL_EVENTS);
+  const [currentEvents, setCurrentEvents] = useState([]);

  function handleWeekendsToggle() {
    setWeekendsVisible(!weekendsVisible);
@@ -51,9 +51,9 @@ export default function EventCalendar({draggedEvent, setDraggedEvent, removeAfte
                ...event
            }
            setCurrentEvents(prev => ([...prev, newEvent]))
-            if(removeAfterDrop){
-              setDummyEvents(prev => prev.filter(item => item.title != newEvent.title))
-            }
+            // if(removeAfterDrop){
+            //   setDummyEvents(prev => prev.filter(item => item.title != newEvent.title))
+            // }
        }
  }

@@ -78,13 +78,20 @@ export default function EventCalendar({draggedEvent, setDraggedEvent, removeAfte
    // setCurrentEvents(events);
  }

+  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)
+    setCurrentEvents(newEventList)
+  },[activeCategory])
+
  return (
    <div className="demo-app">
      <div className="demo-app-main">
        <FullCalendar
          plugins={[dayGridPlugin, timeGridPlugin, interactionPlugin]}
          headerToolbar={{
-            left: 'prev next today',
+            left: 'prev,next,today',
            center: 'title',
            right: 'dayGridMonth,timeGridWeek,timeGridDay',
          }}         
@@ -96,17 +103,18 @@ export default function EventCalendar({draggedEvent, setDraggedEvent, removeAfte
          weekends={weekendsVisible}
        //   initialEvents={INITIAL_EVENTS} // alternatively, use the `events` setting to fetch from a feed
          events={currentEvents}
-          select={handleDateSelect}
          eventContent={renderEventContent} // custom render function
-          // eventClick={handleEventClick}
          eventsSet={handleEvents} // called after events are initialized/added/changed/removed
+          // select={handleDateSelect}
+          // eventClick={handleEventClick}
          /* you can update a remote database when these fire:
          eventAdd={function(){}}
          eventChange={function(){}}
          eventRemove={function(){}}
          */

-          eventRemove={removeEvent}
+          // eventBackgroundColor='purple'
+          // eventRemove={removeEvent}
          droppable= {true} // this allows things to be dropped onto the calendar
          drop={onDrop}
        />
@@ -1,9 +1,16 @@
 import React, { useEffect, useRef } from "react";
 import { Draggable } from "@fullcalendar/interaction";

-const ExternalDraggable = ({dummyEvents}) => {
+const ExternalDraggable = ({category}) => {
  const eventContainerRef = useRef(null);

+  const events = [
+    {id: '1111', title: 'Family Vacation', color: 'fc-event-primary', start: new Date('2025-01-18')},
+    {id: '2222', title: 'Meeting In Office', color: 'fc-event-warning', start: new Date('2025-01-19')},
+    {id: '3333', title: 'Client Call', color: 'fc-event-danger', start: new Date('2025-01-22')},
+    {id: '4444', title: 'Interview', color: 'fc-event-success', start: new Date('2025-01-1')}
+]
+
  useEffect(() => {
    // Make the external events draggable
    const draggable = new Draggable(eventContainerRef.current, {
@@ -21,11 +28,15 @@ const ExternalDraggable = ({dummyEvents}) => {

  return (
    <div ref={eventContainerRef} className="external-events">
-      {dummyEvents.map((item, index) => (
-          <div key={index} className={`fc-event ${item.color}`} data-color={`${item.color}`} >
-              {item.title}
-          </div>
-      ))}
+      {category && category.map((item, index) => {
+        let color = index % 4 === 0 ? 'fc-event-success' : index % 3 === 0 ? 'fc-event-danger' : index % 2 === 0 ? 'fc-event-warning' : 'fc-event-primary'
+        return (
+            <div key={item?.cid || index} className={`fc-event ${color}`} data-color={`${color}`} >
+                {item.description}
+            </div>
+        )
+      } 
+      )}
    </div>
  );
 };
@@ -2,19 +2,19 @@ let eventGuid = 0;
 let todayStr = new Date().toISOString().replace(/T.*$/, ''); // YYYY-MM-DD of today

 export const INITIAL_EVENTS = [
-  // {
-  //   id: createEventId(),
-  //   title: 'All-day event',
-  //   start: new Date('2025-01-19'),
-  //   end: new Date('2025-01-20'),
-  //   // color: 'blue'
-  // },
-  // {
-  //   id: createEventId(),
-  //   title: 'Timed event',
-  //   start: todayStr + 'T12:00:00',
-  //   // color: 'red'
-  // },
+  {
+    id: createEventId(),
+    title: 'All-day event',
+    start: new Date('2025-01-19'),
+    end: new Date('2025-01-20'),
+    // color: 'blue'
+  },
+  {
+    id: createEventId(),
+    title: 'Timed event',
+    start: todayStr + 'T12:00:00',
+    // color: 'red'
+  },
 ];

 export function createEventId() {
@@ -18,7 +18,7 @@ export default function Comments(){
                                        <div className="row justify-content-center">
                                            <div className="col-12">
                                                <div className="text-center mail-sidebar-title px-4">
-                                                    <a href="javascript:void(0)" className="btn btn-primary btn-block py-3 font-weight-bold font-18">className= <i className="fa fa-plus pl-2"></i></a>
+                                                    <a href="javascript:void(0)" className="btn btn-primary btn-block py-3 font-weight-bold font-18"><i className="fa fa-plus pl-2"></i></a>
                                                </div>
                                            </div>
                                            <div className="col-12">
@@ -1,354 +1,300 @@
-import React from "react";
+"use client"
+import React, { useEffect, useState } from "react";
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 import getImage from "../../utils/getImage";
+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 [activeCategoryUID, setActiveCategoryUID] = useState('0') // HOLDS VALUE OF THE ACTIVE CATEGORY
+
+    const [activeContactUID, setActiveContactUID] = useState('')
+    const [activeDetail, setActiveDetail] = useState([])
+
+    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)
+        let detail = contactsData.filter(item => item.uid == uid)
+        setActiveDetail(detail)
+    }
+
+    const changeActiveCategoryUID = (id) => {
+        let filteredConData = []
+        setActiveCategoryUID(id)
+        if(id == '0'){
+            filteredConData = contactsData
+        }else{
+            filteredConData = contactsData.filter(item => item.category == id)
+        }
+        setFiltererdContactData(filteredConData)
+        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']} />
-            <div className="row">
-                {/*<div className="vh-100 col-12 flex align-items-center">Coming Soon</div>*/}
-                <div className="col-12">
-                    <div className="card card-statistics mail-contant">
-                        <div className="card-body p-0">
-                            <div className="row no-gutters">
-                                <div className="col-md-4 col-xxl-2 col-md-4">
-                                    <div className="mail-sidebar">
-                                        <div className="row justify-content-center">
-                                            <div className="col-12">
-                                                <div className="text-center mail-sidebar-title px-4">
-                                                    <a href="javascript:void(0)" className="btn btn-primary btn-block py-3 font-weight-bold font-18">className= <i className="fa fa-plus pl-2"></i></a>
+            {getContactData?.isPending ? 
+                <>
+                    <div className="row">
+                        <div className="col-12">
+                            <p className='text-mute'>Loading...</p>
+                        </div>
+                    </div>
+                </>
+                : getContactData?.error ?
+                <div className="row">
+                    <div className="col-12">
+                        <p className='text-danger'>{getContactData?.error?.message}</p>
+                    </div>
+                </div>
+                :
+                <div className="row">
+                    {/*<div className="vh-100 col-12 flex align-items-center">Coming Soon</div>*/}
+                    <div className="col-12">
+                        <div className="card card-statistics mail-contant">
+                            <div className="card-body p-0">
+                                <div className="row no-gutters">
+                                    <div className="col-md-4 col-xxl-2 col-md-4">
+                                        <div className="mail-sidebar">
+                                            <div className="row justify-content-center">
+                                                <div className="d-none col-12">
+                                                    <div className="text-center mail-sidebar-title px-4">
+                                                        <a href="#" className="btn btn-primary btn-block py-3 font-weight-bold font-18"><i className="fa fa-plus pl-2"></i></a>
+                                                    </div>
                                                </div>
-                                            </div>
-                                            <div className="col-12">
-                                                <div className="px-4 py-4">
-                                                    <ul className="pl-0">
-                                                        <li className="py-2">
-                                                            <a href="javascript:void(0)">
-                                                                            <span className="nav align-items-center">
-                                                                                        <span>
-                                                                                            <i className="fa fa-envelope-o text-primary pr-4"></i>
-                                                                                        </span>
-                                                                            <span>
-                                                                                            <span>Inbox</span>
-                                                                            </span>
-                                                                            <span className="nav-item ml-auto text-right">
-                                                                                             <span className="badge badge-pill badge-primary float-right">0+</span>
-                                                                            </span>
-                                                                            </span>
-                                                            </a>
-                                                        </li>
-                                                        <li className="py-2">
-                                                            <a href="javascript:void(0)">
-                                                                            <span className="nav align-items-center">
-                                                                                        <span>
-                                                                                            <i className="fa fa-paper-plane-o pr-4"></i>
-                                                                                        </span>
-                                                                            <span>
-                                                                                            <span>Replied Mail</span>
-                                                                            </span>
-                                                                            </span>
-                                                            </a>
-                                                        </li>
-
-                                                    </ul>
-                                                    <ul className="pl-0 mt-5">
-                                                        <li className="py-2">
-                                                            <a href="javascript:void(0)">
-                                                                            <span className="nav align-items-center">
-                                                                                        <span>
-                                                                                            <i className="fa fa-circle-o text-danger pr-4"></i>
-                                                                                        </span>
-                                                                            <span>
-                                                                                            <span>Personal</span>
-                                                                            </span>
-                                                                            </span>
-                                                            </a>
-                                                        </li>
-                                                        <li className="py-2">
-                                                            <a href="javascript:void(0)">
-                                                                            <span className="nav align-items-center">
-                                                                                        <span>
-                                                                                            <i className="fa fa-circle-o pr-4 text-warning"></i>
-                                                                                        </span>
-                                                                            <span>
-                                                                                            <span>Work</span>
-                                                                            </span>
-                                                                            </span>
-                                                            </a>
-                                                        </li>
-                                                        <li className="py-2">
-                                                            <a href="javascript:void(0)">
-                                                                            <span className="nav align-items-center">
-                                                                                        <span>
-                                                                                            <i className="fa fa-plus pr-4"></i>
-                                                                                        </span>
-                                                                            <span>
-                                                                                            <span>Add Category</span>
-                                                                            </span>
-                                                                            </span>
-                                                            </a>
-                                                        </li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div className="col-md-8  col-xxl-4 border-md-t">
-                                    <div className="mail-content  border-right border-n h-100">
-                                        <div className="mail-search border-bottom">
-                                            <div className="row align-items-center mx-0">
                                                <div className="col-12">
-                                                    {/*<div className="form-group pt-3">*/}
-                                                    {/*    <input type="text" className="form-control" id="search" placeholder="Search.." />*/}
-                                                    {/*        <i className="fa fa-search"></i>*/}
-                                                    {/*</div>*/}
+                                                    <div className="px-4 py-4">
+                                                        <ul className="pl-0">
+                                                            <li className="py-2">
+                                                                <a href="#">
+                                                                                <span className="nav align-items-center">
+                                                                                            <span>
+                                                                                                <i className="fa fa-envelope-o text-primary pr-4"></i>
+                                                                                            </span>
+                                                                                <span>
+                                                                                                <span>Inbox</span>
+                                                                                </span>
+                                                                                <span className="nav-item ml-auto text-right">
+                                                                                                <span className="badge badge-pill badge-primary float-right">{contactsData?.length}</span>
+                                                                                </span>
+                                                                                </span>
+                                                                </a>
+                                                            </li>
+                                                            <li className="py-2">
+                                                                <a href="#">
+                                                                                <span className="nav align-items-center">
+                                                                                            <span>
+                                                                                                <i className="fa fa-paper-plane-o pr-4"></i>
+                                                                                            </span>
+                                                                                <span>
+                                                                                                <span>Replied Mail</span>
+                                                                                </span>
+                                                                                </span>
+                                                                </a>
+                                                            </li>
+
+                                                        </ul>
+
+                                                        <ul className="pl-0 mt-5">
+                                                            <li className="py-2" onClick={()=>changeActiveCategoryUID('0')} style={{cursor: 'pointer'}}>
+                                                                    <div>
+                                                                        <span className="nav align-items-center">
+                                                                            <span>
+                                                                                <i className={`fa fa-circle-o pr-4 ${activeCategoryUID == '0' ? 'text-primary' : 'text-warning'}`}></i>
+                                                                            </span>
+                                                                        <span>
+                                                                            <span>All</span>
+                                                                        </span>
+                                                                        </span>
+                                                                    </div>
+                                                                </li>
+                                                            {contactsCategory && contactsCategory.map(item => (
+                                                                <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 == `A00000${item?.cid}` ? 'text-primary' : 'text-warning'}`}></i>
+                                                                            </span>
+                                                                        <span>
+                                                                            <span>{item?.description}</span>
+                                                                        </span>
+                                                                        </span>
+                                                                    </div>
+                                                                </li>
+                                                            ))}
+                                                            {/* <li className="py-2">
+                                                                <a href="#">
+                                                                                <span className="nav align-items-center">
+                                                                                            <span>
+                                                                                                <i className="fa fa-circle-o pr-4 text-warning"></i>
+                                                                                            </span>
+                                                                                <span>
+                                                                                                <span>Work</span>
+                                                                                </span>
+                                                                                </span>
+                                                                </a>
+                                                            </li>
+                                                            <li className="py-2">
+                                                                <a href="#">
+                                                                                <span className="nav align-items-center">
+                                                                                            <span>
+                                                                                                <i className="fa fa-plus pr-4"></i>
+                                                                                            </span>
+                                                                                <span>
+                                                                                                <span>Add Category</span>
+                                                                                </span>
+                                                                                </span>
+                                                                </a>
+                                                            </li> */}
+                                                        </ul>
+                                                    </div>
                                                </div>
                                            </div>
                                        </div>
-                                        <div className="mail-msg scrollbar scroll_dark">
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img src={getImage("avtar/01.jpg")} className="img-fluid" alt="user" />
-                                                            </div>
-                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>Martin smith</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">Saas Designer</h5>
-                                                            <p>Since there is not an "all the above" category, I'll take the opportunity to enthusiastically congratulate you on the very high quality.</p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
+                                    </div>
+                                    <div className="col-md-8  col-xxl-4 border-md-t">
+                                        <div className="mail-content  border-right border-n h-100">
+                                            <div className="mail-search border-bottom">
+                                                <div className="row align-items-center mx-0">
+                                                    <div className="col-12">
+                                                        {/*<div className="form-group pt-3">*/}
+                                                        {/*    <input type="text" className="form-control" id="search" placeholder="Search.." />*/}
+                                                        {/*        <i className="fa fa-search"></i>*/}
+                                                        {/*</div>*/}
                                                    </div>
-                                                </a>
+                                                </div>
                                            </div>
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img  src={getImage("avtar/02.jpg")}  className="img-fluid" alt="user" />
-                                                            </div>
+                                            <div className="mail-msg scrollbar scroll_dark">
+                                                {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'}`}>
+                                                            <a href="#">
+                                                                <div className="media align-items-center">
+                                                                    <div className="mr-3">
+                                                                        <div className="bg-img">
+                                                                            <img src={getImage("avtar/01.jpg")} className="img-fluid" alt="user" />
+                                                                        </div>
+                                                                    </div>
+                                                                    <div className="w-100">
+                                                                        <div className="mail-msg-item-titel justify-content-between">
+                                                                            <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>
+                                                                        </div>
+                                                                        <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()}
+                                                                            {/* {getCustomTime(contact.added)} */}
+                                                                            </span>
+                                                                        </p>
+                                                                    </div>
+                                                                </div>
+                                                            </a>
                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>DutcaPatrick</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">Mobile app Designer </h5>
-                                                            <p>Very nice template, lots of pages and good documentation.</p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </div>
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img  src={getImage("avtar/03.jpg")}  className="img-fluid" alt="user" />
-                                                            </div>
-                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>m_morsch</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">Landing page Designer</h5>
-                                                            <p>Excellent and at a great price... thank you very much!</p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </div>
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img  src={getImage("avtar/04.jpg")}  className="img-fluid" alt="user" />
-                                                            </div>
-                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>AnnaHorno</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">Re-Design ios app</h5>
-                                                            <p>Solved my theme problem in 10 minutes. We thank you.</p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </div>
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img  src={getImage("avtar/05.jpg")}  className="img-fluid" alt="user" />
-                                                            </div>
-                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>Wdcorbitt</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">Mobil UX/UI Designer</h5>
-                                                            <p>Asked for information and received it EXTREMELY quickly. Great layout - good code - great price! </p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </div>
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img  src={getImage("avtar/06.jpg")}  className="img-fluid" alt="user" />
-                                                            </div>
-                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>Anne Smith</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">Jobly Opportunity</h5>
-                                                            <p>Mentor has so many features and layouts. Its a great choice.</p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </div>
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img  src={getImage("avtar/07.jpg")}  className="img-fluid" alt="user" />
-                                                            </div>
-                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>Paul Flavius</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">Saas Designer</h5>
-                                                            <p>There are many people in the world with amazing talents who realize only a small percentage of their potential. </p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </div>
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img src="assets/img/avtar/08.jpg" className="img-fluid" alt="user" />
-                                                            </div>
-                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>Sara Lisbon</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">UI Designer</h5>
-                                                            <p>We can look a bit further back in time to Albert Einstein or even further back to Abraham Lincoln.</p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </div>
-                                            <div className="mail-msg-item">
-                                                <a href="javascript:void(0)">
-                                                    <div className="media align-items-center">
-                                                        <div className="mr-3">
-                                                            <div className="bg-img">
-                                                                <img src="assets/img/avtar/09.jpg" className="img-fluid" alt="user" />
-                                                            </div>
-                                                        </div>
-                                                        <div className="w-100">
-                                                            <div className="mail-msg-item-titel justify-content-between">
-                                                                <p>Annahorno</p>
-                                                                <p className="d-none d-xl-block">06:59 <span> PM </span></p>
-                                                            </div>
-                                                            <h5 className="mb-0 my-2">Saas Designer</h5>
-                                                            <p>One of the most difficult aspects of achieving success is staying motivated over the long haul.</p>
-                                                            <p className="d-xl-none">06:59 <span> PM </span></p>
-                                                        </div>
-                                                    </div>
-                                                </a>
+                                                    )
+                                                })}
                                            </div>
                                        </div>
                                    </div>
-                                </div>
-                                <div className="col-xxl-6 border-t border-xxl-t">
-                                    <div className="mail-chat py-5 px-5">
-                                        <div className="media align-items-center">
-                                            <div className="bg-img mr-3">
-                                                <img  src={getImage("avtar/03.jpg")}  className="img-fluid" alt="user" />
-                                            </div>
-                                            <div>
-                                                <h4 className="mb-0">Dutca Patrick</h4>
-                                                <p>30 Min ago</p>
-                                            </div>
-                                        </div>
-                                        <div className="mt-4 d-flex justify-content-between">
-                                            <div>
-                                                <h3>Landing page Designer...</h3>
-                                            </div>
-                                            <div className="d-flex">
-                                                {/*<a href="javascript:void(0)"><i className="fa fa-reply font-22 pr-3"></i></a>*/}
-                                                {/*<a href="javascript:void(0)"><i className="fa fa-print font-22"></i></a>*/}
-                                            </div>
-                                        </div>
-                                        <div>
-                                            <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>
-                                            <p>We know this in our gut, but what can we do about it? How can we motivate ourselves? One of the most difficult aspects of achieving success is staying motivated over the long haul.</p>
-                                            {/*<div className="my-5">*/}
-                                            {/*    <p>Have lovely Day,</p>*/}
-                                            {/*    <p>adminjon</p>*/}
-                                            {/*</div>*/}
-                                        </div>
-                                    </div>
+                                    <div className="col-xxl-6 border-t border-xxl-t">

-                                    <div className="bg-light mail-f px-4 py-3">
-                                        <div className="py-2 bg-white px-4 py-3 d-flex justify-content-between">
-                                            <p>Click here to <a href="#editer" data-toggle="collapse" className="text-primary px-1">Reply</a>or<a href="#forward" data-toggle="collapse" className="text-primary px-1">Forward</a></p>
-                                            <a href="javascript:void(0)" className="text-primary"><i className="fa fa-microphone"></i></a>
-                                        </div>
-                                        <div className="collapse" id="editer">
-                                            <div className="form-group">
-                                                <textarea className="form-control mt-3" id="exampleFormControlTextarea1" rows="3" placeholder="Type here..."></textarea>
+                                        <div className="mail-chat py-5 px-5">
+                                            <div className="media align-items-center">
+                                                <div className="bg-img mr-3">
+                                                    <img  src={getImage("avtar/03.jpg")}  className="img-fluid" alt="user" />
+                                                </div>
+                                                <div>
+                                                    <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>
-                                        <div className="collapse" id="forward">
-                                            <div className="form-group">
-                                                <input className="form-control mt-3" id="exampleFormControl" placeholder="Email Address" />
-                                            </div>
-                                        </div>
-                                        <div className="d-flex align-items-center justify-content-between py-2">
-                                            <div>
-                                                {/*<ul className="nav">*/}
-                                                {/*    <li className="nav-item pr-3"><a href="javascript:void(0)"><i className="ti ti-clip font-20"></i></a></li>*/}
-                                                {/*    <li className="nav-item pr-3"><a href="javascript:void(0)"><i className="ti ti-face-smile font-20"></i></a></li>*/}
-                                                {/*    <li className="nav-item"><a href="javascript:void(0)"><i className="ti ti-gallery font-20"></i></a></li>*/}
-                                                {/*</ul>*/}
+                                            <div className="mt-4 d-flex justify-content-between">
+                                                <div>
+                                                    <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>*/}
+                                                    {/*<a href="javascript:void(0)"><i className="fa fa-print font-22"></i></a>*/}
+                                                </div>
                                            </div>
                                            <div>
-                                                {/*<a href="javascript:void(0)" className="btn btn-primary"><span>Send</span> <i className="fa fa-paper-plane"></i></a>*/}
+                                                <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>
+                                                <p>We know this in our gut, but what can we do about it? How can we motivate ourselves? One of the most difficult aspects of achieving success is staying motivated over the long haul.</p> */}
+                                                {/*<div className="my-5">*/}
+                                                {/*    <p>Have lovely Day,</p>*/}
+                                                {/*    <p>adminjon</p>*/}
+                                                {/*</div>*/}
+                                            </div>
+                                        </div>
+
+                                        <div className="bg-light mail-f px-4 py-3">
+                                            <div className="py-2 bg-white px-4 py-3 d-flex justify-content-between">
+                                                <p>Click here to <a href="#editer" data-toggle="collapse" className="text-primary px-1">Reply</a>or<a href="#forward" data-toggle="collapse" className="text-primary px-1">Forward</a></p>
+                                                <a href="#" className="text-primary"><i className="fa fa-microphone"></i></a>
+                                            </div>
+                                            <div className="collapse" id="editer">
+                                                <div className="form-group">
+                                                    <textarea className="form-control mt-3" id="exampleFormControlTextarea1" rows="3" placeholder="Type here..."></textarea>
+                                                </div>
+                                            </div>
+                                            <div className="collapse" id="forward">
+                                                <div className="form-group">
+                                                    <input className="form-control mt-3" id="exampleFormControl" placeholder="Email Address" />
+                                                </div>
+                                            </div>
+                                            <div className="d-flex align-items-center justify-content-between py-2">
+                                                <div>
+                                                    {/*<ul className="nav">*/}
+                                                    {/*    <li className="nav-item pr-3"><a href="javascript:void(0)"><i className="ti ti-clip font-20"></i></a></li>*/}
+                                                    {/*    <li className="nav-item pr-3"><a href="javascript:void(0)"><i className="ti ti-face-smile font-20"></i></a></li>*/}
+                                                    {/*    <li className="nav-item"><a href="javascript:void(0)"><i className="ti ti-gallery font-20"></i></a></li>*/}
+                                                    {/*</ul>*/}
+                                                </div>
+                                                <div>
+                                                    {/*<a href="javascript:void(0)" className="btn btn-primary"><span>Send</span> <i className="fa fa-paper-plane"></i></a>*/}
+                                                </div>
                                            </div>
                                        </div>
                                    </div>
@@ -357,7 +303,7 @@ export default function Contacts(){
                        </div>
                    </div>
                </div>
-            </div>
+            }
        </>
    )
 }
@@ -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>
+
+        </>
+    )
+}
@@ -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>
                :
@@ -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>
@@ -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">
@@ -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>
+            )
+        })}
+        </>
+        }
+    </>
+  )
+}
@@ -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>
@@ -1,6 +1,6 @@
 import React from "react";
 import getImage from "../../../utils/getImage";
-import { useNavigate } from "react-router-dom";
+import { Link, useNavigate } from "react-router-dom";
 import { useSelector } from "react-redux";
 import siteLinks from "../../../links/siteLinks";

@@ -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
@@ -83,31 +83,35 @@ export default function UserHeader(){
                                        </div>
                                    </div>
                                    <div className="p-4">
-                                        <a className="dropdown-item d-flex nav-link" href="#">
-                                            <i className="fa fa-user pr-2 text-success"></i> Profile</a>
-                                        <a className="dropdown-item d-flex nav-link" href="#">
-                                            <i className="fa fa-envelope pr-2 text-primary"></i> Inbox
+                                        <Link className="dropdown-item d-flex nav-link" to={siteLinks.user}>
+                                            <i className="fa fa-user pr-2 text-success"></i> Users</Link>
+                                        <Link className="dropdown-item d-flex nav-link" to={siteLinks.contacts}>
+                                            <i className="fa fa-envelope pr-2 text-primary"></i> Contacts
                                            <span className="badge badge-primary ml-auto">6</span>
-                                        </a>
-                                        <a className="dropdown-item d-flex nav-link" href="#">
+                                        </Link>
+                                        <Link className="dropdown-item d-flex nav-link" to={siteLinks.settings}>
                                            <i className=" ti ti-settings pr-2 text-info"></i> Settings
-                                        </a>
-                                        <a className="dropdown-item d-flex nav-link" href="#">
-                                            <i className="fa fa-compass pr-2 text-warning"></i> Need help?</a>
-                                        <div className="row mt-2">
-                                            <div className="col">
-                                                <a className="bg-light p-3 text-center d-block" href="#">
-                                                    <i className="fe fe-mail font-20 text-primary"></i>
-                                                    <span className="d-block font-13 mt-2">My messages</span>
-                                                </a>
-                                            </div>
-                                            <div className="col">
-                                                <a className="bg-light p-3 text-center d-block" href="#">
-                                                    <i className="fe fe-plus font-20 text-primary"></i>
-                                                    <span className="d-block font-13 mt-2">Compose new</span>
-                                                </a>
-                                            </div>
-                                        </div>
+                                        </Link>
+                                        <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">*/}
+                                        {/*        <a className="bg-light p-3 text-center d-block" href="#">*/}
+                                        {/*            <i className="fe fe-mail font-20 text-primary"></i>*/}
+                                        {/*            <span className="d-block font-13 mt-2">My messages</span>*/}
+                                        {/*        </a>*/}
+                                        {/*    </div>*/}
+                                        {/*    <div className="col">*/}
+                                        {/*        <a className="bg-light p-3 text-center d-block" href="#">*/}
+                                        {/*            <i className="fe fe-plus font-20 text-primary"></i>*/}
+                                        {/*            <span className="d-block font-13 mt-2">Compose new</span>*/}
+                                        {/*        </a>*/}
+                                        {/*    </div>*/}
+                                        {/*</div>*/}
+
                                    </div>
                                </div>
                            </li>
@@ -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>
                        :
@@ -12,14 +12,20 @@ export default function ProductProvision(props){
    const productTitle  = props?.productData?.title;
    const productDescription  = props?.productData?.description;
    const productID = props?.productData?.product_id
+    const productUID = props?.productData?.product_uid
    const productSubUID = props?.productData?.product_subscription_uid

+    const reqData = {
+        product_id : productID,
+        product_subscription_uid: productSubUID
+    }
+
    const {data:provision, isFetching, isError, error} = useQuery({
        queryKey: queryKeys.myproduct_provision,
-        queryFn: () => productProvision(productID)
+        queryFn: () => productProvision(reqData)
    })

-    const provisionData = provision?.data?.provision
+    const provisionData = provision?.data

    useEffect(()=>{
        joinRoom(productSubUID); // provision subscription room
@@ -54,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>
@@ -105,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>

@@ -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">
@@ -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>
@@ -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">
@@ -31,13 +31,14 @@
 .fc-event {
  border-radius: 2px;
  border: none;
-  cursor: move;
+  // cursor: move;
  font-size: 13px;
  margin: 5px 0px;
  padding: 10px 10px 10px 40px;
  text-align: left;
  position:relative;
  &:before {
+    display: none;
    content:'';
    position:absolute;
    width:15px;
@@ -49,6 +50,9 @@
    &-primary {
      @include hex-rgba($primary, 0.2);
      color:$primary;
+      & label {
+        color:$primary;
+      }
      &:before {
        @include hex-rgba($primary, 0.8);
      }
@@ -59,6 +63,9 @@
    &-warning {
      @include hex-rgba($warning, 0.2);
      color:$warning;
+      & label {
+        color:$warning;
+      }
      &:before {
        @include hex-rgba($warning, 0.8);
      }
@@ -69,6 +76,9 @@
    &-danger {
      @include hex-rgba($danger, 0.2);
      color:$danger;
+      & label {
+        color:$danger;
+      }
      &:before {
        @include hex-rgba($danger, 0.8);
      }
@@ -79,6 +89,9 @@
    &-success {
      @include hex-rgba($success, 0.2);
      color:$success;
+      & label {
+        color:$success;
+      }
      &:before {
        @include hex-rgba($success, 0.8);
      }
@@ -41,7 +41,7 @@
 }
 .mail-msg{
 	max-height: 747px;
-	overflow: hidden;
+	overflow-y: auto;
 	outline: none;
 	@include laptop {
 		max-height: 450px;
@@ -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;
+	}
 }
@@ -10,6 +10,7 @@ body {
    outline:0;
    background:$body;
    color:$muted;
+    font-weight: $font-regular;
    &.sidebar-mini {
        .app-main {
            padding-left:$sidebar-mini;
@@ -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 {
@@ -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

@@ -138,14 +138,28 @@ $event-padding: 10px;

 .fc-today-button.fc-button,
 .fc-timeGridWeek-button.fc-button-active, .fc-timeGridDay-button.fc-button-active, .fc-dayGridMonth-button.fc-button-active{
-  color: #fff!important;
+  color: #fff !important;
  border: none;
-  background-color: #8E54E9!important;
+  background-color: #8E54E9 !important;
  text-transform: capitalize !important;
 }

+.fc-h-event,
 .fc-event.fc-event-draggable.fc-event-start.fc-event-end.fc-daygrid-event,
 .fc-event.fc-event-draggable.fc-event-start.fc-event-end.fc-daygrid-event{
  padding: 10px 2px !important;
+  background-color: #3788d8 !important;
+  color: white;
 }
+
+.fc-theme-standard .fc-popover{
+  overflow-y: auto !important;
+  // height: calc(100% - 50px);
+}
+
+.fc .fc-more-popover .fc-popover-body {
+  overflow-y: auto;
+  height: 100px !important;
+}
+
 /* END OF CALENDER STYLE */
@@ -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>
 );
@@ -1,5 +1,6 @@
 const siteLinks = {
    error: '*',
+    help: '/help',
    home: '/',
    dash: '/dash',
    product: '/product/*',
@@ -1,10 +1,14 @@
 const queryKeys = {
+    user_details: ['user_details'],
+    
    dashboard: ['dashboard'],
    topBar: ['top-bar'],
    recentAction: ['recent-action'],
    product: ['product-data'],
    product_url: ['product_url'],
-    myproduct_provision: ['myproduct_provision']
+    myproduct_provision: ['myproduct_provision'],
+    calendar_events: ['calendar_events'],
+    contacts: ['contacts']
 }

 export default queryKeys
@@ -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,39 +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 DASHBOARD RECENT ACTIONS SECTION
-export const recentActions = () => {
-    return getAuxEnd(`/panel/account/actions`)
-}
-
 // FUNCTION TO GET MY PRODUCT PROVISION DATA
-export const productProvision = (productID) => {
-    const reqData = { product_id : productID}
-    return getAuxEnd(`/panel/myproduct/provision`,reqData)
+export const productProvision = (reqData) => {
+    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 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)
-}
@@ -0,0 +1,13 @@
+function getCustomTime(dateStr) {
+    let date = new Date(dateStr);
+    
+    if(isNaN(date)){
+        return '00:00'
+    }
+    const hours = date.getHours()
+    const minutes = date.getMinutes()
+
+    return `${hours}:${minutes} ${hours >= 12  ? 'PM' : 'AM'}`
+  }
+  
+    export default getCustomTime
@@ -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}`);
    }
@@ -0,0 +1,7 @@
+import HelpCom from '../component/help/HelpCom'
+
+export default function HelpPage() {
+  return (
+    <HelpCom />
+  )
+}
Author	SHA1	Message	Date
victorAnumudu	487494fbff	route bug fixed	2025-07-10 11:53:55 +01:00
victorAnumudu	919594d7b2	Merge branch 'master' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS	2025-07-10 11:08:41 +01:00
ameye	7eedae8fc2	Merge branch 'signup-payload' of MERMS/MermsPanelReactJS into master	2025-07-10 08:36:37 +00:00
victorAnumudu	51a3c60590	bug fix	2025-07-10 09:05:30 +01:00
victorAnumudu	ab597039ba	updated complete signup endpoint	2025-07-10 08:59:20 +01:00
victorAnumudu	6fd2dcdb3d	updated signup payload	2025-07-10 08:54:41 +01:00
victorAnumudu	614910e29c	updated signup payload	2025-07-10 08:52:51 +01:00
ameye	2c832699c2	Merge branch 'signup-payload' of MERMS/MermsPanelReactJS into master	2025-07-08 19:11:40 +00:00
victorAnumudu	c8fe2eadf6	removed isChecked value	2025-07-08 19:23:51 +01:00
ameye	1e174b7432	Merge branch 'provision-bug' of MERMS/MermsPanelReactJS into master	2025-07-08 15:59:27 +00:00
victorAnumudu	dda8fa7d30	fixed bug	2025-07-08 16:53:36 +01:00
ameye	d0f1d5ee34	Merge branch 'product-url' of MERMS/MermsPanelReactJS into master	2025-07-08 14:24:05 +00:00
victorAnumudu	a2843d97e2	product url fixed	2025-07-08 11:58:37 +01:00
ameye	a0e417fc68	Merge branch 'help-page' of MERMS/MermsPanelReactJS into master	2025-07-08 09:02:20 +00:00
victorAnumudu	10e65fa6ff	added dummy help page	2025-07-07 19:56:45 +01:00
ameye	f503422c42	Merge branch 'sales-text' of MERMS/MermsPanelReactJS into master	2025-07-07 15:38:13 +00:00
victorAnumudu	bd470ea8bc	added sale text	2025-07-07 12:38:21 +01:00
ameye	6c14b2587c	Merge branch 'contact-endpoint' of MERMS/MermsPanelReactJS into master	2025-07-06 22:24:27 +00:00
ameye	085756b8bc	Merge branch 'product-data-desc' of MERMS/MermsPanelReactJS into master	2025-07-06 22:24:21 +00:00
victorAnumudu	eb4d5315de	fixed product data description	2025-07-06 20:47:17 +01:00
victorAnumudu	8ac742e5d6	Merge master branch into contact-endpoint	2025-07-06 07:48:49 +01:00
victorAnumudu	c2db47cbb8	contact endpoint fixed	2025-07-06 07:46:21 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	ee787c0740	settings page	2025-07-05 12:02:13 -04:00
ameye	6136d762a3	Merge branch 'product-details-page' of MERMS/MermsPanelReactJS into master	2025-07-04 20:01:08 +00:00
victorAnumudu	2f73e84a84	fixed product details page	2025-07-04 19:43:28 +01:00
ameye	8c57e94bb6	Merge branch 'logo-update' of MERMS/MermsPanelReactJS into master	2025-07-02 23:34:16 +00:00
victorAnumudu	fa7660de29	updated site logo	2025-07-02 06:57:16 +01:00
ameye	bde30f781a	Merge branch 'font-match' of MERMS/MermsPanelReactJS into master	2025-06-30 00:29:55 +00:00
ameye	9f9dcc5e37	Merge branch 'footer-year' of MERMS/MermsPanelReactJS into master	2025-06-30 00:29:47 +00:00
victorAnumudu	ec11a7b5b3	started font matching	2025-06-29 14:43:04 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	38c5717667	register	2025-06-28 20:46:19 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	77eaf15c6a	sign up url	2025-06-28 20:38:43 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	60488524ed	new logo	2025-06-28 00:42:52 -04:00
victorAnumudu	3584447c65	fixed footer year	2025-06-27 19:48:18 +01:00
ameye	58cd232f91	Merge branch 'token-uid-payload' of MERMS/MermsPanelReactJS into master	2025-06-26 19:03:07 +00:00
victorAnumudu	9684e7fcfa	added token and uid to all endpoints	2025-06-26 17:37:11 +01:00
ameye	d4eda11477	Merge branch 'products-endpont' of MERMS/MermsPanelReactJS into master	2025-06-25 19:55:14 +00:00
victorAnumudu	1d31507984	new products endpoint added	2025-06-25 19:31:50 +01:00
ameye	a3dbc8cab1	Merge branch 'location-reload' of MERMS/MermsPanelReactJS into master	2025-06-25 13:08:28 +00:00
victorAnumudu	29878e3ddf	fix location reload error	2025-06-25 13:06:32 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	80a40da9df	dev .env	2025-06-24 15:57:41 -04:00
ameye	9f7f1b706b	Merge branch 'product-endpoint' of MERMS/MermsPanelReactJS into master	2025-06-24 16:18:58 +00:00
victorAnumudu	d878d1d098	made product endpoint a POST request	2025-06-24 17:17:36 +01:00
ameye	3a60d4e12c	Merge branch 'new-top-bar' of MERMS/MermsPanelReactJS into master	2025-06-24 15:47:48 +00:00
victorAnumudu	c03c70b07e	auth layout fix	2025-06-24 16:41:05 +01:00
victorAnumudu	9d158fe1cb	added new endpoint for top bar data	2025-06-24 16:38:42 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	ffd80d9888	New urls	2025-06-23 18:12:51 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	384da476a6	Hide real build for now	2025-06-23 16:20:55 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	3576e7f702	force all to test	2025-06-23 14:55:27 -04:00
ameye	5ed94fee53	Merge branch 'login-new-endpoint' of MERMS/MermsPanelReactJS into master	2025-06-23 18:36:13 +00:00
victorAnumudu	dbf81a4cf5	added the new login endpoint	2025-06-23 19:27:15 +01:00
Olusesan Ameye	0984d78f1e	Image registry	2025-04-22 09:25:41 +00:00
victorAnumudu	ade91c4ed8	added max input length for login username and password	2025-04-01 17:45:42 +01:00
victor.ebuka	905e783f76	Merge branch 'login-box-radius' of MERMS/MermsPanelReactJS into master	2025-01-27 18:08:15 +00:00
victorAnumudu	08665d51a7	border radius added	2025-01-27 19:05:14 +01:00
victor.ebuka	dff0bd72ed	Merge branch 'login-links-margin' of MERMS/MermsPanelReactJS into master	2025-01-27 13:58:24 +00:00
victorAnumudu	823ff83f88	added top margin to login links	2025-01-27 14:48:46 +01:00
victor.ebuka	82f0efe6e5	Merge branch 'login-page-links' of MERMS/MermsPanelReactJS into master	2025-01-26 02:07:59 +00:00
victorAnumudu	3eaf99f212	added login links and updated contact page design	2025-01-26 03:06:47 +01:00
victor.ebuka	5d93817555	Merge branch 'contact-page-api' of MERMS/MermsPanelReactJS into master	2025-01-24 20:18:33 +00:00
victorAnumudu	4505a6fbcd	contact page api added	2025-01-24 21:15:16 +01:00
victorAnumudu	4367364d4f	bug fix	2025-01-24 16:03:50 +01:00
victorAnumudu	b2b0bf8af6	label color fixed	2025-01-24 15:08:43 +01:00
victor.ebuka	fcde22d4cb	Merge branch 'calendar_filtering' of MERMS/MermsPanelReactJS into master	2025-01-24 12:40:05 +00:00
victorAnumudu	56125b427d	calendar filtering started	2025-01-24 13:38:47 +01:00
victor.ebuka	16066d030b	Merge branch 'scroll-fix' of MERMS/MermsPanelReactJS into master	2025-01-23 20:17:08 +00:00
victorAnumudu	b6c79303ae	contact scroll bar fixed	2025-01-23 21:13:29 +01:00
victor.ebuka	ada406eb3f	Merge branch 'promotion-api-query-update' of MERMS/MermsPanelReactJS into master	2025-01-23 17:24:18 +00:00
victorAnumudu	9479be61f1	header link fixed	2025-01-23 18:22:50 +01:00
victorAnumudu	9c8405cf1c	Merge master into promotion-api-query-update	2025-01-23 18:18:52 +01:00
victorAnumudu	92ddea329d	product subscription uid added	2025-01-23 18:18:00 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	a79ab63163	Removed waste	2025-01-23 11:20:25 -05:00
victor.ebuka	d7fce908cc	Merge branch 'calendar-api' of MERMS/MermsPanelReactJS into master	2025-01-21 20:16:54 +00:00
victorAnumudu	1708cb893f	started calendar api integration	2025-01-21 21:14:03 +01:00
ameye	7ec139c5ad	Merge branch 'auth-page-centralized' of MERMS/MermsPanelReactJS into master	2025-01-20 18:35:46 +00:00
ameye	03d395560a	Merge branch 'section-removal' of MERMS/MermsPanelReactJS into master	2025-01-20 18:35:41 +00:00
victorAnumudu	fa234a7fae	auth page centralized	2025-01-20 18:46:36 +01:00