From 2737dc5d9029b936f707fa76be126138171001da Mon Sep 17 00:00:00 2001 From: MBSA-INFINITY Date: Fri, 22 Mar 2024 13:18:51 +0530 Subject: [PATCH] fixed bug in projects page --- src/components/ProjectsPage.js | 14 ++++++-------- src/components/project/projectList.jsx | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/components/ProjectsPage.js b/src/components/ProjectsPage.js index 633fe0f323..00a5657528 100644 --- a/src/components/ProjectsPage.js +++ b/src/components/ProjectsPage.js @@ -20,9 +20,11 @@ const ProjectsPage = ({ projects, tag, img, sig }) => { const handlePageClick = (data) => { setCurrentPage(data.selected); }; - + if (tag != "") { projects = projects.filter(project => project.project_tags.toLowerCase().includes(tag.toLowerCase())) + } else { + projects = projects.filter(project => project.project_sig.toLowerCase() == sig.toLowerCase()) } useEffect(() => { @@ -36,12 +38,8 @@ const ProjectsPage = ({ projects, tag, img, sig }) => { const indexOfLastProject = (currentPage + 1) * projectsPerPage; const indexOfFirstProject = indexOfLastProject - projectsPerPage; - let currentProjects - if (tag == "expo24") { - currentProjects = projects.slice(indexOfFirstProject, indexOfLastProject); - } else { - currentProjects = projects.filter(project => project.project_sig.toLowerCase() == sig.toLowerCase()).filter(project => project.project_year == selectedOption).slice(indexOfFirstProject, indexOfLastProject); - } + + const currentProjects = projects.slice(indexOfFirstProject, indexOfLastProject); const pageCount = Math.ceil(projects.length / projectsPerPage); return ( @@ -53,7 +51,7 @@ const ProjectsPage = ({ projects, tag, img, sig }) => { } - {(currentProjects.length > 0 && tag != "expo24") && + {false &&
    diff --git a/src/components/project/projectList.jsx b/src/components/project/projectList.jsx index 2c6db6b5a1..d5f2a42c09 100644 --- a/src/components/project/projectList.jsx +++ b/src/components/project/projectList.jsx @@ -11,7 +11,8 @@ export default function ProjectList({ img, sig, tag }) { useEffect(() => { const fetchData = async () => { const projectsData = await fetchProjects(); - setProjects(projectsData); + let reversed = [...projectsData].reverse() + setProjects(reversed); }; fetchData();