diff --git a/src/components/Layout/Sidebar.jsx b/src/components/Layout/Sidebar.jsx index b41cb654..1f4b63b8 100644 --- a/src/components/Layout/Sidebar.jsx +++ b/src/components/Layout/Sidebar.jsx @@ -99,7 +99,7 @@ const MenuItem = (item) => { className={`menu-link ${hasSubmenu ? "menu-toggle" : ""}`} target={item.link?.includes("http") ? "_blank" : undefined} > - + {item.icon && }
{item.name}
{item.available === false && (
diff --git a/src/pages/AdvancePayment/AdvancePaymentPage.jsx b/src/pages/AdvancePayment/AdvancePaymentPage.jsx index e81c69a5..9af4a6c9 100644 --- a/src/pages/AdvancePayment/AdvancePaymentPage.jsx +++ b/src/pages/AdvancePayment/AdvancePaymentPage.jsx @@ -26,7 +26,7 @@ export const useAdvancePaymentContext = () => { }; const AdvancePaymentPage = () => { const [balance, setBalance] = useState(null); - const {control, reset, watch } = useForm({ + const { control, reset, watch } = useForm({ defaultValues: { employeeId: "", }, @@ -39,14 +39,13 @@ const AdvancePaymentPage = () => { employeeId: selectedEmpoyee || "", }); }, [reset]); - return (
{ balance > 0 ? "text-success" : "text-danger" } fs-5 fw-bold ms-1`} > - { balance > 0 ? : } {formatFigure(balance, { + {balance > 0 ? ( + + ) : ( + + )}{" "} + {formatFigure(balance, { type: "currency", currency: "INR", })} @@ -85,8 +89,6 @@ const AdvancePaymentPage = () => {
- - diff --git a/src/pages/Expense/ExpensePage.jsx b/src/pages/Expense/ExpensePage.jsx index 034651c2..e7ac3638 100644 --- a/src/pages/Expense/ExpensePage.jsx +++ b/src/pages/Expense/ExpensePage.jsx @@ -1,4 +1,10 @@ -import React, { createContext, useContext, useState, useEffect, useRef } from "react"; +import React, { + createContext, + useContext, + useState, + useEffect, + useRef, +} from "react"; import { useForm, useFormContext } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod"; import { useSelector } from "react-redux"; @@ -19,7 +25,10 @@ import { VIEW_SELF_EXPENSE, } from "../../utils/constants"; -import { defaultFilter, SearchSchema } from "../../components/Expenses/ExpenseSchema"; +import { + defaultFilter, + SearchSchema, +} from "../../components/Expenses/ExpenseSchema"; import PreviewDocument from "../../components/Expenses/PreviewDocument"; // Context @@ -102,14 +111,14 @@ const ExpensePage = () => { setManageExpenseModal, setDocumentView, filterData, - removeFilterChip + removeFilterChip, }; return (
{IsViewAll || IsViewSelf || IsCreatedAble ? ( @@ -128,7 +137,6 @@ const ExpensePage = () => {
- {IsCreatedAble && (
- - { }; const ImageGalleryPage = () => { - const [filter,setFilter] = useState() + const [filter, setFilter] = useState(); const selectedProjectId = useSelectedProject(); const { projectNames } = useProjectName(); - const [openGallery, setOpenGallery] = useState({ isOpen: false, data: null }); @@ -56,24 +55,26 @@ const ImageGalleryPage = () => { setOpenGallery, }; - const { setOffcanvasContent, setShowTrigger } = useFab(); + const { setOffcanvasContent, setShowTrigger } = useFab(); - useEffect(()=>{ + useEffect(() => { setShowTrigger(true); - setOffcanvasContent("Gallery Filter",); - - return ()=>{ - setOffcanvasContent("",null) - setShowTrigger(false); - } - },[]) + setOffcanvasContent( + "Gallery Filter", + + ); + return () => { + setOffcanvasContent("", null); + setShowTrigger(false); + }; + }, []); return (
@@ -104,7 +105,7 @@ const ImageGalleryPage = () => {
)} */} - +
{openGallery?.isOpen && ( diff --git a/src/pages/Organization/OrganizationPage.jsx b/src/pages/Organization/OrganizationPage.jsx index 95629d87..017245e9 100644 --- a/src/pages/Organization/OrganizationPage.jsx +++ b/src/pages/Organization/OrganizationPage.jsx @@ -6,12 +6,15 @@ import OrganizationsList from "../../components/Organization/OrganizationsList"; const OrganizationPage = () => { const { isOpen, orgData, startStep, onOpen, flowType } = useOrganizationModal(); - const [searchText, setSearchText] = useState("") + const [searchText, setSearchText] = useState(""); return (
@@ -29,27 +32,24 @@ const OrganizationPage = () => {
-
+
- -
- +
- ); }; diff --git a/src/pages/PaymentRequest/PaymentRequestPage.jsx b/src/pages/PaymentRequest/PaymentRequestPage.jsx index d19b8250..286e99bb 100644 --- a/src/pages/PaymentRequest/PaymentRequestPage.jsx +++ b/src/pages/PaymentRequest/PaymentRequestPage.jsx @@ -6,7 +6,10 @@ import ExpenseFilterPanel from "../../components/Expenses/ExpenseFilterPanel"; import { useFab } from "../../Context/FabContext"; import PaymentRequestList from "../../components/PaymentRequest/PaymentRequestList"; import PaymentRequestFilterPanel from "../../components/PaymentRequest/PaymentRequestFilterPanel"; -import { defaultPaymentRequestFilter,SearchPaymentRequestSchema } from "../../components/PaymentRequest/PaymentRequestSchema"; +import { + defaultPaymentRequestFilter, + SearchPaymentRequestSchema, +} from "../../components/PaymentRequest/PaymentRequestSchema"; import ViewPaymentRequest from "../../components/PaymentRequest/ViewPaymentRequest"; import PreviewDocument from "../../components/Expenses/PreviewDocument"; import MakeExpense from "../../components/PaymentRequest/MakeExpense"; @@ -15,7 +18,9 @@ export const PaymentRequestContext = createContext(); export const usePaymentRequestContext = () => { const context = useContext(PaymentRequestContext); if (!context) { - throw new Error("usePaymentRequestContext must be used within an ExpenseProvider"); + throw new Error( + "usePaymentRequestContext must be used within an ExpenseProvider" + ); } return context; }; @@ -24,16 +29,21 @@ const PaymentRequestPage = () => { IsOpen: null, RequestId: null, }); - const [ViewRequest,setVieRequest] = useState({view:false,requestId:null}) + const [ViewRequest, setVieRequest] = useState({ + view: false, + requestId: null, + }); const { setOffcanvasContent, setShowTrigger } = useFab(); const [filters, setFilters] = useState(defaultPaymentRequestFilter); - const [ViewDocument, setDocumentView] = useState({ - IsOpen: false, - Image: null, - }); - const [isExpenseGenerate,setIsExpenseGenerate] = useState({IsOpen: null, - RequestId: null,}) - const [modalSize,setModalSize] = useState("md") + const [ViewDocument, setDocumentView] = useState({ + IsOpen: false, + Image: null, + }); + const [isExpenseGenerate, setIsExpenseGenerate] = useState({ + IsOpen: null, + RequestId: null, + }); + const [modalSize, setModalSize] = useState("md"); const [search, setSearch] = useState(""); const contextValue = { @@ -42,11 +52,10 @@ const PaymentRequestPage = () => { setDocumentView, setModalSize, setIsExpenseGenerate, - isExpenseGenerate + isExpenseGenerate, }; useEffect(() => { - setShowTrigger(true); setOffcanvasContent( "Payment Request Filters", @@ -65,7 +74,7 @@ const PaymentRequestPage = () => { {/* Breadcrumb */} { className="form-control form-control-sm w-auto" placeholder="Search Payment Request" value={search} - style={{minWidth:"200px"}} + style={{ minWidth: "200px" }} onChange={(e) => setSearch(e.target.value)} /> @@ -106,10 +115,7 @@ const PaymentRequestPage = () => { - + {/* Add/Edit Modal */} {ManageRequest.IsOpen && ( @@ -129,7 +135,7 @@ const PaymentRequestPage = () => { /> )} - + {ViewRequest.view && ( { modalType="top" closeModal={() => setVieRequest({ requestId: null, view: false })} > - + )} - {isExpenseGenerate.IsOpen && ( + {isExpenseGenerate.IsOpen && ( setIsExpenseGenerate({IsOpen:false, requestId: null})} + closeModal={() => + setIsExpenseGenerate({ IsOpen: false, requestId: null }) + } > setIsExpenseGenerate({IsOpen:false, requestId: null})} /> + nse + onClose={() => + setIsExpenseGenerate({ IsOpen: false, requestId: null }) + } + /> )} @@ -161,7 +173,6 @@ const PaymentRequestPage = () => { )} - ); diff --git a/src/pages/collections/CollectionPage.jsx b/src/pages/collections/CollectionPage.jsx index fbac9564..998d469b 100644 --- a/src/pages/collections/CollectionPage.jsx +++ b/src/pages/collections/CollectionPage.jsx @@ -101,7 +101,7 @@ const CollectionPage = () => { ) { return ( ); } @@ -109,7 +109,10 @@ const CollectionPage = () => {
@@ -152,16 +155,18 @@ const CollectionPage = () => { )}
-
-