Skip to content

Added course redirect to login. Added filtering by course type #35

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

Merged
HareshWed merged 3 commits into from
May 20, 2025
Merged

Added course redirect to login. Added filtering by course type #35

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83e5c5f
Added course redirect to login. Added filtering by course type
HareshWed May 19, 2025
202f2ed
Merge branch 'main' into backend/frontend-integrations
PaulaFregene May 20, 2025
6fba1ae
Merge branch 'main' into backend/frontend-integrations
PaulaFregene May 20, 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
137 changes: 110 additions & 27 deletions src/pages/courses/Courses.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,19 @@ const CoursesStyling = styled.div`
align-self: stretch;
}

.filters-row {
display: flex;
justify-content: space-between;
padding: 48px 120px;
align-items: flex-start;
}

.filter-container {
display: flex;
flex-direction: column;
gap: 12px;
}

.language-button-container {
display: flex;
gap: 8px;
Expand All @@ -115,6 +128,17 @@ const CoursesStyling = styled.div`
.courses-container {
justify-content: center;
}

.filters-row {
flex-direction: column;
padding: 24px;
gap: 24px;
}

.filter-container {
width: 100%;
align-items: center;
}
}
`;

Expand All @@ -124,14 +148,19 @@ const Courses = () => {
const { user } = useUser();
const navigate = useNavigate();
const [language, setLanguage] = useState('English');
const [courseType, setCourseType] = useState('All'); // Add this line

// Filter courses based on selected language
const filteredNonUserCourses = nonUserCourses.filter(
(course) => course.language === language
(course) =>
course.language === language &&
(courseType === 'All' || course.course_type === courseType)
);

const filteredUserCourses = userCourses.filter(
(course) => course.language === language
(course) =>
course.language === language &&
(courseType === 'All' || course.course_type === courseType)
);

useEffect(() => {
Expand All @@ -158,8 +187,12 @@ const Courses = () => {
}
};

fetchData();
}, []);
if (!user) {
navigate('/login');
} else {
fetchData();
}
}, [user, navigate]);

return (
<div>
Expand Down Expand Up @@ -187,31 +220,81 @@ const Courses = () => {
</button>
)}
</div>
<div className='language-container'>
<h3>SELECT LANGUAGE</h3>
<div className='language-button-container'>
<button
className={
language === 'English'
? 'language-button-green'
: 'language-button-white'
}
onClick={() => setLanguage('English')}
>
English
</button>
<button
className={
language === 'Spanish'
? 'language-button-green'
: 'language-button-white'
}
onClick={() => setLanguage('Spanish')}
>
Español
</button>

<div className='filters-row'>
<div className='filter-container'>
<h3>SELECT COURSE TYPE</h3>
<div className='language-button-container'>
<button
className={
courseType === 'All'
? 'language-button-green'
: 'language-button-white'
}
onClick={() => setCourseType('All')}
>
All
</button>
<button
className={
courseType === 'Online'
? 'language-button-green'
: 'language-button-white'
}
onClick={() => setCourseType('Online')}
>
Online
</button>
<button
className={
courseType === 'In-Person'
? 'language-button-green'
: 'language-button-white'
}
onClick={() => setCourseType('In-Person')}
>
In-Person
</button>
<button
className={
courseType === 'Virtual'
? 'language-button-green'
: 'language-button-white'
}
onClick={() => setCourseType('Virtual')}
>
Virtual
</button>
</div>
</div>

<div className='filter-container'>
<h3>SELECT LANGUAGE</h3>
<div className='language-button-container'>
<button
className={
language === 'English'
? 'language-button-green'
: 'language-button-white'
}
onClick={() => setLanguage('English')}
>
English
</button>
<button
className={
language === 'Spanish'
? 'language-button-green'
: 'language-button-white'
}
onClick={() => setLanguage('Spanish')}
>
Español
</button>
</div>
</div>
</div>

<div className='courses-container'>
{filteredNonUserCourses.map((classData, index) => (
<CourseCard
Expand Down