updated site logo

src/App.css

@@ -22,10 +22,9 @@
 }
 
 .login-links a {
-  font-size: 15px;
+  font-size: 14px;
-  font-weight: 700;
   padding: 0px 20px;
-  border-right: 2px solid;
+  border-right: 2px solid #6c757d;
   cursor: pointer;
 }
 
@@ -36,3 +35,8 @@
 .login-links a:last-child{
   border: 0px;
 }
+
+button{
+  font-size: 1rem!important;
+  font-weight: 700!important;
+}

src/component/home/Products.jsx

@@ -1,29 +1,34 @@
-import { useQuery } from '@tanstack/react-query'
+import React, {useEffect} from 'react'
-import React from 'react'
+import { useMutation } from '@tanstack/react-query'
-import { productData } from '../../services/services'
+import { productsData } from '../../services/services'
-import queryKeys from '../../services/queryKeys'
 import productPath from "../../utils/productpath";
 import { Link } from 'react-router-dom';
-export default function Products() {
 
-    const {data, isFetching, isError, error} = useQuery({
+
-        queryKey: queryKeys.product,
+export default function Products() {
-        queryFn: () => productData()
+    const getProductsData = useMutation({
+        mutationFn: (reqData) => {
+            return productsData(reqData)
+        },
+        onError: (error) => {
+            console.log(error)
+        },
+        onSuccess: (res) => {
+            if(res?.data?.resultCode != '0'){
+                throw({message: 'Something went wrong'})
+            }
+        }
     })
-/*
+
-   {
+    useEffect(()=>{
-      "banner": "p1.jpg",
+      let reqData = {
-      "description": "Your personal professional web presence",
+        token: localStorage.getItem('token'), // USER TOKEN
-      "id": 1,
+        uid: localStorage.getItem('uid') // USER UID
-      "name": "Personal Website",
+      }
-      "product_id": "A000001",
+      getProductsData.mutate(reqData)
-      "product_uid": "e92282b4-3ee1-4026-92ac-12cfd214b43a",
+    },[])
-      "status": 5,
+    
-      "status_text": "Activate Now"
+    const products = getProductsData?.data?.data?.products_data // PRODUCTS DATA
-    },
- */
-    //const products = data?.data?.products_list?.products
-    const products = data?.data?.products_list
 
   return (
     <>
@@ -32,7 +37,7 @@ export default function Products() {
                 <h4 className="card-title">My Products</h4>
             </div>
             <div className="card-body pb-0">
-            {isFetching ? 
+            {getProductsData?.isPending ? 
                 <>
                     <div className="row">
                         <div className="col-12">
@@ -40,10 +45,10 @@ export default function Products() {
                         </div>
                     </div>
                 </>
-                : isError ?
+                : getProductsData?.isPending ?
                 <div className="row">
                     <div className="col-12">
-                        <p className='text-danger'>{error.message}</p>
+                        <p className='text-danger'>{getProductsData?.error?.message}</p>
                     </div>
                 </div>
                 :

src/component/layout/layoutcom/UserFooter.jsx

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

src/component/layout/layoutcom/UserHeader.jsx

@@ -38,8 +38,8 @@ export default function UserHeader(){
                 <div className="navbar-header d-flex align-items-center">
                     <a href="#" onClick={toggleSidebar} className="mobile-toggle"><i className="ti ti-align-right"></i></a>
                     <a className="navbar-brand" href="/dash">
-                        <img src={getImage('logo-light.png')} className="img-fluid logo-desktop" alt="logo"/>
+                        <img src={getImage('logo-pink.png')} className="img-fluid logo-desktop" alt="logo"/>
-                        <img src={getImage('logo-icon.png')} className="img-fluid logo-mobile" alt="logo"/>
+                        <img src={getImage('logo-pink.png')} className="img-fluid logo-mobile" alt="logo"/>
                     </a>
                 </div>
                 <button onClick={removeSidebar} className="navbar-toggler" type="button" data-bs-toggle="collapse"

src/css/partials/_layout.scss

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

src/css/partials/_typography.scss

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

src/css/partials/_variables.scss

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

src/services/services.js

@@ -79,35 +79,42 @@ export const topBar = (reqData) => {
 export const recentActions = (reqData) => {
     let postData = {
         ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
     }
     //return getAuxEnd(`/panel/account/actions`)
     return postAuxEnd(`/panel/account/actions`, postData, false)
 }
 
 // FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION
-export const productData = () => {
+export const productsData = (reqData) => {
-     let postData = {
+    let postData = {
-        "token":"b",
+        ...reqData,
-        "uid": 'h'
     }
     return postAuxEnd(`/panel/account/products`, postData, false)
 }
 
+
+
+
+
 // FUNCTION TO GET DASHBOARD PRODUCT URL DATA SECTION
-export const productsURL = () => {
+export const productsURL = (reqData) => {
-    return getAuxEnd(`/panel/account/products/url`)
+    let postData = {
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    return postAuxEnd(`/panel/account/products/url`, postData, false)
+    // return getAuxEnd(`/panel/account/products/url`)
 }
 
-
-
-
-
 // FUNCTION TO REGISTER USER
 export const signUpUser = (reqData) => {
     let postData = {
         ...reqData
     }
-    return postAuxEnd('/panel/auth/register', postData, false)
+    return postAuxEnd('/panel/Register', postData, false)
 }
 
 // FUNCTION TO VERIFY EMAIL
@@ -115,7 +122,7 @@ export const verifyEmail = (reqData) => {
     let postData = {
         ...reqData
     }
-    return postAuxEnd('/panel/auth/register/verify', postData, false)
+    return postAuxEnd('/panel/Register/verify', postData, false)
 }
 
 // FUNCTION TO COMPLETE REGISTRATION
@@ -123,15 +130,17 @@ export const completeRegistration = (reqData) => {
     let postData = {
         ...reqData
     }
-    return postAuxEnd('/panel/auth/register/complete', postData, false)
+    return postAuxEnd('/panel/Register/complete', postData, false)
 }
 
 // FUNCTION TO SUBSCRIBE
 export const subscribe = (reqData) => {
     let postData = {
-        ...reqData
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
     }
-    return postAuxEnd('/panel/myproduct/subscription', postData, false)
+    return postAuxEnd(`/panel/myproduct/subscription`, postData, false)
 }
 
 
@@ -144,27 +153,44 @@ export const recoverPWD = (reqData) => {
 }
 
 // FUNCTION TO GET CALENDAR EVENTS
-export const getCalendarEvents = () => {
+export const getCalendarEvents = (reqData) => {
-   // return getAuxEnd(`/panel/account/calendar`)
     let postData = {
-        "a":"b"
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
     }
     return postAuxEnd(`/panel/account/calendar`, postData, false)
 }
 
 // FUNCTION TO GET MY PRODUCT PROVISION DATA
 export const productProvision = (reqData) => {
-    const postData = { ...reqData }
+    let postData = {
-    return getAuxEnd(`/panel/myproduct/provision`, postData)
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    return postAuxEnd(`/panel/myproduct/provision`, postData, false)
+    // return getAuxEnd(`/panel/myproduct/provision`, postData)
 }
 
 // FUNCTION TO GET DASHBOARD PRODUCT DATA SECTION
-export const contactData = () => {
+export const contactData = (reqData) => {
-    return getAuxEnd(`/panel/contacts`)
+    let postData = {
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    return postAuxEnd(`/panel/contacts`, postData, false)
+    // return getAuxEnd(`/panel/contacts`)
 }
 
 export const MyProductData = (productID) => {
     const reqData = { product_id : productID}
-    //console.log(reqData)
+    let postData = {
-    return getAuxEnd(`/panel/myproduct/dash`,reqData)
+        ...reqData,
+        token: localStorage.getItem('token'), // USER TOKEN
+        uid: localStorage.getItem('uid') // USER UID
+    }
+    return postAuxEnd(`/panel/myproduct/dash`, postData, false)
+    // return getAuxEnd(`/panel/myproduct/dash`,reqData)
 }

src/utils/getImage.js

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