Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance Mentor Filter Functionality #236

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Enhance Mentor Filter Functionality #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38bc95c
add emotion and MUI material dependencies
rdwaynedehoedt Jan 4, 2025
400f2a0
implement mentor filtering on mentor page
rdwaynedehoedt Jan 4, 2025
b4d0151
add emotion and MUI material dependencies
rdwaynedehoedt Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
"author": "",
"license": "ISC",
"dependencies": {
"@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5",
"@hookform/resolvers": "^3.3.4",
"@mui/material": "^6.3.1",
"@tanstack/react-query": "^5.28.4",
"@tanstack/react-query-devtools": "^5.37.1",
"axios": "^1.4.0",
Expand Down
224 changes: 156 additions & 68 deletions src/pages/Mentors/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,25 @@ import { usePublicMentors } from '../../hooks/usePublicMentors';
import { type Mentor, type Category } from '../../types';
import MentorCard from '../../components/MentorCard/MentorCard.component';
import Loading from '../../assets/svg/Loading';
import { ApplicationStatus } from '../../enums';
import Slider from '@mui/material/Slider';
import Box from '@mui/material/Box';

const Mentors = () => {
const [selectedCategory, setSelectedCategory] = useState<string | null>(null);
const [selectedCountries, setSelectedCountries] = useState<string[]>([]);
const [selectedAvailableSlots, setSelectedAvailableSlots] = useState<number[]>([0, 10]);
const [sortedMentors, setSortedMentors] = useState<Mentor[]>([]);
const [uniqueCountries, setUniqueCountries] = useState<string[]>([]);
const [uniqueAvailableSlots, setUniqueAvailableSlots] = useState<number[]>([]);
const [isCountryDropdownOpen, setIsCountryDropdownOpen] = useState(false);
const [isSlotsDropdownOpen, setIsSlotsDropdownOpen] = useState(false);
const [isMobileFilterOpen, setIsMobileFilterOpen] = useState(false);
const pageSize = 10;

const { ref, inView } = useInView();

const { data, fetchNextPage, hasNextPage, isFetchingNextPage, status } =
usePublicMentors(selectedCategory, pageSize);

const {
data: allCategories,
isLoading: categoriesLoading,
error: categoriesError,
} = useCategories();
const { data, fetchNextPage, hasNextPage, isFetchingNextPage, status } = usePublicMentors(selectedCategory, pageSize);
const { data: allCategories, isLoading: categoriesLoading, error: categoriesError } = useCategories();

useEffect(() => {
if (inView && hasNextPage) {
Expand All @@ -31,21 +34,71 @@ const Mentors = () => {
useEffect(() => {
if (data) {
const allMentors = data.pages.flatMap((page) => page.items);
setSortedMentors(allMentors);
const countries = allMentors.map((mentor) => mentor.application?.country).filter((country) => !!country);
setUniqueCountries([...new Set(countries)]);
const availableSlots = allMentors.map((mentor) => {
const approvedMenteesCount = mentor?.mentees ? mentor.mentees.filter((mentee) => mentee.state === ApplicationStatus.APPROVED).length : 0;
return Math.max(0, mentor.application.noOfMentees - approvedMenteesCount);
}).filter((slots, index, self) => self.indexOf(slots) === index);
setUniqueAvailableSlots(availableSlots);
}
}, [data]);

useEffect(() => {
if (data) {
let allMentors = data.pages.flatMap((page) => page.items);
if (selectedCountries.length > 0) {
allMentors = allMentors.filter((mentor) => selectedCountries.includes(mentor.application.country));
}
const [minSlots, maxSlots] = selectedAvailableSlots;
if (minSlots > 0 || maxSlots < 10) {
allMentors = allMentors.filter((mentor) => {
const approvedMenteesCount = mentor?.mentees ? mentor.mentees.filter((mentee) => mentee.state === ApplicationStatus.APPROVED).length : 0;
return mentor?.application.noOfMentees ? Math.max(0, mentor.application.noOfMentees - approvedMenteesCount) >= minSlots && Math.max(0, mentor.application.noOfMentees - approvedMenteesCount) <= maxSlots : false;
});
}
setSortedMentors(allMentors);
}
}, [data, selectedCountries, selectedAvailableSlots]);

const handleSortAZ = () => {
const sorted = [...sortedMentors].sort((a, b) =>
a.application.firstName.localeCompare(b.application.firstName)
);
setSortedMentors(sorted);
);setSortedMentors(sorted);
};

const handleCategoryChange = (category: string | null) => {
setSelectedCategory(category);
};

const handleCountryChange = (country: string) => {
setSelectedCountries((prevCountries) => {
if (prevCountries.includes(country)) {
return prevCountries.filter((c) => c !== country);
} else {
return [...prevCountries, country];
}
});
};

const handleAvailableSlotsChange = (event: Event, newValue: number | number[]) => {
if (Array.isArray(newValue)) {
setSelectedAvailableSlots(newValue);
}
};

const toggleCountryDropdown = () => {
setIsCountryDropdownOpen(!isCountryDropdownOpen);
};

const toggleSlotsDropdown = () => {
setIsSlotsDropdownOpen(!isSlotsDropdownOpen);
};

const toggleMobileFilter = () => {
setIsMobileFilterOpen(!isMobileFilterOpen);
};

if (status === 'pending' || categoriesLoading) {
return (
<div className="flex items-center justify-center h-screen">
Expand All @@ -59,69 +112,104 @@ const Mentors = () => {
}

return (
<div className="w-full">
<div>
<div className="mb-4 w-full flex items-center justify-between">
<p className="text-2xl font-semibold">Mentors</p>
</div>
<hr className="mb-8" />

<div className="mb-4 w-full flex items-center justify-between">
<div className="flex flex-wrap gap-3 items-center text-sm">
<button
onClick={() => {
handleCategoryChange(null);
}}
className={`bg-blue text-black px-4 py-1 rounded-full border border-blue-500 ${
selectedCategory === null ? 'bg-blue-500 text-white' : ''
}`}
>
All
</button>
{allCategories.map((category: Category) => (
<button
key={category.uuid}
onClick={() => {
handleCategoryChange(category.uuid);
}}
className={`bg-blue text-black px-4 py-1 rounded-full border border-blue-500 ${
selectedCategory === category.uuid
? 'bg-blue-500 text-white'
: ''
}`}
>
{category.category}
</button>
))}
<div className="min-h-screen flex flex-col items-center p-6 bg-white">
<div className="w-full max-w-7xl flex flex-col lg:flex-row gap-8">
<button className="lg:hidden bg-blue-500 text-white px-2 py-1 mb-4 rounded" onClick={toggleMobileFilter}>
{isMobileFilterOpen ? 'Hide Filters' : 'Show Filters'}
</button>
<div className={`w-full lg:w-1/4 bg-white rounded-lg p-6 self-start ${isMobileFilterOpen || 'hidden lg:block'}`}>
<p className="text-xl font-semibold mb-4 text-gray-800">Filters</p>

<div className="mb-6">
<p className="font-medium mb-2 text-gray-700">Categories</p>
<div className="flex flex-col gap-3 text-sm">
<label className="flex items-center space-x-2">
<input type="checkbox" checked={selectedCategory === null} onChange={() => handleCategoryChange(null)} className="form-checkbox h-4 w-4 text-blue-500" />
<span className="text-gray-700">All</span>
</label>
{allCategories.map((category: Category) => (
<label key={category.uuid} className="flex items-center space-x-2">
<input type="checkbox" checked={selectedCategory === category.uuid} onChange={() => handleCategoryChange(category.uuid)} className="form-checkbox h-4 w-4 text-blue-500" />
<span className="text-gray-700">{category.category}</span>
</label>
))}
</div>
</div>
</div>

<div className="mb-4 w-full flex justify-end">
<button
onClick={handleSortAZ}
className="bg-blue-500 text-white px-2 py-1 rounded border border-blue-500 text-xs mr-6"
>
Sort A-Z
</button>
</div>
<div className="mb-6">
<p className="font-medium mb-2 text-gray-700 flex items-center">
<button className=" text-gray-700 hover:text-blue-500" onClick={toggleCountryDropdown}>
Countries {isCountryDropdownOpen ? '-' : ' +'}
</button>
</p>
{isCountryDropdownOpen && (
<div className="flex flex-col gap-3 text-sm">
<label className="flex items-center space-x-2">
<input type="checkbox" checked={selectedCountries.length === 0} onChange={() => setSelectedCountries([])} className="form-checkbox h-4 w-4 text-blue-500" />
<span className="text-gray-700">All</span>
</label>
{uniqueCountries.map((country) => (
<label key={country} className="flex items-center space-x-2">
<input type="checkbox" checked={selectedCountries.includes(country)} onChange={() => handleCountryChange(country)} className="form-checkbox h-4 w-4 text-blue-500" />
<span className="text-gray-700">{country}</span>
</label>
))}
</div>
)}
</div>

{sortedMentors.length > 0 ? (
<div className="flex-grow grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-5 xl:grid-cols-6 gap-8 items-start">
{sortedMentors.map((mentor) => (
<MentorCard key={mentor.uuid} mentor={mentor} />
))}
<div className="mb-6">
<p className="font-medium mb-2 text-gray-700 flex items-center">
<button className=" text-gray-700 hover:text-blue-500" onClick={toggleSlotsDropdown}>
Available Slots {isSlotsDropdownOpen ? '-' : ' +'}
</button>
</p>
{isSlotsDropdownOpen && (
<Box sx={{ width: 120 }}>
<Slider
value={selectedAvailableSlots}
onChange={handleAvailableSlotsChange}
valueLabelDisplay="auto"
valueLabelFormat={(value) => `${value} slots`}
min={0}
max={10}
step={1}
/>
</Box>
)}
</div>
) : (
<p>No mentors found for this category.</p>
)}

{isFetchingNextPage && (
<div className="flex justify-center mt-4">
<Loading />
<div>
<button onClick={handleSortAZ} className="bg-blue-500 text-white px-2 py-1 rounded border border-blue-500 text-xs mr-6">
Sort A-Z
</button>
</div>
)}
</div>

<div ref={ref} style={{ height: '20px' }} />
<div className="w-full flex-grow bg-white rounded-lg p-6">
<div>
<p className="text-2xl font-semibold mb-4">Mentors</p>
<hr className="mb-6" />

{sortedMentors.length > 0 ? (
<div className="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-6">
{sortedMentors.map((mentor) => (
<MentorCard key={mentor.uuid} mentor={mentor} />
))}
</div>
) : (
<p>No mentors found for this filter.</p>
)}

{isFetchingNextPage && (
<div className="flex justify-center mt-6">
<Loading />
</div>
)}

<div ref={ref} style={{ height: '20px' }} />
</div>
</div>
</div>
</div>
);
Expand Down
Loading