added refresh message display

src/App.css

@@ -14,6 +14,10 @@
   border-radius: 10px;
 }
 
+.border-radius-10 {
+  border-radius: 10px;
+}
+
 .login-links{
   margin-top: 50px;
   display: flex;

src/AppRouters.jsx

@@ -24,6 +24,8 @@ import OnboardPage from "./views/OnboardPage";
 import AccPWDResetPage from './views/AccPWDResetPage';
 import ProfileCompletePage from './views/ProfileCompletePage';
 import SubscribePage from './views/Subscribe'
+import StartPage from "./views/StartPage";
+import TrafficPage from "./views/TrafficPage";
 
 function AppRouters() {
     return (
@@ -44,7 +46,9 @@ function AppRouters() {
                     {/* protected routes */}
                     <Route element={<SocketIOContextProvider/>}>
                         <Route element={<UserExist/>}>
+                            <Route path={siteLinks.start} element={<StartPage/>}/>
                             <Route path={siteLinks.dash} element={<HomePage/>}/>
+                            <Route path={siteLinks.traffic} element={<TrafficPage/>}/>
                             <Route path={siteLinks.profile_complete} element={<ProfileCompletePage/>}/>
                             <Route path={siteLinks.product} element={<ProductPage/>}/>
                             <Route path={siteLinks.reports} element={<ReportsPage/>}/>

src/component/auth/CSignup.jsx

@@ -66,7 +66,7 @@ export default function CSignup() {
         localStorage.setItem('room', room)
         localStorage.setItem('uid', uid)
         dispatch(updateUserDetails({ ...res?.data }));
-        navigate('/dash') // later add redux to dispatch state
+        navigate(siteLinks.start, {replace: true}) // later add redux to dispatch state
     },
     // onError: (err) => {
     //     console.log('err', err)

src/component/auth/Login2.jsx

@@ -93,13 +93,13 @@ export default function Login() {
                                                 <div className="col-12">
                                                     <div className="form-group">
                                                         <label className="control-label text-black fw-bold">User Name*</label>
-                                                        <input maxLength={55} name='username' value={fields.username} onChange={handleChange} type="text" className="form-control" placeholder="Username" />
+                                                        <input maxLength={25} 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 maxLength={55} name='password' value={fields.password} onChange={handleChange} type="password" className="form-control" placeholder="Password" />
+                                                        <input maxLength={25} name='password' value={fields.password} onChange={handleChange} type="password" className="form-control" placeholder="Password" />
                                                     </div>
                                                 </div>
                                                 <div className="col-12">

src/component/auth/Signup.jsx

@@ -82,9 +82,13 @@ export default function Signup() {
                                     </button>
                                 </div>
                                 <div className="mt-3">
+                                    <hr />
                                     <p className='font-medium'>Already have an account ?
                                         <Link to={siteLinks.login}
-                                              className='hover:text-primary font-bold'> Sign In
+                                              className='bg-secondary; hover:text-primary font-bold' style={{paddingRight: '10px'}}>
+                                            <button className="btn btn-warning text-uppercase">
+                                                Sign In
+                                            </button>
                                         </Link>
                                     </p>
                                 </div>

src/component/auth/Signup2.jsx

@@ -61,7 +61,8 @@ export default function Signup2() {
                     <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-11 col-sm-6 col-lg-5 col-xxl-4 align-self-center order-2 order-sm-1" style={{maxWidth: '520px'}}>
+                                <div className="col-11 col-sm-6 col-lg-5 col-xxl-4 align-self-center order-2 order-sm-1"
+                                     style={{maxWidth: '520px'}}>
                                     <div className="mt-5 d-flex">
                                         <div className="bg-white register p-5">
                                             <h1 className="mb-2">{process.env.REACT_APP_PANEL_NAME}</h1>
@@ -79,20 +80,37 @@ export default function Signup2() {
                                                                     <>
                                                                         <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} />
+                                                                                <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 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} />
+                                                                                <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 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} />
+                                                                                <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">
@@ -109,12 +127,18 @@ export default function Signup2() {
                                                                 </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">
+                                                                                <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>
+                                                                            <span
+                                                                                className={`${(props.errors.isChecked && props.touched.isChecked) && 'text-danger'}`}>{props.errors.isChecked}</span>
                                                                         </div>
 
                                                                         {mutation.error &&
@@ -126,21 +150,36 @@ export default function Signup2() {
                                                                         }
 
                                                                         <div className="col-12 mt-3 text-end">
-                                                                    <button type='submit' className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Sign up'}</button>
+                                                                            <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={{backgroundColor: '#F2FAF7'}}>
-                                                                    <h4 className='p-4 text-black' style={{marginBottom: '-30px'}}>Check your email to continue.</h4>
-                                                                    <img className='' style={{width: '200px'}} src={getImage('check-mail.png')} alt='mail-alert' />
-                                                                    <Link to={siteLinks.login} className='p-2 text-primary' style={{color: '#6FCAEF'}}>Home</Link>
+                                                                        <div
+                                                                            className="rounded-2 d-flex flex-column justify-content-between align-items-center"
+                                                                            style={{backgroundColor: '#F2FAF7'}}>
+                                                                            <h4 className='p-4 text-black'
+                                                                                style={{marginBottom: '-30px'}}>Check
+                                                                                your email to continue.</h4>
+                                                                            <img className='' style={{width: '200px'}}
+                                                                                 src={getImage('check-mail.png')}
+                                                                                 alt='mail-alert'/>
+                                                                            <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>
+                                                                    <p>Already have an account ?<Link
+                                                                        to={siteLinks.login}>
+                                                                        <button
+                                                                            className="btn btn-warning text-uppercase">
+                                                                            Sign In
+                                                                        </button>
+                                                                    </Link></p>
                                                                 </div>
                                                             </div>
                                                         </Form>

src/component/comments/Comments.js

@@ -1,24 +1,103 @@
-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 { commentsData } from "../../services/services";
+import queryKeys from "../../services/queryKeys";
+import getCustomTime from "../../utils/getCustomTime";
 
 export default function Comments() {
+  // 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 commentsData(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="Comments" paths={["Dashboard", "Comments"]} />
+        {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 card-statistics mail-contant"
+                    style={{ minHeight: "200px", borderRadius: "10px" }}
+                >
                   <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="d-none col-12">
                               <div className="text-center mail-sidebar-title px-4">
                                 <a
-                            href="javascript:void(0)"
+                                    href="#"
                                     className="btn btn-primary btn-block py-3 font-weight-bold font-18"
                                 >
                                   <i className="fa fa-plus pl-2"></i>
@@ -29,7 +108,7 @@ export default function Comments() {
                               <div className="px-4 py-4">
                                 <ul className="pl-0">
                                   <li className="py-2">
-                              <a href="javascript:void(0)">
+                                    <a href="#">
                                   <span className="nav align-items-center">
                                     <span>
                                       <i className="fa fa-envelope-o text-primary pr-4"></i>
@@ -39,93 +118,121 @@ export default function Comments() {
                                     </span>
                                     <span className="nav-item ml-auto text-right">
                                       <span className="badge badge-pill badge-primary float-right">
-                                      0+
+                                        {contactsData?.length}
                                       </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>Sent Mail</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">
-                              <a href="javascript:void(0)">
+                                  <li
+                                      className="py-2"
+                                      onClick={() => changeActiveCategoryUID("0")}
+                                      style={{ cursor: "pointer" }}
+                                  >
+                                    <div>
                                   <span className="nav align-items-center">
                                     <span>
-                                    <i className="fa fa-circle-o text-danger pr-4"></i>
+                                      <i
+                                          className={`fa fa-circle-o pr-4 ${
+                                              activeCategoryUID == "0"
+                                                  ? "text-primary"
+                                                  : "text-warning"
+                                          }`}
+                                      ></i>
                                     </span>
                                     <span>
-                                    <span>Personal</span>
+                                      <span>All</span>
                                     </span>
                                   </span>
-                              </a>
+                                    </div>
                                   </li>
-                            <li className="py-2">
-                              <a href="javascript:void(0)">
+                                  {contactsCategory &&
+                                      contactsCategory.map((item) => (
+                                          <li
+                                              key={item?.cid}
+                                              className="py-2"
+                                              onClick={() =>
+                                                  changeActiveCategoryUID(`${item?.cid}`)
+                                              }
+                                              style={{ cursor: "pointer" }}
+                                          >
+                                            <div>
                                       <span className="nav align-items-center">
                                         <span>
-                                    <i className="fa fa-circle-o pr-4 text-warning"></i>
+                                          <i
+                                              className={`fa fa-circle-o pr-4 ${
+                                                  activeCategoryUID ==
+                                                  `${item?.cid}`
+                                                      ? "text-primary"
+                                                      : "text-warning"
+                                              }`}
+                                          ></i>
                                         </span>
                                         <span>
-                                    <span>Work</span>
+                                          <span>{item?.description}</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>
+                                            </div>
                                           </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={`${filteredContactData.length > 0 ? 'col-md-8 col-xxl-4' : 'col-md-8 col-xxl-10'} border-md-t`}>
+                        <div className="mail-content  border-right border-n h-100" style={{placeContent: 'center'}}>
+                          {/* <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.."
-                            />
+                               <input type="text" className="form-control" id="search" placeholder="Search.." />
                                    <i className="fa fa-search"></i>
                             </div>
                           </div>
                         </div>
-                    </div>
+                      </div> */}
                           <div className="mail-msg scrollbar scroll_dark">
-                      <div className="mail-msg-item">
-                        <a href="javascript:void(0)">
+                            { filteredContactData.length ?
+                                filteredContactData?.map((contact, index) => {
+                                  const isActive =
+                                      contact?.uid == activeContactUID ||
+                                      (!activeContactUID && index == 0);
+                                  const avtarImage =
+                                      contact?.category === undefined
+                                          ? "avtar/01.jpg"
+                                          : "avtar/" + contact.category + ".png";
+                                  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")}
+                                                    src={getImage(avtarImage)}
                                                     className="img-fluid"
                                                     alt="user"
                                                 />
@@ -133,301 +240,88 @@ export default function Comments() {
                                             </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.
+                                          <span
+                                              style={{
+                                                fontSize: "14px",
+                                                color: "#148399",
+                                                fontWeight: "bolder",
+                                              }}
+                                          >
+                                            {contact?.sender}
+                                          </span>
                                                 </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/02.jpg")}
-                                  className="img-fluid"
-                                  alt="user"
-                                />
-                              </div>
-                            </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> */}
                                                 <p className="d-none d-xl-block">
-                                  06:59 <span> PM </span>
+                                          <span style={{ fontSize: "14px" }}>
+                                            {new Date(
+                                                contact?.added
+                                            ).toDateString()}
+                                          </span>
                                                 </p>
                                               </div>
                                               <h5 className="mb-0 my-2">
-                                Mobile app Designer{" "}
+                                                {contact?.title}
                                               </h5>
                                               <p>
-                                Very nice template, lots of pages and good
-                                documentation.
+                                                {contact?.message?.length < 100
+                                                    ? contact?.message
+                                                    : contact?.message.substring(0, 101) +
+                                                    " ..."}
                                               </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={getImage("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={getImage("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>
+                                        <span>
+                                          {new Date(
+                                              contact?.added
+                                          ).toDateString()}
+                                          {/* {getCustomTime(contact.added)} */}
+                                        </span>
                                               </p>
                                             </div>
                                           </div>
                                         </a>
                                       </div>
+                                  );
+                                })
+                                :
+                                <p className="text-center">Messages will appear here as soon as they are available for selection</p>
+                            }
                           </div>
                         </div>
                       </div>
+                      {filteredContactData.length > 0 &&
                           <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")}
+                                      src={activeContactUID ? getImage("avtar/" + activeDetail[0].category + ".png") : getImage(filteredContactData[0] == undefined ? "avtar/01.jpg": "avtar/" + filteredContactData[0].category + ".png")}
                                       className="img-fluid"
                                       alt="user"
                                   />
                                 </div>
                                 <div>
-                        <h4 className="mb-0">Dutca Patrick</h4>
-                        <p>30 Min ago</p>
+                                  <h4 className="mb-0" style={{ color: "#148399" }}>
+                                    {activeContactUID
+                                        ? activeDetail[0]?.sender
+                                        : filteredContactData[0]?.sender}
+                                  </h4>
+                                  <p>
+                                    {activeContactUID
+                                        ? new Date(activeDetail[0]?.added).toDateString()
+                                        : new Date(
+                                            filteredContactData[0]?.added
+                                        ).toDateString()}
+                                  </p>
                                 </div>
                               </div>
                               <div className="mt-4 d-flex justify-content-between">
                                 <div>
-                        <h3>Landing page Designer...</h3>
+                                  <h3>
+                                    {activeContactUID
+                                        ? activeDetail[0]?.title
+                                        : filteredContactData[0]?.title}
+                                  </h3>
                                 </div>
                                 <div className="d-flex">
                                   {/*<a href="javascript:void(0)"><i className="fa fa-reply font-22 pr-3"></i></a>*/}
@@ -435,124 +329,21 @@ export default function Comments() {
                                 </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.
+                                  {activeContactUID
+                                      ? activeDetail[0]?.message
+                                      : filteredContactData[0]?.message}
                                 </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="d-md-flex px-5 py-4">*/}
-                  {/*    <div className="flex-fill align-items-center">*/}
-                  {/*        <div className="d-flex">*/}
-                  {/*            <i className="ti ti-clip pr-3 font-22"></i>*/}
-                  {/*            <p className="pr-3 font-weight-bold">Wireframe</p>*/}
-                  {/*            <p>(220.MB)</p>*/}
-                  {/*        </div>*/}
-                  {/*    </div>*/}
-                  {/*    <div className="flex-fill text-left text-md-right"><a href="javascript:void(0)" className="text-primary"><i className="ti ti-download pr-2"></i><span>Download</span></a></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="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>
-                    </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>
+                      }
                     </div>
                   </div>
                 </div>
               </div>
             </div>
+        )}
       </>
   );
 }

src/component/context/SocketIOContext.jsx

@@ -41,7 +41,7 @@ export default function SocketIOContextProvider({children}) {
         socket.on(socketOnEvents.receive_message, (data) => {
             // setSocketMsgReceived(data.message);
             // dispatch(tableReload({type:'CHATMESSAGELIST'})) // dispatches to update chat message sending from owner to worker and vice versa
-            console.log('DATA', data)
+            console.log('SOCKET RECEIVED DATA *** ', data)
             queryClient.refetchQueries({
                 queryKey: [...queryKeys.recentAction],
                 // type: 'active',

src/component/home/DashPayments.jsx

@@ -54,12 +54,12 @@ export default function DashPayments() {
                                 {/* <th style={{width: '30px'}}>#</th> */}
                                 <th>Date</th>
 
-                                <th  style={{width: '130px'}}>Subscription</th>
+                                <th  style={{width: '130px'}}>Description</th>
                                 <th  style={{width: '80px'}}>Amount</th>
                             </tr>
                             </thead>
                             <tbody>
-                                {payments.length > 0 ? 
+                                {payments && payments?.length > 0 ?
                                 payments.map((item, index) => {
                                     return (
                                         <tr key={index}>

src/component/product/ProductActive.jsx

@@ -1,21 +1,26 @@
-import React, { useMemo, useRef, useState } from "react";
+import React, {useEffect, useMemo, useRef, useState} from "react";
 import { useSelector } from "react-redux";
 import getImage from "../../utils/getImage";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { productRefreshSite, getSettingsData } from "../../services/services";
 import Settings from "./settingsTab/Settings";
 import queryKeys from "../../services/queryKeys";
+import {SocketContextValues} from "../context/SocketIOContext";
 
 
 export default function ProductActive({productData}){
-
+    const {joinRoom} = SocketContextValues() // Destructures values from socket context
     const iframe = useRef()
 
+    const [refreshMsg, setRefreshMsg] = useState('')
+
     const refresh = useMutation({
         mutationFn: (fields) => {
             return productRefreshSite(fields)
         },
         onSuccess: (res) => {
+            setRefreshMsg(res?.data?.message)
+            setTimeout(()=>{setRefreshMsg('')},3000)
             iframe.current.src += ''
         }
     })
@@ -31,6 +36,13 @@ export default function ProductActive({productData}){
     }
     let externalUrl= 'https://'+productData?.internal_url
 
+    const productSubUID = productData.subscription_uid;
+    useEffect(() => {
+        const provision_room  = "PROVISION_"+productSubUID;
+        console.log("JOINING ROOM ON ACTIVE *** ", provision_room);
+        joinRoom(provision_room); // provision subscription room
+    }, [])
+
     return(
         <>
             {/*<BreadcrumbComBS title='Active Product Name' paths={['Dashboard', 'Product']} />*/}
@@ -58,11 +70,16 @@ export default function ProductActive({productData}){
                                     <iframe ref={iframe} style={{borderWidth: '0px'}} src={externalUrl} width="100%" height="600" title={externalUrl}></iframe>
                                 </div>
                                 <div className="p-4 ml-auto">
-                                    <button type="button" onClick={handleRefresh} className="btn btn-primary">{refresh.isPending ? 'Loading...' : 'Refresh Site'}
+                                    <div className="d-flex justify-end gap-3">
+                                        {refreshMsg &&
+                                            <p className="text-success text-center">{refreshMsg}</p>
+                                        }
+                                        <button type="button" onClick={handleRefresh} className="btn btn-primary">{refresh.isPending ? 'Initiating...' : 'Rebuild Site'}
                                         </button>
                                     </div>
                                 </div>
                             </div>
+                        </div>
                         <div className="col-xxl-6">
                             <div className="card card-statistics">
                                 <div className="card-header">

src/component/product/ProductFactory.jsx

@@ -2,14 +2,16 @@ import { 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 { useLocation, useNavigate } from 'react-router-dom';
 import {MyProductData} from "../../services/services";
 import ProductActive from "./ProductActive";
 import ProductProvision from "./ProductProvision";
 import {productConst} from "../../constants/products";
 import queryKeys from "../../services/queryKeys";
+import siteLinks from '../../links/siteLinks';
 
 export default function ProductFactory(){
+    const navigate = useNavigate()
     const location = useLocation();
     const pathname = location.pathname;
 
@@ -45,8 +47,9 @@ export default function ProductFactory(){
                     </>
                     : isError ?
                         <div className="row">
-                            <div className="col-12">
+                            <div className="text-center col-12" style={{minHeight: '500px', placeContent: 'center'}}>
                                 <p className='text-danger'>{error?.message}</p>
+                                <button onClick={() => navigate(siteLinks.home)} className='mt-3 btn btn-primary'>Return Home</button>
                             </div>
                         </div>
                     :

src/component/product/ProductProvision.jsx

@@ -28,7 +28,9 @@ export default function ProductProvision(props){
     const provisionData = provision?.data
 
     useEffect(() => {
-        joinRoom(productSubUID); // provision subscription room
+        const provision_room  = "PROVISION_"+productSubUID;
+        console.log("JOINING ROOM ON START *** ", provision_room);
+        joinRoom(provision_room); // provision subscription room
     }, [])
 
     return (
@@ -59,8 +61,11 @@ export default function ProductProvision(props){
                                     </div>
                                     <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>
+                                            <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>
                                         </div>
                                     </div>
                                 </div>
@@ -108,8 +113,10 @@ export default function ProductProvision(props){
 
                             <div className="col-lg-6">
                                 <div className="card card-statistics ">
-                                <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" />
+                                    <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">
                                     <div className="" dangerouslySetInnerHTML={{__html: productDescription}}/>
                                 </div> */}

src/component/product/settingsTab/ColorStyleConfigure.jsx

@@ -0,0 +1,6 @@
+const  ColorStyleConfigure =()=>{
+
+    return <>COLOR CONFIG</>
+}
+
+export default  ColorStyleConfigure

src/component/product/settingsTab/GeneralTab.jsx

@@ -5,8 +5,19 @@ import SiteTemplateSelector from './SiteTemplateSelector';
 import NoYesBooleanDropdown from './NoYesBooleanDropdown';
 import {IoMdArrowDropdown} from 'react-icons/io';
 import queryKeys from '../../../services/queryKeys';
+import sortObjectByListOrder from '../../../helpers/sortObjectByListOrder';
+import URLConfiguration from "./URLConfiguration";
+import ColorStyleConfigure from "./ColorStyleConfigure";
 
-const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backendValues, setFieldsChanged}) =>{
+const GeneralTab = memo(({
+                             name = 'Full Name',
+                             data,
+                             tabKey,
+                             isCustom,
+                             productData,
+                             backendValues,
+                             setFieldsChanged
+                         }) => {
 
         const queryClient = useQueryClient()
 
@@ -27,9 +38,11 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
 
         const [fields, setFields] = useState({})
 
+        const sortedData = sortObjectByListOrder(data ? data : {}) // SORTED SETTINGSCONFIG
+
         useEffect(() => {
             const fieldData = {}
-        Object.entries(data)?.forEach(([key, value]) => { // LOOP TO POPULATE FIELDDATA PROPERTIES WITH DATA OF EACH TAB
+            Object.entries(sortedData)?.forEach(([key, value]) => { // LOOP TO POPULATE FIELDDATA PROPERTIES WITH DATA OF EACH TAB
                 fieldData[value?.name?.toLowerCase().replaceAll(" ", "_")] = ''
             })
             backendValues?.data?.forEach(item => { //LOOPING THROUGH USER ALREADY ADDED DATA FROM BACKEND IF ANY AND UPDATING THE FIELDDATA OBJECT
@@ -78,7 +91,7 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
             }
             submitSettings.mutate(reqData)
         }
-
+        console.log(tabKey);
         return (
             <>
                 {backendValues?.isFetching || !backendValues?.data ?
@@ -98,7 +111,11 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
                         :
                         <>
                             {isCustom === true ?
-            <SiteTemplateSelector  name={name} data={data} isCustom={isCustom} productData={productData} />
+                                <>
+                                    {(tabKey === 'template_tab') && <SiteTemplateSelector name={name} data={sortedData} isCustom={isCustom} productData={productData}/>}
+                                    {(tabKey === 'url_config_tab') && <URLConfiguration name={name} data={sortedData} isCustom={isCustom} productData={productData}/>}
+                                    {(tabKey === 'color_scheme_tab') && <ColorStyleConfigure name={name} data={sortedData} isCustom={isCustom} productData={productData}/>}
+                                </>
                                 :
                                 <div className="page-account-form">
                                     <div className="p-0" style={{minHeight: '500px'}}>
@@ -106,25 +123,39 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
                                         <form id='tab_form'>
                                             <div className="form-row">
                                                 <>
-                                {Object.entries(data)?.map(([key, value]) => {
-                                    let fieldName = value.name.toLowerCase().replaceAll(" ", "_")
-                                    let fieldValue = fields[value.name.toLowerCase().replaceAll(" ", "_")]
+                                                    {Object.entries(sortedData)?.map(([key, value]) => {
+                                                            let fieldName = key; // value.key.toLowerCase().replaceAll(" ", "_")
+                                                            let fieldValue = fields[key]; //fields[value.name.toLowerCase().replaceAll(" ", "_")]
                                                             return (
                                                                 <div key={key} className="form-group col-md-12">
                                                                     <label htmlFor="name1">{value.name}</label>
-                                            {value.controls == 'TEXT' ?
-                                                <input name={fieldName} type="text" className="form-control" id={key} value={fieldValue} onChange={handleChange} />
-                                                :value.controls == 'TEXTAREA' ?
-                                                <textarea name={fieldName} rows={5} style={{resize: 'none'}} type="text" className="form-control" id={key} value={fieldValue} onChange={handleChange} />
-                                                : value.controls == 'SELECT_NO_YES' ?
+                                                                    {value.controls === 'TEXT' ?
+                                                                        <input name={fieldName} type="text"
+                                                                               className="form-control" id={key}
+                                                                               value={fieldValue} onChange={handleChange}/>
+                                                                        : value.controls === 'TEXTAREA' ?
+                                                                            <textarea name={fieldName} rows={5}
+                                                                                      style={{resize: 'none'}} type="text"
+                                                                                      className="form-control" id={key}
+                                                                                      value={fieldValue}
+                                                                                      onChange={handleChange}/>
+                                                                            : value.controls === 'SELECT_NO_YES' ?
                                                                                 // <NoYesBooleanDropdown name={fieldName} value={fieldValue} onChange={handleChange}  />
                                                                                 <div className='position-relative'>
-                                                    <select onChange={handleChange} name={fieldName} value={fieldValue} className="form-control">
+                                                                                    <select onChange={handleChange}
+                                                                                            name={fieldName} value={fieldValue}
+                                                                                            className="form-control">
                                                                                         <option value=''>Select</option>
                                                                                         <option value='0'>No</option>
                                                                                         <option value='1'>Yes</option>
                                                                                     </select>
-                                                    <IoMdArrowDropdown className='position-absolute w-auto' style={{top: '50%', right: '2px', transform: 'translateY(-50%)'}} />                                               
+                                                                                    <IoMdArrowDropdown
+                                                                                        className='position-absolute w-auto'
+                                                                                        style={{
+                                                                                            top: '50%',
+                                                                                            right: '2px',
+                                                                                            transform: 'translateY(-50%)'
+                                                                                        }}/>
                                                                                 </div>
                                                                                 :
                                                                                 null
@@ -142,7 +173,8 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
                                                     </>
                                                 }
                                                 <div className="form-group col-md-12" style={{textAlign: 'right'}}>
-                                <button onClick={handleSubmit} type="button" className="btn btn-primary" disabled={submitSettings.isPending}>{submitSettings.isPending ? 'Loading...' : 'Update'}</button>
+                                                    <button onClick={handleSubmit} type="button" className="btn btn-primary"
+                                                            disabled={submitSettings.isPending}>{submitSettings.isPending ? 'Loading...' : 'Update'}</button>
                                                 </div>
                                             </div>
                                         </form>

src/component/product/settingsTab/Settings.jsx

@@ -4,6 +4,7 @@ import { getSettingsData, getMyProductConfig } from '../../../services/services'
 import queryKeys from '../../../services/queryKeys';
 import { useSelector } from 'react-redux';
 import { useQuery } from '@tanstack/react-query';
+import sortObjectByListOrder from '../../../helpers/sortObjectByListOrder'
 
 const Settings = memo(({productData}) => {
 
@@ -19,6 +20,7 @@ const Settings = memo(({productData}) => {
             }
            return getMyProductConfig(reqData)
         },
+        staleTime: 0,
     })
     const settingsConfig = configData?.data?.settings_items
     // console.log('CONFIG DATA...', settingsConfig)
@@ -53,12 +55,15 @@ const Settings = memo(({productData}) => {
             }
            return getSettingsData(reqData)
         },
+        staleTime: 0,
         enabled: settingsConfig ? true : false
     })
 
     const settingsData = {data: data?.data?.settings, isFetching, isError, error}
     // console.log('data', settingsData)
 
+    const sortedSettingsConfig = sortObjectByListOrder(settingsConfig ? settingsConfig : {}) // SORTED SETTINGSCONFIG
+
       return (
         <>
         {configIsFetching ? 
@@ -79,7 +84,7 @@ const Settings = memo(({productData}) => {
             <div className="tab tab-vertical">
                 <ul className="nav nav-tabs" role="tablist">
                     <>
-                        {Object.entries(settingsConfig).map(([key, value], index) => (
+                        {Object.entries(sortedSettingsConfig).map(([key, value], index) => (
                             <li key={key} className="nav-item">
                             <a className={`nav-link ${(activeTab == value.controls || (index == 0 & !activeTab)) && 'active show'}`}
                                 id={key} 
@@ -99,12 +104,12 @@ const Settings = memo(({productData}) => {
                 </ul>
                 <div className="tab-content">
                     <>
-                        {Object.entries(settingsConfig).map(([key, value], index) => (
+                        {Object.entries(sortedSettingsConfig).map(([key, value], index) => (
                             <div key={key} className={`tab-pane fade  ${(activeTab == value.controls || (index == 0 & !activeTab)) && 'active show'}`}
                                 // id={value.controls} role="tabpanel"
                                 // aria-labelledby={key}
                             >
-                                <GeneralTab name={value.title} data={value.data} isCustom={value.custom} productData={productData} backendValues={settingsData} setFieldsChanged={setFieldsChanged} />
+                                <GeneralTab tabKey={key} name={value.title} data={value.data} isCustom={value.custom} productData={productData} backendValues={settingsData} setFieldsChanged={setFieldsChanged} />
                             </div>
                         ))}
                     </>

src/component/product/settingsTab/SiteTemplateSelector.jsx

@@ -3,6 +3,8 @@ import getImage from "../../../utils/getImage";
 import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
 import queryKeys from '../../../services/queryKeys';
 import {getProductTemplateData, activateTemplate} from '../../../services/services';
+import {Link} from "react-router-dom";
+import siteLinks from "../../../links/siteLinks";
 
 const SiteTemplateSelector = memo(({name = 'Full Name', data, productData}) => {
 
@@ -24,9 +26,10 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
         const templateResponse = templateData?.data
         const currentTemUID = templateResponse?.current_template_uid
         const templates = templateResponse?.templates
+        const custom_template_name = templateResponse?.custom_template_name
 
         // console.log('data Template', templateResponse)
-        // console.log("Page data == ", data)
+        console.log("Page data == ", data)
 
         const handleActivateTemplate = useMutation({
             mutationFn: (fields) => {
@@ -57,7 +60,26 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
             // console.log(reqData)
             handleActivateTemplate.mutate(reqData)
         }
+        if (custom_template_name && custom_template_name != '') {
+            // This implies we have a custom template , just return here
+            return <>
+                <div className='col-12'>
+                    <div
+                        className="rounded-2 d-flex flex-column justify-content-between align-items-center"
+                        style={{backgroundColor: '#F2FAF7'}}>
+                        <h4 className='p-4 text-black'
+                            style={{marginBottom: '20px'}}>Custom Product Template.</h4>
+                        <img className='' style={{width: '200px'}}
+                             src={getImage('custom-template.png')}
+                             alt='mail-alert'/>
+                        <h4 className='p-4 text-black'
+                            style={{marginTop: '20px'}}>This product is using a custom template named <span
+                            style={{color: 'darkred'}}>&ldquo;{custom_template_name}&rdquo;</span> .</h4>
+                    </div>
+                </div>
 
+            </>
+        }
         return (
             <div className="page-account-form">
                 <div className="p-0">
@@ -87,13 +109,16 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
                                                     <div className="card-body">
                                                         <div className="text-center p-2">
                                                             <div className="mb-2">
-                                                    <img  src={getImage('file-icon/svg.png')} alt={template.title} />
+                                                                <img src={getImage('file-icon/svg.png')}
+                                                                     alt={template.title}/>
                                                             </div>
                                                             <h4 className="mb-0">{template.title}</h4>
                                                             {currentTemUID == template.template_uid ?
-                                                <button className="btn btn-light" disabled={true}>Active</button>
+                                                                <button className="btn btn-light"
+                                                                        disabled={true}>Active</button>
                                                                 :
-                                                <button onClick={()=>handleSubmit(template.template_uid)} className="btn btn-primary">Activate</button>
+                                                                <button onClick={() => handleSubmit(template.template_uid)}
+                                                                        className="btn btn-primary">Activate</button>
                                                             }
                                                         </div>
                                                     </div>
@@ -127,7 +152,8 @@ const SiteTemplateSelector = memo(({name='Full Name', data, productData}) =>{
                                                 <p className={'text-center text-danger'}>{handleActivateTemplate.error.message}</p>
                                                 :
                                                 handleActivateTemplate.isSuccess ?
-                            <p className={'text-center text-success'}>Templated activated successfully</p>
+                                                    <p className={'text-center text-success'}>Templated activated
+                                                        successfully</p>
                                                     :
                                                     null
                                         }

src/component/product/settingsTab/URLConfiguration.jsx

@@ -0,0 +1,141 @@
+import {Form, Formik} from "formik";
+import * as Yup from "yup";
+import {useMutation} from '@tanstack/react-query';
+import {setExternalURL} from '../../../services/services';
+import { useState } from "react";
+
+const validationSchema = Yup.object().shape({
+    url: Yup.string().required("URL is required").matches(/^https?:\/\/[a-zA-Z0-9\-]+\.[a-zA-Z0-9\-]+\.[a-zA-Z]+/, 'Must be like: https://example.mysite.com'),
+})
+
+// const initialValues = {
+//     url: '',
+// };
+
+const URLConfiguration = ({productData}) => {
+
+    const [externalURLChanged, setExternalURLChanged] = useState(true)
+
+    const initialValues = {
+        url: productData?.external_url || '',
+    };
+
+    let defaultUrl = 'https://' + productData?.internal_url
+    let externalUrl = productData?.external_url
+
+     const handleExternalURLChanged = (e) => {
+        if(e.target.value == externalUrl){
+            setExternalURLChanged(true)
+        }else{
+            setExternalURLChanged(false)
+        }
+    }
+
+    // API to set url
+    const setURL = useMutation({
+        mutationFn: (fields) => {
+            return setExternalURL(fields)
+        },
+        onSuccess: (res) => {
+            if (res.data.resultCode != '0') {
+                // throw({message: res?.data?.resultDescription})
+                throw({message: 'Something went wrong!'})
+            }
+        },
+        onSettled: () => {
+            setTimeout(() => {
+                setURL.reset()
+            }, 3000)
+        }
+        // onError: (err) => {
+        //     console.log('err', err)
+        // }
+    })
+
+    const handleSubmit = (values) => {
+        let reqData = {
+            token: localStorage.getItem('token'), // USER TOKEN
+            uid: localStorage.getItem('uid'), // USER UID
+            subscription_uid: productData?.subscription_uid,
+            external_url: values.url
+        }
+        setURL.mutate(reqData)
+    }
+
+    return <>
+        <div className="card card-statistics">
+            <div className="card-header">
+                <div className="card-heading">
+                    <h4 className="card-title" style={{textTransform: 'none'}}>{defaultUrl}</h4>
+                </div>
+            </div>
+            {/*<div className="card-body">*/}
+            {/*    <div className="form-group">*/}
+            {/*        /!*<label htmlFor="exampleInputEmail1">Email address</label>*!/*/}
+            {/*        <input type="email" className="form-control"*/}
+            {/*               aria-describedby="defaultUrlHelp" value={defaultUrl} readOnly={true} />*/}
+            {/*    </div>*/}
+            {/*</div>*/}
+        </div>
+
+        <Formik
+            initialValues={initialValues}
+            validationSchema={validationSchema}
+            onSubmit={handleSubmit}
+        >
+            {(props) => {
+                return (
+                    <Form className='w-full'>
+                        <div className="card card-statistics" style={{backgroundColor: '#b6e5ef'}}>
+                            <div className="card-header">
+                                <div className="card-heading">
+                                    <h4 className="card-title" style={{textTransform: 'none'}}>Set your own URL</h4>
+                                </div>
+                            </div>
+                            <div className="card-body">
+                                <div className="form-group">
+                                    <label htmlFor="exampleInputEmail1">Enter your full URL <span
+                                        className={`${(props.errors.url && props.touched.url) && 'text-danger'}`}>{props.errors.url}</span></label>
+                                    <input value={props.values.url} onChange={(e)=>{props.handleChange(e); handleExternalURLChanged(e)}} type="text"
+                                           className="form-control" id="url" aria-describedby="url"
+                                           placeholder="https://example.mysite.com"/>
+                                </div>
+                                <div style={{width: '100%', textAlign: 'right'}}>
+                                    <button 
+                                        type="submit" 
+                                        disabled={setURL.isPending || externalURLChanged}
+                                        className="btn btn-primary"
+                                    >
+                                        {setURL.isPending ? 'Loading...' : 'Submit'}
+                                    </button>
+                                </div>
+                            </div>
+
+                            {setURL.error &&
+                                <div className="col-12">
+                                    <p className='text-danger'>{setURL.error.message}</p>
+                                </div>
+                            }
+
+                            {setURL.isSuccess &&
+                                <div className="col-12">
+                                    <p className='text-success'>{'Completed successfully'}</p>
+                                </div>
+                            }
+                            <div style={{backgroundColor: '#94b8c0', borderRadius: '10px', padding: '10px'}}>
+                                Final steps to configure your URL:<br/>
+                                DNS:<br/>
+                                DNS:<br/>
+                                DNS:<br/>
+
+                            </div>
+                        </div>
+                    </Form>
+                );
+            }}
+        </Formik>
+
+    </>
+}
+
+export default URLConfiguration

src/component/profile_complete/ProfileCompleteCom.jsx

@@ -1,7 +1,7 @@
-import React, {useEffect, useMemo, useState} from "react";
+import React, {useCallback, useEffect, useMemo, useState} from "react";
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 // import { useLocation } from "react-router-dom";
-// import { Form, Formik } from "formik";
+import { Form, Formik } from "formik";
 import * as Yup from "yup";
 import {useMutation, useQuery} from "@tanstack/react-query";
 import getImage from "../../utils/getImage";
@@ -13,17 +13,19 @@ import {updateUserDetails} from "../../store/UserDetails";
 import {useDispatch} from "react-redux";
 
 
-// const validationSchema = Yup.object().shape({
-//     practice: Yup.string().required("Required"),
-//     specialization: Yup.string().required("Required"),
-//     introduction: Yup.string().min(1, "Minimum 10 characters").max(50, "Maximum 50 characters").required("Required"),
-// })
-
-//   const initialValues = {
-//     practice: '',
-//     specialization: '',
-//     introduction: '',
-//   };
+const validationSchema = Yup.object().shape({
+    practice: Yup.string().required("Required"),
+    specialization: Yup.string().when('practice', {
+        is: (value) => typeof value === 'string' && value.trim().length > 0,
+        then: (schema) => schema.required('Required'),
+        otherwise: (schema) => schema,
+    }),
+    introduction: Yup.string().min(1, "Minimum 1 character").max(50, "Maximum 50 characters"),
+    url_name: Yup.string().min(6, "Minimum 6 characters").max(16, "Maximum 16 characters").required("Required").matches(
+    /^[a-zA-Z0-9]+$/, // Regex for alphanumeric characters
+    'Must contain only alphanumeric characters' // Custom error message
+    ),
+})
 
 
 export default function ProfileCompleteCom() {
@@ -35,28 +37,27 @@ export default function ProfileCompleteCom() {
     const {state: {redirectLink}} = useLocation()
 
     const [practices, setPractices] = useState([])
+    const [specialties, setSpecialties] = useState([])
 
     const [initialValues, setInitialValues] = useState({
         practice: '',
         specialization: '',
         introduction: '',
+        url_name: ''
     })
 
-    const specialties = useMemo(() => { // FUNCTION TO UPDATE SPECIALITY ARRAY EACH TIME PRACTICE CHANGES
+    const handleUpdateSpecialties = (e) => {
         setInitialValues(prev => ({...prev, specialization: ''}))
-        if (!initialValues.practice) {
-            return []
+        const specialtiesArr = practices.filter(item => item.practice == e.target.value)[0]?.specialties
+        setSpecialties(specialtiesArr)
     }
-        const specialtiesArr = practices.filter(item => item.practice == initialValues.practice)[0]?.specialties
-        return specialtiesArr
-    }, [initialValues.practice])
 
 
     const mutation = useMutation({
         mutationFn: (fields) => {
-            const {practice, specialization} = fields
-            if (!practice || !specialization) {
-                throw new Error('Please select both practice and specialization fields')
+            const {practice, specialization, url_name} = fields
+            if (!practice || !specialization || !url_name) {
+                throw new Error('Please Select both Practice, Specialization and Enter URL_Name')
             }
             return completeProfile(fields)
         },
@@ -93,15 +94,11 @@ export default function ProfileCompleteCom() {
         }
     })
 
-    const handlePracticeChange = ({target: {name, value}}) => {
-        setInitialValues(prev => ({...prev, [name]: value}))
-    }
-
-    const handleCompleteProfile = () => { // FUNCTION TO COMPLETE PROFILE
+    const handleCompleteProfile = (values) => { // FUNCTION TO COMPLETE PROFILE
         let reqData = {
             token: localStorage.getItem('token'), // USER TOKEN
             uid: localStorage.getItem('uid'), // USER UID
-            ...initialValues
+            ...values
         }
         mutation.mutate(reqData)
     }
@@ -145,10 +142,19 @@ export default function ProfileCompleteCom() {
                             <div className="card-body">
                                 <div className='h-100 row flex-column'>
                                     {/* <div className="row"> */}
+                                    <Formik
+                                        initialValues={initialValues}
+                                        validationSchema={validationSchema}
+                                        onSubmit={handleCompleteProfile}
+                                        enableReinitialize={true}
+                                    >
+                                        {(props) => {
+                                        return (
+                                            <Form className='mt-2'>
                                                 <>
                                                     <div className="">
                                                         <div className="form-group position-relative">
-                                                <label className={`text-black fw-bold control-label`}>Practice :</label>
+                                                            <label className={`text-black fw-bold control-label`}>Practice : <span className="text-danger">{(props.errors.practice && props.touched.practice) && props.errors.practice}</span></label>
                                                             <div className="position-relative">
                                                                 {/* <select onChange={props.handleChange} name='practice' value={props.values.practice} className="form-control">
                                                                     <option value=''>Select</option>
@@ -156,8 +162,10 @@ export default function ProfileCompleteCom() {
                                                                         <option key={index} value={practice.practice}>{practice.practice}</option>
                                                                     ))}
                                                                 </select> */}
-                                                    <select onChange={handlePracticeChange} name='practice'
-                                                            value={initialValues.practice} className="form-control">
+                                                                <select 
+                                                                        onChange={(e) => {props.handleChange(e); props.setFieldValue('specialization', ''); handleUpdateSpecialties(e)}} 
+                                                                        name='practice'
+                                                                        value={props.values.practice} className="form-control">
                                                                     <option value=''>Select</option>
                                                                     {practices.map((practice, index) => (
                                                                         <option key={index}
@@ -176,10 +184,10 @@ export default function ProfileCompleteCom() {
                                                     <div className="">
                                                         <div className="form-group">
                                                             <label className={`text-black fw-bold control-label`}>Your
-                                                    Specialization :</label>
+                                                                Specialization : <span className="text-danger">{(props.errors.specialization && props.touched.specialization) && props.errors.specialization}</span></label>
                                                             <div className="position-relative">
-                                                    <select onChange={handlePracticeChange} name='specialization'
-                                                            value={initialValues.specialization}
+                                                                <select onChange={props.handleChange} name='specialization'
+                                                                        value={props.values.specialization}
                                                                         className="form-control">
                                                                     <option value=''>Select</option>
                                                                     {specialties.map((specialty, index) => (
@@ -197,11 +205,10 @@ export default function ProfileCompleteCom() {
 
                                                     <div className="">
                                                         <div className="form-group position-relative">
-                                                <label className={`text-black fw-bold control-label`}>Other General
-                                                    Information :</label>
-                                                <textarea name='introduction' rows={10} style={{resize: 'none'}}
-                                                          className="form-control" value={initialValues.introduction}
-                                                          onChange={handlePracticeChange}/>
+                                                            <label className={`text-black fw-bold control-label`}>Other General Information : <span className="text-danger">{(props.errors.introduction && props.touched.introduction) && props.errors.introduction}</span></label>
+                                                            <textarea name='introduction' rows={5} style={{resize: 'none'}}
+                                                                    className="form-control" value={props.values.introduction}
+                                                                    onChange={props.handleChange}/>
                                                         </div>
                                                     </div>
 
@@ -209,8 +216,51 @@ export default function ProfileCompleteCom() {
                                                         <div className="form-group position-relativ'e">
                                                             {/*<label className={`text-black fw-bold control-label`}>What we use this*/}
                                                             {/*    information for :</label>*/}
-                                                <div style={{fontSize: '14px', borderRadius: '10px', backgroundColor: 'aliceblue', fontWeight:'bolder', padding: '15px' }}>
-                                                    MERMS A.I. agents use the information supplied to help generate useful entries for your product settings.
+                                                            <div style={{
+                                                                fontSize: '14px',
+                                                                borderRadius: '10px',
+                                                                backgroundColor: 'aliceblue',
+                                                                fontWeight: 'bolder',
+                                                                padding: '15px'
+                                                            }}>
+                                                                MERMS A.I. agents use the information supplied to help generate
+                                                                useful entries for your product settings.
+                                                            </div>
+                                                        </div>
+                                                    </div>
+
+                                                    <div className="">
+                                                        <div className="form-group position-relative">
+                                                            <label className={`text-black fw-bold control-label`}>URL Name : <span className="text-danger">{(props.errors.url_name && props.touched.url_name) && props.errors.url_name}</span></label>
+                                                            <div className="position-relative d-flex flex-column flex-xxl-row" style={{gap: '10px'}}>
+                                                                {/* <select onChange={handlePracticeChange} name='url_name'
+                                                                        value={initialValues.url_name} className="form-control">
+                                                                    <option value=''>Select</option>
+                                                                    {practices.map((practice, index) => (
+                                                                        <option key={index}
+                                                                                value={practice.practice}>{practice.practice}</option>
+                                                                    ))}
+                                                                </select>
+                                                                <IoMdArrowDropdown className='position-absolute w-auto' style={{
+                                                                    top: '50%',
+                                                                    right: '2px',
+                                                                    transform: 'translateY(-50%)'
+                                                                }}/> */}
+                                                                <input
+                                                                    className="form-control"
+                                                                    onChange={props.handleChange} name='url_name'
+                                                                    value={props.values.url_name}
+                                                                    minLength={6}
+                                                                    maxLength={16}
+                                                                />
+                                                                <p className="border-radius-10 p-2 border border-warning"
+                                                                style={{fontSize: "1.0rem"}}>We use the URL Name to form part of
+                                                                    your default URL when we configure
+                                                                    a new URL for your products. You can always change your product
+                                                                    URL. <br/>
+                                                                    <b>Example : <span style={{color: 'red'}}>url_name</span>.product.mermsemr.com
+                                                                    </b>
+                                                                </p>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -224,10 +274,14 @@ export default function ProfileCompleteCom() {
                                                     }
 
                                                     <div className="mt-auto text-end">
-                                            <button type='button' onClick={handleCompleteProfile}
+                                                        <button type='submit'
                                                                 className="btn btn-primary text-uppercase">{mutation.isPending ? 'loading...' : 'Continue'}</button>
                                                     </div>
                                                 </>
+                                            </Form>
+                                        );
+                                        }}
+                                    </Formik>
                                     {/* </div> */}
                                 </div>
                             </div>

src/component/settings/Settings.jsx

@@ -1,10 +1,68 @@
-import React from "react";
+import React, { useEffect, useMemo, useState } from "react";
+import { Form, Formik } from "formik";
+import * as Yup from "yup";
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 import getImage from "../../utils/getImage";
+import queryKeys from "../../services/queryKeys";
+import { useQuery } from "@tanstack/react-query";
+import { profileDetails } from "../../services/services";
+
+
+
+
+const profileValidationSchema = Yup.object().shape({
+    // firstname: Yup.string().required("firstname is required"),
+    // lastname: Yup.string().required("lastname is required"),
+    // email: Yup.string().required("email is required"),
+    // account_name: Yup.string().required("account name is required"),
+    // phone: Yup.string().required("phone is required"),
+    // full_address: Yup.string().required("full address is required"),
+})
+
+const linksValidationSchema = Yup.object().shape({
+    // facebook_url: Yup.string().required("facebook is required"),
+    // twitter_url: Yup.string().required("twitter is required"),
+    // blogger_url: Yup.string().required("blog is required"),
+    // google_url: Yup.string().required("google is required"),
+    // linked_url: Yup.string().required("linkedin is required"),
+    // website_url: Yup.string().required("website is required"),
+})
 
 
 export default function Settings() {
     const avtarImage = "avtar/merms-user.png";
+
+    const [intialData, setInitialData] = useState({
+        external_links: {},
+        personal_data: {},
+    })
+
+    const {data:profileInfo, isFetching, isError, error} = useQuery({
+        queryKey: queryKeys.profile_data,
+        queryFn: () => {
+            let reqData = {
+                token: localStorage.getItem('token'), // USER TOKEN
+                uid: localStorage.getItem('uid') // USER UID
+            }
+            return profileDetails(reqData)
+        }
+    })
+    // const profileData = profileInfo?.data // profile data
+    useMemo(()=>{
+        const data = profileInfo?.data
+        setInitialData({external_links: data?.external_links, personal_data: data?.personal_data})
+    },[profileInfo])
+    // console.log('INI', intialData)
+    
+
+    const updateProfile = (values, helpers) => {
+        console.log('Values', values)
+    }
+
+    const updateLinks = (values, helpers) => {
+        console.log('Values', values)
+    }
+
     return (
         <>
             <BreadcrumbComBS title='Settings' paths={['Dashboard', 'Settings']}/>
@@ -12,7 +70,21 @@ export default function Settings() {
             {/*    <div className="vh-100 col-12 flex align-items-center">Coming Soon</div>*/}
             {/*</div>*/}
 
-
+            {isFetching ? 
+                <>
+                <div className="row">
+                    <div className="col-12">
+                    <p className="text-mute">Loading...</p>
+                    </div>
+                </div>
+                </>
+            : isError ? 
+                <div className="row">
+                <div className="col-12">
+                    <p className="text-danger">{error?.message}</p>
+                </div>
+                </div>
+                :
                 <div className="row account-contant">
                     <div className="col-12">
                         <div className="card card-statistics">
@@ -29,7 +101,7 @@ export default function Settings() {
                                                             className="img-fluid" alt="user"/>
                                                     </div>
                                                     <div className="profile pt-4">
-                                                    <h4 className="mb-1">Alice Williams</h4>
+                                                        <h4 className="mb-1">{intialData?.personal_data?.lastname} {intialData?.personal_data?.firstname}</h4>
                                                         <div style={{padding: '10px'}}>
                                                             <hr/>
                                                         </div>
@@ -54,49 +126,50 @@ export default function Settings() {
                                                 <h5 className="mb-0 py-2">Edit Your Personal Settings</h5>
                                             </div>
                                             <div className="p-4">
-                                            <form>
+                                                <Formik
+                                                    initialValues={intialData?.personal_data}
+                                                    validationSchema={profileValidationSchema}
+                                                    onSubmit={updateProfile}
+                                                >
+                                                    {(props) => {
+                                                    return (
+                                                        <Form className=''>
                                                             <div className="form-row">
                                                                 <div className="form-group col-md-12">
-                                                        <label htmlFor="name1">First Name</label>
-                                                        <input type="text" className="form-control" id="name1"
-                                                               value="Alice"/>
+                                                                    <label htmlFor="name1">First Name {(props.errors.firstname && props.touched.firstname) && <span className="text-danger">*</span>}</label>
+                                                                    <input type="text" className="form-control" name="firstname" value={props.values?.firstname} onChange={props.handleChange} />
                                                                 </div>
                                                                 <div className="form-group col-md-12">
-                                                        <label htmlFor="name1">Last Name</label>
-                                                        <input type="text" className="form-control" id="name1"
-                                                               value="Williams"/>
+                                                                    <label htmlFor="name1">Last Name {(props.errors.lastname && props.touched.lastname) && <span className="text-danger">*</span>}</label>
+                                                                    <input type="text" className="form-control" name="lastname" value={props.values?.lastname} onChange={props.handleChange} />
                                                                 </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"/>
+                                                                    <label htmlFor="name1">Account Name {(props.errors.account_name && props.touched.account_name) && <span className="text-danger">*</span>}</label>
+                                                                    <input type="text" className="form-control" name="account_name" value={props.values?.account_name} onChange={props.handleChange} />
                                                                 </div>
                                                                 {/*<div className="form-group col-md-12">*/}
                                                                 {/*    <label htmlFor="title1">Email</label>*/}
-                                                    {/*    <input type="text" className="form-control" id="title1"*/}
+                                                                {/*    <input type="text" className="form-control" name="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"
-                                                               value="(01) 97 563 15613"/>
+                                                                    <label htmlFor="phone1">Phone Number {(props.errors.phone && props.touched.phone) && <span className="text-danger">*</span>}</label>
+                                                                    <input type="text" className="form-control" name="phone" value={props.values?.phone} onChange={props.handleChange} />
                                                                 </div>
                                                                 <div className="form-group col-md-12">
-                                                        <label htmlFor="email1">Email</label>
-                                                        <input type="email" className="form-control" id="email1"
-                                                               value="alicewilliams@gmail.com"/>
+                                                                    <label htmlFor="email1">Email {(props.errors.email && props.touched.email) && <span className="text-danger">*</span>}</label>
+                                                                    <input type="text" className="form-control" name="email" value={props.values?.email} onChange={props.handleChange} />
                                                                 </div>
                                                             </div>
                                                             <div className="form-group">
-                                                    <label htmlFor="add1">Address</label>
-                                                    <input type="text" className="form-control" id="add1"
-                                                           value="17504 Carlton Cuevas Rd, Gulfport, MS, 39503"/>
-                                                </div>
-                                                <div className="form-group">
-                                                    <label htmlFor="add2">Address 2</label>
-                                                    <input type="text" className="form-control" id="add2"
-                                                           value="1234 North Avenue Luke Lane, South Bend, IN 360001"/>
+                                                                <label htmlFor="add1">Address {(props.errors.full_address && props.touched.full_address) && <span className="text-danger">*</span>}</label>
+                                                                <input type="text" className="form-control" name="full_address" value={props.values?.full_address} onChange={props.handleChange} />
                                                             </div>
+                                                            {/*<div className="form-group">*/}
+                                                            {/*    <label htmlFor="add2">Address 2</label>*/}
+                                                            {/*    <input type="text" className="form-control" id="add2"*/}
+                                                            {/*           value="1234 North Avenue Luke Lane, South Bend, IN 360001"/>*/}
+                                                            {/*</div>*/}
 
                                                             {/*<div className="form-row">*/}
                                                             {/*    <div className="form-group col-md-4">*/}
@@ -138,8 +211,10 @@ export default function Settings() {
                                                                 <button type="submit" className="btn btn-primary">Update Profile
                                                                 </button>
                                                             </div>
-
-                                            </form>
+                                                        </Form>
+                                                    );
+                                                    }}
+                                                </Formik>
                                             </div>
                                         </div>
                                     </div>
@@ -149,47 +224,50 @@ export default function Settings() {
                                                 <h5 className="mb-0 py-2">Your External Link</h5>
                                             </div>
                                             <div className="p-4">
-                                            <form>
+                                                <Formik
+                                                    initialValues={intialData?.external_links}
+                                                    validationSchema={linksValidationSchema}
+                                                    onSubmit={updateLinks}
+                                                >
+                                                    {(props) => {
+                                                    return (
+                                                        <Form className=''>            
                                                             <div className="form-group">
-                                                    <label htmlFor="fb">Facebook URL:</label>
-                                                    <input type="text" className="form-control" id="fb"
-                                                           value="https://www.facebook.com/"/>
+                                                                <label htmlFor="fb">Facebook URL: {(props.errors.facebook_url && props.touched.facebook_url) && <span className="text-danger">*</span>}</label>
+                                                                <input type="text" className="form-control" name="facebook_url" value={props.values?.facebook_url} onChange={props.handleChange} />
                                                             </div>
                                                             <div className="form-group">
-                                                    <label htmlFor="tr">Twitter URL:</label>
-                                                    <input type="text" className="form-control" id="tr"
-                                                           value="https://twitter.com/"/>
+                                                                <label htmlFor="tr">Twitter URL: {(props.errors.twitter_url && props.touched.twitter_url) && <span className="text-danger">*</span>}</label>
+                                                                <input type="text" className="form-control" name="twitter_url" value={props.values?.twitter_url} onChange={props.handleChange} />
                                                             </div>
 
                                                             <div className="form-group">
-                                                    <label htmlFor="br">Blogger URL:</label>
-                                                    <input type="text" className="form-control" id="br"
-                                                           value="https://www.blogger.com"/>
+                                                                <label htmlFor="br">Blogger URL: {(props.errors.blogger_url && props.touched.blogger_url) && <span className="text-danger">*</span>}</label>
+                                                                <input type="text" className="form-control" name="blogger_url" value={props.values?.blogger_url} onChange={props.handleChange} />
                                                             </div>
 
                                                             <div className="form-group">
-                                                    <label htmlFor="go">Google+ URL:</label>
-                                                    <input type="text" className="form-control" id="go"
-                                                           value="https://plus.google.com/discover"/>
+                                                                <label htmlFor="go">Google+ URL: {(props.errors.google_url && props.touched.google_url) && <span className="text-danger">*</span>}</label>
+                                                                <input type="text" className="form-control" name="google_url" value={props.values?.google_url} onChange={props.handleChange} />
                                                             </div>
 
                                                             <div className="form-group">
-                                                    <label htmlFor="li">LinkedIn URL:</label>
-                                                    <input type="text" className="form-control" id="li"
-                                                           value="https://in.linkedin.com/"/>
+                                                                <label htmlFor="li">LinkedIn URL: {(props.errors.linked_url && props.touched.linked_url) && <span className="text-danger">*</span>}</label>
+                                                                <input type="text" className="form-control" name="linked_url" value={props.values?.linked_url} onChange={props.handleChange} />
                                                             </div>
 
                                                             <div className="form-group">
-                                                    <label htmlFor="we">Website URL:</label>
-                                                    <input type="text" className="form-control" id="we"
-                                                           value="https://yourwebsite.com"/>
+                                                                <label htmlFor="we">Website URL: {(props.errors.website_url && props.touched.website_url) && <span className="text-danger">*</span>}</label>
+                                                                <input type="text" className="form-control" name="website_url" value={props.values?.website_url} onChange={props.handleChange} />
                                                             </div>
                                                             <div style={{textAlign: "right"}}>
                                                                 <button type="submit" className="btn btn-primary">Update Links
                                                                 </button>
                                                             </div>
-
-                                            </form>
+                                                        </Form>
+                                                    );
+                                                    }}
+                                                </Formik>
                                             </div>
                                         </div>
                                     </div>
@@ -198,7 +276,7 @@ export default function Settings() {
                         </div>
                     </div>
                 </div>
-
+            }
         </>
     )
 }

src/component/start/Start.jsx

@@ -0,0 +1,82 @@
+import React from "react";
+import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
+import getImage from "../../utils/getImage";
+
+export default function Start() {
+
+    const bgImg = getImage("side-banner.jpg");
+
+    return (
+        <>
+            <BreadcrumbComBS title='Get Started...' paths={['Dashboard', 'Start']}/>
+            <div className="row">
+                <div className="col-xl-3 col-md-6">
+                    <div className="card card-statistics text-center py-3"
+                         style={{minHeight: '550px', borderRadius: '10px', backgroundImage: `url(${bgImg})`}}>
+                    </div>
+                </div>
+
+                <div className="col-xl-3 col-md-6">
+                    <div className="card card-statistics text-center py-3">
+                        <div className="card-body pricing-content">
+                            <div className="pricing-content-card">
+                                <h5>Start with</h5>
+                                <h2 className="text-primary pt-3"><a href="/product/A000001">Personal Website</a></h2>
+                                <ul className="py-2">
+                                    <li>post jobs</li>
+                                    <li>advanced instructors search</li>
+                                    <li>invite candidates</li>
+                                    <li>post events</li>
+                                    <li>cancel any time</li>
+                                </ul>
+                                <div className="pt-2"><a href="/product/A000001"
+                                                         className="btn btn-primary btn-round btn-sm">Start</a></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div className="col-xl-3 col-md-6">
+                    <div className="card card-statistics text-center py-3">
+                        <div className="card-body pricing-content">
+                            <div className="pricing-content-card">
+                                <h5>Start with</h5>
+                                <h2 className="text-primary pt-3"><a href="/product/A000002">Business Website</a></h2>
+                                <ul className="py-2">
+                                    <li>post jobs</li>
+                                    <li>advanced instructors search</li>
+                                    <li>invite candidates</li>
+                                    <li>post events</li>
+                                    <li>cancel any time</li>
+                                </ul>
+                                <div className="pt-2"><a href="/product/A000001"
+                                                         className="btn btn-primary btn-round btn-sm">Start</a></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div className="col-xl-3 col-md-6">
+                    {/*<div className="card card-statistics text-center py-3">*/}
+                    {/*<div className="card-body pricing-content">*/}
+                    {/*<div className="pricing-content-card">*/}
+                    {/*    <h5>small</h5>*/}
+                    {/*    <h2 className="text-primary pt-3">$80</h2>*/}
+                    {/*    <p className="text-primary pb-3">/ Monthly</p>*/}
+                    {/*    <ul className="py-2">*/}
+                    {/*        <li>post jobs</li>*/}
+                    {/*        <li>advanced instructors search</li>*/}
+                    {/*        <li>invite candidates</li>*/}
+                    {/*        <li>post events</li>*/}
+                    {/*        <li>cancel any time</li>*/}
+                    {/*    </ul>*/}
+                    {/*    <div className="pt-2"><a href="javascript:void(0)" className="btn btn-inverse-secondary btn-round btn-sm">go premium</a></div>*/}
+                    {/*</div>*/}
+                    {/*</div>*/}
+                    {/*</div>*/}
+                </div>
+            </div>
+
+        </>
+    )
+}

src/component/traffic/Traffic.jsx

@@ -0,0 +1,44 @@
+import React from "react";
+import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
+import TrafficChart from "./TrafficChart";
+
+
+export default function Traffic() {
+
+    return (
+        <>
+            <BreadcrumbComBS title='Traffic' paths={['Dashboard', 'Traffic']}/>
+            <div className="row">
+                <div className="col-lg-4">
+                    <div className="card card-statistics" style={{minHeight: '350px', borderRadius: '10px', backgroundColor: 'aliceblue'}}>
+                        <div className="card-header">
+                            <div className="card-heading">
+                                <h4 className="card-title">Site Traffic Monitoring</h4>
+                            </div>
+                        </div>
+                        <div className="card-body">
+
+
+
+                        </div>
+                    </div>
+                </div>
+                <div className="col-lg-8">
+                    <div className="card card-statistics">
+                        <div className="card-header">
+                            <div className="card-heading">
+                                <h4 className="card-title">Plot</h4>
+                            </div>
+                        </div>
+                        <div className="card-body">
+                            <div className="apexchart-wrapper">
+                                <TrafficChart />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </>
+    )
+}

src/component/traffic/TrafficChart.jsx

@@ -0,0 +1,108 @@
+import { useState } from "react";
+import ReactApexChart from "react-apexcharts";
+
+    const TrafficChart = () => {
+        const [state, setState] = useState({
+          
+            series: [
+              {
+                // name: "High - 2013",
+                name: 'Professional Website',
+                data: [28, 29, 33, 36, 32, 32, 33, 33, 36, 32, 32, 33]
+              },
+              {
+                // name: "Low - 2013",
+                name: 'Personal Website',
+                data: [12, 11, 14, 18, 17, 13, 13, 14, 18, 17, 13, 13]
+              },
+              {
+                // name: "Low - 2013",
+                name: 'Personal Forum',
+                data: [10, 11, 14, 19, 18, 23, 17, 14, 10, 17, 23, 10]
+              },
+              {
+                // name: "High - 2013",
+                name: 'Professional Forum',
+                data: [20, 19, 30, 36, 30, 35, 33, 33, 36, 32, 32, 30]
+              }
+            ],
+            options: {
+              chart: {
+                height: 350,
+                type: 'line',
+                dropShadow: {
+                  enabled: true,
+                  color: '#000',
+                  top: 18,
+                  left: 7,
+                  blur: 10,
+                  opacity: 0.5
+                },
+                zoom: {
+                  enabled: false
+                },
+                toolbar: {
+                  show: false
+                }
+              },
+              colors: ['#77B6EA', '#545454', '#F50898','#213ece'],
+              dataLabels: {
+                enabled: true,
+              },
+              stroke: {
+                curve: 'smooth'
+              },
+              title: {
+                text: 'Recent Sites Traffic',
+                align: 'left'
+              },
+              grid: {
+                borderColor: '#e7e7e7',
+                row: {
+                  colors: ['#f3f3f3', 'transparent'], // takes an array which will be repeated on columns
+                  opacity: 0.5
+                },
+              },
+              markers: {
+                size: 1
+              },
+              xaxis: {
+                categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'],
+                title: {
+                  text: 'Month'
+                }
+              },
+              yaxis: {
+                title: {
+                  text: 'Visits'
+                },
+                min: 5,
+                max: 40
+              },
+              legend: {
+                position: 'top',
+                horizontalAlign: 'right',
+                floating: true,
+                offsetY: -25,
+                offsetX: -5
+              }
+            },
+          
+          
+        });
+
+        
+
+        return (
+          <div>
+            <div id="chart">
+                <ReactApexChart options={state.options} series={state.series} type="line" height={450} />
+              </div>
+            <div id="html-dist"></div>
+          </div>
+        );
+      }
+
+
+
+      export default TrafficChart

src/helpers/sortObjectByListOrder.js

@@ -0,0 +1,14 @@
+const sortObjectByListOrder = (data) => {
+    const sortedEntriesByValue = Object.entries(data).sort((a, b) => {
+        if(a[1].list_order > b[1].list_order){
+            return 1
+        }else{
+            return -1
+        }
+    }); // Sorts numerically by value
+
+    const sortedObjectByValue = Object.fromEntries(sortedEntriesByValue);
+    return sortedObjectByValue
+}
+
+export default sortObjectByListOrder

src/links/siteLinks.js

@@ -3,6 +3,8 @@ const siteLinks = {
     help: '/help',
     home: '/',
     dash: '/dash',
+    traffic: '/traffic',
+    start: '/start',
     profile_complete: '/profile-complete',
     product: '/product/*',
     contacts: '/contacts',

src/services/queryKeys.js

@@ -10,6 +10,7 @@ const queryKeys = {
     myProductConfig: ['myproduct_config'],
     productTemplateData: ['product_template_data'],
     subscriptions: ['subscriptions'],
+    profile_data: ['profile_data'],
     
     dashboard: ['dashboard'],
     topBar: ['top-bar'],

src/services/services.js

@@ -26,7 +26,8 @@ const postAuxEnd = (path, postData, media=false) => {
     return axios.post(`${basePath}${path}`, postData).then(res => {
         return res
     }).catch(err => {
-        throw new Error(err.response.data.msg);
+        // console.log('res', err.response.data)
+        throw new Error(err.response.data.error_message);
     })
 }
 
@@ -75,6 +76,14 @@ export const topBar = (reqData) => {
     return postAuxEnd(`/panel/account/bar`, postData, false)
 }
 
+// FUNCTION TO GET PROFILE DATA
+export const profileDetails = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/account/profile`, postData, false)
+}
+
 // FUNCTION TO GET PRODUCT BY ID
 export const MyProductData = (reqData) => {
     let postData = {
@@ -98,7 +107,7 @@ export const getCalendarEvents = (reqData) => {
     return postAuxEnd(`/panel/account/calendar`, postData, false)
 }
 
-// FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION
+// FUNCTION TO GET CONTACT DATA
 export const contactData = (reqData) => {
     let postData = {
         ...reqData,
@@ -106,6 +115,14 @@ export const contactData = (reqData) => {
     return postAuxEnd(`/panel/contacts`, postData, false)
 }
 
+// FUNCTION TO GET COMMENTS DATA
+export const commentsData = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/comments`, postData, false)
+}
+
 // FUNCTION TO GET DASHBOARD PRODUCT URL DATA SECTION
 export const productsURL = (reqData) => {
     let postData = {
@@ -229,6 +246,14 @@ export const getCommonPractice = (reqData) => {
     return postAuxEnd(`/panel/common/practice`, postData, false)
 }
 
+// FUNCTION TO SET EXTERNAL URL
+export const setExternalURL = (reqData) => {
+    let postData = {
+        ...reqData
+    }
+    return postAuxEnd('/panel/myproduct/external-url', postData, false)
+}
+
 
 
 

src/views/StartPage.jsx

@@ -0,0 +1,7 @@
+
+import Start from "../component/start/Start";
+
+
+export default function StartPage(){
+    return <Start />
+}

src/views/TrafficPage.jsx

@@ -0,0 +1,8 @@
+import React from 'react'
+import Traffic from "../component/traffic/Traffic";
+
+export default function TrafficPage() {
+    return (
+        <Traffic />
+    )
+}