diff --git a/src/assets/img/arrow-next.png b/src/assets/img/arrow-next.png new file mode 100644 index 0000000..c3fb454 Binary files /dev/null and b/src/assets/img/arrow-next.png differ diff --git a/src/assets/img/check-mail.png b/src/assets/img/check-mail.png new file mode 100644 index 0000000..a18b1f8 Binary files /dev/null and b/src/assets/img/check-mail.png differ diff --git a/src/component/auth/Signup2.jsx b/src/component/auth/Signup2.jsx index 7628885..0d26254 100644 --- a/src/component/auth/Signup2.jsx +++ b/src/component/auth/Signup2.jsx @@ -8,6 +8,7 @@ import { Link } from 'react-router-dom' import siteLinks from '../../links/siteLinks' import { useMutation } from '@tanstack/react-query'; import { signUpUser } from '../../services/services'; +import getImage from '../../utils/getImage'; const validationSchema = Yup.object().shape({ email: Yup.string() @@ -130,8 +131,9 @@ export default function Signup2() { :
-
-

Check your email to continue.

+
+

Check your email to continue.

+ mail-alert Home
diff --git a/src/component/home/ProductsURL.jsx b/src/component/home/ProductsURL.jsx index 190c4ab..b055465 100644 --- a/src/component/home/ProductsURL.jsx +++ b/src/component/home/ProductsURL.jsx @@ -2,6 +2,7 @@ import React from 'react' import { productsURL } from '../../services/services' import { useQuery } from '@tanstack/react-query' import queryKeys from '../../services/queryKeys' +import getImage from '../../utils/getImage' export default function ProductsURL() { @@ -70,7 +71,12 @@ export default function ProductsURL() { {item?.status} - + {/* */} + + + next + + ) })} diff --git a/src/component/home/RecentActions.jsx b/src/component/home/RecentActions.jsx index a3a0b49..ef7c4c7 100644 --- a/src/component/home/RecentActions.jsx +++ b/src/component/home/RecentActions.jsx @@ -10,7 +10,7 @@ export default function RecentActions() { queryFn: () => recentActions() }) - const actionData = dataAction?.data?.action_data + const actionData = dataAction?.data?.recent_actions return ( <> @@ -43,7 +43,7 @@ export default function RecentActions() {

Last Update

-

{dataAction?.data?.action_data?.last_update}

+

{dataAction?.data?.last_update}

{/**/} @@ -62,19 +62,19 @@ export default function RecentActions() {

Initial

-

{actionData?.initial}

+

{dataAction?.data?.initial}

Processing

-

{actionData?.processing}

+

{dataAction?.data?.processing}

Verifying

-

{actionData?.verifying}

+

{dataAction?.data?.verifying}

Completed

-

{actionData?.completed}

+

{dataAction?.data?.completed}

@@ -89,16 +89,16 @@ export default function RecentActions() { - {actionData && actionData?.actions.map((action, index) => { + {actionData && actionData?.map((action, index) => { let bgColor = action?.status == '5' ? 'badge-success-inverse' : action?.status == '3' ? 'badge-info-inverse' : action?.status == '0' ? 'badge-warning-inverse' : 'badge-primary-inverse' let text = action?.status == '5' ? 'completed' : action?.status == '3' ? 'verifying' : action?.status == '0' ? 'processing' : 'processing' return ( - {action?.no} - {action?.description} - {new Date(action?.date).toDateString()} + {action?.id} + {action?.action_label} + {new Date(action?.added).toDateString()} - + ) diff --git a/src/component/layout/layoutcom/UserHeader.jsx b/src/component/layout/layoutcom/UserHeader.jsx index 40aeea9..9a5582c 100644 --- a/src/component/layout/layoutcom/UserHeader.jsx +++ b/src/component/layout/layoutcom/UserHeader.jsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useRef } from "react"; import getImage from "../../../utils/getImage"; import { Link, useNavigate } from "react-router-dom"; import { useSelector } from "react-redux"; @@ -9,6 +9,8 @@ export default function UserHeader(){ const { userDetails } = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active + const nav_menu = useRef(null) + const toggleSidebar = (e) => { e.preventDefault() document.body.classList.toggle('sidebar-toggled') @@ -32,6 +34,11 @@ export default function UserHeader(){ window.location.reload() } + const toggleMenu = (e) => { + // e.preventDefault() + nav_menu.current.classList.toggle('show') + } + return (