diff --git a/src/APIs/ProjectScreenAPIs/getLinkedProject.tsx b/src/APIs/ProjectScreenAPIs/getLinkedProject.tsx index ef03dee..534dde7 100644 --- a/src/APIs/ProjectScreenAPIs/getLinkedProject.tsx +++ b/src/APIs/ProjectScreenAPIs/getLinkedProject.tsx @@ -1,6 +1,6 @@ import {useQuery, UseQueryOptions, UseQueryResult } from '@tanstack/react-query'; -export const getLinkedProjectListCopy = async(searchBy:any)=>{ +export const getLinkedProjectList = async(searchBy:any)=>{ try { const response = await fetch(`${process.env.REACT_APP_API_URL}/linked-project?searchBy=${searchBy}`); if (!response.ok) { @@ -12,3 +12,12 @@ export const getLinkedProjectListCopy = async(searchBy:any)=>{ console.error('Error fetching data:', error); } } + +export const useLinkedProjectData = (searchBy: any) => { + return useQuery( + { + queryKey: ['linked-project-list', searchBy], + queryFn: () => getLinkedProjectList(searchBy) + } + ); + }; diff --git a/src/APIs/ProjectScreenAPIs/getProject.tsx b/src/APIs/ProjectScreenAPIs/getProject.tsx index 43310a8..732495c 100644 --- a/src/APIs/ProjectScreenAPIs/getProject.tsx +++ b/src/APIs/ProjectScreenAPIs/getProject.tsx @@ -1,6 +1,6 @@ import {useQuery, UseQueryOptions, UseQueryResult } from '@tanstack/react-query'; -export const getProjectListCopy = async(searchBy:any)=>{ +export const getProjectList = async(searchBy:any)=>{ const response = await fetch(`${process.env.REACT_APP_API_URL}/project-list?searchBy=`); const projectListData = await response.json() return projectListData; @@ -10,7 +10,7 @@ export const useGetProjectData = (searchBy: any) => { return useQuery( { queryKey: ['Project-list', searchBy], - queryFn: () => getProjectListCopy(searchBy) + queryFn: () => getProjectList(searchBy) } ); }; \ No newline at end of file diff --git a/src/APIs/ProjectScreenAPIs/getUnlinkedProject.tsx b/src/APIs/ProjectScreenAPIs/getUnlinkedProject.tsx index 96a7aa8..2dfbf8d 100644 --- a/src/APIs/ProjectScreenAPIs/getUnlinkedProject.tsx +++ b/src/APIs/ProjectScreenAPIs/getUnlinkedProject.tsx @@ -5,3 +5,12 @@ export const getUnlinkedProjects = async(searchBy:any)=>{ const projectListData = await response.json() return projectListData; } + +export const useUnlinkedProjectData = (searchBy: any) => { + return useQuery( + { + queryKey: ['unlinked-project-list', searchBy], + queryFn: () => getUnlinkedProjects(searchBy) + } + ); + }; diff --git a/src/components/Dashboard.tsx b/src/components/Dashboard.tsx index 8aed77e..8c405c8 100644 --- a/src/components/Dashboard.tsx +++ b/src/components/Dashboard.tsx @@ -1,14 +1,13 @@ import { Box, Card, CardContent, Grid, Paper, Typography, styled } from "@mui/material"; import React, { useEffect } from "react"; -// import { getLinkedProjects, useGetLinkedProjects } from "APIs/getLinkedProjects"; -// import { useGetUnlinkedProjects } from "APIs/getUnlinkedProjects"; -// import { useGetProjectData } from "APIs/getProject"; +import { getLinkedProjectList, useLinkedProjectData } from "../APIs/ProjectScreenAPIs/getLinkedProject"; +import { useUnlinkedProjectData } from "../APIs/ProjectScreenAPIs/getUnlinkedProject"; export default function Dashboard(){ const [linkedProjectData, setLinkedProjectData] = React.useState() -// const { data: getLinkedProjectList } = useGetLinkedProjects(); -// const { data: getUnlinkedProjectList } = useGetUnlinkedProjects(); + const { data: getLinkedProjectList } = useLinkedProjectData(''); + const { data: getUnlinkedProjectList } = useUnlinkedProjectData(''); const Item = styled(Paper)(({ theme }) => ({ backgroundColor: '#1e1e1e', @@ -20,14 +19,14 @@ export default function Dashboard(){ return ( - + - + - + - {/* {getUnlinkedProjectList && getUnlinkedProjectList.length} */} + {getUnlinkedProjectList && getUnlinkedProjectList.length} @@ -38,12 +37,12 @@ export default function Dashboard(){ - + - {/* {getLinkedProjectList && getLinkedProjectList.length} */} + {getLinkedProjectList && getLinkedProjectList.length} diff --git a/src/components/projects/Projects.tsx b/src/components/projects/Projects.tsx index c773f03..04c81e9 100644 --- a/src/components/projects/Projects.tsx +++ b/src/components/projects/Projects.tsx @@ -1,10 +1,10 @@ import React from "react"; import ProjectList from "./ProjectsList"; import { useGetProjectDataRQ } from "../../APIs/getProjectRQ"; -import { getProjectListCopy } from "../../APIs/ProjectScreenAPIs/getProject"; +import { getProjectList } from "../../APIs/ProjectScreenAPIs/getProject"; import { useState } from "react"; import { useEffect } from "react"; -import { getLinkedProjectListCopy } from "../../APIs/ProjectScreenAPIs/getLinkedProject"; +import { getLinkedProjectList } from "../../APIs/ProjectScreenAPIs/getLinkedProject"; import { Box, Card, CardContent, FormControl, Grid, InputLabel, MenuItem, Paper, Select, TextField } from "@mui/material"; import { getPublishedProjects } from "../../APIs/ProjectScreenAPIs/getPublishedProject"; import { getUnlinkedProjects } from "../../APIs/ProjectScreenAPIs/getUnlinkedProject"; @@ -19,10 +19,10 @@ export default function Projects(){ useEffect(()=>{ if(selectedContractFilter=='All'){ - setContractFilterResponseData(getProjectListCopy(searchByFilter)) + setContractFilterResponseData(getProjectList(searchByFilter)) } else if (selectedContractFilter=='linked'){ - setContractFilterResponseData(getLinkedProjectListCopy(searchByFilter)) + setContractFilterResponseData(getLinkedProjectList(searchByFilter)) } else if (selectedContractFilter=='unlinked'){ setContractFilterResponseData(getUnlinkedProjects(searchByFilter))