diff --git a/src/SiteRoutes.jsx b/src/SiteRoutes.jsx
index a868b6f..e9a0064 100644
--- a/src/SiteRoutes.jsx
+++ b/src/SiteRoutes.jsx
@@ -1,4 +1,4 @@
-import { lazy, Suspense } from 'react'
+import { Suspense } from 'react'
import { Routes, Route } from 'react-router-dom'
import RouteLinks from './RouteLinks'
diff --git a/src/components/Icons.jsx b/src/components/Icons.jsx
index 5a4b03c..a946309 100644
--- a/src/components/Icons.jsx
+++ b/src/components/Icons.jsx
@@ -16,41 +16,41 @@ import { FaLongArrowAltRight, FaFilter } from "react-icons/fa";
export default function Icons({name, className}) {
return (
<>
- {name.toLowerCase() == 'dashboard' ?
+ {name.toLowerCase() === 'dashboard' ?
- : name.toLowerCase() == 'money' ?
+ : name.toLowerCase() === 'money' ?
- :name.toLowerCase() == 'dot' ?
+ :name.toLowerCase() === 'dot' ?
- :name.toLowerCase() == 'people' ?
+ :name.toLowerCase() === 'people' ?
- :name.toLowerCase() == 'product' ?
+ :name.toLowerCase() === 'product' ?
- :name.toLowerCase() == 'trash' ?
+ :name.toLowerCase() === 'trash' ?
- :name.toLowerCase() == 'eye' ?
+ :name.toLowerCase() === 'eye' ?
- :name.toLowerCase() == 'next' ?
+ :name.toLowerCase() === 'next' ?
- :name.toLowerCase() == 'prev' ?
+ :name.toLowerCase() === 'prev' ?
- :name.toLowerCase() == 'edit' ?
+ :name.toLowerCase() === 'edit' ?
- :name.toLowerCase() == 'settings' ?
+ :name.toLowerCase() === 'settings' ?
- :name.toLowerCase() == 'message' ?
+ :name.toLowerCase() === 'message' ?
- :name.toLowerCase() == 'right-panel' ?
+ :name.toLowerCase() === 'right-panel' ?
- :name.toLowerCase() == 'google' ?
+ :name.toLowerCase() === 'google' ?
- :name.toLowerCase() == 'apple' ?
+ :name.toLowerCase() === 'apple' ?
- :name.toLowerCase() == 'sales' ?
+ :name.toLowerCase() === 'sales' ?
- :name.toLowerCase() == 'arrow-right' ?
+ :name.toLowerCase() === 'arrow-right' ?
- :name.toLowerCase() == 'filter' ?
+ :name.toLowerCase() === 'filter' ?
:
null
diff --git a/src/components/auth/LoginCom.jsx b/src/components/auth/LoginCom.jsx
index 7fed9db..f771d70 100644
--- a/src/components/auth/LoginCom.jsx
+++ b/src/components/auth/LoginCom.jsx
@@ -1,6 +1,6 @@
-import React, { useEffect, useState } from 'react'
+import React, { useState } from 'react'
import { useDispatch } from 'react-redux'
-import { useLocation, useNavigate, Link } from 'react-router-dom'
+import { useNavigate, Link } from 'react-router-dom'
import { useMutation } from '@tanstack/react-query'
import {Formik, Form} from 'formik'
import * as Yup from "yup";
@@ -10,7 +10,7 @@ import { updateUserDetails } from "../../store/UserDetails";
import { loginUser } from '../../services/siteServices'
import RouteLinks from '../../RouteLinks'
-import Icons from '../Icons'
+// import Icons from '../Icons'
const initialValues = {
@@ -49,6 +49,7 @@ export default function LoginCom() {
const data = {jwt_token}
dispatch(updateUserDetails({ ...data, ...user }));
}
+ setLoading(false)
navigate(RouteLinks.homePage, {state:{proceed:'true'}}) // later add redux to dispatch state
}
})
diff --git a/src/components/breadcrumb/BreadcrumbCom.jsx b/src/components/breadcrumb/BreadcrumbCom.jsx
index d4b7b30..a5bbf88 100644
--- a/src/components/breadcrumb/BreadcrumbCom.jsx
+++ b/src/components/breadcrumb/BreadcrumbCom.jsx
@@ -1,25 +1,24 @@
-import { useEffect, useState } from 'react'
import { MdKeyboardDoubleArrowRight } from 'react-icons/md'
import { TiHomeOutline } from 'react-icons/ti'
import DashboardHeader from '../layouts/DashboardHeader'
export default function BreadcrumbCom({title, span, paths}) {
- const [stickNav, setStickNav] = useState(false)
+ // const [stickNav, setStickNav] = useState(false)
- useEffect(()=>{
- // var rect = navRef?.current?.getBoundingClientRect()?.bottom;
- var rect = 10;
- window.addEventListener('scroll', ()=>{
- if(window.scrollY >= rect + 20){
- setStickNav(true)
- console.log('tru')
- }else{
- setStickNav(false)
- console.log('false')
- }
- })
- },[])
+ // useEffect(()=>{
+ // // var rect = navRef?.current?.getBoundingClientRect()?.bottom;
+ // var rect = 10;
+ // window.addEventListener('scroll', ()=>{
+ // if(window.scrollY >= rect + 20){
+ // setStickNav(true)
+ // console.log('tru')
+ // }else{
+ // setStickNav(false)
+ // console.log('false')
+ // }
+ // })
+ // },[])
return (
// ${stickNav ? 'sticky top-0 transition-[top] duration-1000 shadow-md shadow-black' : '-top-[100px] static'}
@@ -35,7 +34,7 @@ export default function BreadcrumbCom({title, span, paths}) {
{paths.map((item, index) => (
))}
diff --git a/src/components/customer/CustomerCom.jsx b/src/components/customer/CustomerCom.jsx
index 1ae1493..29100d3 100644
--- a/src/components/customer/CustomerCom.jsx
+++ b/src/components/customer/CustomerCom.jsx
@@ -6,9 +6,9 @@ import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons'
import { getCustomers } from '../../services/siteServices'
import getDateFromDateString from '../../helpers/GetDateFromDateString';
-import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
-import localImgLoader from '../../helpers/localImageLoader';
-import RouteLinks from '../../RouteLinks';
+// import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
+// import localImgLoader from '../../helpers/localImageLoader';
+// import RouteLinks from '../../RouteLinks';
export default function CustomerCom() {
diff --git a/src/components/home/HomeCom.jsx b/src/components/home/HomeCom.jsx
index b70ebec..b88233e 100644
--- a/src/components/home/HomeCom.jsx
+++ b/src/components/home/HomeCom.jsx
@@ -124,7 +124,7 @@ export default function HomeCom() {
|
@@ -153,6 +153,8 @@ export default function HomeCom() {
)
+ }else{
+ return null
}
}
)
diff --git a/src/components/layouts/DashboardHeader.jsx b/src/components/layouts/DashboardHeader.jsx
index 49a3a69..0b1785c 100644
--- a/src/components/layouts/DashboardHeader.jsx
+++ b/src/components/layouts/DashboardHeader.jsx
@@ -47,7 +47,7 @@ export default function DashboardHeader() {
{/* THEME SELECTION */}
- {theme == 'dark' ?
+ {theme === 'dark' ?
:
@@ -56,7 +56,7 @@ export default function DashboardHeader() {
handleActiveMenu('avatar')} className='relative cursor-pointer w-10 h-10 rounded shadow-round_black dark:shadow-round_white'>

- {activeMenu == 'avatar' &&
+ {activeMenu === 'avatar' &&
diff --git a/src/components/layouts/DashboardLayout.jsx b/src/components/layouts/DashboardLayout.jsx
index 4efdffb..5690604 100644
--- a/src/components/layouts/DashboardLayout.jsx
+++ b/src/components/layouts/DashboardLayout.jsx
@@ -17,8 +17,8 @@ export default function DashboardLayout() {
-
-
setShowAsideDrawer('')} >
+
+
setShowAsideDrawer('')} >
@@ -45,9 +45,9 @@ export default function DashboardLayout() {
-
setShowAsideDrawer('')}>
- {/*
setShowAsideDrawer('')} >
*/}
-
e.stopPropagation()} className={`${showAsideDrawer =='right-aside' ? 'right-0' : '-right-full'} fixed z-[999] top-0 botom-0 px-8 py-4 h-full w-4/5 sm:w-[400px] bg-[#192440] dark:bg-[#1E1E2D] text-white-body`}>
+
setShowAsideDrawer('')}>
+ {/*
setShowAsideDrawer('')} >
*/}
+
e.stopPropagation()} className={`${showAsideDrawer ==='right-aside' ? 'right-0' : '-right-full'} fixed z-[999] top-0 botom-0 px-8 py-4 h-full w-4/5 sm:w-[400px] bg-[#192440] dark:bg-[#1E1E2D] text-white-body`}>
diff --git a/src/components/layouts/HandBurger.jsx b/src/components/layouts/HandBurger.jsx
index b3dbf14..79ef012 100644
--- a/src/components/layouts/HandBurger.jsx
+++ b/src/components/layouts/HandBurger.jsx
@@ -11,21 +11,21 @@ export default function HandBurger({showAside, barColor}) {
>
*/}
setShowAsideDrawer(false)}
>
diff --git a/src/components/layouts/aside/AsideLinkWithSubLinks.jsx b/src/components/layouts/aside/AsideLinkWithSubLinks.jsx
index 32f7aac..873c41b 100644
--- a/src/components/layouts/aside/AsideLinkWithSubLinks.jsx
+++ b/src/components/layouts/aside/AsideLinkWithSubLinks.jsx
@@ -1,5 +1,5 @@
import { useState } from "react";
-import { useLocation } from "react-router-dom"
+// import { useLocation } from "react-router-dom"
import { FaCaretDown } from "react-icons/fa";
import Icons from "../../Icons";
import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext";
@@ -9,9 +9,9 @@ export default function AsideLinkWithSubLinks({name, icon, to, children, isOpen}
const {shrinkAside} = GeneralLayoutContext()
- const {pathname} = useLocation()
+// const {pathname} = useLocation()
- const isMatchedPath = pathname.split('/').includes('')
+// const isMatchedPath = pathname.split('/').includes('')
// isMatchedPath.splice(0,1)
const [hideSubMenu, setHideSubMenu] = useState(isOpen)
diff --git a/src/components/layouts/aside/DashboardAside.jsx b/src/components/layouts/aside/DashboardAside.jsx
index 61bfe0c..232e97f 100644
--- a/src/components/layouts/aside/DashboardAside.jsx
+++ b/src/components/layouts/aside/DashboardAside.jsx
@@ -4,7 +4,7 @@ import DummyLogo from "../../DummyLogo";
import MainBtn from "../../MainBtn";
import AsideLink from "./AsideLink";
import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks";
-import { useSelector } from "react-redux";
+// import { useSelector } from "react-redux";
import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext";
import { TbLogout2 } from "react-icons/tb";
import UserAvatar from '../../../assets/user_avatar.jpg'
@@ -14,10 +14,10 @@ export default function DashboardAside() {
const {pathname} = useLocation()
- const {setLogoutModal, activeMenu, handleActiveMenu} = GeneralLayoutContext()
+ const {setLogoutModal, handleActiveMenu} = GeneralLayoutContext()
- const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS
- const {role}= userDetails
+ // const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS
+ // const {role}= userDetails
return (
@@ -28,7 +28,7 @@ export default function DashboardAside() {
{asideNavLinks.map((link, index) => {
- let active = link.status == 1 ? true : false
+ let active = link.status === 1 ? true : false
let hasSubLinks = (link.subLinks && link.subLinks.length > 0) ? true : false
if(active && !hasSubLinks){
return (
@@ -53,10 +53,10 @@ export default function DashboardAside() {
{link.title &&
{link.title}
}
-
+
<>
{link.subLinks.map((subItem, index)=>{
- let active = subItem.status == 1 ? true : false
+ let active = subItem.status === 1 ? true : false
let hasSubLinks = (subItem.subLinks && subItem.subLinks.length > 0) ? true : false
if(active && !hasSubLinks){
return (
@@ -74,13 +74,15 @@ export default function DashboardAside() {
<>
{subItem.subLinks.map((item, index)=>{
- let active = item.status == 1 ? true : false
+ let active = item.status === 1 ? true : false
if(active){
return (
)
+ }else{
+ return null
}
})}
>
@@ -94,6 +96,8 @@ export default function DashboardAside() {
)
+ }else{
+ return null
}
})}
diff --git a/src/components/layouts/rightaside/Orders.jsx b/src/components/layouts/rightaside/Orders.jsx
index 9d224c7..3322ec4 100644
--- a/src/components/layouts/rightaside/Orders.jsx
+++ b/src/components/layouts/rightaside/Orders.jsx
@@ -39,7 +39,7 @@ export default function Orders() {
-

+
Project Briefing
@@ -48,7 +48,7 @@ export default function Orders() {
-

+
Project Briefing
@@ -57,7 +57,7 @@ export default function Orders() {
-

+
Project Briefing
@@ -66,7 +66,7 @@ export default function Orders() {
-

+
Project Briefing
diff --git a/src/components/layouts/rightaside/RightAsideBar.jsx b/src/components/layouts/rightaside/RightAsideBar.jsx
index 73b34d2..714fcf4 100644
--- a/src/components/layouts/rightaside/RightAsideBar.jsx
+++ b/src/components/layouts/rightaside/RightAsideBar.jsx
@@ -17,21 +17,21 @@ export default function RightAsideBar() {
{/* Menu */}
-
{/* Body */}
- {active == 'orders' &&
}
- {active == 'tickets' &&
}
- {active == 'tasks' &&
}
+ {active === 'orders' &&
}
+ {active === 'tickets' &&
}
+ {active === 'tasks' &&
}
)
}
diff --git a/src/components/layouts/rightaside/Tasks.jsx b/src/components/layouts/rightaside/Tasks.jsx
index 61acbeb..a6d38fe 100644
--- a/src/components/layouts/rightaside/Tasks.jsx
+++ b/src/components/layouts/rightaside/Tasks.jsx
@@ -39,7 +39,7 @@ export default function Tasks() {
-

+
Project Briefing
@@ -48,7 +48,7 @@ export default function Tasks() {
-

+
Project Briefing
@@ -57,7 +57,7 @@ export default function Tasks() {
-

+
Project Briefing
@@ -66,7 +66,7 @@ export default function Tasks() {
-

+
Project Briefing
diff --git a/src/components/layouts/rightaside/Tickets.jsx b/src/components/layouts/rightaside/Tickets.jsx
index e5a8570..37d6d00 100644
--- a/src/components/layouts/rightaside/Tickets.jsx
+++ b/src/components/layouts/rightaside/Tickets.jsx
@@ -39,7 +39,7 @@ export default function Tickets() {
-

+
Project Briefing
@@ -48,7 +48,7 @@ export default function Tickets() {
-

+
Project Briefing
@@ -57,7 +57,7 @@ export default function Tickets() {
-

+
Project Briefing
@@ -66,7 +66,7 @@ export default function Tickets() {
-

+
Project Briefing
diff --git a/src/components/loan_charges/BillingsCom.jsx b/src/components/loan_charges/BillingsCom.jsx
index 650f001..124c7d2 100644
--- a/src/components/loan_charges/BillingsCom.jsx
+++ b/src/components/loan_charges/BillingsCom.jsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys'
@@ -7,8 +7,8 @@ import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons'
import { getBillings } from '../../services/siteServices'
import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString';
-import formatNumber from '../../helpers/formatNumber'
-import Avatar from '../../assets/user_avatar.jpg'
+// import formatNumber from '../../helpers/formatNumber'
+// import Avatar from '../../assets/user_avatar.jpg'
export default function BillingsCom() {
diff --git a/src/components/loanscom/LoansCom.jsx b/src/components/loanscom/LoansCom.jsx
index 1d0b061..79ecad3 100644
--- a/src/components/loanscom/LoansCom.jsx
+++ b/src/components/loanscom/LoansCom.jsx
@@ -111,7 +111,7 @@ export default function LoansCom() {
- 
+
{item?.account_id || ''}
{item?.id} : {item?.transaction_id}
diff --git a/src/components/offers/OffersCom.jsx b/src/components/offers/OffersCom.jsx
index c2ad21a..79d6a99 100644
--- a/src/components/offers/OffersCom.jsx
+++ b/src/components/offers/OffersCom.jsx
@@ -8,7 +8,7 @@ import Icons from '../Icons'
import Avatar from '../../assets/user_avatar.jpg'
import queryKeys from '../../services/queryKeys'
import { getOffers } from '../../services/siteServices'
-import getDateFromDateString from '../../helpers/GetDateFromDateString';
+// import getDateFromDateString from '../../helpers/GetDateFromDateString';
import formatNumber from '../../helpers/formatNumber';
export default function OffersCom() {
@@ -72,7 +72,7 @@ export default function OffersCom() {
- 
+
{item?.product_id || ''}
{/* {item?.description} */}
diff --git a/src/components/repayments/RepaymentsCom.jsx b/src/components/repayments/RepaymentsCom.jsx
index 3fd1749..da32dac 100644
--- a/src/components/repayments/RepaymentsCom.jsx
+++ b/src/components/repayments/RepaymentsCom.jsx
@@ -103,7 +103,7 @@ export default function RepaymentsCom() {
- 
+
{item?.customer_id || ''}
{item?.loan_id} : {item?.transaction_id}
diff --git a/src/components/tableWrapper/TablePaginatedWrapper.jsx b/src/components/tableWrapper/TablePaginatedWrapper.jsx
index d76c610..2e7f299 100644
--- a/src/components/tableWrapper/TablePaginatedWrapper.jsx
+++ b/src/components/tableWrapper/TablePaginatedWrapper.jsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+// import { useState } from "react";
import MainBtn from "../MainBtn";
import Icons from "../Icons";
diff --git a/src/components/transactionDetails/LoanChargeDetails.jsx b/src/components/transactionDetails/LoanChargeDetails.jsx
index 0f6f99b..ce7559f 100644
--- a/src/components/transactionDetails/LoanChargeDetails.jsx
+++ b/src/components/transactionDetails/LoanChargeDetails.jsx
@@ -1,7 +1,7 @@
import React, { useState } from 'react'
import { useQuery } from "@tanstack/react-query";
-import Icons from '../Icons'
+// import Icons from '../Icons'
import Avatar from '../../assets/user_avatar.jpg'
import queryKeys from '../../services/queryKeys'
@@ -58,7 +58,7 @@ export default function LoanChargeDetails({transactionID}) {
- 
+
{item?.transaction_id || ''}
{/* {item?.description} */}
diff --git a/src/components/transactionDetails/LoanDetails.jsx b/src/components/transactionDetails/LoanDetails.jsx
index 04fbab5..e5e4b4d 100644
--- a/src/components/transactionDetails/LoanDetails.jsx
+++ b/src/components/transactionDetails/LoanDetails.jsx
@@ -62,7 +62,7 @@ export default function LoanDetails({transactionID}) {
- 
+
{item?.account_id || ''}
{item?.id} : {item?.transaction_id}
diff --git a/src/components/transactionDetails/RepaymentScheduleDetails.jsx b/src/components/transactionDetails/RepaymentScheduleDetails.jsx
index 74fa97a..035a419 100644
--- a/src/components/transactionDetails/RepaymentScheduleDetails.jsx
+++ b/src/components/transactionDetails/RepaymentScheduleDetails.jsx
@@ -68,7 +68,7 @@ export default function RepaymentScheduleDetails({transactionID}) {
- 
+
{item?.loan_id || ''}
{/* {item?.description} */}
diff --git a/src/components/transactions/SubscriptionsCom.jsx b/src/components/transactions/SubscriptionsCom.jsx
index 6f176cf..4e0f077 100644
--- a/src/components/transactions/SubscriptionsCom.jsx
+++ b/src/components/transactions/SubscriptionsCom.jsx
@@ -1,5 +1,5 @@
-import { useEffect, useState } from 'react'
-import {Link} from 'react-router-dom'
+import { useState } from 'react'
+// import {Link} from 'react-router-dom'
import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys'
@@ -8,8 +8,8 @@ import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons'
import { getSubscriptions } from '../../services/siteServices'
import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString';
-import localImgLoader from '../../helpers/localImageLoader';
-import RouteLinks from '../../RouteLinks';
+// import localImgLoader from '../../helpers/localImageLoader';
+// import RouteLinks from '../../RouteLinks';
export default function SubscriptionsCom() {
diff --git a/src/context/GeneralLayoutContext.jsx b/src/context/GeneralLayoutContext.jsx
index 0be00e3..f2d792b 100644
--- a/src/context/GeneralLayoutContext.jsx
+++ b/src/context/GeneralLayoutContext.jsx
@@ -21,7 +21,7 @@ export default function GeneralLayoutContextInt({children}) {
const [showAsideDrawer, setShowAsideDrawer] = useState('')
const handleActiveMenu = (name) => {
- if(activeMenu == name){
+ if(activeMenu === name){
setActiveMenu('')
}else{
setActiveMenu(name)
@@ -32,7 +32,7 @@ export default function GeneralLayoutContextInt({children}) {
setDrawer((prev)=>{
if(!prev){
return drawerToOpen
- }else if(drawerToOpen == prev){
+ }else if(drawerToOpen === prev){
return ''
}else{
return drawerToOpen
@@ -44,7 +44,7 @@ export default function GeneralLayoutContextInt({children}) {
setBooking((prev)=>{
if(!prev){
return bookingToOpen
- }else if(bookingToOpen == prev){
+ }else if(bookingToOpen === prev){
return ''
}else{
return bookingToOpen
diff --git a/src/pages/TransactionDetailsPage.jsx b/src/pages/TransactionDetailsPage.jsx
index fcec4ed..b6901e1 100644
--- a/src/pages/TransactionDetailsPage.jsx
+++ b/src/pages/TransactionDetailsPage.jsx
@@ -11,7 +11,7 @@ export default function TransactionDetailsPage() {
if(!state?.transactionID){
navigate('/', {replace: true})
}
- },[])
+ },[state])
return (
)
| | | | | |